From b03e9f8fd51b48e5ffaa30c7fda39c29bc57a0bb Mon Sep 17 00:00:00 2001
From: michael <michael@crossingpaths.be>
Date: Wed, 16 Nov 2016 13:13:39 +0100
Subject: [PATCH 001/145] issue U4-8967: updated labels as required and updated
 dialogs/linkpicker.html to be consistent with the structure
 overlay/linkpicker.html

I updated the labels in EN, FR, NL + other languages where I could figure out what was the update to perform.
---
 .gitignore                                                | 2 ++
 .../src/common/mocks/services/localization.mocks.js       | 4 ++--
 .../src/views/common/dialogs/linkpicker.html              | 8 ++++----
 src/Umbraco.Web.UI/umbraco/config/lang/de.xml             | 4 ++--
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml             | 2 +-
 src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml          | 2 +-
 src/Umbraco.Web.UI/umbraco/config/lang/es.xml             | 4 ++--
 src/Umbraco.Web.UI/umbraco/config/lang/fr.xml             | 4 ++--
 src/Umbraco.Web.UI/umbraco/config/lang/it.xml             | 4 ++--
 src/Umbraco.Web.UI/umbraco/config/lang/nl.xml             | 4 ++--
 10 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5b5e7660c5..2bf1e1c5dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,3 +141,5 @@ build/docs.zip
 build/ui-docs.zip
 build/csharp-docs.zip
 build/msbuild.log
+/src/Umbraco.Web.UI/js/jquery.min.js
+/src/Umbraco.Web.UI/js/bootstrap.min.js
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
index d4393dd20b..127448ff5b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
@@ -131,7 +131,7 @@ angular.module('umbraco.mocks').
                   "content_memberrole": "Role",
                   "content_membertype": "Member Type",
                   "content_noDate": "No date chosen",
-                  "content_nodeName": "Page Title",
+                  "content_nodeName": "Link Title",
                   "content_otherElements": "Properties",
                   "content_parentNotPublished": "This document is published but is not visible because the parent '%0%' is unpublished",
                   "content_parentNotPublishedAnomaly": "This document is published but is not in the cache",
@@ -148,7 +148,7 @@ angular.module('umbraco.mocks').
                   "content_updateDate": "Last edited",
                   "content_updateDateDesc": "Date/time this document was created",
                   "content_uploadClear": "Remove file",
-                  "content_urls": "Link to document",
+                  "content_urls": "Link",
                   "content_memberof": "Member of group(s)",
                   "content_notmemberof": "Not a member of group(s)",
                   "content_childItems": "Child items",
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
index be9024045e..ebc3336edb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
@@ -22,9 +22,7 @@
 			<umb-control-group label="@content_target">
 				<select class="umb-editor umb-dropdown" ng-model="target.target">
 					<option value=""></option>
-					<option value="_blank">Opens the linked document in a new window or tab</option>
-					<option value="_top">Opens the linked document in the full body of the window</option>
-					<option value="_parent">Opens the linked document in the parent frame</option>
+					<option value="_blank"><localize key="defaultdialogs_openInNewWindow">Opens the linked document in a new window or tab</localize></option>
 				</select>
 			</umb-control-group>
 		</umb-pane>
@@ -63,7 +61,9 @@
 	        		<localize key="general_cancel">Cancel</localize>
 				</a>
 
-				<a href ng-click="switchToMediaPicker()" class="btn">Link to file</a>
+	            <a href ng-click="switchToMediaPicker()" class="btn">
+                    <localize key="defaultdialogs_selectMedia">Select media</localize>
+	            </a>
 
 				<button
 					class="btn btn-primary"
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
index ed7f1e07a2..ac7828b91f 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
@@ -137,7 +137,7 @@
     <key alias="memberrole">Mitgliederrolle</key>
     <key alias="membertype">Mitglieder-Typ</key>
     <key alias="noDate">Kein Datum gewählt</key>
-    <key alias="nodeName">Name des Dokument</key>
+    <key alias="nodeName">Name des Link</key>
     <key alias="otherElements">Eigenschaften</key>
     <key alias="parentNotPublished">Dieses Dokument ist veröffentlicht aber nicht sichtbar, da das übergeordnete Dokument '%0%' nicht publiziert ist</key>
     <key alias="parentNotPublishedAnomaly">Ups! Dieses Dokument ist veröffentlicht aber nicht im internen Cache aufzufinden: Systemfehler.</key>
@@ -156,7 +156,7 @@
     <key alias="updateDate">Zuletzt bearbeitet am</key>
     <key alias="updateDateDesc" version="7.0">Letzter Änderungszeitpunkt des Dokuments</key>
     <key alias="uploadClear">Datei entfernen</key>
-    <key alias="urls">Link zum Dokument</key>
+    <key alias="urls">Link</key>
     <key alias="memberof">Mitglied der Gruppe(n)</key>
     <key alias="notmemberof">Kein Mitglied der Gruppe(n)</key>
     <key alias="childItems" version="7.0">Untergeordnete Elemente</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index bdc2647563..b08ef5ed5e 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -168,7 +168,7 @@
     <key alias="updateDate">Last edited</key>
     <key alias="updateDateDesc" version="7.0">Date/time this document was edited</key>
     <key alias="uploadClear">Remove file(s)</key>
-    <key alias="urls">Link to document</key>
+    <key alias="urls">Link</key>
     <key alias="memberof">Member of group(s)</key>
     <key alias="notmemberof">Not a member of group(s)</key>
     <key alias="childItems" version="7.0">Child items</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 7544cacc0c..8744a1b1e5 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -169,7 +169,7 @@
     <key alias="updateDate">Last edited</key>
     <key alias="updateDateDesc" version="7.0">Date/time this document was edited</key>
     <key alias="uploadClear">Remove file(s)</key>
-    <key alias="urls">Link to document</key>
+    <key alias="urls">Link</key>
     <key alias="memberof">Member of group(s)</key>
     <key alias="notmemberof">Not a member of group(s)</key>
     <key alias="childItems" version="7.0">Child items</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
index 09af60593f..61b2407f02 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
@@ -140,7 +140,7 @@
     <key alias="memberrole">Rol</key>
     <key alias="membertype">Tipo de miembro</key>
     <key alias="noDate">Sin fecha</key>
-    <key alias="nodeName">Título de la página</key>
+    <key alias="nodeName">Título del vínculo</key>
     <key alias="otherElements">Propiedades</key>
     <key alias="parentNotPublished">Este documento ha sido publicado pero no es visible porque el padre '%0%' no esta publicado</key>
     <key alias="parentNotPublishedAnomaly">Upss: este documento está publicado pero no está en la caché (error interno)</key>
@@ -158,7 +158,7 @@
     <key alias="updateDate">Última actualización</key>
     <key alias="updateDateDesc" version="7.0">Fecha/hora este documento fue modificado</key>
     <key alias="uploadClear">Eliminar archivo</key>
-    <key alias="urls">Vínculo al documento</key>
+    <key alias="urls">Vínculo</key>
     <key alias="memberof">Miembro de grupo(s)</key>
     <key alias="notmemberof">No es miembreo de grupo(s)</key>
     <key alias="childItems" version="7.0">Nodos hijo</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
index 39cafeef7f..80811b4bad 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
@@ -145,7 +145,7 @@
     <key alias="memberrole">Rôle</key>
     <key alias="membertype">Type de membre</key>
     <key alias="noDate">Aucune date choisie</key>
-    <key alias="nodeName">Titre de la page</key>
+    <key alias="nodeName">Titre du lien</key>
     <key alias="otherElements">Propriétés</key>
     <key alias="parentNotPublished">Ce document est publié mais n'est pas visible car son parent '%0%' n'est pas publié</key>
     <key alias="parentNotPublishedAnomaly">Oups : ce document est publié mais n'est pas présent dans le cache (erreur interne Umbraco)</key>
@@ -166,7 +166,7 @@
     <key alias="updateDate">Dernière édition</key>
     <key alias="updateDateDesc" version="7.0">Date/heure à laquelle ce document a été édité</key>
     <key alias="uploadClear">Supprimer le(s) fichier(s)</key>
-    <key alias="urls">Lien vers un document</key>
+    <key alias="urls">Lien</key>
     <key alias="memberof">Membre du/des groupe(s)</key>
     <key alias="notmemberof">Pas membre du/des groupe(s)</key>
     <key alias="childItems" version="7.0">Eléments enfants</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
index 8be7261a8d..1be0b9f95b 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
@@ -96,7 +96,7 @@
     <key alias="memberrole">Ruolo</key>
     <key alias="membertype">Tipologia Membro</key>
     <key alias="noDate"><![CDATA[La data non è stata selezionata]]></key>
-    <key alias="nodeName">Titolo della Pagina</key>
+    <key alias="nodeName">Titolo del Link</key>
     <key alias="otherElements"><![CDATA[Proprietà]]></key>
     <key alias="parentNotPublished"><![CDATA[Questo documento è pubblicato ma non è visibile perchè il padre '%0%' non è pubblicato]]></key>
     <key alias="publish">Pubblicato</key>
@@ -111,7 +111,7 @@
     <key alias="unPublish">Non pubblicare</key>
     <key alias="updateDate">Ultima modifica</key>
     <key alias="uploadClear">Rimuovi il file</key>
-    <key alias="urls">Link al documento</key>
+    <key alias="urls">Link</key>
   </area>
   <area alias="create">
     <key alias="chooseNode"><![CDATA[Dove vuoi creare il nuovo %0%]]></key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
index 2955ce716a..75d80a2956 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
@@ -140,7 +140,7 @@
     <key alias="memberrole">Rol</key>
     <key alias="membertype">Ledentype</key>
     <key alias="noDate">Geen datum gekozen</key>
-    <key alias="nodeName">Pagina Titel</key>
+    <key alias="nodeName">Link Titel</key>
     <key alias="otherElements">Eigenschappen</key>
     <key alias="parentNotPublished">Dit document is gepubliceerd maar niet zichtbaar omdat de bovenliggende node '%0%' niet gepubliceerd is</key>
     <key alias="parentNotPublishedAnomaly">Oeps: dit document is gepubliceerd, maar het is niet in de cache (interne serverfout)</key>
@@ -159,7 +159,7 @@
     <key alias="updateDate">Laatst gewijzigd</key>
     <key alias="updateDateDesc" version="7.0">Date/time this document was edited</key>
     <key alias="uploadClear">Bestand(en) verwijderen</key>
-    <key alias="urls">Link naar het document</key>
+    <key alias="urls">Link</key>
     <key alias="memberof">Lid van groep(en)</key>
     <key alias="notmemberof">Geen lid van groep(en)</key>
     

From 3ce3a6f6ea6101d6ea46b0e1e9f42a0b081e5f11 Mon Sep 17 00:00:00 2001
From: michael <michael@crossingpaths.be>
Date: Wed, 16 Nov 2016 13:23:56 +0100
Subject: [PATCH 002/145] Added files by mistake

---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2bf1e1c5dc..5b5e7660c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,5 +141,3 @@ build/docs.zip
 build/ui-docs.zip
 build/csharp-docs.zip
 build/msbuild.log
-/src/Umbraco.Web.UI/js/jquery.min.js
-/src/Umbraco.Web.UI/js/bootstrap.min.js

From 6be9a25d99736da416d06a317cedb691972663af Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Sat, 7 Jan 2017 01:24:32 +0100
Subject: [PATCH 003/145] new package.json to support gulp

---
 src/Umbraco.Web.UI.Client/package.json | 51 ++++++++++----------------
 1 file changed, 20 insertions(+), 31 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index d2af0e2b83..30060c3b7e 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -14,38 +14,27 @@
   "engines": {
     "node": ">= 0.8.4"
   },
+  "scripts": {
+    "install": "bower-installer",
+    "test": "karma start test/config/karma.conf.js --singlerun"
+  },
   "dependencies": {},
   "devDependencies": {
-    "autoprefixer-core": "~5.2.1",
-    "bower": "^1.4.1",
-    "eslint": "^0.23.0",
-    "eslint-plugin-angular": "0.0.13",
-    "grunt": "~0.4.0",
-    "grunt-bower": "^0.19.0",
-    "grunt-bower-install-simple": "^1.1.3",
-    "grunt-contrib-clean": "~0.4.0",
-    "grunt-contrib-concat": "~0.1.3",
-    "grunt-contrib-connect": "~0.3.0",
-    "grunt-contrib-copy": "~0.7.0",
-    "grunt-contrib-jshint": "~0.2.0",
-    "grunt-contrib-uglify": "~0.1.1",
-    "grunt-contrib-watch": "~0.3.1",
-    "grunt-eslint": "^15.0.0",
-    "grunt-html2js": "~0.1.0",
-    "grunt-hustler": "^4.0.6",
-    "grunt-karma": "~0.5",
-    "grunt-ngdocs": "~0.1.2",
-    "grunt-open": "~0.2.0",
-    "grunt-postcss": "~0.6.0",
-    "grunt-recess": "~0.3",
-    "karma": "~0.9",
-    "karma-chrome-launcher": "0.0.2",
-    "karma-coffee-preprocessor": "0.0.1",
-    "karma-firefox-launcher": "0.0.2",
-    "karma-jasmine": "0.0.1",
-    "karma-phantomjs-launcher": "0.0.2",
-    "karma-requirejs": "0.0.1",
-    "karma-script-launcher": "0.0.1",
-    "phantomjs": "~1.9.1-0"
+    "autoprefixer": "^6.5.0",
+    "bower-installer": "^1.2.0",
+    "cssnano": "^3.7.6",
+    "gulp": "^3.9.1",
+    "gulp-concat": "^2.6.0",
+    "gulp-less": "^3.1.0",
+    "gulp-postcss": "^6.2.0",
+    "gulp-rename": "^1.2.2",
+    "gulp-sourcemaps": "^1.6.0",
+    "gulp-watch": "^4.3.10",
+    "gulp-wrap": "^0.13.0",
+    "jasmine-core": "^2.5.2",
+    "karma": "^1.3.0",
+    "karma-jasmine": "^0.1.0",
+    "karma-phantomjs-launcher": "^1.0.2",
+    "lodash": "^4.16.3"
   }
 }

From 4a191f0711e1b680b8bf36b82566e1fd2353a483 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Sat, 7 Jan 2017 01:25:43 +0100
Subject: [PATCH 004/145] Rebuild bower.json to support bower-installer

removes most of the custom bower lib installing we had in gruntfile
---
 src/Umbraco.Web.UI.Client/bower.json | 49 ++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json
index 0f3eea3291..0e18f99b46 100644
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -25,9 +25,52 @@
     "jquery-migrate": "1.4.0",
     "angular-dynamic-locale": "0.1.28",
     "ng-file-upload": "~7.3.8",
-    "tinymce": "~4.1.10",
-    "codemirror": "~5.3.0",
     "angular-local-storage": "~0.2.3",
-    "moment": "~2.10.3"
+    "moment": "~2.10.3",
+    "ace-builds": "^1.2.3",
+    "tinymce": "tinymce-dist#^4.5.2"
+  },
+
+  "install": {
+    
+    "path": "lib-bower",
+
+    "sources": {
+      "moment": "bower_components/moment/min/moment-with-locales.js",
+      "underscore": [
+        "bower_components/underscore/underscore-min.js",
+        "bower_components/underscore/underscore-min.map"
+      ],
+
+      "jquery": [
+        "bower_components/jquery/dist/jquery.min.js",
+        "bower_components/jquery/dist/jquery.min.map"
+      ],
+      
+      "ace-builds": "bower_components/ace-builds/src-min-noconflict/**",
+      
+      "angular-dynamic-locale": [
+        "bower_components/angular-dynamic-locale/tmhDynamicLocale.min.js",
+        "bower_components/angular-dynamic-locale/tmhDynamicLocale.min.js.map"
+      ],
+
+      "angular-local-storage": [
+        "bower_components/angular-local-storage/dist/angular-local-storage.min.js",
+        "bower_components/angular-local-storage/dist/angular-local-storage.min.js.map"
+      ],
+
+      "tinymce": [
+        "bower_components/tinymce/tinymce.min.js"
+      ],
+
+      "typeahead.js": "bower_components/typeahead.js/dist/typeahead.bundle.min.js",
+
+      "rgrove-lazyload":"bower_components/rgrove-lazyload/lazyload.js",
+
+      "ng-file-upload":"bower_components/ng-file-upload/ng-file-upload.min.js",
+
+      "jquery-ui":"bower_components/jquery-ui/jquery-ui.min.js",
+      "jquery-migrate":"bower_components/jquery-migrate/jquery-migrate.min.js"
+    }
   }
 }

From 904265cdf5b3796fb7c6dd290fccc707b520551e Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Sat, 7 Jan 2017 01:26:13 +0100
Subject: [PATCH 005/145] replaces gruntfile with gulpfile

Meaner, faster, better
---
 src/Umbraco.Web.UI.Client/gulpfile.js | 196 ++++++++++++++++++++++++++
 1 file changed, 196 insertions(+)
 create mode 100644 src/Umbraco.Web.UI.Client/gulpfile.js

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
new file mode 100644
index 0000000000..6c7e581530
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -0,0 +1,196 @@
+var gulp = require('gulp');
+var watch = require("gulp-watch");
+var concat = require("gulp-concat");
+var rename = require("gulp-rename");
+var wrap = require("gulp-wrap");
+
+var _ = require("lodash");
+
+//Less + css
+var postcss = require('gulp-postcss');
+var less = require('gulp-less');
+var autoprefixer = require('autoprefixer');
+var cssnano = require('cssnano');
+
+
+/***************************************************************
+Helper functions
+***************************************************************/
+function processJs(files, out) {
+    console.log("Compiling JS:" + files + " to " + out);
+
+    return gulp.src(files)
+     .pipe(concat(out))
+     .pipe(wrap('(function(){\n"use strict";\n<%= contents %>\n})();'))
+     .pipe(gulp.dest(root + targets.js));
+}
+
+function processLess(files, out) {
+    console.log("Compiling LESS:" + files + " to " + out);
+
+    var processors = [
+         autoprefixer,
+         cssnano
+    ];
+
+    return gulp.src(files)
+        .pipe(less())
+        .pipe(postcss(processors))
+        .pipe(rename(out))
+        .pipe(gulp.dest(root + targets.css));
+}
+
+/***************************************************************
+Paths and destinations
+Each group is iterated automatically in the setup tasks below
+***************************************************************/
+var sources = {
+    
+    //less files used by backoffice and preview
+    //processed in the less task
+    less: {
+        installer: { files: ["src/less/installer.less"], out: "installer.css" },
+        preview: { files: ['src/less/canvas-designer.less', 'src/less/helveticons.less'], out: "canvasdesigner.css" },
+        umbraco: { files: ["src/less/belle.less"], out: "umbraco.css" }
+    },
+    
+    //js files for backoffie
+    //processed in the js task
+    js: {
+        preview: { files: ["src/canvasdesigner/**/*.js"], out: "umbraco.canvasdesigner.js" },
+        installer: { files: ["src/installer/**/*.js"], out: "umbraco.installer.js" },
+        
+        controllers: { files: ["src/views/**/*.controller.js"], out: "umbraco.controllers.js" },
+        directives: { files: ["src/common/directives/**/*.js"], out: "umbraco.directives.js" },
+        filters: { files: ["src/common/filters/**/*.js"], out: "umbraco.filters.js" },
+        resources: { files: ["src/common/resources/**/*.js"], out: "umbraco.resources.js" },
+        services: { files: ["src/common/services/**/*.js"], out: "umbraco.services.js" },
+        security: { files: ["src/common/security/**/*.js"], out: "umbraco.security.js" }
+    },
+
+    //selectors for copying all views into the build
+    //processed in the views task
+    views:{
+        umbraco: {files: ["src/views/**/*html"], folder: "/"},
+        preview: { files: ["src/canvasdesigner/**/*.html"], folder: "../preview"},
+        installer: {files: ["src/installer/steps/*.html"], folder: "/install"}
+    },
+
+    //globs for file-watching
+    globs:{
+        views: "src/views/**/*html",
+        less: "src/less*.less",
+        js: "src/*.js",
+        lib: "lib/**/*.*, lib-bower/**/*.*",
+        assets: "src/assets/**"    
+    }
+};
+
+var root = "../__BUILD/umbraco/";
+var targets = {
+    js: "js",
+    lib: "lib",
+    views: "views",
+    css: "assets/css",
+    assets: "assets"
+};
+
+
+/**************************
+ * Runs the default tasks for the project to prepare backoffice files
+ **************************/
+var defaultTasks = ["dependencies","js", "less", "views"];
+gulp.task("default", defaultTasks);
+
+
+/**************************
+ * Task processes and copies all dependencies, either installed by bower, npm or stored locally in the project
+ **************************/
+gulp.task('dependencies', function () { 
+
+    //bower component specific copy rules
+    //this is to patch the sometimes wonky rules these libs are distrbuted under
+
+    //Tinymce
+    gulp.src("bower_components/tinymce/plugins/**")
+        .pipe(gulp.dest(root + targets.lib + "/tinymce/plugins/"));
+
+    //font-awesome
+    gulp.src("bower_components/font-awesome/{fonts,css}/*")
+        .pipe(gulp.dest(root + targets.lib + "/font-awesome"));
+
+    //copy over libs which are not on bower (/lib) and 
+    //libraries that have been managed by bower-installer (/lib-bower)
+    gulp.src(sources.globs.lib)
+     .pipe(gulp.dest(root + targets.lib));
+
+    //Copies all static assets into /root / assets folder 
+    //css, fonts and image files
+    gulp.src(sources.globs.assets)
+        .pipe(gulp.dest(root + targets.assets));
+
+    // Copies all the less files related to the preview into their folder
+    //these are not pre-processed as preview has its own less combiler client side
+    gulp.src("src/canvasdesigner/editors/*.less")
+        .pipe(gulp.dest(root + targets.assets + "/less"));     
+});
+
+
+/**************************
+ * Copies all angular JS files into their seperate umbraco.*.js file
+ **************************/
+gulp.task('js', function () { 
+
+  gulp.src(sources.globs.js)
+     .pipe(gulp.dest(root + targets.js));
+
+    return _.forEach(sources.js, function (group) {
+        processJs(group.files, group.out);
+    });
+});
+
+gulp.task('less', function () {
+    
+    gulp.src(sources.globs.assets)
+     .pipe(gulp.dest(targets.assets));
+
+    return _.forEach(sources.less, function (group) {
+        processLess(group.files, group.out);
+    });
+});
+
+
+gulp.task('views', function () {
+
+    return _.forEach(sources.views, function (group) {
+        gulp.src(group.files)
+            .pipe(gulp.dest(root + targets.views + group.folder));
+    });
+   
+});
+
+
+gulp.task('watch', defaultTasks, function () {
+
+    //Setup a watcher for all groups of javascript files
+    _.forEach(sources.js, function (group) {
+        if(group.watch !== false){
+            watch(group.files, { ignoreInitial: true }, function () {
+                processJs(group.files, group.out);
+            });
+        }
+    });
+
+    //watch all less files and trigger the less task
+    watch(sources.globs.less, { ignoreInitial: true }, function () {
+        gulp.run(['less']);
+    });
+
+    //watch all views - copy single file changes
+    watch(sources.globs.views)
+        .pipe(gulp.dest(root + targets.views));
+
+    //watch all app js files that will not be merged - copy single file changes
+    watch(sources.globs.js)
+        .pipe(gulp.dest(root + targets.js));    
+});
\ No newline at end of file

From 4e9a8623f05e9160ee0a1a18c84a4a23b00342c5 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Sat, 7 Jan 2017 01:26:35 +0100
Subject: [PATCH 006/145] syntax issue in eslintrc

---
 src/Umbraco.Web.UI.Client/.eslintrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/.eslintrc b/src/Umbraco.Web.UI.Client/.eslintrc
index 811fabdabf..205d8dcf50 100644
--- a/src/Umbraco.Web.UI.Client/.eslintrc
+++ b/src/Umbraco.Web.UI.Client/.eslintrc
@@ -39,7 +39,7 @@
     "globals": {
         "angular": false,
         "_": false,
-        "$", false,
+        "$": false,
         "tinymce": false,
         "tinyMCE": false,
         "FileReader": false,
@@ -47,7 +47,7 @@
         "window": false,
         "LazyLoad": false,
         "ActiveXObject": false,
-        "Bloodhound", false
+        "Bloodhound": false
     }
 
 }
\ No newline at end of file

From ee9deacf92d3263f2f87b9c0e2d31dac9e3a01cd Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Sat, 7 Jan 2017 01:26:47 +0100
Subject: [PATCH 007/145] ignore lib-bower temp folder

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 16994e0ab1..7465b3c452 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,6 +71,7 @@ src/Umbraco.Web.UI/[Ww]eb.config
 webpihash.txt
 
 node_modules
+lib-bower
 
 src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*

From cc3355b1f984b390f481c4e4584da183e6dfdb4f Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Sat, 7 Jan 2017 01:27:26 +0100
Subject: [PATCH 008/145] fixes issues with bootstrap2 navbar and less2 syntax

---
 src/Umbraco.Web.UI.Client/lib/bootstrap/less/navbar.less | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/navbar.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/navbar.less
index a448255731..b4e1edf65f 100644
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/navbar.less
+++ b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/navbar.less
@@ -193,10 +193,10 @@
 
 // Reset container width
 // Required here as we reset the width earlier on and the grid mixins don't override early enough
-.navbar-static-top .container,
+.navbar-static-top .container,  
 .navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  #grid > .core > .span(@gridColumns);
+.navbar-fixed-bottom .container { 
+width: (@gridColumnWidth * @gridColumns) + (@gridGutterWidth * (@gridColumns - 1));
 }
 
 // Fixed to top

From 7e930330e2acd932dc410a35f8748937147d68c2 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Sat, 7 Jan 2017 01:27:59 +0100
Subject: [PATCH 009/145] fixes karma testing config - now runs with "npm test"
 command instead

---
 .../test/config/karma.conf.js                 | 44 +++++++++----------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
index ede7c20538..e5198e9caa 100644
--- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
+++ b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
@@ -1,5 +1,7 @@
-module.exports = function(karma) {
-  karma.configure({
+module.exports = function(config) {
+
+   config.set({
+
     // base path, that will be used to resolve files and exclude
     basePath: '../..',
 
@@ -7,40 +9,36 @@ module.exports = function(karma) {
 
     // list of files / patterns to load in the browser
     files: [
-        'lib/../build/belle/lib/jquery/jquery.min.js',
+
+        //libraries
+        'lib-bower/jquery/jquery.min.js',
         'lib/angular/1.1.5/angular.js',
         'lib/angular/1.1.5/angular-cookies.min.js',
         'lib/angular/1.1.5/angular-mocks.js',
         'lib/angular/angular-ui-sortable.js',
-        
-        /*
-        For angular 1.2:
-         'lib/angular/1.2/angular.js',
-         'lib/angular/1.2/angular-route.min.js',
-         'lib/angular/1.2/angular-touch.min.js',
-         'lib/angular/1.2/angular-cookies.min.js',
-         'lib/angular/1.2/angular-animate.min.js',
-         'lib/angular/1.2/angular-mocks.js',*/
-         
-
-         'lib/../build/belle/lib/underscore/underscore-min.js',
-         'lib/../build/belle/lib/moment/moment-with-locales.js',
+        'lib-bower/underscore/underscore-min.js',
+         'lib-bower/moment/moment-with-locales.js',
          'lib/umbraco/Extensions.js', 
-         'lib/../build/belle/lib/rgrove-lazyload/lazyload.js',
-         'lib/../build/belle/lib/angular-local-storage/angular-local-storage.min.js',
+         'lib-bower/rgrove-lazyload/lazyload.js',
+         'lib-bower//angular-local-storage/angular-local-storage.min.js',
 
+         //app bootstrap and loader
          'test/config/app.unit.js',
-         'src/common/mocks/umbraco.servervariables.js',
 
+         //application files
          'src/common/directives/*.js',
          'src/common/filters/*.js',
          'src/common/services/*.js',
          'src/common/security/*.js',
          'src/common/resources/*.js',
-         'src/common/mocks/**/*.js',
          'src/views/**/*.controller.js',
-         'test/unit/**/*.spec.js',
-        {pattern: 'lib/**/*.js', watched: true, served: true, included: false}       
+
+         //mocked data and routing
+         'src/common/mocks/umbraco.servervariables.js',
+         'src/common/mocks/**/*.js',
+
+         //tests
+         'test/unit/**/*.spec.js'     
     ],
 
     // list of files to exclude
@@ -66,7 +64,7 @@ module.exports = function(karma) {
     // level of logging
     // possible values: karma.LOG_DISABLE || karma.LOG_ERROR || karma.LOG_WARN || karma.LOG_INFO || karma.LOG_DEBUG
     // CLI --log-level debug
-    logLevel: karma.LOG_INFO,
+    logLevel: config.LOG_WARN,
 
     // enable / disable watching file and executing tests whenever any file changes
     // CLI --auto-watch --no-auto-watch

From 1e34570a1f1d14ed00cc452e4b0a8c1c2a76bde6 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Sat, 7 Jan 2017 01:28:16 +0100
Subject: [PATCH 010/145] consistent naming for canvasdesigner js file

---
 src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js b/src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
index 59d5a4bef5..eefb5beed6 100644
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
+++ b/src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
@@ -11,8 +11,7 @@ LazyLoad.js([
       '../js/umbraco.security.js',
       '../ServerVariables',
       '../lib/spectrum/spectrum.js',
-
-      '../js/canvasdesigner.panel.js',
+      '../js/umbraco.canvasdesigner.js',
 ], function () {
     jQuery(document).ready(function () {
         angular.bootstrap(document, ['Umbraco.canvasdesigner']);

From 5cee5a27c95b2ab974c4eec73bd62d2bab40be10 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Mon, 9 Jan 2017 15:26:05 +0100
Subject: [PATCH 011/145] Wraps tasks in a merge-stream

This ensures proper timing and feedback of tasks
---
 src/Umbraco.Web.UI.Client/gulpfile.js  | 143 +++++++++++++++++--------
 src/Umbraco.Web.UI.Client/package.json |   3 +-
 2 files changed, 102 insertions(+), 44 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index 6c7e581530..a2b6983c6a 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -1,10 +1,12 @@
 var gulp = require('gulp');
-var watch = require("gulp-watch");
-var concat = require("gulp-concat");
-var rename = require("gulp-rename");
-var wrap = require("gulp-wrap");
+var watch = require('gulp-watch');
+var concat = require('gulp-concat');
+var rename = require('gulp-rename');
+var wrap = require('gulp-wrap');
+
+var _ = require('lodash');
+var MergeStream = require('merge-stream');
 
-var _ = require("lodash");
 
 //Less + css
 var postcss = require('gulp-postcss');
@@ -17,17 +19,17 @@ var cssnano = require('cssnano');
 Helper functions
 ***************************************************************/
 function processJs(files, out) {
-    console.log("Compiling JS:" + files + " to " + out);
-
+    
     return gulp.src(files)
      .pipe(concat(out))
      .pipe(wrap('(function(){\n"use strict";\n<%= contents %>\n})();'))
      .pipe(gulp.dest(root + targets.js));
+
+     console.log(out + " compiled");
 }
 
 function processLess(files, out) {
-    console.log("Compiling LESS:" + files + " to " + out);
-
+   
     var processors = [
          autoprefixer,
          cssnano
@@ -38,6 +40,8 @@ function processLess(files, out) {
         .pipe(postcss(processors))
         .pipe(rename(out))
         .pipe(gulp.dest(root + targets.css));
+    
+    console.log(out + " compiled");
 }
 
 /***************************************************************
@@ -60,7 +64,7 @@ var sources = {
         preview: { files: ["src/canvasdesigner/**/*.js"], out: "umbraco.canvasdesigner.js" },
         installer: { files: ["src/installer/**/*.js"], out: "umbraco.installer.js" },
         
-        controllers: { files: ["src/views/**/*.controller.js"], out: "umbraco.controllers.js" },
+        controllers: { files: ["src/{views,controllers}/**/*.controller.js"], out: "umbraco.controllers.js" },
         directives: { files: ["src/common/directives/**/*.js"], out: "umbraco.directives.js" },
         filters: { files: ["src/common/filters/**/*.js"], out: "umbraco.filters.js" },
         resources: { files: ["src/common/resources/**/*.js"], out: "umbraco.resources.js" },
@@ -111,28 +115,43 @@ gulp.task('dependencies', function () {
     //bower component specific copy rules
     //this is to patch the sometimes wonky rules these libs are distrbuted under
 
+    //as we do multiple things in this task, we merge the multiple streams
+    var stream = new MergeStream();
+
     //Tinymce
-    gulp.src("bower_components/tinymce/plugins/**")
-        .pipe(gulp.dest(root + targets.lib + "/tinymce/plugins/"));
+    stream.add(
+            gulp.src("bower_components/tinymce/plugins/**")
+                .pipe(gulp.dest(root + targets.lib + "/tinymce/plugins/"))
+        );
 
     //font-awesome
-    gulp.src("bower_components/font-awesome/{fonts,css}/*")
-        .pipe(gulp.dest(root + targets.lib + "/font-awesome"));
+    stream.add(
+            gulp.src("bower_components/font-awesome/{fonts,css}/*")
+                .pipe(gulp.dest(root + targets.lib + "/font-awesome"))
+        );
 
     //copy over libs which are not on bower (/lib) and 
     //libraries that have been managed by bower-installer (/lib-bower)
-    gulp.src(sources.globs.lib)
-     .pipe(gulp.dest(root + targets.lib));
+    stream.add(
+         gulp.src(sources.globs.lib)
+            .pipe(gulp.dest(root + targets.lib))
+        );
 
     //Copies all static assets into /root / assets folder 
     //css, fonts and image files
-    gulp.src(sources.globs.assets)
-        .pipe(gulp.dest(root + targets.assets));
+    stream.add( 
+            gulp.src(sources.globs.assets)
+                .pipe(gulp.dest(root + targets.assets))
+        );
 
     // Copies all the less files related to the preview into their folder
     //these are not pre-processed as preview has its own less combiler client side
-    gulp.src("src/canvasdesigner/editors/*.less")
-        .pipe(gulp.dest(root + targets.assets + "/less"));     
+    stream.add( 
+            gulp.src("src/canvasdesigner/editors/*.less")
+                .pipe(gulp.dest(root + targets.assets + "/less"))
+        );
+
+    return stream;
 });
 
 
@@ -140,57 +159,95 @@ gulp.task('dependencies', function () {
  * Copies all angular JS files into their seperate umbraco.*.js file
  **************************/
 gulp.task('js', function () { 
+  
+    //we run multiple streams, so merge them all together
+    var stream = new MergeStream();
 
-  gulp.src(sources.globs.js)
-     .pipe(gulp.dest(root + targets.js));
+    stream.add(
+        gulp.src(sources.globs.js)
+            .pipe(gulp.dest(root + targets.js))
+        );
 
-    return _.forEach(sources.js, function (group) {
-        processJs(group.files, group.out);
-    });
+     _.forEach(sources.js, function (group) {
+        stream.add (processJs(group.files, group.out) );
+     });
+
+     return stream;
 });
 
 gulp.task('less', function () {
     
-    gulp.src(sources.globs.assets)
-     .pipe(gulp.dest(targets.assets));
+    var stream = new MergeStream();
 
-    return _.forEach(sources.less, function (group) {
-        processLess(group.files, group.out);
+    _.forEach(sources.less, function (group) {
+        stream.add( processLess(group.files, group.out) );
     });
+
+    return stream;
 });
 
 
 gulp.task('views', function () {
 
-    return _.forEach(sources.views, function (group) {
-        gulp.src(group.files)
-            .pipe(gulp.dest(root + targets.views + group.folder));
+    var stream = new MergeStream();
+
+    _.forEach(sources.views, function (group) {
+
+        stream.add (
+            gulp.src(group.files)
+                .pipe(gulp.dest(root + targets.views + group.folder))
+        );
+    
     });
    
+    return stream;
 });
 
 
 gulp.task('watch', defaultTasks, function () {
 
+    var stream = new MergeStream();
+
     //Setup a watcher for all groups of javascript files
     _.forEach(sources.js, function (group) {
+
         if(group.watch !== false){
-            watch(group.files, { ignoreInitial: true }, function () {
-                processJs(group.files, group.out);
-            });
+
+            stream.add( 
+
+                watch(group.files, { ignoreInitial: true }, function (file) {
+
+                    console.info(file.path + " has changed, added to:  " + group.out);
+                    processJs(group.files, group.out);
+                
+                })
+
+            );
+
         }
+
     });
 
-    //watch all less files and trigger the less task
-    watch(sources.globs.less, { ignoreInitial: true }, function () {
-        gulp.run(['less']);
-    });
+    stream.add( 
+        //watch all less files and trigger the less task
+        watch(sources.globs.less, { ignoreInitial: true }, function () {
+            gulp.run(['less']);
+        })
+
+    );
+
 
     //watch all views - copy single file changes
-    watch(sources.globs.views)
-        .pipe(gulp.dest(root + targets.views));
+    stream.add( 
+        watch(sources.globs.views)
+        .pipe(gulp.dest(root + targets.views))
+    );
 
     //watch all app js files that will not be merged - copy single file changes
-    watch(sources.globs.js)
-        .pipe(gulp.dest(root + targets.js));    
+    stream.add( 
+        watch(sources.globs.js)
+        .pipe(gulp.dest(root + targets.js))
+    );
+
+    return stream;    
 });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 30060c3b7e..b9b88090ee 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -35,6 +35,7 @@
     "karma": "^1.3.0",
     "karma-jasmine": "^0.1.0",
     "karma-phantomjs-launcher": "^1.0.2",
-    "lodash": "^4.16.3"
+    "lodash": "^4.16.3",
+    "merge-stream": "^1.0.1"
   }
 }

From 7c9476ca41de36b5e20d32af48dde91f36aa0af0 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Mon, 9 Jan 2017 15:27:05 +0100
Subject: [PATCH 012/145] Sets the correct root dir for compiling files

---
 src/Umbraco.Web.UI.Client/gulpfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index a2b6983c6a..0be14c1b08 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -90,7 +90,7 @@ var sources = {
     }
 };
 
-var root = "../__BUILD/umbraco/";
+var root = "../Umbraco.Web.UI/umbraco/";
 var targets = {
     js: "js",
     lib: "lib",

From a68eb91c145e6fbab0fa3e1b921ccf09a91fa242 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Tue, 10 Jan 2017 14:58:46 +0100
Subject: [PATCH 013/145] update buildbell.bat file to use gulp

---
 build/BuildBelle.bat | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build/BuildBelle.bat b/build/BuildBelle.bat
index 8a07ee380a..7fb1725cb2 100644
--- a/build/BuildBelle.bat
+++ b/build/BuildBelle.bat
@@ -25,9 +25,8 @@ CD %CD%\..\src\Umbraco.Web.UI.Client\
 ECHO Do npm install and the grunt build of Belle
 call npm cache clean --quiet
 call npm install --quiet
-call npm install -g grunt-cli --quiet
-call npm install -g bower --quiet
-call grunt build --buildversion=%release%
+call npm install -g gulp-cli --quiet
+call gulp --buildversion=%release%
 
 ECHO Move back to the build folder
 CD %buildFolder% 
\ No newline at end of file

From 1757e7b4c86103cdd6ea569e8e4d1b6389bd8ede Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Mon, 16 Jan 2017 14:53:07 +0100
Subject: [PATCH 014/145] Update gulpfile and buildbelle file

Should now have the right paths for running it from VS
---
 build/BuildBelle.bat                  |  2 +-
 src/Umbraco.Web.UI.Client/gulpfile.js | 42 +++++++++++++++------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/build/BuildBelle.bat b/build/BuildBelle.bat
index 7fb1725cb2..fe06f81587 100644
--- a/build/BuildBelle.bat
+++ b/build/BuildBelle.bat
@@ -26,7 +26,7 @@ ECHO Do npm install and the grunt build of Belle
 call npm cache clean --quiet
 call npm install --quiet
 call npm install -g gulp-cli --quiet
-call gulp --buildversion=%release%
+call gulp
 
 ECHO Move back to the build folder
 CD %buildFolder% 
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index 0be14c1b08..644adfc718 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -75,28 +75,29 @@ var sources = {
     //selectors for copying all views into the build
     //processed in the views task
     views:{
-        umbraco: {files: ["src/views/**/*html"], folder: "/"},
+        umbraco: {files: ["src/views/**/*html"], folder: ""},
         preview: { files: ["src/canvasdesigner/**/*.html"], folder: "../preview"},
-        installer: {files: ["src/installer/steps/*.html"], folder: "/install"}
+        installer: {files: ["src/installer/steps/*.html"], folder: "install"}
     },
 
     //globs for file-watching
     globs:{
-        views: "src/views/**/*html",
-        less: "src/less*.less",
-        js: "src/*.js",
-        lib: "lib/**/*.*, lib-bower/**/*.*",
-        assets: "src/assets/**"    
+        views: "./src/views/**/*.html",
+        less: "./src/less/**/*.less",
+        js: "./src/*.js",
+        lib: "./lib/**/*",
+        bower: "./lib-bower/**/*",
+        assets: "./src/assets/**"    
     }
 };
 
-var root = "../Umbraco.Web.UI/umbraco/";
+var root = "../Umbraco.Web.UI/Umbraco/";
 var targets = {
-    js: "js",
-    lib: "lib",
-    views: "views",
-    css: "assets/css",
-    assets: "assets"
+    js: "js/",
+    lib: "lib/",
+    views: "views/",
+    css: "assets/css/",
+    assets: "assets/"
 };
 
 
@@ -120,13 +121,13 @@ gulp.task('dependencies', function () {
 
     //Tinymce
     stream.add(
-            gulp.src("bower_components/tinymce/plugins/**")
+            gulp.src("./bower_components/tinymce/plugins/**")
                 .pipe(gulp.dest(root + targets.lib + "/tinymce/plugins/"))
         );
 
     //font-awesome
     stream.add(
-            gulp.src("bower_components/font-awesome/{fonts,css}/*")
+            gulp.src("./bower_components/font-awesome/{fonts,css}/*")
                 .pipe(gulp.dest(root + targets.lib + "/font-awesome"))
         );
 
@@ -137,6 +138,11 @@ gulp.task('dependencies', function () {
             .pipe(gulp.dest(root + targets.lib))
         );
 
+    stream.add(
+         gulp.src(sources.globs.bower)
+            .pipe(gulp.dest(root + targets.lib))
+        );
+
     //Copies all static assets into /root / assets folder 
     //css, fonts and image files
     stream.add( 
@@ -193,9 +199,11 @@ gulp.task('views', function () {
 
     _.forEach(sources.views, function (group) {
 
+        console.log("copying " + group.files + " to " + root + targets.views + group.folder)
+
         stream.add (
             gulp.src(group.files)
-                .pipe(gulp.dest(root + targets.views + group.folder))
+                .pipe( gulp.dest(root + targets.views + group.folder) )
         );
     
     });
@@ -233,10 +241,8 @@ gulp.task('watch', defaultTasks, function () {
         watch(sources.globs.less, { ignoreInitial: true }, function () {
             gulp.run(['less']);
         })
-
     );
 
-
     //watch all views - copy single file changes
     stream.add( 
         watch(sources.globs.views)

From 21f003e705586dc2aea4f981cc939a61c7ee04ca Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Fri, 5 May 2017 12:26:04 +0200
Subject: [PATCH 015/145] clean up ace builds

---
 src/Umbraco.Web.UI.Client/bower.json  |  2 --
 src/Umbraco.Web.UI.Client/gulpfile.js | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json
index 0e18f99b46..ba76c249b2 100644
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -47,8 +47,6 @@
         "bower_components/jquery/dist/jquery.min.map"
       ],
       
-      "ace-builds": "bower_components/ace-builds/src-min-noconflict/**",
-      
       "angular-dynamic-locale": [
         "bower_components/angular-dynamic-locale/tmhDynamicLocale.min.js",
         "bower_components/angular-dynamic-locale/tmhDynamicLocale.min.js.map"
diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index 644adfc718..96b24a7cec 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -130,6 +130,22 @@ gulp.task('dependencies', function () {
             gulp.src("./bower_components/font-awesome/{fonts,css}/*")
                 .pipe(gulp.dest(root + targets.lib + "/font-awesome"))
         );
+    
+    // ace Editor
+    stream.add(
+            gulp.src(["bower_components/ace-builds/src-min-noconflict/ace.js",
+        "bower_components/ace-builds/src-min-noconflict/ext-language_tools.js",
+        "bower_components/ace-builds/src-min-noconflict/ext-searchbox.js",
+        "bower_components/ace-builds/src-min-noconflict/ext-settings_menu.js",
+        "bower_components/ace-builds/src-min-noconflict/snippets/text.js",
+        "bower_components/ace-builds/src-min-noconflict/snippets/javascript.js",
+        "bower_components/ace-builds/src-min-noconflict/theme-chrome.js",
+        "bower_components/ace-builds/src-min-noconflict/mode-razor.js",
+        "bower_components/ace-builds/src-min-noconflict/mode-javascript.js",
+        "bower_components/ace-builds/src-min-noconflict/worker-javascript.js"],
+        {base: "./bower_components/ace-builds/"})
+            .pipe(gulp.dest(root + targets.lib + "/ace-builds"))
+        );
 
     //copy over libs which are not on bower (/lib) and 
     //libraries that have been managed by bower-installer (/lib-bower)

From 229a15be4fec037cb0bc5909f7c1b5e0fbe0a0ee Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Fri, 5 May 2017 13:10:40 +0200
Subject: [PATCH 016/145] add nonodes to gulp

---
 src/Umbraco.Web.UI.Client/gulpfile.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index 96b24a7cec..e3433d99ad 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -54,10 +54,11 @@ var sources = {
     //processed in the less task
     less: {
         installer: { files: ["src/less/installer.less"], out: "installer.css" },
+        nonodes: { files: ["src/less/pages/nonodes.less"], out: "nonodes.style.min.css"},
         preview: { files: ['src/less/canvas-designer.less', 'src/less/helveticons.less'], out: "canvasdesigner.css" },
         umbraco: { files: ["src/less/belle.less"], out: "umbraco.css" }
     },
-    
+
     //js files for backoffie
     //processed in the js task
     js: {

From 631a9f92eaa1281a96942bca960cde481d1817bd Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Fri, 5 May 2017 14:19:37 +0200
Subject: [PATCH 017/145] fix merge bug + add ignore list

---
 src/Umbraco.Web.UI.Client/bower.json | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json
index 15311b645f..b539217338 100644
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -30,13 +30,19 @@
     "angular-local-storage": "~0.2.3",
     "moment": "~2.10.3",
     "ace-builds": "^1.2.3",
-    "tinymce": "tinymce-dist#^4.5.2"
+    "font-awesome": "~4.2"
   },
 
   "install": {
-    
+
     "path": "lib-bower",
 
+    "ignore": [
+      "font-awesome",
+      "angular",
+      "bootstrap"
+    ],
+    
     "sources": {
       "moment": "bower_components/moment/min/moment-with-locales.js",
       "underscore": [

From 24d9c60bdf2b799093a9154d89811f4e5a50ab4f Mon Sep 17 00:00:00 2001
From: Brian Powell <bpowell@bitmapped.net>
Date: Thu, 1 Jun 2017 21:59:31 -0400
Subject: [PATCH 018/145] Update fonts and stylesheet to include table icons
 missing per U4-9977

---
 .../tinymce/skins/umbraco/fonts/icomoon.eot   |  Bin 8196 -> 0 bytes
 .../tinymce/skins/umbraco/fonts/icomoon.svg   |  150 -
 .../tinymce/skins/umbraco/fonts/icomoon.ttf   |  Bin 8032 -> 0 bytes
 .../tinymce/skins/umbraco/fonts/icomoon.woff  |  Bin 8340 -> 0 bytes
 .../lib/tinymce/skins/umbraco/fonts/readme.md |    2 +-
 .../skins/umbraco/fonts/tinymce-small.eot     |  Bin 0 -> 9492 bytes
 .../skins/umbraco/fonts/tinymce-small.json    | 1277 ++++++
 .../skins/umbraco/fonts/tinymce-small.svg     |   63 +
 .../skins/umbraco/fonts/tinymce-small.ttf     |  Bin 0 -> 9304 bytes
 .../skins/umbraco/fonts/tinymce-small.woff    |  Bin 0 -> 9380 bytes
 .../tinymce/skins/umbraco/fonts/tinymce.eot   |  Bin 0 -> 17572 bytes
 .../tinymce/skins/umbraco/fonts/tinymce.json  | 3469 +++++++++++++++++
 .../tinymce/skins/umbraco/fonts/tinymce.svg   |  131 +
 .../tinymce/skins/umbraco/fonts/tinymce.ttf   |  Bin 0 -> 17408 bytes
 .../tinymce/skins/umbraco/fonts/tinymce.woff  |  Bin 0 -> 17484 bytes
 .../lib/tinymce/skins/umbraco/skin.min.css    |    2 +-
 16 files changed, 4942 insertions(+), 152 deletions(-)
 delete mode 100755 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/icomoon.eot
 delete mode 100755 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/icomoon.svg
 delete mode 100755 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/icomoon.ttf
 delete mode 100755 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/icomoon.woff
 create mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.eot
 create mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.json
 create mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.svg
 create mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.ttf
 create mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.woff
 create mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.eot
 create mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.json
 create mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.svg
 create mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.ttf
 create mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.woff

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/icomoon.eot b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/icomoon.eot
deleted file mode 100755
index 0350809a8c6b0e7570cbd2d40678b9b8d2f35dd9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
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
L@*{>Dzc2p}lK$2K

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/icomoon.svg b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/icomoon.svg
deleted file mode 100755
index 92a12b2740..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/icomoon.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG font generated by IcoMoon.
-<iconset grid="16"></iconset>
-</metadata>
-<defs>
-<font id="icomoon" horiz-adv-x="512" >
-<font-face units-per-em="512" ascent="480" descent="-32" />
-<missing-glyph horiz-adv-x="512" />
-<glyph unicode="&#xe034;" d="M 464.00,416.00L 256.00,416.00L 240.00,448.00L 64.00,448.00L 32.00,384.00L 480.00,384.00 zM 452.17,128.00l 37.43,0.00 L 512.00,352.00L0.00,352.00 l 32.00-320.00l 242.04,0.00 C 221.599,50.888, 184.00,101.133, 184.00,160.00c0.00,74.991, 61.009,136.00, 136.00,136.00
-	c 74.99,0.00, 136.00-61.009, 136.00-136.00C 456.00,149.161, 454.689,138.425, 452.17,128.00zM 501.498,23.125l-99.248,87.346C 410.977,124.931, 416.00,141.878, 416.00,160.00c0.00,53.02-42.98,96.00-96.00,96.00s-96.00-42.98-96.00-96.00
-	s 42.98-96.00, 96.00-96.00c 18.122,0.00, 35.069,5.023, 49.529,13.75l 87.346-99.248c 11.481-13.339, 31.059-14.07, 43.503-1.626l 2.746,2.746
-	C 515.568-7.934, 514.837,11.644, 501.498,23.125z M 320.00,98.00c-34.242,0.00-62.00,27.758-62.00,62.00s 27.758,62.00, 62.00,62.00s 62.00-27.758, 62.00-62.00
-	S 354.242,98.00, 320.00,98.00z" />
-<glyph unicode="&#xe032;" d="M 384.00,352.00L 416.00,352.00L 416.00,320.00L 384.00,320.00zM 320.00,288.00L 352.00,288.00L 352.00,256.00L 320.00,256.00zM 320.00,224.00L 352.00,224.00L 352.00,192.00L 320.00,192.00zM 320.00,160.00L 352.00,160.00L 352.00,128.00L 320.00,128.00zM 256.00,224.00L 288.00,224.00L 288.00,192.00L 256.00,192.00zM 256.00,160.00L 288.00,160.00L 288.00,128.00L 256.00,128.00zM 192.00,160.00L 224.00,160.00L 224.00,128.00L 192.00,128.00zM 384.00,288.00L 416.00,288.00L 416.00,256.00L 384.00,256.00zM 384.00,224.00L 416.00,224.00L 416.00,192.00L 384.00,192.00zM 384.00,160.00L 416.00,160.00L 416.00,128.00L 384.00,128.00zM 384.00,96.00L 416.00,96.00L 416.00,64.00L 384.00,64.00zM 320.00,96.00L 352.00,96.00L 352.00,64.00L 320.00,64.00zM 256.00,96.00L 288.00,96.00L 288.00,64.00L 256.00,64.00zM 192.00,96.00L 224.00,96.00L 224.00,64.00L 192.00,64.00zM 128.00,96.00L 160.00,96.00L 160.00,64.00L 128.00,64.00z"  />
-<glyph unicode="&#xe031;" d="M 416.00,352.00l-96.00,0.00 L 320.00,384.00 L 224.00,480.00L0.00,480.00 l0.00-384.00 l 192.00,0.00 l0.00-128.00 l 320.00,0.00 L 512.00,256.00 L 416.00,352.00z M 416.00,306.745L 466.745,256.00L 416.00,256.00 L 416.00,306.745 z M 224.00,434.745L 274.745,384.00L 224.00,384.00 
-	L 224.00,434.745 z M 32.00,448.00l 160.00,0.00 l0.00-96.00 l 96.00,0.00 l0.00-224.00 L 32.00,128.00 L 32.00,448.00 z M 480.00,0.00L 224.00,0.00 l0.00,96.00 l 96.00,0.00 L 320.00,320.00 l 64.00,0.00 l0.00-96.00 l 96.00,0.00 L 480.00,0.00 z"  />
-<glyph unicode="&#xe030;" d="M 128.00,448.00 L 384.00,448.00 L 384.00,384.00 L 320.00,384.00 L 320.00,0.00 L 256.00,0.00 L 256.00,384.00 L 192.00,384.00 L 192.00,0.00 L 128.00,0.00 L 128.00,224.00 C 66.144,224.00 16.00,274.144 16.00,336.00 C 16.00,397.856 66.144,448.00 128.00,448.00 ZM 480.00,32.00L 352.00,144.00L 480.00,256.00 z"  />
-<glyph unicode="&#xe02f;" d="M 224.00,448.00 L 480.00,448.00 L 480.00,384.00 L 416.00,384.00 L 416.00,0.00 L 352.00,0.00 L 352.00,384.00 L 288.00,384.00 L 288.00,0.00 L 224.00,0.00 L 224.00,224.00 C 162.144,224.00 112.00,274.144 112.00,336.00 C 112.00,397.856 162.144,448.00 224.00,448.00 ZM 32.00,256.00L 160.00,144.00L 32.00,32.00 z"  />
-<glyph unicode="&#xe02e;" d="M 192.00,448.00 L 448.00,448.00 L 448.00,384.00 L 384.00,384.00 L 384.00,0.00 L 320.00,0.00 L 320.00,384.00 L 256.00,384.00 L 256.00,0.00 L 192.00,0.00 L 192.00,224.00 C 130.144,224.00 80.00,274.144 80.00,336.00 C 80.00,397.856 130.144,448.00 192.00,448.00 Z"  />
-<glyph unicode="&#xe02d;" d="M 365.71,221.482 C 397.67,197.513 416.00,163.439 416.00,128.00 C 416.00,92.561 397.67,58.487 365.71,34.518 C 336.031,12.259 297.068,0.00 256.00,0.00 C 214.931,0.00 175.969,12.259 146.29,34.518 C 114.33,58.487 96.00,92.561 96.00,128.00 L 160.00,128.00 C 160.00,93.309 203.963,64.00 256.00,64.00 C 308.037,64.00 352.00,93.309 352.00,128.00 C 352.00,162.691 308.037,192.00 256.00,192.00 C 214.931,192.00 175.969,204.259 146.29,226.518 C 114.33,250.488 96.00,284.561 96.00,320.00 C 96.00,355.439 114.33,389.512 146.29,413.482 C 175.969,435.741 214.931,448.00 256.00,448.00 C 297.068,448.00 336.031,435.741 365.71,413.482 C 397.67,389.512 416.00,355.439 416.00,320.00 L 352.00,320.00 C 352.00,354.691 308.037,384.00 256.00,384.00 C 203.963,384.00 160.00,354.691 160.00,320.00 C 160.00,285.309 203.963,256.00 256.00,256.00 C 297.068,256.00 336.031,243.741 365.71,221.482 ZM0.00,224.00L 512.00,224.00L 512.00,192.00L0.00,192.00z"  />
-<glyph unicode="&#xe02c;" d="M 352.00,448.00 L 416.00,448.00 L 416.00,240.00 C 416.00,160.471 344.366,96.00 256.00,96.00 C 167.635,96.00 96.00,160.471 96.00,240.00 L 96.00,448.00 L 160.00,448.00 L 160.00,240.00 C 160.00,219.917 169.119,200.648 185.677,185.747 C 204.125,169.145 229.10,160.00 256.00,160.00 C 282.90,160.00 307.875,169.145 326.323,185.747 C 342.881,200.648 352.00,219.917 352.00,240.00 L 352.00,448.00 ZM 96.00,64.00L 416.00,64.00L 416.00,0.00L 96.00,0.00z"  />
-<glyph unicode="&#xe02b;" d="M 448.00,448.00 L 448.00,416.00 L 384.00,416.00 L 224.00,32.00 L 288.00,32.00 L 288.00,0.00 L 64.00,0.00 L 64.00,32.00 L 128.00,32.00 L 288.00,416.00 L 224.00,416.00 L 224.00,448.00 Z"  />
-<glyph unicode="&#xe02a;" d="M 353.94,237.674C 372.689,259.945, 384.00,288.678, 384.00,320.00c0.00,70.58-57.421,128.00-128.00,128.00l-64.00,0.00 l-64.00,0.00 L 96.00,448.00 l0.00-448.00 l 32.00,0.00 l 64.00,0.00 l 96.00,0.00 
-	c 70.579,0.00, 128.00,57.421, 128.00,128.00C 416.00,174.478, 391.101,215.248, 353.94,237.674z M 192.00,384.00l 50.75,0.00 c 27.984,0.00, 50.75-28.71, 50.75-64.00
-	s-22.766-64.00-50.75-64.00L 192.00,256.00 L 192.00,384.00 z M 271.50,64.00L 192.00,64.00 L 192.00,192.00 l 79.50,0.00 c 29.225,0.00, 53.00-28.71, 53.00-64.00S 300.725,64.00, 271.50,64.00z"  />
-<glyph unicode="&#xe029;" d="M 192.00,64.00L 288.00,64.00L 288.00-32.00L 192.00-32.00zM 400.00,448.00 C 426.51,448.00 448.00,426.51 448.00,400.00 L 448.00,256.00 L 288.00,160.00 L 288.00,96.00 L 192.00,96.00 L 192.00,192.00 L 352.00,288.00 L 352.00,352.00 L 96.00,352.00 L 96.00,448.00 L 400.00,448.00 Z" />
-<glyph unicode="&#xe028;" d="M 288.00,448.00 C 411.712,448.00 512.00,347.712 512.00,224.00 C 512.00,100.288 411.712,0.00 288.00,0.00 L 288.00,48.00 C 335.012,48.00 379.209,66.307 412.451,99.549 C 445.693,132.791 464.00,176.988 464.00,224.00 C 464.00,271.011 445.693,315.209 412.451,348.451 C 379.209,381.693 335.012,400.00 288.00,400.00 C 240.989,400.00 196.791,381.693 163.549,348.451 C 137.979,322.882 121.258,290.828 114.896,256.00 L 208.00,256.00 L 96.00,128.00 L -16.00,256.00 L 66.285,256.00 C 81.815,364.551 175.154,448.00 288.00,448.00 ZM 384.00,256.00 L 384.00,192.00 L 256.00,192.00 L 256.00,352.00 L 320.00,352.00 L 320.00,256.00 Z"  />
-<glyph unicode="&#xe027;" d="M0.00,224.00L 64.00,224.00L 64.00,192.00L0.00,192.00zM 96.00,224.00L 192.00,224.00L 192.00,192.00L 96.00,192.00zM 224.00,224.00L 288.00,224.00L 288.00,192.00L 224.00,192.00zM 320.00,224.00L 416.00,224.00L 416.00,192.00L 320.00,192.00zM 448.00,224.00L 512.00,224.00L 512.00,192.00L 448.00,192.00zM 440.00,480.00 L 448.00,256.00 L 64.00,256.00 L 72.00,480.00 L 88.00,480.00 L 96.00,288.00 L 416.00,288.00 L 424.00,480.00 ZM 72.00-32.00 L 64.00,160.00 L 448.00,160.00 L 440.00-32.00 L 424.00-32.00 L 416.00,128.00 L 96.00,128.00 L 88.00-32.00 Z"  />
-<glyph unicode="&#xe026;" d="M 192.00,384.00L 256.00,384.00L 256.00,352.00L 192.00,352.00zM 288.00,384.00L 352.00,384.00L 352.00,352.00L 288.00,352.00zM 448.00,384.00 L 448.00,256.00 L 352.00,256.00 L 352.00,288.00 L 416.00,288.00 L 416.00,352.00 L 384.00,352.00 L 384.00,384.00 ZM 160.00,288.00L 224.00,288.00L 224.00,256.00L 160.00,256.00zM 256.00,288.00L 320.00,288.00L 320.00,256.00L 256.00,256.00zM 96.00,352.00 L 96.00,288.00 L 128.00,288.00 L 128.00,256.00 L 64.00,256.00 L 64.00,384.00 L 160.00,384.00 L 160.00,352.00 ZM 192.00,192.00L 256.00,192.00L 256.00,160.00L 192.00,160.00zM 288.00,192.00L 352.00,192.00L 352.00,160.00L 288.00,160.00zM 448.00,192.00 L 448.00,64.00 L 352.00,64.00 L 352.00,96.00 L 416.00,96.00 L 416.00,160.00 L 384.00,160.00 L 384.00,192.00 ZM 160.00,96.00L 224.00,96.00L 224.00,64.00L 160.00,64.00zM 256.00,96.00L 320.00,96.00L 320.00,64.00L 256.00,64.00zM 96.00,160.00 L 96.00,96.00 L 128.00,96.00 L 128.00,64.00 L 64.00,64.00 L 64.00,192.00 L 160.00,192.00 L 160.00,160.00 ZM 480.00,448.00 L 32.00,448.00 L 32.00,0.00 L 480.00,0.00 L 480.00,448.00 Z M 512.00,480.00 L 512.00,480.00 L 512.00-32.00 L 0.00-32.00 L 0.00,480.00 L 512.00,480.00 Z"  />
-<glyph unicode="&#xe025;" d="M 224.00,192.00 L 128.00,192.00 L 128.00,256.00 L 224.00,256.00 L 224.00,352.00 L 288.00,352.00 L 288.00,256.00 L 384.00,256.00 L 384.00,192.00 L 288.00,192.00 L 288.00,96.00 L 224.00,96.00 ZM 512.00,160.00 L 512.00-32.00 L 0.00-32.00 L 0.00,160.00 L 64.00,160.00 L 64.00,32.00 L 448.00,32.00 L 448.00,160.00 Z"  />
-<glyph unicode="&#xe024;" d="M 64.00,352.00l 64.00,0.00 l0.00-96.00 l 32.00,0.00 L 160.00,448.00 c0.00,17.60-14.40,32.00-32.00,32.00L 64.00,480.00 C 46.40,480.00, 32.00,465.60, 32.00,448.00l0.00-192.00 l 32.00,0.00 L 64.00,352.00 z M 64.00,448.00l 64.00,0.00 l0.00-64.00 L 64.00,384.00 L 64.00,448.00 z M 480.00,448.00L 480.00,480.00 l-96.00,0.00 
-	c-17.601,0.00-32.00-14.40-32.00-32.00l0.00-160.00 c0.00-17.60, 14.399-32.00, 32.00-32.00l 96.00,0.00 l0.00,32.00 l-96.00,0.00 L 384.00,448.00 L 480.00,448.00 z M 320.00,400.00L 320.00,448.00 c0.00,17.60-14.40,32.00-32.00,32.00l-96.00,0.00 l0.00-224.00 l 96.00,0.00 
-	c 17.60,0.00, 32.00,14.40, 32.00,32.00l0.00,48.00 c0.00,17.60-4.40,32.00-22.00,32.00C 315.60,368.00, 320.00,382.40, 320.00,400.00z M 288.00,288.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 288.00,288.00 z M 288.00,384.00l-64.00,0.00 L 224.00,448.00 l 64.00,0.00 L 288.00,384.00 zM 416.00,192.00 L 208.00-32.00 L 96.00,112.00 L 137.00,147.00 L 208.00,73.00 L 384.00,224.00 Z"  />
-<glyph unicode="&#xe023;" d="M 512.00,480.00 L 512.00,288.00 L 442.87,357.13 L 336.87,251.13 L 283.13,304.87 L 389.13,410.87 L 320.00,480.00 ZM 122.87,410.87 L 228.87,304.87 L 175.13,251.13 L 69.13,357.13 L 0.00,288.00 L 0.00,480.00 L 192.00,480.00 ZM 442.87,90.87 L 512.00,160.00 L 512.00-32.00 L 320.00-32.00 L 389.13,37.13 L 283.13,143.13 L 336.87,196.87 ZM 228.87,143.13 L 122.87,37.13 L 192.00-32.00 L 0.00-32.00 L 0.00,160.00 L 69.13,90.87 L 175.13,196.87 Z"  />
-<glyph unicode="&#xe022;" d="M 128.00,448.00L 384.00,448.00L 384.00,384.00L 128.00,384.00zM 480.00,352.00L 32.00,352.00 C 14.40,352.00,0.00,337.60,0.00,320.00l0.00-160.00 c0.00-17.60, 14.398-32.00, 32.00-32.00l 96.00,0.00 l0.00-128.00 l 256.00,0.00 L 384.00,128.00 l 96.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00L 512.00,320.00 
-		C 512.00,337.60, 497.60,352.00, 480.00,352.00z M 352.00,32.00L 160.00,32.00 L 160.00,192.00 l 192.00,0.00 L 352.00,32.00 z M 487.20,304.00c0.00-12.813-10.387-23.20-23.199-23.20
-		c-12.813,0.00-23.201,10.387-23.201,23.20s 10.388,23.20, 23.201,23.20C 476.814,327.20, 487.20,316.813, 487.20,304.00z"  />
-<glyph unicode="&#xe021;" d="M 256.00,480.00C 114.615,480.00,0.00,365.386,0.00,224.00c0.00-141.385, 114.614-256.00, 256.00-256.00c 141.385,0.00, 256.00,114.615, 256.00,256.00
-	C 512.00,365.386, 397.385,480.00, 256.00,480.00z M 256.00,8.00c-119.293,0.00-216.00,96.706-216.00,216.00c0.00,119.293, 96.707,216.00, 216.00,216.00c 119.295,0.00, 216.00-96.707, 216.00-216.00
-	C 472.00,104.706, 375.295,8.00, 256.00,8.00z M 192.00,320.00c0.00-17.673-14.327-32.00-32.00-32.00s-32.00,14.327-32.00,32.00s 14.327,32.00, 32.00,32.00S 192.00,337.673, 192.00,320.00z
-	 M 384.00,320.00c0.00-17.673-14.326-32.00-32.00-32.00s-32.00,14.327-32.00,32.00s 14.326,32.00, 32.00,32.00S 384.00,337.673, 384.00,320.00zM 256.00,154.00 C 326.537,154.00 387.344,182.766 415.231,215.596 C 404.795,129.986 337.087,64.00 256.00,64.00 C 174.941,64.00 107.251,130.013 96.778,215.584 C 124.671,182.761 185.471,154.00 256.00,154.00 Z"  />
-<glyph unicode="&#xe020;" d="M 352.00,32.00 L 480.00,32.00 L 512.00,96.00 L 512.00-32.00 L 320.00-32.00 L 320.00,75.107 C 385.556,103.349 432.00,173.688 432.00,256.00 C 432.00,363.216 353.201,447.133 256.00,447.133 C 158.797,447.133 80.00,363.217 80.00,256.00 C 80.00,173.688 126.443,103.349 192.00,75.107 L 192.00-32.00 L 0.00-32.00 L 0.00,96.00 L 32.00,32.00 L 160.00,32.00 L 160.00,48.295 C 66.185,81.525 0.00,161.996 0.00,256.00 C 0.00,379.712 114.615,480.00 256.00,480.00 C 397.385,480.00 512.00,379.712 512.00,256.00 C 512.00,161.996 445.815,81.525 352.00,48.295 L 352.00,32.00 Z"  />
-<glyph unicode="&#xe01f;" d="M 384.00,377.00 L 384.00,352.00 L 448.00,352.00 L 448.00,320.00 L 352.00,320.00 L 352.00,393.00 L 416.00,423.00 L 416.00,448.00 L 352.00,448.00 L 352.00,480.00 L 448.00,480.00 L 448.00,407.00 ZM 338.00,352.00L 270.00,352.00L 176.00,258.00L 82.00,352.00L 14.00,352.00L 142.00,224.00L 14.00,96.00L 82.00,96.00L 176.00,190.00L 270.00,96.00L 338.00,96.00L 210.00,224.00 z"  />
-<glyph unicode="&#xe01e;" d="M 384.00,25.00 L 384.00,0.00 L 448.00,0.00 L 448.00-32.00 L 352.00-32.00 L 352.00,41.00 L 416.00,71.00 L 416.00,96.00 L 352.00,96.00 L 352.00,128.00 L 448.00,128.00 L 448.00,55.00 ZM 338.00,352.00L 270.00,352.00L 176.00,258.00L 82.00,352.00L 14.00,352.00L 142.00,224.00L 14.00,96.00L 82.00,96.00L 176.00,190.00L 270.00,96.00L 338.00,96.00L 210.00,224.00 z"  />
-<glyph unicode="&#xe01d;" d="M0.00,32.00L 288.00,32.00L 288.00-32.00L0.00-32.00zM 96.00,480.00L 448.00,480.00L 448.00,416.00L 96.00,416.00zM 138.694,64.00 L 241.038,456.082 L 302.963,439.918 L 204.838,64.00 ZM 464.887-32.00 L 400.00,32.887 L 335.113-32.00 L 304.00-0.887 L 368.887,64.00 L 304.00,128.887 L 335.113,160.00 L 400.00,95.113 L 464.887,160.00 L 496.00,128.887 L 431.113,64.00 L 496.00-0.887 Z"  />
-<glyph unicode="&#xe01c;" d="M0.00,256.00L 512.00,256.00L 512.00,192.00L0.00,192.00z"  />
-<glyph unicode="&#xe01b;" d="M0.00,448.00l0.00-448.00 l 512.00,0.00 L 512.00,448.00 L0.00,448.00 z M 192.00,160.00l0.00,96.00 l 128.00,0.00 l0.00-96.00 L 192.00,160.00 z M 320.00,128.00l0.00-96.00 L 192.00,32.00 l0.00,96.00 L 320.00,128.00 z M 320.00,384.00l0.00-96.00 L 192.00,288.00 L 192.00,384.00 L 320.00,384.00 z M 160.00,384.00l0.00-96.00 L 32.00,288.00 L 32.00,384.00 L 160.00,384.00 z
-	 M 32.00,256.00l 128.00,0.00 l0.00-96.00 L 32.00,160.00 L 32.00,256.00 z M 352.00,256.00l 128.00,0.00 l0.00-96.00 L 352.00,160.00 L 352.00,256.00 z M 352.00,288.00L 352.00,384.00 l 128.00,0.00 l0.00-96.00 L 352.00,288.00 z M 32.00,128.00l 128.00,0.00 l0.00-96.00 L 32.00,32.00 L 32.00,128.00 z M 352.00,32.00l0.00,96.00 l 128.00,0.00 l0.00-96.00 L 352.00,32.00 z"  />
-<glyph unicode="&#xe01a;" d="M 161.009,64.00l 28.80,96.00l 132.382,0.00 l 28.80-96.00l 56.816,0.00 L 311.809,384.00L 200.191,384.00 l-96.00-320.00L 161.009,64.00 z M 237.809,320.00l 36.382,0.00 l 28.80-96.00l-93.982,0.00 
-	L 237.809,320.00z"  />
-<glyph unicode="&#xe019;" d="M 256.00,320.00C 151.316,320.00, 58.378,269.722,0.00,192.00c 58.378-77.723, 151.316-128.00, 256.00-128.00c 104.684,0.00, 197.622,50.277, 256.00,128.00
-	C 453.622,269.722, 360.684,320.00, 256.00,320.00z M 224.00,256.00c 17.673,0.00, 32.00-14.327, 32.00-32.00s-14.327-32.00-32.00-32.00s-32.00,14.327-32.00,32.00S 206.327,256.00, 224.00,256.00z
-	 M 386.808,127.352c-19.824-10.129-40.826-17.931-62.423-23.188C 302.141,98.746, 279.134,96.00, 256.00,96.00
-	c-23.133,0.00-46.141,2.746-68.384,8.162c-21.597,5.259-42.599,13.061-62.423,23.188c-31.51,16.101-60.111,38.205-83.82,64.649
-	c 23.709,26.444, 52.31,48.55, 83.82,64.649c 16.168,8.261, 33.121,14.973, 50.541,20.02C 165.79,261.547, 160.00,243.451, 160.00,224.00
-	c0.00-53.02, 42.981-96.00, 96.00-96.00c 53.019,0.00, 96.00,42.98, 96.00,96.00c0.00,19.451-5.791,37.547-15.733,52.67c 17.419-5.048, 34.372-11.76, 50.541-20.021
-	c 31.511-16.099, 60.109-38.204, 83.819-64.649C 446.917,165.557, 418.318,143.45, 386.808,127.352z M 430.459,358.139
-	C 376.099,385.916, 317.403,400.00, 256.00,400.00c-61.403,0.00-120.099-14.084-174.459-41.861C 52.155,343.123, 24.675,324.187,0.00,302.101l0.00-54.603 
-	c 27.669,29.283, 60.347,53.877, 96.097,72.145C 145.907,345.095, 199.706,358.00, 256.00,358.00s 110.093-12.905, 159.902-38.358
-	c 35.751-18.268, 68.429-42.862, 96.098-72.145L 512.00,302.10 C 487.325,324.187, 459.846,343.123, 430.459,358.139z"  />
-<glyph unicode="&#xe018;" d="M 256.00,384.00C 149.962,384.00, 64.00,298.039, 64.00,192.00s 85.961-192.00, 192.00-192.00c 106.037,0.00, 192.00,85.961, 192.00,192.00S 362.037,384.00, 256.00,384.00z
-		 M 357.822,90.177C 330.626,62.979, 294.464,48.00, 256.00,48.00s-74.625,14.979-101.823,42.177C 126.979,117.374, 112.00,153.536, 112.00,192.00
-		s 14.979,74.625, 42.177,101.823C 181.375,321.021, 217.536,336.00, 256.00,336.00s 74.626-14.979, 101.821-42.177
-		C 385.022,266.625, 400.00,230.464, 400.00,192.00S 385.021,117.374, 357.822,90.177zM 162.965,378.069l-21.47,42.939C 92.058,396.24, 51.76,355.942, 26.992,306.504l 42.938-21.47
-		C 90.054,325.202, 122.796,357.945, 162.965,378.069zM 442.067,285.035l 42.939,21.469C 460.24,355.942, 419.943,396.24, 370.504,421.008l-21.472-42.939
-		C 389.201,357.945, 421.944,325.203, 442.067,285.035zM 256.00,288.00l-32.00,0.00 l0.00-96.00 c0.00-5.055, 2.35-9.555, 6.011-12.486l-0.006-0.008l 80.00-64.00l 19.988,24.988L 256.00,199.689L 256.00,288.00 z"  />
-<glyph unicode="&#xe017;" d="M 160.00,352.00L 32.00,224.00L 160.00,96.00L 224.00,96.00L 96.00,224.00L 224.00,352.00 	zM 352.00,352.00L 288.00,352.00L 416.00,224.00L 288.00,96.00L 352.00,96.00L 480.00,224.00 	z"  />
-<glyph unicode="&#xe016;" d="M 224.00,128.00L 288.00,128.00L 288.00,64.00L 224.00,64.00zM 352.00,352.00 C 369.673,352.00 384.00,337.673 384.00,320.00 L 384.00,224.00 L 288.00,160.00 L 224.00,160.00 L 224.00,192.00 L 320.00,256.00 L 320.00,288.00 L 160.00,288.00 L 160.00,352.00 L 352.00,352.00 ZM 256.00,432.00 C 200.441,432.00 148.208,410.364 108.922,371.078 C 69.636,331.792 48.00,279.559 48.00,224.00 C 48.00,168.441 69.636,116.208 108.922,76.922 C 148.208,37.636 200.441,16.00 256.00,16.00 C 311.559,16.00 363.792,37.636 403.078,76.922 C 442.364,116.208 464.00,168.441 464.00,224.00 C 464.00,279.559 442.364,331.792 403.078,371.078 C 363.792,410.364 311.559,432.00 256.00,432.00 Z M 256.00,480.00 L 256.00,480.00 C 397.385,480.00 512.00,365.385 512.00,224.00 C 512.00,82.615 397.385-32.00 256.00-32.00 C 114.615-32.00 0.00,82.615 0.00,224.00 C 0.00,365.385 114.615,480.00 256.00,480.00 Z"  />
-<glyph unicode="&#xe015;" d="M0.00,416.00l0.00-384.00 l 512.00,0.00 L 512.00,416.00 L0.00,416.00 z M 96.00,64.00L 32.00,64.00 l0.00,64.00 l 64.00,0.00 L 96.00,64.00 z M 96.00,192.00L 32.00,192.00 l0.00,64.00 l 64.00,0.00 L 96.00,192.00 z M 96.00,320.00L 32.00,320.00 L 32.00,384.00 l 64.00,0.00 L 96.00,320.00 z M 384.00,64.00L 128.00,64.00 L 128.00,384.00 l 256.00,0.00 L 384.00,64.00 z
-		 M 480.00,64.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 480.00,64.00 z M 480.00,192.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 480.00,192.00 z M 480.00,320.00l-64.00,0.00 L 416.00,384.00 l 64.00,0.00 L 480.00,320.00 zM 192.00,320.00L 192.00,128.00L 320.00,224.00 	z"  />
-<glyph unicode="&#xe014;" d="M0.00,416.00l0.00-416.00 l 512.00,0.00 L 512.00,416.00 L0.00,416.00 z M 480.00,32.00L 32.00,32.00 L 32.00,384.00 l 448.00,0.00 L 480.00,32.00 zM 352.00,304.00A48.00,48.00 1620.00 1,0 448.00,304A48.00,48.00 1620.00 1,0 352.00,304zM 448.00,64.00 L 64.00,64.00 L 160.00,320.00 L 288.00,160.00 L 352.00,208.00 Z"  />
-<glyph unicode="&#xe013;" d="M 96.00,480.00l0.00-512.00 l 160.00,160.00l 160.00-160.00L 416.00,480.00 L 96.00,480.00 z M 384.00,45.255l-128.00,128.00l-128.00-128.00L 128.00,448.00 l 256.00,0.00 L 384.00,45.255 z"  />
-<glyph unicode="&#xe012;" d="M 238.444,142.443c 2.28-4.524, 3.495-9.579, 3.495-14.848c0.00-8.808-3.372-17.029-9.496-23.154l-81.69-81.69
-		c-6.124-6.124-14.348-9.496-23.154-9.496s-17.03,3.372-23.154,9.496l-49.69,49.69c-6.124,6.125-9.496,14.348-9.496,23.154
-		s 3.372,17.03, 9.496,23.154l 81.69,81.691c 6.124,6.123, 14.348,9.496, 23.154,9.496c 5.269,0.00, 10.322-1.215, 14.848-3.494l 32.669,32.668
-		c-13.935,10.705-30.72,16.08-47.517,16.08c-19.993,0.00-39.986-7.583-55.154-22.751l-81.69-81.691
-		c-30.335-30.335-30.335-79.975,0.00-110.309l 49.69-49.691c 15.167-15.166, 35.16-22.75, 55.153-22.75
-		c 19.994,0.00, 39.987,7.584, 55.154,22.751l 81.69,81.69c 27.91,27.91, 30.119,72.149, 6.672,102.673L 238.444,142.443zM 489.248,407.558l-49.69,49.691C 424.391,472.417, 404.398,480.00, 384.404,480.00c-19.993,0.00-39.985-7.583-55.153-22.751l-81.691-81.691
-		c-27.91-27.91-30.119-72.149-6.671-102.671l 32.669,32.67c-2.279,4.525-3.494,9.58-3.494,14.847c0.00,8.808, 3.372,17.03, 9.496,23.154
-		l 81.691,81.691c 6.123,6.124, 14.347,9.497, 23.153,9.497c 8.808,0.00, 17.03-3.373, 23.154-9.497l 49.69-49.691
-		c 6.124-6.124, 9.496-14.347, 9.496-23.154c0.00-8.807-3.372-17.03-9.496-23.154l-81.69-81.691c-6.124-6.124-14.347-9.496-23.154-9.496
-		c-5.268,0.00-10.322,1.215-14.848,3.495l-32.669-32.669c 13.936-10.705, 30.72-16.08, 47.517-16.08c 19.994,0.00, 39.987,7.584, 55.154,22.752
-		l 81.69,81.69C 519.584,327.584, 519.584,377.223, 489.248,407.558zM 116.684,340.688L 20.687,436.685L 43.315,459.313L 139.312,363.316zM 192.00,480.00L 224.00,480.00L 224.00,384.00L 192.00,384.00zM0.00,288.00L 96.00,288.00L 96.00,256.00L0.00,256.00zM 395.316,107.312L 491.314,11.314L 468.686-11.314L 372.688,84.684zM 288.00,64.00L 320.00,64.00L 320.00-32.00L 288.00-32.00zM 416.00,192.00L 512.00,192.00L 512.00,160.00L 416.00,160.00z"  />
-<glyph unicode="&#xe011;" d="M 160.00,128.00c 8.80-8.80, 23.637-8.363, 32.971,0.971L 351.03,287.029C 360.364,296.363, 360.80,311.20, 352.00,320.00
-		s-23.637,8.363-32.971-0.971L 160.971,160.971C 151.637,151.637, 151.20,136.80, 160.00,128.00zM 238.444,142.444c 2.28-4.525, 3.495-9.58, 3.495-14.848c0.00-8.808-3.372-17.03-9.496-23.154l-81.691-81.691
-		c-6.124-6.124-14.347-9.496-23.154-9.496s-17.03,3.372-23.154,9.496l-49.691,49.691c-6.124,6.124-9.496,14.347-9.496,23.154
-		s 3.372,17.03, 9.496,23.154l 81.691,81.691c 6.124,6.124, 14.347,9.497, 23.154,9.497c 5.268,0.00, 10.322-1.215, 14.848-3.495l 32.669,32.669
-		c-13.935,10.705-30.72,16.08-47.517,16.08c-19.993,0.00-39.986-7.583-55.154-22.751l-81.691-81.691
-		c-30.335-30.335-30.335-79.974,0.00-110.309l 49.691-49.691C 87.611-24.416, 107.604-32.00, 127.597-32.00
-		c 19.994,0.00, 39.987,7.584, 55.154,22.751l 81.691,81.691c 27.91,27.91, 30.119,72.149, 6.672,102.672L 238.444,142.444zM 489.249,407.558l-49.691,49.691C 424.391,472.417, 404.398,480.00, 384.404,480.00c-19.993,0.00-39.986-7.583-55.154-22.751l-81.691-81.691
-		c-27.91-27.91-30.119-72.149-6.671-102.671l 32.669,32.67c-2.279,4.525-3.494,9.58-3.494,14.847c0.00,8.808, 3.372,17.03, 9.496,23.154
-		l 81.691,81.691c 6.124,6.124, 14.347,9.497, 23.154,9.497s 17.03-3.373, 23.154-9.497l 49.691-49.691
-		c 6.124-6.124, 9.496-14.347, 9.496-23.154s-3.372-17.03-9.496-23.154l-81.691-81.691c-6.124-6.124-14.347-9.496-23.154-9.496
-		c-5.268,0.00-10.322,1.215-14.848,3.495l-32.669-32.669c 13.936-10.705, 30.72-16.08, 47.517-16.08c 19.994,0.00, 39.987,7.584, 55.154,22.751
-		l 81.691,81.691C 519.584,327.584, 519.584,377.223, 489.249,407.558z"  />
-<glyph unicode="&#xe010;" d="M 288.00,355.814L 288.00,480.00 l 192.00-192.00L 288.00,96.00L 288.00,222.912 C 64.625,228.153, 74.206,71.016, 131.07-32.00
-	C-9.286,119.707, 20.52,362.785, 288.00,355.814z"  />
-<glyph unicode="&#xe00f;" d="M 380.931-32.00C 437.794,71.016, 447.375,228.153, 224.00,222.912L 224.00,96.00 L 32.00,288.00L 224.00,480.00l0.00-124.186 
-	C 491.481,362.785, 521.285,119.707, 380.931-32.00z"  />
-<glyph unicode="&#xe00e;" d="M 112.50,256.00 C 174.356,256.00 224.50,205.855 224.50,144.00 C 224.50,82.144 174.356,32.00 112.50,32.00 C 50.644,32.00 0.50,82.144 0.50,144.00 L 0.00,160.00 C 0.00,283.712 100.288,384.00 224.00,384.00 L 224.00,320.00 C 181.263,320.00 141.083,303.357 110.863,273.137 C 105.046,267.319 99.737,261.129 94.948,254.627 C 100.667,255.527 106.528,256.00 112.50,256.00 ZM 400.50,256.00 C 462.355,256.00 512.50,205.855 512.50,144.00 C 512.50,82.144 462.355,32.00 400.50,32.00 C 338.645,32.00 288.50,82.144 288.50,144.00 L 288.00,160.00 C 288.00,283.712 388.288,384.00 512.00,384.00 L 512.00,320.00 C 469.263,320.00 429.083,303.357 398.863,273.137 C 393.045,267.319 387.736,261.129 382.947,254.627 C 388.667,255.527 394.527,256.00 400.50,256.00 Z"  />
-<glyph unicode="&#xe00d;" d="M0.00,448.00L 512.00,448.00L 512.00,384.00L0.00,384.00zM 192.00,352.00L 512.00,352.00L 512.00,288.00L 192.00,288.00zM 192.00,256.00L 512.00,256.00L 512.00,192.00L 192.00,192.00zM 192.00,160.00L 512.00,160.00L 512.00,96.00L 192.00,96.00zM0.00,64.00L 512.00,64.00L 512.00,0.00L0.00,0.00zM 128.00,320.00 L 128.00,128.00 L 0.00,224.00 Z"  />
-<glyph unicode="&#xe00c;" d="M0.00,448.00L 512.00,448.00L 512.00,384.00L0.00,384.00zM 192.00,352.00L 512.00,352.00L 512.00,288.00L 192.00,288.00zM 192.00,256.00L 512.00,256.00L 512.00,192.00L 192.00,192.00zM 192.00,160.00L 512.00,160.00L 512.00,96.00L 192.00,96.00zM0.00,64.00L 512.00,64.00L 512.00,0.00L0.00,0.00zM 0.00,128.00 L 0.00,320.00 L 128.00,224.00 Z"  />
-<glyph unicode="&#xe00b;" d="M 192.00,64.00L 512.00,64.00L 512.00,0.00L 192.00,0.00zM 192.00,256.00L 512.00,256.00L 512.00,192.00L 192.00,192.00zM 192.00,448.00L 512.00,448.00L 512.00,384.00L 192.00,384.00zM 96.00,480.00 L 96.00,352.00 L 64.00,352.00 L 64.00,448.00 L 32.00,448.00 L 32.00,480.00 ZM 64.00,217.00 L 64.00,192.00 L 128.00,192.00 L 128.00,160.00 L 32.00,160.00 L 32.00,233.00 L 96.00,263.00 L 96.00,288.00 L 32.00,288.00 L 32.00,320.00 L 128.00,320.00 L 128.00,247.00 ZM 128.00,128.00 L 128.00-32.00 L 32.00-32.00 L 32.00,0.00 L 96.00,0.00 L 96.00,32.00 L 32.00,32.00 L 32.00,64.00 L 96.00,64.00 L 96.00,96.00 L 32.00,96.00 L 32.00,128.00 Z"  />
-<glyph unicode="&#xe00a;" d="M 192.00,448.00l 320.00,0.00 l0.00-64.00 L 192.00,384.00 L 192.00,448.00 z M 192.00,256.00l 320.00,0.00 l0.00-64.00 L 192.00,192.00 L 192.00,256.00 z M 192.00,64.00l 320.00,0.00 l0.00-64.00 L 192.00,0.00 L 192.00,64.00 zM0.00,416.00A64.00,64.00 1620.00 1,0 128.00,416A64.00,64.00 1620.00 1,0 0.00,416zM0.00,224.00A64.00,64.00 1620.00 1,0 128.00,224A64.00,64.00 1620.00 1,0 0.00,224zM0.00,32.00A64.00,64.00 1620.00 1,0 128.00,32A64.00,64.00 1620.00 1,0 0.00,32z"  />
-<glyph unicode="&#xe009;" d="M 32.00,480.00L 224.00,480.00L 224.00,448.00L 32.00,448.00zM 288.00,480.00L 480.00,480.00L 480.00,448.00L 288.00,448.00zM 476.00,320.00l-28.00,0.00 L 448.00,448.00 L 320.00,448.00 l0.00-128.00 L 192.00,320.00 L 192.00,448.00 L 64.00,448.00 l0.00-128.00 L 36.00,320.00 c-19.80,0.00-36.00-16.20-36.00-36.00l0.00-280.00 c0.00-19.80, 16.20-36.00, 36.00-36.00l 152.00,0.00 c 19.80,0.00, 36.00,16.20, 36.00,36.00L 224.00,192.00 l 64.00,0.00 
-	l0.00-188.00 c0.00-19.80, 16.20-36.00, 36.00-36.00l 152.00,0.00 c 19.80,0.00, 36.00,16.20, 36.00,36.00L 512.00,284.00 C 512.00,303.80, 495.80,320.00, 476.00,320.00z M 174.00,0.00L 50.00,0.00 c-9.90,0.00-18.00,7.20-18.00,16.00
-	s 8.10,16.00, 18.00,16.00l 124.00,0.00 c 9.90,0.00, 18.00-7.20, 18.00-16.00S 183.90,0.00, 174.00,0.00z M 272.00,224.00l-32.00,0.00 c-8.80,0.00-16.00,7.20-16.00,16.00s 7.20,16.00, 16.00,16.00l 32.00,0.00 c 8.80,0.00, 16.00-7.20, 16.00-16.00
-	S 280.80,224.00, 272.00,224.00z M 462.00,0.00L 338.00,0.00 c-9.90,0.00-18.00,7.20-18.00,16.00s 8.10,16.00, 18.00,16.00l 124.00,0.00 c 9.90,0.00, 18.00-7.20, 18.00-16.00S 471.90,0.00, 462.00,0.00z"  />
-<glyph unicode="&#xe008;" d="M 416.00,320.00L 416.00,400.00 c0.00,8.80-7.20,16.00-16.00,16.00L 288.00,416.00 L 288.00,448.00 c0.00,17.60-14.40,32.00-32.00,32.00l-64.00,0.00 c-17.602,0.00-32.00-14.40-32.00-32.00l0.00-32.00 L 48.00,416.00 c-8.801,0.00-16.00-7.20-16.00-16.00l0.00-320.00 
-	c0.00-8.80, 7.199-16.00, 16.00-16.00l 144.00,0.00 l0.00-96.00 l 224.00,0.00 l 96.00,96.00L 512.00,320.00 L 416.00,320.00 z M 192.00,447.943c 0.017,0.019, 0.036,0.039, 0.057,0.057l 63.884,0.00 
-	c 0.021-0.018, 0.041-0.038, 0.059-0.057L 256.00,416.00 l-64.00,0.00 L 192.00,447.943 z M 96.00,352.00L 96.00,384.00 l 256.00,0.00 l0.00-32.00 L 96.00,352.00 z M 416.00,13.255L 416.00,64.00 l 50.745,0.00 L 416.00,13.255z M 480.00,96.00l-96.00,0.00 l0.00-96.00 
-	L 224.00,0.00 L 224.00,288.00 l 256.00,0.00 L 480.00,96.00 z"  />
-<glyph unicode="&#xe007;" d="M 445.387,125.423c-22.827,22.778-51.864,34.536-78.973,34.536l-14.556,0.00 l-31.952,32.004l 127.81,128.019
-	c 31.952,32.005, 31.952,96.014,0.00,128.019L 256.001,255.973L 64.285,448.00c-31.952-32.004-31.952-96.014,0.00-128.019l 127.811-128.017
-	l-31.953-32.004l-14.557,0.00 c-27.11,0.00-56.146-11.759-78.974-34.538c-40.811-40.721-46.325-101.242-12.315-135.175
-	C 69.282-24.704, 89.441-32.00, 110.795-32.00c 27.108,0.00, 56.145,11.757, 78.973,34.536c 26.792,26.732, 38.371,62.00, 33.542,92.674l 32.692,32.744
-	l 32.688-32.744c-4.828-30.674, 6.753-65.941, 33.542-92.674C 345.063-20.243, 374.098-32.00, 401.206-32.00
-	c 21.354,0.00, 41.512,7.296, 56.497,22.248C 491.713,24.181, 486.197,84.702, 445.387,125.423z M 176.512,57.231
-	c-3.849-8.941-9.505-17.173-16.813-24.463c-7.318-7.302-15.586-12.959-24.574-16.812c-8.066-3.458-16.48-5.284-24.331-5.284
-	c-7.573,0.00-18.306,1.701-26.431,9.806c-8.068,8.052-9.76,18.659-9.76,26.144c0.00,7.771, 1.821,16.105, 5.263,24.106
-	c 3.85,8.942, 9.507,17.173, 16.813,24.463c 7.317,7.303, 15.586,12.957, 24.575,16.812c 8.067,3.457, 16.48,5.284, 24.332,5.284
-	c 7.573,0.00, 18.306-1.70, 26.429-9.807c 8.067-8.049, 9.761-18.658, 9.761-26.142C 181.777,73.567, 179.957,65.23, 176.512,57.231z
-	 M 256.002,146.702c-24.957,0.00-45.188,20.266-45.188,45.263c0.00,24.996, 20.231,45.26, 45.188,45.26s 45.186-20.264, 45.186-45.26
-	C 301.188,166.966, 280.958,146.702, 256.002,146.702z M 427.636,20.479c-8.124-8.104-18.856-9.806-26.43-9.806
-	c-7.852,0.00-16.265,1.826-24.333,5.284c-8.986,3.853-17.254,9.51-24.571,16.812c-7.307,7.29-12.963,15.521-16.813,24.463
-	c-3.443,7.999-5.263,16.336-5.263,24.106c0.00,7.483, 1.692,18.094, 9.76,26.143c 8.123,8.104, 18.856,9.807, 26.43,9.807
-	c 7.85,0.00, 16.265-1.827, 24.33-5.284c 8.989-3.854, 17.258-9.509, 24.575-16.812c 7.305-7.29, 12.962-15.521, 16.813-24.463
-	c 3.442-7.999, 5.263-16.335, 5.263-24.106C 437.396,39.138, 435.702,28.53, 427.636,20.479z"  />
-<glyph unicode="&#xe006;" d="M0.00,448.00L 512.00,448.00L 512.00,384.00L0.00,384.00zM0.00,352.00L 512.00,352.00L 512.00,288.00L0.00,288.00zM0.00,256.00L 512.00,256.00L 512.00,192.00L0.00,192.00zM0.00,160.00L 512.00,160.00L 512.00,96.00L0.00,96.00zM0.00,64.00L 512.00,64.00L 512.00,0.00L0.00,0.00z"  />
-<glyph unicode="&#xe005;" d="M0.00,448.00L 512.00,448.00L 512.00,384.00L0.00,384.00zM 192.00,352.00L 512.00,352.00L 512.00,288.00L 192.00,288.00zM 192.00,160.00L 512.00,160.00L 512.00,96.00L 192.00,96.00zM0.00,256.00L 512.00,256.00L 512.00,192.00L0.00,192.00zM0.00,64.00L 512.00,64.00L 512.00,0.00L0.00,0.00z"  />
-<glyph unicode="&#xe004;" d="M0.00,448.00L 512.00,448.00L 512.00,384.00L0.00,384.00zM 96.00,352.00L 416.00,352.00L 416.00,288.00L 96.00,288.00zM 96.00,160.00L 416.00,160.00L 416.00,96.00L 96.00,96.00zM0.00,256.00L 512.00,256.00L 512.00,192.00L0.00,192.00zM0.00,64.00L 512.00,64.00L 512.00,0.00L0.00,0.00z"  />
-<glyph unicode="&#xe003;" d="M0.00,448.00L 512.00,448.00L 512.00,384.00L0.00,384.00zM0.00,352.00L 320.00,352.00L 320.00,288.00L0.00,288.00zM0.00,160.00L 320.00,160.00L 320.00,96.00L0.00,96.00zM0.00,256.00L 512.00,256.00L 512.00,192.00L0.00,192.00zM0.00,64.00L 512.00,64.00L 512.00,0.00L0.00,0.00z"  />
-<glyph unicode="&#xe002;" d="M 512.00,183.771l0.00,80.458 l-79.572,7.957c-4.093,15.021-10.044,29.274-17.605,42.49l 52.298,63.919L 410.595,435.12l-63.918-52.298
-	c-13.217,7.562-27.471,13.513-42.491,17.604L 296.229,480.00l-80.458,0.00 l-7.957-79.573c-15.021-4.093-29.274-10.043-42.49-17.604
-	L 101.405,435.12L 44.88,378.595l 52.298-63.918c-7.562-13.216-13.513-27.47-17.605-42.49L0.00,264.229l0.00-80.458 l 79.573-7.957
-	c 4.093-15.021, 10.043-29.274, 17.605-42.491L 44.88,69.405l 56.524-56.524l 63.919,52.298c 13.216-7.562, 27.47-13.514, 42.49-17.605
-	L 215.771-32.00l 80.458,0.00 l 7.957,79.572c 15.021,4.093, 29.274,10.044, 42.491,17.605l 63.918-52.298l 56.524,56.524l-52.298,63.918
-	c 7.562,13.217, 13.514,27.471, 17.605,42.49L 512.00,183.771z M 352.00,192.00l-64.00-64.00l-64.00,0.00 l-64.00,64.00l0.00,64.00 l 64.00,64.00l 64.00,0.00 l 64.00-64.00L 352.00,192.00 z"  />
-<glyph unicode="&#xe001;" d="M 451.716,380.285l-71.432,71.431C 364.728,467.272, 334.00,480.00, 312.00,480.00L 72.00,480.00 C 50.00,480.00, 32.00,462.00, 32.00,440.00l0.00-432.00 c0.00-22.00, 18.00-40.00, 40.00-40.00l 368.00,0.00 c 22.00,0.00, 40.00,18.00, 40.00,40.00
-	L 480.00,312.00 C 480.00,334.00, 467.272,364.729, 451.716,380.285z M 429.089,357.657c 1.565-1.565, 3.125-3.487, 4.64-5.657L 352.00,352.00 L 352.00,433.728 
-	c 2.17-1.515, 4.092-3.075, 5.657-4.64L 429.089,357.657z M 448.00,8.00c0.00-4.336-3.664-8.00-8.00-8.00L 72.00,0.00 c-4.336,0.00-8.00,3.664-8.00,8.00L 64.00,440.00 c0.00,4.336, 3.664,8.00, 8.00,8.00
-	l 240.00,0.00 c 2.416,0.00, 5.127-0.305, 8.00-0.852L 320.00,320.00 l 127.148,0.00 c 0.547-2.873, 0.852-5.583, 0.852-8.00L 448.00,8.00 z"  />
-<glyph unicode="&#xe000;" d="M 448.00,480.00L0.00,480.00 l0.00-512.00 l 512.00,0.00 L 512.00,416.00 L 448.00,480.00z M 256.00,416.00l 64.00,0.00 l0.00-128.00 l-64.00,0.00 L 256.00,416.00 z M 448.00,32.00L 64.00,32.00 L 64.00,416.00 l 32.00,0.00 l0.00-160.00 l 288.00,0.00 L 384.00,416.00 l 37.489,0.00 L 448.00,389.491L 448.00,32.00 z"  />
-<glyph unicode="&#xe033;" d="M 64.00,208.00L 208.00,64.00L 448.00,304.00L 384.00,368.00L 208.00,192.00L 128.00,272.00 z" />
-<glyph unicode="&#x20;" horiz-adv-x="256" />
-<glyph class="hidden" unicode="&#xf000;" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" />
-</font></defs></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/icomoon.ttf b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/icomoon.ttf
deleted file mode 100755
index 4529badb8748c5a7310bf7e835e51fe8a0fe277a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8032
zcmds6eQaCTbw7t+kNPIVk0(*G^vEZXl5I&OpGeBJtvtDw+{F2yQ^#J?*?YEQJ8^A`
za1tzWllTD+(qQX4BW=?zD>g10x+2X0BQ3I_%ZfL&%O69x8fZ2YMTYQ?q40(+Fg6tE
zR)E^?Ts}Hd;$$hXzxMd<J@@mRd(S;z_mP;02FRr#)mK*!-hJwG-`-9%u@|jl`}VG^
z(kY6dK8d<<@2BU>^MCpF1QGul>W5C8JJ$Hw({Fu?DDY*py>a^3qmA`-V4{gJ^hZyh
zee#s~ay>y5`T<e;3lE<>_RufyIWUaAw~?w3qahTa5zI}ZKKbyu$DTO*t<WE$eiik9
zKD&0}*jFQ8e+KjGs6Te@*b@!<Ejot&MbwS+$IhL+_ox4PooE#O{9I%0(Z}wb`0+k0
z{U=z{UXr~bEo9s2-x%8UbLtDAf#~lhqH|rieq;Te0CNlVD0RBk9B!?@LvsOIztN@u
zD@-z_`|MCHJLo74sV14(8D;xJI6!=b!W8AZ_!Qdq`S9o1@3UAPg~6xp6YCZL>!(&8
zBD+O52y1B39M+a~)tY2bcZu{$r;NHQZAdXB1F7!U9Y7mNAkz8`zny$&yss|pgMR9c
z5%{n_E(7@fIgZ~a<4U*a-#A{%8|yNso4V~bn&c7QNE!oI<#`=7DUDHxUIL7EPph?X
zgCKKwgkzmjY*CGc+~TQHg%-%7GL@)E^E5}Zw4JumR+^z{Do~!LXp&6IQI-svpmEv)
zDx;LaISrFeX-ZL&5_B8IDTdP?gtqikAN5iX)}TQ<!dO#HR?DE+SuS9Ab7~QO*6rNb
z_W!kf7ySwSBmIJhxy<MJ%ls<8&Ho+92aX5+Ht?^(rC=lY&EUU<#zT8UXF@N9z8Sh6
z4ul^HzZ`xe{BC4x<Y44%<QLin?FH>M?RqpBU5Z|ezTRW>9PerMMtZmR-q-s?@0)#*
zzUjWjzE$v_)?3gw4`-3YsTRS1vtVl3pjFEztU0bMRLkj9QZH013;A3mnYPL`Jzc(?
ztElFsGs)Mk#jYCcjpfsAGX7(_TyNB8PYf>B7Z;~T^~2FjPq6133zL%zliW1yb!xS}
z!PV`H_4;D$$;0~S^dd$Mp6J7<%%?GEasdZBL@wFfWCzlrL1u;^M>=F{0`gXX49-I?
zYqS%qwNj>rl=4$y1FUUmmwxHnnAkN8+fa`J$UId;hVspq9W=<}sJyB2_cD>gu+PU9
zWV;`$O+gpH$x6YDTd8ckpquhqSVcCRtymS5xal}8k8Q`YJiJY39mlXvj_rV+({^1p
zEbH5r?X+B{<$y*2S_I36vl@g(Q6if%<LXzDgWy8VWwP<i?b*X$#B|SYyX>~z)}CMA
z({>sSpa2fzBXDTC*1Cz~h4-QG1OrnYnWxt9{uOvPr*0w*nu;*y$l1|UI;ll+g?z<I
zrpu5b6Xk_kwXCO8W>>_**;JO#m&<eRT-n}n&yF1hdu~&$?FFb!|1{N@GR>*QOg;}h
z8!HC386XF1ZGvtb=OL1kjO6mW1ww*r)rz9x*hil|YG=j{j%9EFb{l)Uw(H=*UDvKn
z=$VW@an;7^v2Osi?>@kk8H6ZRtb|#?R-1MUi9Mt38U|!a#s@dh9-%CDE&8)97~dHv
zOQ~Q%aU$DT2No&u@$vl?+cpf_sqD{v&q|Gtr>uIto|>3=*PO5HZ`=DTxt)KEZF(*;
z+1q+cttTi_A(Eabr?;?%Wz{O#isv}jl4DJ$xlWL$)>!h2V>@_dZGrV0!W{4=30qAp
z^v#MKMNW%omR7KqSeNak*f?_e@{v1EpMJqA^d4z6?(2W%J1%y5`MZ~kr(Za|kgvM#
zedoaeg;%?&1MlhVD9)UK$&?jtOhG+cvyixu)l4KC%X8dr9*wr$Xe`QhwB3xd6x&|3
zWpp1lS}o6Oljk*?@VuMob}U85PIRoq?et072Yu<TK(<yfE1F*~Kq+Oj`v20;*?2Y)
z&&EA0(#Do;qtz)Hwqx9)4YCAQ8Eq0XV;HVsEBk?YuF?EJ3mX{SLc}CT)3M18>>eV(
znk-i=hnX^`QZOD!Ejdfa#w4=Y^`z|Bp69xRM<WBWfgk*B92Rp99=uAs6bCGkLe53D
zu;4VODyEc^>76VbQJpEPT;0tJW?Ad-$x3L2nqGr&CI;+*1hxvxHIPUQfT&~xiF6u`
zw(VYP%<Q|$j^jzM=cyS@%xD&i1Bq5*plH-><p8djcYYP2>CJPCV5Lb|cW71t#0s!O
z1r6#|gUl3aL!u>mEkG-0s%KXIMl$c0D;{cRQCc~}Eh(Q_QJL5Noa&N6D`$j;FY7_&
zKOl{;o3O#%Z3{!ye)B<Ww<;C_PR(V4F>u<p+9wk>nfM*g`}{z1U?2&V2P?2K*HxhH
zH7`p007$*(2Q+vA9o(NmtN2amSHO3elRg#boob1ctF=MS<qK&(^VW+mzV+gtzIN%-
zYnR&B6PZLJ^JA4aPaR4}AH4WrG|erHc=4_F_b}wrYj4UB|9x{ZvwZmQGISdDsv|>)
zfMI(qFtV})Uk(qRN~T4*b*pmIxkog1T*E6bL8q6>p5g9$03;sRXV~s%)5mw$*VgL0
zkEcKD+ObSyRV>14Ludq`c@At)3v#N<*@+(2AV*e8Gqr-LYgSFS3hY8QZRh;nqeu6;
zuFCnz5#x?=q}tJ=u8SnNlsyxf2d=3NxPl*zYs5#zGhJLtuJ{Jl)v-gsSHYRfxsS3Q
z3@Z_XMC+Ok1!_4s=jOIkOUF61ygbo;4Ld+~yUEYT+Rr=PM)Y=gOI|=&93+YZtGFT-
z2SJE!@u1K1X>X2OXaq)tE7q2PSxJCd(CCWnbP7rQQW#Ja90;Myu4^E%jjW9f1@^?G
zV9Ac*IFL#_ZYMPXI;0<lMfe)KBvBLH&X#Tk&0xaP%|F`m?3Nu)!+CCU%TXKCZMZs;
zNundzE$&=Buottm8}(d78)t}Rep0*xq*RY6r(MVws<moOq)7Z&A+4wNNI^M{6guF<
z^-7-ae(AZ{+2<r%CncQUAJ1l2v)S?D<YaMpG=_jLHad(-_`r7$%ua2s?tf)}b?X${
zD?4|tAcd7kpC5|i85)_M9_fz`Z$X?my=6GskNV$l-I~tTX2<gRvDsP<%Z1*FC;J(H
z1N)ZfOZlCy-idBWq&m+LO|OP)`GS_#%v5rMYXz=18;xe8c<_mXc>g_pSAN?B-@h$?
zS9<C9jYvItC%fowG`}F-2cJ<LOKQ|kCmOPcVO9fVKo45%U=`qbLW9uPEG7O;*OlW#
z!r?h6$s_AkG76rHjCSnA1|QzhqN;B-x+l=GZFe96L*IP;)r%Kjz1V(J*$UTYSR)69
z)v)VmzWC}Z%03WIljPROP0-jJLxW{X5`6<NDyzKPhI%*!gWHDU%EJb%AvvmSw_7eZ
zRb<&z4G<%UQm4;zKvU!iO!4Us!LloALHN&zx-dj?dNv^jU3{MBj!ln^P48{HaQ{H;
zDCEvV(l`bQZ5BJ|9N32@_!W|UCE_(b9xQ0_tkY~7u8R){@SV*jmV7sAU&8&8@O47?
zo1+!FgYKpSbU!^nN8nF!of+atZl3cCxW-szy@nVREszJf*eoHEhC~nXAfu-uW6J1}
zIS5rXT!7^A6BeHcb(JV0Eba<W>hFen5A=@qmU;mOqmgVXlhqICdP!f_52Ql3{j^)i
z-f~>~aVPCma1DWe{x*vD8;0vRUyMWtfeuJV0YcdrFfIcnFz(d<#fRBj4cZPIkHcDg
z1u*5b3`hduzQ^E8AL4=oxa6m+vgLdP+d~BYf54gF8%$__ps~si-g1{8mm8lSWME3D
zy#H3)`&c}H<d)XoQSlHWWv=L2B|jKQ>vMsn02>HX4ozu^+sv81k;UWu&{LjwiH*wY
z-t5!^hY##BA$+XjsULx7m>*u^xqy}`)Kb;)z##L}w<WZxLx{bWk1vk&%^2Ces}+MU
zdEQfO?mBSz0i_BAJ!IJAH~}Bxbg`%iv8q-|BJOJT11*jD<>e!LE+5%5-=p>L^rjl&
zI=5#ocI2`>-_ygJDnyZvvTX7{>5iAu;i<Ym4W&e?AdX9EuW|;^VozG2K%O!uVp7;v
zI{ho)-Oc)k;N5`M1=fi0Rq1HQKE-ioMzmDJ+Qh3$Du|PWtAt{8A`9`H61+>=v~mX#
zwTd&GjwNEU@xnbC?f>#4gx_ppjA00mHqlLVyoJOE-Cw}BQ(b%2g_}rvxQK0ju|XJm
zo1ar1FKx)>ST@t0!Pm8A*d=u@kpKWeuEYaK2-4ybl1p5Q%c?3>;tP2;#gCyK0#w^j
z);E+P&`h59#uyyU*ib4p^tGXst@2d+`%h_oeVSySF|?i@O|n0~*~Tp}2eVu^HPpT?
zQ{Q+)avmN^wY{Ff9=xqh0DB7GJj2ennLNG_LdWEiar35eb3ZAo7MGoBm24_ev1-_A
zJj=}<t)Xrf4O!EbmLtx@!Qoj0P7{XRu4_Gp#NkGd*7md>m_~9TnnwH2EW=>~9szO$
z{r+p3q8;Gr{fHkyzfh|#Ak-7Hu9-Ov)?B__RbjVb=%kbn!?M7p!^YQ^xCT!E`&aFR
z3dyt>`#HvE3aDvWAIIzz|5a{w&~S%`J#To}H3nyM6WWNL+iuQ8v)Sm3xjm<kXzhQ9
zqzC)^<B4!2JuuK8OCHH*GWpE&iFkkiU^)^`#`*^a0G~F2sV=DMz-5l#n@O89RyJ$R
znCZ;Dc^Q(3_o<<ndJj-!^1rK)-b9XI1NV&&#G5K6?MiYNib}peZO}(S^P#x9mZRY7
z$0qewCPP{jHWyz)T>DqV<#f%D(_P`m!`0mz#7X_sD(p@?a!X9Ys;=%A@C}isDhOzC
z-^|am2}_KNC;VUvL9C|N(i3bU)YWT<cnkPOQNj0$0M#RX3yXGAkJh7l(q3HXi_~w?
z)UiQ-@sVS?(_(5c_#gD;xP@DP24C5UA%JpO7i(Z;5pTl=XldAqw4O+s*&OOH271bZ
zX#U_+eKWBevEktuH)6x_Tp)N~F!*4!eI**b5ei*me(F<w@!?pzu7(uj(|tjV2(&*F
zjq=qfUkZglzss8t;wOAzl$bD{g~BGX@)fgU>2d+V{~=`C9zJ%lF*Pc27h*WXhi<bu
zN>E!EUXL3hO~N~^U|+dmU#(wLIr_Uaa1wFOsv`r6&eKmX$_PA68oX_%96)*6F9+d4
zpYY2ew7=??CG!5EUyh*tI(EaM9<<==kYASj>abr9(ki}ncgBR!{&l|`#=jQd@yijk
z|AZc)6SPL>kk;rt(IY3;&aJJXa37td)ATr<rDJpf)sv?mKYI*?RW<H01utO4Niy*L
zWe(H~`UKKue4VxuE#lr)LMmfi3E#G9b?y9Pt7{idpESyIMdK5OPZy=q;%sTQTr6SG
zW?b*B?GUJ5phwX!Yc_yU=+mK-7ao0N?YvQ%L*>KfDjiX0@L|~wbv^+OaF9bB<_K#X
z<sR<kKJMoM#LYt-<2c{O2~Ki~)2!paj1kW8D39?L9_I-*ILkRUd6K6%&jp_58QuzE
z-_El<$Mam|68`<Lc!4Wi<(l^R`A1fY)`AbqJ}mjL*n#C$AFlXtuMa=z!#zG+_Tdg6
zF8a`?Q?B~;iVuCdWy`Po^vgc|vQNL{(=Yk-OFsRQPru~TFZuLKKK+tUzvR;|`SeRZ
z{gO|=<kK(t^h-Ydl25<r(=Yn;i$49LPrvBXFZ%S0KK-Ikzv$C1`t*xF{i095=+iIy
z^ou_IqEFva{j0?y#ETgJC?dE+Ni<OYxmJz}y0wT_xg){?;E@sZ!`(0cNZ`i*m;VRT
CcEy?i

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/icomoon.woff b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/icomoon.woff
deleted file mode 100755
index 33eea8ea6553ee03d51539328686900e6f48611b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8340
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

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/readme.md b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/readme.md
index 253012e724..fa5d63946c 100755
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/readme.md
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/readme.md
@@ -1 +1 @@
-Icons are generated and provided by the http://icomoon.io service.
+Icons are generated and provided by the http://icomoon.io service.
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.eot b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.eot
new file mode 100644
index 0000000000000000000000000000000000000000..b144ba0bd949de3c0f87abdd78b517067169884f
GIT binary patch
literal 9492
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
a@gt-tewA|!qxK@v&x`Qu4XoB(um1(SgK0(p

literal 0
HcmV?d00001

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.json b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.json
new file mode 100644
index 0000000000..ed0d0efff9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.json
@@ -0,0 +1,1277 @@
+{
+  "IcoMoonType": "selection",
+  "icons": [
+    {
+      "icon": {
+        "paths": [
+          "M704 832v-37.004c151.348-61.628 256-193.82 256-346.996 0-212.078-200.576-384-448-384s-448 171.922-448 384c0 153.176 104.654 285.368 256 346.996v37.004h-192l-64-96v224h320v-222.812c-100.9-51.362-170.666-161.54-170.666-289.188 0-176.732 133.718-320 298.666-320 164.948 0 298.666 143.268 298.666 320 0 127.648-69.766 237.826-170.666 289.188v222.812h320v-224l-64 96h-192z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57376,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 0,
+        "order": 1,
+        "prevSize": 32,
+        "code": 57376,
+        "name": "charmap",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 0
+    },
+    {
+      "icon": {
+        "paths": [
+          "M256 64v896l256-256 256 256v-896h-512zM704 789.49l-192-192-192 192v-661.49h384v661.49z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57363,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 1,
+        "order": 2,
+        "prevSize": 32,
+        "code": 57363,
+        "name": "bookmark",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 1
+    },
+    {
+      "icon": {
+        "paths": [
+          "M927.274 230.216l-133.49-133.488c-21.104-21.104-49.232-32.728-79.198-32.728s-58.094 11.624-79.196 32.726l-165.492 165.49c-43.668 43.668-43.668 114.724 0 158.392l2.746 2.746 67.882-67.882-2.746-2.746c-6.132-6.132-6.132-16.494 0-22.626l165.492-165.492c4.010-4.008 8.808-4.608 11.312-4.608s7.302 0.598 11.312 4.61l133.49 133.488c6.132 6.134 6.132 16.498 0.002 22.628l-165.494 165.494c-4.008 4.008-8.806 4.608-11.31 4.608s-7.302-0.6-11.312-4.612l-2.746-2.746-67.88 67.884 2.742 2.742c21.106 21.108 49.23 32.728 79.2 32.728s58.094-11.624 79.196-32.726l165.494-165.492c43.662-43.666 43.662-114.72-0.004-158.39zM551.356 600.644l-67.882 67.882 2.746 2.746c4.008 4.008 4.61 8.806 4.61 11.31 0 2.506-0.598 7.302-4.606 11.314l-165.494 165.49c-4.010 4.010-8.81 4.61-11.314 4.61s-7.304-0.6-11.314-4.61l-133.492-133.486c-4.010-4.010-4.61-8.81-4.61-11.314s0.598-7.3 4.61-11.312l165.49-165.488c4.010-4.012 8.81-4.612 11.314-4.612s7.304 0.6 11.314 4.612l2.746 2.742 67.882-67.88-2.746-2.746c-21.104-21.104-49.23-32.726-79.196-32.726s-58.092 11.624-79.196 32.726l-165.488 165.486c-21.106 21.104-32.73 49.234-32.73 79.198s11.624 58.094 32.726 79.198l133.49 133.49c21.106 21.102 49.232 32.726 79.198 32.726s58.092-11.624 79.196-32.726l165.494-165.492c21.104-21.104 32.722-49.23 32.722-79.196s-11.624-58.094-32.726-79.196l-2.744-2.746zM800 838c-9.724 0-19.45-3.708-26.87-11.13l-128-127.998c-14.844-14.84-14.844-38.898 0-53.738 14.84-14.844 38.896-14.844 53.736 0l128 128c14.844 14.84 14.844 38.896 0 53.736-7.416 7.422-17.142 11.13-26.866 11.13zM608 960c-17.674 0-32-14.326-32-32v-128c0-17.674 14.326-32 32-32s32 14.326 32 32v128c0 17.674-14.326 32-32 32zM928 640h-128c-17.674 0-32-14.326-32-32s14.326-32 32-32h128c17.674 0 32 14.326 32 32s-14.326 32-32 32zM224 186c9.724 0 19.45 3.708 26.87 11.13l128 128c14.842 14.84 14.842 38.898 0 53.738-14.84 14.844-38.898 14.844-53.738 0l-128-128c-14.842-14.84-14.842-38.898 0-53.738 7.418-7.422 17.144-11.13 26.868-11.13zM416 64c17.674 0 32 14.326 32 32v128c0 17.674-14.326 32-32 32s-32-14.326-32-32v-128c0-17.674 14.326-32 32-32zM96 384h128c17.674 0 32 14.326 32 32s-14.326 32-32 32h-128c-17.674 0-32-14.326-32-32s14.326-32 32-32z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57362,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 2,
+        "order": 3,
+        "prevSize": 32,
+        "code": 57362,
+        "name": "link",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 2
+    },
+    {
+      "icon": {
+        "paths": [
+          "M927.274 230.216l-133.49-133.488c-21.104-21.104-49.232-32.728-79.198-32.728s-58.094 11.624-79.196 32.726l-165.492 165.49c-43.668 43.668-43.668 114.724 0 158.392l2.746 2.746 67.882-67.882-2.746-2.746c-6.132-6.132-6.132-16.494 0-22.626l165.492-165.492c4.010-4.008 8.808-4.608 11.312-4.608s7.302 0.598 11.312 4.61l133.49 133.488c6.132 6.134 6.132 16.498 0.002 22.628l-165.494 165.494c-4.008 4.008-8.806 4.608-11.31 4.608s-7.302-0.6-11.312-4.612l-2.746-2.746-67.88 67.884 2.742 2.742c21.106 21.108 49.23 32.728 79.2 32.728s58.094-11.624 79.196-32.726l165.494-165.492c43.662-43.666 43.662-114.72-0.004-158.39zM551.356 600.644l-67.882 67.882 2.746 2.746c4.008 4.008 4.61 8.806 4.61 11.31 0 2.506-0.598 7.302-4.606 11.314l-165.494 165.49c-4.010 4.010-8.81 4.61-11.314 4.61s-7.304-0.6-11.314-4.61l-133.492-133.486c-4.010-4.010-4.61-8.81-4.61-11.314s0.598-7.3 4.61-11.312l165.49-165.488c4.010-4.012 8.81-4.612 11.314-4.612s7.304 0.6 11.314 4.612l2.746 2.742 67.882-67.88-2.746-2.746c-21.104-21.104-49.23-32.726-79.196-32.726s-58.092 11.624-79.196 32.726l-165.488 165.486c-21.106 21.104-32.73 49.234-32.73 79.198s11.624 58.094 32.726 79.198l133.49 133.49c21.106 21.102 49.232 32.726 79.198 32.726s58.092-11.624 79.196-32.726l165.494-165.492c21.104-21.104 32.722-49.23 32.722-79.196s-11.624-58.094-32.726-79.196l-2.744-2.746zM352 710c-9.724 0-19.45-3.71-26.87-11.128-14.84-14.84-14.84-38.898 0-53.738l320-320c14.84-14.84 38.896-14.84 53.736 0 14.844 14.84 14.844 38.9 0 53.74l-320 320c-7.416 7.416-17.142 11.126-26.866 11.126z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57361,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 3,
+        "order": 4,
+        "prevSize": 32,
+        "code": 57361,
+        "name": "unlink",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 3
+    },
+    {
+      "icon": {
+        "paths": [
+          "M576 281.326v-217.326l336.002 336-336.002 336v-222.096c-390.906-9.17-315 247.096-256 446.096-288-320-212.092-690.874 256-678.674z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57360,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 4,
+        "order": 5,
+        "prevSize": 32,
+        "code": 57360,
+        "name": "redo",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 4
+    },
+    {
+      "icon": {
+        "paths": [
+          "M704 960c59-199 134.906-455.266-256-446.096v222.096l-336.002-336 336.002-336v217.326c468.092-12.2 544 358.674 256 678.674z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57359,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 5,
+        "order": 6,
+        "prevSize": 32,
+        "code": 57359,
+        "name": "undo",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 5
+    },
+    {
+      "icon": {
+        "paths": [
+          "M256.428 424.726c105.8 0 191.572 91.17 191.572 203.638 0 112.464-85.772 203.636-191.572 203.636-105.802 0-191.572-91.17-191.572-203.636l-0.856-29.092c0-224.93 171.54-407.272 383.144-407.272v116.364c-73.1 0-141.826 30.26-193.516 85.204-9.954 10.578-19.034 21.834-27.224 33.656 9.784-1.64 19.806-2.498 30.024-2.498zM768.428 424.726c105.8 0 191.572 91.17 191.572 203.638 0 112.464-85.772 203.636-191.572 203.636-105.802 0-191.572-91.17-191.572-203.636l-0.856-29.092c0-224.93 171.54-407.272 383.144-407.272v116.364c-73.1 0-141.826 30.26-193.516 85.204-9.956 10.578-19.036 21.834-27.224 33.656 9.784-1.64 19.806-2.498 30.024-2.498z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57358,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 6,
+        "order": 7,
+        "prevSize": 32,
+        "code": 57358,
+        "name": "blockquote",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 6
+    },
+    {
+      "icon": {
+        "paths": [
+          "M64 192h896v128h-896zM384 576h576v128h-576zM384 384h576v128h-576zM64 768h896v128h-896zM64 384l224 160-224 160z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57356,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 7,
+        "order": 8,
+        "prevSize": 32,
+        "code": 57356,
+        "name": "indent",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 7
+    },
+    {
+      "icon": {
+        "paths": [
+          "M64 192h896v128h-896zM64 576h576v128h-576zM64 384h576v128h-576zM64 768h896v128h-896zM960 384l-224 160 224 160z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57357,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 8,
+        "order": 9,
+        "prevSize": 32,
+        "code": 57357,
+        "name": "outdent",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 8
+    },
+    {
+      "icon": {
+        "paths": [
+          "M384 128h576v128h-576zM384 448h576v128h-576zM384 768h576v128h-576zM320 530v-146h-64v-320h-128v64h64v256h-64v64h128v50l-128 60v146h128v64h-128v64h128v64h-128v64h192v-320h-128v-50z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57355,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 9,
+        "order": 10,
+        "prevSize": 32,
+        "code": 57355,
+        "name": "numlist",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 9
+    },
+    {
+      "icon": {
+        "paths": [
+          "M384 128h576v128h-576zM384 448h576v128h-576zM384 768h576v128h-576zM128 192c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM128 512c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM128 832c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57354,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 10,
+        "order": 11,
+        "prevSize": 32,
+        "code": 57354,
+        "name": "bullist",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 10
+    },
+    {
+      "icon": {
+        "paths": [
+          "M888 384h-56v-256h64v-64h-320v64h64v256h-256v-256h64v-64h-320v64h64v256h-56c-39.6 0-72 32.4-72 72v432c0 39.6 32.4 72 72 72h240c39.6 0 72-32.4 72-72v-312h128v312c0 39.6 32.4 72 72 72h240c39.6 0 72-32.4 72-72v-432c0-39.6-32.4-72-72-72zM348 896h-184c-19.8 0-36-14.4-36-32s16.2-32 36-32h184c19.8 0 36 14.4 36 32s-16.2 32-36 32zM544 512h-64c-17.6 0-32-14.4-32-32s14.4-32 32-32h64c17.6 0 32 14.4 32 32s-14.4 32-32 32zM860 896h-184c-19.8 0-36-14.4-36-32s16.2-32 36-32h184c19.8 0 36 14.4 36 32s-16.2 32-36 32z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57353,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 11,
+        "order": 12,
+        "prevSize": 32,
+        "code": 57353,
+        "name": "searchreplace",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 11
+    },
+    {
+      "icon": {
+        "paths": [
+          "M704 384v-160c0-17.6-14.4-32-32-32h-160v-64c0-35.2-28.8-64-64-64h-128c-35.204 0-64 28.8-64 64v64h-160c-17.602 0-32 14.4-32 32v512c0 17.6 14.398 32 32 32h224v192h384l192-192v-384h-192zM320 128.114c0.034-0.038 0.072-0.078 0.114-0.114h127.768c0.042 0.036 0.082 0.076 0.118 0.114l0 63.886h-128v-63.886zM192 320v-64h384v64h-384zM704 869.49v-101.49h101.49l-101.49 101.49zM832 704h-192v192h-256v-448h448v256z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57352,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 12,
+        "order": 13,
+        "prevSize": 32,
+        "code": 57352,
+        "name": "paste",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 12
+    },
+    {
+      "icon": {
+        "paths": [
+          "M832 320h-192v-64l-192-192h-384v704h384v192h576v-448l-192-192zM832 410.51l101.49 101.49h-101.49v-101.49zM448 154.51l101.49 101.49h-101.49v-101.49zM128 128h256v192h192v384h-448v-576zM960 896h-448v-128h128v-384h128v192h192v320z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57393,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 13,
+        "order": 14,
+        "prevSize": 32,
+        "code": 57393,
+        "name": "copy",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 13
+    },
+    {
+      "icon": {
+        "paths": [
+          "M960 512h-265.876c-50.078-35.42-114.43-54.86-182.124-54.86-89.206 0-164.572-50.242-164.572-109.712 0-59.47 75.366-109.714 164.572-109.714 75.058 0 140.308 35.576 159.12 82.286h113.016c-7.93-50.644-37.58-97.968-84.058-132.826-50.88-38.16-117.676-59.174-188.078-59.174-70.404 0-137.196 21.014-188.074 59.174-54.788 41.090-86.212 99.502-86.212 160.254s31.424 119.164 86.212 160.254c1.956 1.466 3.942 2.898 5.946 4.316h-265.872v64h512.532c58.208 17.106 100.042 56.27 100.042 100.572 0 59.468-75.368 109.71-164.572 109.71-75.060 0-140.308-35.574-159.118-82.286h-113.016c7.93 50.64 37.582 97.968 84.060 132.826 50.876 38.164 117.668 59.18 188.072 59.18 70.402 0 137.198-21.016 188.074-59.174 54.79-41.090 86.208-99.502 86.208-160.254 0-35.298-10.654-69.792-30.294-100.572h204.012v-64z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57389,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 19,
+        "order": 15,
+        "prevSize": 32,
+        "code": 57389,
+        "name": "strikethrough",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 14
+    },
+    {
+      "icon": {
+        "paths": [
+          "M192 832h576v64h-576v-64zM640 128v384c0 31.312-14.7 61.624-41.39 85.352-30.942 27.502-73.068 42.648-118.61 42.648-45.544 0-87.668-15.146-118.608-42.648-26.692-23.728-41.392-54.040-41.392-85.352v-384h-128v384c0 141.382 128.942 256 288 256s288-114.618 288-256v-384h-128z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57388,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 20,
+        "order": 16,
+        "prevSize": 32,
+        "code": 57388,
+        "name": "underline",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 15
+    },
+    {
+      "icon": {
+        "paths": [
+          "M832 128v64h-144l-256 640h144v64h-448v-64h144l256-640h-144v-64h448z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57387,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 21,
+        "order": 17,
+        "prevSize": 32,
+        "code": 57387,
+        "name": "italic",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 16
+    },
+    {
+      "icon": {
+        "paths": [
+          "M625.442 494.182c48.074-38.15 78.558-94.856 78.558-158.182 0-114.876-100.29-208-224-208h-224v768h288c123.712 0 224-93.124 224-208 0-88.196-59.118-163.562-142.558-193.818zM384 304c0-26.51 21.49-48 48-48h67.204c42.414 0 76.796 42.98 76.796 96s-34.382 96-76.796 96h-115.204v-144zM547.2 768h-115.2c-26.51 0-48-21.49-48-48v-144h163.2c42.418 0 76.8 42.98 76.8 96s-34.382 96-76.8 96z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57386,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 22,
+        "order": 18,
+        "prevSize": 32,
+        "code": 57386,
+        "name": "bold",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 17
+    },
+    {
+      "icon": {
+        "paths": [
+          "M850.746 242.746l-133.492-133.49c-24.888-24.892-74.054-45.256-109.254-45.256h-416c-35.2 0-64 28.8-64 64v768c0 35.2 28.8 64 64 64h640c35.2 0 64-28.8 64-64v-544c0-35.2-20.366-84.364-45.254-109.254zM805.49 287.998c6.792 6.796 13.792 19.162 18.894 32.002h-184.384v-184.386c12.84 5.1 25.204 12.1 32 18.896l133.49 133.488zM831.884 896h-639.77c-0.040-0.034-0.082-0.076-0.114-0.116v-767.77c0.034-0.040 0.076-0.082 0.114-0.114h383.886v256h256v511.884c-0.034 0.040-0.076 0.082-0.116 0.116z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57345,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 23,
+        "order": 19,
+        "prevSize": 32,
+        "code": 57345,
+        "name": "newdocument",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 18
+    },
+    {
+      "icon": {
+        "paths": [
+          "M960 880v-591.938l-223.938-224.062h-592.062c-44.182 0-80 35.816-80 80v736c0 44.184 35.818 80 80 80h736c44.184 0 80-35.816 80-80zM576 192h64v192h-64v-192zM704 832h-384v-255.882c0.034-0.042 0.076-0.082 0.116-0.118h383.77c0.040 0.036 0.082 0.076 0.116 0.118l-0.002 255.882zM832 832h-64v-256c0-35.2-28.8-64-64-64h-384c-35.2 0-64 28.8-64 64v256h-64v-640h64v192c0 35.2 28.8 64 64 64h320c35.2 0 64-28.8 64-64v-171.010l128 128.072v490.938z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57344,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 24,
+        "order": 20,
+        "prevSize": 32,
+        "code": 57344,
+        "name": "save",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 19
+    },
+    {
+      "icon": {
+        "paths": [
+          "M64 192v704h896v-704h-896zM384 640v-128h256v128h-256zM640 704v128h-256v-128h256zM640 320v128h-256v-128h256zM320 320v128h-192v-128h192zM128 512h192v128h-192v-128zM704 512h192v128h-192v-128zM704 448v-128h192v128h-192zM128 704h192v128h-192v-128zM704 832v-128h192v128h-192z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57371,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 25,
+        "order": 21,
+        "prevSize": 32,
+        "code": 57371,
+        "name": "table",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 20
+    },
+    {
+      "icon": {
+        "paths": [
+          "M512 140c99.366 0 192.782 38.694 263.042 108.956s108.958 163.678 108.958 263.044-38.696 192.782-108.958 263.042-163.676 108.958-263.042 108.958-192.782-38.696-263.044-108.958-108.956-163.676-108.956-263.042 38.694-192.782 108.956-263.044 163.678-108.956 263.044-108.956zM512 64c-247.424 0-448 200.576-448 448s200.576 448 448 448 448-200.576 448-448-200.576-448-448-448v0zM320 384c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM576 384c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM512 656c-101.84 0-192.56-36.874-251.166-94.328 23.126 117.608 126.778 206.328 251.166 206.328 124.388 0 228.040-88.72 251.168-206.328-58.608 57.454-149.328 94.328-251.168 94.328z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57377,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 26,
+        "order": 22,
+        "prevSize": 32,
+        "code": 57377,
+        "name": "emoticons",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 21
+    },
+    {
+      "icon": {
+        "paths": [
+          "M480 384l-192-192 128-128h-352v352l128-128 192 192zM640 480l192-192 128 128v-352h-352l128 128-192 192zM544 640l192 192-128 128h352v-352l-128 128-192-192zM384 544l-192 192-128-128v352h352l-128-128 192-192z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57379,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 27,
+        "order": 23,
+        "prevSize": 32,
+        "code": 57379,
+        "name": "fullscreen",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 22
+    },
+    {
+      "icon": {
+        "paths": [
+          "M64 448h896v128h-896z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57372,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 28,
+        "order": 24,
+        "prevSize": 32,
+        "code": 57372,
+        "name": "hr",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 23
+    },
+    {
+      "icon": {
+        "paths": [
+          "M64 768h512v128h-512v-128zM768 192h-220.558l-183.766 512h-132.288l183.762-512h-223.15v-128h576v128zM929.774 896l-129.774-129.774-129.774 129.774-62.226-62.226 129.774-129.774-129.774-129.774 62.226-62.226 129.774 129.774 129.774-129.774 62.226 62.226-129.774 129.774 129.774 129.774-62.226 62.226z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57373,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 29,
+        "order": 25,
+        "prevSize": 32,
+        "code": 57373,
+        "name": "removeformat",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 24
+    },
+    {
+      "icon": {
+        "paths": [
+          "M256 128h512v128h-512v-128zM896 320h-768c-35.2 0-64 28.8-64 64v256c0 35.2 28.796 64 64 64h128v192h512v-192h128c35.2 0 64-28.8 64-64v-256c0-35.2-28.8-64-64-64zM704 832h-384v-256h384v256zM910.4 416c0 25.626-20.774 46.4-46.398 46.4s-46.402-20.774-46.402-46.4 20.778-46.4 46.402-46.4c25.626 0 46.398 20.774 46.398 46.4z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57378,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 30,
+        "order": 26,
+        "prevSize": 32,
+        "code": 57378,
+        "name": "print",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 25
+    },
+    {
+      "icon": {
+        "paths": [
+          "M384 128c-123.712 0-224 100.288-224 224s100.288 224 224 224v320h128v-640h64v640h128v-640h128v-128h-448z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57390,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 31,
+        "order": 27,
+        "prevSize": 32,
+        "code": 57390,
+        "name": "visualchars",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 26
+    },
+    {
+      "icon": {
+        "paths": [
+          "M448 128c-123.712 0-224 100.288-224 224s100.288 224 224 224v320h128v-640h64v640h128v-640h128v-128h-448zM64 896l224-192-224-192z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57391,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 32,
+        "order": 28,
+        "prevSize": 32,
+        "code": 57391,
+        "name": "ltr",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 27
+    },
+    {
+      "icon": {
+        "paths": [
+          "M416 704l-192-192 192-192-64-64-256 256 256 256zM672 256l-64 64 192 192-192 192 64 64 256-256z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57367,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 38,
+        "order": 29,
+        "prevSize": 32,
+        "code": 57367,
+        "name": "code",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 28
+    },
+    {
+      "icon": {
+        "paths": [
+          "M448 704h128v128h-128v-128zM704 256c35.346 0 64 28.654 64 64v166l-228 154h-92v-64l192-128v-64h-320v-128h384zM512 64c-119.666 0-232.166 46.6-316.784 131.216-84.614 84.618-131.216 197.118-131.216 316.784 0 119.664 46.602 232.168 131.216 316.784 84.618 84.616 197.118 131.216 316.784 131.216 119.664 0 232.168-46.6 316.784-131.216 84.616-84.616 131.216-197.12 131.216-316.784 0-119.666-46.6-232.166-131.216-316.784-84.616-84.616-197.12-131.216-316.784-131.216z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57366,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 39,
+        "order": 30,
+        "prevSize": 32,
+        "code": 57366,
+        "name": "help",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 29
+    },
+    {
+      "icon": {
+        "paths": [
+          "M896 128h-768c-35.2 0-64 28.8-64 64v640c0 35.2 28.8 64 64 64h768c35.2 0 64-28.8 64-64v-640c0-35.2-28.8-64-64-64zM896 831.884c-0.012 0.014-0.030 0.028-0.042 0.042l-191.958-319.926-160 128-224-288-191.968 479.916c-0.010-0.010-0.022-0.022-0.032-0.032v-639.77c0.034-0.040 0.076-0.082 0.114-0.114h767.77c0.040 0.034 0.082 0.076 0.116 0.116v639.768zM640 352c0 53.019 42.981 96 96 96s96-42.981 96-96c0-53.019-42.981-96-96-96-53.019 0-96 42.981-96 96z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57364,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 40,
+        "order": 31,
+        "prevSize": 32,
+        "code": 57364,
+        "name": "image",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 30
+    },
+    {
+      "icon": {
+        "paths": [
+          "M896 128h-768c-35.2 0-64 28.8-64 64v640c0 35.2 28.8 64 64 64h768c35.2 0 64-28.8 64-64v-640c0-35.2-28.8-64-64-64zM256 832h-128v-128h128v128zM256 576h-128v-128h128v128zM256 320h-128v-128h128v128zM704 832h-384v-640h384v640zM896 832h-128v-128h128v128zM896 576h-128v-128h128v128zM896 320h-128v-128h128v128zM384 320v384l288-192z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57365,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 41,
+        "order": 32,
+        "prevSize": 32,
+        "code": 57365,
+        "name": "media",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 31
+    },
+    {
+      "icon": {
+        "paths": [
+          "M77.798 304.624l81.414 50.882c50.802-81.114 128.788-143.454 221.208-174.246l-30.366-91.094c-113.748 37.898-209.728 114.626-272.256 214.458zM673.946 90.166l-30.366 91.094c92.422 30.792 170.404 93.132 221.208 174.248l81.412-50.882c-62.526-99.834-158.506-176.562-272.254-214.46zM607.974 704.008c-4.808 0-9.692-1.090-14.286-3.386l-145.688-72.844v-211.778c0-17.672 14.328-32 32-32s32 14.328 32 32v172.222l110.31 55.156c15.806 7.902 22.214 27.124 14.31 42.932-5.604 11.214-16.908 17.696-28.646 17.698zM512 192c-212.078 0-384 171.922-384 384s171.922 384 384 384c212.078 0 384-171.922 384-384 0-212.078-171.922-384-384-384zM512 864c-159.058 0-288-128.942-288-288s128.942-288 288-288c159.058 0 288 128.942 288 288 0 159.058-128.942 288-288 288z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57368,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 42,
+        "order": 33,
+        "prevSize": 32,
+        "code": 57368,
+        "name": "insertdatetime",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 32
+    },
+    {
+      "icon": {
+        "paths": [
+          "M64 455.746c45.318-49.92 97.162-92.36 153.272-125.124 90.332-52.744 192.246-80.622 294.728-80.622 102.48 0 204.396 27.878 294.726 80.624 56.112 32.764 107.956 75.204 153.274 125.124v-117.432c-33.010-28.118-68.124-53.14-104.868-74.594-105.006-61.314-223.658-93.722-343.132-93.722s-238.128 32.408-343.134 93.72c-36.742 21.454-71.856 46.478-104.866 74.596v117.43zM512 320c-183.196 0-345.838 100.556-448 256 102.162 155.448 264.804 256 448 256 183.196 0 345.838-100.552 448-256-102.162-155.444-264.804-256-448-256zM512 512c0 35.346-28.654 64-64 64s-64-28.654-64-64c0-35.348 28.654-64 64-64s64 28.652 64 64zM728.066 696.662c-67.434 39.374-140.128 59.338-216.066 59.338s-148.632-19.964-216.066-59.338c-51.554-30.104-98.616-71.31-138.114-120.662 39.498-49.35 86.56-90.558 138.116-120.66 13.276-7.752 26.758-14.74 40.426-20.982-10.512 23.742-16.362 50.008-16.362 77.642 0 106.040 85.962 192 192 192 106.040 0 192-85.96 192-192 0-27.634-5.85-53.9-16.36-77.642 13.668 6.244 27.15 13.23 40.426 20.982 51.554 30.102 98.616 71.31 138.116 120.66-39.498 49.352-86.56 90.558-138.116 120.662z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57369,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 43,
+        "order": 34,
+        "prevSize": 32,
+        "code": 57369,
+        "name": "preview",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 33
+    },
+    {
+      "icon": {
+        "paths": [
+          "M651.168 283.834c-24.612-81.962-28.876-91.834-107.168-91.834h-64c-79.618 0-82.664 10.152-108.418 96 0 0.002 0 0.002-0.002 0.004l-143.998 479.996h113.636l57.6-192h226.366l57.6 192h113.63l-145.246-484.166zM437.218 448l38.4-136c10.086-33.618 36.38-30 36.38-30s26.294-3.618 36.38 30h0.004l38.4 136h-149.564z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57370,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 44,
+        "order": 35,
+        "prevSize": 32,
+        "code": 57370,
+        "name": "forecolor",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 34
+    },
+    {
+      "icon": {
+        "paths": [
+          "M576 64c247.424 0 448 200.576 448 448s-200.576 448-448 448v-96c94.024 0 182.418-36.614 248.902-103.098 66.484-66.484 103.098-154.878 103.098-248.902 0-94.022-36.614-182.418-103.098-248.902-66.484-66.484-154.878-103.098-248.902-103.098-94.022 0-182.418 36.614-248.902 103.098-51.14 51.138-84.582 115.246-97.306 184.902h186.208l-224 256-224-256h164.57c31.060-217.102 217.738-384 443.43-384zM768 448v128h-256v-320h128v192z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57384,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 45,
+        "order": 36,
+        "prevSize": 32,
+        "code": 57384,
+        "name": "restoredraft",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 35
+    },
+    {
+      "icon": {
+        "paths": [
+          "M1024 592.458v-160.916l-159.144-15.914c-8.186-30.042-20.088-58.548-35.21-84.98l104.596-127.838-113.052-113.050-127.836 104.596c-26.434-15.124-54.942-27.026-84.982-35.208l-15.914-159.148h-160.916l-15.914 159.146c-30.042 8.186-58.548 20.086-84.98 35.208l-127.838-104.594-113.050 113.050 104.596 127.836c-15.124 26.432-27.026 54.94-35.21 84.98l-159.146 15.916v160.916l159.146 15.914c8.186 30.042 20.086 58.548 35.21 84.982l-104.596 127.836 113.048 113.048 127.838-104.596c26.432 15.124 54.94 27.028 84.98 35.21l15.916 159.148h160.916l15.914-159.144c30.042-8.186 58.548-20.088 84.982-35.21l127.836 104.596 113.048-113.048-104.596-127.836c15.124-26.434 27.028-54.942 35.21-84.98l159.148-15.92zM704 576l-128 128h-128l-128-128v-128l128-128h128l128 128v128z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57346,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 46,
+        "order": 37,
+        "prevSize": 32,
+        "code": 57346,
+        "name": "fullpage",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 36
+    },
+    {
+      "icon": {
+        "paths": [
+          "M768 206v50h128v64h-192v-146l128-60v-50h-128v-64h192v146zM676 256h-136l-188 188-188-188h-136l256 256-256 256h136l188-188 188 188h136l-256-256z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57375,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 47,
+        "order": 38,
+        "prevSize": 32,
+        "code": 57375,
+        "name": "superscript",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 37
+    },
+    {
+      "icon": {
+        "paths": [
+          "M768 910v50h128v64h-192v-146l128-60v-50h-128v-64h192v146zM676 256h-136l-188 188-188-188h-136l256 256-256 256h136l188-188 188 188h136l-256-256z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57374,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 48,
+        "order": 39,
+        "prevSize": 32,
+        "code": 57374,
+        "name": "subscript",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 38
+    },
+    {
+      "icon": {
+        "paths": [
+          "M704 384v-160c0-17.6-14.4-32-32-32h-160v-64c0-35.2-28.8-64-64-64h-128c-35.204 0-64 28.8-64 64v64h-160c-17.602 0-32 14.4-32 32v512c0 17.6 14.398 32 32 32h224v192h576v-576h-192zM320 128.114c0.034-0.038 0.072-0.078 0.114-0.114h127.768c0.042 0.036 0.082 0.076 0.118 0.114l0 63.886h-128v-63.886zM192 320v-64h384v64h-384zM832 896h-448v-448h448v448zM448 512v128h32l32-64h64v192h-48v64h160v-64h-48v-192h64l32 64h32v-128z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "tags": [
+          "pastetext"
+        ],
+        "defaultCode": 57397,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 49,
+        "order": 40,
+        "prevSize": 32,
+        "code": 57397,
+        "name": "pastetext",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 39
+    },
+    {
+      "icon": {
+        "paths": [
+          "M768 256h64v64h-64zM640 384h64v64h-64zM640 512h64v64h-64zM640 640h64v64h-64zM512 512h64v64h-64zM512 640h64v64h-64zM384 640h64v64h-64zM768 384h64v64h-64zM768 512h64v64h-64zM768 640h64v64h-64zM768 768h64v64h-64zM640 768h64v64h-64zM512 768h64v64h-64zM384 768h64v64h-64zM256 768h64v64h-64z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "tags": [
+          "resize",
+          "dots"
+        ],
+        "defaultCode": 57394,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 50,
+        "order": 41,
+        "prevSize": 32,
+        "code": 57394,
+        "name": "resize",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 40
+    },
+    {
+      "icon": {
+        "paths": [
+          "M928 128h-416l-32-64h-352l-64 128h896zM840.34 704h87.66l32-448h-896l64 640h356.080c-104.882-37.776-180.080-138.266-180.080-256 0-149.982 122.018-272 272-272 149.98 0 272 122.018 272 272 0 21.678-2.622 43.15-7.66 64zM874.996 849.75l-134.496-110.692c17.454-28.922 27.5-62.814 27.5-99.058 0-106.040-85.96-192-192-192s-192 85.96-192 192 85.96 192 192 192c36.244 0 70.138-10.046 99.058-27.5l110.692 134.496c22.962 26.678 62.118 28.14 87.006 3.252l5.492-5.492c24.888-24.888 23.426-64.044-3.252-87.006zM576 764c-68.484 0-124-55.516-124-124s55.516-124 124-124 124 55.516 124 124-55.516 124-124 124z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "tags": [
+          "browse"
+        ],
+        "defaultCode": 57396,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 51,
+        "order": 42,
+        "prevSize": 32,
+        "code": 57396,
+        "name": "browse",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 41
+    },
+    {
+      "icon": {
+        "paths": [
+          "M864.408 670.132c-46.47-46.47-106.938-68.004-161.082-62.806l-63.326-63.326 192-192c0 0 128-128 0-256l-320 320-320-320c-128 128 0 256 0 256l192 192-63.326 63.326c-54.144-5.198-114.61 16.338-161.080 62.806-74.98 74.98-85.112 186.418-22.626 248.9 62.482 62.482 173.92 52.354 248.9-22.626 46.47-46.468 68.002-106.938 62.806-161.080l63.326-63.326 63.328 63.328c-5.196 54.144 16.336 114.61 62.806 161.078 74.978 74.98 186.418 85.112 248.898 22.626 62.488-62.482 52.356-173.918-22.624-248.9zM353.124 758.578c-2.212 24.332-15.020 49.826-35.14 69.946-22.212 22.214-51.080 35.476-77.218 35.476-10.524 0-25.298-2.228-35.916-12.848-21.406-21.404-17.376-73.132 22.626-113.136 22.212-22.214 51.080-35.476 77.218-35.476 10.524 0 25.298 2.228 35.916 12.848 13.112 13.11 13.47 32.688 12.514 43.19zM512 608c-35.346 0-64-28.654-64-64s28.654-64 64-64 64 28.654 64 64-28.654 64-64 64zM819.152 851.152c-10.62 10.62-25.392 12.848-35.916 12.848-26.138 0-55.006-13.262-77.218-35.476-20.122-20.12-32.928-45.614-35.138-69.946-0.958-10.502-0.6-30.080 12.514-43.192 10.618-10.622 25.39-12.848 35.916-12.848 26.136 0 55.006 13.262 77.216 35.474 40.004 40.008 44.032 91.736 22.626 113.14z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57351,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 14,
+        "order": 43,
+        "prevSize": 32,
+        "code": 57351,
+        "name": "cut",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 42
+    },
+    {
+      "icon": {
+        "paths": [
+          "M64 192h896v128h-896zM64 576h896v128h-896zM64 384h896v128h-896zM64 768h896v128h-896z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57350,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 15,
+        "order": 44,
+        "prevSize": 32,
+        "code": 57350,
+        "name": "alignjustify",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 43
+    },
+    {
+      "icon": {
+        "paths": [
+          "M64 192h896v128h-896zM64 576h896v128h-896zM256 384h512v128h-512zM256 768h512v128h-512z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57348,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 16,
+        "order": 45,
+        "prevSize": 32,
+        "code": 57348,
+        "name": "aligncenter",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 44
+    },
+    {
+      "icon": {
+        "paths": [
+          "M64 192h896v128h-896zM64 576h896v128h-896zM384 384h576v128h-576zM384 768h576v128h-576z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57349,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 17,
+        "order": 46,
+        "prevSize": 32,
+        "code": 57349,
+        "name": "alignright",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 45
+    },
+    {
+      "icon": {
+        "paths": [
+          "M64 192h896v128h-896zM64 576h896v128h-896zM64 384h576v128h-576zM64 768h576v128h-576z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57347,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 18,
+        "order": 47,
+        "prevSize": 32,
+        "code": 57347,
+        "name": "alignleft",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 46
+    },
+    {
+      "icon": {
+        "paths": [
+          "M320 128c-123.712 0-224 100.288-224 224s100.288 224 224 224v320h128v-640h64v640h128v-640h128v-128h-448zM960 512l-224 192 224 192z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57392,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 33,
+        "order": 48,
+        "prevSize": 32,
+        "code": 57392,
+        "name": "rtl",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 47
+    },
+    {
+      "icon": {
+        "paths": [
+          "M512 384h128v64h-128zM512 768h128v64h-128zM576 576h128v64h-128zM768 576v192h-64v64h128v-256zM384 576h128v64h-128zM320 768h128v64h-128zM320 384h128v64h-128zM192 192v256h64v-192h64v-64zM704 448h128v-256h-64v192h-64zM64 64v896h896v-896h-896zM896 896h-768v-768h768v768zM192 576v256h64v-192h64v-64zM576 192h128v64h-128zM384 192h128v64h-128z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57382,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 34,
+        "order": 49,
+        "prevSize": 32,
+        "code": 57382,
+        "name": "template",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 48
+    },
+    {
+      "icon": {
+        "paths": [
+          "M816 64l16 384h-640l16-384h32l16 320h512l16-320h32zM208 960l-16-320h640l-16 320h-32l-16-256h-512l-16 256h-32zM64 512h128v64h-128zM256 512h128v64h-128zM448 512h128v64h-128zM640 512h128v64h-128zM832 512h128v64h-128z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57383,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 35,
+        "order": 50,
+        "prevSize": 32,
+        "code": 57383,
+        "name": "pagebreak",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 49
+    },
+    {
+      "icon": {
+        "paths": [
+          "M960 128v-64h-192c-35.202 0-64 28.8-64 64v320c0 15.856 5.858 30.402 15.496 41.614l-303.496 260.386-142-148-82 70 224 288 416-448h128v-64h-192v-320h192zM256 512h64v-384c0-35.2-28.8-64-64-64h-128c-35.2 0-64 28.8-64 64v384h64v-192h128v192zM128 256v-128h128v128h-128zM640 448v-96c0-35.2-8.8-64-44-64 35.2 0 44-28.8 44-64v-96c0-35.2-28.8-64-64-64h-192v448h192c35.2 0 64-28.8 64-64zM448 128h128v128h-128v-128zM448 320h128v128h-128v-128z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57380,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 36,
+        "order": 51,
+        "prevSize": 32,
+        "code": 57380,
+        "name": "spellcheck",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 50
+    },
+    {
+      "icon": {
+        "paths": [
+          "M448 512h-128v-128h128v-128h128v128h128v128h-128v128h-128v-128zM960 576v320h-896v-320h128v192h640v-192h128z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "defaultCode": 57381,
+        "grid": 0
+      },
+      "attrs": [],
+      "properties": {
+        "id": 37,
+        "order": 52,
+        "prevSize": 32,
+        "code": 57381,
+        "name": "nonbreaking",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 2,
+      "iconIdx": 51
+    },
+    {
+      "icon": {
+        "paths": [
+          "M256 352v-128c0-53.020 42.98-96 96-96h32v-128h-32c-123.712 0-224 100.288-224 224v128c0 53.020-42.98 96-96 96h-32v128h32c53.020 0 96 42.98 96 96v128c0 123.71 100.288 224 224 224h32v-128h-32c-53.020 0-96-42.98-96-96v-128c0-62.684-25.758-119.342-67.254-160 41.496-40.658 67.254-97.316 67.254-160z",
+          "M1024 352v-128c0-53.020-42.98-96-96-96h-32v-128h32c123.71 0 224 100.288 224 224v128c0 53.020 42.98 96 96 96h32v128h-32c-53.020 0-96 42.98-96 96v128c0 123.71-100.29 224-224 224h-32v-128h32c53.020 0 96-42.98 96-96v-128c0-62.684 25.758-119.342 67.254-160-41.496-40.658-67.254-97.316-67.254-160z",
+          "M768 320.882c0 70.692-57.308 128-128 128s-128-57.308-128-128c0-70.692 57.308-128 128-128s128 57.308 128 128z",
+          "M640 511.118c-70.692 0-128 57.308-128 128 0 68.732 32 123.216 130.156 127.852-29.19 41.126-73.156 57.366-130.156 62.7v76c0 0 256 22.332 256-266.55-0.25-70.694-57.306-128.002-128-128.002z"
+        ],
+        "width": 1280,
+        "attrs": [],
+        "isMulticolor": false,
+        "tags": [
+          "code",
+          "semicolon",
+          "curly-braces"
+        ],
+        "grid": 16
+      },
+      "attrs": [],
+      "properties": {
+        "order": 1,
+        "id": 0,
+        "prevSize": 16,
+        "code": 58883,
+        "name": "codesample"
+      },
+      "setIdx": 1,
+      "setId": 1,
+      "iconIdx": 0
+    }
+  ],
+  "height": 1024,
+  "metadata": {
+    "name": "tinymce-small"
+  },
+  "preferences": {
+    "showGlyphs": true,
+    "showQuickUse": true,
+    "showQuickUse2": true,
+    "showSVGs": true,
+    "fontPref": {
+      "prefix": "icon-",
+      "metadata": {
+        "fontFamily": "tinymce-small",
+        "majorVersion": 1,
+        "minorVersion": 0
+      },
+      "metrics": {
+        "emSize": 1024,
+        "baseline": 6.25,
+        "whitespace": 50
+      },
+      "showMetrics": false,
+      "showMetadata": false,
+      "showVersion": false,
+      "embed": false
+    },
+    "imagePref": {
+      "prefix": "icon-",
+      "png": true,
+      "useClassSelector": true,
+      "color": 4473924,
+      "bgColor": 16777215
+    },
+    "historySize": 100,
+    "showCodes": true
+  }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.svg b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.svg
new file mode 100644
index 0000000000..b4ee6f4088
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="tinymce-small" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe000;" glyph-name="save" d="M960 80v591.938l-223.938 224.062h-592.062c-44.182 0-80-35.816-80-80v-736c0-44.184 35.818-80 80-80h736c44.184 0 80 35.816 80 80zM576 768h64v-192h-64v192zM704 128h-384v255.882c0.034 0.042 0.076 0.082 0.116 0.118h383.77c0.040-0.036 0.082-0.076 0.116-0.118l-0.002-255.882zM832 128h-64v256c0 35.2-28.8 64-64 64h-384c-35.2 0-64-28.8-64-64v-256h-64v640h64v-192c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v171.010l128-128.072v-490.938z" />
+<glyph unicode="&#xe001;" glyph-name="newdocument" d="M850.746 717.254l-133.492 133.49c-24.888 24.892-74.054 45.256-109.254 45.256h-416c-35.2 0-64-28.8-64-64v-768c0-35.2 28.8-64 64-64h640c35.2 0 64 28.8 64 64v544c0 35.2-20.366 84.364-45.254 109.254zM805.49 672.002c6.792-6.796 13.792-19.162 18.894-32.002h-184.384v184.386c12.84-5.1 25.204-12.1 32-18.896l133.49-133.488zM831.884 64h-639.77c-0.040 0.034-0.082 0.076-0.114 0.116v767.77c0.034 0.040 0.076 0.082 0.114 0.114h383.886v-256h256v-511.884c-0.034-0.040-0.076-0.082-0.116-0.116z" />
+<glyph unicode="&#xe002;" glyph-name="fullpage" d="M1024 367.542v160.916l-159.144 15.914c-8.186 30.042-20.088 58.548-35.21 84.98l104.596 127.838-113.052 113.050-127.836-104.596c-26.434 15.124-54.942 27.026-84.982 35.208l-15.914 159.148h-160.916l-15.914-159.146c-30.042-8.186-58.548-20.086-84.98-35.208l-127.838 104.594-113.050-113.050 104.596-127.836c-15.124-26.432-27.026-54.94-35.21-84.98l-159.146-15.916v-160.916l159.146-15.914c8.186-30.042 20.086-58.548 35.21-84.982l-104.596-127.836 113.048-113.048 127.838 104.596c26.432-15.124 54.94-27.028 84.98-35.21l15.916-159.148h160.916l15.914 159.144c30.042 8.186 58.548 20.088 84.982 35.21l127.836-104.596 113.048 113.048-104.596 127.836c15.124 26.434 27.028 54.942 35.21 84.98l159.148 15.92zM704 384l-128-128h-128l-128 128v128l128 128h128l128-128v-128z" />
+<glyph unicode="&#xe003;" glyph-name="alignleft" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM64 576h576v-128h-576zM64 192h576v-128h-576z" />
+<glyph unicode="&#xe004;" glyph-name="aligncenter" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM256 576h512v-128h-512zM256 192h512v-128h-512z" />
+<glyph unicode="&#xe005;" glyph-name="alignright" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM384 576h576v-128h-576zM384 192h576v-128h-576z" />
+<glyph unicode="&#xe006;" glyph-name="alignjustify" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM64 576h896v-128h-896zM64 192h896v-128h-896z" />
+<glyph unicode="&#xe007;" glyph-name="cut" d="M864.408 289.868c-46.47 46.47-106.938 68.004-161.082 62.806l-63.326 63.326 192 192c0 0 128 128 0 256l-320-320-320 320c-128-128 0-256 0-256l192-192-63.326-63.326c-54.144 5.198-114.61-16.338-161.080-62.806-74.98-74.98-85.112-186.418-22.626-248.9 62.482-62.482 173.92-52.354 248.9 22.626 46.47 46.468 68.002 106.938 62.806 161.080l63.326 63.326 63.328-63.328c-5.196-54.144 16.336-114.61 62.806-161.078 74.978-74.98 186.418-85.112 248.898-22.626 62.488 62.482 52.356 173.918-22.624 248.9zM353.124 201.422c-2.212-24.332-15.020-49.826-35.14-69.946-22.212-22.214-51.080-35.476-77.218-35.476-10.524 0-25.298 2.228-35.916 12.848-21.406 21.404-17.376 73.132 22.626 113.136 22.212 22.214 51.080 35.476 77.218 35.476 10.524 0 25.298-2.228 35.916-12.848 13.112-13.11 13.47-32.688 12.514-43.19zM512 352c-35.346 0-64 28.654-64 64s28.654 64 64 64 64-28.654 64-64-28.654-64-64-64zM819.152 108.848c-10.62-10.62-25.392-12.848-35.916-12.848-26.138 0-55.006 13.262-77.218 35.476-20.122 20.12-32.928 45.614-35.138 69.946-0.958 10.502-0.6 30.080 12.514 43.192 10.618 10.622 25.39 12.848 35.916 12.848 26.136 0 55.006-13.262 77.216-35.474 40.004-40.008 44.032-91.736 22.626-113.14z" />
+<glyph unicode="&#xe008;" glyph-name="paste" d="M704 576v160c0 17.6-14.4 32-32 32h-160v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-160c-17.602 0-32-14.4-32-32v-512c0-17.6 14.398-32 32-32h224v-192h384l192 192v384h-192zM320 831.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 640v64h384v-64h-384zM704 90.51v101.49h101.49l-101.49-101.49zM832 256h-192v-192h-256v448h448v-256z" />
+<glyph unicode="&#xe009;" glyph-name="searchreplace" d="M888 576h-56v256h64v64h-320v-64h64v-256h-256v256h64v64h-320v-64h64v-256h-56c-39.6 0-72-32.4-72-72v-432c0-39.6 32.4-72 72-72h240c39.6 0 72 32.4 72 72v312h128v-312c0-39.6 32.4-72 72-72h240c39.6 0 72 32.4 72 72v432c0 39.6-32.4 72-72 72zM348 64h-184c-19.8 0-36 14.4-36 32s16.2 32 36 32h184c19.8 0 36-14.4 36-32s-16.2-32-36-32zM544 448h-64c-17.6 0-32 14.4-32 32s14.4 32 32 32h64c17.6 0 32-14.4 32-32s-14.4-32-32-32zM860 64h-184c-19.8 0-36 14.4-36 32s16.2 32 36 32h184c19.8 0 36-14.4 36-32s-16.2-32-36-32z" />
+<glyph unicode="&#xe00a;" glyph-name="bullist" d="M384 832h576v-128h-576zM384 512h576v-128h-576zM384 192h576v-128h-576zM128 768c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM128 448c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM128 128c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64z" />
+<glyph unicode="&#xe00b;" glyph-name="numlist" d="M384 832h576v-128h-576zM384 512h576v-128h-576zM384 192h576v-128h-576zM320 430v146h-64v320h-128v-64h64v-256h-64v-64h128v-50l-128-60v-146h128v-64h-128v-64h128v-64h-128v-64h192v320h-128v50z" />
+<glyph unicode="&#xe00c;" glyph-name="indent" d="M64 768h896v-128h-896zM384 384h576v-128h-576zM384 576h576v-128h-576zM64 192h896v-128h-896zM64 576l224-160-224-160z" />
+<glyph unicode="&#xe00d;" glyph-name="outdent" d="M64 768h896v-128h-896zM64 384h576v-128h-576zM64 576h576v-128h-576zM64 192h896v-128h-896zM960 576l-224-160 224-160z" />
+<glyph unicode="&#xe00e;" glyph-name="blockquote" d="M256.428 535.274c105.8 0 191.572-91.17 191.572-203.638 0-112.464-85.772-203.636-191.572-203.636-105.802 0-191.572 91.17-191.572 203.636l-0.856 29.092c0 224.93 171.54 407.272 383.144 407.272v-116.364c-73.1 0-141.826-30.26-193.516-85.204-9.954-10.578-19.034-21.834-27.224-33.656 9.784 1.64 19.806 2.498 30.024 2.498zM768.428 535.274c105.8 0 191.572-91.17 191.572-203.638 0-112.464-85.772-203.636-191.572-203.636-105.802 0-191.572 91.17-191.572 203.636l-0.856 29.092c0 224.93 171.54 407.272 383.144 407.272v-116.364c-73.1 0-141.826-30.26-193.516-85.204-9.956-10.578-19.036-21.834-27.224-33.656 9.784 1.64 19.806 2.498 30.024 2.498z" />
+<glyph unicode="&#xe00f;" glyph-name="undo" d="M704 0c59 199 134.906 455.266-256 446.096v-222.096l-336.002 336 336.002 336v-217.326c468.092 12.2 544-358.674 256-678.674z" />
+<glyph unicode="&#xe010;" glyph-name="redo" d="M576 678.674v217.326l336.002-336-336.002-336v222.096c-390.906 9.17-315-247.096-256-446.096-288 320-212.092 690.874 256 678.674z" />
+<glyph unicode="&#xe011;" glyph-name="unlink" d="M927.274 729.784l-133.49 133.488c-21.104 21.104-49.232 32.728-79.198 32.728s-58.094-11.624-79.196-32.726l-165.492-165.49c-43.668-43.668-43.668-114.724 0-158.392l2.746-2.746 67.882 67.882-2.746 2.746c-6.132 6.132-6.132 16.494 0 22.626l165.492 165.492c4.010 4.008 8.808 4.608 11.312 4.608s7.302-0.598 11.312-4.61l133.49-133.488c6.132-6.134 6.132-16.498 0.002-22.628l-165.494-165.494c-4.008-4.008-8.806-4.608-11.31-4.608s-7.302 0.6-11.312 4.612l-2.746 2.746-67.88-67.884 2.742-2.742c21.106-21.108 49.23-32.728 79.2-32.728s58.094 11.624 79.196 32.726l165.494 165.492c43.662 43.666 43.662 114.72-0.004 158.39zM551.356 359.356l-67.882-67.882 2.746-2.746c4.008-4.008 4.61-8.806 4.61-11.31 0-2.506-0.598-7.302-4.606-11.314l-165.494-165.49c-4.010-4.010-8.81-4.61-11.314-4.61s-7.304 0.6-11.314 4.61l-133.492 133.486c-4.010 4.010-4.61 8.81-4.61 11.314s0.598 7.3 4.61 11.312l165.49 165.488c4.010 4.012 8.81 4.612 11.314 4.612s7.304-0.6 11.314-4.612l2.746-2.742 67.882 67.88-2.746 2.746c-21.104 21.104-49.23 32.726-79.196 32.726s-58.092-11.624-79.196-32.726l-165.488-165.486c-21.106-21.104-32.73-49.234-32.73-79.198s11.624-58.094 32.726-79.198l133.49-133.49c21.106-21.102 49.232-32.726 79.198-32.726s58.092 11.624 79.196 32.726l165.494 165.492c21.104 21.104 32.722 49.23 32.722 79.196s-11.624 58.094-32.726 79.196l-2.744 2.746zM352 250c-9.724 0-19.45 3.71-26.87 11.128-14.84 14.84-14.84 38.898 0 53.738l320 320c14.84 14.84 38.896 14.84 53.736 0 14.844-14.84 14.844-38.9 0-53.74l-320-320c-7.416-7.416-17.142-11.126-26.866-11.126z" />
+<glyph unicode="&#xe012;" glyph-name="link" d="M927.274 729.784l-133.49 133.488c-21.104 21.104-49.232 32.728-79.198 32.728s-58.094-11.624-79.196-32.726l-165.492-165.49c-43.668-43.668-43.668-114.724 0-158.392l2.746-2.746 67.882 67.882-2.746 2.746c-6.132 6.132-6.132 16.494 0 22.626l165.492 165.492c4.010 4.008 8.808 4.608 11.312 4.608s7.302-0.598 11.312-4.61l133.49-133.488c6.132-6.134 6.132-16.498 0.002-22.628l-165.494-165.494c-4.008-4.008-8.806-4.608-11.31-4.608s-7.302 0.6-11.312 4.612l-2.746 2.746-67.88-67.884 2.742-2.742c21.106-21.108 49.23-32.728 79.2-32.728s58.094 11.624 79.196 32.726l165.494 165.492c43.662 43.666 43.662 114.72-0.004 158.39zM551.356 359.356l-67.882-67.882 2.746-2.746c4.008-4.008 4.61-8.806 4.61-11.31 0-2.506-0.598-7.302-4.606-11.314l-165.494-165.49c-4.010-4.010-8.81-4.61-11.314-4.61s-7.304 0.6-11.314 4.61l-133.492 133.486c-4.010 4.010-4.61 8.81-4.61 11.314s0.598 7.3 4.61 11.312l165.49 165.488c4.010 4.012 8.81 4.612 11.314 4.612s7.304-0.6 11.314-4.612l2.746-2.742 67.882 67.88-2.746 2.746c-21.104 21.104-49.23 32.726-79.196 32.726s-58.092-11.624-79.196-32.726l-165.488-165.486c-21.106-21.104-32.73-49.234-32.73-79.198s11.624-58.094 32.726-79.198l133.49-133.49c21.106-21.102 49.232-32.726 79.198-32.726s58.092 11.624 79.196 32.726l165.494 165.492c21.104 21.104 32.722 49.23 32.722 79.196s-11.624 58.094-32.726 79.196l-2.744 2.746zM800 122c-9.724 0-19.45 3.708-26.87 11.13l-128 127.998c-14.844 14.84-14.844 38.898 0 53.738 14.84 14.844 38.896 14.844 53.736 0l128-128c14.844-14.84 14.844-38.896 0-53.736-7.416-7.422-17.142-11.13-26.866-11.13zM608 0c-17.674 0-32 14.326-32 32v128c0 17.674 14.326 32 32 32s32-14.326 32-32v-128c0-17.674-14.326-32-32-32zM928 320h-128c-17.674 0-32 14.326-32 32s14.326 32 32 32h128c17.674 0 32-14.326 32-32s-14.326-32-32-32zM224 774c9.724 0 19.45-3.708 26.87-11.13l128-128c14.842-14.84 14.842-38.898 0-53.738-14.84-14.844-38.898-14.844-53.738 0l-128 128c-14.842 14.84-14.842 38.898 0 53.738 7.418 7.422 17.144 11.13 26.868 11.13zM416 896c17.674 0 32-14.326 32-32v-128c0-17.674-14.326-32-32-32s-32 14.326-32 32v128c0 17.674 14.326 32 32 32zM96 576h128c17.674 0 32-14.326 32-32s-14.326-32-32-32h-128c-17.674 0-32 14.326-32 32s14.326 32 32 32z" />
+<glyph unicode="&#xe013;" glyph-name="bookmark" d="M256 896v-896l256 256 256-256v896h-512zM704 170.51l-192 192-192-192v661.49h384v-661.49z" />
+<glyph unicode="&#xe014;" glyph-name="image" d="M896 832h-768c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h768c35.2 0 64 28.8 64 64v640c0 35.2-28.8 64-64 64zM896 128.116c-0.012-0.014-0.030-0.028-0.042-0.042l-191.958 319.926-160-128-224 288-191.968-479.916c-0.010 0.010-0.022 0.022-0.032 0.032v639.77c0.034 0.040 0.076 0.082 0.114 0.114h767.77c0.040-0.034 0.082-0.076 0.116-0.116v-639.768zM640 608c0-53.019 42.981-96 96-96s96 42.981 96 96c0 53.019-42.981 96-96 96s-96-42.981-96-96z" />
+<glyph unicode="&#xe015;" glyph-name="media" d="M896 832h-768c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h768c35.2 0 64 28.8 64 64v640c0 35.2-28.8 64-64 64zM256 128h-128v128h128v-128zM256 384h-128v128h128v-128zM256 640h-128v128h128v-128zM704 128h-384v640h384v-640zM896 128h-128v128h128v-128zM896 384h-128v128h128v-128zM896 640h-128v128h128v-128zM384 640v-384l288 192z" />
+<glyph unicode="&#xe016;" glyph-name="help" d="M448 256h128v-128h-128v128zM704 704c35.346 0 64-28.654 64-64v-166l-228-154h-92v64l192 128v64h-320v128h384zM512 896c-119.666 0-232.166-46.6-316.784-131.216-84.614-84.618-131.216-197.118-131.216-316.784 0-119.664 46.602-232.168 131.216-316.784 84.618-84.616 197.118-131.216 316.784-131.216 119.664 0 232.168 46.6 316.784 131.216s131.216 197.12 131.216 316.784c0 119.666-46.6 232.166-131.216 316.784-84.616 84.616-197.12 131.216-316.784 131.216z" />
+<glyph unicode="&#xe017;" glyph-name="code" d="M416 256l-192 192 192 192-64 64-256-256 256-256zM672 704l-64-64 192-192-192-192 64-64 256 256z" />
+<glyph unicode="&#xe018;" glyph-name="insertdatetime" d="M77.798 655.376l81.414-50.882c50.802 81.114 128.788 143.454 221.208 174.246l-30.366 91.094c-113.748-37.898-209.728-114.626-272.256-214.458zM673.946 869.834l-30.366-91.094c92.422-30.792 170.404-93.132 221.208-174.248l81.412 50.882c-62.526 99.834-158.506 176.562-272.254 214.46zM607.974 255.992c-4.808 0-9.692 1.090-14.286 3.386l-145.688 72.844v211.778c0 17.672 14.328 32 32 32s32-14.328 32-32v-172.222l110.31-55.156c15.806-7.902 22.214-27.124 14.31-42.932-5.604-11.214-16.908-17.696-28.646-17.698zM512 768c-212.078 0-384-171.922-384-384s171.922-384 384-384c212.078 0 384 171.922 384 384s-171.922 384-384 384zM512 96c-159.058 0-288 128.942-288 288s128.942 288 288 288c159.058 0 288-128.942 288-288s-128.942-288-288-288z" />
+<glyph unicode="&#xe019;" glyph-name="preview" d="M64 504.254c45.318 49.92 97.162 92.36 153.272 125.124 90.332 52.744 192.246 80.622 294.728 80.622 102.48 0 204.396-27.878 294.726-80.624 56.112-32.764 107.956-75.204 153.274-125.124v117.432c-33.010 28.118-68.124 53.14-104.868 74.594-105.006 61.314-223.658 93.722-343.132 93.722s-238.128-32.408-343.134-93.72c-36.742-21.454-71.856-46.478-104.866-74.596v-117.43zM512 640c-183.196 0-345.838-100.556-448-256 102.162-155.448 264.804-256 448-256s345.838 100.552 448 256c-102.162 155.444-264.804 256-448 256zM512 448c0-35.346-28.654-64-64-64s-64 28.654-64 64c0 35.348 28.654 64 64 64s64-28.652 64-64zM728.066 263.338c-67.434-39.374-140.128-59.338-216.066-59.338s-148.632 19.964-216.066 59.338c-51.554 30.104-98.616 71.31-138.114 120.662 39.498 49.35 86.56 90.558 138.116 120.66 13.276 7.752 26.758 14.74 40.426 20.982-10.512-23.742-16.362-50.008-16.362-77.642 0-106.040 85.962-192 192-192 106.040 0 192 85.96 192 192 0 27.634-5.85 53.9-16.36 77.642 13.668-6.244 27.15-13.23 40.426-20.982 51.554-30.102 98.616-71.31 138.116-120.66-39.498-49.352-86.56-90.558-138.116-120.662z" />
+<glyph unicode="&#xe01a;" glyph-name="forecolor" d="M651.168 676.166c-24.612 81.962-28.876 91.834-107.168 91.834h-64c-79.618 0-82.664-10.152-108.418-96 0-0.002 0-0.002-0.002-0.004l-143.998-479.996h113.636l57.6 192h226.366l57.6-192h113.63l-145.246 484.166zM437.218 512l38.4 136c10.086 33.618 36.38 30 36.38 30s26.294 3.618 36.38-30h0.004l38.4-136h-149.564z" />
+<glyph unicode="&#xe01b;" glyph-name="table" d="M64 768v-704h896v704h-896zM384 320v128h256v-128h-256zM640 256v-128h-256v128h256zM640 640v-128h-256v128h256zM320 640v-128h-192v128h192zM128 448h192v-128h-192v128zM704 448h192v-128h-192v128zM704 512v128h192v-128h-192zM128 256h192v-128h-192v128zM704 128v128h192v-128h-192z" />
+<glyph unicode="&#xe01c;" glyph-name="hr" d="M64 512h896v-128h-896z" />
+<glyph unicode="&#xe01d;" glyph-name="removeformat" d="M64 192h512v-128h-512v128zM768 768h-220.558l-183.766-512h-132.288l183.762 512h-223.15v128h576v-128zM929.774 64l-129.774 129.774-129.774-129.774-62.226 62.226 129.774 129.774-129.774 129.774 62.226 62.226 129.774-129.774 129.774 129.774 62.226-62.226-129.774-129.774 129.774-129.774-62.226-62.226z" />
+<glyph unicode="&#xe01e;" glyph-name="subscript" d="M768 50v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
+<glyph unicode="&#xe01f;" glyph-name="superscript" d="M768 754v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
+<glyph unicode="&#xe020;" glyph-name="charmap" d="M704 128v37.004c151.348 61.628 256 193.82 256 346.996 0 212.078-200.576 384-448 384s-448-171.922-448-384c0-153.176 104.654-285.368 256-346.996v-37.004h-192l-64 96v-224h320v222.812c-100.9 51.362-170.666 161.54-170.666 289.188 0 176.732 133.718 320 298.666 320s298.666-143.268 298.666-320c0-127.648-69.766-237.826-170.666-289.188v-222.812h320v224l-64-96h-192z" />
+<glyph unicode="&#xe021;" glyph-name="emoticons" d="M512 820c99.366 0 192.782-38.694 263.042-108.956s108.958-163.678 108.958-263.044-38.696-192.782-108.958-263.042-163.676-108.958-263.042-108.958-192.782 38.696-263.044 108.958-108.956 163.676-108.956 263.042 38.694 192.782 108.956 263.044 163.678 108.956 263.044 108.956zM512 896c-247.424 0-448-200.576-448-448s200.576-448 448-448 448 200.576 448 448-200.576 448-448 448v0zM320 576c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM576 576c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM512 304c-101.84 0-192.56 36.874-251.166 94.328 23.126-117.608 126.778-206.328 251.166-206.328s228.040 88.72 251.168 206.328c-58.608-57.454-149.328-94.328-251.168-94.328z" />
+<glyph unicode="&#xe022;" glyph-name="print" d="M256 832h512v-128h-512v128zM896 640h-768c-35.2 0-64-28.8-64-64v-256c0-35.2 28.796-64 64-64h128v-192h512v192h128c35.2 0 64 28.8 64 64v256c0 35.2-28.8 64-64 64zM704 128h-384v256h384v-256zM910.4 544c0-25.626-20.774-46.4-46.398-46.4s-46.402 20.774-46.402 46.4 20.778 46.4 46.402 46.4c25.626 0 46.398-20.774 46.398-46.4z" />
+<glyph unicode="&#xe023;" glyph-name="fullscreen" d="M480 576l-192 192 128 128h-352v-352l128 128 192-192zM640 480l192 192 128-128v352h-352l128-128-192-192zM544 320l192-192-128-128h352v352l-128-128-192 192zM384 416l-192-192-128 128v-352h352l-128 128 192 192z" />
+<glyph unicode="&#xe024;" glyph-name="spellcheck" d="M960 832v64h-192c-35.202 0-64-28.8-64-64v-320c0-15.856 5.858-30.402 15.496-41.614l-303.496-260.386-142 148-82-70 224-288 416 448h128v64h-192v320h192zM256 448h64v384c0 35.2-28.8 64-64 64h-128c-35.2 0-64-28.8-64-64v-384h64v192h128v-192zM128 704v128h128v-128h-128zM640 512v96c0 35.2-8.8 64-44 64 35.2 0 44 28.8 44 64v96c0 35.2-28.8 64-64 64h-192v-448h192c35.2 0 64 28.8 64 64zM448 832h128v-128h-128v128zM448 640h128v-128h-128v128z" />
+<glyph unicode="&#xe025;" glyph-name="nonbreaking" d="M448 448h-128v128h128v128h128v-128h128v-128h-128v-128h-128v128zM960 384v-320h-896v320h128v-192h640v192h128z" />
+<glyph unicode="&#xe026;" glyph-name="template" d="M512 576h128v-64h-128zM512 192h128v-64h-128zM576 384h128v-64h-128zM768 384v-192h-64v-64h128v256zM384 384h128v-64h-128zM320 192h128v-64h-128zM320 576h128v-64h-128zM192 768v-256h64v192h64v64zM704 512h128v256h-64v-192h-64zM64 896v-896h896v896h-896zM896 64h-768v768h768v-768zM192 384v-256h64v192h64v64zM576 768h128v-64h-128zM384 768h128v-64h-128z" />
+<glyph unicode="&#xe027;" glyph-name="pagebreak" d="M816 896l16-384h-640l16 384h32l16-320h512l16 320h32zM208 0l-16 320h640l-16-320h-32l-16 256h-512l-16-256h-32zM64 448h128v-64h-128zM256 448h128v-64h-128zM448 448h128v-64h-128zM640 448h128v-64h-128zM832 448h128v-64h-128z" />
+<glyph unicode="&#xe028;" glyph-name="restoredraft" d="M576 896c247.424 0 448-200.576 448-448s-200.576-448-448-448v96c94.024 0 182.418 36.614 248.902 103.098s103.098 154.878 103.098 248.902c0 94.022-36.614 182.418-103.098 248.902s-154.878 103.098-248.902 103.098c-94.022 0-182.418-36.614-248.902-103.098-51.14-51.138-84.582-115.246-97.306-184.902h186.208l-224-256-224 256h164.57c31.060 217.102 217.738 384 443.43 384zM768 512v-128h-256v320h128v-192z" />
+<glyph unicode="&#xe02a;" glyph-name="bold" d="M625.442 465.818c48.074 38.15 78.558 94.856 78.558 158.182 0 114.876-100.29 208-224 208h-224v-768h288c123.712 0 224 93.124 224 208 0 88.196-59.118 163.562-142.558 193.818zM384 656c0 26.51 21.49 48 48 48h67.204c42.414 0 76.796-42.98 76.796-96s-34.382-96-76.796-96h-115.204v144zM547.2 192h-115.2c-26.51 0-48 21.49-48 48v144h163.2c42.418 0 76.8-42.98 76.8-96s-34.382-96-76.8-96z" />
+<glyph unicode="&#xe02b;" glyph-name="italic" d="M832 832v-64h-144l-256-640h144v-64h-448v64h144l256 640h-144v64h448z" />
+<glyph unicode="&#xe02c;" glyph-name="underline" d="M192 128h576v-64h-576v64zM640 832v-384c0-31.312-14.7-61.624-41.39-85.352-30.942-27.502-73.068-42.648-118.61-42.648-45.544 0-87.668 15.146-118.608 42.648-26.692 23.728-41.392 54.040-41.392 85.352v384h-128v-384c0-141.382 128.942-256 288-256s288 114.618 288 256v384h-128z" />
+<glyph unicode="&#xe02d;" glyph-name="strikethrough" d="M960 448h-265.876c-50.078 35.42-114.43 54.86-182.124 54.86-89.206 0-164.572 50.242-164.572 109.712s75.366 109.714 164.572 109.714c75.058 0 140.308-35.576 159.12-82.286h113.016c-7.93 50.644-37.58 97.968-84.058 132.826-50.88 38.16-117.676 59.174-188.078 59.174-70.404 0-137.196-21.014-188.074-59.174-54.788-41.090-86.212-99.502-86.212-160.254s31.424-119.164 86.212-160.254c1.956-1.466 3.942-2.898 5.946-4.316h-265.872v-64h512.532c58.208-17.106 100.042-56.27 100.042-100.572 0-59.468-75.368-109.71-164.572-109.71-75.060 0-140.308 35.574-159.118 82.286h-113.016c7.93-50.64 37.582-97.968 84.060-132.826 50.876-38.164 117.668-59.18 188.072-59.18 70.402 0 137.198 21.016 188.074 59.174 54.79 41.090 86.208 99.502 86.208 160.254 0 35.298-10.654 69.792-30.294 100.572h204.012v64z" />
+<glyph unicode="&#xe02e;" glyph-name="visualchars" d="M384 832c-123.712 0-224-100.288-224-224s100.288-224 224-224v-320h128v640h64v-640h128v640h128v128h-448z" />
+<glyph unicode="&#xe02f;" glyph-name="ltr" d="M448 832c-123.712 0-224-100.288-224-224s100.288-224 224-224v-320h128v640h64v-640h128v640h128v128h-448zM64 64l224 192-224 192z" />
+<glyph unicode="&#xe030;" glyph-name="rtl" d="M320 832c-123.712 0-224-100.288-224-224s100.288-224 224-224v-320h128v640h64v-640h128v640h128v128h-448zM960 448l-224-192 224-192z" />
+<glyph unicode="&#xe031;" glyph-name="copy" d="M832 640h-192v64l-192 192h-384v-704h384v-192h576v448l-192 192zM832 549.49l101.49-101.49h-101.49v101.49zM448 805.49l101.49-101.49h-101.49v101.49zM128 832h256v-192h192v-384h-448v576zM960 64h-448v128h128v384h128v-192h192v-320z" />
+<glyph unicode="&#xe032;" glyph-name="resize" d="M768 704h64v-64h-64zM640 576h64v-64h-64zM640 448h64v-64h-64zM640 320h64v-64h-64zM512 448h64v-64h-64zM512 320h64v-64h-64zM384 320h64v-64h-64zM768 576h64v-64h-64zM768 448h64v-64h-64zM768 320h64v-64h-64zM768 192h64v-64h-64zM640 192h64v-64h-64zM512 192h64v-64h-64zM384 192h64v-64h-64zM256 192h64v-64h-64z" />
+<glyph unicode="&#xe034;" glyph-name="browse" d="M928 832h-416l-32 64h-352l-64-128h896zM840.34 256h87.66l32 448h-896l64-640h356.080c-104.882 37.776-180.080 138.266-180.080 256 0 149.982 122.018 272 272 272 149.98 0 272-122.018 272-272 0-21.678-2.622-43.15-7.66-64zM874.996 110.25l-134.496 110.692c17.454 28.922 27.5 62.814 27.5 99.058 0 106.040-85.96 192-192 192s-192-85.96-192-192 85.96-192 192-192c36.244 0 70.138 10.046 99.058 27.5l110.692-134.496c22.962-26.678 62.118-28.14 87.006-3.252l5.492 5.492c24.888 24.888 23.426 64.044-3.252 87.006zM576 196c-68.484 0-124 55.516-124 124s55.516 124 124 124 124-55.516 124-124-55.516-124-124-124z" />
+<glyph unicode="&#xe035;" glyph-name="pastetext" d="M704 576v160c0 17.6-14.4 32-32 32h-160v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-160c-17.602 0-32-14.4-32-32v-512c0-17.6 14.398-32 32-32h224v-192h576v576h-192zM320 831.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 640v64h384v-64h-384zM832 64h-448v448h448v-448zM448 448v-128h32l32 64h64v-192h-48v-64h160v64h-48v192h64l32-64h32v128z" />
+<glyph unicode="&#xe603;" glyph-name="codesample" d="M200.015 577.994v103.994c0 43.077 34.919 77.997 77.997 77.997h26v103.994h-26c-100.51 0-181.991-81.481-181.991-181.991v-103.994c0-43.077-34.919-77.997-77.997-77.997h-26v-103.994h26c43.077 0 77.997-34.919 77.997-77.997v-103.994c0-100.509 81.481-181.991 181.991-181.991h26v103.994h-26c-43.077 0-77.997 34.919-77.997 77.997v103.994c0 50.927-20.928 96.961-54.642 129.994 33.714 33.032 54.642 79.065 54.642 129.994zM823.985 577.994v103.994c0 43.077-34.919 77.997-77.997 77.997h-26v103.994h26c100.509 0 181.991-81.481 181.991-181.991v-103.994c0-43.077 34.919-77.997 77.997-77.997h26v-103.994h-26c-43.077 0-77.997-34.919-77.997-77.997v-103.994c0-100.509-81.482-181.991-181.991-181.991h-26v103.994h26c43.077 0 77.997 34.919 77.997 77.997v103.994c0 50.927 20.928 96.961 54.642 129.994-33.714 33.032-54.642 79.065-54.642 129.994zM615.997 603.277c0-57.435-46.56-103.994-103.994-103.994s-103.994 46.56-103.994 103.994c0 57.435 46.56 103.994 103.994 103.994s103.994-46.56 103.994-103.994zM512 448.717c-57.435 0-103.994-46.56-103.994-103.994 0-55.841 26-100.107 105.747-103.875-23.715-33.413-59.437-46.608-105.747-50.94v-61.747c0 0 207.991-18.144 207.991 216.561-0.202 57.437-46.56 103.996-103.994 103.996z" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.ttf b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..a983e2dc4cb30880fffe00e1f0879be4d95eb4cc
GIT binary patch
literal 9304
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
V|H?UnQG1YRcKGiNtkxZ`{{_U;RE_`u

literal 0
HcmV?d00001

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.woff b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.woff
new file mode 100644
index 0000000000000000000000000000000000000000..d8962df76e50488c6520c0dadf3220080aaae9fb
GIT binary patch
literal 9380
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

literal 0
HcmV?d00001

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.eot b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.eot
new file mode 100644
index 0000000000000000000000000000000000000000..f99c13f32f5c968849f08a3d8a399157bfb0cccb
GIT binary patch
literal 17572
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
S4xrR19F>Jx9kYDL=l=i@ywbP;

literal 0
HcmV?d00001

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.json b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.json
new file mode 100644
index 0000000000..37e02dd3a0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.json
@@ -0,0 +1,3469 @@
+{
+    "IcoMoonType": "selection",
+    "icons": [
+    {
+      "icon": {
+        "paths": [
+          "M889.68 166.32c-93.608-102.216-228.154-166.32-377.68-166.32-282.77 0-512 229.23-512 512h96c0-229.75 186.25-416 416-416 123.020 0 233.542 53.418 309.696 138.306l-149.696 149.694h352v-352l-134.32 134.32z",
+          "M928 512c0 229.75-186.25 416-416 416-123.020 0-233.542-53.418-309.694-138.306l149.694-149.694h-352v352l134.32-134.32c93.608 102.216 228.154 166.32 377.68 166.32 282.77 0 512-229.23 512-512h-96z"
+        ],
+        "attrs": [
+          {},
+          {}
+        ],
+        "isMulticolor": false,
+        "isMulticolor2": false,
+        "grid": 16,
+        "tags": [
+          "reload"
+        ]
+      },
+      "attrs": [
+        {},
+        {}
+      ],
+      "properties": {
+        "order": 647,
+        "id": 120,
+        "name": "reload",
+        "prevSize": 32,
+        "code": 59654
+      },
+      "setIdx": 0,
+      "setId": 5,
+      "iconIdx": 0
+    },
+    {
+      "icon": {
+        "paths": [
+          "M0 64h128v128h-128v-128z",
+          "M192 64h832v128h-832v-128z",
+          "M0 448h128v128h-128v-128z",
+          "M192 448h832v128h-832v-128z",
+          "M0 832h128v128h-128v-128z",
+          "M192 832h832v128h-832v-128z",
+          "M192 256h128v128h-128v-128z",
+          "M384 256h640v128h-640v-128z",
+          "M192 640h128v128h-128v-128z",
+          "M384 640h640v128h-640v-128z"
+        ],
+        "attrs": [
+          {},
+          {},
+          {},
+          {},
+          {},
+          {},
+          {},
+          {},
+          {},
+          {}
+        ],
+        "isMulticolor": false,
+        "isMulticolor2": false,
+        "tags": [
+          "toc"
+        ],
+        "grid": 16
+      },
+      "attrs": [
+        {},
+        {},
+        {},
+        {},
+        {},
+        {},
+        {},
+        {},
+        {},
+        {}
+      ],
+      "properties": {
+        "order": 646,
+        "id": 1,
+        "name": "toc",
+        "prevSize": 32,
+        "code": 59649
+      },
+      "setIdx": 0,
+      "setId": 6,
+      "iconIdx": 1
+    },
+        {
+            "icon": {
+                "paths": [
+                    "M576.234 289.27l242.712-81.432 203.584 606.784-242.712 81.432zM0 896h256v-704h-256v704zM64 320h128v64h-128v-64zM320 896h256v-704h-256v704zM384 320h128v64h-128v-64z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "books",
+                    "library",
+                    "archive"
+                ],
+                "defaultCode": 57458,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 523,
+                "id": 1722,
+                "prevSize": 32,
+                "code": 59665,
+                "name": "books",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 0
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 416v192c0 17.672 14.328 32 32 32h960c17.672 0 32-14.328 32-32v-192c0-17.672-14.328-32-32-32h-960c-17.672 0-32 14.328-32 32z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "minus",
+                    "minimize",
+                    "subtract"
+                ],
+                "defaultCode": 58229,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 597,
+                "id": 1723,
+                "prevSize": 32,
+                "code": 59705,
+                "name": "minus",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 1
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M992 384h-352v-352c0-17.672-14.328-32-32-32h-192c-17.672 0-32 14.328-32 32v352h-352c-17.672 0-32 14.328-32 32v192c0 17.672 14.328 32 32 32h352v352c0 17.672 14.328 32 32 32h192c17.672 0 32-14.328 32-32v-352h352c17.672 0 32-14.328 32-32v-192c0-17.672-14.328-32-32-32z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "plus",
+                    "add",
+                    "sum"
+                ],
+                "defaultCode": 58230,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 598,
+                "id": 1724,
+                "prevSize": 32,
+                "code": 59706,
+                "name": "plus",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 2
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M521.6 44.8l-67.2 67.2-86.4-86.4-86.4 86.4 86.4 86.4-368 368 432 432 518.4-518.4-428.8-435.2zM435.2 825.6l-262.4-262.4 35.2-35.2 576-51.2-348.8 348.8zM953.6 550.4c-6.4 6.4-16 16-28.8 32-28.8 32-41.6 64-41.6 89.6v0 0 0 0 0 0 0c0 16 6.4 35.2 22.4 48 12.8 12.8 32 22.4 48 22.4s35.2-6.4 48-22.4 22.4-32 22.4-48v0 0 0 0 0 0 0c0-25.6-12.8-54.4-41.6-89.6-9.6-16-22.4-25.6-28.8-32v0z"
+                ],
+                "attrs": [
+                    {}
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "fill"
+                ],
+                "grid": 16
+            },
+            "attrs": [
+                {}
+            ],
+            "properties": {
+                "order": 599,
+                "id": 1695,
+                "prevSize": 32,
+                "code": 59650,
+                "name": "fill"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 3
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 694.4h1024v128h-1024v-128z",
+                    "M0 928h1024v64h-1024v-64z",
+                    "M0 393.6h1024v192h-1024v-192z",
+                    "M0 32h1024v256h-1024v-256z"
+                ],
+                "attrs": [
+                    {},
+                    {},
+                    {},
+                    {}
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "borderwidth"
+                ],
+                "grid": 16
+            },
+            "attrs": [
+                {},
+                {},
+                {},
+                {}
+            ],
+            "properties": {
+                "order": 524,
+                "id": 1696,
+                "prevSize": 32,
+                "code": 59651,
+                "name": "borderwidth"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 4
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M739.2 332.8l-502.4 502.4h-185.6v-185.6l502.4-502.4 185.6 185.6zM803.2 272l-185.6-185.6 67.2-67.2c22.4-22.4 54.4-22.4 76.8 0l108.8 108.8c22.4 22.4 22.4 54.4 0 76.8l-67.2 67.2zM41.6 912h940.8v112h-940.8v-112z"
+                ],
+                "attrs": [
+                    {}
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "line"
+                ],
+                "grid": 16
+            },
+            "attrs": [
+                {}
+            ],
+            "properties": {
+                "order": 525,
+                "id": 1697,
+                "prevSize": 32,
+                "code": 59652,
+                "name": "line"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 5
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 480h1024v64h-1024v-64z",
+                    "M304 48v339.2h-67.2v-272h-67.2v-67.2z",
+                    "M444.8 265.6v54.4h134.4v67.2h-201.6v-153.6l134.4-64v-54.4h-134.4v-67.2h201.6v153.6z",
+                    "M854.4 48v339.2h-204.8v-67.2h137.6v-67.2h-137.6v-70.4h137.6v-67.2h-137.6v-67.2z",
+                    "M115.2 793.6c3.2-57.6 38.4-83.2 108.8-83.2 38.4 0 67.2 9.6 86.4 25.6s25.6 35.2 25.6 70.4v112c0 25.6 0 28.8 9.6 41.6h-73.6c-3.2-9.6-3.2-9.6-6.4-19.2-22.4 19.2-41.6 25.6-70.4 25.6-54.4 0-89.6-32-89.6-76.8s28.8-70.4 99.2-80l38.4-6.4c16-3.2 22.4-6.4 22.4-16 0-12.8-12.8-22.4-38.4-22.4s-41.6 9.6-44.8 28.8h-67.2zM262.4 844.8c-6.4 3.2-12.8 6.4-25.6 6.4l-25.6 6.4c-25.6 6.4-38.4 16-38.4 28.8 0 16 12.8 25.6 35.2 25.6s41.6-9.6 54.4-32v-35.2z",
+                    "M390.4 624h73.6v112c22.4-16 41.6-22.4 67.2-22.4 64 0 105.6 51.2 105.6 124.8 0 76.8-44.8 134.4-108.8 134.4-32 0-48-9.6-67.2-35.2v28.8h-70.4v-342.4zM460.8 838.4c0 41.6 22.4 70.4 51.2 70.4s51.2-28.8 51.2-70.4c0-44.8-19.2-70.4-51.2-70.4-28.8 0-51.2 28.8-51.2 70.4z",
+                    "M851.2 806.4c-3.2-22.4-19.2-35.2-44.8-35.2-32 0-51.2 25.6-51.2 70.4 0 48 19.2 73.6 51.2 73.6 25.6 0 41.6-12.8 44.8-41.6l70.4 3.2c-9.6 60.8-54.4 96-118.4 96-73.6 0-121.6-51.2-121.6-128 0-80 48-131.2 124.8-131.2 64 0 108.8 35.2 112 96h-67.2z"
+                ],
+                "attrs": [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "count"
+                ],
+                "grid": 16
+            },
+            "attrs": [
+                {},
+                {},
+                {},
+                {},
+                {},
+                {},
+                {}
+            ],
+            "properties": {
+                "order": 526,
+                "id": 1698,
+                "prevSize": 32,
+                "code": 59653,
+                "name": "count"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 6
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M553.6 656l-118.4-118.4c80-89.6 137.6-195.2 172.8-304h137.6v-92.8h-326.4v-92.8h-92.8v92.8h-326.4v92.8h518.4c-32 89.6-80 176-147.2 249.6-44.8-48-80-99.2-108.8-156.8h-92.8c35.2 76.8 80 147.2 137.6 211.2l-236.8 233.6 67.2 67.2 233.6-233.6 144 144c3.2 0 38.4-92.8 38.4-92.8zM816 419.2h-92.8l-208 560h92.8l51.2-140.8h220.8l51.2 140.8h92.8l-208-560zM691.2 745.6l76.8-201.6 76.8 201.6h-153.6z"
+                ],
+                "attrs": [
+                    {}
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "translate"
+                ],
+                "grid": 16
+            },
+            "attrs": [
+                {}
+            ],
+            "properties": {
+                "order": 527,
+                "id": 1699,
+                "prevSize": 32,
+                "code": 59655,
+                "name": "translate"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 7
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M576 64h128v128h-128v-128z",
+                    "M576 320h128v128h-128v-128z",
+                    "M320 320h128v128h-128v-128z",
+                    "M576 576h128v128h-128v-128z",
+                    "M320 576h128v128h-128v-128z",
+                    "M320 832h128v128h-128v-128z",
+                    "M576 832h128v128h-128v-128z",
+                    "M320 64h128v128h-128v-128z"
+                ],
+                "attrs": [
+                    {
+                        "opacity": 1,
+                        "visibility": false
+                    },
+                    {
+                        "opacity": 1,
+                        "visibility": false
+                    },
+                    {
+                        "opacity": 1,
+                        "visibility": false
+                    },
+                    {
+                        "opacity": 1,
+                        "visibility": false
+                    },
+                    {
+                        "opacity": 1,
+                        "visibility": false
+                    },
+                    {
+                        "opacity": 1,
+                        "visibility": false
+                    },
+                    {
+                        "opacity": 1,
+                        "visibility": false
+                    },
+                    {
+                        "opacity": 1,
+                        "visibility": false
+                    },
+                    {
+                        "opacity": 1,
+                        "visibility": false
+                    }
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "drag"
+                ],
+                "grid": 16
+            },
+            "attrs": [
+                {
+                    "opacity": 1,
+                    "visibility": false
+                },
+                {
+                    "opacity": 1,
+                    "visibility": false
+                },
+                {
+                    "opacity": 1,
+                    "visibility": false
+                },
+                {
+                    "opacity": 1,
+                    "visibility": false
+                },
+                {
+                    "opacity": 1,
+                    "visibility": false
+                },
+                {
+                    "opacity": 1,
+                    "visibility": false
+                },
+                {
+                    "opacity": 1,
+                    "visibility": false
+                },
+                {
+                    "opacity": 1,
+                    "visibility": false
+                },
+                {
+                    "opacity": 1,
+                    "visibility": false
+                }
+            ],
+            "properties": {
+                "order": 528,
+                "id": 1700,
+                "prevSize": 32,
+                "code": 59656,
+                "name": "drag",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 8
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1024 590.444l-512-397.426-512 397.428v-162.038l512-397.426 512 397.428zM896 576v384h-256v-256h-256v256h-256v-384l384-288z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "home"
+                ],
+                "defaultCode": 57345,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 529,
+                "id": 1701,
+                "prevSize": 32,
+                "code": 59659,
+                "name": "home",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 9
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M839.432 199.43c27.492 27.492 50.554 78.672 55.552 120.57h-318.984v-318.984c41.898 4.998 93.076 28.060 120.568 55.552l142.864 142.862zM512 384v-384h-368c-44 0-80 36-80 80v864c0 44 36 80 80 80h672c44 0 80-36 80-80v-560h-384zM576 768v192h-192v-192h-160l256-256 256 256h-160z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "upload"
+                ],
+                "defaultCode": 57474,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 530,
+                "id": 1702,
+                "prevSize": 32,
+                "code": 59668,
+                "name": "upload",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 10
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M928 64h-832c-52.8 0-96 43.2-96 96v512c0 52.8 43.2 96 96 96h160v256l307.2-256h364.8c52.8 0 96-43.2 96-96v-512c0-52.8-43.2-96-96-96zM896 640h-379.142l-196.858 174.714v-174.714h-192v-448h768v448z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "bubble"
+                ],
+                "defaultCode": 57703,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 600,
+                "id": 1703,
+                "prevSize": 32,
+                "code": 59676,
+                "name": "bubble",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 11
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M622.826 702.736c-22.11-3.518-22.614-64.314-22.614-64.314s64.968-64.316 79.128-150.802c38.090 0 61.618-91.946 23.522-124.296 1.59-34.054 48.96-267.324-190.862-267.324-239.822 0-192.45 233.27-190.864 267.324-38.094 32.35-14.57 124.296 23.522 124.296 14.158 86.486 79.128 150.802 79.128 150.802s-0.504 60.796-22.614 64.314c-71.22 11.332-337.172 128.634-337.172 257.264h896c0-128.63-265.952-245.932-337.174-257.264z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "user"
+                ],
+                "defaultCode": 57733,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 601,
+                "id": 1704,
+                "prevSize": 32,
+                "code": 59677,
+                "name": "user",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 12
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M592 448h-16v-192c0-105.87-86.13-192-192-192h-128c-105.87 0-192 86.13-192 192v192h-16c-26.4 0-48 21.6-48 48v480c0 26.4 21.6 48 48 48h544c26.4 0 48-21.6 48-48v-480c0-26.4-21.6-48-48-48zM192 256c0-35.29 28.71-64 64-64h128c35.29 0 64 28.71 64 64v192h-256v-192z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "lock"
+                ],
+                "defaultCode": 57811,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 602,
+                "id": 1705,
+                "prevSize": 32,
+                "code": 59686,
+                "name": "lock"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 13
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M768 64c105.87 0 192 86.13 192 192v192h-128v-192c0-35.29-28.71-64-64-64h-128c-35.29 0-64 28.71-64 64v192h16c26.4 0 48 21.6 48 48v480c0 26.4-21.6 48-48 48h-544c-26.4 0-48-21.6-48-48v-480c0-26.4 21.6-48 48-48h400v-192c0-105.87 86.13-192 192-192h128z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "unlock"
+                ],
+                "defaultCode": 57812,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 603,
+                "id": 1706,
+                "prevSize": 32,
+                "code": 59687,
+                "name": "unlock"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 14
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M448 128v-16c0-26.4-21.6-48-48-48h-160c-26.4 0-48 21.6-48 48v16h-192v128h192v16c0 26.4 21.6 48 48 48h160c26.4 0 48-21.6 48-48v-16h576v-128h-576zM256 256v-128h128v128h-128zM832 432c0-26.4-21.6-48-48-48h-160c-26.4 0-48 21.6-48 48v16h-576v128h576v16c0 26.4 21.6 48 48 48h160c26.4 0 48-21.6 48-48v-16h192v-128h-192v-16zM640 576v-128h128v128h-128zM448 752c0-26.4-21.6-48-48-48h-160c-26.4 0-48 21.6-48 48v16h-192v128h192v16c0 26.4 21.6 48 48 48h160c26.4 0 48-21.6 48-48v-16h576v-128h-576v-16zM256 896v-128h128v128h-128z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "settings"
+                ],
+                "defaultCode": 57819,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 604,
+                "id": 1707,
+                "prevSize": 32,
+                "code": 59688,
+                "name": "settings",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 15
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M192 1024h640l64-704h-768zM640 128v-128h-256v128h-320v192l64-64h768l64 64v-192h-320zM576 128h-128v-64h128v64z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "remove2"
+                ],
+                "defaultCode": 57935,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 605,
+                "id": 1708,
+                "prevSize": 32,
+                "code": 59690,
+                "name": "remove2",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 16
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M384 64h256v256h-256zM384 384h256v256h-256zM384 704h256v256h-256z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "menu"
+                ],
+                "defaultCode": 58025,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 606,
+                "id": 1709,
+                "prevSize": 32,
+                "code": 59693,
+                "name": "menu",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 17
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1009.956 915.76l-437.074-871.112c-16.742-29.766-38.812-44.648-60.882-44.648s-44.14 14.882-60.884 44.648l-437.074 871.112c-33.486 59.532-5 108.24 63.304 108.24h869.308c68.302 0 96.792-48.708 63.302-108.24zM512 896c-35.346 0-64-28.654-64-64 0-35.348 28.654-64 64-64 35.348 0 64 28.652 64 64 0 35.346-28.652 64-64 64zM556 704h-88l-20-256c0-35.346 28.654-64 64-64s64 28.654 64 64l-20 256z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "warning"
+                ],
+                "defaultCode": 58198,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 531,
+                "id": 1710,
+                "prevSize": 32,
+                "code": 59696,
+                "name": "warning"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 18
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M448 704h128v128h-128zM704 256c35.346 0 64 28.654 64 64v192l-192 128h-128v-64l192-128v-64h-320v-128h384zM512 96c-111.118 0-215.584 43.272-294.156 121.844s-121.844 183.038-121.844 294.156c0 111.118 43.272 215.584 121.844 294.156 78.572 78.572 183.038 121.844 294.156 121.844 111.118 0 215.584-43.272 294.156-121.844 78.572-78.572 121.844-183.038 121.844-294.156 0-111.118-43.272-215.584-121.844-294.156-78.572-78.572-183.038-121.844-294.156-121.844zM512 0v0c282.77 0 512 229.23 512 512s-229.23 512-512 512c-282.77 0-512-229.23-512-512 0-282.77 229.23-512 512-512z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "question"
+                ],
+                "defaultCode": 58201,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 532,
+                "id": 1711,
+                "prevSize": 32,
+                "code": 59697,
+                "name": "question",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 19
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM512 896c-212.078 0-384-171.922-384-384s171.922-384 384-384c212.078 0 384 171.922 384 384 0 212.078-171.922 384-384 384zM768 576h-192v192h-128v-192h-192v-128h192v-192h128v192h192z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "pluscircle"
+                ],
+                "defaultCode": 58206,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 533,
+                "id": 1712,
+                "prevSize": 32,
+                "code": 59698,
+                "name": "pluscircle",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 20
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM448 192h128v128h-128v-128zM640 832h-256v-64h64v-256h-64v-64h192v320h64v64z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "info"
+                ],
+                "defaultCode": 58211,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 534,
+                "id": 1713,
+                "prevSize": 32,
+                "code": 59699,
+                "name": "info"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 21
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1024 736 736 0h-448l-288 288v448l288 288h448l288-288v-448l-288-288zM576 832h-128v-128h128v128zM576 576h-128v-384h128v384z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "notice"
+                ],
+                "defaultCode": 58218,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 535,
+                "id": 1714,
+                "prevSize": 32,
+                "code": 59700,
+                "name": "notice"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 22
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 640l192 192 320-320 320 320 192-192-511.998-512z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "arrowup"
+                ],
+                "defaultCode": 58288,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 536,
+                "id": 1715,
+                "prevSize": 32,
+                "code": 59707,
+                "name": "arrowup",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 23
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M384 0l-192 192 320 320-320 320 192 192 512-512z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "arrowright"
+                ],
+                "defaultCode": 58289,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 537,
+                "id": 1716,
+                "prevSize": 32,
+                "code": 59708,
+                "name": "arrowright",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 24
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1024 384l-192-192-320 320-320-320-192 192 512 511.998z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "arrowdown"
+                ],
+                "defaultCode": 58290,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 538,
+                "id": 1717,
+                "prevSize": 32,
+                "code": 59709,
+                "name": "arrowdown",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 25
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M768 640l-256-256-256 256z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "arrowup2"
+                ],
+                "defaultCode": 58292,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 539,
+                "id": 1718,
+                "prevSize": 32,
+                "code": 59711,
+                "name": "arrowup2",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 26
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M256 384l256 256 256-256z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "arrowdown2"
+                ],
+                "defaultCode": 58294,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 540,
+                "id": 1719,
+                "prevSize": 32,
+                "code": 59712,
+                "name": "arrowdown2",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 27
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M256 256l256 256 256-256zM255.996 575.996l256 256 256-256z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "menu2"
+                ],
+                "defaultCode": 58393,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 541,
+                "id": 1720,
+                "prevSize": 32,
+                "code": 59713,
+                "name": "menu2",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 28
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M704 576l128-128v512h-768v-768h512l-128 128h-256v512h512zM960 64v352l-130.744-130.744-354.746 354.744h-90.51v-90.512l354.744-354.744-130.744-130.744z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "newtab"
+                ],
+                "defaultCode": 58492,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 607,
+                "id": 1721,
+                "prevSize": 32,
+                "code": 59745,
+                "name": "newtab",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 29
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M960 256v-64l-448 128-448-128v64l320 128v256l-128 448h64l192-448 192 448h64l-128-448v-256zM416 160q0-40 28-68t68-28 68 28 28 68-28 68-68 28-68-28-28-68z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "grid": 16,
+                "tags": [
+                    "a11y"
+                ]
+            },
+            "attrs": [],
+            "properties": {
+                "order": 608,
+                "id": 1694,
+                "prevSize": 32,
+                "code": 59648,
+                "name": "a11y"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 30
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M892.8 982.4l-89.6-89.6c-70.4 80-172.8 131.2-288 131.2-208 0-380.8-166.4-384-377.6 0 0 0 0 0 0 0-3.2 0-3.2 0-6.4s0-3.2 0-6.4v0c0 0 0 0 0-3.2 0 0 0-3.2 0-3.2 3.2-105.6 48-211.2 105.6-304l-192-192 44.8-44.8 182.4 182.4c0 0 0 0 0 0l569.6 569.6c0 0 0 0 0 0l99.2 99.2-48 44.8zM896 633.6c0 0 0 0 0 0 0-3.2 0-6.4 0-6.4-9.6-316.8-384-627.2-384-627.2s-108.8 89.6-208 220.8l70.4 70.4c6.4-9.6 16-22.4 22.4-32 41.6-51.2 83.2-96 115.2-128v0c32 32 73.6 76.8 115.2 128 108.8 137.6 169.6 265.6 172.8 371.2 0 0 0 3.2 0 3.2v0 0c0 3.2 0 3.2 0 6.4s0 3.2 0 3.2v0 0c0 22.4-3.2 41.6-9.6 64l76.8 76.8c16-41.6 28.8-89.6 28.8-137.6 0 0 0 0 0 0 0-3.2 0-3.2 0-6.4s-0-3.2-0-6.4z"
+                ],
+                "attrs": [
+                    {}
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "invert"
+                ],
+                "grid": 16,
+                "defaultCode": 58882
+            },
+            "attrs": [
+                {}
+            ],
+            "properties": {
+                "order": 609,
+                "id": 0,
+                "prevSize": 32,
+                "code": 58882,
+                "name": "invert"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 31
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M928 128h-416l-32-64h-352l-64 128h896zM904.34 704h74.86l44.8-448h-1024l64 640h484.080c-104.882-37.776-180.080-138.266-180.080-256 0-149.982 122.018-272 272-272 149.98 0 272 122.018 272 272 0 21.678-2.622 43.15-7.66 64zM1002.996 913.75l-198.496-174.692c17.454-28.92 27.5-62.814 27.5-99.058 0-106.040-85.96-192-192-192s-192 85.96-192 192 85.96 192 192 192c36.244 0 70.138-10.046 99.058-27.5l174.692 198.496c22.962 26.678 62.118 28.14 87.006 3.252l5.492-5.492c24.888-24.888 23.426-64.044-3.252-87.006zM640 764c-68.484 0-124-55.516-124-124s55.516-124 124-124 124 55.516 124 124-55.516 124-124 124z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "defaultCode": 57396,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 0,
+                "order": 610,
+                "prevSize": 32,
+                "code": 57396,
+                "name": "browse",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 32
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M768 256h64v64h-64zM640 384h64v64h-64zM640 512h64v64h-64zM640 640h64v64h-64zM512 512h64v64h-64zM512 640h64v64h-64zM384 640h64v64h-64zM768 384h64v64h-64zM768 512h64v64h-64zM768 640h64v64h-64zM768 768h64v64h-64zM640 768h64v64h-64zM512 768h64v64h-64zM384 768h64v64h-64zM256 768h64v64h-64z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "resize",
+                    "dots"
+                ],
+                "defaultCode": 57394,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 1,
+                "order": 611,
+                "prevSize": 32,
+                "code": 57394,
+                "name": "resize",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 33
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M832 256h-192v-64l-192-192h-448v768h384v256h640v-576l-192-192zM832 346.51l101.49 101.49h-101.49v-101.49zM448 90.51l101.49 101.49h-101.49v-101.49zM64 64h320v192h192v448h-512v-640zM960 960h-512v-192h192v-448h128v192h192v448z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "copy"
+                ],
+                "defaultCode": 57393,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 2,
+                "order": 612,
+                "prevSize": 32,
+                "code": 57393,
+                "name": "copy",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 34
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M256 64h512v128h-128v768h-128v-768h-128v768h-128v-448c-123.712 0-224-100.288-224-224s100.288-224 224-224zM960 896l-256-224 256-224z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "rtl"
+                ],
+                "defaultCode": 57392,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 3,
+                "order": 613,
+                "prevSize": 32,
+                "code": 57392,
+                "name": "rtl",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 35
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M448 64h512v128h-128v768h-128v-768h-128v768h-128v-448c-123.712 0-224-100.288-224-224s100.288-224 224-224zM64 448l256 224-256 224z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "ltr"
+                ],
+                "defaultCode": 57391,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 4,
+                "order": 542,
+                "prevSize": 32,
+                "code": 57391,
+                "name": "ltr",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 36
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M384 64h512v128h-128v768h-128v-768h-128v768h-128v-448c-123.712 0-224-100.288-224-224s100.288-224 224-224z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "visualchars"
+                ],
+                "defaultCode": 57390,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 5,
+                "order": 543,
+                "prevSize": 32,
+                "code": 57390,
+                "name": "visualchars",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 37
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M731.42 517.036c63.92 47.938 100.58 116.086 100.58 186.964s-36.66 139.026-100.58 186.964c-59.358 44.518-137.284 69.036-219.42 69.036-82.138 0-160.062-24.518-219.42-69.036-63.92-47.938-100.58-116.086-100.58-186.964h128c0 69.382 87.926 128 192 128 104.074 0 192-58.618 192-128 0-69.382-87.926-128-192-128-82.138 0-160.062-24.518-219.42-69.036-63.92-47.94-100.58-116.086-100.58-186.964 0-70.878 36.66-139.024 100.58-186.964 59.358-44.518 137.282-69.036 219.42-69.036 82.136 0 160.062 24.518 219.42 69.036 63.92 47.94 100.58 116.086 100.58 186.964h-128c0-69.382-87.926-128-192-128-104.074 0-192 58.618-192 128 0 69.382 87.926 128 192 128 82.136 0 160.062 24.518 219.42 69.036zM0 512h1024v64h-1024z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "strikethrough"
+                ],
+                "defaultCode": 57389,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 6,
+                "order": 544,
+                "prevSize": 32,
+                "code": 57389,
+                "name": "strikethrough",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 38
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M704 64h128v416c0 159.058-143.268 288-320 288-176.73 0-320-128.942-320-288v-416h128v416c0 40.166 18.238 78.704 51.354 108.506 36.896 33.204 86.846 51.494 140.646 51.494 53.8 0 103.75-18.29 140.646-51.494 33.116-29.802 51.354-68.34 51.354-108.506v-416zM192 832h640v128h-640z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "underline"
+                ],
+                "defaultCode": 57388,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 7,
+                "order": 545,
+                "prevSize": 32,
+                "code": 57388,
+                "name": "underline",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 39
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M896 64v64h-128l-320 768h128v64h-448v-64h128l320-768h-128v-64z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "italic"
+                ],
+                "defaultCode": 57387,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 8,
+                "order": 546,
+                "prevSize": 32,
+                "code": 57387,
+                "name": "italic",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 40
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M707.88 484.652c37.498-44.542 60.12-102.008 60.12-164.652 0-141.16-114.842-256-256-256h-320v896h384c141.158 0 256-114.842 256-256 0-92.956-49.798-174.496-124.12-219.348zM384 192h101.5c55.968 0 101.5 57.42 101.5 128s-45.532 128-101.5 128h-101.5v-256zM543 832h-159v-256h159c58.45 0 106 57.42 106 128s-47.55 128-106 128z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "bold0"
+                ],
+                "defaultCode": 57386,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 9,
+                "order": 547,
+                "prevSize": 32,
+                "code": 57386,
+                "name": "bold",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 41
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M576 64c247.424 0 448 200.576 448 448s-200.576 448-448 448v-96c94.024 0 182.418-36.614 248.902-103.098 66.484-66.484 103.098-154.878 103.098-248.902 0-94.022-36.614-182.418-103.098-248.902-66.484-66.484-154.878-103.098-248.902-103.098-94.022 0-182.418 36.614-248.902 103.098-51.14 51.138-84.582 115.246-97.306 184.902h186.208l-224 256-224-256h164.57c31.060-217.102 217.738-384 443.43-384zM768 448v128h-256v-320h128v192z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "restoredraft"
+                ],
+                "defaultCode": 57384,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 11,
+                "order": 548,
+                "prevSize": 32,
+                "code": 57384,
+                "name": "restoredraft",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 42
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 512h128v64h-128zM192 512h192v64h-192zM448 512h128v64h-128zM640 512h192v64h-192zM896 512h128v64h-128zM880 0l16 448h-768l16-448h32l16 384h640l16-384zM144 1024l-16-384h768l-16 384h-32l-16-320h-640l-16 320z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "pagebreak"
+                ],
+                "defaultCode": 57383,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 12,
+                "order": 549,
+                "prevSize": 32,
+                "code": 57383,
+                "name": "pagebreak",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 43
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M384 192h128v64h-128zM576 192h128v64h-128zM896 192v256h-192v-64h128v-128h-64v-64zM320 384h128v64h-128zM512 384h128v64h-128zM192 256v128h64v64h-128v-256h192v64zM384 576h128v64h-128zM576 576h128v64h-128zM896 576v256h-192v-64h128v-128h-64v-64zM320 768h128v64h-128zM512 768h128v64h-128zM192 640v128h64v64h-128v-256h192v64zM960 64h-896v896h896v-896zM1024 0v0 1024h-1024v-1024h1024z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "template"
+                ],
+                "defaultCode": 57382,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 13,
+                "order": 550,
+                "prevSize": 32,
+                "code": 57382,
+                "name": "template",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 44
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M448 576h-192v-128h192v-192h128v192h192v128h-192v192h-128zM1024 640v384h-1024v-384h128v256h768v-256z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "nonbreaking"
+                ],
+                "defaultCode": 57381,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 14,
+                "order": 551,
+                "prevSize": 32,
+                "code": 57381,
+                "name": "nonbreaking",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 45
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M128 256h128v192h64v-384c0-35.2-28.8-64-64-64h-128c-35.2 0-64 28.8-64 64v384h64v-192zM128 64h128v128h-128v-128zM960 64v-64h-192c-35.202 0-64 28.8-64 64v320c0 35.2 28.798 64 64 64h192v-64h-192v-320h192zM640 160v-96c0-35.2-28.8-64-64-64h-192v448h192c35.2 0 64-28.8 64-64v-96c0-35.2-8.8-64-44-64 35.2 0 44-28.8 44-64zM576 384h-128v-128h128v128zM576 192h-128v-128h128v128zM832 576l-416 448-224-288 82-70 142 148 352-302z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "spellchecker"
+                ],
+                "defaultCode": 57380,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 15,
+                "order": 552,
+                "prevSize": 32,
+                "code": 57380,
+                "name": "spellchecker",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 46
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M704 896h256l64-128v256h-384v-214.214c131.112-56.484 224-197.162 224-361.786 0-214.432-157.598-382.266-352-382.266-194.406 0-352 167.832-352 382.266 0 164.624 92.886 305.302 224 361.786v214.214h-384v-256l64 128h256v-32.59c-187.63-66.46-320-227.402-320-415.41 0-247.424 229.23-448 512-448 282.77 0 512 200.576 512 448 0 188.008-132.37 348.95-320 415.41v32.59z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "charmap"
+                ],
+                "defaultCode": 57376,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 19,
+                "order": 614,
+                "prevSize": 32,
+                "code": 57376,
+                "name": "charmap",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 47
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M768 206v50h128v64h-192v-146l128-60v-50h-128v-64h192v146zM676 256h-136l-188 188-188-188h-136l256 256-256 256h136l188-188 188 188h136l-256-256z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "sup"
+                ],
+                "defaultCode": 57375,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 20,
+                "order": 615,
+                "prevSize": 32,
+                "code": 57375,
+                "name": "sup",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 48
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M768 910v50h128v64h-192v-146l128-60v-50h-128v-64h192v146zM676 256h-136l-188 188-188-188h-136l256 256-256 256h136l188-188 188 188h136l-256-256z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "sub"
+                ],
+                "defaultCode": 57374,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 21,
+                "order": 616,
+                "prevSize": 32,
+                "code": 57374,
+                "name": "sub",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 49
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 896h576v128h-576zM192 0h704v128h-704zM277.388 832l204.688-784.164 123.85 32.328-196.25 751.836zM929.774 1024l-129.774-129.774-129.774 129.774-62.226-62.226 129.774-129.774-129.774-129.774 62.226-62.226 129.774 129.774 129.774-129.774 62.226 62.226-129.774 129.774 129.774 129.774z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "removeformat"
+                ],
+                "defaultCode": 57373,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 22,
+                "order": 617,
+                "prevSize": 32,
+                "code": 57373,
+                "name": "removeformat",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 50
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 448h1024v128h-1024z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "hr"
+                ],
+                "defaultCode": 57372,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 23,
+                "order": 618,
+                "prevSize": 32,
+                "code": 57372,
+                "name": "hr",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 51
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64v896h1024v-896h-1024zM384 640v-192h256v192h-256zM640 704v192h-256v-192h256zM640 192v192h-256v-192h256zM320 192v192h-256v-192h256zM64 448h256v192h-256v-192zM704 448h256v192h-256v-192zM704 384v-192h256v192h-256zM64 704h256v192h-256v-192zM704 896v-192h256v192h-256z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "table"
+                ],
+                "defaultCode": 57371,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 24,
+                "order": 619,
+                "prevSize": 32,
+                "code": 57371,
+                "name": "table",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 52
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M322.018 832l57.6-192h264.764l57.6 192h113.632l-191.996-640h-223.236l-192 640h113.636zM475.618 320h72.764l57.6 192h-187.964l57.6-192z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "forecolor"
+                ],
+                "defaultCode": 57370,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 25,
+                "order": 620,
+                "prevSize": 32,
+                "code": 57370,
+                "name": "forecolor",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 53
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M512 320c-209.368 0-395.244 100.556-512 256 116.756 155.446 302.632 256 512 256 209.368 0 395.244-100.554 512-256-116.756-155.444-302.632-256-512-256zM448 448c35.346 0 64 28.654 64 64s-28.654 64-64 64-64-28.654-64-64 28.654-64 64-64zM773.616 705.296c-39.648 20.258-81.652 35.862-124.846 46.376-44.488 10.836-90.502 16.328-136.77 16.328-46.266 0-92.282-5.492-136.768-16.324-43.194-10.518-85.198-26.122-124.846-46.376-63.020-32.202-120.222-76.41-167.64-129.298 47.418-52.888 104.62-97.1 167.64-129.298 32.336-16.522 66.242-29.946 101.082-40.040-19.888 30.242-31.468 66.434-31.468 105.336 0 106.040 85.962 192 192 192 106.038 0 192-85.96 192-192 0-38.902-11.582-75.094-31.466-105.34 34.838 10.096 68.744 23.52 101.082 40.042 63.022 32.198 120.218 76.408 167.638 129.298-47.42 52.886-104.618 97.1-167.638 129.296zM860.918 243.722c-108.72-55.554-226.112-83.722-348.918-83.722-122.806 0-240.198 28.168-348.918 83.722-58.772 30.032-113.732 67.904-163.082 112.076v109.206c55.338-58.566 120.694-107.754 192.194-144.29 99.62-50.904 207.218-76.714 319.806-76.714s220.186 25.81 319.804 76.716c71.502 36.536 136.858 85.724 192.196 144.29v-109.206c-49.35-44.174-104.308-82.046-163.082-112.078z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "preview"
+                ],
+                "defaultCode": 57369,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 26,
+                "order": 553,
+                "prevSize": 32,
+                "code": 57369,
+                "name": "preview",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 54
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M512 192c-212.076 0-384 171.922-384 384s171.922 384 384 384c212.074 0 384-171.922 384-384s-171.926-384-384-384zM715.644 779.646c-54.392 54.396-126.716 84.354-203.644 84.354s-149.25-29.958-203.646-84.354c-54.396-54.394-84.354-126.718-84.354-203.646s29.958-149.25 84.354-203.646c54.396-54.396 126.718-84.354 203.646-84.354s149.252 29.958 203.642 84.354c54.402 54.396 84.358 126.718 84.358 203.646s-29.958 149.252-84.356 203.646zM325.93 203.862l-42.94-85.878c-98.874 49.536-179.47 130.132-229.006 229.008l85.876 42.94c40.248-80.336 105.732-145.822 186.070-186.070zM884.134 389.93l85.878-42.938c-49.532-98.876-130.126-179.472-229.004-229.008l-42.944 85.878c80.338 40.248 145.824 105.732 186.070 186.068zM512 384h-64v192c0 10.11 4.7 19.11 12.022 24.972l-0.012 0.016 160 128 39.976-49.976-147.986-118.39v-176.622z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "inserttime"
+                ],
+                "defaultCode": 57368,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 27,
+                "order": 554,
+                "prevSize": 32,
+                "code": 57368,
+                "name": "inserttime",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 55
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M320 256l-256 256 256 256h128l-256-256 256-256zM704 256h-128l256 256-256 256h128l256-256z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "code"
+                ],
+                "defaultCode": 57367,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 28,
+                "order": 555,
+                "prevSize": 32,
+                "code": 57367,
+                "name": "code",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 56
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M448 704h128v128h-128zM704 256c35.346 0 64 28.654 64 64v192l-192 128h-128v-64l192-128v-64h-320v-128h384zM512 96c-111.118 0-215.584 43.272-294.156 121.844s-121.844 183.038-121.844 294.156c0 111.118 43.272 215.584 121.844 294.156 78.572 78.572 183.038 121.844 294.156 121.844 111.118 0 215.584-43.272 294.156-121.844 78.572-78.572 121.844-183.038 121.844-294.156 0-111.118-43.272-215.584-121.844-294.156-78.572-78.572-183.038-121.844-294.156-121.844zM512 0v0c282.77 0 512 229.23 512 512s-229.23 512-512 512c-282.77 0-512-229.23-512-512 0-282.77 229.23-512 512-512z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "help"
+                ],
+                "defaultCode": 57366,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 29,
+                "order": 556,
+                "prevSize": 32,
+                "code": 57366,
+                "name": "help",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 57
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 128v768h1024v-768h-1024zM192 832h-128v-128h128v128zM192 576h-128v-128h128v128zM192 320h-128v-128h128v128zM768 832h-512v-640h512v640zM960 832h-128v-128h128v128zM960 576h-128v-128h128v128zM960 320h-128v-128h128v128zM384 320v384l256-192z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "media"
+                ],
+                "defaultCode": 57365,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 30,
+                "order": 557,
+                "prevSize": 32,
+                "code": 57365,
+                "name": "media",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 58
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 128v832h1024v-832h-1024zM960 896h-896v-704h896v704zM704 352c0-53.019 42.981-96 96-96s96 42.981 96 96c0 53.019-42.981 96-96 96-53.019 0-96-42.981-96-96zM896 832h-768l192-512 256 320 128-96z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "image"
+                ],
+                "defaultCode": 57364,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 31,
+                "order": 558,
+                "prevSize": 32,
+                "code": 57364,
+                "name": "image",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 59
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M192 0v1024l320-320 320 320v-1024h-640zM768 869.49l-256-256-256 256v-805.49h512v805.49z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "anchor"
+                ],
+                "defaultCode": 57363,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 32,
+                "order": 559,
+                "prevSize": 32,
+                "code": 57363,
+                "name": "anchor",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 60
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M476.888 675.114c4.56 9.048 6.99 19.158 6.99 29.696 0 17.616-6.744 34.058-18.992 46.308l-163.38 163.38c-12.248 12.248-28.696 18.992-46.308 18.992s-34.060-6.744-46.308-18.992l-99.38-99.38c-12.248-12.25-18.992-28.696-18.992-46.308s6.744-34.060 18.992-46.308l163.38-163.382c12.248-12.246 28.696-18.992 46.308-18.992 10.538 0 20.644 2.43 29.696 6.988l65.338-65.336c-27.87-21.41-61.44-32.16-95.034-32.16-39.986 0-79.972 15.166-110.308 45.502l-163.38 163.382c-60.67 60.67-60.67 159.95 0 220.618l99.38 99.382c30.334 30.332 70.32 45.5 110.306 45.5 39.988 0 79.974-15.168 110.308-45.502l163.38-163.38c55.82-55.82 60.238-144.298 13.344-205.346l-65.34 65.338zM978.496 144.884l-99.38-99.382c-30.334-30.336-70.32-45.502-110.308-45.502-39.986 0-79.97 15.166-110.306 45.502l-163.382 163.382c-55.82 55.82-60.238 144.298-13.342 205.342l65.338-65.34c-4.558-9.050-6.988-19.16-6.988-29.694 0-17.616 6.744-34.060 18.992-46.308l163.382-163.382c12.246-12.248 28.694-18.994 46.306-18.994 17.616 0 34.060 6.746 46.308 18.994l99.38 99.382c12.248 12.248 18.992 28.694 18.992 46.308s-6.744 34.060-18.992 46.308l-163.38 163.382c-12.248 12.248-28.694 18.992-46.308 18.992-10.536 0-20.644-2.43-29.696-6.99l-65.338 65.338c27.872 21.41 61.44 32.16 95.034 32.16 39.988 0 79.974-15.168 110.308-45.504l163.38-163.38c60.672-60.666 60.672-159.944 0-220.614zM233.368 278.624l-191.994-191.994 45.256-45.256 191.994 191.994zM384 0h64v192h-64zM0 384h192v64h-192zM790.632 745.376l191.996 191.996-45.256 45.256-191.996-191.996zM576 832h64v192h-64zM832 576h192v64h-192z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "unlink"
+                ],
+                "defaultCode": 57362,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 33,
+                "order": 560,
+                "prevSize": 32,
+                "code": 57362,
+                "name": "unlink",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 61
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M320 704c17.6 17.6 47.274 16.726 65.942-1.942l316.118-316.116c18.668-18.668 19.54-48.342 1.94-65.942s-47.274-16.726-65.942 1.942l-316.116 316.116c-18.668 18.668-19.542 48.342-1.942 65.942zM476.888 675.112c4.56 9.050 6.99 19.16 6.99 29.696 0 17.616-6.744 34.060-18.992 46.308l-163.382 163.382c-12.248 12.248-28.694 18.992-46.308 18.992s-34.060-6.744-46.308-18.992l-99.382-99.382c-12.248-12.248-18.992-28.694-18.992-46.308s6.744-34.060 18.992-46.308l163.382-163.382c12.248-12.248 28.694-18.994 46.308-18.994 10.536 0 20.644 2.43 29.696 6.99l65.338-65.338c-27.87-21.41-61.44-32.16-95.034-32.16-39.986 0-79.972 15.166-110.308 45.502l-163.382 163.382c-60.67 60.67-60.67 159.948 0 220.618l99.382 99.382c30.334 30.332 70.32 45.5 110.306 45.5 39.988 0 79.974-15.168 110.308-45.502l163.382-163.382c55.82-55.82 60.238-144.298 13.344-205.344l-65.34 65.34zM978.498 144.884l-99.382-99.382c-30.334-30.336-70.32-45.502-110.308-45.502-39.986 0-79.972 15.166-110.308 45.502l-163.382 163.382c-55.82 55.82-60.238 144.298-13.342 205.342l65.338-65.34c-4.558-9.050-6.988-19.16-6.988-29.694 0-17.616 6.744-34.060 18.992-46.308l163.382-163.382c12.248-12.248 28.694-18.994 46.308-18.994s34.060 6.746 46.308 18.994l99.382 99.382c12.248 12.248 18.992 28.694 18.992 46.308s-6.744 34.060-18.992 46.308l-163.382 163.382c-12.248 12.248-28.694 18.992-46.308 18.992-10.536 0-20.644-2.43-29.696-6.99l-65.338 65.338c27.872 21.41 61.44 32.16 95.034 32.16 39.988 0 79.974-15.168 110.308-45.502l163.382-163.382c60.67-60.666 60.67-159.944 0-220.614z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "link"
+                ],
+                "defaultCode": 57361,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 34,
+                "order": 561,
+                "prevSize": 32,
+                "code": 57361,
+                "name": "link",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 62
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64h1024v128h-1024zM384 256h640v128h-640zM384 448h640v128h-640zM384 640h640v128h-640zM0 832h1024v128h-1024zM256 320v384l-256-192z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "outdent"
+                ],
+                "defaultCode": 57357,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 38,
+                "order": 562,
+                "prevSize": 32,
+                "code": 57357,
+                "name": "outdent",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 63
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64h1024v128h-1024zM384 256h640v128h-640zM384 448h640v128h-640zM384 640h640v128h-640zM0 832h1024v128h-1024zM0 704v-384l256 192z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "indent"
+                ],
+                "defaultCode": 57356,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 39,
+                "order": 563,
+                "prevSize": 32,
+                "code": 57356,
+                "name": "indent",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 64
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M384 832h640v128h-640zM384 448h640v128h-640zM384 64h640v128h-640zM192 0v256h-64v-192h-64v-64zM128 526v50h128v64h-192v-146l128-60v-50h-128v-64h192v146zM256 704v320h-192v-64h128v-64h-128v-64h128v-64h-128v-64z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "numlist"
+                ],
+                "defaultCode": 57355,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 40,
+                "order": 621,
+                "prevSize": 32,
+                "code": 57355,
+                "name": "numlist",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 65
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M384 64h640v128h-640v-128zM384 448h640v128h-640v-128zM384 832h640v128h-640v-128zM0 128c0-70.692 57.308-128 128-128 70.692 0 128 57.308 128 128 0 70.692-57.308 128-128 128-70.692 0-128-57.308-128-128zM0 512c0-70.692 57.308-128 128-128 70.692 0 128 57.308 128 128 0 70.692-57.308 128-128 128-70.692 0-128-57.308-128-128zM0 896c0-70.692 57.308-128 128-128 70.692 0 128 57.308 128 128 0 70.692-57.308 128-128 128-70.692 0-128-57.308-128-128z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "bullist"
+                ],
+                "defaultCode": 57354,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 41,
+                "order": 622,
+                "prevSize": 32,
+                "code": 57354,
+                "name": "bullist",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 66
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M64 0h384v64h-384zM576 0h384v64h-384zM952 320h-56v-256h-256v256h-256v-256h-256v256h-56c-39.6 0-72 32.4-72 72v560c0 39.6 32.4 72 72 72h304c39.6 0 72-32.4 72-72v-376h128v376c0 39.6 32.4 72 72 72h304c39.6 0 72-32.4 72-72v-560c0-39.6-32.4-72-72-72zM348 960h-248c-19.8 0-36-14.4-36-32s16.2-32 36-32h248c19.8 0 36 14.4 36 32s-16.2 32-36 32zM544 512h-64c-17.6 0-32-14.4-32-32s14.4-32 32-32h64c17.6 0 32 14.4 32 32s-14.4 32-32 32zM924 960h-248c-19.8 0-36-14.4-36-32s16.2-32 36-32h248c19.8 0 36 14.4 36 32s-16.2 32-36 32z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "searchreplace"
+                ],
+                "defaultCode": 57353,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 42,
+                "order": 623,
+                "prevSize": 32,
+                "code": 57353,
+                "name": "searchreplace",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 67
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M832 320v-160c0-17.6-14.4-32-32-32h-224v-64c0-35.2-28.8-64-64-64h-128c-35.204 0-64 28.8-64 64v64h-224c-17.602 0-32 14.4-32 32v640c0 17.6 14.398 32 32 32h288v192h448l192-192v-512h-192zM384 64.114c0.034-0.038 0.072-0.078 0.114-0.114h127.768c0.042 0.036 0.082 0.076 0.118 0.114l0 63.886h-128v-63.886zM192 256v-64h512v64h-512zM832 933.49v-101.49h101.49l-101.49 101.49zM960 768h-192v192h-320v-576h512v384z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "paste"
+                ],
+                "defaultCode": 57352,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 43,
+                "order": 624,
+                "prevSize": 32,
+                "code": 57352,
+                "name": "paste",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 68
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M890.774 709.154c-45.654-45.556-103.728-69.072-157.946-69.072h-29.112l-63.904-64.008 255.62-256.038c63.904-64.010 63.904-192.028 0-256.038l-383.43 384.056-383.432-384.054c-63.904 64.008-63.904 192.028 0 256.038l255.622 256.034-63.906 64.008h-29.114c-54.22 0-112.292 23.518-157.948 69.076-81.622 81.442-92.65 202.484-24.63 270.35 29.97 29.902 70.288 44.494 112.996 44.494 54.216 0 112.29-23.514 157.946-69.072 53.584-53.464 76.742-124 67.084-185.348l65.384-65.488 65.376 65.488c-9.656 61.348 13.506 131.882 67.084 185.348 45.662 45.558 103.732 69.072 157.948 69.072 42.708 0 83.024-14.592 112.994-44.496 68.020-67.866 56.988-188.908-24.632-270.35zM353.024 845.538c-7.698 17.882-19.010 34.346-33.626 48.926-14.636 14.604-31.172 25.918-49.148 33.624-16.132 6.916-32.96 10.568-48.662 10.568-15.146 0-36.612-3.402-52.862-19.612-16.136-16.104-19.52-37.318-19.52-52.288 0-15.542 3.642-32.21 10.526-48.212 7.7-17.884 19.014-34.346 33.626-48.926 14.634-14.606 31.172-25.914 49.15-33.624 16.134-6.914 32.96-10.568 48.664-10.568 15.146 0 36.612 3.4 52.858 19.614 16.134 16.098 19.522 37.316 19.522 52.284 0.002 15.542-3.638 32.216-10.528 48.214zM512.004 666.596c-49.914 0-90.376-40.532-90.376-90.526 0-49.992 40.462-90.52 90.376-90.52s90.372 40.528 90.372 90.52c0 49.998-40.46 90.526-90.372 90.526zM855.272 919.042c-16.248 16.208-37.712 19.612-52.86 19.612-15.704 0-32.53-3.652-48.666-10.568-17.972-7.706-34.508-19.020-49.142-33.624-14.614-14.58-25.926-31.042-33.626-48.926-6.886-15.998-10.526-32.672-10.526-48.212 0-14.966 3.384-36.188 19.52-52.286 16.246-16.208 37.712-19.614 52.86-19.614 15.7 0 32.53 3.654 48.66 10.568 17.978 7.708 34.516 19.018 49.15 33.624 14.61 14.58 25.924 31.042 33.626 48.926 6.884 15.998 10.526 32.67 10.526 48.212-0.002 14.97-3.39 36.186-19.522 52.288z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "cut"
+                ],
+                "defaultCode": 57351,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 44,
+                "order": 625,
+                "prevSize": 32,
+                "code": 57351,
+                "name": "cut",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 69
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64h1024v128h-1024zM0 256h1024v128h-1024zM0 448h1024v128h-1024zM0 640h1024v128h-1024zM0 832h1024v128h-1024z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "alignjustify"
+                ],
+                "defaultCode": 57350,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 45,
+                "order": 626,
+                "prevSize": 32,
+                "code": 57350,
+                "name": "alignjustify",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 70
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64h1024v128h-1024zM384 256h640v128h-640zM384 640h640v128h-640zM0 448h1024v128h-1024zM0 832h1024v128h-1024z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "alignright"
+                ],
+                "defaultCode": 57349,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 46,
+                "order": 627,
+                "prevSize": 32,
+                "code": 57349,
+                "name": "alignright",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 71
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64h1024v128h-1024zM192 256h640v128h-640zM192 640h640v128h-640zM0 448h1024v128h-1024zM0 832h1024v128h-1024z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "aligncenter"
+                ],
+                "defaultCode": 57348,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 47,
+                "order": 564,
+                "prevSize": 32,
+                "code": 57348,
+                "name": "aligncenter",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 72
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64h1024v128h-1024zM0 256h640v128h-640zM0 640h640v128h-640zM0 448h1024v128h-1024zM0 832h1024v128h-1024z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "alignleft"
+                ],
+                "defaultCode": 57347,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 48,
+                "order": 565,
+                "prevSize": 32,
+                "code": 57347,
+                "name": "alignleft",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 73
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1024 592.458v-160.916l-159.144-15.914c-8.186-30.042-20.088-58.548-35.21-84.98l104.596-127.838-113.052-113.050-127.836 104.596c-26.434-15.124-54.942-27.026-84.982-35.208l-15.914-159.148h-160.916l-15.914 159.146c-30.042 8.186-58.548 20.086-84.98 35.208l-127.838-104.594-113.050 113.050 104.596 127.836c-15.124 26.432-27.026 54.94-35.21 84.98l-159.146 15.916v160.916l159.146 15.914c8.186 30.042 20.086 58.548 35.21 84.982l-104.596 127.836 113.048 113.048 127.838-104.596c26.432 15.124 54.94 27.028 84.98 35.21l15.916 159.148h160.916l15.914-159.144c30.042-8.186 58.548-20.088 84.982-35.21l127.836 104.596 113.048-113.048-104.596-127.836c15.124-26.434 27.028-54.942 35.21-84.98l159.148-15.92zM704 576l-128 128h-128l-128-128v-128l128-128h128l128 128v128z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "fullpage"
+                ],
+                "defaultCode": 57346,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 49,
+                "order": 566,
+                "prevSize": 32,
+                "code": 57346,
+                "name": "fullpage",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 74
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M903.432 199.43l-142.864-142.862c-31.112-31.112-92.568-56.568-136.568-56.568h-480c-44 0-80 36-80 80v864c0 44 36 80 80 80h736c44 0 80-36 80-80v-608c0-44-25.456-105.458-56.568-136.57zM858.178 244.686c3.13 3.13 6.25 6.974 9.28 11.314h-163.458v-163.456c4.34 3.030 8.184 6.15 11.314 9.28l142.864 142.862zM896 944c0 8.672-7.328 16-16 16h-736c-8.672 0-16-7.328-16-16v-864c0-8.672 7.328-16 16-16h480c4.832 0 10.254 0.61 16 1.704v254.296h254.296c1.094 5.746 1.704 11.166 1.704 16v608z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "newdocument"
+                ],
+                "defaultCode": 57345,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 50,
+                "order": 567,
+                "prevSize": 32,
+                "code": 57345,
+                "name": "newdocument",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 75
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M896 0h-896v1024h1024v-896l-128-128zM512 128h128v256h-128v-256zM896 896h-768v-768h64v320h576v-320h74.978l53.022 53.018v714.982z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "save"
+                ],
+                "defaultCode": 57344,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 51,
+                "order": 568,
+                "prevSize": 32,
+                "code": 57344,
+                "name": "save",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 76
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M128 544l288 288 480-480-128-128-352 352-160-160z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "defaultCode": 57395,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 52,
+                "order": 569,
+                "prevSize": 32,
+                "code": 57395,
+                "name": "checkbox",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 77
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M512 512v128h32l32-64h64v256h-48v64h224v-64h-48v-256h64l32 64h32v-128zM832 320v-160c0-17.6-14.4-32-32-32h-224v-64c0-35.2-28.8-64-64-64h-128c-35.204 0-64 28.8-64 64v64h-224c-17.602 0-32 14.4-32 32v640c0 17.6 14.398 32 32 32h288v192h640v-704h-192zM384 64.114c0.034-0.038 0.072-0.078 0.114-0.114h127.768c0.042 0.036 0.082 0.076 0.118 0.114l0 63.886h-128v-63.886zM192 256v-64h512v64h-512zM960 960h-512v-576h512v576z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "pastetext"
+                ],
+                "defaultCode": 57397,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 53,
+                "order": 570,
+                "prevSize": 32,
+                "code": 57397,
+                "name": "pastetext",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 78
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1024 0v384l-138.26-138.26-212 212-107.48-107.48 212-212-138.26-138.26zM245.74 138.26l212 212-107.48 107.48-212-212-138.26 138.26v-384h384zM885.74 778.26l138.26-138.26v384h-384l138.26-138.26-212-212 107.48-107.48zM457.74 673.74l-212 212 138.26 138.26h-384v-384l138.26 138.26 212-212z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "fullscreen"
+                ],
+                "defaultCode": 57379,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 16,
+                "order": 571,
+                "prevSize": 32,
+                "code": 57379,
+                "name": "fullscreen",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 79
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M256 64h512v128h-512zM960 256h-896c-35.2 0-64 28.8-64 64v320c0 35.2 28.796 64 64 64h192v256h512v-256h192c35.2 0 64-28.8 64-64v-320c0-35.2-28.8-64-64-64zM704 896h-384v-320h384v320zM974.4 352c0 25.626-20.774 46.4-46.398 46.4-25.626 0-46.402-20.774-46.402-46.4s20.776-46.4 46.402-46.4c25.626 0 46.398 20.774 46.398 46.4z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "print"
+                ],
+                "defaultCode": 57378,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 17,
+                "order": 572,
+                "prevSize": 32,
+                "code": 57378,
+                "name": "print",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 80
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M512 0c-282.77 0-512 229.228-512 512 0 282.77 229.228 512 512 512 282.77 0 512-229.23 512-512 0-282.772-229.23-512-512-512zM512 944c-238.586 0-432-193.412-432-432 0-238.586 193.414-432 432-432 238.59 0 432 193.414 432 432 0 238.588-193.41 432-432 432zM384 320c0 35.346-28.654 64-64 64s-64-28.654-64-64 28.654-64 64-64 64 28.654 64 64zM768 320c0 35.346-28.652 64-64 64s-64-28.654-64-64 28.652-64 64-64 64 28.654 64 64zM512 652c141.074 0 262.688-57.532 318.462-123.192-20.872 171.22-156.288 303.192-318.462 303.192-162.118 0-297.498-132.026-318.444-303.168 55.786 65.646 177.386 123.168 318.444 123.168z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "emoticons"
+                ],
+                "defaultCode": 57377,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 18,
+                "order": 573,
+                "prevSize": 32,
+                "code": 57377,
+                "name": "emoticons",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 81
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M225 448c123.712 0 224 100.29 224 224 0 123.712-100.288 224-224 224-123.712 0-224-100.288-224-224l-1-32c0-247.424 200.576-448 448-448v128c-85.474 0-165.834 33.286-226.274 93.726-11.634 11.636-22.252 24.016-31.83 37.020 11.438-1.8 23.16-2.746 35.104-2.746zM801 448c123.71 0 224 100.29 224 224 0 123.712-100.29 224-224 224-123.71 0-224-100.288-224-224l-1-32c0-247.424 200.576-448 448-448v128c-85.474 0-165.834 33.286-226.274 93.726-11.636 11.636-22.254 24.016-31.832 37.020 11.44-1.8 23.16-2.746 35.106-2.746z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "blockquote"
+                ],
+                "defaultCode": 57358,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 37,
+                "order": 574,
+                "prevSize": 32,
+                "code": 57358,
+                "name": "blockquote",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 82
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M761.862 1024c113.726-206.032 132.888-520.306-313.862-509.824v253.824l-384-384 384-384v248.372c534.962-13.942 594.57 472.214 313.862 775.628z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "undo"
+                ],
+                "defaultCode": 57359,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 36,
+                "order": 628,
+                "prevSize": 32,
+                "code": 57359,
+                "name": "undo",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 83
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M576 248.372v-248.372l384 384-384 384v-253.824c-446.75-10.482-427.588 303.792-313.86 509.824-280.712-303.414-221.1-789.57 313.86-775.628z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "redo"
+                ],
+                "defaultCode": 57360,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 35,
+                "order": 629,
+                "prevSize": 32,
+                "code": 57360,
+                "name": "redo",
+                "ligatures": ""
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 84
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M199.995 381.998v-104.002c0-43.078 34.923-78.001 78.001-78.001h26v-104.002h-26c-100.518 0-182.003 81.485-182.003 182.003v104.002c0 43.078-34.923 78.001-78.001 78.001h-26v104.002h26c43.078 0 78.001 34.923 78.001 78.001v104.002c0 100.515 81.485 182.003 182.003 182.003h26v-104.002h-26c-43.078 0-78.001-34.923-78.001-78.001v-104.002c0-50.931-20.928-96.966-54.646-130.002 33.716-33.036 54.646-79.072 54.646-130.002z",
+                    "M824.005 381.998v-104.002c0-43.078-34.923-78.001-78.001-78.001h-26v-104.002h26c100.515 0 182.003 81.485 182.003 182.003v104.002c0 43.078 34.923 78.001 78.001 78.001h26v104.002h-26c-43.078 0-78.001 34.923-78.001 78.001v104.002c0 100.515-81.488 182.003-182.003 182.003h-26v-104.002h26c43.078 0 78.001-34.923 78.001-78.001v-104.002c0-50.931 20.928-96.966 54.646-130.002-33.716-33.036-54.646-79.072-54.646-130.002z",
+                    "M616.002 356.715c0 57.439-46.562 104.002-104.002 104.002s-104.002-46.562-104.002-104.002c0-57.439 46.562-104.002 104.002-104.002s104.002 46.562 104.002 104.002z",
+                    "M512 511.283c-57.439 0-104.002 46.562-104.002 104.002 0 55.845 26 100.115 105.752 103.88-23.719 33.417-59.441 46.612-105.752 50.944v61.751c0 0 208.003 18.144 208.003-216.577-0.202-57.441-46.56-104.004-104.002-104.004z"
+                ],
+                "width": 1024,
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "code",
+                    "semicolon",
+                    "curly-braces"
+                ],
+                "grid": 16,
+                "defaultCode": 58883
+            },
+            "attrs": [],
+            "properties": {
+                "order": 630,
+                "id": 1,
+                "prevSize": 32,
+                "code": 58883,
+                "name": "codesample"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 85
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M864.626 473.162c-65.754-183.44-205.11-348.15-352.626-473.162-147.516 125.012-286.87 289.722-352.626 473.162-40.664 113.436-44.682 236.562 12.584 345.4 65.846 125.14 198.632 205.438 340.042 205.438s274.196-80.298 340.040-205.44c57.27-108.838 53.25-231.962 12.586-345.398zM738.764 758.956c-43.802 83.252-132.812 137.044-226.764 137.044-55.12 0-108.524-18.536-152.112-50.652 13.242 1.724 26.632 2.652 40.112 2.652 117.426 0 228.668-67.214 283.402-171.242 44.878-85.292 40.978-173.848 23.882-244.338 14.558 28.15 26.906 56.198 36.848 83.932 22.606 63.062 40.024 156.34-5.368 242.604z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "drop"
+                ],
+                "defaultCode": 57381,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 87,
+                "order": 631,
+                "prevSize": 32,
+                "code": 59701,
+                "ligatures": "droplet, color9",
+                "name": "drop"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 86
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M768 128h-512l-256 256 512 576 512-576-256-256zM512 778.666v-2.666h-2.37l-14.222-16h16.592v-16h-30.814l-14.222-16h45.036v-16h-59.258l-14.222-16h73.48v-16h-87.704l-14.222-16h101.926v-16h-116.148l-14.222-16h130.37v-16h-144.592l-14.222-16h158.814v-16h-173.038l-14.222-16h187.26v-16h-201.482l-14.222-16h215.704v-16h-229.926l-14.222-16h244.148v-16h-258.372l-14.222-16h272.594v-16h-286.816l-14.222-16h301.038v-16h-315.26l-14.222-16h329.482v-16h-343.706l-7.344-8.262 139.072-139.072h211.978v3.334h215.314l16 16h-231.314v16h247.314l16 16h-263.314v16h279.314l16 16h-295.314v16h311.314l16 16h-327.314v16h343.312l7.738 7.738-351.050 394.928z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "diamond",
+                    "gem",
+                    "jewelry",
+                    "dualtone"
+                ],
+                "defaultCode": 57889,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 635,
+                "order": 632,
+                "prevSize": 32,
+                "code": 60327,
+                "ligatures": "diamond2, gem2",
+                "name": "sharpen"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 87
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM128 512c0-212.078 171.922-384 384-384v768c-212.078 0-384-171.922-384-384z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "contrast"
+                ],
+                "defaultCode": 58104,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 854,
+                "order": 633,
+                "prevSize": 32,
+                "code": 60628,
+                "ligatures": "contrast",
+                "name": "contrast"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 88
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M893.254 221.254l-90.508-90.508-290.746 290.744-290.746-290.744-90.508 90.506 290.746 290.748-290.746 290.746 90.508 90.508 290.746-290.746 290.746 290.746 90.508-90.51-290.744-290.744z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "remove"
+                ],
+                "defaultCode": 60778,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 24,
+                "order": 634,
+                "prevSize": 32,
+                "code": 60778,
+                "ligatures": "cross2, cancel3",
+                "name": "remove22"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 89
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64v384c0 35.346 28.654 64 64 64s64-28.654 64-64v-229.488l677.488 677.488h-229.488c-35.346 0-64 28.652-64 64 0 35.346 28.654 64 64 64h384c35.346 0 64-28.654 64-64v-384c0-35.348-28.654-64-64-64s-64 28.652-64 64v229.488l-677.488-677.488h229.488c35.346 0 64-28.654 64-64s-28.652-64-64-64h-384c-35.346 0-64 28.654-64 64z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "resize2"
+                ],
+                "defaultCode": 58329,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 1097,
+                "order": 575,
+                "prevSize": 32,
+                "code": 60921,
+                "ligatures": "arrow-resize2, diagonal2",
+                "name": "resize2"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 90
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M483.2 640l-147.2-336c-9.6-25.6-19.2-44.8-25.6-54.4s-16-12.8-25.6-12.8c-16 0-25.6 3.2-28.8 3.2v-70.4c9.6-6.4 25.6-6.4 38.4-9.6 32 0 57.6 6.4 73.6 22.4 6.4 6.4 12.8 16 19.2 25.6 6.4 12.8 12.8 25.6 16 41.6l121.6 291.2 150.4-371.2h92.8l-198.4 470.4v224h-86.4v-224z",
+                    "M0 0v1024h1024v-1024h-1024zM960 960h-896v-896h896v896z"
+                ],
+                "attrs": [
+                    {},
+                    {}
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "gamma2"
+                ],
+                "grid": 16,
+                "defaultCode": 58880
+            },
+            "attrs": [
+                {},
+                {}
+            ],
+            "properties": {
+                "order": 576,
+                "id": 1,
+                "prevSize": 32,
+                "code": 58880,
+                "name": "gamma"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 91
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M627.2 880h-579.2v-396.8h579.2v396.8zM553.6 553.6h-435.2v256h435.2v-256z",
+                    "M259.2 227.2c176-176 457.6-176 633.6 0s176 457.6 0 633.6c-121.6 121.6-297.6 160-454.4 108.8 121.6 28.8 262.4-9.6 361.6-108.8 150.4-150.4 160-384 22.4-521.6-121.6-121.6-320-128-470.4-19.2l86.4 86.4-294.4 22.4 22.4-294.4 92.8 92.8z"
+                ],
+                "attrs": [
+                    {},
+                    {}
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "orientation"
+                ],
+                "grid": 16,
+                "defaultCode": 58881
+            },
+            "attrs": [
+                {},
+                {}
+            ],
+            "properties": {
+                "order": 577,
+                "id": 0,
+                "prevSize": 32,
+                "code": 58881,
+                "name": "orientation"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 92
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M768 544v352h-640v-640h352l128-128h-512c-52.8 0-96 43.2-96 96v704c0 52.8 43.2 96 96 96h704c52.798 0 96-43.2 96-96v-512l-128 128z",
+                    "M864 0l-608 608v160h160l608-608c0-96-64-160-160-160zM416 640l-48-48 480-480 48 48-480 480z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "pencil",
+                    "write",
+                    "edit"
+                ],
+                "defaultCode": 57361,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 68,
+                "order": 578,
+                "prevSize": 32,
+                "code": 59669,
+                "ligatures": "pencil7, write7",
+                "name": "editimage"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 93
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M607.998 128.014c-212.070 0-383.986 171.916-383.986 383.986h-191.994l246.848 246.848 246.848-246.848h-191.994c0-151.478 122.798-274.276 274.276-274.276 151.48 0 274.276 122.798 274.276 274.276 0 151.48-122.796 274.276-274.276 274.276v109.71c212.070 0 383.986-171.916 383.986-383.986s-171.916-383.986-383.986-383.986z"
+                ],
+                "width": 1024,
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "rotate-ccw",
+                    "ccw",
+                    "arrow"
+                ],
+                "defaultCode": 60072,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 22,
+                "order": 579,
+                "prevSize": 32,
+                "code": 60072,
+                "ligatures": "rotate-ccw3, ccw4",
+                "name": "rotateleft"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 94
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M416.002 128.014c212.070 0 383.986 171.916 383.986 383.986h191.994l-246.848 246.848-246.848-246.848h191.994c0-151.478-122.798-274.276-274.276-274.276-151.48 0-274.276 122.798-274.276 274.276 0 151.48 122.796 274.276 274.276 274.276v109.71c-212.070 0-383.986-171.916-383.986-383.986s171.916-383.986 383.986-383.986z"
+                ],
+                "width": 1024,
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "rotate-cw",
+                    "cw",
+                    "arrow"
+                ],
+                "defaultCode": 60073,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 580,
+                "id": 1679,
+                "prevSize": 32,
+                "code": 60073,
+                "ligatures": "rotate-cw3, cw4",
+                "name": "rotateright"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 95
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 384h1024v-384zM1024 960v-384h-1024z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "flip-vertical",
+                    "mirror"
+                ],
+                "defaultCode": 57663,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 403,
+                "order": 581,
+                "prevSize": 32,
+                "code": 60074,
+                "ligatures": "flip-vertical, mirror",
+                "name": "flipv"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 96
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M576 0v1024h384zM0 1024h384v-1024z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "flip-horizontal",
+                    "mirror"
+                ],
+                "defaultCode": 57664,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 405,
+                "order": 582,
+                "prevSize": 32,
+                "code": 60076,
+                "ligatures": "flip-horizontal, mirror3",
+                "name": "fliph"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 97
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M992.262 871.396l-242.552-206.294c-25.074-22.566-51.89-32.926-73.552-31.926 57.256-67.068 91.842-154.078 91.842-249.176 0-212.078-171.922-384-384-384-212.076 0-384 171.922-384 384 0 212.078 171.922 384 384 384 95.098 0 182.108-34.586 249.176-91.844-1 21.662 9.36 48.478 31.926 73.552l206.294 242.552c35.322 39.246 93.022 42.554 128.22 7.356s31.892-92.898-7.354-128.22zM384 640c-141.384 0-256-114.616-256-256s114.616-256 256-256 256 114.616 256 256-114.614 256-256 256zM448 192h-128v128h-128v128h128v128h128v-128h128v-128h-128z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "zoom-in",
+                    "magnifier",
+                    "magnifier-plus",
+                    "enlarge"
+                ],
+                "defaultCode": 57788,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 534,
+                "order": 583,
+                "prevSize": 32,
+                "code": 60213,
+                "ligatures": "zoom-in3, magnifier9",
+                "name": "zoomin"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 98
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M992.262 871.396l-242.552-206.294c-25.074-22.566-51.89-32.926-73.552-31.926 57.256-67.068 91.842-154.078 91.842-249.176 0-212.078-171.922-384-384-384-212.076 0-384 171.922-384 384 0 212.078 171.922 384 384 384 95.098 0 182.108-34.586 249.176-91.844-1 21.662 9.36 48.478 31.926 73.552l206.294 242.552c35.322 39.246 93.022 42.554 128.22 7.356s31.892-92.898-7.354-128.22zM384 640c-141.384 0-256-114.616-256-256s114.616-256 256-256 256 114.616 256 256-114.614 256-256 256zM192 320h384v128h-384z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "zoom-out",
+                    "magnifier",
+                    "magnifier-minus",
+                    "reduce"
+                ],
+                "defaultCode": 57789,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 535,
+                "order": 584,
+                "prevSize": 32,
+                "code": 60214,
+                "ligatures": "zoom-out3, magnifier10",
+                "name": "zoomout"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 99
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M64 192h896v192h-896zM64 448h896v192h-896zM64 704h896v192h-896z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "menu",
+                    "list",
+                    "options",
+                    "lines",
+                    "hamburger"
+                ],
+                "defaultCode": 58031,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "order": 585,
+                "id": 1448,
+                "prevSize": 32,
+                "code": 60522,
+                "ligatures": "menu3, list4",
+                "name": "options"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 100
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M512 832c35.346 0 64 28.654 64 64v64c0 35.346-28.654 64-64 64s-64-28.654-64-64v-64c0-35.346 28.654-64 64-64zM512 192c-35.346 0-64-28.654-64-64v-64c0-35.346 28.654-64 64-64s64 28.654 64 64v64c0 35.346-28.654 64-64 64zM960 448c35.346 0 64 28.654 64 64s-28.654 64-64 64h-64c-35.348 0-64-28.654-64-64s28.652-64 64-64h64zM192 512c0 35.346-28.654 64-64 64h-64c-35.346 0-64-28.654-64-64s28.654-64 64-64h64c35.346 0 64 28.654 64 64zM828.784 738.274l45.256 45.258c24.992 24.99 24.992 65.516 0 90.508-24.994 24.992-65.518 24.992-90.51 0l-45.256-45.256c-24.992-24.99-24.992-65.516 0-90.51 24.994-24.992 65.518-24.992 90.51-0zM195.216 285.726l-45.256-45.256c-24.994-24.994-24.994-65.516 0-90.51s65.516-24.994 90.51 0l45.256 45.256c24.994 24.994 24.994 65.516 0 90.51s-65.516 24.994-90.51 0zM828.784 285.726c-24.992 24.992-65.516 24.992-90.51 0-24.992-24.994-24.992-65.516 0-90.51l45.256-45.254c24.992-24.994 65.516-24.994 90.51 0 24.992 24.994 24.992 65.516 0 90.51l-45.256 45.254zM195.216 738.274c24.992-24.992 65.518-24.992 90.508 0 24.994 24.994 24.994 65.52 0 90.51l-45.254 45.256c-24.994 24.992-65.516 24.992-90.51 0s-24.994-65.518 0-90.508l45.256-45.258z",
+                    "M512 256c-141.384 0-256 114.616-256 256 0 141.382 114.616 256 256 256 141.382 0 256-114.618 256-256 0-141.384-114.616-256-256-256zM512 672c-88.366 0-160-71.634-160-160s71.634-160 160-160 160 71.634 160 160-71.634 160-160 160z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "sun",
+                    "weather"
+                ],
+                "defaultCode": 58094,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 844,
+                "order": 635,
+                "prevSize": 32,
+                "code": 60620,
+                "ligatures": "sun2, weather21",
+                "name": "sun"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 101
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M715.812 64.48c-60.25-34.784-124.618-55.904-189.572-64.48 122.936 160.082 144.768 384.762 37.574 570.42-107.2 185.67-312.688 279.112-512.788 252.68 39.898 51.958 90.376 97.146 150.628 131.934 245.908 141.974 560.37 57.72 702.344-188.198 141.988-245.924 57.732-560.372-188.186-702.356z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "moon",
+                    "night",
+                    "sleep"
+                ],
+                "defaultCode": 58105,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 855,
+                "order": 636,
+                "prevSize": 32,
+                "code": 60621,
+                "ligatures": "moon, night",
+                "name": "moon"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 102
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M672 1024l192-192-320-320 320-320-192-192-512 512z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "arrow-left",
+                    "left",
+                    "previous"
+                ],
+                "defaultCode": 58291,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 1056,
+                "order": 637,
+                "prevSize": 32,
+                "code": 60864,
+                "ligatures": "arrow-left, left4",
+                "name": "arrowleft"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 103
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M832 256l192-192-64-64-192 192h-448v-192h-128v192h-192v128h192v512h512v192h128v-192h192v-128h-192v-448zM320 320h320l-320 320v-320zM384 704l320-320v320h-320z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "tags": [
+                    "crop",
+                    "resize",
+                    "cut"
+                ],
+                "defaultCode": 58428,
+                "grid": 16
+            },
+            "attrs": [],
+            "properties": {
+                "id": 1201,
+                "order": 638,
+                "prevSize": 32,
+                "code": 61048,
+                "ligatures": "crop, resize",
+                "name": "crop"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 104
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64v896h1024v-896h-1024zM640 704v192h-256v-192h256zM640 192v192h-256v-192h256zM320 192v192h-256v-192h256zM704 384v-192h256v192h-256zM64 704h256v192h-256v-192zM704 896v-192h256v192h-256z"
+                ],
+                "attrs": [
+                    {
+                        "fill": "rgb(0, 0, 0)"
+                    }
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "tablerowprops"
+                ],
+                "defaultCode": 58880,
+                "grid": 16
+            },
+            "attrs": [
+                {
+                    "fill": "rgb(0, 0, 0)"
+                }
+            ],
+            "properties": {
+                "id": 1680,
+                "order": 639,
+                "prevSize": 32,
+                "code": 58884,
+                "name": "tablerowprops"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 105
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64v896h1024v-896h-1024zM640 704v192h-256v-192h256zM640 192v192h-256v-192h256zM320 192v192h-256v-192h256zM64 448h256v192h-256v-192zM704 448h256v192h-256v-192zM704 384v-192h256v192h-256zM64 704h256v192h-256v-192zM704 896v-192h256v192h-256z"
+                ],
+                "attrs": [
+                    {
+                        "fill": "rgb(0, 0, 0)"
+                    }
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "tablecellprops"
+                ],
+                "defaultCode": 58881,
+                "grid": 16
+            },
+            "attrs": [
+                {
+                    "fill": "rgb(0, 0, 0)"
+                }
+            ],
+            "properties": {
+                "id": 1681,
+                "order": 640,
+                "prevSize": 32,
+                "code": 58885,
+                "name": "tablecellprops"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 106
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64v832h1024v-832h-1024zM320 832h-256v-192h256v192zM320 576h-256v-192h256v192zM640 832h-256v-192h256v192zM640 576h-256v-192h256v192zM960 832h-256v-192h256v192zM960 576h-256v-192h256v192zM960 320h-896v-192h896v192z"
+                ],
+                "attrs": [
+                    {
+                        "fill": "rgb(0, 0, 0)"
+                    }
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "table2"
+                ],
+                "defaultCode": 58882,
+                "grid": 16
+            },
+            "attrs": [
+                {
+                    "fill": "rgb(0, 0, 0)"
+                }
+            ],
+            "properties": {
+                "id": 1682,
+                "order": 641,
+                "prevSize": 32,
+                "code": 58886,
+                "name": "table2"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 107
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64v896h1024v-896h-1024zM384 896v-448h576v448h-576zM640 192v192h-256v-192h256zM320 192v192h-256v-192h256zM64 448h256v192h-256v-192zM704 384v-192h256v192h-256zM64 704h256v192h-256v-192z"
+                ],
+                "attrs": [
+                    {
+                        "fill": "rgb(0, 0, 0)"
+                    }
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "tablemergecells"
+                ],
+                "defaultCode": 58884,
+                "grid": 16
+            },
+            "attrs": [
+                {
+                    "fill": "rgb(0, 0, 0)"
+                }
+            ],
+            "properties": {
+                "id": 1683,
+                "order": 586,
+                "prevSize": 32,
+                "code": 58887,
+                "name": "tablemergecells"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 108
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M320 771.2v-182.4h-182.4v-89.6h182.4v-182.4h86.4v182.4h185.6v89.6h-185.6v182.4zM0 64v896h1024v-896h-1024zM640 896h-576v-704h576v704zM960 896h-256v-192h256v192zM960 640h-256v-192h256v192zM960 384h-256v-192h256v192z"
+                ],
+                "attrs": [
+                    {
+                        "fill": "rgb(0, 0, 0)"
+                    }
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "tableinsertcolbefore"
+                ],
+                "defaultCode": 58885,
+                "grid": 16
+            },
+            "attrs": [
+                {
+                    "fill": "rgb(0, 0, 0)"
+                }
+            ],
+            "properties": {
+                "id": 1684,
+                "order": 587,
+                "prevSize": 32,
+                "code": 58888,
+                "name": "tableinsertcolbefore"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 109
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M704 316.8v182.4h182.4v89.6h-182.4v182.4h-86.4v-182.4h-185.6v-89.6h185.6v-182.4zM0 64v896h1024v-896h-1024zM320 896h-256v-192h256v192zM320 640h-256v-192h256v192zM320 384h-256v-192h256v192zM960 896h-576v-704h576v704z"
+                ],
+                "attrs": [
+                    {
+                        "fill": "rgb(0, 0, 0)"
+                    }
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "tableinsertcolafter"
+                ],
+                "defaultCode": 58886,
+                "grid": 16
+            },
+            "attrs": [
+                {
+                    "fill": "rgb(0, 0, 0)"
+                }
+            ],
+            "properties": {
+                "id": 1685,
+                "order": 588,
+                "prevSize": 32,
+                "code": 58889,
+                "name": "tableinsertcolafter"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 110
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M691.2 451.2h-144v144h-70.4v-144h-144v-67.2h144v-144h70.4v144h144zM0 64v896h1024v-896h-1024zM320 896h-256v-192h256v192zM640 896h-256v-192h256v192zM960 896h-256v-192h256v192zM960 643.2h-896v-451.2h896v451.2z"
+                ],
+                "attrs": [
+                    {
+                        "fill": "rgb(0, 0, 0)"
+                    }
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "tableinsertrowbefore"
+                ],
+                "defaultCode": 58887,
+                "grid": 16
+            },
+            "attrs": [
+                {
+                    "fill": "rgb(0, 0, 0)"
+                }
+            ],
+            "properties": {
+                "id": 1686,
+                "order": 589,
+                "prevSize": 32,
+                "code": 58890,
+                "name": "tableinsertrowbefore"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 111
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M332.8 636.8h144v-144h70.4v144h144v67.2h-144v144h-70.4v-144h-144zM0 64v896h1024v-896h-1024zM384 192h256v192h-256v-192zM64 192h256v192h-256v-192zM960 896h-896v-451.2h896v451.2zM960 384h-256v-192h256v192z"
+                ],
+                "attrs": [
+                    {
+                        "fill": "rgb(0, 0, 0)"
+                    }
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "tableinsertrowafter"
+                ],
+                "defaultCode": 58888,
+                "grid": 16
+            },
+            "attrs": [
+                {
+                    "fill": "rgb(0, 0, 0)"
+                }
+            ],
+            "properties": {
+                "id": 1687,
+                "order": 590,
+                "prevSize": 32,
+                "code": 58891,
+                "name": "tableinsertrowafter"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 112
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64v896h1024v-896h-1024zM384 192h256v192h-256v-192zM320 896h-256v-192h256v192zM320 640h-256v-192h256v192zM320 384h-256v-192h256v192zM960 896h-576v-448h576v448zM960 384h-256v-192h256v192zM864 803.2l-60.8 60.8-131.2-131.2-131.2 131.2-60.8-60.8 131.2-131.2-131.2-131.2 60.8-60.8 131.2 131.2 131.2-131.2 60.8 60.8-131.2 131.2z"
+                ],
+                "attrs": [
+                    {
+                        "fill": "rgb(0, 0, 0)"
+                    }
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "tablesplitcells"
+                ],
+                "defaultCode": 58890,
+                "grid": 16
+            },
+            "attrs": [
+                {
+                    "fill": "rgb(0, 0, 0)"
+                }
+            ],
+            "properties": {
+                "id": 1688,
+                "order": 591,
+                "prevSize": 32,
+                "code": 58893,
+                "name": "tablesplitcells"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 113
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64h1024v896h-1024v-896zM60.8 192v704h899.2v-704h-899.2zM809.6 748.8l-96 96-204.8-204.8-204.8 204.8-96-96 204.8-204.8-204.8-204.8 96-96 204.8 204.8 204.8-204.8 96 96-204.8 204.8z"
+                ],
+                "attrs": [
+                    {
+                        "fill": "rgb(0, 0, 0)"
+                    }
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "tabledelete"
+                ],
+                "defaultCode": 58891,
+                "grid": 16
+            },
+            "attrs": [
+                {
+                    "fill": "rgb(0, 0, 0)"
+                }
+            ],
+            "properties": {
+                "id": 1689,
+                "order": 592,
+                "prevSize": 32,
+                "code": 58894,
+                "name": "tabledelete"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 114
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64v832h1024v-832h-1024zM640 832h-256v-192h256v192zM640 576h-256v-192h256v192zM640 320h-256v-192h256v192zM960 832h-256v-192h256v192zM960 576h-256v-192h256v192zM960 320h-256v-192h256v192z"
+                ],
+                "attrs": [
+                    {
+                        "fill": "rgb(0, 0, 0)"
+                    }
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "tableleftheader"
+                ],
+                "defaultCode": 58922,
+                "grid": 16
+            },
+            "attrs": [
+                {
+                    "fill": "rgb(0, 0, 0)"
+                }
+            ],
+            "properties": {
+                "id": 1690,
+                "order": 593,
+                "prevSize": 32,
+                "code": 58922,
+                "name": "tableleftheader"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 115
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 64v832h1024v-832h-1024zM320 832h-256v-192h256v192zM320 576h-256v-192h256v192zM640 832h-256v-192h256v192zM640 576h-256v-192h256v192zM960 832h-256v-192h256v192zM960 576h-256v-192h256v192z"
+                ],
+                "attrs": [
+                    {
+                        "fill": "rgb(0, 0, 0)"
+                    }
+                ],
+                "isMulticolor": false,
+                "tags": [
+                    "tabletopheader"
+                ],
+                "defaultCode": 58923,
+                "grid": 16
+            },
+            "attrs": [
+                {
+                    "fill": "rgb(0, 0, 0)"
+                }
+            ],
+            "properties": {
+                "id": 1691,
+                "order": 594,
+                "prevSize": 32,
+                "code": 58923,
+                "name": "tabletopheader"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 116
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M886.4 387.2l-156.8 156.8 160 160-76.8 76.8-160-160-156.8 156.8-76.8-73.6 160-160-163.2-163.2 76.8-76.8 163.2 163.2 156.8-156.8 73.6 76.8zM0 64v896h1024v-896h-1024zM960 384h-22.4l-64 64h86.4v192h-89.6l64 64h25.6v192h-896v-192h310.4l64-64h-374.4v-192h371.2l-64-64h-307.2v-192h896v192z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "grid": 16,
+                "tags": [
+                    "tabledeleterow"
+                ],
+                "defaultCode": 59392
+            },
+            "attrs": [],
+            "properties": {
+                "order": 595,
+                "id": 1693,
+                "prevSize": 32,
+                "code": 59392,
+                "name": "tabledeleterow"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 117
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M320 460.8l64 64v12.8l-64 64v-140.8zM640 537.6l64 64v-137.6l-64 64v9.6zM1024 64v896h-1024v-896h1024zM960 192h-256v51.2l-12.8-12.8-51.2 51.2v-89.6h-256v89.6l-51.2-51.2-12.8 12.8v-51.2h-256v704h256v-118.4l35.2 35.2 28.8-28.8v115.2h256v-115.2l48 48 16-16v83.2h256v-707.2zM672 297.6l-156.8 156.8-163.2-163.2-76.8 76.8 163.2 163.2-156.8 156.8 76.8 76.8 156.8-156.8 160 160 76.8-76.8-160-160 156.8-156.8-76.8-76.8z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "grid": 16,
+                "tags": [
+                    "tabledeletecol"
+                ],
+                "defaultCode": 59393
+            },
+            "attrs": [],
+            "properties": {
+                "order": 596,
+                "id": 1692,
+                "prevSize": 32,
+                "code": 59393,
+                "name": "tabledeletecol"
+            },
+            "setIdx": 2,
+            "setId": 1,
+            "iconIdx": 118
+        }
+    ],
+    "height": 1024,
+    "metadata": {
+        "name": "tinymce"
+    },
+    "preferences": {
+        "showGlyphs": true,
+        "showQuickUse": true,
+        "showQuickUse2": true,
+        "showSVGs": true,
+        "fontPref": {
+            "prefix": "icon-",
+            "metadata": {
+                "fontFamily": "tinymce",
+                "majorVersion": 1,
+                "minorVersion": 0
+            },
+            "metrics": {
+                "emSize": 1024,
+                "baseline": 6.25,
+                "whitespace": 50
+            },
+            "resetPoint": 59649,
+            "embed": false
+        },
+        "imagePref": {
+            "prefix": "icon-",
+            "png": true,
+            "useClassSelector": true,
+            "color": 4473924,
+            "bgColor": 16777215
+        },
+        "historySize": 100,
+        "gridSize": 16,
+        "showGrid": true,
+        "showCodes": true,
+        "showLiga": false
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.svg b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.svg
new file mode 100644
index 0000000000..5727cea425
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="tinymce" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe000;" glyph-name="save" d="M896 960h-896v-1024h1024v896l-128 128zM512 832h128v-256h-128v256zM896 64h-768v768h64v-320h576v320h74.978l53.022-53.018v-714.982z" />
+<glyph unicode="&#xe001;" glyph-name="newdocument" d="M903.432 760.57l-142.864 142.862c-31.112 31.112-92.568 56.568-136.568 56.568h-480c-44 0-80-36-80-80v-864c0-44 36-80 80-80h736c44 0 80 36 80 80v608c0 44-25.456 105.458-56.568 136.57zM858.178 715.314c3.13-3.13 6.25-6.974 9.28-11.314h-163.458v163.456c4.34-3.030 8.184-6.15 11.314-9.28l142.864-142.862zM896 16c0-8.672-7.328-16-16-16h-736c-8.672 0-16 7.328-16 16v864c0 8.672 7.328 16 16 16h480c4.832 0 10.254-0.61 16-1.704v-254.296h254.296c1.094-5.746 1.704-11.166 1.704-16v-608z" />
+<glyph unicode="&#xe002;" glyph-name="fullpage" d="M1024 367.542v160.916l-159.144 15.914c-8.186 30.042-20.088 58.548-35.21 84.98l104.596 127.838-113.052 113.050-127.836-104.596c-26.434 15.124-54.942 27.026-84.982 35.208l-15.914 159.148h-160.916l-15.914-159.146c-30.042-8.186-58.548-20.086-84.98-35.208l-127.838 104.594-113.050-113.050 104.596-127.836c-15.124-26.432-27.026-54.94-35.21-84.98l-159.146-15.916v-160.916l159.146-15.914c8.186-30.042 20.086-58.548 35.21-84.982l-104.596-127.836 113.048-113.048 127.838 104.596c26.432-15.124 54.94-27.028 84.98-35.21l15.916-159.148h160.916l15.914 159.144c30.042 8.186 58.548 20.088 84.982 35.21l127.836-104.596 113.048 113.048-104.596 127.836c15.124 26.434 27.028 54.942 35.21 84.98l159.148 15.92zM704 384l-128-128h-128l-128 128v128l128 128h128l128-128v-128z" />
+<glyph unicode="&#xe003;" glyph-name="alignleft" d="M0 896h1024v-128h-1024zM0 704h640v-128h-640zM0 320h640v-128h-640zM0 512h1024v-128h-1024zM0 128h1024v-128h-1024z" />
+<glyph unicode="&#xe004;" glyph-name="aligncenter" d="M0 896h1024v-128h-1024zM192 704h640v-128h-640zM192 320h640v-128h-640zM0 512h1024v-128h-1024zM0 128h1024v-128h-1024z" />
+<glyph unicode="&#xe005;" glyph-name="alignright" d="M0 896h1024v-128h-1024zM384 704h640v-128h-640zM384 320h640v-128h-640zM0 512h1024v-128h-1024zM0 128h1024v-128h-1024z" />
+<glyph unicode="&#xe006;" glyph-name="alignjustify" d="M0 896h1024v-128h-1024zM0 704h1024v-128h-1024zM0 512h1024v-128h-1024zM0 320h1024v-128h-1024zM0 128h1024v-128h-1024z" />
+<glyph unicode="&#xe007;" glyph-name="cut" d="M890.774 250.846c-45.654 45.556-103.728 69.072-157.946 69.072h-29.112l-63.904 64.008 255.62 256.038c63.904 64.010 63.904 192.028 0 256.038l-383.43-384.056-383.432 384.054c-63.904-64.008-63.904-192.028 0-256.038l255.622-256.034-63.906-64.008h-29.114c-54.22 0-112.292-23.518-157.948-69.076-81.622-81.442-92.65-202.484-24.63-270.35 29.97-29.902 70.288-44.494 112.996-44.494 54.216 0 112.29 23.514 157.946 69.072 53.584 53.464 76.742 124 67.084 185.348l65.384 65.488 65.376-65.488c-9.656-61.348 13.506-131.882 67.084-185.348 45.662-45.558 103.732-69.072 157.948-69.072 42.708 0 83.024 14.592 112.994 44.496 68.020 67.866 56.988 188.908-24.632 270.35zM353.024 114.462c-7.698-17.882-19.010-34.346-33.626-48.926-14.636-14.604-31.172-25.918-49.148-33.624-16.132-6.916-32.96-10.568-48.662-10.568-15.146 0-36.612 3.402-52.862 19.612-16.136 16.104-19.52 37.318-19.52 52.288 0 15.542 3.642 32.21 10.526 48.212 7.7 17.884 19.014 34.346 33.626 48.926 14.634 14.606 31.172 25.914 49.15 33.624 16.134 6.914 32.96 10.568 48.664 10.568 15.146 0 36.612-3.4 52.858-19.614 16.134-16.098 19.522-37.316 19.522-52.284 0.002-15.542-3.638-32.216-10.528-48.214zM512.004 293.404c-49.914 0-90.376 40.532-90.376 90.526 0 49.992 40.462 90.52 90.376 90.52s90.372-40.528 90.372-90.52c0-49.998-40.46-90.526-90.372-90.526zM855.272 40.958c-16.248-16.208-37.712-19.612-52.86-19.612-15.704 0-32.53 3.652-48.666 10.568-17.972 7.706-34.508 19.020-49.142 33.624-14.614 14.58-25.926 31.042-33.626 48.926-6.886 15.998-10.526 32.672-10.526 48.212 0 14.966 3.384 36.188 19.52 52.286 16.246 16.208 37.712 19.614 52.86 19.614 15.7 0 32.53-3.654 48.66-10.568 17.978-7.708 34.516-19.018 49.15-33.624 14.61-14.58 25.924-31.042 33.626-48.926 6.884-15.998 10.526-32.67 10.526-48.212-0.002-14.97-3.39-36.186-19.522-52.288z" />
+<glyph unicode="&#xe008;" glyph-name="paste" d="M832 640v160c0 17.6-14.4 32-32 32h-224v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-224c-17.602 0-32-14.4-32-32v-640c0-17.6 14.398-32 32-32h288v-192h448l192 192v512h-192zM384 895.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 704v64h512v-64h-512zM832 26.51v101.49h101.49l-101.49-101.49zM960 192h-192v-192h-320v576h512v-384z" />
+<glyph unicode="&#xe009;" glyph-name="searchreplace" d="M64 960h384v-64h-384zM576 960h384v-64h-384zM952 640h-56v256h-256v-256h-256v256h-256v-256h-56c-39.6 0-72-32.4-72-72v-560c0-39.6 32.4-72 72-72h304c39.6 0 72 32.4 72 72v376h128v-376c0-39.6 32.4-72 72-72h304c39.6 0 72 32.4 72 72v560c0 39.6-32.4 72-72 72zM348 0h-248c-19.8 0-36 14.4-36 32s16.2 32 36 32h248c19.8 0 36-14.4 36-32s-16.2-32-36-32zM544 448h-64c-17.6 0-32 14.4-32 32s14.4 32 32 32h64c17.6 0 32-14.4 32-32s-14.4-32-32-32zM924 0h-248c-19.8 0-36 14.4-36 32s16.2 32 36 32h248c19.8 0 36-14.4 36-32s-16.2-32-36-32z" />
+<glyph unicode="&#xe00a;" glyph-name="bullist" d="M384 896h640v-128h-640v128zM384 512h640v-128h-640v128zM384 128h640v-128h-640v128zM0 832c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128zM0 448c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128zM0 64c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128z" />
+<glyph unicode="&#xe00b;" glyph-name="numlist" d="M384 128h640v-128h-640zM384 512h640v-128h-640zM384 896h640v-128h-640zM192 960v-256h-64v192h-64v64zM128 434v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM256 256v-320h-192v64h128v64h-128v64h128v64h-128v64z" />
+<glyph unicode="&#xe00c;" glyph-name="indent" d="M0 896h1024v-128h-1024zM384 704h640v-128h-640zM384 512h640v-128h-640zM384 320h640v-128h-640zM0 128h1024v-128h-1024zM0 256v384l256-192z" />
+<glyph unicode="&#xe00d;" glyph-name="outdent" d="M0 896h1024v-128h-1024zM384 704h640v-128h-640zM384 512h640v-128h-640zM384 320h640v-128h-640zM0 128h1024v-128h-1024zM256 640v-384l-256 192z" />
+<glyph unicode="&#xe00e;" glyph-name="blockquote" d="M225 512c123.712 0 224-100.29 224-224 0-123.712-100.288-224-224-224s-224 100.288-224 224l-1 32c0 247.424 200.576 448 448 448v-128c-85.474 0-165.834-33.286-226.274-93.726-11.634-11.636-22.252-24.016-31.83-37.020 11.438 1.8 23.16 2.746 35.104 2.746zM801 512c123.71 0 224-100.29 224-224 0-123.712-100.29-224-224-224s-224 100.288-224 224l-1 32c0 247.424 200.576 448 448 448v-128c-85.474 0-165.834-33.286-226.274-93.726-11.636-11.636-22.254-24.016-31.832-37.020 11.44 1.8 23.16 2.746 35.106 2.746z" />
+<glyph unicode="&#xe00f;" glyph-name="undo" d="M761.862-64c113.726 206.032 132.888 520.306-313.862 509.824v-253.824l-384 384 384 384v-248.372c534.962 13.942 594.57-472.214 313.862-775.628z" />
+<glyph unicode="&#xe010;" glyph-name="redo" d="M576 711.628v248.372l384-384-384-384v253.824c-446.75 10.482-427.588-303.792-313.86-509.824-280.712 303.414-221.1 789.57 313.86 775.628z" />
+<glyph unicode="&#xe011;" glyph-name="link" d="M320 256c17.6-17.6 47.274-16.726 65.942 1.942l316.118 316.116c18.668 18.668 19.54 48.342 1.94 65.942s-47.274 16.726-65.942-1.942l-316.116-316.116c-18.668-18.668-19.542-48.342-1.942-65.942zM476.888 284.888c4.56-9.050 6.99-19.16 6.99-29.696 0-17.616-6.744-34.060-18.992-46.308l-163.382-163.382c-12.248-12.248-28.694-18.992-46.308-18.992s-34.060 6.744-46.308 18.992l-99.382 99.382c-12.248 12.248-18.992 28.694-18.992 46.308s6.744 34.060 18.992 46.308l163.382 163.382c12.248 12.248 28.694 18.994 46.308 18.994 10.536 0 20.644-2.43 29.696-6.99l65.338 65.338c-27.87 21.41-61.44 32.16-95.034 32.16-39.986 0-79.972-15.166-110.308-45.502l-163.382-163.382c-60.67-60.67-60.67-159.948 0-220.618l99.382-99.382c30.334-30.332 70.32-45.5 110.306-45.5 39.988 0 79.974 15.168 110.308 45.502l163.382 163.382c55.82 55.82 60.238 144.298 13.344 205.344l-65.34-65.34zM978.498 815.116l-99.382 99.382c-30.334 30.336-70.32 45.502-110.308 45.502-39.986 0-79.972-15.166-110.308-45.502l-163.382-163.382c-55.82-55.82-60.238-144.298-13.342-205.342l65.338 65.34c-4.558 9.050-6.988 19.16-6.988 29.694 0 17.616 6.744 34.060 18.992 46.308l163.382 163.382c12.248 12.248 28.694 18.994 46.308 18.994s34.060-6.746 46.308-18.994l99.382-99.382c12.248-12.248 18.992-28.694 18.992-46.308s-6.744-34.060-18.992-46.308l-163.382-163.382c-12.248-12.248-28.694-18.992-46.308-18.992-10.536 0-20.644 2.43-29.696 6.99l-65.338-65.338c27.872-21.41 61.44-32.16 95.034-32.16 39.988 0 79.974 15.168 110.308 45.502l163.382 163.382c60.67 60.666 60.67 159.944 0 220.614z" />
+<glyph unicode="&#xe012;" glyph-name="unlink" d="M476.888 284.886c4.56-9.048 6.99-19.158 6.99-29.696 0-17.616-6.744-34.058-18.992-46.308l-163.38-163.38c-12.248-12.248-28.696-18.992-46.308-18.992s-34.060 6.744-46.308 18.992l-99.38 99.38c-12.248 12.25-18.992 28.696-18.992 46.308s6.744 34.060 18.992 46.308l163.38 163.382c12.248 12.246 28.696 18.992 46.308 18.992 10.538 0 20.644-2.43 29.696-6.988l65.338 65.336c-27.87 21.41-61.44 32.16-95.034 32.16-39.986 0-79.972-15.166-110.308-45.502l-163.38-163.382c-60.67-60.67-60.67-159.95 0-220.618l99.38-99.382c30.334-30.332 70.32-45.5 110.306-45.5 39.988 0 79.974 15.168 110.308 45.502l163.38 163.38c55.82 55.82 60.238 144.298 13.344 205.346l-65.34-65.338zM978.496 815.116l-99.38 99.382c-30.334 30.336-70.32 45.502-110.308 45.502-39.986 0-79.97-15.166-110.306-45.502l-163.382-163.382c-55.82-55.82-60.238-144.298-13.342-205.342l65.338 65.34c-4.558 9.050-6.988 19.16-6.988 29.694 0 17.616 6.744 34.060 18.992 46.308l163.382 163.382c12.246 12.248 28.694 18.994 46.306 18.994 17.616 0 34.060-6.746 46.308-18.994l99.38-99.382c12.248-12.248 18.992-28.694 18.992-46.308s-6.744-34.060-18.992-46.308l-163.38-163.382c-12.248-12.248-28.694-18.992-46.308-18.992-10.536 0-20.644 2.43-29.696 6.99l-65.338-65.338c27.872-21.41 61.44-32.16 95.034-32.16 39.988 0 79.974 15.168 110.308 45.504l163.38 163.38c60.672 60.666 60.672 159.944 0 220.614zM233.368 681.376l-191.994 191.994 45.256 45.256 191.994-191.994zM384 960h64v-192h-64zM0 576h192v-64h-192zM790.632 214.624l191.996-191.996-45.256-45.256-191.996 191.996zM576 128h64v-192h-64zM832 384h192v-64h-192z" />
+<glyph unicode="&#xe013;" glyph-name="anchor" d="M192 960v-1024l320 320 320-320v1024h-640zM768 90.51l-256 256-256-256v805.49h512v-805.49z" />
+<glyph unicode="&#xe014;" glyph-name="image" d="M0 832v-832h1024v832h-1024zM960 64h-896v704h896v-704zM704 608c0 53.019 42.981 96 96 96s96-42.981 96-96c0-53.019-42.981-96-96-96s-96 42.981-96 96zM896 128h-768l192 512 256-320 128 96z" />
+<glyph unicode="&#xe015;" glyph-name="media" d="M0 832v-768h1024v768h-1024zM192 128h-128v128h128v-128zM192 384h-128v128h128v-128zM192 640h-128v128h128v-128zM768 128h-512v640h512v-640zM960 128h-128v128h128v-128zM960 384h-128v128h128v-128zM960 640h-128v128h128v-128zM384 640v-384l256 192z" />
+<glyph unicode="&#xe016;" glyph-name="help" d="M448 256h128v-128h-128zM704 704c35.346 0 64-28.654 64-64v-192l-192-128h-128v64l192 128v64h-320v128h384zM512 864c-111.118 0-215.584-43.272-294.156-121.844s-121.844-183.038-121.844-294.156c0-111.118 43.272-215.584 121.844-294.156s183.038-121.844 294.156-121.844c111.118 0 215.584 43.272 294.156 121.844s121.844 183.038 121.844 294.156c0 111.118-43.272 215.584-121.844 294.156s-183.038 121.844-294.156 121.844zM512 960v0c282.77 0 512-229.23 512-512s-229.23-512-512-512c-282.77 0-512 229.23-512 512s229.23 512 512 512z" />
+<glyph unicode="&#xe017;" glyph-name="code" d="M320 704l-256-256 256-256h128l-256 256 256 256zM704 704h-128l256-256-256-256h128l256 256z" />
+<glyph unicode="&#xe018;" glyph-name="inserttime" d="M512 768c-212.076 0-384-171.922-384-384s171.922-384 384-384c212.074 0 384 171.922 384 384s-171.926 384-384 384zM715.644 180.354c-54.392-54.396-126.716-84.354-203.644-84.354s-149.25 29.958-203.646 84.354c-54.396 54.394-84.354 126.718-84.354 203.646s29.958 149.25 84.354 203.646c54.396 54.396 126.718 84.354 203.646 84.354s149.252-29.958 203.642-84.354c54.402-54.396 84.358-126.718 84.358-203.646s-29.958-149.252-84.356-203.646zM325.93 756.138l-42.94 85.878c-98.874-49.536-179.47-130.132-229.006-229.008l85.876-42.94c40.248 80.336 105.732 145.822 186.070 186.070zM884.134 570.070l85.878 42.938c-49.532 98.876-130.126 179.472-229.004 229.008l-42.944-85.878c80.338-40.248 145.824-105.732 186.070-186.068zM512 576h-64v-192c0-10.11 4.7-19.11 12.022-24.972l-0.012-0.016 160-128 39.976 49.976-147.986 118.39v176.622z" />
+<glyph unicode="&#xe019;" glyph-name="preview" d="M512 640c-209.368 0-395.244-100.556-512-256 116.756-155.446 302.632-256 512-256s395.244 100.554 512 256c-116.756 155.444-302.632 256-512 256zM448 512c35.346 0 64-28.654 64-64s-28.654-64-64-64-64 28.654-64 64 28.654 64 64 64zM773.616 254.704c-39.648-20.258-81.652-35.862-124.846-46.376-44.488-10.836-90.502-16.328-136.77-16.328-46.266 0-92.282 5.492-136.768 16.324-43.194 10.518-85.198 26.122-124.846 46.376-63.020 32.202-120.222 76.41-167.64 129.298 47.418 52.888 104.62 97.1 167.64 129.298 32.336 16.522 66.242 29.946 101.082 40.040-19.888-30.242-31.468-66.434-31.468-105.336 0-106.040 85.962-192 192-192s192 85.96 192 192c0 38.902-11.582 75.094-31.466 105.34 34.838-10.096 68.744-23.52 101.082-40.042 63.022-32.198 120.218-76.408 167.638-129.298-47.42-52.886-104.618-97.1-167.638-129.296zM860.918 716.278c-108.72 55.554-226.112 83.722-348.918 83.722s-240.198-28.168-348.918-83.722c-58.772-30.032-113.732-67.904-163.082-112.076v-109.206c55.338 58.566 120.694 107.754 192.194 144.29 99.62 50.904 207.218 76.714 319.806 76.714s220.186-25.81 319.804-76.716c71.502-36.536 136.858-85.724 192.196-144.29v109.206c-49.35 44.174-104.308 82.046-163.082 112.078z" />
+<glyph unicode="&#xe01a;" glyph-name="forecolor" d="M322.018 128l57.6 192h264.764l57.6-192h113.632l-191.996 640h-223.236l-192-640h113.636zM475.618 640h72.764l57.6-192h-187.964l57.6 192z" />
+<glyph unicode="&#xe01b;" glyph-name="table" d="M0 896v-896h1024v896h-1024zM384 320v192h256v-192h-256zM640 256v-192h-256v192h256zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM64 512h256v-192h-256v192zM704 512h256v-192h-256v192zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192zM704 64v192h256v-192h-256z" />
+<glyph unicode="&#xe01c;" glyph-name="hr" d="M0 512h1024v-128h-1024z" />
+<glyph unicode="&#xe01d;" glyph-name="removeformat" d="M0 64h576v-128h-576zM192 960h704v-128h-704zM277.388 128l204.688 784.164 123.85-32.328-196.25-751.836zM929.774-64l-129.774 129.774-129.774-129.774-62.226 62.226 129.774 129.774-129.774 129.774 62.226 62.226 129.774-129.774 129.774 129.774 62.226-62.226-129.774-129.774 129.774-129.774z" />
+<glyph unicode="&#xe01e;" glyph-name="sub" d="M768 50v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
+<glyph unicode="&#xe01f;" glyph-name="sup" d="M768 754v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
+<glyph unicode="&#xe020;" glyph-name="charmap" d="M704 64h256l64 128v-256h-384v214.214c131.112 56.484 224 197.162 224 361.786 0 214.432-157.598 382.266-352 382.266-194.406 0-352-167.832-352-382.266 0-164.624 92.886-305.302 224-361.786v-214.214h-384v256l64-128h256v32.59c-187.63 66.46-320 227.402-320 415.41 0 247.424 229.23 448 512 448s512-200.576 512-448c0-188.008-132.37-348.95-320-415.41v-32.59z" />
+<glyph unicode="&#xe021;" glyph-name="emoticons" d="M512 960c-282.77 0-512-229.228-512-512 0-282.77 229.228-512 512-512 282.77 0 512 229.23 512 512 0 282.772-229.23 512-512 512zM512 16c-238.586 0-432 193.412-432 432 0 238.586 193.414 432 432 432 238.59 0 432-193.414 432-432 0-238.588-193.41-432-432-432zM384 640c0-35.346-28.654-64-64-64s-64 28.654-64 64 28.654 64 64 64 64-28.654 64-64zM768 640c0-35.346-28.652-64-64-64s-64 28.654-64 64 28.652 64 64 64 64-28.654 64-64zM512 308c141.074 0 262.688 57.532 318.462 123.192-20.872-171.22-156.288-303.192-318.462-303.192-162.118 0-297.498 132.026-318.444 303.168 55.786-65.646 177.386-123.168 318.444-123.168z" />
+<glyph unicode="&#xe022;" glyph-name="print" d="M256 896h512v-128h-512zM960 704h-896c-35.2 0-64-28.8-64-64v-320c0-35.2 28.796-64 64-64h192v-256h512v256h192c35.2 0 64 28.8 64 64v320c0 35.2-28.8 64-64 64zM704 64h-384v320h384v-320zM974.4 608c0-25.626-20.774-46.4-46.398-46.4-25.626 0-46.402 20.774-46.402 46.4s20.776 46.4 46.402 46.4c25.626 0 46.398-20.774 46.398-46.4z" />
+<glyph unicode="&#xe023;" glyph-name="fullscreen" d="M1024 960v-384l-138.26 138.26-212-212-107.48 107.48 212 212-138.26 138.26zM245.74 821.74l212-212-107.48-107.48-212 212-138.26-138.26v384h384zM885.74 181.74l138.26 138.26v-384h-384l138.26 138.26-212 212 107.48 107.48zM457.74 286.26l-212-212 138.26-138.26h-384v384l138.26-138.26 212 212z" />
+<glyph unicode="&#xe024;" glyph-name="spellchecker" d="M128 704h128v-192h64v384c0 35.2-28.8 64-64 64h-128c-35.2 0-64-28.8-64-64v-384h64v192zM128 896h128v-128h-128v128zM960 896v64h-192c-35.202 0-64-28.8-64-64v-320c0-35.2 28.798-64 64-64h192v64h-192v320h192zM640 800v96c0 35.2-28.8 64-64 64h-192v-448h192c35.2 0 64 28.8 64 64v96c0 35.2-8.8 64-44 64 35.2 0 44 28.8 44 64zM576 576h-128v128h128v-128zM576 768h-128v128h128v-128zM832 384l-416-448-224 288 82 70 142-148 352 302z" />
+<glyph unicode="&#xe025;" glyph-name="nonbreaking" d="M448 384h-192v128h192v192h128v-192h192v-128h-192v-192h-128zM1024 320v-384h-1024v384h128v-256h768v256z" />
+<glyph unicode="&#xe026;" glyph-name="template" d="M384 768h128v-64h-128zM576 768h128v-64h-128zM896 768v-256h-192v64h128v128h-64v64zM320 576h128v-64h-128zM512 576h128v-64h-128zM192 704v-128h64v-64h-128v256h192v-64zM384 384h128v-64h-128zM576 384h128v-64h-128zM896 384v-256h-192v64h128v128h-64v64zM320 192h128v-64h-128zM512 192h128v-64h-128zM192 320v-128h64v-64h-128v256h192v-64zM960 896h-896v-896h896v896zM1024 960v0-1024h-1024v1024h1024z" />
+<glyph unicode="&#xe027;" glyph-name="pagebreak" d="M0 448h128v-64h-128zM192 448h192v-64h-192zM448 448h128v-64h-128zM640 448h192v-64h-192zM896 448h128v-64h-128zM880 960l16-448h-768l16 448h32l16-384h640l16 384zM144-64l-16 384h768l-16-384h-32l-16 320h-640l-16-320z" />
+<glyph unicode="&#xe028;" glyph-name="restoredraft" d="M576 896c247.424 0 448-200.576 448-448s-200.576-448-448-448v96c94.024 0 182.418 36.614 248.902 103.098s103.098 154.878 103.098 248.902c0 94.022-36.614 182.418-103.098 248.902s-154.878 103.098-248.902 103.098c-94.022 0-182.418-36.614-248.902-103.098-51.14-51.138-84.582-115.246-97.306-184.902h186.208l-224-256-224 256h164.57c31.060 217.102 217.738 384 443.43 384zM768 512v-128h-256v320h128v-192z" />
+<glyph unicode="&#xe02a;" glyph-name="bold" d="M707.88 475.348c37.498 44.542 60.12 102.008 60.12 164.652 0 141.16-114.842 256-256 256h-320v-896h384c141.158 0 256 114.842 256 256 0 92.956-49.798 174.496-124.12 219.348zM384 768h101.5c55.968 0 101.5-57.42 101.5-128s-45.532-128-101.5-128h-101.5v256zM543 128h-159v256h159c58.45 0 106-57.42 106-128s-47.55-128-106-128z" />
+<glyph unicode="&#xe02b;" glyph-name="italic" d="M896 896v-64h-128l-320-768h128v-64h-448v64h128l320 768h-128v64z" />
+<glyph unicode="&#xe02c;" glyph-name="underline" d="M704 896h128v-416c0-159.058-143.268-288-320-288-176.73 0-320 128.942-320 288v416h128v-416c0-40.166 18.238-78.704 51.354-108.506 36.896-33.204 86.846-51.494 140.646-51.494s103.75 18.29 140.646 51.494c33.116 29.802 51.354 68.34 51.354 108.506v416zM192 128h640v-128h-640z" />
+<glyph unicode="&#xe02d;" glyph-name="strikethrough" d="M731.42 442.964c63.92-47.938 100.58-116.086 100.58-186.964s-36.66-139.026-100.58-186.964c-59.358-44.518-137.284-69.036-219.42-69.036-82.138 0-160.062 24.518-219.42 69.036-63.92 47.938-100.58 116.086-100.58 186.964h128c0-69.382 87.926-128 192-128s192 58.618 192 128c0 69.382-87.926 128-192 128-82.138 0-160.062 24.518-219.42 69.036-63.92 47.94-100.58 116.086-100.58 186.964s36.66 139.024 100.58 186.964c59.358 44.518 137.282 69.036 219.42 69.036 82.136 0 160.062-24.518 219.42-69.036 63.92-47.94 100.58-116.086 100.58-186.964h-128c0 69.382-87.926 128-192 128s-192-58.618-192-128c0-69.382 87.926-128 192-128 82.136 0 160.062-24.518 219.42-69.036zM0 448h1024v-64h-1024z" />
+<glyph unicode="&#xe02e;" glyph-name="visualchars" d="M384 896h512v-128h-128v-768h-128v768h-128v-768h-128v448c-123.712 0-224 100.288-224 224s100.288 224 224 224z" />
+<glyph unicode="&#xe02f;" glyph-name="ltr" d="M448 896h512v-128h-128v-768h-128v768h-128v-768h-128v448c-123.712 0-224 100.288-224 224s100.288 224 224 224zM64 512l256-224-256-224z" />
+<glyph unicode="&#xe030;" glyph-name="rtl" d="M256 896h512v-128h-128v-768h-128v768h-128v-768h-128v448c-123.712 0-224 100.288-224 224s100.288 224 224 224zM960 64l-256 224 256 224z" />
+<glyph unicode="&#xe031;" glyph-name="copy" d="M832 704h-192v64l-192 192h-448v-768h384v-256h640v576l-192 192zM832 613.49l101.49-101.49h-101.49v101.49zM448 869.49l101.49-101.49h-101.49v101.49zM64 896h320v-192h192v-448h-512v640zM960 0h-512v192h192v448h128v-192h192v-448z" />
+<glyph unicode="&#xe032;" glyph-name="resize" d="M768 704h64v-64h-64zM640 576h64v-64h-64zM640 448h64v-64h-64zM640 320h64v-64h-64zM512 448h64v-64h-64zM512 320h64v-64h-64zM384 320h64v-64h-64zM768 576h64v-64h-64zM768 448h64v-64h-64zM768 320h64v-64h-64zM768 192h64v-64h-64zM640 192h64v-64h-64zM512 192h64v-64h-64zM384 192h64v-64h-64zM256 192h64v-64h-64z" />
+<glyph unicode="&#xe033;" glyph-name="checkbox" d="M128 416l288-288 480 480-128 128-352-352-160 160z" />
+<glyph unicode="&#xe034;" glyph-name="browse" d="M928 832h-416l-32 64h-352l-64-128h896zM904.34 256h74.86l44.8 448h-1024l64-640h484.080c-104.882 37.776-180.080 138.266-180.080 256 0 149.982 122.018 272 272 272 149.98 0 272-122.018 272-272 0-21.678-2.622-43.15-7.66-64zM1002.996 46.25l-198.496 174.692c17.454 28.92 27.5 62.814 27.5 99.058 0 106.040-85.96 192-192 192s-192-85.96-192-192 85.96-192 192-192c36.244 0 70.138 10.046 99.058 27.5l174.692-198.496c22.962-26.678 62.118-28.14 87.006-3.252l5.492 5.492c24.888 24.888 23.426 64.044-3.252 87.006zM640 196c-68.484 0-124 55.516-124 124s55.516 124 124 124 124-55.516 124-124-55.516-124-124-124z" />
+<glyph unicode="&#xe035;" glyph-name="pastetext" d="M512 448v-128h32l32 64h64v-256h-48v-64h224v64h-48v256h64l32-64h32v128zM832 640v160c0 17.6-14.4 32-32 32h-224v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-224c-17.602 0-32-14.4-32-32v-640c0-17.6 14.398-32 32-32h288v-192h640v704h-192zM384 895.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 704v64h512v-64h-512zM960 0h-512v576h512v-576z" />
+<glyph unicode="&#xe600;" glyph-name="gamma" d="M483.2 320l-147.2 336c-9.6 25.6-19.2 44.8-25.6 54.4s-16 12.8-25.6 12.8c-16 0-25.6-3.2-28.8-3.2v70.4c9.6 6.4 25.6 6.4 38.4 9.6 32 0 57.6-6.4 73.6-22.4 6.4-6.4 12.8-16 19.2-25.6 6.4-12.8 12.8-25.6 16-41.6l121.6-291.2 150.4 371.2h92.8l-198.4-470.4v-224h-86.4v224zM0 960v-1024h1024v1024h-1024zM960 0h-896v896h896v-896z" />
+<glyph unicode="&#xe601;" glyph-name="orientation" d="M627.2 80h-579.2v396.8h579.2v-396.8zM553.6 406.4h-435.2v-256h435.2v256zM259.2 732.8c176 176 457.6 176 633.6 0s176-457.6 0-633.6c-121.6-121.6-297.6-160-454.4-108.8 121.6-28.8 262.4 9.6 361.6 108.8 150.4 150.4 160 384 22.4 521.6-121.6 121.6-320 128-470.4 19.2l86.4-86.4-294.4-22.4 22.4 294.4 92.8-92.8z" />
+<glyph unicode="&#xe602;" glyph-name="invert" d="M892.8-22.4l-89.6 89.6c-70.4-80-172.8-131.2-288-131.2-208 0-380.8 166.4-384 377.6 0 0 0 0 0 0 0 3.2 0 3.2 0 6.4s0 3.2 0 6.4v0c0 0 0 0 0 3.2 0 0 0 3.2 0 3.2 3.2 105.6 48 211.2 105.6 304l-192 192 44.8 44.8 182.4-182.4c0 0 0 0 0 0l569.6-569.6c0 0 0 0 0 0l99.2-99.2-48-44.8zM896 326.4c0 0 0 0 0 0 0 3.2 0 6.4 0 6.4-9.6 316.8-384 627.2-384 627.2s-108.8-89.6-208-220.8l70.4-70.4c6.4 9.6 16 22.4 22.4 32 41.6 51.2 83.2 96 115.2 128v0c32-32 73.6-76.8 115.2-128 108.8-137.6 169.6-265.6 172.8-371.2 0 0 0-3.2 0-3.2v0 0c0-3.2 0-3.2 0-6.4s0-3.2 0-3.2v0 0c0-22.4-3.2-41.6-9.6-64l76.8-76.8c16 41.6 28.8 89.6 28.8 137.6 0 0 0 0 0 0 0 3.2 0 3.2 0 6.4s0 3.2 0 6.4z" />
+<glyph unicode="&#xe603;" glyph-name="codesample" d="M199.995 578.002v104.002c0 43.078 34.923 78.001 78.001 78.001h26v104.002h-26c-100.518 0-182.003-81.485-182.003-182.003v-104.002c0-43.078-34.923-78.001-78.001-78.001h-26v-104.002h26c43.078 0 78.001-34.923 78.001-78.001v-104.002c0-100.515 81.485-182.003 182.003-182.003h26v104.002h-26c-43.078 0-78.001 34.923-78.001 78.001v104.002c0 50.931-20.928 96.966-54.646 130.002 33.716 33.036 54.646 79.072 54.646 130.002zM824.005 578.002v104.002c0 43.078-34.923 78.001-78.001 78.001h-26v104.002h26c100.515 0 182.003-81.485 182.003-182.003v-104.002c0-43.078 34.923-78.001 78.001-78.001h26v-104.002h-26c-43.078 0-78.001-34.923-78.001-78.001v-104.002c0-100.515-81.488-182.003-182.003-182.003h-26v104.002h26c43.078 0 78.001 34.923 78.001 78.001v104.002c0 50.931 20.928 96.966 54.646 130.002-33.716 33.036-54.646 79.072-54.646 130.002zM616.002 603.285c0-57.439-46.562-104.002-104.002-104.002s-104.002 46.562-104.002 104.002c0 57.439 46.562 104.002 104.002 104.002s104.002-46.562 104.002-104.002zM512 448.717c-57.439 0-104.002-46.562-104.002-104.002 0-55.845 26-100.115 105.752-103.88-23.719-33.417-59.441-46.612-105.752-50.944v-61.751c0 0 208.003-18.144 208.003 216.577-0.202 57.441-46.56 104.004-104.002 104.004z" />
+<glyph unicode="&#xe604;" glyph-name="tablerowprops" d="M0 896v-896h1024v896h-1024zM640 256v-192h-256v192h256zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192zM704 64v192h256v-192h-256z" />
+<glyph unicode="&#xe605;" glyph-name="tablecellprops" d="M0 896v-896h1024v896h-1024zM640 256v-192h-256v192h256zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM64 512h256v-192h-256v192zM704 512h256v-192h-256v192zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192zM704 64v192h256v-192h-256z" />
+<glyph unicode="&#xe606;" glyph-name="table2" d="M0 896v-832h1024v832h-1024zM320 128h-256v192h256v-192zM320 384h-256v192h256v-192zM640 128h-256v192h256v-192zM640 384h-256v192h256v-192zM960 128h-256v192h256v-192zM960 384h-256v192h256v-192zM960 640h-896v192h896v-192z" />
+<glyph unicode="&#xe607;" glyph-name="tablemergecells" d="M0 896v-896h1024v896h-1024zM384 64v448h576v-448h-576zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM64 512h256v-192h-256v192zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192z" />
+<glyph unicode="&#xe608;" glyph-name="tableinsertcolbefore" d="M320 188.8v182.4h-182.4v89.6h182.4v182.4h86.4v-182.4h185.6v-89.6h-185.6v-182.4zM0 896v-896h1024v896h-1024zM640 64h-576v704h576v-704zM960 64h-256v192h256v-192zM960 320h-256v192h256v-192zM960 576h-256v192h256v-192z" />
+<glyph unicode="&#xe609;" glyph-name="tableinsertcolafter" d="M704 643.2v-182.4h182.4v-89.6h-182.4v-182.4h-86.4v182.4h-185.6v89.6h185.6v182.4zM0 896v-896h1024v896h-1024zM320 64h-256v192h256v-192zM320 320h-256v192h256v-192zM320 576h-256v192h256v-192zM960 64h-576v704h576v-704z" />
+<glyph unicode="&#xe60a;" glyph-name="tableinsertrowbefore" d="M691.2 508.8h-144v-144h-70.4v144h-144v67.2h144v144h70.4v-144h144zM0 896v-896h1024v896h-1024zM320 64h-256v192h256v-192zM640 64h-256v192h256v-192zM960 64h-256v192h256v-192zM960 316.8h-896v451.2h896v-451.2z" />
+<glyph unicode="&#xe60b;" glyph-name="tableinsertrowafter" d="M332.8 323.2h144v144h70.4v-144h144v-67.2h-144v-144h-70.4v144h-144zM0 896v-896h1024v896h-1024zM384 768h256v-192h-256v192zM64 768h256v-192h-256v192zM960 64h-896v451.2h896v-451.2zM960 576h-256v192h256v-192z" />
+<glyph unicode="&#xe60d;" glyph-name="tablesplitcells" d="M0 896v-896h1024v896h-1024zM384 768h256v-192h-256v192zM320 64h-256v192h256v-192zM320 320h-256v192h256v-192zM320 576h-256v192h256v-192zM960 64h-576v448h576v-448zM960 576h-256v192h256v-192zM864 156.8l-60.8-60.8-131.2 131.2-131.2-131.2-60.8 60.8 131.2 131.2-131.2 131.2 60.8 60.8 131.2-131.2 131.2 131.2 60.8-60.8-131.2-131.2z" />
+<glyph unicode="&#xe60e;" glyph-name="tabledelete" d="M0 896h1024v-896h-1024v896zM60.8 768v-704h899.2v704h-899.2zM809.6 211.2l-96-96-204.8 204.8-204.8-204.8-96 96 204.8 204.8-204.8 204.8 96 96 204.8-204.8 204.8 204.8 96-96-204.8-204.8z" />
+<glyph unicode="&#xe62a;" glyph-name="tableleftheader" d="M0 896v-832h1024v832h-1024zM640 128h-256v192h256v-192zM640 384h-256v192h256v-192zM640 640h-256v192h256v-192zM960 128h-256v192h256v-192zM960 384h-256v192h256v-192zM960 640h-256v192h256v-192z" />
+<glyph unicode="&#xe62b;" glyph-name="tabletopheader" d="M0 896v-832h1024v832h-1024zM320 128h-256v192h256v-192zM320 384h-256v192h256v-192zM640 128h-256v192h256v-192zM640 384h-256v192h256v-192zM960 128h-256v192h256v-192zM960 384h-256v192h256v-192z" />
+<glyph unicode="&#xe800;" glyph-name="tabledeleterow" d="M886.4 572.8l-156.8-156.8 160-160-76.8-76.8-160 160-156.8-156.8-76.8 73.6 160 160-163.2 163.2 76.8 76.8 163.2-163.2 156.8 156.8 73.6-76.8zM0 896v-896h1024v896h-1024zM960 576h-22.4l-64-64h86.4v-192h-89.6l64-64h25.6v-192h-896v192h310.4l64 64h-374.4v192h371.2l-64 64h-307.2v192h896v-192z" />
+<glyph unicode="&#xe801;" glyph-name="tabledeletecol" d="M320 499.2l64-64v-12.8l-64-64v140.8zM640 422.4l64-64v137.6l-64-64v-9.6zM1024 896v-896h-1024v896h1024zM960 768h-256v-51.2l-12.8 12.8-51.2-51.2v89.6h-256v-89.6l-51.2 51.2-12.8-12.8v51.2h-256v-704h256v118.4l35.2-35.2 28.8 28.8v-115.2h256v115.2l48-48 16 16v-83.2h256v707.2zM672 662.4l-156.8-156.8-163.2 163.2-76.8-76.8 163.2-163.2-156.8-156.8 76.8-76.8 156.8 156.8 160-160 76.8 76.8-160 160 156.8 156.8-76.8 76.8z" />
+<glyph unicode="&#xe900;" glyph-name="a11y" d="M960 704v64l-448-128-448 128v-64l320-128v-256l-128-448h64l192 448 192-448h64l-128 448v256zM416 800q0 40 28 68t68 28 68-28 28-68-28-68-68-28-68 28-28 68z" />
+<glyph unicode="&#xe901;" glyph-name="toc" d="M0 896h128v-128h-128v128zM192 896h832v-128h-832v128zM192 704h128v-128h-128v128zM384 704h640v-128h-640v128zM384 512h128v-128h-128v128zM576 512h448v-128h-448v128zM0 320h128v-128h-128v128zM192 320h832v-128h-832v128zM192 128h128v-128h-128v128zM384 128h640v-128h-640v128z" />
+<glyph unicode="&#xe902;" glyph-name="fill" d="M521.6 915.2l-67.2-67.2-86.4 86.4-86.4-86.4 86.4-86.4-368-368 432-432 518.4 518.4-428.8 435.2zM435.2 134.4l-262.4 262.4 35.2 35.2 576 51.2-348.8-348.8zM953.6 409.6c-6.4-6.4-16-16-28.8-32-28.8-32-41.6-64-41.6-89.6v0 0 0 0 0 0 0c0-16 6.4-35.2 22.4-48 12.8-12.8 32-22.4 48-22.4s35.2 6.4 48 22.4 22.4 32 22.4 48v0 0 0 0 0 0 0c0 25.6-12.8 54.4-41.6 89.6-9.6 16-22.4 25.6-28.8 32v0z" />
+<glyph unicode="&#xe903;" glyph-name="borderwidth" d="M0 265.6h1024v-128h-1024v128zM0 32h1024v-64h-1024v64zM0 566.4h1024v-192h-1024v192zM0 928h1024v-256h-1024v256z" />
+<glyph unicode="&#xe904;" glyph-name="line" d="M739.2 627.2l-502.4-502.4h-185.6v185.6l502.4 502.4 185.6-185.6zM803.2 688l-185.6 185.6 67.2 67.2c22.4 22.4 54.4 22.4 76.8 0l108.8-108.8c22.4-22.4 22.4-54.4 0-76.8l-67.2-67.2zM41.6 48h940.8v-112h-940.8v112z" />
+<glyph unicode="&#xe905;" glyph-name="count" d="M0 480h1024v-64h-1024v64zM304 912v-339.2h-67.2v272h-67.2v67.2zM444.8 694.4v-54.4h134.4v-67.2h-201.6v153.6l134.4 64v54.4h-134.4v67.2h201.6v-153.6zM854.4 912v-339.2h-204.8v67.2h137.6v67.2h-137.6v70.4h137.6v67.2h-137.6v67.2zM115.2 166.4c3.2 57.6 38.4 83.2 108.8 83.2 38.4 0 67.2-9.6 86.4-25.6s25.6-35.2 25.6-70.4v-112c0-25.6 0-28.8 9.6-41.6h-73.6c-3.2 9.6-3.2 9.6-6.4 19.2-22.4-19.2-41.6-25.6-70.4-25.6-54.4 0-89.6 32-89.6 76.8s28.8 70.4 99.2 80l38.4 6.4c16 3.2 22.4 6.4 22.4 16 0 12.8-12.8 22.4-38.4 22.4s-41.6-9.6-44.8-28.8h-67.2zM262.4 115.2c-6.4-3.2-12.8-6.4-25.6-6.4l-25.6-6.4c-25.6-6.4-38.4-16-38.4-28.8 0-16 12.8-25.6 35.2-25.6s41.6 9.6 54.4 32v35.2zM390.4 336h73.6v-112c22.4 16 41.6 22.4 67.2 22.4 64 0 105.6-51.2 105.6-124.8 0-76.8-44.8-134.4-108.8-134.4-32 0-48 9.6-67.2 35.2v-28.8h-70.4v342.4zM460.8 121.6c0-41.6 22.4-70.4 51.2-70.4s51.2 28.8 51.2 70.4c0 44.8-19.2 70.4-51.2 70.4-28.8 0-51.2-28.8-51.2-70.4zM851.2 153.6c-3.2 22.4-19.2 35.2-44.8 35.2-32 0-51.2-25.6-51.2-70.4 0-48 19.2-73.6 51.2-73.6 25.6 0 41.6 12.8 44.8 41.6l70.4-3.2c-9.6-60.8-54.4-96-118.4-96-73.6 0-121.6 51.2-121.6 128 0 80 48 131.2 124.8 131.2 64 0 108.8-35.2 112-96h-67.2z" />
+<glyph unicode="&#xe906;" glyph-name="reload" d="M889.68 793.68c-93.608 102.216-228.154 166.32-377.68 166.32-282.77 0-512-229.23-512-512h96c0 229.75 186.25 416 416 416 123.020 0 233.542-53.418 309.696-138.306l-149.696-149.694h352v352l-134.32-134.32zM928 448c0-229.75-186.25-416-416-416-123.020 0-233.542 53.418-309.694 138.306l149.694 149.694h-352v-352l134.32 134.32c93.608-102.216 228.154-166.32 377.68-166.32 282.77 0 512 229.23 512 512h-96z" />
+<glyph unicode="&#xe907;" glyph-name="translate" d="M553.6 304l-118.4 118.4c80 89.6 137.6 195.2 172.8 304h137.6v92.8h-326.4v92.8h-92.8v-92.8h-326.4v-92.8h518.4c-32-89.6-80-176-147.2-249.6-44.8 48-80 99.2-108.8 156.8h-92.8c35.2-76.8 80-147.2 137.6-211.2l-236.8-233.6 67.2-67.2 233.6 233.6 144-144c3.2 0 38.4 92.8 38.4 92.8zM816 540.8h-92.8l-208-560h92.8l51.2 140.8h220.8l51.2-140.8h92.8l-208 560zM691.2 214.4l76.8 201.6 76.8-201.6h-153.6z" />
+<glyph unicode="&#xe908;" glyph-name="drag" d="M576 896h128v-128h-128v128zM576 640h128v-128h-128v128zM320 640h128v-128h-128v128zM576 384h128v-128h-128v128zM320 384h128v-128h-128v128zM320 128h128v-128h-128v128zM576 128h128v-128h-128v128zM320 896h128v-128h-128v128z" />
+<glyph unicode="&#xe90b;" glyph-name="home" d="M1024 369.556l-512 397.426-512-397.428v162.038l512 397.426 512-397.428zM896 384v-384h-256v256h-256v-256h-256v384l384 288z" />
+<glyph unicode="&#xe911;" glyph-name="books" d="M576.234 670.73l242.712 81.432 203.584-606.784-242.712-81.432zM0 64h256v704h-256v-704zM64 640h128v-64h-128v64zM320 64h256v704h-256v-704zM384 640h128v-64h-128v64z" />
+<glyph unicode="&#xe914;" glyph-name="upload" d="M839.432 760.57c27.492-27.492 50.554-78.672 55.552-120.57h-318.984v318.984c41.898-4.998 93.076-28.060 120.568-55.552l142.864-142.862zM512 576v384h-368c-44 0-80-36-80-80v-864c0-44 36-80 80-80h672c44 0 80 36 80 80v560h-384zM576 192v-192h-192v192h-160l256 256 256-256h-160z" />
+<glyph unicode="&#xe915;" glyph-name="editimage" d="M768 416v-352h-640v640h352l128 128h-512c-52.8 0-96-43.2-96-96v-704c0-52.8 43.2-96 96-96h704c52.798 0 96 43.2 96 96v512l-128-128zM864 960l-608-608v-160h160l608 608c0 96-64 160-160 160zM416 320l-48 48 480 480 48-48-480-480z" />
+<glyph unicode="&#xe91c;" glyph-name="bubble" d="M928 896h-832c-52.8 0-96-43.2-96-96v-512c0-52.8 43.2-96 96-96h160v-256l307.2 256h364.8c52.8 0 96 43.2 96 96v512c0 52.8-43.2 96-96 96zM896 320h-379.142l-196.858-174.714v174.714h-192v448h768v-448z" />
+<glyph unicode="&#xe91d;" glyph-name="user" d="M622.826 257.264c-22.11 3.518-22.614 64.314-22.614 64.314s64.968 64.316 79.128 150.802c38.090 0 61.618 91.946 23.522 124.296 1.59 34.054 48.96 267.324-190.862 267.324s-192.45-233.27-190.864-267.324c-38.094-32.35-14.57-124.296 23.522-124.296 14.158-86.486 79.128-150.802 79.128-150.802s-0.504-60.796-22.614-64.314c-71.22-11.332-337.172-128.634-337.172-257.264h896c0 128.63-265.952 245.932-337.174 257.264z" />
+<glyph unicode="&#xe926;" glyph-name="lock" d="M592 512h-16v192c0 105.87-86.13 192-192 192h-128c-105.87 0-192-86.13-192-192v-192h-16c-26.4 0-48-21.6-48-48v-480c0-26.4 21.6-48 48-48h544c26.4 0 48 21.6 48 48v480c0 26.4-21.6 48-48 48zM192 704c0 35.29 28.71 64 64 64h128c35.29 0 64-28.71 64-64v-192h-256v192z" />
+<glyph unicode="&#xe927;" glyph-name="unlock" d="M768 896c105.87 0 192-86.13 192-192v-192h-128v192c0 35.29-28.71 64-64 64h-128c-35.29 0-64-28.71-64-64v-192h16c26.4 0 48-21.6 48-48v-480c0-26.4-21.6-48-48-48h-544c-26.4 0-48 21.6-48 48v480c0 26.4 21.6 48 48 48h400v192c0 105.87 86.13 192 192 192h128z" />
+<glyph unicode="&#xe928;" glyph-name="settings" d="M448 832v16c0 26.4-21.6 48-48 48h-160c-26.4 0-48-21.6-48-48v-16h-192v-128h192v-16c0-26.4 21.6-48 48-48h160c26.4 0 48 21.6 48 48v16h576v128h-576zM256 704v128h128v-128h-128zM832 528c0 26.4-21.6 48-48 48h-160c-26.4 0-48-21.6-48-48v-16h-576v-128h576v-16c0-26.4 21.6-48 48-48h160c26.4 0 48 21.6 48 48v16h192v128h-192v16zM640 384v128h128v-128h-128zM448 208c0 26.4-21.6 48-48 48h-160c-26.4 0-48-21.6-48-48v-16h-192v-128h192v-16c0-26.4 21.6-48 48-48h160c26.4 0 48 21.6 48 48v16h576v128h-576v16zM256 64v128h128v-128h-128z" />
+<glyph unicode="&#xe92a;" glyph-name="remove2" d="M192-64h640l64 704h-768zM640 832v128h-256v-128h-320v-192l64 64h768l64-64v192h-320zM576 832h-128v64h128v-64z" />
+<glyph unicode="&#xe92d;" glyph-name="menu" d="M384 896h256v-256h-256zM384 576h256v-256h-256zM384 256h256v-256h-256z" />
+<glyph unicode="&#xe930;" glyph-name="warning" d="M1009.956 44.24l-437.074 871.112c-16.742 29.766-38.812 44.648-60.882 44.648s-44.14-14.882-60.884-44.648l-437.074-871.112c-33.486-59.532-5-108.24 63.304-108.24h869.308c68.302 0 96.792 48.708 63.302 108.24zM512 64c-35.346 0-64 28.654-64 64 0 35.348 28.654 64 64 64 35.348 0 64-28.652 64-64 0-35.346-28.652-64-64-64zM556 256h-88l-20 256c0 35.346 28.654 64 64 64s64-28.654 64-64l-20-256z" />
+<glyph unicode="&#xe931;" glyph-name="question" d="M448 256h128v-128h-128zM704 704c35.346 0 64-28.654 64-64v-192l-192-128h-128v64l192 128v64h-320v128h384zM512 864c-111.118 0-215.584-43.272-294.156-121.844s-121.844-183.038-121.844-294.156c0-111.118 43.272-215.584 121.844-294.156s183.038-121.844 294.156-121.844c111.118 0 215.584 43.272 294.156 121.844s121.844 183.038 121.844 294.156c0 111.118-43.272 215.584-121.844 294.156s-183.038 121.844-294.156 121.844zM512 960v0c282.77 0 512-229.23 512-512s-229.23-512-512-512c-282.77 0-512 229.23-512 512s229.23 512 512 512z" />
+<glyph unicode="&#xe932;" glyph-name="pluscircle" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM512 64c-212.078 0-384 171.922-384 384s171.922 384 384 384c212.078 0 384-171.922 384-384s-171.922-384-384-384zM768 384h-192v-192h-128v192h-192v128h192v192h128v-192h192z" />
+<glyph unicode="&#xe933;" glyph-name="info" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM448 768h128v-128h-128v128zM640 128h-256v64h64v256h-64v64h192v-320h64v-64z" />
+<glyph unicode="&#xe934;" glyph-name="notice" d="M1024 224l-288 736h-448l-288-288v-448l288-288h448l288 288v448l-288 288zM576 128h-128v128h128v-128zM576 384h-128v384h128v-384z" />
+<glyph unicode="&#xe935;" glyph-name="drop" d="M864.626 486.838c-65.754 183.44-205.11 348.15-352.626 473.162-147.516-125.012-286.87-289.722-352.626-473.162-40.664-113.436-44.682-236.562 12.584-345.4 65.846-125.14 198.632-205.438 340.042-205.438s274.196 80.298 340.040 205.44c57.27 108.838 53.25 231.962 12.586 345.398zM738.764 201.044c-43.802-83.252-132.812-137.044-226.764-137.044-55.12 0-108.524 18.536-152.112 50.652 13.242-1.724 26.632-2.652 40.112-2.652 117.426 0 228.668 67.214 283.402 171.242 44.878 85.292 40.978 173.848 23.882 244.338 14.558-28.15 26.906-56.198 36.848-83.932 22.606-63.062 40.024-156.34-5.368-242.604z" />
+<glyph unicode="&#xe939;" glyph-name="minus" d="M0 544v-192c0-17.672 14.328-32 32-32h960c17.672 0 32 14.328 32 32v192c0 17.672-14.328 32-32 32h-960c-17.672 0-32-14.328-32-32z" />
+<glyph unicode="&#xe93a;" glyph-name="plus" d="M992 576h-352v352c0 17.672-14.328 32-32 32h-192c-17.672 0-32-14.328-32-32v-352h-352c-17.672 0-32-14.328-32-32v-192c0-17.672 14.328-32 32-32h352v-352c0-17.672 14.328-32 32-32h192c17.672 0 32 14.328 32 32v352h352c17.672 0 32 14.328 32 32v192c0 17.672-14.328 32-32 32z" />
+<glyph unicode="&#xe93b;" glyph-name="arrowup" d="M0 320l192-192 320 320 320-320 192 192-511.998 512z" />
+<glyph unicode="&#xe93c;" glyph-name="arrowright" d="M384 960l-192-192 320-320-320-320 192-192 512 512z" />
+<glyph unicode="&#xe93d;" glyph-name="arrowdown" d="M1024 576l-192 192-320-320-320 320-192-192 512-511.998z" />
+<glyph unicode="&#xe93f;" glyph-name="arrowup2" d="M768 320l-256 256-256-256z" />
+<glyph unicode="&#xe940;" glyph-name="arrowdown2" d="M256 576l256-256 256 256z" />
+<glyph unicode="&#xe941;" glyph-name="menu2" d="M256 704l256-256 256 256zM255.996 384.004l256-256 256 256z" />
+<glyph unicode="&#xe961;" glyph-name="newtab" d="M704 384l128 128v-512h-768v768h512l-128-128h-256v-512h512zM960 896v-352l-130.744 130.744-354.746-354.744h-90.51v90.512l354.744 354.744-130.744 130.744z" />
+<glyph unicode="&#xeaa8;" glyph-name="rotateleft" d="M607.998 831.986c-212.070 0-383.986-171.916-383.986-383.986h-191.994l246.848-246.848 246.848 246.848h-191.994c0 151.478 122.798 274.276 274.276 274.276 151.48 0 274.276-122.798 274.276-274.276 0-151.48-122.796-274.276-274.276-274.276v-109.71c212.070 0 383.986 171.916 383.986 383.986s-171.916 383.986-383.986 383.986z" />
+<glyph unicode="&#xeaa9;" glyph-name="rotateright" d="M416.002 831.986c212.070 0 383.986-171.916 383.986-383.986h191.994l-246.848-246.848-246.848 246.848h191.994c0 151.478-122.798 274.276-274.276 274.276-151.48 0-274.276-122.798-274.276-274.276 0-151.48 122.796-274.276 274.276-274.276v-109.71c-212.070 0-383.986 171.916-383.986 383.986s171.916 383.986 383.986 383.986z" />
+<glyph unicode="&#xeaaa;" glyph-name="flipv" d="M0 576h1024v384zM1024 0v384h-1024z" />
+<glyph unicode="&#xeaac;" glyph-name="fliph" d="M576 960v-1024h384zM0-64h384v1024z" />
+<glyph unicode="&#xeb35;" glyph-name="zoomin" d="M992.262 88.604l-242.552 206.294c-25.074 22.566-51.89 32.926-73.552 31.926 57.256 67.068 91.842 154.078 91.842 249.176 0 212.078-171.922 384-384 384-212.076 0-384-171.922-384-384s171.922-384 384-384c95.098 0 182.108 34.586 249.176 91.844-1-21.662 9.36-48.478 31.926-73.552l206.294-242.552c35.322-39.246 93.022-42.554 128.22-7.356s31.892 92.898-7.354 128.22zM384 320c-141.384 0-256 114.616-256 256s114.616 256 256 256 256-114.616 256-256-114.614-256-256-256zM448 768h-128v-128h-128v-128h128v-128h128v128h128v128h-128z" />
+<glyph unicode="&#xeb36;" glyph-name="zoomout" d="M992.262 88.604l-242.552 206.294c-25.074 22.566-51.89 32.926-73.552 31.926 57.256 67.068 91.842 154.078 91.842 249.176 0 212.078-171.922 384-384 384-212.076 0-384-171.922-384-384s171.922-384 384-384c95.098 0 182.108 34.586 249.176 91.844-1-21.662 9.36-48.478 31.926-73.552l206.294-242.552c35.322-39.246 93.022-42.554 128.22-7.356s31.892 92.898-7.354 128.22zM384 320c-141.384 0-256 114.616-256 256s114.616 256 256 256 256-114.616 256-256-114.614-256-256-256zM192 640h384v-128h-384z" />
+<glyph unicode="&#xeba7;" glyph-name="sharpen" d="M768 832h-512l-256-256 512-576 512 576-256 256zM512 181.334v2.666h-2.37l-14.222 16h16.592v16h-30.814l-14.222 16h45.036v16h-59.258l-14.222 16h73.48v16h-87.704l-14.222 16h101.926v16h-116.148l-14.222 16h130.37v16h-144.592l-14.222 16h158.814v16h-173.038l-14.222 16h187.26v16h-201.482l-14.222 16h215.704v16h-229.926l-14.222 16h244.148v16h-258.372l-14.222 16h272.594v16h-286.816l-14.222 16h301.038v16h-315.26l-14.222 16h329.482v16h-343.706l-7.344 8.262 139.072 139.072h211.978v-3.334h215.314l16-16h-231.314v-16h247.314l16-16h-263.314v-16h279.314l16-16h-295.314v-16h311.314l16-16h-327.314v-16h343.312l7.738-7.738-351.050-394.928z" />
+<glyph unicode="&#xec6a;" glyph-name="options" d="M64 768h896v-192h-896zM64 512h896v-192h-896zM64 256h896v-192h-896z" />
+<glyph unicode="&#xeccc;" glyph-name="sun" d="M512 128c35.346 0 64-28.654 64-64v-64c0-35.346-28.654-64-64-64s-64 28.654-64 64v64c0 35.346 28.654 64 64 64zM512 768c-35.346 0-64 28.654-64 64v64c0 35.346 28.654 64 64 64s64-28.654 64-64v-64c0-35.346-28.654-64-64-64zM960 512c35.346 0 64-28.654 64-64s-28.654-64-64-64h-64c-35.348 0-64 28.654-64 64s28.652 64 64 64h64zM192 448c0-35.346-28.654-64-64-64h-64c-35.346 0-64 28.654-64 64s28.654 64 64 64h64c35.346 0 64-28.654 64-64zM828.784 221.726l45.256-45.258c24.992-24.99 24.992-65.516 0-90.508-24.994-24.992-65.518-24.992-90.51 0l-45.256 45.256c-24.992 24.99-24.992 65.516 0 90.51 24.994 24.992 65.518 24.992 90.51 0zM195.216 674.274l-45.256 45.256c-24.994 24.994-24.994 65.516 0 90.51s65.516 24.994 90.51 0l45.256-45.256c24.994-24.994 24.994-65.516 0-90.51s-65.516-24.994-90.51 0zM828.784 674.274c-24.992-24.992-65.516-24.992-90.51 0-24.992 24.994-24.992 65.516 0 90.51l45.256 45.254c24.992 24.994 65.516 24.994 90.51 0 24.992-24.994 24.992-65.516 0-90.51l-45.256-45.254zM195.216 221.726c24.992 24.992 65.518 24.992 90.508 0 24.994-24.994 24.994-65.52 0-90.51l-45.254-45.256c-24.994-24.992-65.516-24.992-90.51 0s-24.994 65.518 0 90.508l45.256 45.258zM512 704c-141.384 0-256-114.616-256-256 0-141.382 114.616-256 256-256 141.382 0 256 114.618 256 256 0 141.384-114.616 256-256 256zM512 288c-88.366 0-160 71.634-160 160s71.634 160 160 160 160-71.634 160-160-71.634-160-160-160z" />
+<glyph unicode="&#xeccd;" glyph-name="moon" d="M715.812 895.52c-60.25 34.784-124.618 55.904-189.572 64.48 122.936-160.082 144.768-384.762 37.574-570.42-107.2-185.67-312.688-279.112-512.788-252.68 39.898-51.958 90.376-97.146 150.628-131.934 245.908-141.974 560.37-57.72 702.344 188.198 141.988 245.924 57.732 560.372-188.186 702.356z" />
+<glyph unicode="&#xecd4;" glyph-name="contrast" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM128 448c0 212.078 171.922 384 384 384v-768c-212.078 0-384 171.922-384 384z" />
+<glyph unicode="&#xed6a;" glyph-name="remove22" d="M893.254 738.746l-90.508 90.508-290.746-290.744-290.746 290.744-90.508-90.506 290.746-290.748-290.746-290.746 90.508-90.508 290.746 290.746 290.746-290.746 90.508 90.51-290.744 290.744z" />
+<glyph unicode="&#xedc0;" glyph-name="arrowleft" d="M672-64l192 192-320 320 320 320-192 192-512-512z" />
+<glyph unicode="&#xedf9;" glyph-name="resize2" d="M0 896v-384c0-35.346 28.654-64 64-64s64 28.654 64 64v229.488l677.488-677.488h-229.488c-35.346 0-64-28.652-64-64 0-35.346 28.654-64 64-64h384c35.346 0 64 28.654 64 64v384c0 35.348-28.654 64-64 64s-64-28.652-64-64v-229.488l-677.488 677.488h229.488c35.346 0 64 28.654 64 64s-28.652 64-64 64h-384c-35.346 0-64-28.654-64-64z" />
+<glyph unicode="&#xee78;" glyph-name="crop" d="M832 704l192 192-64 64-192-192h-448v192h-128v-192h-192v-128h192v-512h512v-192h128v192h192v128h-192v448zM320 640h320l-320-320v320zM384 256l320 320v-320h-320z" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.ttf b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..16536bfd7a292e7090b9d4e0ae61061da9bc042f
GIT binary patch
literal 17408
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
N%EGLUS-#`*e*qFO!Ds*g

literal 0
HcmV?d00001

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.woff b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.woff
new file mode 100644
index 0000000000000000000000000000000000000000..74b50f4c3001da7fdfffd8638213dcf1a396da78
GIT binary patch
literal 17484
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

literal 0
HcmV?d00001

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/skin.min.css b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/skin.min.css
index 83e57ee88b..c17e10b917 100755
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/skin.min.css
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/skin.min.css
@@ -1 +1 @@
-.mce-container,.mce-container *,.mce-widget,.mce-widget *{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#000;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-container ::-webkit-scrollbar{width:8px;height:8px;-webkit-border-radius:4px}.mce-container ::-webkit-scrollbar-track,.mce-container ::-webkit-scrollbar-track-piece{background-color:transparent}.mce-container ::-webkit-scrollbar-thumb{background-color:rgba(53,57,71,0.3);width:6px;height:6px;-webkit-border-radius:4px}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:visible!important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block;border-radius:2px}.mce-wordcount{float:right;padding:8px}.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid #c5c5c5;width:20px;height:20px;line-height:20px;text-align:center;vertical-align:center;padding:2px}.mce-charmap td:hover{background:#d9d9d9}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover{border-color:#c5c5c5}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#e8e8e8;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#c4daff;background:#deeafa}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scroll{position:relative}.mce-panel{border:0 solid #9e9e9e;background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}.mce-floatpanel{position:absolute;-webkit-box-shadow:#ccc 5px 5px 5px;-moz-box-shadow:#ccc 5px 5px 5px;box-shadow:#ccc 5px 5px 5px}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{position:absolute;top:0;left:0;background:#fff;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#FFF;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #EEE;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:bold;line-height:20px;color:#CCC;text-shadow:0 1px 0 white;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#AAA}.mce-window-head .mce-title{display:inline-block;*display:inline;*zoom:1;line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:whiteSmoke;border-top:1px solid #DDD;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window.mce-fullscreen,.mce-window.mce-fullscreen .mce-foot{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:#fff;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-inner{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-tooltip-inner{-webkit-box-shadow:0 0 5px #000;-moz-box-shadow:0 0 5px #000;box-shadow:0 0 5px #000}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:0;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-btn{border:1px solid #c5c5c5;position:relative;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-btn:hover,.mce-btn:focus{text-decoration:none;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn.mce-disabled,.mce-btn.mce-disabled:hover{cursor:default;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn button{padding:4px 10px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px #fff}.mce-primary{color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);zoom:1;border-color:#04c #04c #002b80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary:hover,.mce-primary:focus{color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#005fb3;background-image:-moz-linear-gradient(top,#0077b3,#003cb3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#0077b3),to(#003cb3));background-image:-webkit-linear-gradient(top,#0077b3,#003cb3);background-image:-o-linear-gradient(top,#0077b3,#003cb3);background-image:linear-gradient(to bottom,#0077b3,#003cb3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0077b3',endColorstr='#ff003cb3',GradientType=0);zoom:1;border-color:#003cb3 #003cb3 #026;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary button{color:#333}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:3px 5px;font-size:12px;line-height:15px}.mce-btn-small i{margin-top:0}.mce-btn .mce-caret{margin-top:8px;*margin-top:6px;margin-left:0}.mce-btn-small .mce-caret{margin-top:6px;*margin-top:4px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #444;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#999}.mce-caret.mce-up{border-bottom:4px solid #444;border-top:0}.mce-btn-group .mce-btn{border-width:1px 0 1px 0;margin:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-btn-group .mce-btn:hover,.mce-btn-group .mce-btn:focus{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-disabled,.mce-btn-group .mce-btn.mce-disabled:hover{-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-active,.mce-btn-group .mce-btn.mce-active:hover,.mce-btn-group .mce-btn:active{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn-group .mce-btn.mce-disabled button{opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn-group .mce-first{border-left:1px solid #c5c5c5;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.mce-btn-group .mce-last{border-right:1px solid #c5c5c5;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.mce-btn-group .mce-first.mce-last{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0}.mce-checked i.mce-i-checkbox{color:#000;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox{border:1px solid #59a5e1;border:1px solid rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-colorbutton .mce-ico{position:relative}.mce-colorpicker{background:#FFF}.mce-colorbutton-grid{margin:4px}.mce-grid td div{border:1px solid #808080;width:12px;height:12px;margin:2px;cursor:pointer}.mce-grid td div:hover{border-color:black}.mce-grid td div:focus{border-color:#59a5e1;outline:1px solid rgba(82,168,236,0.8);border-color:rgba(82,168,236,0.8)}.mce-colorbutton{position:relative}.mce-colorbutton .mce-preview{display:block;position:absolute;left:50%;top:50%;margin-left:-8px;margin-top:7px;background:gray;width:16px;height:2px;overflow:hidden}.mce-combobox{display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;width:100px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-combobox input{border-color:1px solid #c5c5c5;border-right-color:rgba(0,0,0,0.15);height:28px}.mce-combobox.mce-has-open input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.mce-combobox .mce-btn{border-left:0;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox *:focus{border-color:#59a5e1;border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#000}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:gray;color:white}.mce-path .mce-divider{display:inline}.mce-fieldset{border:0 solid #9e9e9e;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-iframe{border:0 solid #c5c5c5;width:100%;height:100%}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);border:0 solid #c5c5c5;overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label-disabled .mce-text{color:#999}.mce-label.mce-multiline{white-space:pre-wrap}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:none}.mce-menubar{border:1px solid #ddd}.mce-menubar .mce-menubtn button{color:#000}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubtn:focus{border-color:transparent;background:#ddd;filter:none}.mce-menubtn.mce-disabled span{color:#999}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-listbox span{width:100%;display:block;overflow:hidden}.mce-menu-item{display:block;padding:6px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal}.mce-menu-item.mce-disabled .mce-text{color:#999}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:#fff;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0);zoom:1}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text{color:#fff}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:white}.mce-menu-shortcut{display:inline-block;color:#999}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 20px 0 20px}.mce-menu-item .mce-caret{margin-top:6px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #666}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret{border-left-color:#FFF}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item-sep,.mce-menu-item-sep:hover{padding:0;height:1px;margin:9px 1px;overflow:hidden;background:#e5e5e5;border-bottom:1px solid white;cursor:default;filter:none}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item.mce-active{background-color:#c8def4;outline:1px solid #c5c5c5}.mce-menu-item-checkbox.mce-active{background-color:#FFF;outline:0}.mce-menu{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:2px 0 0;min-width:160px;background:#FFF;border:1px solid #CCC;border:1px solid rgba(0,0,0,0.2);z-index:1002;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline;*zoom:1}.mce-menu-sub{margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}i.mce-radio{padding:1px;margin:0 3px 0 0;background-color:#fafafa;border:1px solid #cacece;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}i.mce-radio:after{font-family:Arial;font-size:12px;color:#000;content:'\25cf'}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#000}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent;border-right:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#c5c5c5;border-right-color:#c5c5c5}.mce-splitbtn button{padding-right:4px}.mce-splitbtn .mce-open{padding-left:4px}.mce-splitbtn .mce-open.mce-active{-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #ccc}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #ccc;border-width:1px 1px 0 0;background:#e3e3e3;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-textbox{background:#FFF;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);display:inline-block;-webkit-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:normal;color:#000}.mce-textbox:focus{border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}@font-face{font-family:'tinymce';src:url('fonts/icomoon.eot');src:url('fonts/icomoon.eot?#iefix') format('embedded-opentype'),url('fonts/icomoon.svg#icomoon') format('svg'),url('fonts/icomoon.woff') format('woff'),url('fonts/icomoon.ttf') format('truetype');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce',Arial;font-style:normal;font-weight:normal;font-size:16px;line-height:16px;vertical-align:text-top;-webkit-font-smoothing:antialiased;display:inline-block;background:transparent center center;width:16px;height:16px;color:#333}.mce-i-save:before{content:"\e000"}.mce-i-newdocument:before{content:"\e001"}.mce-i-fullpage:before{content:"\e002"}.mce-i-alignleft:before{content:"\e003"}.mce-i-aligncenter:before{content:"\e004"}.mce-i-alignright:before{content:"\e005"}.mce-i-alignjustify:before{content:"\e006"}.mce-i-cut:before{content:"\e007"}.mce-i-paste:before{content:"\e008"}.mce-i-searchreplace:before{content:"\e009"}.mce-i-bullist:before{content:"\e00a"}.mce-i-numlist:before{content:"\e00b"}.mce-i-indent:before{content:"\e00c"}.mce-i-outdent:before{content:"\e00d"}.mce-i-blockquote:before{content:"\e00e"}.mce-i-undo:before{content:"\e00f"}.mce-i-redo:before{content:"\e010"}.mce-i-link:before{content:"\e011"}.mce-i-unlink:before{content:"\e012"}.mce-i-anchor:before{content:"\e013"}.mce-i-image:before{content:"\e014"}.mce-i-media:before{content:"\e015"}.mce-i-help:before{content:"\e016"}.mce-i-code:before{content:"\e017"}.mce-i-inserttime:before{content:"\e018"}.mce-i-preview:before{content:"\e019"}.mce-i-forecolor:before{content:"\e01a"}.mce-i-backcolor:before{content:"\e01a"}.mce-i-table:before{content:"\e01b"}.mce-i-hr:before{content:"\e01c"}.mce-i-removeformat:before{content:"\e01d"}.mce-i-subscript:before{content:"\e01e"}.mce-i-superscript:before{content:"\e01f"}.mce-i-charmap:before{content:"\e020"}.mce-i-emoticons:before{content:"\e021"}.mce-i-print:before{content:"\e022"}.mce-i-fullscreen:before{content:"\e023"}.mce-i-spellchecker:before{content:"\e024"}.mce-i-nonbreaking:before{content:"\e025"}.mce-i-template:before{content:"\e026"}.mce-i-pagebreak:before{content:"\e027"}.mce-i-restoredraft:before{content:"\e028"}.mce-i-untitled:before{content:"\e029"}.mce-i-bold:before{content:"\e02a"}.mce-i-italic:before{content:"\e02b"}.mce-i-underline:before{content:"\e02c"}.mce-i-strikethrough:before{content:"\e02d"}.mce-i-visualchars:before{content:"\e02e"}.mce-i-visualblocks:before{content:"\e026"}.mce-i-ltr:before{content:"\e02f"}.mce-i-rtl:before{content:"\e030"}.mce-i-copy:before{content:"\e031"}.mce-i-resize:before{content:"\e032"}.mce-i-browse:before{content:"\e034"}.mce-i-checkbox:before,.mce-i-selected:before{content:"\e033"}.mce-i-selected{visibility:hidden}i.mce-i-backcolor{text-shadow:none;background:#BBB}
\ No newline at end of file
+.mce-container,.mce-container *,.mce-widget,.mce-widget *{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#000;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-container ::-webkit-scrollbar{width:8px;height:8px;-webkit-border-radius:4px}.mce-container ::-webkit-scrollbar-track,.mce-container ::-webkit-scrollbar-track-piece{background-color:transparent}.mce-container ::-webkit-scrollbar-thumb{background-color:rgba(53,57,71,0.3);width:6px;height:6px;-webkit-border-radius:4px}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:visible!important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block;border-radius:2px}.mce-wordcount{float:right;padding:8px}.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid #c5c5c5;width:20px;height:20px;line-height:20px;text-align:center;vertical-align:center;padding:2px}.mce-charmap td:hover{background:#d9d9d9}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover{border-color:#c5c5c5}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#e8e8e8;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#c4daff;background:#deeafa}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scroll{position:relative}.mce-panel{border:0 solid #9e9e9e;background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}.mce-floatpanel{position:absolute;-webkit-box-shadow:#ccc 5px 5px 5px;-moz-box-shadow:#ccc 5px 5px 5px;box-shadow:#ccc 5px 5px 5px}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{position:absolute;top:0;left:0;background:#fff;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#FFF;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #EEE;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:bold;line-height:20px;color:#CCC;text-shadow:0 1px 0 white;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#AAA}.mce-window-head .mce-title{display:inline-block;*display:inline;*zoom:1;line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:whiteSmoke;border-top:1px solid #DDD;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window.mce-fullscreen,.mce-window.mce-fullscreen .mce-foot{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:#fff;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-inner{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-tooltip-inner{-webkit-box-shadow:0 0 5px #000;-moz-box-shadow:0 0 5px #000;box-shadow:0 0 5px #000}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:0;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-btn{border:1px solid #c5c5c5;position:relative;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-btn:hover,.mce-btn:focus{text-decoration:none;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn.mce-disabled,.mce-btn.mce-disabled:hover{cursor:default;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn button{padding:4px 10px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px #fff}.mce-primary{color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);zoom:1;border-color:#04c #04c #002b80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary:hover,.mce-primary:focus{color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#005fb3;background-image:-moz-linear-gradient(top,#0077b3,#003cb3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#0077b3),to(#003cb3));background-image:-webkit-linear-gradient(top,#0077b3,#003cb3);background-image:-o-linear-gradient(top,#0077b3,#003cb3);background-image:linear-gradient(to bottom,#0077b3,#003cb3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0077b3',endColorstr='#ff003cb3',GradientType=0);zoom:1;border-color:#003cb3 #003cb3 #026;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary button{color:#333}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:3px 5px;font-size:12px;line-height:15px}.mce-btn-small i{margin-top:0}.mce-btn .mce-caret{margin-top:8px;*margin-top:6px;margin-left:0}.mce-btn-small .mce-caret{margin-top:6px;*margin-top:4px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #444;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#999}.mce-caret.mce-up{border-bottom:4px solid #444;border-top:0}.mce-btn-group .mce-btn{border-width:1px 0 1px 0;margin:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-btn-group .mce-btn:hover,.mce-btn-group .mce-btn:focus{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-disabled,.mce-btn-group .mce-btn.mce-disabled:hover{-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-active,.mce-btn-group .mce-btn.mce-active:hover,.mce-btn-group .mce-btn:active{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn-group .mce-btn.mce-disabled button{opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn-group .mce-first{border-left:1px solid #c5c5c5;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.mce-btn-group .mce-last{border-right:1px solid #c5c5c5;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.mce-btn-group .mce-first.mce-last{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0}.mce-checked i.mce-i-checkbox{color:#000;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox{border:1px solid #59a5e1;border:1px solid rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-colorbutton .mce-ico{position:relative}.mce-colorpicker{background:#FFF}.mce-colorbutton-grid{margin:4px}.mce-grid td div{border:1px solid #808080;width:12px;height:12px;margin:2px;cursor:pointer}.mce-grid td div:hover{border-color:black}.mce-grid td div:focus{border-color:#59a5e1;outline:1px solid rgba(82,168,236,0.8);border-color:rgba(82,168,236,0.8)}.mce-colorbutton{position:relative}.mce-colorbutton .mce-preview{display:block;position:absolute;left:50%;top:50%;margin-left:-8px;margin-top:7px;background:gray;width:16px;height:2px;overflow:hidden}.mce-combobox{display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;width:100px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-combobox input{border-color:1px solid #c5c5c5;border-right-color:rgba(0,0,0,0.15);height:28px}.mce-combobox.mce-has-open input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.mce-combobox .mce-btn{border-left:0;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox *:focus{border-color:#59a5e1;border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#000}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:gray;color:white}.mce-path .mce-divider{display:inline}.mce-fieldset{border:0 solid #9e9e9e;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-iframe{border:0 solid #c5c5c5;width:100%;height:100%}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);border:0 solid #c5c5c5;overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label-disabled .mce-text{color:#999}.mce-label.mce-multiline{white-space:pre-wrap}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:none}.mce-menubar{border:1px solid #ddd}.mce-menubar .mce-menubtn button{color:#000}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubtn:focus{border-color:transparent;background:#ddd;filter:none}.mce-menubtn.mce-disabled span{color:#999}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-listbox span{width:100%;display:block;overflow:hidden}.mce-menu-item{display:block;padding:6px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal}.mce-menu-item.mce-disabled .mce-text{color:#999}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:#fff;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0);zoom:1}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text{color:#fff}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:white}.mce-menu-shortcut{display:inline-block;color:#999}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 20px 0 20px}.mce-menu-item .mce-caret{margin-top:6px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #666}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret{border-left-color:#FFF}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item-sep,.mce-menu-item-sep:hover{padding:0;height:1px;margin:9px 1px;overflow:hidden;background:#e5e5e5;border-bottom:1px solid white;cursor:default;filter:none}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item.mce-active{background-color:#c8def4;outline:1px solid #c5c5c5}.mce-menu-item-checkbox.mce-active{background-color:#FFF;outline:0}.mce-menu{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:2px 0 0;min-width:160px;background:#FFF;border:1px solid #CCC;border:1px solid rgba(0,0,0,0.2);z-index:1002;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline;*zoom:1}.mce-menu-sub{margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}i.mce-radio{padding:1px;margin:0 3px 0 0;background-color:#fafafa;border:1px solid #cacece;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}i.mce-radio:after{font-family:Arial;font-size:12px;color:#000;content:'\25cf'}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#000}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent;border-right:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#c5c5c5;border-right-color:#c5c5c5}.mce-splitbtn button{padding-right:4px}.mce-splitbtn .mce-open{padding-left:4px}.mce-splitbtn .mce-open.mce-active{-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #ccc}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #ccc;border-width:1px 1px 0 0;background:#e3e3e3;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-textbox{background:#FFF;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);display:inline-block;-webkit-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:normal;color:#000}.mce-textbox:focus{border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}@font-face{font-family:'tinymce';src:url('fonts/tinymce.eot');src:url('fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce.woff') format('woff'),url('fonts/tinymce.ttf') format('truetype'),url('fonts/tinymce.svg#tinymce') format('svg');font-weight:normal;font-style:normal}@font-face{font-family:'tinymce-small';src:url('fonts/tinymce-small.eot');src:url('fonts/tinymce-small.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce-small.woff') format('woff'),url('fonts/tinymce-small.ttf') format('truetype'),url('fonts/tinymce-small.svg#tinymce') format('svg');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce',Arial;font-style:normal;font-weight:normal;font-size:16px;line-height:16px;vertical-align:text-top;-webkit-font-smoothing:antialiased;display:inline-block;background:transparent center center;width:16px;height:16px;color:#333}.mce-i-save:before{content:"\e000"}.mce-i-newdocument:before{content:"\e001"}.mce-i-fullpage:before{content:"\e002"}.mce-i-alignleft:before{content:"\e003"}.mce-i-aligncenter:before{content:"\e004"}.mce-i-alignright:before{content:"\e005"}.mce-i-alignjustify:before{content:"\e006"}.mce-i-cut:before{content:"\e007"}.mce-i-paste:before{content:"\e008"}.mce-i-searchreplace:before{content:"\e009"}.mce-i-bullist:before{content:"\e00a"}.mce-i-numlist:before{content:"\e00b"}.mce-i-indent:before{content:"\e00c"}.mce-i-outdent:before{content:"\e00d"}.mce-i-blockquote:before{content:"\e00e"}.mce-i-undo:before{content:"\e00f"}.mce-i-redo:before{content:"\e010"}.mce-i-link:before{content:"\e011"}.mce-i-unlink:before{content:"\e012"}.mce-i-anchor:before{content:"\e013"}.mce-i-image:before{content:"\e014"}.mce-i-media:before{content:"\e015"}.mce-i-help:before{content:"\e016"}.mce-i-code:before{content:"\e017"}.mce-i-inserttime:before{content:"\e018"}.mce-i-preview:before{content:"\e019"}.mce-i-forecolor:before{content:"\e01a"}.mce-i-backcolor:before{content:"\e01a"}.mce-i-table:before{content:"\e01b"}.mce-i-hr:before{content:"\e01c"}.mce-i-removeformat:before{content:"\e01d"}.mce-i-subscript:before{content:"\e01e"}.mce-i-superscript:before{content:"\e01f"}.mce-i-charmap:before{content:"\e020"}.mce-i-emoticons:before{content:"\e021"}.mce-i-print:before{content:"\e022"}.mce-i-fullscreen:before{content:"\e023"}.mce-i-spellchecker:before{content:"\e024"}.mce-i-nonbreaking:before{content:"\e025"}.mce-i-template:before{content:"\e026"}.mce-i-pagebreak:before{content:"\e027"}.mce-i-restoredraft:before{content:"\e028"}.mce-i-untitled:before{content:"\e029"}.mce-i-bold:before{content:"\e02a"}.mce-i-italic:before{content:"\e02b"}.mce-i-underline:before{content:"\e02c"}.mce-i-strikethrough:before{content:"\e02d"}.mce-i-visualchars:before{content:"\e02e"}.mce-i-visualblocks:before{content:"\e026"}.mce-i-ltr:before{content:"\e02f"}.mce-i-rtl:before{content:"\e030"}.mce-i-copy:before{content:"\e031"}.mce-i-resize:before{content:"\e032"}.mce-i-browse:before{content:"\e034"}.mce-i-checkbox:before,.mce-i-selected:before{content:"\e033"}.mce-i-selected{visibility:hidden}i.mce-i-backcolor{text-shadow:none;background:#BBB}.mce-i-tablerowprops:before{content:"\e604"}.mce-i-tablecellprops:before{content:"\e605"}.mce-i-table2:before{content:"\e606"}.mce-i-tablemergecells:before{content:"\e607"}.mce-i-tableinsertcolbefore:before{content:"\e608"}.mce-i-tableinsertcolafter:before{content:"\e609"}.mce-i-tableinsertrowbefore:before{content:"\e60a"}.mce-i-tableinsertrowafter:before{content:"\e60b"}.mce-i-tablesplitcells:before{content:"\e60d"}.mce-i-tabledelete:before{content:"\e60e"}.mce-i-tableleftheader:before{content:"\e62a"}.mce-i-tabletopheader:before{content:"\e62b"}.mce-i-tabledeleterow:before{content:"\e800"}.mce-i-tabledeletecol:before{content:"\e801"}
\ No newline at end of file

From 70a0bbbe610c79dbc85c75c3488da6819164845b Mon Sep 17 00:00:00 2001
From: Brian Powell <bpowell@bitmapped.net>
Date: Sat, 3 Jun 2017 12:49:42 -0400
Subject: [PATCH 019/145] Change font references: icomoon -> tinymce

---
 .../lib/tinymce/skins/umbraco/skin.classic.min.css              | 2 +-
 .../lib/tinymce/skins/umbraco/skin.ie7.min.css                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/skin.classic.min.css b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/skin.classic.min.css
index 86cd46b2d0..18ceba8d63 100755
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/skin.classic.min.css
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/skin.classic.min.css
@@ -1 +1 @@
-.mce-container,.mce-container *,.mce-widget,.mce-widget *{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#000;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-container ::-webkit-scrollbar{width:8px;height:8px;-webkit-border-radius:4px}.mce-container ::-webkit-scrollbar-track,.mce-container ::-webkit-scrollbar-track-piece{background-color:transparent}.mce-container ::-webkit-scrollbar-thumb{background-color:rgba(53,57,71,0.3);width:6px;height:6px;-webkit-border-radius:4px}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:visible!important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block;border-radius:2px}.mce-wordcount{float:right;padding:8px}.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid #c5c5c5;width:20px;height:20px;line-height:20px;text-align:center;vertical-align:center;padding:2px}.mce-charmap td:hover{background:#d9d9d9}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover{border-color:#c5c5c5}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#e8e8e8;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#c4daff;background:#deeafa}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scroll{position:relative}.mce-panel{border:0 solid #9e9e9e;background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}.mce-floatpanel{position:absolute;-webkit-box-shadow:#ccc 5px 5px 5px;-moz-box-shadow:#ccc 5px 5px 5px;box-shadow:#ccc 5px 5px 5px}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{position:absolute;top:0;left:0;background:#fff;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#FFF;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #EEE;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:bold;line-height:20px;color:#CCC;text-shadow:0 1px 0 white;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#AAA}.mce-window-head .mce-title{display:inline-block;*display:inline;*zoom:1;line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:whiteSmoke;border-top:1px solid #DDD;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window.mce-fullscreen,.mce-window.mce-fullscreen .mce-foot{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:#fff;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-inner{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-tooltip-inner{-webkit-box-shadow:0 0 5px #000;-moz-box-shadow:0 0 5px #000;box-shadow:0 0 5px #000}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:0;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-btn{border:1px solid #c5c5c5;position:relative;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-btn:hover,.mce-btn:focus{text-decoration:none;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn.mce-disabled,.mce-btn.mce-disabled:hover{cursor:default;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn button{padding:4px 10px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px #fff}.mce-primary{color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);zoom:1;border-color:#04c #04c #002b80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary:hover,.mce-primary:focus{color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#005fb3;background-image:-moz-linear-gradient(top,#0077b3,#003cb3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#0077b3),to(#003cb3));background-image:-webkit-linear-gradient(top,#0077b3,#003cb3);background-image:-o-linear-gradient(top,#0077b3,#003cb3);background-image:linear-gradient(to bottom,#0077b3,#003cb3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0077b3',endColorstr='#ff003cb3',GradientType=0);zoom:1;border-color:#003cb3 #003cb3 #026;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary button{color:#fff}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:3px 5px;font-size:12px;line-height:15px}.mce-btn-small i{margin-top:0}.mce-btn .mce-caret{margin-top:8px;*margin-top:6px;margin-left:0}.mce-btn-small .mce-caret{margin-top:6px;*margin-top:4px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #444;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#999}.mce-caret.mce-up{border-bottom:4px solid #444;border-top:0}.mce-btn-group .mce-btn{border-width:1px 0 1px 0;margin:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-btn-group .mce-btn:hover,.mce-btn-group .mce-btn:focus{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-disabled,.mce-btn-group .mce-btn.mce-disabled:hover{-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-active,.mce-btn-group .mce-btn.mce-active:hover,.mce-btn-group .mce-btn:active{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn-group .mce-btn.mce-disabled button{opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn-group .mce-first{border-left:1px solid #c5c5c5;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.mce-btn-group .mce-last{border-right:1px solid #c5c5c5;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.mce-btn-group .mce-first.mce-last{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0}.mce-checked i.mce-i-checkbox{color:#000;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox{border:1px solid #59a5e1;border:1px solid rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-colorbutton .mce-ico{position:relative}.mce-colorpicker{background:#FFF}.mce-colorbutton-grid{margin:4px}.mce-grid td div{border:1px solid #808080;width:12px;height:12px;margin:2px;cursor:pointer}.mce-grid td div:hover{border-color:black}.mce-grid td div:focus{border-color:#59a5e1;outline:1px solid rgba(82,168,236,0.8);border-color:rgba(82,168,236,0.8)}.mce-colorbutton{position:relative}.mce-colorbutton .mce-preview{display:block;position:absolute;left:50%;top:50%;margin-left:-8px;margin-top:7px;background:gray;width:16px;height:2px;overflow:hidden}.mce-combobox{display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;width:100px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-combobox input{border-color:1px solid #c5c5c5;border-right-color:rgba(0,0,0,0.15);height:28px}.mce-combobox.mce-has-open input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.mce-combobox .mce-btn{border-left:0;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox *:focus{border-color:#59a5e1;border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#000}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:gray;color:white}.mce-path .mce-divider{display:inline}.mce-fieldset{border:0 solid #9e9e9e;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-iframe{border:0 solid #c5c5c5;width:100%;height:100%}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);border:0 solid #c5c5c5;overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label-disabled .mce-text{color:#999}.mce-label.mce-multiline{white-space:pre-wrap}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:none}.mce-menubar{border:1px solid #ddd}.mce-menubar .mce-menubtn button{color:#000}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubtn:focus{border-color:transparent;background:#ddd;filter:none}.mce-menubtn.mce-disabled span{color:#999}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-listbox span{width:100%;display:block;overflow:hidden}.mce-menu-item{display:block;padding:6px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal}.mce-menu-item.mce-disabled .mce-text{color:#999}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:#fff;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0);zoom:1}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text{color:#fff}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:white}.mce-menu-shortcut{display:inline-block;color:#999}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 20px 0 20px}.mce-menu-item .mce-caret{margin-top:6px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #666}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret{border-left-color:#FFF}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item-sep,.mce-menu-item-sep:hover{padding:0;height:1px;margin:9px 1px;overflow:hidden;background:#e5e5e5;border-bottom:1px solid white;cursor:default;filter:none}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item.mce-active{background-color:#c8def4;outline:1px solid #c5c5c5}.mce-menu-item-checkbox.mce-active{background-color:#FFF;outline:0}.mce-menu{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:2px 0 0;min-width:160px;background:#FFF;border:1px solid #CCC;border:1px solid rgba(0,0,0,0.2);z-index:1002;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline;*zoom:1}.mce-menu-sub{margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}i.mce-radio{padding:1px;margin:0 3px 0 0;background-color:#fafafa;border:1px solid #cacece;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}i.mce-radio:after{font-family:Arial;font-size:12px;color:#000;content:'\25cf'}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#000}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent;border-right:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#c5c5c5;border-right-color:#c5c5c5}.mce-splitbtn button{padding-right:4px}.mce-splitbtn .mce-open{padding-left:4px}.mce-splitbtn .mce-open.mce-active{-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #ccc}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #ccc;border-width:1px 1px 0 0;background:#e3e3e3;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-textbox{background:#FFF;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);display:inline-block;-webkit-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:normal;color:#000}.mce-textbox:focus{border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}@font-face{font-family:'tinymce';src:url('fonts/icomoon.eot');src:url('fonts/icomoon.eot?#iefix') format('embedded-opentype'),url('fonts/icomoon.svg#icomoon') format('svg'),url('fonts/icomoon.woff') format('woff'),url('fonts/icomoon.ttf') format('truetype');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce',Arial;font-style:normal;font-weight:normal;font-size:16px;line-height:16px;vertical-align:text-top;-webkit-font-smoothing:antialiased;display:inline-block;background:transparent center center;width:16px;height:16px;color:#333}.mce-i-save:before{content:"\e000"}.mce-i-newdocument:before{content:"\e001"}.mce-i-fullpage:before{content:"\e002"}.mce-i-alignleft:before{content:"\e003"}.mce-i-aligncenter:before{content:"\e004"}.mce-i-alignright:before{content:"\e005"}.mce-i-alignjustify:before{content:"\e006"}.mce-i-cut:before{content:"\e007"}.mce-i-paste:before{content:"\e008"}.mce-i-searchreplace:before{content:"\e009"}.mce-i-bullist:before{content:"\e00a"}.mce-i-numlist:before{content:"\e00b"}.mce-i-indent:before{content:"\e00c"}.mce-i-outdent:before{content:"\e00d"}.mce-i-blockquote:before{content:"\e00e"}.mce-i-undo:before{content:"\e00f"}.mce-i-redo:before{content:"\e010"}.mce-i-link:before{content:"\e011"}.mce-i-unlink:before{content:"\e012"}.mce-i-anchor:before{content:"\e013"}.mce-i-image:before{content:"\e014"}.mce-i-media:before{content:"\e015"}.mce-i-help:before{content:"\e016"}.mce-i-code:before{content:"\e017"}.mce-i-inserttime:before{content:"\e018"}.mce-i-preview:before{content:"\e019"}.mce-i-forecolor:before{content:"\e01a"}.mce-i-backcolor:before{content:"\e01a"}.mce-i-table:before{content:"\e01b"}.mce-i-hr:before{content:"\e01c"}.mce-i-removeformat:before{content:"\e01d"}.mce-i-subscript:before{content:"\e01e"}.mce-i-superscript:before{content:"\e01f"}.mce-i-charmap:before{content:"\e020"}.mce-i-emoticons:before{content:"\e021"}.mce-i-print:before{content:"\e022"}.mce-i-fullscreen:before{content:"\e023"}.mce-i-spellchecker:before{content:"\e024"}.mce-i-nonbreaking:before{content:"\e025"}.mce-i-template:before{content:"\e026"}.mce-i-pagebreak:before{content:"\e027"}.mce-i-restoredraft:before{content:"\e028"}.mce-i-untitled:before{content:"\e029"}.mce-i-bold:before{content:"\e02a"}.mce-i-italic:before{content:"\e02b"}.mce-i-underline:before{content:"\e02c"}.mce-i-strikethrough:before{content:"\e02d"}.mce-i-visualchars:before{content:"\e02e"}.mce-i-visualblocks:before{content:"\e026"}.mce-i-ltr:before{content:"\e02f"}.mce-i-rtl:before{content:"\e030"}.mce-i-copy:before{content:"\e031"}.mce-i-resize:before{content:"\e032"}.mce-i-browse:before{content:"\e034"}.mce-i-checkbox:before,.mce-i-selected:before{content:"\e033"}.mce-i-selected{visibility:hidden}i.mce-i-backcolor{text-shadow:none;background:#BBB}
\ No newline at end of file
+.mce-container,.mce-container *,.mce-widget,.mce-widget *{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#000;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-container ::-webkit-scrollbar{width:8px;height:8px;-webkit-border-radius:4px}.mce-container ::-webkit-scrollbar-track,.mce-container ::-webkit-scrollbar-track-piece{background-color:transparent}.mce-container ::-webkit-scrollbar-thumb{background-color:rgba(53,57,71,0.3);width:6px;height:6px;-webkit-border-radius:4px}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:visible!important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block;border-radius:2px}.mce-wordcount{float:right;padding:8px}.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid #c5c5c5;width:20px;height:20px;line-height:20px;text-align:center;vertical-align:center;padding:2px}.mce-charmap td:hover{background:#d9d9d9}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover{border-color:#c5c5c5}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#e8e8e8;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#c4daff;background:#deeafa}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scroll{position:relative}.mce-panel{border:0 solid #9e9e9e;background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}.mce-floatpanel{position:absolute;-webkit-box-shadow:#ccc 5px 5px 5px;-moz-box-shadow:#ccc 5px 5px 5px;box-shadow:#ccc 5px 5px 5px}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{position:absolute;top:0;left:0;background:#fff;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#FFF;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #EEE;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:bold;line-height:20px;color:#CCC;text-shadow:0 1px 0 white;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#AAA}.mce-window-head .mce-title{display:inline-block;*display:inline;*zoom:1;line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:whiteSmoke;border-top:1px solid #DDD;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window.mce-fullscreen,.mce-window.mce-fullscreen .mce-foot{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:#fff;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-inner{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-tooltip-inner{-webkit-box-shadow:0 0 5px #000;-moz-box-shadow:0 0 5px #000;box-shadow:0 0 5px #000}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:0;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-btn{border:1px solid #c5c5c5;position:relative;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-btn:hover,.mce-btn:focus{text-decoration:none;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn.mce-disabled,.mce-btn.mce-disabled:hover{cursor:default;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn button{padding:4px 10px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px #fff}.mce-primary{color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);zoom:1;border-color:#04c #04c #002b80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary:hover,.mce-primary:focus{color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#005fb3;background-image:-moz-linear-gradient(top,#0077b3,#003cb3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#0077b3),to(#003cb3));background-image:-webkit-linear-gradient(top,#0077b3,#003cb3);background-image:-o-linear-gradient(top,#0077b3,#003cb3);background-image:linear-gradient(to bottom,#0077b3,#003cb3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0077b3',endColorstr='#ff003cb3',GradientType=0);zoom:1;border-color:#003cb3 #003cb3 #026;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary button{color:#fff}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:3px 5px;font-size:12px;line-height:15px}.mce-btn-small i{margin-top:0}.mce-btn .mce-caret{margin-top:8px;*margin-top:6px;margin-left:0}.mce-btn-small .mce-caret{margin-top:6px;*margin-top:4px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #444;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#999}.mce-caret.mce-up{border-bottom:4px solid #444;border-top:0}.mce-btn-group .mce-btn{border-width:1px 0 1px 0;margin:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-btn-group .mce-btn:hover,.mce-btn-group .mce-btn:focus{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-disabled,.mce-btn-group .mce-btn.mce-disabled:hover{-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-active,.mce-btn-group .mce-btn.mce-active:hover,.mce-btn-group .mce-btn:active{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn-group .mce-btn.mce-disabled button{opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn-group .mce-first{border-left:1px solid #c5c5c5;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.mce-btn-group .mce-last{border-right:1px solid #c5c5c5;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.mce-btn-group .mce-first.mce-last{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0}.mce-checked i.mce-i-checkbox{color:#000;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox{border:1px solid #59a5e1;border:1px solid rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-colorbutton .mce-ico{position:relative}.mce-colorpicker{background:#FFF}.mce-colorbutton-grid{margin:4px}.mce-grid td div{border:1px solid #808080;width:12px;height:12px;margin:2px;cursor:pointer}.mce-grid td div:hover{border-color:black}.mce-grid td div:focus{border-color:#59a5e1;outline:1px solid rgba(82,168,236,0.8);border-color:rgba(82,168,236,0.8)}.mce-colorbutton{position:relative}.mce-colorbutton .mce-preview{display:block;position:absolute;left:50%;top:50%;margin-left:-8px;margin-top:7px;background:gray;width:16px;height:2px;overflow:hidden}.mce-combobox{display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;width:100px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-combobox input{border-color:1px solid #c5c5c5;border-right-color:rgba(0,0,0,0.15);height:28px}.mce-combobox.mce-has-open input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.mce-combobox .mce-btn{border-left:0;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox *:focus{border-color:#59a5e1;border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#000}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:gray;color:white}.mce-path .mce-divider{display:inline}.mce-fieldset{border:0 solid #9e9e9e;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-iframe{border:0 solid #c5c5c5;width:100%;height:100%}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);border:0 solid #c5c5c5;overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label-disabled .mce-text{color:#999}.mce-label.mce-multiline{white-space:pre-wrap}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:none}.mce-menubar{border:1px solid #ddd}.mce-menubar .mce-menubtn button{color:#000}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubtn:focus{border-color:transparent;background:#ddd;filter:none}.mce-menubtn.mce-disabled span{color:#999}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-listbox span{width:100%;display:block;overflow:hidden}.mce-menu-item{display:block;padding:6px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal}.mce-menu-item.mce-disabled .mce-text{color:#999}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:#fff;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0);zoom:1}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text{color:#fff}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:white}.mce-menu-shortcut{display:inline-block;color:#999}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 20px 0 20px}.mce-menu-item .mce-caret{margin-top:6px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #666}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret{border-left-color:#FFF}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item-sep,.mce-menu-item-sep:hover{padding:0;height:1px;margin:9px 1px;overflow:hidden;background:#e5e5e5;border-bottom:1px solid white;cursor:default;filter:none}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item.mce-active{background-color:#c8def4;outline:1px solid #c5c5c5}.mce-menu-item-checkbox.mce-active{background-color:#FFF;outline:0}.mce-menu{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:2px 0 0;min-width:160px;background:#FFF;border:1px solid #CCC;border:1px solid rgba(0,0,0,0.2);z-index:1002;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline;*zoom:1}.mce-menu-sub{margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}i.mce-radio{padding:1px;margin:0 3px 0 0;background-color:#fafafa;border:1px solid #cacece;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}i.mce-radio:after{font-family:Arial;font-size:12px;color:#000;content:'\25cf'}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#000}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent;border-right:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#c5c5c5;border-right-color:#c5c5c5}.mce-splitbtn button{padding-right:4px}.mce-splitbtn .mce-open{padding-left:4px}.mce-splitbtn .mce-open.mce-active{-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #ccc}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #ccc;border-width:1px 1px 0 0;background:#e3e3e3;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-textbox{background:#FFF;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);display:inline-block;-webkit-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:normal;color:#000}.mce-textbox:focus{border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}@font-face{font-family:'tinymce';src:url('fonts/tinymce.eot');src:url('fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce.svg#icomoon') format('svg'),url('fonts/tinymce.woff') format('woff'),url('fonts/tinymce.ttf') format('truetype');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce',Arial;font-style:normal;font-weight:normal;font-size:16px;line-height:16px;vertical-align:text-top;-webkit-font-smoothing:antialiased;display:inline-block;background:transparent center center;width:16px;height:16px;color:#333}.mce-i-save:before{content:"\e000"}.mce-i-newdocument:before{content:"\e001"}.mce-i-fullpage:before{content:"\e002"}.mce-i-alignleft:before{content:"\e003"}.mce-i-aligncenter:before{content:"\e004"}.mce-i-alignright:before{content:"\e005"}.mce-i-alignjustify:before{content:"\e006"}.mce-i-cut:before{content:"\e007"}.mce-i-paste:before{content:"\e008"}.mce-i-searchreplace:before{content:"\e009"}.mce-i-bullist:before{content:"\e00a"}.mce-i-numlist:before{content:"\e00b"}.mce-i-indent:before{content:"\e00c"}.mce-i-outdent:before{content:"\e00d"}.mce-i-blockquote:before{content:"\e00e"}.mce-i-undo:before{content:"\e00f"}.mce-i-redo:before{content:"\e010"}.mce-i-link:before{content:"\e011"}.mce-i-unlink:before{content:"\e012"}.mce-i-anchor:before{content:"\e013"}.mce-i-image:before{content:"\e014"}.mce-i-media:before{content:"\e015"}.mce-i-help:before{content:"\e016"}.mce-i-code:before{content:"\e017"}.mce-i-inserttime:before{content:"\e018"}.mce-i-preview:before{content:"\e019"}.mce-i-forecolor:before{content:"\e01a"}.mce-i-backcolor:before{content:"\e01a"}.mce-i-table:before{content:"\e01b"}.mce-i-hr:before{content:"\e01c"}.mce-i-removeformat:before{content:"\e01d"}.mce-i-subscript:before{content:"\e01e"}.mce-i-superscript:before{content:"\e01f"}.mce-i-charmap:before{content:"\e020"}.mce-i-emoticons:before{content:"\e021"}.mce-i-print:before{content:"\e022"}.mce-i-fullscreen:before{content:"\e023"}.mce-i-spellchecker:before{content:"\e024"}.mce-i-nonbreaking:before{content:"\e025"}.mce-i-template:before{content:"\e026"}.mce-i-pagebreak:before{content:"\e027"}.mce-i-restoredraft:before{content:"\e028"}.mce-i-untitled:before{content:"\e029"}.mce-i-bold:before{content:"\e02a"}.mce-i-italic:before{content:"\e02b"}.mce-i-underline:before{content:"\e02c"}.mce-i-strikethrough:before{content:"\e02d"}.mce-i-visualchars:before{content:"\e02e"}.mce-i-visualblocks:before{content:"\e026"}.mce-i-ltr:before{content:"\e02f"}.mce-i-rtl:before{content:"\e030"}.mce-i-copy:before{content:"\e031"}.mce-i-resize:before{content:"\e032"}.mce-i-browse:before{content:"\e034"}.mce-i-checkbox:before,.mce-i-selected:before{content:"\e033"}.mce-i-selected{visibility:hidden}i.mce-i-backcolor{text-shadow:none;background:#BBB}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/skin.ie7.min.css b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/skin.ie7.min.css
index 3c200ea3a0..bb0ca2bac6 100755
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/skin.ie7.min.css
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/skin.ie7.min.css
@@ -1 +1 @@
-.mce-container,.mce-container *,.mce-widget,.mce-widget *{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#000;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-container ::-webkit-scrollbar{width:8px;height:8px;-webkit-border-radius:4px}.mce-container ::-webkit-scrollbar-track,.mce-container ::-webkit-scrollbar-track-piece{background-color:transparent}.mce-container ::-webkit-scrollbar-thumb{background-color:rgba(53,57,71,0.3);width:6px;height:6px;-webkit-border-radius:4px}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:visible!important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block;border-radius:2px}.mce-wordcount{float:right;padding:8px}.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid #c5c5c5;width:20px;height:20px;line-height:20px;text-align:center;vertical-align:center;padding:2px}.mce-charmap td:hover{background:#d9d9d9}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover{border-color:#c5c5c5}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#e8e8e8;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#c4daff;background:#deeafa}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scroll{position:relative}.mce-panel{border:0 solid #9e9e9e;background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}.mce-floatpanel{position:absolute;-webkit-box-shadow:#ccc 5px 5px 5px;-moz-box-shadow:#ccc 5px 5px 5px;box-shadow:#ccc 5px 5px 5px}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{position:absolute;top:0;left:0;background:#fff;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#FFF;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #EEE;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:bold;line-height:20px;color:#CCC;text-shadow:0 1px 0 white;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#AAA}.mce-window-head .mce-title{display:inline-block;*display:inline;*zoom:1;line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:whiteSmoke;border-top:1px solid #DDD;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window.mce-fullscreen,.mce-window.mce-fullscreen .mce-foot{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:#fff;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-inner{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-tooltip-inner{-webkit-box-shadow:0 0 5px #000;-moz-box-shadow:0 0 5px #000;box-shadow:0 0 5px #000}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:0;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-btn{border:1px solid #c5c5c5;position:relative;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-btn:hover,.mce-btn:focus{text-decoration:none;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn.mce-disabled,.mce-btn.mce-disabled:hover{cursor:default;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn button{padding:4px 10px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px #fff}.mce-primary{color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);zoom:1;border-color:#04c #04c #002b80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary:hover,.mce-primary:focus{color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#005fb3;background-image:-moz-linear-gradient(top,#0077b3,#003cb3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#0077b3),to(#003cb3));background-image:-webkit-linear-gradient(top,#0077b3,#003cb3);background-image:-o-linear-gradient(top,#0077b3,#003cb3);background-image:linear-gradient(to bottom,#0077b3,#003cb3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0077b3',endColorstr='#ff003cb3',GradientType=0);zoom:1;border-color:#003cb3 #003cb3 #026;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary button{color:#fff}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:3px 5px;font-size:12px;line-height:15px}.mce-btn-small i{margin-top:0}.mce-btn .mce-caret{margin-top:8px;*margin-top:6px;margin-left:0}.mce-btn-small .mce-caret{margin-top:6px;*margin-top:4px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #444;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#999}.mce-caret.mce-up{border-bottom:4px solid #444;border-top:0}.mce-btn-group .mce-btn{border-width:1px 0 1px 0;margin:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-btn-group .mce-btn:hover,.mce-btn-group .mce-btn:focus{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-disabled,.mce-btn-group .mce-btn.mce-disabled:hover{-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-active,.mce-btn-group .mce-btn.mce-active:hover,.mce-btn-group .mce-btn:active{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn-group .mce-btn.mce-disabled button{opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn-group .mce-first{border-left:1px solid #c5c5c5;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.mce-btn-group .mce-last{border-right:1px solid #c5c5c5;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.mce-btn-group .mce-first.mce-last{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0}.mce-checked i.mce-i-checkbox{color:#000;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox{border:1px solid #59a5e1;border:1px solid rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-colorbutton .mce-ico{position:relative}.mce-colorpicker{background:#FFF}.mce-colorbutton-grid{margin:4px}.mce-grid td div{border:1px solid #808080;width:12px;height:12px;margin:2px;cursor:pointer}.mce-grid td div:hover{border-color:black}.mce-grid td div:focus{border-color:#59a5e1;outline:1px solid rgba(82,168,236,0.8);border-color:rgba(82,168,236,0.8)}.mce-colorbutton{position:relative}.mce-colorbutton .mce-preview{display:block;position:absolute;left:50%;top:50%;margin-left:-8px;margin-top:7px;background:gray;width:16px;height:2px;overflow:hidden}.mce-combobox{display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;width:100px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-combobox input{border-color:1px solid #c5c5c5;border-right-color:rgba(0,0,0,0.15);height:28px}.mce-combobox.mce-has-open input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.mce-combobox .mce-btn{border-left:0;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox *:focus{border-color:#59a5e1;border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#000}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:gray;color:white}.mce-path .mce-divider{display:inline}.mce-fieldset{border:0 solid #9e9e9e;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-iframe{border:0 solid #c5c5c5;width:100%;height:100%}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);border:0 solid #c5c5c5;overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label-disabled .mce-text{color:#999}.mce-label.mce-multiline{white-space:pre-wrap}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:none}.mce-menubar{border:1px solid #ddd}.mce-menubar .mce-menubtn button{color:#000}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubtn:focus{border-color:transparent;background:#ddd;filter:none}.mce-menubtn.mce-disabled span{color:#999}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-listbox span{width:100%;display:block;overflow:hidden}.mce-menu-item{display:block;padding:6px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal}.mce-menu-item.mce-disabled .mce-text{color:#999}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:#fff;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0);zoom:1}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text{color:#fff}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:white}.mce-menu-shortcut{display:inline-block;color:#999}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 20px 0 20px}.mce-menu-item .mce-caret{margin-top:6px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #666}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret{border-left-color:#FFF}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item-sep,.mce-menu-item-sep:hover{padding:0;height:1px;margin:9px 1px;overflow:hidden;background:#e5e5e5;border-bottom:1px solid white;cursor:default;filter:none}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item.mce-active{background-color:#c8def4;outline:1px solid #c5c5c5}.mce-menu-item-checkbox.mce-active{background-color:#FFF;outline:0}.mce-menu{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:2px 0 0;min-width:160px;background:#FFF;border:1px solid #CCC;border:1px solid rgba(0,0,0,0.2);z-index:1002;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline;*zoom:1}.mce-menu-sub{margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}i.mce-radio{padding:1px;margin:0 3px 0 0;background-color:#fafafa;border:1px solid #cacece;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}i.mce-radio:after{font-family:Arial;font-size:12px;color:#000;content:'\25cf'}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#000}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent;border-right:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#c5c5c5;border-right-color:#c5c5c5}.mce-splitbtn button{padding-right:4px}.mce-splitbtn .mce-open{padding-left:4px}.mce-splitbtn .mce-open.mce-active{-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #ccc}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #ccc;border-width:1px 1px 0 0;background:#e3e3e3;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-textbox{background:#FFF;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);display:inline-block;-webkit-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:normal;color:#000}.mce-textbox:focus{border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}@font-face{font-family:'icomoon';src:url('fonts/icomoon.eot');src:url('fonts/icomoon.eot?#iefix') format('embedded-opentype'),url('fonts/icomoon.svg#icomoon') format('svg'),url('fonts/icomoon.woff') format('woff'),url('fonts/icomoon.ttf') format('truetype');font-weight:normal;font-style:normal}.mce-ico{font-family:'icomoon';font-style:normal;font-weight:normal;font-size:16px;line-height:16px;vertical-align:text-top;-webkit-font-smoothing:antialiased;display:inline-block;background:transparent center center;width:16px;height:16px;color:#333;-ie7-icon:' '}.mce-ico,i.mce-i-checkbox{zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = this.currentStyle['-ie7-icon'].substr(1,1)+'&nbsp;')}.mce-i-save{-ie7-icon:"\e000"}.mce-i-newdocument{-ie7-icon:"\e001"}.mce-i-fullpage{-ie7-icon:"\e002"}.mce-i-alignleft{-ie7-icon:"\e003"}.mce-i-aligncenter{-ie7-icon:"\e004"}.mce-i-alignright{-ie7-icon:"\e005"}.mce-i-alignjustify{-ie7-icon:"\e006"}.mce-i-cut{-ie7-icon:"\e007"}.mce-i-paste{-ie7-icon:"\e008"}.mce-i-searchreplace{-ie7-icon:"\e009"}.mce-i-bullist{-ie7-icon:"\e00a"}.mce-i-numlist{-ie7-icon:"\e00b"}.mce-i-indent{-ie7-icon:"\e00c"}.mce-i-outdent{-ie7-icon:"\e00d"}.mce-i-blockquote{-ie7-icon:"\e00e"}.mce-i-undo{-ie7-icon:"\e00f"}.mce-i-redo{-ie7-icon:"\e010"}.mce-i-link{-ie7-icon:"\e011"}.mce-i-unlink{-ie7-icon:"\e012"}.mce-i-anchor{-ie7-icon:"\e013"}.mce-i-image{-ie7-icon:"\e014"}.mce-i-media{-ie7-icon:"\e015"}.mce-i-help{-ie7-icon:"\e016"}.mce-i-code{-ie7-icon:"\e017"}.mce-i-inserttime{-ie7-icon:"\e018"}.mce-i-preview{-ie7-icon:"\e019"}.mce-i-forecolor{-ie7-icon:"\e01a"}.mce-i-backcolor{-ie7-icon:"\e01a"}.mce-i-table{-ie7-icon:"\e01b"}.mce-i-hr{-ie7-icon:"\e01c"}.mce-i-removeformat{-ie7-icon:"\e01d"}.mce-i-subscript{-ie7-icon:"\e01e"}.mce-i-superscript{-ie7-icon:"\e01f"}.mce-i-charmap{-ie7-icon:"\e020"}.mce-i-emoticons{-ie7-icon:"\e021"}.mce-i-print{-ie7-icon:"\e022"}.mce-i-fullscreen{-ie7-icon:"\e023"}.mce-i-spellchecker{-ie7-icon:"\e024"}.mce-i-nonbreaking{-ie7-icon:"\e025"}.mce-i-template{-ie7-icon:"\e026"}.mce-i-pagebreak{-ie7-icon:"\e027"}.mce-i-restoredraft{-ie7-icon:"\e028"}.mce-i-untitled{-ie7-icon:"\e029"}.mce-i-bold{-ie7-icon:"\e02a"}.mce-i-italic{-ie7-icon:"\e02b"}.mce-i-underline{-ie7-icon:"\e02c"}.mce-i-strikethrough{-ie7-icon:"\e02d"}.mce-i-visualchars{-ie7-icon:"\e02e"}.mce-i-visualblocks:before{content:"\e026"}.mce-i-ltr{-ie7-icon:"\e02f"}.mce-i-rtl{-ie7-icon:"\e030"}.mce-i-copy{-ie7-icon:"\e031"}.mce-i-resize{-ie7-icon:"\e032"}.mce-i-browse{-ie7-icon:"\e034"}.mce-i-checkbox,.mce-i-selected{-ie7-icon:"\e033"}.mce-i-selected{visibility:hidden}.mce-i-backcolor{background:#BBB}
\ No newline at end of file
+.mce-container,.mce-container *,.mce-widget,.mce-widget *{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#000;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-container ::-webkit-scrollbar{width:8px;height:8px;-webkit-border-radius:4px}.mce-container ::-webkit-scrollbar-track,.mce-container ::-webkit-scrollbar-track-piece{background-color:transparent}.mce-container ::-webkit-scrollbar-thumb{background-color:rgba(53,57,71,0.3);width:6px;height:6px;-webkit-border-radius:4px}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:visible!important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block;border-radius:2px}.mce-wordcount{float:right;padding:8px}.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid #c5c5c5;width:20px;height:20px;line-height:20px;text-align:center;vertical-align:center;padding:2px}.mce-charmap td:hover{background:#d9d9d9}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover{border-color:#c5c5c5}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#e8e8e8;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#c4daff;background:#deeafa}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scroll{position:relative}.mce-panel{border:0 solid #9e9e9e;background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}.mce-floatpanel{position:absolute;-webkit-box-shadow:#ccc 5px 5px 5px;-moz-box-shadow:#ccc 5px 5px 5px;box-shadow:#ccc 5px 5px 5px}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{position:absolute;top:0;left:0;background:#fff;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#FFF;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #EEE;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:bold;line-height:20px;color:#CCC;text-shadow:0 1px 0 white;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#AAA}.mce-window-head .mce-title{display:inline-block;*display:inline;*zoom:1;line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:whiteSmoke;border-top:1px solid #DDD;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window.mce-fullscreen,.mce-window.mce-fullscreen .mce-foot{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:#fff;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-inner{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-tooltip-inner{-webkit-box-shadow:0 0 5px #000;-moz-box-shadow:0 0 5px #000;box-shadow:0 0 5px #000}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:0;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-btn{border:1px solid #c5c5c5;position:relative;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-btn:hover,.mce-btn:focus{text-decoration:none;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn.mce-disabled,.mce-btn.mce-disabled:hover{cursor:default;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn button{padding:4px 10px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px #fff}.mce-primary{color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);zoom:1;border-color:#04c #04c #002b80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary:hover,.mce-primary:focus{color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#005fb3;background-image:-moz-linear-gradient(top,#0077b3,#003cb3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#0077b3),to(#003cb3));background-image:-webkit-linear-gradient(top,#0077b3,#003cb3);background-image:-o-linear-gradient(top,#0077b3,#003cb3);background-image:linear-gradient(to bottom,#0077b3,#003cb3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0077b3',endColorstr='#ff003cb3',GradientType=0);zoom:1;border-color:#003cb3 #003cb3 #026;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary button{color:#fff}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:3px 5px;font-size:12px;line-height:15px}.mce-btn-small i{margin-top:0}.mce-btn .mce-caret{margin-top:8px;*margin-top:6px;margin-left:0}.mce-btn-small .mce-caret{margin-top:6px;*margin-top:4px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #444;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#999}.mce-caret.mce-up{border-bottom:4px solid #444;border-top:0}.mce-btn-group .mce-btn{border-width:1px 0 1px 0;margin:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-btn-group .mce-btn:hover,.mce-btn-group .mce-btn:focus{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-disabled,.mce-btn-group .mce-btn.mce-disabled:hover{-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-active,.mce-btn-group .mce-btn.mce-active:hover,.mce-btn-group .mce-btn:active{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn-group .mce-btn.mce-disabled button{opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn-group .mce-first{border-left:1px solid #c5c5c5;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.mce-btn-group .mce-last{border-right:1px solid #c5c5c5;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.mce-btn-group .mce-first.mce-last{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0}.mce-checked i.mce-i-checkbox{color:#000;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox{border:1px solid #59a5e1;border:1px solid rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-colorbutton .mce-ico{position:relative}.mce-colorpicker{background:#FFF}.mce-colorbutton-grid{margin:4px}.mce-grid td div{border:1px solid #808080;width:12px;height:12px;margin:2px;cursor:pointer}.mce-grid td div:hover{border-color:black}.mce-grid td div:focus{border-color:#59a5e1;outline:1px solid rgba(82,168,236,0.8);border-color:rgba(82,168,236,0.8)}.mce-colorbutton{position:relative}.mce-colorbutton .mce-preview{display:block;position:absolute;left:50%;top:50%;margin-left:-8px;margin-top:7px;background:gray;width:16px;height:2px;overflow:hidden}.mce-combobox{display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;width:100px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-combobox input{border-color:1px solid #c5c5c5;border-right-color:rgba(0,0,0,0.15);height:28px}.mce-combobox.mce-has-open input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.mce-combobox .mce-btn{border-left:0;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox *:focus{border-color:#59a5e1;border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#000}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:gray;color:white}.mce-path .mce-divider{display:inline}.mce-fieldset{border:0 solid #9e9e9e;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-iframe{border:0 solid #c5c5c5;width:100%;height:100%}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);border:0 solid #c5c5c5;overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label-disabled .mce-text{color:#999}.mce-label.mce-multiline{white-space:pre-wrap}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:none}.mce-menubar{border:1px solid #ddd}.mce-menubar .mce-menubtn button{color:#000}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubtn:focus{border-color:transparent;background:#ddd;filter:none}.mce-menubtn.mce-disabled span{color:#999}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-listbox span{width:100%;display:block;overflow:hidden}.mce-menu-item{display:block;padding:6px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal}.mce-menu-item.mce-disabled .mce-text{color:#999}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:#fff;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0);zoom:1}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text{color:#fff}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:white}.mce-menu-shortcut{display:inline-block;color:#999}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 20px 0 20px}.mce-menu-item .mce-caret{margin-top:6px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #666}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret{border-left-color:#FFF}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item-sep,.mce-menu-item-sep:hover{padding:0;height:1px;margin:9px 1px;overflow:hidden;background:#e5e5e5;border-bottom:1px solid white;cursor:default;filter:none}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item.mce-active{background-color:#c8def4;outline:1px solid #c5c5c5}.mce-menu-item-checkbox.mce-active{background-color:#FFF;outline:0}.mce-menu{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:2px 0 0;min-width:160px;background:#FFF;border:1px solid #CCC;border:1px solid rgba(0,0,0,0.2);z-index:1002;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline;*zoom:1}.mce-menu-sub{margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}i.mce-radio{padding:1px;margin:0 3px 0 0;background-color:#fafafa;border:1px solid #cacece;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}i.mce-radio:after{font-family:Arial;font-size:12px;color:#000;content:'\25cf'}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#000}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent;border-right:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#c5c5c5;border-right-color:#c5c5c5}.mce-splitbtn button{padding-right:4px}.mce-splitbtn .mce-open{padding-left:4px}.mce-splitbtn .mce-open.mce-active{-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #ccc}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #ccc;border-width:1px 1px 0 0;background:#e3e3e3;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-textbox{background:#FFF;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);display:inline-block;-webkit-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:normal;color:#000}.mce-textbox:focus{border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}@font-face{font-family:'icomoon';src:url('fonts/tinymce.eot');src:url('fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce.svg#icomoon') format('svg'),url('fonts/tinymce.woff') format('woff'),url('fonts/tinymce.ttf') format('truetype');font-weight:normal;font-style:normal}.mce-ico{font-family:'icomoon';font-style:normal;font-weight:normal;font-size:16px;line-height:16px;vertical-align:text-top;-webkit-font-smoothing:antialiased;display:inline-block;background:transparent center center;width:16px;height:16px;color:#333;-ie7-icon:' '}.mce-ico,i.mce-i-checkbox{zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = this.currentStyle['-ie7-icon'].substr(1,1)+'&nbsp;')}.mce-i-save{-ie7-icon:"\e000"}.mce-i-newdocument{-ie7-icon:"\e001"}.mce-i-fullpage{-ie7-icon:"\e002"}.mce-i-alignleft{-ie7-icon:"\e003"}.mce-i-aligncenter{-ie7-icon:"\e004"}.mce-i-alignright{-ie7-icon:"\e005"}.mce-i-alignjustify{-ie7-icon:"\e006"}.mce-i-cut{-ie7-icon:"\e007"}.mce-i-paste{-ie7-icon:"\e008"}.mce-i-searchreplace{-ie7-icon:"\e009"}.mce-i-bullist{-ie7-icon:"\e00a"}.mce-i-numlist{-ie7-icon:"\e00b"}.mce-i-indent{-ie7-icon:"\e00c"}.mce-i-outdent{-ie7-icon:"\e00d"}.mce-i-blockquote{-ie7-icon:"\e00e"}.mce-i-undo{-ie7-icon:"\e00f"}.mce-i-redo{-ie7-icon:"\e010"}.mce-i-link{-ie7-icon:"\e011"}.mce-i-unlink{-ie7-icon:"\e012"}.mce-i-anchor{-ie7-icon:"\e013"}.mce-i-image{-ie7-icon:"\e014"}.mce-i-media{-ie7-icon:"\e015"}.mce-i-help{-ie7-icon:"\e016"}.mce-i-code{-ie7-icon:"\e017"}.mce-i-inserttime{-ie7-icon:"\e018"}.mce-i-preview{-ie7-icon:"\e019"}.mce-i-forecolor{-ie7-icon:"\e01a"}.mce-i-backcolor{-ie7-icon:"\e01a"}.mce-i-table{-ie7-icon:"\e01b"}.mce-i-hr{-ie7-icon:"\e01c"}.mce-i-removeformat{-ie7-icon:"\e01d"}.mce-i-subscript{-ie7-icon:"\e01e"}.mce-i-superscript{-ie7-icon:"\e01f"}.mce-i-charmap{-ie7-icon:"\e020"}.mce-i-emoticons{-ie7-icon:"\e021"}.mce-i-print{-ie7-icon:"\e022"}.mce-i-fullscreen{-ie7-icon:"\e023"}.mce-i-spellchecker{-ie7-icon:"\e024"}.mce-i-nonbreaking{-ie7-icon:"\e025"}.mce-i-template{-ie7-icon:"\e026"}.mce-i-pagebreak{-ie7-icon:"\e027"}.mce-i-restoredraft{-ie7-icon:"\e028"}.mce-i-untitled{-ie7-icon:"\e029"}.mce-i-bold{-ie7-icon:"\e02a"}.mce-i-italic{-ie7-icon:"\e02b"}.mce-i-underline{-ie7-icon:"\e02c"}.mce-i-strikethrough{-ie7-icon:"\e02d"}.mce-i-visualchars{-ie7-icon:"\e02e"}.mce-i-visualblocks:before{content:"\e026"}.mce-i-ltr{-ie7-icon:"\e02f"}.mce-i-rtl{-ie7-icon:"\e030"}.mce-i-copy{-ie7-icon:"\e031"}.mce-i-resize{-ie7-icon:"\e032"}.mce-i-browse{-ie7-icon:"\e034"}.mce-i-checkbox,.mce-i-selected{-ie7-icon:"\e033"}.mce-i-selected{visibility:hidden}.mce-i-backcolor{background:#BBB}
\ No newline at end of file

From e35a748c92f4ff76324c99076e50fa2c666b2122 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Tue, 27 Jun 2017 17:00:00 +0200
Subject: [PATCH 020/145] Fixes issues with missing angular modules and adds
 sourcemap support

---
 src/Umbraco.Web.UI.Client/gulpfile.js              | 11 +++++++++--
 src/Umbraco.Web.UI.Client/package.json             | 14 +++++++++-----
 src/Umbraco.Web.UI.Client/src/installer/_module.js |  1 +
 3 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/installer/_module.js

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index e3433d99ad..cb1883d3ed 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -2,7 +2,10 @@
 var watch = require('gulp-watch');
 var concat = require('gulp-concat');
 var rename = require('gulp-rename');
-var wrap = require('gulp-wrap');
+var sourcemaps = require('gulp-sourcemaps');
+var wrap = require("gulp-wrap-js");
+var sort = require('gulp-sort');
+var uglify = require('gulp-uglify');
 
 var _ = require('lodash');
 var MergeStream = require('merge-stream');
@@ -21,8 +24,12 @@ Helper functions
 function processJs(files, out) {
     
     return gulp.src(files)
+     .pipe(sort())
+     .pipe(sourcemaps.init())
      .pipe(concat(out))
-     .pipe(wrap('(function(){\n"use strict";\n<%= contents %>\n})();'))
+     .pipe(wrap('(function(){\n%= body %\n})();'))
+     .pipe(uglify({ mangle: false }))
+     .pipe(sourcemaps.write())
      .pipe(gulp.dest(root + targets.js));
 
      console.log(out + " compiled");
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index b9b88090ee..4ca32e5f41 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -16,7 +16,8 @@
   },
   "scripts": {
     "install": "bower-installer",
-    "test": "karma start test/config/karma.conf.js --singlerun"
+    "test": "karma start test/config/karma.conf.js --singlerun",
+    "build": "gulp"
   },
   "dependencies": {},
   "devDependencies": {
@@ -28,13 +29,16 @@
     "gulp-less": "^3.1.0",
     "gulp-postcss": "^6.2.0",
     "gulp-rename": "^1.2.2",
-    "gulp-sourcemaps": "^1.6.0",
+    "gulp-sort": "^2.0.0",
+    "gulp-sourcemaps": "^2.6.0",
+    "gulp-uglify": "^3.0.0",
     "gulp-watch": "^4.3.10",
     "gulp-wrap": "^0.13.0",
+    "gulp-wrap-js": "^0.4.1",
     "jasmine-core": "^2.5.2",
-    "karma": "^1.3.0",
-    "karma-jasmine": "^0.1.0",
-    "karma-phantomjs-launcher": "^1.0.2",
+    "karma": "^1.7.0",
+    "karma-jasmine": "^1.1.0",
+    "karma-phantomjs-launcher": "^1.0.4",
     "lodash": "^4.16.3",
     "merge-stream": "^1.0.1"
   }
diff --git a/src/Umbraco.Web.UI.Client/src/installer/_module.js b/src/Umbraco.Web.UI.Client/src/installer/_module.js
new file mode 100644
index 0000000000..d031c60679
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/installer/_module.js
@@ -0,0 +1 @@
+angular.module('umbraco.install', []);
\ No newline at end of file

From 6db18d83bee859a45eb5b31e03edbca091e8e593 Mon Sep 17 00:00:00 2001
From: Robert <robe2006@edu.eal.dk>
Date: Wed, 5 Jul 2017 10:15:23 +0200
Subject: [PATCH 021/145] add/remove functionality on keyDown added

---
 .../multipletextbox.controller.js             | 34 +++++++++++++++++--
 .../multipletextbox/multipletextbox.html      |  2 +-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
index 771d854aae..a5924e17d3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
@@ -11,7 +11,7 @@
     if (!$scope.model.value) {
         $scope.model.value = [];
     }
-    
+
     //add any fields that there isn't values for
     if ($scope.model.config.min > 0) {
         for (var i = 0; i < $scope.model.config.min; i++) {
@@ -21,13 +21,43 @@
         }
     }
 
+    //TODO remove text box only when is empty
+    $scope.addRemoveOnKeyDown = function (event, index) {
+        console.log("Index: " + index);
+        console.log($scope.model.value);
+        console.log("KeyCode: " + event.keyCode);
+        var txtBoxValue = $scope.model.value[index];
+        console.log(txtBoxValue.value);
+        switch (event.keyCode) {
+            case 13:
+                if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
+                    $scope.model.value.push({ value: "" });
+                }
+                break;
+            case 8:
+                var remainder = [];
+                if ($scope.model.value.length > 1) {
+                    if (txtBoxValue.value === "") {
+                        for (var x = 0; x < $scope.model.value.length; x++) {
+                            if (x !== index) {
+                                remainder.push($scope.model.value[x]);
+                            }
+                        }
+                        $scope.model.value = remainder;
+                    }
+                }
+                break;
+            default:
+        }
+    }
+
     $scope.add = function () {
         if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
             $scope.model.value.push({ value: "" });
         }
     };
 
-    $scope.remove = function(index) {
+    $scope.remove = function (index) {
         var remainder = [];
         for (var x = 0; x < $scope.model.value.length; x++) {
             if (x !== index) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index 7aba2d9432..ea7db2b4d5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -3,7 +3,7 @@
     <div ui-sortable="sortableOptions" ng-model="model.value">
         <div class="control-group" ng-repeat="item in model.value">
             <i class="icon icon-navigation handle"></i>
-            <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" />
+            <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" ng-keydown="addRemoveOnKeyDown($event, $index)"/>
             <a prevent-default href="" localize="title" title="@content_removeTextBox"
                ng-show="model.value.length > model.config.min"
                ng-click="remove($index)">

From 193eb259a6c2ac2833654cd67feb5e182dfd4088 Mon Sep 17 00:00:00 2001
From: Robert <robe2006@edu.eal.dk>
Date: Wed, 5 Jul 2017 12:54:59 +0200
Subject: [PATCH 022/145] Add/Remove functionality on key press added

---
 .../multipletextbox.controller.js             | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
index a5924e17d3..cdfe903648 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
@@ -19,19 +19,21 @@
                 $scope.model.value.push({ value: "" });
             }
         }
-    }
+    }
 
-    //TODO remove text box only when is empty
+    //TODO add focus to newly created text box or the first in line after deletion
     $scope.addRemoveOnKeyDown = function (event, index) {
-        console.log("Index: " + index);
-        console.log($scope.model.value);
-        console.log("KeyCode: " + event.keyCode);
         var txtBoxValue = $scope.model.value[index];
-        console.log(txtBoxValue.value);
+
+        var e = angular.element(elem[0].querySelector('[name="item_0"]'));
+
+        console.log(e);
+
         switch (event.keyCode) {
             case 13:
                 if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
-                    $scope.model.value.push({ value: "" });
+                    $scope.model.value.push({ value: "" });
+
                 }
                 break;
             case 8:
@@ -49,7 +51,9 @@
                 break;
             default:
         }
-    }
+    }
+
+
 
     $scope.add = function () {
         if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {

From cc57cd6eb7f427b6f18f00f692920922edd1035e Mon Sep 17 00:00:00 2001
From: Robert <robe2006@edu.eal.dk>
Date: Wed, 5 Jul 2017 12:57:29 +0200
Subject: [PATCH 023/145] Changed to keyup

---
 .../multipletextbox/multipletextbox.controller.js             | 4 ----
 .../propertyeditors/multipletextbox/multipletextbox.html      | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
index cdfe903648..5c476f08af 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
@@ -24,10 +24,6 @@
     //TODO add focus to newly created text box or the first in line after deletion
     $scope.addRemoveOnKeyDown = function (event, index) {
         var txtBoxValue = $scope.model.value[index];
-
-        var e = angular.element(elem[0].querySelector('[name="item_0"]'));
-
-        console.log(e);
 
         switch (event.keyCode) {
             case 13:
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index ea7db2b4d5..e612e2abb5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -3,7 +3,7 @@
     <div ui-sortable="sortableOptions" ng-model="model.value">
         <div class="control-group" ng-repeat="item in model.value">
             <i class="icon icon-navigation handle"></i>
-            <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" ng-keydown="addRemoveOnKeyDown($event, $index)"/>
+            <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" ng-keyup="addRemoveOnKeyDown($event, $index)"/>
             <a prevent-default href="" localize="title" title="@content_removeTextBox"
                ng-show="model.value.length > model.config.min"
                ng-click="remove($index)">

From 3395445d7c74982d51bcd1627cfa7c6c35950a0e Mon Sep 17 00:00:00 2001
From: Robert <robe2006@edu.eal.dk>
Date: Thu, 13 Jul 2017 14:05:50 +0200
Subject: [PATCH 024/145] Newly added text box now get's focused.

---
 .../multipletextbox/multipletextbox.controller.js             | 4 +++-
 .../propertyeditors/multipletextbox/multipletextbox.html      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
index 5c476f08af..9621001d0c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
@@ -29,7 +29,9 @@
             case 13:
                 if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
                     $scope.model.value.push({ value: "" });
-
+
+                    //Focus on the newly added value
+                  $scope.focusMe = true;
                 }
                 break;
             case 8:
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index e612e2abb5..e8ead14bc2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -3,7 +3,7 @@
     <div ui-sortable="sortableOptions" ng-model="model.value">
         <div class="control-group" ng-repeat="item in model.value">
             <i class="icon icon-navigation handle"></i>
-            <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" ng-keyup="addRemoveOnKeyDown($event, $index)"/>
+            <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" ng-keyup="addRemoveOnKeyDown($event, $index)" focus-When="{{focusMe}}"/>
             <a prevent-default href="" localize="title" title="@content_removeTextBox"
                ng-show="model.value.length > model.config.min"
                ng-click="remove($index)">

From 4c9b2f552ac84cad595470ba6a360fba460545ac Mon Sep 17 00:00:00 2001
From: Robert <robe2006@edu.eal.dk>
Date: Fri, 14 Jul 2017 13:30:28 +0200
Subject: [PATCH 025/145] On textbox delete the next in line gets focused

umbfocusbackwards.directive.js file added
---
 .../editor/umbfocusbackwards.directive.js     | 42 +++++++++++++++++++
 .../multipletextbox.controller.js             | 36 +++++++++-------
 .../multipletextbox/multipletextbox.html      | 31 +++++++-------
 3 files changed, 80 insertions(+), 29 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbfocusbackwards.directive.js

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbfocusbackwards.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbfocusbackwards.directive.js
new file mode 100644
index 0000000000..c696c6cb28
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbfocusbackwards.directive.js
@@ -0,0 +1,42 @@
+/**
+@ngdoc directive
+@name umbraco.directives: focusNow
+@restrict A
+
+@description
+Use this directive focus backwards in a list of elements.
+You need to toggle the attribute's value everytime you delete an element to trigger the observe event.
+$scope.focusMe = ($scope.focusMe === true)? false: true;
+
+<h3>Example</h3>
+
+<div ui-sortable="sortableOptions" ng-model="model.value">
+    <div class="control-group" ng-repeat="item in model.value">
+
+      <i class="icon icon-navigation handle"></i>
+      <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" ng-keyup="addRemoveOnKeyDown($event, $index)" focus-Backwards="{{focusMe}}" />
+      <a prevent-default href="" localize="title" title="@content_removeTextBox" ng-show="model.value.length > model.config.min" ng-click="remove($index)">
+       <i class="icon icon-remove"></i>
+
+      </a>
+    </div>
+  </div>
+**/
+angular.module("umbraco").directive("focusBackwards", function ($timeout) {
+    return {
+        restrict: "A",
+        link: function (scope, element, attrs) {
+            attrs.$observe("focusBackwards", function (value) {
+                if (value === "true") {
+                    $timeout(function () {
+                        element.focus();
+                    });
+                } else {
+                    $timeout(function () {
+                        element.focus();
+                    });
+                }
+            });
+        }
+    };
+});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
index 9621001d0c..6582e975e2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
@@ -19,43 +19,50 @@
                 $scope.model.value.push({ value: "" });
             }
         }
-    }
+    }
 
-    //TODO add focus to newly created text box or the first in line after deletion
+    //TODO add focus to newly created text box or the first in line after deletion
     $scope.addRemoveOnKeyDown = function (event, index) {
         var txtBoxValue = $scope.model.value[index];
-
-        switch (event.keyCode) {
+
+        event.preventDefault();
+
+        switch (event.keyCode) {
             case 13:
                 if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
-                    $scope.model.value.push({ value: "" });
-
+                    $scope.model.value.push({ value: "" });
+
                     //Focus on the newly added value
-                  $scope.focusMe = true;
-                }
-                break;
+                    $scope.focusMe = false;
+                }
+                break;
             case 8:
+
                 var remainder = [];
-                if ($scope.model.value.length > 1) {
-                    if (txtBoxValue.value === "") {
+                if ($scope.model.value.length > 1) {
+                    if (txtBoxValue.value === "") {
                         for (var x = 0; x < $scope.model.value.length; x++) {
                             if (x !== index) {
                                 remainder.push($scope.model.value[x]);
                             }
                         }
                         $scope.model.value = remainder;
+
+                        // The role of this statement is to trigger the observe event
+                        $scope.focusMe = ($scope.focusMe === true) ? false : true;
                     }
                 }
                 break;
             default:
-        }
+        }
     }
 
-
+
 
     $scope.add = function () {
         if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
             $scope.model.value.push({ value: "" });
+            $scope.focusMe = false;
         }
     };
 
@@ -67,8 +74,9 @@
             }
         }
         $scope.model.value = remainder;
+        $scope.focusMe = true;
     };
 
 }
 
-angular.module("umbraco").controller("Umbraco.PropertyEditors.MultipleTextBoxController", MultipleTextBoxController);
+angular.module("umbraco").controller("Umbraco.PropertyEditors.MultipleTextBoxController", MultipleTextBoxController);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index e8ead14bc2..483bdee838 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -1,20 +1,21 @@
 <div class="umb-editor umb-multiple-textbox" ng-controller="Umbraco.PropertyEditors.MultipleTextBoxController">
 
-    <div ui-sortable="sortableOptions" ng-model="model.value">
-        <div class="control-group" ng-repeat="item in model.value">
-            <i class="icon icon-navigation handle"></i>
-            <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" ng-keyup="addRemoveOnKeyDown($event, $index)" focus-When="{{focusMe}}"/>
-            <a prevent-default href="" localize="title" title="@content_removeTextBox"
-               ng-show="model.value.length > model.config.min"
-               ng-click="remove($index)">
-                <i class="icon icon-remove"></i>
-            </a>
-        </div>
+  <div ui-sortable="sortableOptions" ng-model="model.value">
+    <div class="control-group" ng-repeat="item in model.value">
+      <i class="icon icon-navigation handle"></i>
+      <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor"
+             ng-keyup="addRemoveOnKeyDown($event, $index)" focus-Backwards="{{focusMe}}" />
+      <a prevent-default href="" localize="title" title="@content_removeTextBox"
+         ng-show="model.value.length > model.config.min"
+         ng-click="remove($index)">
+        <i class="icon icon-remove"></i>
+      </a>
     </div>
-    <a prevent-default href="" localize="title" title="@content_addTextBox"
-       ng-show="model.config.max <= 0 || model.value.length < model.config.max"
-       ng-click="add()">
-        <i class="icon icon-add"></i>
-    </a>
+  </div>
+  <a prevent-default href="" localize="title" title="@content_addTextBox"
+     ng-show="model.config.max <= 0 || model.value.length < model.config.max"
+     ng-click="add()">
+    <i class="icon icon-add"></i>
+  </a>
 
 </div>

From 91646212fd2f6f519206fd84f4ebcae009296c65 Mon Sep 17 00:00:00 2001
From: Robert <robe2006@edu.eal.dk>
Date: Wed, 5 Jul 2017 10:15:23 +0200
Subject: [PATCH 026/145] add/remove functionality on keyDown added

---
 .../multipletextbox.controller.js             | 34 +++++++++++++++++--
 .../multipletextbox/multipletextbox.html      |  2 +-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
index 771d854aae..a5924e17d3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
@@ -11,7 +11,7 @@
     if (!$scope.model.value) {
         $scope.model.value = [];
     }
-    
+
     //add any fields that there isn't values for
     if ($scope.model.config.min > 0) {
         for (var i = 0; i < $scope.model.config.min; i++) {
@@ -21,13 +21,43 @@
         }
     }
 
+    //TODO remove text box only when is empty
+    $scope.addRemoveOnKeyDown = function (event, index) {
+        console.log("Index: " + index);
+        console.log($scope.model.value);
+        console.log("KeyCode: " + event.keyCode);
+        var txtBoxValue = $scope.model.value[index];
+        console.log(txtBoxValue.value);
+        switch (event.keyCode) {
+            case 13:
+                if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
+                    $scope.model.value.push({ value: "" });
+                }
+                break;
+            case 8:
+                var remainder = [];
+                if ($scope.model.value.length > 1) {
+                    if (txtBoxValue.value === "") {
+                        for (var x = 0; x < $scope.model.value.length; x++) {
+                            if (x !== index) {
+                                remainder.push($scope.model.value[x]);
+                            }
+                        }
+                        $scope.model.value = remainder;
+                    }
+                }
+                break;
+            default:
+        }
+    }
+
     $scope.add = function () {
         if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
             $scope.model.value.push({ value: "" });
         }
     };
 
-    $scope.remove = function(index) {
+    $scope.remove = function (index) {
         var remainder = [];
         for (var x = 0; x < $scope.model.value.length; x++) {
             if (x !== index) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index 7aba2d9432..ea7db2b4d5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -3,7 +3,7 @@
     <div ui-sortable="sortableOptions" ng-model="model.value">
         <div class="control-group" ng-repeat="item in model.value">
             <i class="icon icon-navigation handle"></i>
-            <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" />
+            <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" ng-keydown="addRemoveOnKeyDown($event, $index)"/>
             <a prevent-default href="" localize="title" title="@content_removeTextBox"
                ng-show="model.value.length > model.config.min"
                ng-click="remove($index)">

From a8c036749288432f792b7653920f260fbd0604f7 Mon Sep 17 00:00:00 2001
From: Robert <robe2006@edu.eal.dk>
Date: Wed, 5 Jul 2017 12:54:59 +0200
Subject: [PATCH 027/145] Add/Remove functionality on key press added

---
 .../multipletextbox.controller.js             | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
index a5924e17d3..cdfe903648 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
@@ -19,19 +19,21 @@
                 $scope.model.value.push({ value: "" });
             }
         }
-    }
+    }
 
-    //TODO remove text box only when is empty
+    //TODO add focus to newly created text box or the first in line after deletion
     $scope.addRemoveOnKeyDown = function (event, index) {
-        console.log("Index: " + index);
-        console.log($scope.model.value);
-        console.log("KeyCode: " + event.keyCode);
         var txtBoxValue = $scope.model.value[index];
-        console.log(txtBoxValue.value);
+
+        var e = angular.element(elem[0].querySelector('[name="item_0"]'));
+
+        console.log(e);
+
         switch (event.keyCode) {
             case 13:
                 if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
-                    $scope.model.value.push({ value: "" });
+                    $scope.model.value.push({ value: "" });
+
                 }
                 break;
             case 8:
@@ -49,7 +51,9 @@
                 break;
             default:
         }
-    }
+    }
+
+
 
     $scope.add = function () {
         if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {

From 3ba001164f640ddbe0ae0920a7bf1867058517d3 Mon Sep 17 00:00:00 2001
From: Robert <robe2006@edu.eal.dk>
Date: Wed, 5 Jul 2017 12:57:29 +0200
Subject: [PATCH 028/145] Changed to keyup

---
 .../multipletextbox/multipletextbox.controller.js             | 4 ----
 .../propertyeditors/multipletextbox/multipletextbox.html      | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
index cdfe903648..5c476f08af 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
@@ -24,10 +24,6 @@
     //TODO add focus to newly created text box or the first in line after deletion
     $scope.addRemoveOnKeyDown = function (event, index) {
         var txtBoxValue = $scope.model.value[index];
-
-        var e = angular.element(elem[0].querySelector('[name="item_0"]'));
-
-        console.log(e);
 
         switch (event.keyCode) {
             case 13:
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index ea7db2b4d5..e612e2abb5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -3,7 +3,7 @@
     <div ui-sortable="sortableOptions" ng-model="model.value">
         <div class="control-group" ng-repeat="item in model.value">
             <i class="icon icon-navigation handle"></i>
-            <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" ng-keydown="addRemoveOnKeyDown($event, $index)"/>
+            <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" ng-keyup="addRemoveOnKeyDown($event, $index)"/>
             <a prevent-default href="" localize="title" title="@content_removeTextBox"
                ng-show="model.value.length > model.config.min"
                ng-click="remove($index)">

From c94338d2b6d5426e02b0b404584ce4bc156680fa Mon Sep 17 00:00:00 2001
From: Robert <robe2006@edu.eal.dk>
Date: Thu, 13 Jul 2017 14:05:50 +0200
Subject: [PATCH 029/145] Newly added text box now get's focused.

---
 .../multipletextbox/multipletextbox.controller.js             | 4 +++-
 .../propertyeditors/multipletextbox/multipletextbox.html      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
index 5c476f08af..9621001d0c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
@@ -29,7 +29,9 @@
             case 13:
                 if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
                     $scope.model.value.push({ value: "" });
-
+
+                    //Focus on the newly added value
+                  $scope.focusMe = true;
                 }
                 break;
             case 8:
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index e612e2abb5..e8ead14bc2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -3,7 +3,7 @@
     <div ui-sortable="sortableOptions" ng-model="model.value">
         <div class="control-group" ng-repeat="item in model.value">
             <i class="icon icon-navigation handle"></i>
-            <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" ng-keyup="addRemoveOnKeyDown($event, $index)"/>
+            <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" ng-keyup="addRemoveOnKeyDown($event, $index)" focus-When="{{focusMe}}"/>
             <a prevent-default href="" localize="title" title="@content_removeTextBox"
                ng-show="model.value.length > model.config.min"
                ng-click="remove($index)">

From 6ccb822cb5ea73b6cf2a0bfe197743dfae38a6d2 Mon Sep 17 00:00:00 2001
From: Robert <robe2006@edu.eal.dk>
Date: Fri, 14 Jul 2017 13:30:28 +0200
Subject: [PATCH 030/145] On textbox delete the next in line gets focused

umbfocusbackwards.directive.js file added
---
 .../editor/umbfocusbackwards.directive.js     | 42 +++++++++++++++++++
 .../multipletextbox.controller.js             | 36 +++++++++-------
 .../multipletextbox/multipletextbox.html      | 31 +++++++-------
 3 files changed, 80 insertions(+), 29 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbfocusbackwards.directive.js

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbfocusbackwards.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbfocusbackwards.directive.js
new file mode 100644
index 0000000000..c696c6cb28
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbfocusbackwards.directive.js
@@ -0,0 +1,42 @@
+/**
+@ngdoc directive
+@name umbraco.directives: focusNow
+@restrict A
+
+@description
+Use this directive focus backwards in a list of elements.
+You need to toggle the attribute's value everytime you delete an element to trigger the observe event.
+$scope.focusMe = ($scope.focusMe === true)? false: true;
+
+<h3>Example</h3>
+
+<div ui-sortable="sortableOptions" ng-model="model.value">
+    <div class="control-group" ng-repeat="item in model.value">
+
+      <i class="icon icon-navigation handle"></i>
+      <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" ng-keyup="addRemoveOnKeyDown($event, $index)" focus-Backwards="{{focusMe}}" />
+      <a prevent-default href="" localize="title" title="@content_removeTextBox" ng-show="model.value.length > model.config.min" ng-click="remove($index)">
+       <i class="icon icon-remove"></i>
+
+      </a>
+    </div>
+  </div>
+**/
+angular.module("umbraco").directive("focusBackwards", function ($timeout) {
+    return {
+        restrict: "A",
+        link: function (scope, element, attrs) {
+            attrs.$observe("focusBackwards", function (value) {
+                if (value === "true") {
+                    $timeout(function () {
+                        element.focus();
+                    });
+                } else {
+                    $timeout(function () {
+                        element.focus();
+                    });
+                }
+            });
+        }
+    };
+});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
index 9621001d0c..6582e975e2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
@@ -19,43 +19,50 @@
                 $scope.model.value.push({ value: "" });
             }
         }
-    }
+    }
 
-    //TODO add focus to newly created text box or the first in line after deletion
+    //TODO add focus to newly created text box or the first in line after deletion
     $scope.addRemoveOnKeyDown = function (event, index) {
         var txtBoxValue = $scope.model.value[index];
-
-        switch (event.keyCode) {
+
+        event.preventDefault();
+
+        switch (event.keyCode) {
             case 13:
                 if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
-                    $scope.model.value.push({ value: "" });
-
+                    $scope.model.value.push({ value: "" });
+
                     //Focus on the newly added value
-                  $scope.focusMe = true;
-                }
-                break;
+                    $scope.focusMe = false;
+                }
+                break;
             case 8:
+
                 var remainder = [];
-                if ($scope.model.value.length > 1) {
-                    if (txtBoxValue.value === "") {
+                if ($scope.model.value.length > 1) {
+                    if (txtBoxValue.value === "") {
                         for (var x = 0; x < $scope.model.value.length; x++) {
                             if (x !== index) {
                                 remainder.push($scope.model.value[x]);
                             }
                         }
                         $scope.model.value = remainder;
+
+                        // The role of this statement is to trigger the observe event
+                        $scope.focusMe = ($scope.focusMe === true) ? false : true;
                     }
                 }
                 break;
             default:
-        }
+        }
     }
 
-
+
 
     $scope.add = function () {
         if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
             $scope.model.value.push({ value: "" });
+            $scope.focusMe = false;
         }
     };
 
@@ -67,8 +74,9 @@
             }
         }
         $scope.model.value = remainder;
+        $scope.focusMe = true;
     };
 
 }
 
-angular.module("umbraco").controller("Umbraco.PropertyEditors.MultipleTextBoxController", MultipleTextBoxController);
+angular.module("umbraco").controller("Umbraco.PropertyEditors.MultipleTextBoxController", MultipleTextBoxController);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index e8ead14bc2..483bdee838 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -1,20 +1,21 @@
 <div class="umb-editor umb-multiple-textbox" ng-controller="Umbraco.PropertyEditors.MultipleTextBoxController">
 
-    <div ui-sortable="sortableOptions" ng-model="model.value">
-        <div class="control-group" ng-repeat="item in model.value">
-            <i class="icon icon-navigation handle"></i>
-            <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" ng-keyup="addRemoveOnKeyDown($event, $index)" focus-When="{{focusMe}}"/>
-            <a prevent-default href="" localize="title" title="@content_removeTextBox"
-               ng-show="model.value.length > model.config.min"
-               ng-click="remove($index)">
-                <i class="icon icon-remove"></i>
-            </a>
-        </div>
+  <div ui-sortable="sortableOptions" ng-model="model.value">
+    <div class="control-group" ng-repeat="item in model.value">
+      <i class="icon icon-navigation handle"></i>
+      <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor"
+             ng-keyup="addRemoveOnKeyDown($event, $index)" focus-Backwards="{{focusMe}}" />
+      <a prevent-default href="" localize="title" title="@content_removeTextBox"
+         ng-show="model.value.length > model.config.min"
+         ng-click="remove($index)">
+        <i class="icon icon-remove"></i>
+      </a>
     </div>
-    <a prevent-default href="" localize="title" title="@content_addTextBox"
-       ng-show="model.config.max <= 0 || model.value.length < model.config.max"
-       ng-click="add()">
-        <i class="icon icon-add"></i>
-    </a>
+  </div>
+  <a prevent-default href="" localize="title" title="@content_addTextBox"
+     ng-show="model.config.max <= 0 || model.value.length < model.config.max"
+     ng-click="add()">
+    <i class="icon icon-add"></i>
+  </a>
 
 </div>

From 50d711420951ecb3442f1c65c0764896c4ab0efe Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Tue, 18 Jul 2017 00:07:22 +0200
Subject: [PATCH 031/145] Update localization of email

---
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml    | 11 ++++++-----
 src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index bc3fccfd34..c74fd2907b 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -263,7 +263,7 @@
     <key alias="recycleBinIsEmpty">Papirkurven er nu tom</key>
     <key alias="recycleBinWarning">Når elementer slettes fra papirkurven, slettes de for altid</key>
     <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webservice oplever i øjeblikket problemer, vi ikke har kontrol over. Beklager ulejligheden. ]]></key>
-    <key alias="regexSearchHelp">Søg efter et regulært udtryk for at tilføje validering til et formularfelt. Eksempel: 'email', 'zip-code', 'url'</key>
+    <key alias="regexSearchHelp">Søg efter et regulært udtryk for at tilføje validering til et formularfelt. Eksempel: 'e-mail', 'zip-code', 'url'</key>
     <key alias="removeMacro">Fjern makro</key>
     <key alias="requiredField">Obligatorisk</key>
     <key alias="sitereindexed">Sitet er genindekseret</key>
@@ -321,7 +321,8 @@
     <key alias="search">Søg...</key>
     <key alias="filter">Filtrer...</key>
     <key alias="enterTags">Indtast nøgleord (tryk på Enter efter hvert nøgleord)...</key>
-    <key alias="usernameHint">Dit brugernavn er typisk din e-mail adresse</key>
+    <key alias="email">Indtast din e-mail</key>
+    <key alias="usernameHint">Dit brugernavn er typisk din e-mailadresse</key>
   </area>
   <area alias="editcontenttype">
     <key alias="allowAtRoot" version="7.2">Tillad på rodniveau</key>
@@ -421,7 +422,7 @@
     <key alias="edit">Rediger</key>
     <key alias="edited">Redigeret</key>
     <key alias="elements">Elementer</key>
-    <key alias="email">Email</key>
+    <key alias="email">E-mail</key>
     <key alias="error">Fejl</key>
     <key alias="findDocument">Find</key>
     <key alias="height">Højde</key>
@@ -456,7 +457,7 @@
     <key alias="pleasewait">Et øjeblik...</key>
     <key alias="previous">Forrige</key>
     <key alias="properties">Egenskaber</key>
-    <key alias="reciept">Email der skal modtage indhold af formular</key>
+    <key alias="reciept">E-mail der skal modtage indhold af formular</key>
     <key alias="recycleBin">Papirkurv</key>
     <key alias="recycleBinEmpty">Din papirkurv er tom</key>
     <key alias="remaining">Mangler</key>
@@ -1268,7 +1269,7 @@ Mange hilsner fra Umbraco robotten
   </area>
   <area alias="validation">
     <key alias="validation">Validation</key>
-    <key alias="validateAsEmail">Valider som email</key>
+    <key alias="validateAsEmail">Valider som e-mail</key>
     <key alias="validateAsNumber">Valider som tal</key>
     <key alias="validateAsUrl">Valider som Url</key>
     <key alias="enterCustomValidation">...eller indtast din egen validering</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index c099c4e1a8..8df120b28e 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -351,8 +351,8 @@
     <key alias="filter">Type to filter...</key>
     <key alias="enterTags">Type to add tags (press enter after each tag)...</key>
     <key alias="email">Enter your email</key>
+    <key alias="usernameHint">Your username is usually your email</key>
   </area>
-
   <area alias="editcontenttype">
     <key alias="allowAtRoot" version="7.2">Allow at root</key>
     <key alias="allowAtRootDesc" version="7.2">Only Content Types with this checked can be created at the root level of Content and Media trees</key>

From 2c64f91b258ffe1c0d101677bb010ba91455fa44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Gregersen?= <soreng@gmail.com>
Date: Wed, 19 Jul 2017 22:23:22 +0200
Subject: [PATCH 032/145] Changed name of argument in validation

Minor change... :)
---
 src/Umbraco.Core/PropertyEditors/PropertyEditorAttribute.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/PropertyEditors/PropertyEditorAttribute.cs b/src/Umbraco.Core/PropertyEditors/PropertyEditorAttribute.cs
index 41e4ccc74e..ec87af29ad 100644
--- a/src/Umbraco.Core/PropertyEditors/PropertyEditorAttribute.cs
+++ b/src/Umbraco.Core/PropertyEditors/PropertyEditorAttribute.cs
@@ -26,7 +26,7 @@ namespace Umbraco.Core.PropertyEditors
 
         public PropertyEditorAttribute(string alias, string name)
         {
-            Mandate.ParameterNotNullOrEmpty(alias, "id");
+            Mandate.ParameterNotNullOrEmpty(alias, "alias");
             Mandate.ParameterNotNullOrEmpty(name, "name");
 
             Alias = alias;
@@ -82,4 +82,4 @@ namespace Umbraco.Core.PropertyEditors
         /// </summary>
         public string Group { get; set; }
     }
-}
\ No newline at end of file
+}

From 74e16c0f8d16976bca43b40dca4703d19fa0df6b Mon Sep 17 00:00:00 2001
From: pijemcolu <mklstmnk@gmail.com>
Date: Fri, 21 Jul 2017 10:14:07 +0200
Subject: [PATCH 033/145] fix link to training in Settings->Dashboard

---
 .../src/views/dashboard/developer/developerdashboardintro.html  | 2 +-
 .../src/views/dashboard/settings/settingsdashboardintro.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html
index 6ced082c06..9b7f1433e3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html
@@ -10,5 +10,5 @@
     <li>Find an add-on <a class="btn-link -underline href="http://our.umbraco.org/projects" target="_blank">package</a> to help you get going quickly</li>
     <li>Watch our <a class="btn-link -underline href="http://umbraco.tv" target="_blank">tutorial videos</a> (some are free, some require a subscription)</li>
     <li>Find out about our <a class="btn-link -underline href="http://umbraco.org/products" target="_blank">productivity boosting tools and commercial support</a></li>
-    <li>Find out about real-life <a class="btn-link -underline href="http://umbraco.org/training/training-schedule" target="_blank">training and certification</a> opportunities</li>
+    <li>Find out about real-life <a class="btn-link -underline href="http://umbraco.org/training/" target="_blank">training and certification</a> opportunities</li>
 </ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
index 3a45776872..d59d10d393 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
@@ -10,5 +10,5 @@
 <li>Ask a question in the <a class="btn-link -underline" href="https://our.umbraco.org/" target="_blank">Community Forum</a></li>
 <li>Watch our <a class="btn-link -underline" href="http://umbraco.tv" target="_blank">tutorial videos</a> (some are free, some require a subscription)</li>
 <li>Find out about our <a class="btn-link -underline" href="http://umbraco.com/products-and-support" target="_blank">productivity boosting tools and commercial support</a></li>
-<li>Find out about real-life <a class="btn-link -underline" href="http://umbraco.com/products/training/schedule" target="_blank">training and certification</a> opportunities</li>
+<li>Find out about real-life <a class="btn-link -underline" href="http://umbraco.com/training/" target="_blank">training and certification</a> opportunities</li>
 </ul>

From e0c891719fd95ca7b6707000fa4729354d610b7d Mon Sep 17 00:00:00 2001
From: akierczynska <anna.kierczynska91@gmail.com>
Date: Mon, 24 Jul 2017 00:04:11 +0100
Subject: [PATCH 034/145] Update pl.xml to match en.xml

Updating pl.xml with new keys to match en.xml
---
 src/Umbraco.Web.UI/umbraco/config/lang/pl.xml | 86 ++++++++++++++++++-
 1 file changed, 83 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
index 30e4f3039c..e1af9412a3 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
@@ -177,6 +177,8 @@ także do obecnego węzła, o ile poniższa domena również do niego należy.]]
     <key alias="target" version="7.0">Cel</key>
     <key alias="scheduledPublishServerTime">Oznacza to następującą godzinę na serwerze:</key>
     <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.org/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">Co to oznacza?</a>]]></key>
+    <key alias="addTextBox">Dodaj kolejne pole tekstowe</key>
+    <key alias="removeTextBox">Usuń te pole tekstowe</key> 
   </area>
   <area alias="media">
     <key alias="clickToUpload">Kliknij, aby załadować plik</key>
@@ -304,6 +306,7 @@ także do obecnego węzła, o ile poniższa domena również do niego należy.]]
     <key alias="linkToPage">Link do strony</key>
     <key alias="openInNewWindow">Otwórz zlinkowany dokument w nowym oknie lub zakładce</key>
     <key alias="linkToMedia">Link do mediów</key>
+    <key alias="linkToFile">Link do plików</key>
     <key alias="selectMedia">Wybierz media</key>
     <key alias="selectIcon">Wybierz ikonę</key>
     <key alias="selectItem">Wybierz element</key>
@@ -323,6 +326,7 @@ także do obecnego węzła, o ile poniższa domena również do niego należy.]]
     <key alias="unLinkYour">Odlinkuj swój</key>
     <key alias="account">konto</key>
     <key alias="selectEditor">Wybierz edytora</key>
+    <key alias="selectSnippet">Wybierz snippet</key>
   </area>
   <area alias="dictionaryItem">
     <key alias="description"><![CDATA[
@@ -380,6 +384,13 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
     <key alias="rteRelatedStylesheets">Powiązane arkusze stylów</key>
     <key alias="rteShowLabel">Pokaż etykietę</key>
     <key alias="rteWidthAndHeight">Szerokość i wysokość</key>
+    <key alias="allPropTypes">Wszystkie typy właściwości &amp; dane właściwości</key>
+    <key alias="willBeDeleted">używające tego typu danych zostaną usunięte na zawsze, potwierdź, że chcesz je także usunąć</key>
+    <key alias="yesDelete">Tak, usuń</key>
+    <key alias="andAllRelated">i wszystkie typy właściwości &amp; dane właściwości używające tego typu danych/key>
+    <key alias="selectFolder">Wybierz folder do przeniesienia</key>
+    <key alias="inTheTree">do w strukturze drzewa poniżej</key>
+    <key alias="wasMoved">został przeniesiony poniżej</key>
   </area>
   <area alias="errorHandling">
     <key alias="errorButDataWasSaved">Dane zostały zapisane, lecz wystąpiły błędy, które musisz poprawić przed publikacją strony:</key>
@@ -438,6 +449,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
     <key alias="closewindow">Zamknij okno</key>
     <key alias="comment">Komentarz</key>
     <key alias="confirm">Potwierdzenie</key>
+    <key alias="constrain">Zachowaj</key>
     <key alias="constrainProportions">Zachowaj proporcje</key>
     <key alias="continue">Kontynuuj</key>
     <key alias="copy">Kopiuj</key>
@@ -449,6 +461,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
     <key alias="deleted">Usunięto</key>
     <key alias="deleting">Usuwanie...</key>
     <key alias="design">Wygląd</key>
+    <key alias="dictionary">Słownik</key>
     <key alias="dimensions">Rozmiary</key>
     <key alias="down">Dół</key>
     <key alias="download">Pobierz</key>
@@ -458,6 +471,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
     <key alias="email">Email</key>
     <key alias="error">Błąd</key>
     <key alias="findDocument">Znajdź</key>
+    <key alias="first">Pierwszy</key>
     <key alias="height">Wysokość</key>
     <key alias="help">Pomoc</key>
     <key alias="icon">Ikona</key>
@@ -468,7 +482,8 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
     <key alias="invalid">Nieprawidłowe</key>
     <key alias="justify">Wyrównaj</key>
     <key alias="language">Język</key>
-    <key alias="layout">układ</key>
+    <key alias="last">Ostatni</key>
+    <key alias="layout">Układ</key>
     <key alias="loading">Ładowanie</key>
     <key alias="locked">Zablokowany</key>
     <key alias="login">Zaloguj</key>
@@ -495,9 +510,11 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
     <key alias="reciept">E-mail, aby otrzymywać dane z formularzy</key>
     <key alias="recycleBin">Kosz</key>
     <key alias="remaining">Pozostało</key>
+    <key alias="remove">Usuń</key>
     <key alias="rename">Zmień nazwę</key>
     <key alias="renew">Odnów</key>
     <key alias="required" version="7.0">Wymagany</key>
+    <key alias="retrieve">Odzyskaj</key>
     <key alias="retry">Ponów próbę</key>
     <key alias="rights">Uprawnienia</key>
     <key alias="search">Szukaj</key>
@@ -806,6 +823,39 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
       Wskaż pakiet z Twojego komputera, poprzez kliknięcie na przycisk "Przeglądaj"<br /> 
       i wskaż gdzie jest zapisany. Pakiety Umbraco przeważnie posiadają rozszerzenie ".umb" lub ".zip".
       ]]></key>
+    <key alias="dropHere">Upuść, aby załadować</key>
+    <key alias="orClickHereToUpload">lub kliknij tutaj, aby wybrać pliki</key>
+    <key alias="uploadPackage">Załaduj pakiet</key>
+    <key alias="localPackageDescription">Zainstaluj lokalny pakiet poprzez wybranie go ze swojego komputera. Instaluj jedynie te pakiety, z zaufanych i znanych Tobie źródeł</key>
+    <key alias="uploadAnother">Załaduj kolejny pakiet</key>
+    <key alias="cancelAndUploadAnother">Anuluj i załaduj kolejny pakiet</key>
+    <key alias="packageLicense">Licencja</key>
+    <key alias="accept">Zgadzam się</key>
+    <key alias="termsOfUse">zasady użytkowania</key>
+    <key alias="packageInstall">Zainstaluj pakiet</key>
+    <key alias="installFinish">Zakończ</key>
+    <key alias="installedPackages">Zainstalowane pakiety</key>
+    <key alias="noPackages">Nie masz żadnych zainstalowanych pakietów</key>
+    <key alias="noPackagesDescription"><![CDATA[Nie masz żadnych zainstalowanych pakietów. Zainstaluj lokalny pakiet poprzez wybranie go ze swojego komputera lub przeglądaj dostępne pakiety, używając ikony <strong>'Pakiety'</strong> w prawym górnym rogu ekranu]]></key>
+    <key alias="packageSearch">Szukaj pakietów</key>
+    <key alias="packageSearchResults">Wyniki dla</key>
+    <key alias="packageNoResults">Nie mogliśmy znaleźć niczego dla</key>
+    <key alias="packageNoResultsDescription">Spróbuj wyszukać kolejny pakiet lub przeszukaj kategorie pakietów</key>
+    <key alias="packagesPopular">Popularne</key>
+    <key alias="packagesNew">Nowe wydania</key>
+    <key alias="packageHas">ma</key>
+    <key alias="packageKarmaPoints">punktów karmy</key>
+    <key alias="packageInfo">Informacja</key>
+    <key alias="packageOwner">Właściciel</key>
+    <key alias="packageContrib">Kontrybutor</key>
+    <key alias="packageCreated">Utworzone</key>
+    <key alias="packageCurrentVersion">Obecna wersja</key>
+    <key alias="packageNetVersion">wersja .NET</key>
+    <key alias="packageDownloads">Pobrania</key>
+    <key alias="packageLikes">Polubienia</key>
+    <key alias="packageCompatibility">Zgodność</key>
+    <key alias="packageCompatibilityDescription">Według raportów członków społeczności, ten pakiet jest zgodny z następującymi wersjami Umbraco. Pełna zgodność nie może być zagwarantowana dla wersji zaraportowanych poniżej 100%</key>
+    <key alias="packageExternalSources">Zewnętrzne źródła</key>
     <key alias="packageAuthor">Autor</key>
     <key alias="packageDemonstration">Demonstracja</key>
     <key alias="packageDocumentation">Dokumentacja</key>
@@ -841,6 +891,7 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
     <key alias="installStateRestarting">Restartowanie, proszę czekać...</key>
     <key alias="installStateComplete">Wszystko skończone, Twoja przeglądarka się teraz odświeży, proszę czekać...</key>
     <key alias="installStateCompleted">Proszę kliknąć Zakończ, aby zakończyć instalację i przeładować stronę.</key>
+    <key alias="installStateUploading">Wgrywanie pakietu...</key>
   </area>
   <area alias="paste">
     <key alias="doNothing">Wklej z zachowaniem formatowania (Nie zalecane)</key>
@@ -908,6 +959,10 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
   </area>
   <area alias="imagecropper">
     <key alias="reset">Resetuj</key>
+    <key alias="defineCrop">Zdefiniuj przycięcie</key>
+    <key alias="defineCropDescription">Ustaw alias dla przycięcia, a także jego domyślną szerokość i długość</key>
+    <key alias="saveCrop">Zapisz przycięcie</key>
+    <key alias="addCrop">Dodaj nowe przycięcie</key>
   </area>
   <area alias="rollback">
     <key alias="currentVersion">Aktualna wersja</key>
@@ -1116,6 +1171,7 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
     
     
     <key alias="queryBuilder">Konstruktor zapytań</key>
+    <key alias="buildQuery">Zbuduj zapytanie</key>
     <key alias="itemsReturned">Element zwrócony, w</key>
 
     <key alias="iWant">Chcę</key>   
@@ -1261,25 +1317,36 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
   </area>
       
   <area alias="templateEditor">
+    <key alias="addFallbackField">Dodaj pole zastępcze</key>
+    <key alias="fallbackField">Pole zastępcze</key>
+    <key alias="addDefaultValue">Dodaj domyślną wartość</key>
+    <key alias="defaultValue">Domyślna wartość</key>
     <key alias="alternativeField">Pole alternatywne</key>
     <key alias="alternativeText">Tekst alternatywny</key>
     <key alias="casing">Wielkość liter</key>
     <key alias="encoding">Kodowanie</key>
     <key alias="chooseField">Wybierz pole</key>
     <key alias="convertLineBreaks">Konwertuj złamania wiersza</key>
+    <key alias="convertLineBreaksDescription">Tak, konwertuj złamania wiersza</key>
     <key alias="convertLineBreaksHelp">Zamienia złamania wiersza na html-tag &amp;lt;br&amp;gt;</key>
     <key alias="customFields">Niestandardowe Pola</key>
     <key alias="dateOnly">Tak, tylko data</key>
+    <key alias="formatAndEncoding">Format i kodowanie</key>
     <key alias="formatAsDate">Formatuj jako datę</key>
+    <key alias="formatAsDateDescr">Formatuj wartość jako datę lub jako datę i czas, zgodnie z aktywną kulturą</key>
     <key alias="htmlEncode">Kodowanie HTML</key>
     <key alias="htmlEncodeHelp">Zamienia znaki specjalne na ich odpowiedniki HTML</key>
     <key alias="insertedAfter">Zostanie wstawione za wartością pola</key>
     <key alias="insertedBefore">Zostanie wstawione przed wartością pola</key>
     <key alias="lowercase">małe znaki</key>
+    <key alias="modifyOutput">Modyfikuj dane wyjściowe</key>
     <key alias="none">Nic</key>
+    <key alias="outputSample">Próbka danych wyjściowych</key>
     <key alias="postContent">Wstaw za polem</key>
     <key alias="preContent">Wstaw przed polem</key>
     <key alias="recursive">Rekurencyjne</key>
+    <key alias="recursiveDescr">Tak, spraw, aby było to rekurencyjne</key>
+    <key alias="separator">Separator</key>
     <key alias="standardFields">Standardowe Pola</key>
     <key alias="uppercase">Wielkie litery</key>
     <key alias="urlEncode">Kodowanie URL</key>
@@ -1429,6 +1496,14 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
       <key alias="validateAsUrl">Waliduj jako URL</key>
       <key alias="enterCustomValidation">...lub wpisz niestandardową walidację</key>
       <key alias="fieldIsMandatory">Pole jest wymagane</key>
+    <key alias="validationRegExp">Wprowadź wyrażenie regularne</key>
+    <key alias="minCount">Musisz dodać przynajmniej</key>
+    <key alias="maxCount">Możesz mieć jedynie</key>
+    <key alias="items">elementy</key>
+    <key alias="itemsSelected">wybrane elementy</key>
+    <key alias="invalidDate">Niepoprawna data</key>
+    <key alias="invalidNumber">To nie jest numer</key>
+    <key alias="invalidEmail">Niepoprawny e-mail</key>
   </area>
   <area alias="healthcheck">
 	  <!-- Następujące klucze spowodują, że tokeny zostaną przekazane:
@@ -1472,8 +1547,10 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
 	  <key alias="xmlDataIntegrityCheckMedia">Media - Suma XML: %0%, Suma: %1%, Suma niepoprawnych: %2%</key>
 	  <key alias="xmlDataIntegrityCheckContent">Zawartość - Suma XML: %0%, Suma opublikowanych: %1%, Suma niepoprawnych: %2%</key>
 
-	  <key alias="httpsCheckValidCertificate">Certifikat Twojej strony został oznaczony jako poprawny.</key>
+	  <key alias="httpsCheckValidCertificate">Certifikat Twojej strony jest poprawny.</key>
 	  <key alias="httpsCheckInvalidCertificate">Błąd walidacji certyfikatu: '%0%'</key>
+    <key alias="httpsCheckExpiredCertificate">Certyfikat SSL Twojej strony wygasł.</key>
+    <key alias="httpsCheckExpiringCertificate">Certyfikat SSL Twojej strony wygaśnie za %0% dni.</key>
 	  <key alias="httpsCheckInvalidUrl">Błąd pingowania adresu URL %0% - '%1%'</key>
 	  <key alias="httpsCheckIsCurrentSchemeHttps">Oglądasz %0% stronę używając HTTPS.</key>
 	  <key alias="httpsCheckConfigurationRectifyNotPossible">appSetting 'umbracoUseSSL' został ustawiony na 'false' w Twoim pliku web.config. Po uzyskaniu dostępu do strony, używając HTTPS, powinieneś go ustawić na 'true'.</key>
@@ -1552,5 +1629,8 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
   </area>
   <area alias="emptyStates">
     <key alias="emptyDictionaryTree">Brak elementów słownika do wyboru</key>
-  </area>    
+  </area>
+    <area alias="textbox">
+    <key alias="characters_left">pozostało znaków</key>
+  </area>
 </language>

From db2a35dbcee919ed54eb25bdf0de53f2f983bb73 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 24 Jul 2017 20:23:54 +1000
Subject: [PATCH 035/145] fixes a localized key that doesn't exist

---
 .../src/views/packager/views/install-local.html                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html
index b265a346b3..f548a29308 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html
@@ -90,7 +90,7 @@
 
         <umb-editor-sub-header>
             <umb-editor-sub-header-content-left>
-                <a class="umb-package-details__back-link" href="" ng-click="vm.state = 'upload'">&larr; <localize key="packager_cancelAndAnother">Cancel and upload another package</localize></a>
+                <a class="umb-package-details__back-link" href="" ng-click="vm.state = 'upload'">&larr; <localize key="packager_cancelAndUploadAnother">Cancel and upload another package</localize></a>
             </umb-editor-sub-header-content-left>
         </umb-editor-sub-header>
 

From c5e7e1e39e329bd94a7afc8c172d3039c7729e1f Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 24 Jul 2017 14:05:04 +0200
Subject: [PATCH 036/145] U4-10144 - dont break again

---
 .../Trees/FileSystemTreeController.cs         | 100 +++++---------
 .../Trees/FileSystemTreeController2.cs        | 127 ------------------
 .../Trees/PartialViewMacrosTreeController.cs  |   2 +-
 .../Trees/PartialViewsTreeController.cs       |   2 +-
 src/Umbraco.Web/Trees/ScriptTreeController.cs |   2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   3 +-
 6 files changed, 40 insertions(+), 196 deletions(-)
 delete mode 100644 src/Umbraco.Web/Trees/FileSystemTreeController2.cs

diff --git a/src/Umbraco.Web/Trees/FileSystemTreeController.cs b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
index 0d612b5d4e..4f414a941d 100644
--- a/src/Umbraco.Web/Trees/FileSystemTreeController.cs
+++ b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
@@ -1,18 +1,21 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Net.Http.Formatting;
 using umbraco.BusinessLogic.Actions;
 using Umbraco.Core;
 using Umbraco.Core.IO;
-using Umbraco.Web.Models.Trees;
 using Umbraco.Core.Services;
+using Umbraco.Web.Models.Trees;
+using System.Web;
 
 namespace Umbraco.Web.Trees
 {
     public abstract class FileSystemTreeController : TreeController
     {
-        protected abstract string FilePath { get; }
-        protected abstract string FileSearchPattern { get; }
+        protected abstract IFileSystem2 FileSystem { get; }
+        protected abstract string[] Extensions { get; }
+        protected abstract string FileIcon { get; }
 
         /// <summary>
         /// Inheritors can override this method to modify the file node that is created.
@@ -28,64 +31,39 @@ namespace Umbraco.Web.Trees
 
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
         {
-            var orgPath = "";
-            string path;
-            if (string.IsNullOrEmpty(id) == false && id != "-1")
-            {
-                orgPath = id;
-                path = IOHelper.MapPath(FilePath + "/" + orgPath);
-                orgPath += "/";
-            }
-            else
-            {
-                path = IOHelper.MapPath(FilePath);
-            }
+            var path = string.IsNullOrEmpty(id) == false && id != Constants.System.Root.ToInvariantString()
+                ? HttpUtility.UrlDecode(id).TrimStart("/")
+                : "";
 
-            var dirInfo = new DirectoryInfo(path);
-            var dirInfos = dirInfo.GetDirectories();
+            var directories = FileSystem.GetDirectories(path);
 
             var nodes = new TreeNodeCollection();
-            foreach (var dir in dirInfos)
+            foreach (var directory in directories)
             {
-                if ((dir.Attributes & FileAttributes.Hidden) != 0)
-                    continue;
-
-                var hasChildren = dir.GetFiles().Length > 0 || dir.GetDirectories().Length > 0;
-                var node = CreateTreeNode(orgPath + dir.Name, orgPath, queryStrings, dir.Name, "icon-folder", hasChildren);
+                var hasChildren = FileSystem.GetFiles(directory).Any() || FileSystem.GetDirectories(directory).Any();
 
+                var name = Path.GetFileName(directory);
+                var node = CreateTreeNode(HttpUtility.UrlEncode(directory), path, queryStrings, name, "icon-folder", hasChildren);
                 OnRenderFolderNode(ref node);
-                if (node != null)
+                if(node != null)
                     nodes.Add(node);
             }
 
             //this is a hack to enable file system tree to support multiple file extension look-up
             //so the pattern both support *.* *.xml and xml,js,vb for lookups
-            var allowedExtensions = new string[0];
-            var filterByMultipleExtensions = FileSearchPattern.Contains(",");
-            FileInfo[] fileInfo;
-
-            if (filterByMultipleExtensions)
+            var files = FileSystem.GetFiles(path).Where(x =>
             {
-                fileInfo = dirInfo.GetFiles();
-                allowedExtensions = FileSearchPattern.ToLower().Split(',');
-            }
-            else
-                fileInfo = dirInfo.GetFiles(FileSearchPattern);
+                var extension = Path.GetExtension(x);
+                return extension != null && Extensions.Contains(extension.Trim('.'), StringComparer.InvariantCultureIgnoreCase);
+            });
 
-            foreach (var file in fileInfo)
+            foreach (var file in files)
             {
-                if ((file.Attributes & FileAttributes.Hidden) != 0)
-                    continue;
-
-                if (filterByMultipleExtensions && Array.IndexOf(allowedExtensions, file.Extension.ToLower().Trim('.')) < 0)
-                    continue;
-
-                var withoutExt = Path.GetFileNameWithoutExtension(file.Name);
-                if (withoutExt.IsNullOrWhiteSpace())
-                    continue;
-
-                var node = CreateTreeNode(orgPath + file.Name, orgPath, queryStrings, file.Name, "icon-file", false);
+                var withoutExt = Path.GetFileNameWithoutExtension(file);
+                if (withoutExt.IsNullOrWhiteSpace()) continue;
 
+                var name = Path.GetFileName(file);
+                var node = CreateTreeNode(HttpUtility.UrlEncode(file), path, queryStrings, name, FileIcon, false);
                 OnRenderFileNode(ref node);
                 if (node != null)
                     nodes.Add(node);
@@ -111,27 +89,22 @@ namespace Umbraco.Web.Trees
                 return menu;
             }
 
-            string path;
-            if (string.IsNullOrEmpty(id) == false)
-            {
-                var orgPath = System.Web.HttpUtility.UrlDecode(id);
-                path = IOHelper.MapPath(FilePath + "/" + orgPath);
-            }
-            else
-            {
-                path = IOHelper.MapPath(FilePath);
-            }
+            var path = string.IsNullOrEmpty(id) == false && id != Constants.System.Root.ToInvariantString()
+                ? HttpUtility.UrlDecode(id).TrimStart("/")
+                : "";
 
-            var dirInfo = new DirectoryInfo(path);
-            //check if it's a directory
-            if (dirInfo.Attributes == FileAttributes.Directory)
+            var isFile = FileSystem.FileExists(path);
+            var isDirectory = FileSystem.DirectoryExists(path);
+
+            if (isDirectory)
             {
                 //set the default to create
                 menu.DefaultMenuAlias = ActionNew.Instance.Alias;
                 //create action
                 menu.Items.Add<ActionNew>(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias)));
-                
-                var hasChildren = dirInfo.GetFiles().Length > 0 || dirInfo.GetDirectories().Length > 0;
+
+                var hasChildren = FileSystem.GetFiles(path).Any() || FileSystem.GetDirectories(path).Any();
+
                 //We can only delete folders if it doesn't have any children (folders or files)
                 if (hasChildren == false)
                 {
@@ -142,10 +115,9 @@ namespace Umbraco.Web.Trees
                 //refresh action
                 menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true);
             }
-            //if it's not a directory then we only allow to delete the item
-            else
+            else if (isFile)
             {
-                //delete action
+                //if it's not a directory then we only allow to delete the item
                 menu.Items.Add<ActionDelete>(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias)));
             }
 
diff --git a/src/Umbraco.Web/Trees/FileSystemTreeController2.cs b/src/Umbraco.Web/Trees/FileSystemTreeController2.cs
deleted file mode 100644
index d43d68ee77..0000000000
--- a/src/Umbraco.Web/Trees/FileSystemTreeController2.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net.Http.Formatting;
-using umbraco.BusinessLogic.Actions;
-using Umbraco.Core;
-using Umbraco.Core.IO;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.Trees;
-using System.Web;
-
-namespace Umbraco.Web.Trees
-{
-    public abstract class FileSystemTreeController2 : TreeController
-    {
-        protected abstract IFileSystem2 FileSystem { get; }
-        protected abstract string[] Extensions { get; }
-        protected abstract string FileIcon { get; }
-
-        /// <summary>
-        /// Inheritors can override this method to modify the file node that is created.
-        /// </summary>
-        /// <param name="treeNode"></param>
-        protected virtual void OnRenderFileNode(ref TreeNode treeNode) { }
-
-        /// <summary>
-        /// Inheritors can override this method to modify the folder node that is created.
-        /// </summary>
-        /// <param name="treeNode"></param>
-        protected virtual void OnRenderFolderNode(ref TreeNode treeNode) { }
-
-        protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
-        {
-            var path = string.IsNullOrEmpty(id) == false && id != Constants.System.Root.ToInvariantString()
-                ? HttpUtility.UrlDecode(id).TrimStart("/")
-                : "";
-
-            var directories = FileSystem.GetDirectories(path);
-
-            var nodes = new TreeNodeCollection();
-            foreach (var directory in directories)
-            {
-                var hasChildren = FileSystem.GetFiles(directory).Any() || FileSystem.GetDirectories(directory).Any();
-
-                var name = Path.GetFileName(directory);
-                var node = CreateTreeNode(HttpUtility.UrlEncode(directory), path, queryStrings, name, "icon-folder", hasChildren);
-                OnRenderFolderNode(ref node);
-                if(node != null)
-                    nodes.Add(node);
-            }
-
-            //this is a hack to enable file system tree to support multiple file extension look-up
-            //so the pattern both support *.* *.xml and xml,js,vb for lookups
-            var files = FileSystem.GetFiles(path).Where(x =>
-            {
-                var extension = Path.GetExtension(x);
-                return extension != null && Extensions.Contains(extension.Trim('.'), StringComparer.InvariantCultureIgnoreCase);
-            });
-
-            foreach (var file in files)
-            {
-                var withoutExt = Path.GetFileNameWithoutExtension(file);
-                if (withoutExt.IsNullOrWhiteSpace()) continue;
-
-                var name = Path.GetFileName(file);
-                var node = CreateTreeNode(HttpUtility.UrlEncode(file), path, queryStrings, name, FileIcon, false);
-                OnRenderFileNode(ref node);
-                if (node != null)
-                    nodes.Add(node);
-            }
-
-            return nodes;
-        }
-
-        protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings)
-        {
-            var menu = new MenuItemCollection();
-
-            //if root node no need to visit the filesystem so lets just create the menu and return it
-            if (id == Constants.System.Root.ToInvariantString())
-            {
-                //set the default to create
-                menu.DefaultMenuAlias = ActionNew.Instance.Alias;
-                //create action
-                menu.Items.Add<ActionNew>(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias)));
-                //refresh action
-                menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true);
-
-                return menu;
-            }
-
-            var path = string.IsNullOrEmpty(id) == false && id != Constants.System.Root.ToInvariantString()
-                ? HttpUtility.UrlDecode(id).TrimStart("/")
-                : "";
-
-            var isFile = FileSystem.FileExists(path);
-            var isDirectory = FileSystem.DirectoryExists(path);
-
-            if (isDirectory)
-            {
-                //set the default to create
-                menu.DefaultMenuAlias = ActionNew.Instance.Alias;
-                //create action
-                menu.Items.Add<ActionNew>(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias)));
-
-                var hasChildren = FileSystem.GetFiles(path).Any() || FileSystem.GetDirectories(path).Any();
-
-                //We can only delete folders if it doesn't have any children (folders or files)
-                if (hasChildren == false)
-                {
-                    //delete action
-                    menu.Items.Add<ActionDelete>(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias)), true);
-                }
-
-                //refresh action
-                menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true);
-            }
-            else if (isFile)
-            {
-                //if it's not a directory then we only allow to delete the item
-                menu.Items.Add<ActionDelete>(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias)));
-            }
-
-            return menu;
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
index ba4724aead..54c5150676 100644
--- a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
+++ b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.Trees
     /// Tree for displaying partial view macros in the developer app
     /// </summary>
     [Tree(Constants.Applications.Developer, "partialViewMacros", null, sortOrder: 6)]
-    public class PartialViewMacrosTreeController : FileSystemTreeController2
+    public class PartialViewMacrosTreeController : FileSystemTreeController
     {
         protected override IFileSystem2 FileSystem
         {
diff --git a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
index bf4ec65a2e..67195cf37c 100644
--- a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
+++ b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.Trees
     /// Tree for displaying partial views in the settings app
     /// </summary>
     [Tree(Constants.Applications.Settings, "partialViews", null, sortOrder: 2)]
-    public class PartialViewsTreeController : FileSystemTreeController2
+    public class PartialViewsTreeController : FileSystemTreeController
     {
         protected override IFileSystem2 FileSystem
         {
diff --git a/src/Umbraco.Web/Trees/ScriptTreeController.cs b/src/Umbraco.Web/Trees/ScriptTreeController.cs
index cb9954019b..2e4c25c656 100644
--- a/src/Umbraco.Web/Trees/ScriptTreeController.cs
+++ b/src/Umbraco.Web/Trees/ScriptTreeController.cs
@@ -5,7 +5,7 @@ using Umbraco.Web.Models.Trees;
 namespace Umbraco.Web.Trees
 {
     [Tree(Constants.Applications.Settings, "scripts", null, sortOrder: 4)]
-    public class ScriptTreeController : FileSystemTreeController2
+    public class ScriptTreeController : FileSystemTreeController
     {
         protected override IFileSystem2 FileSystem
         {
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0eb3a2a27c..0048ef01f9 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -435,7 +435,6 @@
     <Compile Include="Security\Identity\PreviewAuthenticationMiddleware.cs" />
     <Compile Include="SingletonHttpContextAccessor.cs" />
     <Compile Include="Trees\ContentTypeTreeController.cs" />
-    <Compile Include="Trees\FileSystemTreeController.cs" />
     <Compile Include="Trees\PackagesTreeController.cs" />
     <Compile Include="Trees\MediaTypeTreeController.cs" />
     <Compile Include="Trees\MemberTypeTreeController.cs" />
@@ -713,7 +712,7 @@
     <Compile Include="TagQuery.cs" />
     <Compile Include="Trees\CoreTreeAttribute.cs" />
     <Compile Include="Trees\DataTypeTreeController.cs" />
-    <Compile Include="Trees\FileSystemTreeController2.cs" />
+    <Compile Include="Trees\FileSystemTreeController.cs" />
     <Compile Include="Trees\LanguageTreeController.cs" />
     <Compile Include="Trees\LegacyBaseTreeAttribute.cs" />
     <Compile Include="Trees\MemberTreeController.cs" />

From 1ccc8cc161e76ac68cfc4ca6711e6bcba13b805b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 25 Jul 2017 19:40:30 +1000
Subject: [PATCH 037/145] U4-10123 Make sure the backoffice login is not
 susceptible to DOS attacks

---
 src/Umbraco.Web/Models/LoginModel.cs          |  3 +-
 .../FormsAuthenticationSecureDataFormat.cs    | 30 +++++++++++++------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web/Models/LoginModel.cs b/src/Umbraco.Web/Models/LoginModel.cs
index 650fa067a3..5e6b2e5c18 100644
--- a/src/Umbraco.Web/Models/LoginModel.cs
+++ b/src/Umbraco.Web/Models/LoginModel.cs
@@ -10,7 +10,8 @@ namespace Umbraco.Web.Models
         public string Username { get; set; }
 
         [Required]
-        [DataMember(Name = "password", IsRequired = true)]
+        [DataMember(Name = "password", IsRequired = true)]
+        [StringLength(maximumLength:256)]
         public string Password { get; set; }
 
     }
diff --git a/src/Umbraco.Web/Security/Identity/FormsAuthenticationSecureDataFormat.cs b/src/Umbraco.Web/Security/Identity/FormsAuthenticationSecureDataFormat.cs
index 77e0fe9faf..457f9257b2 100644
--- a/src/Umbraco.Web/Security/Identity/FormsAuthenticationSecureDataFormat.cs
+++ b/src/Umbraco.Web/Security/Identity/FormsAuthenticationSecureDataFormat.cs
@@ -63,17 +63,29 @@ namespace Umbraco.Web.Security.Identity
                 return null;
             }
 
-            var identity = new UmbracoBackOfficeIdentity(decrypt);
-
-            var ticket = new AuthenticationTicket(identity, new AuthenticationProperties
+            try
             {
-                ExpiresUtc = decrypt.Expiration.ToUniversalTime(),
-                IssuedUtc = decrypt.IssueDate.ToUniversalTime(),
-                IsPersistent = decrypt.IsPersistent,
-                AllowRefresh = true
-            });
+                var identity = new UmbracoBackOfficeIdentity(decrypt);
 
-            return ticket;
+                var ticket = new AuthenticationTicket(identity, new AuthenticationProperties
+                {
+                    ExpiresUtc = decrypt.Expiration.ToUniversalTime(),
+                    IssuedUtc = decrypt.IssueDate.ToUniversalTime(),
+                    IsPersistent = decrypt.IsPersistent,
+                    AllowRefresh = true
+                });
+
+                return ticket;
+            }
+            catch (JsonReaderException)
+            {
+                //catch this and return null if the json is invalid
+                //NOTE: This will happen when running on local host and developing on 7.6 and 7.7+ because 7.7 has a different
+                // auth ticket format.
+                return null;
+            }
+
+            
         }
     }
 }
\ No newline at end of file

From d4a22441905333a2499df08fe8d31e8e818169fa Mon Sep 17 00:00:00 2001
From: Stephan Lonntorp <stephan.kvart@creuna.se>
Date: Tue, 25 Jul 2017 13:28:46 +0200
Subject: [PATCH 038/145] Added missing translations

---
 src/Umbraco.Web.UI/umbraco/config/lang/sv.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
index 51c780f57e..17bc3ee5d0 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
@@ -638,8 +638,12 @@
   </area>
   <area alias="imagecropper">
     <key alias="reset">Återställ</key>
+    <key alias="defineCrop">Definiera beskräning</key>
+    <key alias="defineCropDescription">Ge beskärningen ett alias och dess standardbredd och -höjd</key>
+    <key alias="saveCrop">spara beskärning</key>
+    <key alias="addCrop">Lägg till ny beskärning</key>
   </area>
-  <area alias="rollback">
+    <area alias="rollback">
     <key alias="currentVersion">Nuvarande version</key>
     <key alias="diffHelp"><![CDATA[Här visas skillnaderna mellan nuvarande version och vald version<br /><del>Röd</del> text kommer inte att synas i den valda versionen. , <ins>Grön betyder att den har tillkommit</ins>]]></key>
     <key alias="documentRolledBack">Dokumentet har återgått till en tidigare version</key>

From 6c91d5437289d4ce6cca6d8d10efa5fb7c91b219 Mon Sep 17 00:00:00 2001
From: Alexander Bryukhov <abryukhov@gmail.com>
Date: Wed, 26 Jul 2017 10:24:03 +0700
Subject: [PATCH 039/145] U4-10200 Listview layouts - empty state not localized

---
 .../src/views/propertyeditors/listview/layouts/grid/grid.html | 4 ++--
 .../src/views/propertyeditors/listview/layouts/list/list.html | 4 ++--
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml                 | 2 ++
 src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml              | 2 ++
 src/Umbraco.Web.UI/umbraco/config/lang/ru.xml                 | 2 ++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
index 949374cbc2..cf1c3f6411 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
@@ -14,8 +14,8 @@
       <umb-empty-state
           ng-if="!items && options.filter.length === 0 && !vm.isRecycleBin"
           position="center">
-          <div ng-if="entityType === 'content'">No content has been added</div>
-          <div ng-if="entityType === 'member'">No members have been added</div>
+          <div ng-if="entityType === 'content'"><localize key="content_listViewNoContent">No content has been added</localize></div>
+          <div ng-if="entityType === 'member'"><localize key="content_listViewNoMembers">No members have been added</localize></div>
       </umb-empty-state>
 
       <umb-empty-state
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
index ca1c2124d4..45f51e754c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
@@ -53,8 +53,8 @@
         <umb-empty-state
             ng-if="!items && options.filter.length === 0 && !vm.isRecycleBin"
             position="center">
-            <div ng-if="entityType === 'content'">No content has been added</div>
-            <div ng-if="entityType === 'member'">No members have been added</div>
+            <div ng-if="entityType === 'content'"><localize key="content_listViewNoContent">No content has been added</localize></div>
+            <div ng-if="entityType === 'member'"><localize key="content_listViewNoMembers">No members have been added</localize></div>
         </umb-empty-state>
 
     </div>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 52c0779733..c2be0a2ec0 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -143,6 +143,8 @@
     <key alias="lastPublished">Last published</key>
     <key alias="noItemsToShow">There are no items to show</key>
     <key alias="listViewNoItems" version="7.1.5">There are no items to show in the list.</key>
+    <key alias="listViewNoContent">No content has been added</key>
+    <key alias="listViewNoMembers">No members have been added</key>
     <key alias="mediatype">Media Type</key>
     <key alias="mediaLinks">Link to media item(s)</key>
     <key alias="membergroup">Member Group</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index f2ea5ad011..1950fc9aa2 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -142,6 +142,8 @@
     <key alias="lastPublished">Last published</key>
     <key alias="noItemsToShow">There are no items to show</key>
     <key alias="listViewNoItems" version="7.1.5">There are no items to show in the list.</key>
+    <key alias="listViewNoContent">No content has been added</key>
+    <key alias="listViewNoMembers">No members have been added</key>
     <key alias="mediatype">Media Type</key>
     <key alias="mediaLinks">Link to media item(s)</key>
     <key alias="membergroup">Member Group</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
index 3cc1978416..228b549261 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
@@ -184,6 +184,8 @@
     <key alias="lastPublished">Документ опубликован</key>
     <key alias="noItemsToShow">Здесь еще нет элементов.</key>
     <key alias="listViewNoItems" version="7.1.5">В этом списке пока нет элементов.</key>
+    <key alias="listViewNoContent">Содержимое пока еще не добавлено</key>
+    <key alias="listViewNoMembers">Участники пока еще не добавлены</key>
     <key alias="mediaLinks">Ссылка на медиа-элементы</key>
     <key alias="mediatype">Тип медиа-контента</key>
     <key alias="membergroup">Группа участников</key>

From 7dd9f3e766eaefa488d7e6a3529772a74aa6bdfb Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 31 Jul 2017 16:24:22 +0200
Subject: [PATCH 040/145] PluginManager - implement retries on list file

---
 src/Umbraco.Core/PluginManager.cs | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/PluginManager.cs b/src/Umbraco.Core/PluginManager.cs
index 3eb0f2a018..c81913bf11 100644
--- a/src/Umbraco.Core/PluginManager.cs
+++ b/src/Umbraco.Core/PluginManager.cs
@@ -277,7 +277,7 @@ namespace Umbraco.Core
                         uniqInfos.Add(info.FullName);
                         hashCombiner.AddFileSystemItem(info);
                     }
-                } 
+                }
 
                 return ConvertHashToInt64(hashCombiner.GetCombinedHashCode());
             }
@@ -336,6 +336,9 @@ namespace Umbraco.Core
 
         #region Cache
 
+        private const int ListFileOpenReadTimeout = 4000; // milliseconds
+        private const int ListFileOpenWriteTimeout = 2000; // milliseconds
+
         /// <summary>
         /// Attemps to retrieve the list of types from the cache.
         /// </summary>
@@ -381,7 +384,7 @@ namespace Umbraco.Core
             if (File.Exists(filePath) == false)
                 return cache;
 
-            using (var stream = File.OpenRead(filePath))
+            using (var stream = GetFileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read, ListFileOpenReadTimeout))
             using (var reader = new StreamReader(stream))
             {
                 while (true)
@@ -451,7 +454,7 @@ namespace Umbraco.Core
         {
             var filePath = GetPluginListFilePath();
 
-            using (var stream = File.Open(filePath, FileMode.Create, FileAccess.ReadWrite))
+            using (var stream = GetFileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None, ListFileOpenWriteTimeout))
             using (var writer = new StreamWriter(stream))
             {
                 foreach (var typeList in _types.Values)
@@ -471,7 +474,26 @@ namespace Umbraco.Core
             // at the moment we write the cache to disk every time we update it. ideally we defer the writing
             // since all the updates are going to happen in a row when Umbraco starts. that being said, the
             // file is small enough, so it is not a priority.
-            WriteCache();            
+            WriteCache();
+        }
+
+        private static Stream GetFileStream(string path, FileMode fileMode, FileAccess fileAccess, FileShare fileShare, int timeoutMilliseconds)
+        {
+            const int pauseMilliseconds = 250;
+            var attempts = timeoutMilliseconds / pauseMilliseconds;
+            while (true)
+            {
+                try
+                {
+                    return new FileStream(path, fileMode, fileAccess, fileShare);
+                }
+                catch
+                {
+                    if (--attempts == 0)
+                        throw;
+                    Thread.Sleep(250);
+                }
+            }
         }
 
         #endregion

From 86c37c7f6d200d5e83fd230e42c66befeb07e764 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 31 Jul 2017 16:38:39 +0200
Subject: [PATCH 041/145] PluginManager - fix

---
 src/Umbraco.Core/PluginManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/PluginManager.cs b/src/Umbraco.Core/PluginManager.cs
index c81913bf11..a15613b024 100644
--- a/src/Umbraco.Core/PluginManager.cs
+++ b/src/Umbraco.Core/PluginManager.cs
@@ -491,7 +491,7 @@ namespace Umbraco.Core
                 {
                     if (--attempts == 0)
                         throw;
-                    Thread.Sleep(250);
+                    Thread.Sleep(pauseMilliseconds);
                 }
             }
         }

From 21f46d0a3c6c5affa60acbe792370dadd2199d9f Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 1 Aug 2017 09:16:39 +0200
Subject: [PATCH 042/145] Adds debug level logging for failed attempts to get
 filestream

---
 src/Umbraco.Core/PluginManager.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/PluginManager.cs b/src/Umbraco.Core/PluginManager.cs
index a15613b024..fe9236c58c 100644
--- a/src/Umbraco.Core/PluginManager.cs
+++ b/src/Umbraco.Core/PluginManager.cs
@@ -484,13 +484,15 @@ namespace Umbraco.Core
             while (true)
             {
                 try
-                {
+                {
                     return new FileStream(path, fileMode, fileAccess, fileShare);
                 }
                 catch
                 {
                     if (--attempts == 0)
-                        throw;
+                        throw;
+
+                    LogHelper.Debug<PluginManager>(string.Format("Attempted to get filestream for file {0} failed, {1} attempts left, pausing for {2} milliseconds", path, attempts, pauseMilliseconds));
                     Thread.Sleep(pauseMilliseconds);
                 }
             }

From 26a042f291195eaccbe0f86908919a41ca44a1b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Kottal?= <snielsen43@gmail.com>
Date: Wed, 2 Aug 2017 19:41:55 +0200
Subject: [PATCH 043/145] U4-10225: Bumps z-index of #leftcolumn

http://issues.umbraco.org/issue/U4-10225

This bumps the z-index of #leftcolumn, so the notifications don't get in the way.
---
 src/Umbraco.Web.UI.Client/src/less/application/grid.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/application/grid.less b/src/Umbraco.Web.UI.Client/src/less/application/grid.less
index c1db0579ad..8348b072b1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/application/grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/application/grid.less
@@ -70,7 +70,7 @@ body {
 
 #leftcolumn {
   height: 100%;
-  z-index: 20;
+  z-index: 1100;
   width: 80px;
   float: left;
   position: absolute;

From 6a59a909640cb9377fd8312cd6829433604c0c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Kottal?= <snielsen43@gmail.com>
Date: Wed, 2 Aug 2017 20:49:20 +0200
Subject: [PATCH 044/145] Moves .alert-form.-no-border slightly

Moves .alert-form.-no-border slightly, so borders beneath are visible
---
 src/Umbraco.Web.UI.Client/src/less/alerts.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/alerts.less b/src/Umbraco.Web.UI.Client/src/less/alerts.less
index 47ee38a70f..f414c4d2c9 100644
--- a/src/Umbraco.Web.UI.Client/src/less/alerts.less
+++ b/src/Umbraco.Web.UI.Client/src/less/alerts.less
@@ -74,6 +74,8 @@
 
 .alert-form.-no-border {
    border: none !important;
+   margin-left: 1px;
+   margin-bottom: 1px;
 }
 
 .alert-form h4 {

From b22e9d0911d86a396ec87be68dee920726174336 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Thu, 3 Aug 2017 21:35:03 +0200
Subject: [PATCH 045/145] Remove bottom margin of subtitle paragraph

---
 src/Umbraco.Web.UI.Client/src/less/components/overlays.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
index 3710a4d7b1..c7e91c1a44 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
@@ -28,13 +28,13 @@
     font-size: @fontSizeLarge;
     color: @black;
     font-weight: bold;
-
     margin: 7px 0;
 }
 
 .umb-overlay .umb-overlay__subtitle {
     font-size: @fontSizeSmall;
     color: @gray-3;
+    margin: 0;
 }
 
 .umb-overlay .umb-overlay-container {

From 68ba0ca1e2e2ac0c7d6ddcc7191bf835fa9b26ee Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Thu, 3 Aug 2017 21:45:01 +0200
Subject: [PATCH 046/145] Fix typo in localization of placeholder text

---
 .../src/views/common/dialogs/iconpicker.html                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html
index c159aafd6e..4e482c26b1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html
@@ -7,7 +7,7 @@
                        style="width: 100%"
                        ng-model="searchTerm"
                        class="umb-search-field search-query input-block-level"
-                       localize="plceholder"
+                       localize="placeholder"
                        placeholder="@placeholders_filter"
                        no-dirty-check>
             </div>

From 00e0f83c8e461d859619f77b267e0338c09cfbf6 Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@panoramastudios.nl>
Date: Sun, 6 Aug 2017 22:41:20 +0200
Subject: [PATCH 047/145] Fixed U4-10252

Umbraco.Slider property editor did not use the correct initial values
when range was enabled and both values were equal.
---
 .../src/views/propertyeditors/slider/slider.controller.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js
index 76d1599508..404c311d8b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js
@@ -127,7 +127,7 @@
                 var i2 = parseFloat($scope.model.config.initVal2);
                 sliderVal = [
                     isNaN(i1) ? $scope.model.config.minVal : (i1 >= $scope.model.config.minVal ? i1 : $scope.model.config.minVal),
-                    isNaN(i2) ? $scope.model.config.maxVal : (i2 > i1 ? (i2 <= $scope.model.config.maxVal ? i2 : $scope.model.config.maxVal) : $scope.model.config.maxVal)
+                    isNaN(i2) ? $scope.model.config.maxVal : (i2 >= i1 ? (i2 <= $scope.model.config.maxVal ? i2 : $scope.model.config.maxVal) : $scope.model.config.maxVal)
                 ];
             }
             else {

From babcbd2f7aff1a2f522a066c8a5969eed4713088 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Mon, 7 Aug 2017 15:29:34 +0200
Subject: [PATCH 048/145] Updates from dev-v7

---
 src/Umbraco.Web.UI.Client/package.json        |   2 +-
 .../Views/Partials/Grid/Bootstrap2.cshtml     |  32 ++---
 .../Views/Partials/Grid/Bootstrap3.cshtml     |  32 ++---
 .../Views/Partials/Grid/Editors/Base.cshtml   |   1 +
 .../Views/Partials/Grid/Editors/Embed.cshtml  |   7 +-
 .../Views/Partials/Grid/Editors/Macro.cshtml  |   2 +
 .../Views/Partials/Grid/Editors/Media.cshtml  |   3 +-
 .../Partials/Grid/Editors/TextString.cshtml   |   5 +-
 .../config/grid.editors.config.js             | 109 +++++++++++++++++-
 9 files changed, 141 insertions(+), 52 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 4ca32e5f41..89dcd3a0db 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git@github.com:umbraco/umbraco-cms.git"
+    "url": "https://github.com/umbraco/Umbraco-CMS.git"
   },
   "bugs": {
     "url": "https://issues.umbraco.org"
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml
index c8f9ab7cd1..8b189ae1a0 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml
@@ -2,10 +2,6 @@
 @using Umbraco.Web.Templates
 @using Newtonsoft.Json.Linq
 
-@* 
-    Razor helpers located at the bottom of this file
-*@
-
 @if (Model != null && Model.sections != null)
 {
     var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
@@ -64,29 +60,21 @@
         JObject cfg = contentItem.config;
 
         if(cfg != null)
-            foreach (JProperty property in cfg.Properties())
-            {
-                var propertyValue = HttpUtility.HtmlAttributeEncode(property.Value.ToString());
-                attrs.Add(property.Name + "=\"" + propertyValue + "\"");
+            foreach (JProperty property in cfg.Properties()) {
+                attrs.Add(property.Name + "='" + property.Value.ToString() + "'");
             }
-
+                
         JObject style = contentItem.styles;
 
-        if (style != null) {
-            var cssVals = new List<string>();
-            foreach (JProperty property in style.Properties())
-            {
-                var propertyValue = property.Value.ToString();
-                if (string.IsNullOrWhiteSpace(propertyValue) == false)
-                {
-                    cssVals.Add(property.Name + ":" + propertyValue + ";");
-                }
-            }
+        if (style != null) { 
+        var cssVals = new List<string>();
+        foreach (JProperty property in style.Properties())
+            cssVals.Add(property.Name + ":" + property.Value.ToString() + ";");
 
-            if (cssVals.Any())
-                attrs.Add("style=\"" + HttpUtility.HtmlAttributeEncode(string.Join(" ", cssVals)) + "\"");
+        if (cssVals.Any())
+            attrs.Add("style='" + string.Join(" ", cssVals) + "'");
         }
-
+            
         return new MvcHtmlString(string.Join(" ", attrs));
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
index 6ab5c1355a..e672aa2a11 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
@@ -2,10 +2,6 @@
 @using Umbraco.Web.Templates
 @using Newtonsoft.Json.Linq
 
-@* 
-    Razor helpers located at the bottom of this file
-*@
-
 @if (Model != null && Model.sections != null)
 {
     var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
@@ -64,29 +60,21 @@
         JObject cfg = contentItem.config;
 
         if(cfg != null)
-            foreach (JProperty property in cfg.Properties())
-            {
-                var propertyValue = HttpUtility.HtmlAttributeEncode(property.Value.ToString());
-                attrs.Add(property.Name + "=\"" + propertyValue + "\"");
+            foreach (JProperty property in cfg.Properties()) {
+                attrs.Add(property.Name + "='" + property.Value.ToString() + "'");
             }
-        
+                
         JObject style = contentItem.styles;
 
-        if (style != null) {
-            var cssVals = new List<string>();
-            foreach (JProperty property in style.Properties())
-            {
-                var propertyValue = property.Value.ToString();
-                if (string.IsNullOrWhiteSpace(propertyValue) == false)
-                {
-                    cssVals.Add(property.Name + ":" + propertyValue + ";");
-                }
-            }
+        if (style != null) { 
+        var cssVals = new List<string>();
+        foreach (JProperty property in style.Properties())
+            cssVals.Add(property.Name + ":" + property.Value.ToString() + ";");
 
-            if (cssVals.Any())
-                attrs.Add("style=\"" + HttpUtility.HtmlAttributeEncode(string.Join(" ", cssVals)) + "\"");
+        if (cssVals.Any())
+            attrs.Add("style='" + string.Join(" ", cssVals) + "'");
         }
-
+            
         return new MvcHtmlString(string.Join(" ", attrs));
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Base.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Base.cshtml
index ffb7603048..a86c04819a 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Base.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Base.cshtml
@@ -1,4 +1,5 @@
 @model dynamic
+@using Umbraco.Web.Templates
 
 @functions {
     public static string EditorView(dynamic contentItem)
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Embed.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Embed.cshtml
index c27be6bcdf..393157bcf8 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Embed.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Embed.cshtml
@@ -1,2 +1,7 @@
 @model dynamic
-@Html.Raw(Model.value)
+@using Umbraco.Web.Templates
+
+
+<div class="video-wrapper">
+	@Html.Raw(Model.value)
+</div>
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Macro.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Macro.cshtml
index ed08bb2484..e0822808d8 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Macro.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Macro.cshtml
@@ -1,4 +1,6 @@
 @inherits UmbracoViewPage<dynamic>
+@using Umbraco.Web.Templates
+
 
 @if (Model.value != null)
 {
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
index 5b5adbdc7d..09d04219f2 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
@@ -1,4 +1,5 @@
 @model dynamic
+@using Umbraco.Web.Templates
 
 @if (Model.value != null)
 {   
@@ -13,7 +14,7 @@
         }
     }
     
-    <img src="@url" alt="@Model.value.altText">
+    <img src="@url" alt="@Model.value.caption">
     
     if (Model.value.caption != null)
     {
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
index 8c92ca0d83..0cac4eb1ff 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
@@ -4,9 +4,8 @@
 @if (Model.editor.config.markup != null)
 {
     string markup = Model.editor.config.markup.ToString();
-    var umbracoHelper = new UmbracoHelper(UmbracoContext.Current);
-    
-    markup = markup.Replace("#value#", umbracoHelper.ReplaceLineBreaksForHtml(HttpUtility.HtmlEncode(Model.value.ToString())));
+
+    markup = markup.Replace("#value#", Model.value.ToString());
     markup = markup.Replace("#style#", Model.editor.config.style.ToString());
 
     <text>
diff --git a/src/Umbraco.Web.UI/config/grid.editors.config.js b/src/Umbraco.Web.UI/config/grid.editors.config.js
index b904920566..1adb6da2dc 100644
--- a/src/Umbraco.Web.UI/config/grid.editors.config.js
+++ b/src/Umbraco.Web.UI/config/grid.editors.config.js
@@ -1,4 +1,4 @@
-[
+[
 	{
 	    "name": "Rich text editor",
 	    "alias": "rte",
@@ -11,6 +11,40 @@
 	    "view": "media",
 	    "icon": "icon-picture"
 	},
+	{
+	    "name": "Image wide",
+	    "alias": "media_wide",
+	    "view": "media",
+	    "render": "/App_Plugins/Grid/Editors/Render/media_wide.cshtml",
+	    "icon": "icon-picture"
+	},
+	{
+	    "name": "Image wide cropped",
+	    "alias": "media_wide_cropped",
+	    "view": "media",
+	    "render": "media",
+	    "icon": "icon-picture",
+	    "config": {
+	    	"size": {
+	    		"width": 1920,
+	    		"height": 700
+	    	}
+	    }
+	},
+	{
+	    "name": "Image rounded",
+	    "alias": "media_round",
+	    "view": "media",
+	    "render": "/App_Plugins/Grid/Editors/Render/media_round.cshtml",
+	    "icon": "icon-picture"
+	},
+	{
+	    "name": "Image w/ text right",
+	    "alias": "media_text_right",
+	    "view": "/App_Plugins/Grid/Editors/Views/media_with_description.html",
+	    "render": "/App_Plugins/Grid/Editors/Render/media_text_right.cshtml",
+	    "icon": "icon-picture"
+	},
 	{
 	    "name": "Macro",
 	    "alias": "macro",
@@ -21,8 +55,29 @@
 	    "name": "Embed",
 	    "alias": "embed",
 	    "view": "embed",
+	    "render": "/App_Plugins/Grid/Editors/Render/embed_videowrapper.cshtml",
 	    "icon": "icon-movie-alt"
 	},
+	{
+        "name": "Banner Headline",
+        "alias": "banner_headline",
+        "view": "textstring",
+        "icon": "icon-coin",
+        "config": {
+            "style": "font-size: 36px; line-height: 45px; font-weight: bold; text-align:center",
+            "markup": "<h1 style='font-size:62px;text-align:center'>#value#</h1>"
+        }
+    },
+    {
+        "name": "Banner Tagline",
+        "alias": "banner_tagline",
+        "view": "textstring",
+        "icon": "icon-coin",
+        "config": {
+            "style": "font-size: 25px; line-height: 35px; font-weight: normal; text-align:center",
+            "markup": "<h2 style='font-weight: 100; font-size: 40px;text-align:center'>#value#</h2>"
+        }
+    },
     {
         "name": "Headline",
         "alias": "headline",
@@ -32,6 +87,36 @@
             "style": "font-size: 36px; line-height: 45px; font-weight: bold",
             "markup": "<h1>#value#</h1>"
         }
+    },
+    {
+        "name": "Headline centered",
+        "alias": "headline_centered",
+        "view": "textstring",
+        "icon": "icon-coin",
+        "config": {
+            "style": "font-size: 30px; line-height: 45px; font-weight: bold; text-align:center;",
+            "markup": "<h1 style='text-align:center;'>#value#</h1>"
+        }
+    },
+    {
+        "name": "Abstract",
+        "alias": "abstract",
+        "view": "textstring",
+        "icon": "icon-coin",
+        "config": {
+            "style": "font-size: 16px; line-height: 20px; font-weight: bold;",
+            "markup": "<h3>#value#</h3>"
+        }
+    },
+    {
+        "name": "Paragraph",
+        "alias": "paragraph",
+        "view": "textstring",
+        "icon": "icon-font",
+        "config": {
+            "style": "font-size: 16px; line-height: 20px; font-weight: light;",
+            "markup": "<p>#value#</p>"
+        }
     },
 	{
 	    "name": "Quote",
@@ -39,8 +124,28 @@
 	    "view": "textstring",
 	    "icon": "icon-quote",
 	    "config": {
-	        "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-style: italic; font-size: 18px",
+	        "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px",
 	        "markup": "<blockquote>#value#</blockquote>"
 	    }
+	},
+	{
+	    "name": "Quote with description",
+	    "alias": "quote_D",
+	    "view": "/App_Plugins/Grid/Editors/Views/quote_with_description.html",
+	    "render": "/App_Plugins/Grid/Editors/Render/quote_with_description.cshtml",
+	    "icon": "icon-quote",
+	    "config": {
+	        "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px"
+	    }
+	},
+	{
+	    "name": "Code",
+	    "alias": "code",
+	    "view": "textstring",
+	    "icon": "icon-code",
+	    "config": {
+	        "style": "overflow: auto;padding: 6px 10px;border: 1px solid #ddd;border-radius: 3px;background-color: #f8f8f8;font-size: .9rem;font-family: 'Courier 10 Pitch', Courier, monospace;line-height: 19px;",
+	        "markup": "<pre>#value#</pre>"
+	    }
 	}
 ]
\ No newline at end of file

From 27168722ab50a7298e03444ab69bfa9d06f06dea Mon Sep 17 00:00:00 2001
From: mikkelhm <mikkel@umbraco.com>
Date: Mon, 7 Aug 2017 20:33:49 +0200
Subject: [PATCH 049/145] fix xml in pl.xml

---
 src/Umbraco.Web.UI/umbraco/config/lang/pl.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
index e1af9412a3..b875d13105 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
@@ -45,7 +45,7 @@
     <key alias="permissionDenied">Brak odpowiednich uprawnień</key>
     <key alias="addNew">Dodaj nową domenę</key>
     <key alias="remove">Usuń domenę</key>
-    <key alias="invalidNode">Niepoprawny węzeł<./key>
+    <key alias="invalidNode">Niepoprawny węzeł.</key>
     <key alias="invalidDomain">Niepoprawny format domeny.</key>
     <key alias="duplicateDomain">Domena została już przydzielona.</key>
     <key alias="language">Język</key>

From ca0de5acd30488875bd14f601a27f4f0e1199704 Mon Sep 17 00:00:00 2001
From: mikkelhm <mikkel@umbraco.com>
Date: Mon, 7 Aug 2017 21:58:45 +0200
Subject: [PATCH 050/145] Fix more xml format issues in pl.xml

---
 src/Umbraco.Web.UI/umbraco/config/lang/pl.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
index b875d13105..89d39dc659 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
@@ -387,7 +387,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
     <key alias="allPropTypes">Wszystkie typy właściwości &amp; dane właściwości</key>
     <key alias="willBeDeleted">używające tego typu danych zostaną usunięte na zawsze, potwierdź, że chcesz je także usunąć</key>
     <key alias="yesDelete">Tak, usuń</key>
-    <key alias="andAllRelated">i wszystkie typy właściwości &amp; dane właściwości używające tego typu danych/key>
+    <key alias="andAllRelated">i wszystkie typy właściwości &amp; dane właściwości używające tego typu danych</key>
     <key alias="selectFolder">Wybierz folder do przeniesienia</key>
     <key alias="inTheTree">do w strukturze drzewa poniżej</key>
     <key alias="wasMoved">został przeniesiony poniżej</key>
@@ -819,7 +819,7 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
     <key alias="notifications">Powiadomienie</key>
   </area>
   <area alias="packager">
-    <key alias="chooseLocalPackageText"><!CDATA[
+    <key alias="chooseLocalPackageText"><![CDATA[
       Wskaż pakiet z Twojego komputera, poprzez kliknięcie na przycisk "Przeglądaj"<br /> 
       i wskaż gdzie jest zapisany. Pakiety Umbraco przeważnie posiadają rozszerzenie ".umb" lub ".zip".
       ]]></key>

From fa1663ed51355efae6570a938ef0270fb59e590f Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Tue, 8 Aug 2017 13:08:29 +0200
Subject: [PATCH 051/145] Fixes build script to work with VS 2017 (only) and
 fixes BuildBelle since it didn't work and is missing tools

---
 build/Build.bat                  | 10 ----------
 build/BuildBelle.bat             | 23 ++++++++++++++++-------
 src/umbraco.presentation.targets |  4 ++++
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/build/Build.bat b/build/Build.bat
index f26c4877cd..da34691c3d 100644
--- a/build/Build.bat
+++ b/build/Build.bat
@@ -125,22 +125,12 @@ IF NOT EXIST "%nuGetExecutable%" (
 	powershell -Command "(New-Object Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', '%nuGetExecutable%')"
 )
 
-:: We need 7za.exe for BuildBelle.bat
-IF NOT EXIST "%toolsFolder%7za.exe" (
-	ECHO 7zip not found - fetching now
-	"%nuGetExecutable%" install 7-Zip.CommandLine -OutputDirectory tools -Verbosity quiet
-)
-
 :: We need vswhere.exe for VS2017+
 IF NOT EXIST "%toolsFolder%vswhere.exe" (
 	ECHO vswhere not found - fetching now
 	"%nuGetExecutable%" install vswhere -OutputDirectory tools -Verbosity quiet
 )
 
-:: Put 7za.exe and vswhere.exe in a predictable path (not version specific)
-FOR /f "delims=" %%A in ('dir "%toolsFolder%7-Zip.CommandLine.*" /b') DO SET "sevenZipExePath=%toolsFolder%%%A\"
-MOVE "%sevenZipExePath%tools\7za.exe" "%toolsFolder%7za.exe"
-
 FOR /f "delims=" %%A in ('dir "%toolsFolder%vswhere.*" /b') DO SET "vswhereExePath=%toolsFolder%%%A\"
 MOVE "%vswhereExePath%tools\vswhere.exe" "%toolsFolder%vswhere.exe"
 
diff --git a/build/BuildBelle.bat b/build/BuildBelle.bat
index 78b7736c2b..750ffae6b2 100644
--- a/build/BuildBelle.bat
+++ b/build/BuildBelle.bat
@@ -8,6 +8,22 @@ ECHO Current folder: %CD%
 SET nodeFileName=node-v6.9.1-win-x86.7z
 SET nodeExtractFolder=%toolsFolder%node.js.691
 
+SET nuGetExecutable=%CD%\tools\nuget.exe
+IF NOT EXIST "%nuGetExecutable%" (
+	ECHO Downloading https://dist.nuget.org/win-x86-commandline/latest/nuget.exe to %nuGetExecutable%
+	powershell -Command "(New-Object Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', '%nuGetExecutable%')"
+)
+
+:: We need 7za.exe for BuildBelle.bat
+IF NOT EXIST "%toolsFolder%7za.exe" (
+	ECHO 7zip not found - fetching now
+	"%nuGetExecutable%" install 7-Zip.CommandLine -OutputDirectory tools -Verbosity quiet
+)
+
+:: Put 7za.exe and vswhere.exe in a predictable path (not version specific)
+FOR /f "delims=" %%A in ('dir "%toolsFolder%7-Zip.CommandLine.*" /b') DO SET "sevenZipExePath=%toolsFolder%%%A\"
+MOVE "%sevenZipExePath%tools\7za.exe" "%toolsFolder%7za.exe"
+
 IF NOT EXIST "%nodeExtractFolder%" (
 	ECHO Downloading http://nodejs.org/dist/v6.9.1/%nodeFileName% to %toolsFolder%%nodeFileName%
 	powershell -Command "(New-Object Net.WebClient).DownloadFile('http://nodejs.org/dist/v6.9.1/%nodeFileName%', '%toolsFolder%%nodeFileName%')"
@@ -16,13 +32,6 @@ IF NOT EXIST "%nodeExtractFolder%" (
 )
 FOR /f "delims=" %%A in ('dir "%nodeExtractFolder%\node*" /b') DO SET "nodePath=%nodeExtractFolder%\%%A"
 
-
-SET nuGetExecutable=%CD%\tools\nuget.exe
-IF NOT EXIST "%nuGetExecutable%" (
-	ECHO Downloading https://dist.nuget.org/win-x86-commandline/latest/nuget.exe to %nuGetExecutable%
-	powershell -Command "(New-Object Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', '%nuGetExecutable%')"
-)
-
 SET drive=%CD:~0,2%
 SET nuGetFolder=%drive%\packages\
 FOR /f "delims=" %%A in ('dir "%nuGetFolder%npm.*" /b') DO SET "npmPath=%nuGetFolder%%%A\"
diff --git a/src/umbraco.presentation.targets b/src/umbraco.presentation.targets
index 2a33705d6f..6eb87ad9fa 100644
--- a/src/umbraco.presentation.targets
+++ b/src/umbraco.presentation.targets
@@ -58,6 +58,10 @@
   
   <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v15.0\Web\Microsoft.Web.Publishing.Tasks.dll')">
     <WebPublishingTasks>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v15.0\Web\Microsoft.Web.Publishing.Tasks.dll</WebPublishingTasks>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="Exists('$(VSWherePath)\Microsoft\VisualStudio\v15.0\Web\Microsoft.Web.Publishing.Tasks.dll')">
+    <WebPublishingTasks>$(VSWherePath)\Microsoft\VisualStudio\v15.0\Web\Microsoft.Web.Publishing.Tasks.dll</WebPublishingTasks>
   </PropertyGroup>
 
   <!-- 

From d625388786fc0ef2f0ed8582f6ef57716913d4ed Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Tue, 8 Aug 2017 13:10:33 +0200
Subject: [PATCH 052/145] U4-10266 Package installer need to handle files
 before handling entities

---
 .../businesslogic/Packager/Installer.cs       | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs
index e97b9317d8..0499157427 100644
--- a/src/umbraco.cms/businesslogic/Packager/Installer.cs
+++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs
@@ -381,14 +381,26 @@ namespace umbraco.cms.businesslogic.packager
 
                     //Perhaps it would have been a good idea to put the following into methods eh?!?
 
-                    #region DataTypes
-                    var dataTypeElement = rootElement.Descendants("DataTypes").FirstOrDefault();
-                    if (dataTypeElement != null)
+                    #region Stylesheets
+                    foreach (XmlNode n in Config.DocumentElement.SelectNodes("Stylesheets/Stylesheet"))
                     {
-                        var dataTypeDefinitions = packagingService.ImportDataTypeDefinitions(dataTypeElement, currentUser.Id);
-                        foreach (var dataTypeDefinition in dataTypeDefinitions)
+                        StyleSheet s = StyleSheet.Import(n, currentUser);
+
+                        insPack.Data.Stylesheets.Add(s.Id.ToString(CultureInfo.InvariantCulture));
+                        //saveNeeded = true;
+                    }
+
+                    //if (saveNeeded) { insPack.Save(); saveNeeded = false; }
+                    #endregion
+
+                    #region Templates
+                    var templateElement = rootElement.Descendants("Templates").FirstOrDefault();
+                    if (templateElement != null)
+                    {
+                        var templates = packagingService.ImportTemplates(templateElement, currentUser.Id);
+                        foreach (var template in templates)
                         {
-                            insPack.Data.DataTypes.Add(dataTypeDefinition.Id.ToString(CultureInfo.InvariantCulture));
+                            insPack.Data.Templates.Add(template.Id.ToString(CultureInfo.InvariantCulture));
                         }
                     }
                     #endregion
@@ -412,6 +424,18 @@ namespace umbraco.cms.businesslogic.packager
                     }
                     #endregion
 
+                    #region DataTypes
+                    var dataTypeElement = rootElement.Descendants("DataTypes").FirstOrDefault();
+                    if (dataTypeElement != null)
+                    {
+                        var dataTypeDefinitions = packagingService.ImportDataTypeDefinitions(dataTypeElement, currentUser.Id);
+                        foreach (var dataTypeDefinition in dataTypeDefinitions)
+                        {
+                            insPack.Data.DataTypes.Add(dataTypeDefinition.Id.ToString(CultureInfo.InvariantCulture));
+                        }
+                    }
+                    #endregion
+
                     #region Macros
                     var macroItemsElement = rootElement.Descendants("Macros").FirstOrDefault();
                     if (macroItemsElement != null)
@@ -421,18 +445,6 @@ namespace umbraco.cms.businesslogic.packager
                     }
                     #endregion
 
-                    #region Templates
-                    var templateElement = rootElement.Descendants("Templates").FirstOrDefault();
-                    if (templateElement != null)
-                    {
-                        var templates = packagingService.ImportTemplates(templateElement, currentUser.Id);
-                        foreach (var template in templates)
-                        {
-                            insPack.Data.Templates.Add(template.Id.ToString(CultureInfo.InvariantCulture));
-                        }
-                    }
-                    #endregion
-
                     #region DocumentTypes
                     //Check whether the root element is a doc type rather then a complete package
                     var docTypeElement = rootElement.Name.LocalName.Equals("DocumentType") ||
@@ -451,18 +463,6 @@ namespace umbraco.cms.businesslogic.packager
                     }
                     #endregion
 
-                    #region Stylesheets
-                    foreach (XmlNode n in Config.DocumentElement.SelectNodes("Stylesheets/Stylesheet"))
-                    {
-                        StyleSheet s = StyleSheet.Import(n, currentUser);
-
-                        insPack.Data.Stylesheets.Add(s.Id.ToString(CultureInfo.InvariantCulture));
-                        //saveNeeded = true;
-                    }
-
-                    //if (saveNeeded) { insPack.Save(); saveNeeded = false; }
-                    #endregion
-
                     #region Documents
                     var documentElement = rootElement.Descendants("DocumentSet").FirstOrDefault();
                     if (documentElement != null)

From 7db1055a0d86d4e95c70722312e7ed7912991614 Mon Sep 17 00:00:00 2001
From: Bitmapped <bpowell@bitmapped.net>
Date: Tue, 8 Aug 2017 13:54:36 -0400
Subject: [PATCH 053/145] Remove JSON files, which appear to be unnecessary.

---
 .../skins/umbraco/fonts/tinymce-small.json    | 1277 ------
 .../tinymce/skins/umbraco/fonts/tinymce.json  | 3469 -----------------
 2 files changed, 4746 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.json
 delete mode 100644 src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.json

diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.json b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.json
deleted file mode 100644
index ed0d0efff9..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce-small.json
+++ /dev/null
@@ -1,1277 +0,0 @@
-{
-  "IcoMoonType": "selection",
-  "icons": [
-    {
-      "icon": {
-        "paths": [
-          "M704 832v-37.004c151.348-61.628 256-193.82 256-346.996 0-212.078-200.576-384-448-384s-448 171.922-448 384c0 153.176 104.654 285.368 256 346.996v37.004h-192l-64-96v224h320v-222.812c-100.9-51.362-170.666-161.54-170.666-289.188 0-176.732 133.718-320 298.666-320 164.948 0 298.666 143.268 298.666 320 0 127.648-69.766 237.826-170.666 289.188v222.812h320v-224l-64 96h-192z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57376,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 0,
-        "order": 1,
-        "prevSize": 32,
-        "code": 57376,
-        "name": "charmap",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 0
-    },
-    {
-      "icon": {
-        "paths": [
-          "M256 64v896l256-256 256 256v-896h-512zM704 789.49l-192-192-192 192v-661.49h384v661.49z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57363,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 1,
-        "order": 2,
-        "prevSize": 32,
-        "code": 57363,
-        "name": "bookmark",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 1
-    },
-    {
-      "icon": {
-        "paths": [
-          "M927.274 230.216l-133.49-133.488c-21.104-21.104-49.232-32.728-79.198-32.728s-58.094 11.624-79.196 32.726l-165.492 165.49c-43.668 43.668-43.668 114.724 0 158.392l2.746 2.746 67.882-67.882-2.746-2.746c-6.132-6.132-6.132-16.494 0-22.626l165.492-165.492c4.010-4.008 8.808-4.608 11.312-4.608s7.302 0.598 11.312 4.61l133.49 133.488c6.132 6.134 6.132 16.498 0.002 22.628l-165.494 165.494c-4.008 4.008-8.806 4.608-11.31 4.608s-7.302-0.6-11.312-4.612l-2.746-2.746-67.88 67.884 2.742 2.742c21.106 21.108 49.23 32.728 79.2 32.728s58.094-11.624 79.196-32.726l165.494-165.492c43.662-43.666 43.662-114.72-0.004-158.39zM551.356 600.644l-67.882 67.882 2.746 2.746c4.008 4.008 4.61 8.806 4.61 11.31 0 2.506-0.598 7.302-4.606 11.314l-165.494 165.49c-4.010 4.010-8.81 4.61-11.314 4.61s-7.304-0.6-11.314-4.61l-133.492-133.486c-4.010-4.010-4.61-8.81-4.61-11.314s0.598-7.3 4.61-11.312l165.49-165.488c4.010-4.012 8.81-4.612 11.314-4.612s7.304 0.6 11.314 4.612l2.746 2.742 67.882-67.88-2.746-2.746c-21.104-21.104-49.23-32.726-79.196-32.726s-58.092 11.624-79.196 32.726l-165.488 165.486c-21.106 21.104-32.73 49.234-32.73 79.198s11.624 58.094 32.726 79.198l133.49 133.49c21.106 21.102 49.232 32.726 79.198 32.726s58.092-11.624 79.196-32.726l165.494-165.492c21.104-21.104 32.722-49.23 32.722-79.196s-11.624-58.094-32.726-79.196l-2.744-2.746zM800 838c-9.724 0-19.45-3.708-26.87-11.13l-128-127.998c-14.844-14.84-14.844-38.898 0-53.738 14.84-14.844 38.896-14.844 53.736 0l128 128c14.844 14.84 14.844 38.896 0 53.736-7.416 7.422-17.142 11.13-26.866 11.13zM608 960c-17.674 0-32-14.326-32-32v-128c0-17.674 14.326-32 32-32s32 14.326 32 32v128c0 17.674-14.326 32-32 32zM928 640h-128c-17.674 0-32-14.326-32-32s14.326-32 32-32h128c17.674 0 32 14.326 32 32s-14.326 32-32 32zM224 186c9.724 0 19.45 3.708 26.87 11.13l128 128c14.842 14.84 14.842 38.898 0 53.738-14.84 14.844-38.898 14.844-53.738 0l-128-128c-14.842-14.84-14.842-38.898 0-53.738 7.418-7.422 17.144-11.13 26.868-11.13zM416 64c17.674 0 32 14.326 32 32v128c0 17.674-14.326 32-32 32s-32-14.326-32-32v-128c0-17.674 14.326-32 32-32zM96 384h128c17.674 0 32 14.326 32 32s-14.326 32-32 32h-128c-17.674 0-32-14.326-32-32s14.326-32 32-32z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57362,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 2,
-        "order": 3,
-        "prevSize": 32,
-        "code": 57362,
-        "name": "link",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 2
-    },
-    {
-      "icon": {
-        "paths": [
-          "M927.274 230.216l-133.49-133.488c-21.104-21.104-49.232-32.728-79.198-32.728s-58.094 11.624-79.196 32.726l-165.492 165.49c-43.668 43.668-43.668 114.724 0 158.392l2.746 2.746 67.882-67.882-2.746-2.746c-6.132-6.132-6.132-16.494 0-22.626l165.492-165.492c4.010-4.008 8.808-4.608 11.312-4.608s7.302 0.598 11.312 4.61l133.49 133.488c6.132 6.134 6.132 16.498 0.002 22.628l-165.494 165.494c-4.008 4.008-8.806 4.608-11.31 4.608s-7.302-0.6-11.312-4.612l-2.746-2.746-67.88 67.884 2.742 2.742c21.106 21.108 49.23 32.728 79.2 32.728s58.094-11.624 79.196-32.726l165.494-165.492c43.662-43.666 43.662-114.72-0.004-158.39zM551.356 600.644l-67.882 67.882 2.746 2.746c4.008 4.008 4.61 8.806 4.61 11.31 0 2.506-0.598 7.302-4.606 11.314l-165.494 165.49c-4.010 4.010-8.81 4.61-11.314 4.61s-7.304-0.6-11.314-4.61l-133.492-133.486c-4.010-4.010-4.61-8.81-4.61-11.314s0.598-7.3 4.61-11.312l165.49-165.488c4.010-4.012 8.81-4.612 11.314-4.612s7.304 0.6 11.314 4.612l2.746 2.742 67.882-67.88-2.746-2.746c-21.104-21.104-49.23-32.726-79.196-32.726s-58.092 11.624-79.196 32.726l-165.488 165.486c-21.106 21.104-32.73 49.234-32.73 79.198s11.624 58.094 32.726 79.198l133.49 133.49c21.106 21.102 49.232 32.726 79.198 32.726s58.092-11.624 79.196-32.726l165.494-165.492c21.104-21.104 32.722-49.23 32.722-79.196s-11.624-58.094-32.726-79.196l-2.744-2.746zM352 710c-9.724 0-19.45-3.71-26.87-11.128-14.84-14.84-14.84-38.898 0-53.738l320-320c14.84-14.84 38.896-14.84 53.736 0 14.844 14.84 14.844 38.9 0 53.74l-320 320c-7.416 7.416-17.142 11.126-26.866 11.126z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57361,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 3,
-        "order": 4,
-        "prevSize": 32,
-        "code": 57361,
-        "name": "unlink",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 3
-    },
-    {
-      "icon": {
-        "paths": [
-          "M576 281.326v-217.326l336.002 336-336.002 336v-222.096c-390.906-9.17-315 247.096-256 446.096-288-320-212.092-690.874 256-678.674z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57360,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 4,
-        "order": 5,
-        "prevSize": 32,
-        "code": 57360,
-        "name": "redo",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 4
-    },
-    {
-      "icon": {
-        "paths": [
-          "M704 960c59-199 134.906-455.266-256-446.096v222.096l-336.002-336 336.002-336v217.326c468.092-12.2 544 358.674 256 678.674z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57359,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 5,
-        "order": 6,
-        "prevSize": 32,
-        "code": 57359,
-        "name": "undo",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 5
-    },
-    {
-      "icon": {
-        "paths": [
-          "M256.428 424.726c105.8 0 191.572 91.17 191.572 203.638 0 112.464-85.772 203.636-191.572 203.636-105.802 0-191.572-91.17-191.572-203.636l-0.856-29.092c0-224.93 171.54-407.272 383.144-407.272v116.364c-73.1 0-141.826 30.26-193.516 85.204-9.954 10.578-19.034 21.834-27.224 33.656 9.784-1.64 19.806-2.498 30.024-2.498zM768.428 424.726c105.8 0 191.572 91.17 191.572 203.638 0 112.464-85.772 203.636-191.572 203.636-105.802 0-191.572-91.17-191.572-203.636l-0.856-29.092c0-224.93 171.54-407.272 383.144-407.272v116.364c-73.1 0-141.826 30.26-193.516 85.204-9.956 10.578-19.036 21.834-27.224 33.656 9.784-1.64 19.806-2.498 30.024-2.498z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57358,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 6,
-        "order": 7,
-        "prevSize": 32,
-        "code": 57358,
-        "name": "blockquote",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 6
-    },
-    {
-      "icon": {
-        "paths": [
-          "M64 192h896v128h-896zM384 576h576v128h-576zM384 384h576v128h-576zM64 768h896v128h-896zM64 384l224 160-224 160z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57356,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 7,
-        "order": 8,
-        "prevSize": 32,
-        "code": 57356,
-        "name": "indent",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 7
-    },
-    {
-      "icon": {
-        "paths": [
-          "M64 192h896v128h-896zM64 576h576v128h-576zM64 384h576v128h-576zM64 768h896v128h-896zM960 384l-224 160 224 160z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57357,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 8,
-        "order": 9,
-        "prevSize": 32,
-        "code": 57357,
-        "name": "outdent",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 8
-    },
-    {
-      "icon": {
-        "paths": [
-          "M384 128h576v128h-576zM384 448h576v128h-576zM384 768h576v128h-576zM320 530v-146h-64v-320h-128v64h64v256h-64v64h128v50l-128 60v146h128v64h-128v64h128v64h-128v64h192v-320h-128v-50z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57355,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 9,
-        "order": 10,
-        "prevSize": 32,
-        "code": 57355,
-        "name": "numlist",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 9
-    },
-    {
-      "icon": {
-        "paths": [
-          "M384 128h576v128h-576zM384 448h576v128h-576zM384 768h576v128h-576zM128 192c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM128 512c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM128 832c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57354,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 10,
-        "order": 11,
-        "prevSize": 32,
-        "code": 57354,
-        "name": "bullist",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 10
-    },
-    {
-      "icon": {
-        "paths": [
-          "M888 384h-56v-256h64v-64h-320v64h64v256h-256v-256h64v-64h-320v64h64v256h-56c-39.6 0-72 32.4-72 72v432c0 39.6 32.4 72 72 72h240c39.6 0 72-32.4 72-72v-312h128v312c0 39.6 32.4 72 72 72h240c39.6 0 72-32.4 72-72v-432c0-39.6-32.4-72-72-72zM348 896h-184c-19.8 0-36-14.4-36-32s16.2-32 36-32h184c19.8 0 36 14.4 36 32s-16.2 32-36 32zM544 512h-64c-17.6 0-32-14.4-32-32s14.4-32 32-32h64c17.6 0 32 14.4 32 32s-14.4 32-32 32zM860 896h-184c-19.8 0-36-14.4-36-32s16.2-32 36-32h184c19.8 0 36 14.4 36 32s-16.2 32-36 32z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57353,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 11,
-        "order": 12,
-        "prevSize": 32,
-        "code": 57353,
-        "name": "searchreplace",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 11
-    },
-    {
-      "icon": {
-        "paths": [
-          "M704 384v-160c0-17.6-14.4-32-32-32h-160v-64c0-35.2-28.8-64-64-64h-128c-35.204 0-64 28.8-64 64v64h-160c-17.602 0-32 14.4-32 32v512c0 17.6 14.398 32 32 32h224v192h384l192-192v-384h-192zM320 128.114c0.034-0.038 0.072-0.078 0.114-0.114h127.768c0.042 0.036 0.082 0.076 0.118 0.114l0 63.886h-128v-63.886zM192 320v-64h384v64h-384zM704 869.49v-101.49h101.49l-101.49 101.49zM832 704h-192v192h-256v-448h448v256z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57352,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 12,
-        "order": 13,
-        "prevSize": 32,
-        "code": 57352,
-        "name": "paste",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 12
-    },
-    {
-      "icon": {
-        "paths": [
-          "M832 320h-192v-64l-192-192h-384v704h384v192h576v-448l-192-192zM832 410.51l101.49 101.49h-101.49v-101.49zM448 154.51l101.49 101.49h-101.49v-101.49zM128 128h256v192h192v384h-448v-576zM960 896h-448v-128h128v-384h128v192h192v320z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57393,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 13,
-        "order": 14,
-        "prevSize": 32,
-        "code": 57393,
-        "name": "copy",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 13
-    },
-    {
-      "icon": {
-        "paths": [
-          "M960 512h-265.876c-50.078-35.42-114.43-54.86-182.124-54.86-89.206 0-164.572-50.242-164.572-109.712 0-59.47 75.366-109.714 164.572-109.714 75.058 0 140.308 35.576 159.12 82.286h113.016c-7.93-50.644-37.58-97.968-84.058-132.826-50.88-38.16-117.676-59.174-188.078-59.174-70.404 0-137.196 21.014-188.074 59.174-54.788 41.090-86.212 99.502-86.212 160.254s31.424 119.164 86.212 160.254c1.956 1.466 3.942 2.898 5.946 4.316h-265.872v64h512.532c58.208 17.106 100.042 56.27 100.042 100.572 0 59.468-75.368 109.71-164.572 109.71-75.060 0-140.308-35.574-159.118-82.286h-113.016c7.93 50.64 37.582 97.968 84.060 132.826 50.876 38.164 117.668 59.18 188.072 59.18 70.402 0 137.198-21.016 188.074-59.174 54.79-41.090 86.208-99.502 86.208-160.254 0-35.298-10.654-69.792-30.294-100.572h204.012v-64z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57389,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 19,
-        "order": 15,
-        "prevSize": 32,
-        "code": 57389,
-        "name": "strikethrough",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 14
-    },
-    {
-      "icon": {
-        "paths": [
-          "M192 832h576v64h-576v-64zM640 128v384c0 31.312-14.7 61.624-41.39 85.352-30.942 27.502-73.068 42.648-118.61 42.648-45.544 0-87.668-15.146-118.608-42.648-26.692-23.728-41.392-54.040-41.392-85.352v-384h-128v384c0 141.382 128.942 256 288 256s288-114.618 288-256v-384h-128z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57388,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 20,
-        "order": 16,
-        "prevSize": 32,
-        "code": 57388,
-        "name": "underline",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 15
-    },
-    {
-      "icon": {
-        "paths": [
-          "M832 128v64h-144l-256 640h144v64h-448v-64h144l256-640h-144v-64h448z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57387,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 21,
-        "order": 17,
-        "prevSize": 32,
-        "code": 57387,
-        "name": "italic",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 16
-    },
-    {
-      "icon": {
-        "paths": [
-          "M625.442 494.182c48.074-38.15 78.558-94.856 78.558-158.182 0-114.876-100.29-208-224-208h-224v768h288c123.712 0 224-93.124 224-208 0-88.196-59.118-163.562-142.558-193.818zM384 304c0-26.51 21.49-48 48-48h67.204c42.414 0 76.796 42.98 76.796 96s-34.382 96-76.796 96h-115.204v-144zM547.2 768h-115.2c-26.51 0-48-21.49-48-48v-144h163.2c42.418 0 76.8 42.98 76.8 96s-34.382 96-76.8 96z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57386,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 22,
-        "order": 18,
-        "prevSize": 32,
-        "code": 57386,
-        "name": "bold",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 17
-    },
-    {
-      "icon": {
-        "paths": [
-          "M850.746 242.746l-133.492-133.49c-24.888-24.892-74.054-45.256-109.254-45.256h-416c-35.2 0-64 28.8-64 64v768c0 35.2 28.8 64 64 64h640c35.2 0 64-28.8 64-64v-544c0-35.2-20.366-84.364-45.254-109.254zM805.49 287.998c6.792 6.796 13.792 19.162 18.894 32.002h-184.384v-184.386c12.84 5.1 25.204 12.1 32 18.896l133.49 133.488zM831.884 896h-639.77c-0.040-0.034-0.082-0.076-0.114-0.116v-767.77c0.034-0.040 0.076-0.082 0.114-0.114h383.886v256h256v511.884c-0.034 0.040-0.076 0.082-0.116 0.116z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57345,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 23,
-        "order": 19,
-        "prevSize": 32,
-        "code": 57345,
-        "name": "newdocument",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 18
-    },
-    {
-      "icon": {
-        "paths": [
-          "M960 880v-591.938l-223.938-224.062h-592.062c-44.182 0-80 35.816-80 80v736c0 44.184 35.818 80 80 80h736c44.184 0 80-35.816 80-80zM576 192h64v192h-64v-192zM704 832h-384v-255.882c0.034-0.042 0.076-0.082 0.116-0.118h383.77c0.040 0.036 0.082 0.076 0.116 0.118l-0.002 255.882zM832 832h-64v-256c0-35.2-28.8-64-64-64h-384c-35.2 0-64 28.8-64 64v256h-64v-640h64v192c0 35.2 28.8 64 64 64h320c35.2 0 64-28.8 64-64v-171.010l128 128.072v490.938z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57344,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 24,
-        "order": 20,
-        "prevSize": 32,
-        "code": 57344,
-        "name": "save",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 19
-    },
-    {
-      "icon": {
-        "paths": [
-          "M64 192v704h896v-704h-896zM384 640v-128h256v128h-256zM640 704v128h-256v-128h256zM640 320v128h-256v-128h256zM320 320v128h-192v-128h192zM128 512h192v128h-192v-128zM704 512h192v128h-192v-128zM704 448v-128h192v128h-192zM128 704h192v128h-192v-128zM704 832v-128h192v128h-192z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57371,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 25,
-        "order": 21,
-        "prevSize": 32,
-        "code": 57371,
-        "name": "table",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 20
-    },
-    {
-      "icon": {
-        "paths": [
-          "M512 140c99.366 0 192.782 38.694 263.042 108.956s108.958 163.678 108.958 263.044-38.696 192.782-108.958 263.042-163.676 108.958-263.042 108.958-192.782-38.696-263.044-108.958-108.956-163.676-108.956-263.042 38.694-192.782 108.956-263.044 163.678-108.956 263.044-108.956zM512 64c-247.424 0-448 200.576-448 448s200.576 448 448 448 448-200.576 448-448-200.576-448-448-448v0zM320 384c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM576 384c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM512 656c-101.84 0-192.56-36.874-251.166-94.328 23.126 117.608 126.778 206.328 251.166 206.328 124.388 0 228.040-88.72 251.168-206.328-58.608 57.454-149.328 94.328-251.168 94.328z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57377,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 26,
-        "order": 22,
-        "prevSize": 32,
-        "code": 57377,
-        "name": "emoticons",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 21
-    },
-    {
-      "icon": {
-        "paths": [
-          "M480 384l-192-192 128-128h-352v352l128-128 192 192zM640 480l192-192 128 128v-352h-352l128 128-192 192zM544 640l192 192-128 128h352v-352l-128 128-192-192zM384 544l-192 192-128-128v352h352l-128-128 192-192z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57379,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 27,
-        "order": 23,
-        "prevSize": 32,
-        "code": 57379,
-        "name": "fullscreen",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 22
-    },
-    {
-      "icon": {
-        "paths": [
-          "M64 448h896v128h-896z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57372,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 28,
-        "order": 24,
-        "prevSize": 32,
-        "code": 57372,
-        "name": "hr",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 23
-    },
-    {
-      "icon": {
-        "paths": [
-          "M64 768h512v128h-512v-128zM768 192h-220.558l-183.766 512h-132.288l183.762-512h-223.15v-128h576v128zM929.774 896l-129.774-129.774-129.774 129.774-62.226-62.226 129.774-129.774-129.774-129.774 62.226-62.226 129.774 129.774 129.774-129.774 62.226 62.226-129.774 129.774 129.774 129.774-62.226 62.226z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57373,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 29,
-        "order": 25,
-        "prevSize": 32,
-        "code": 57373,
-        "name": "removeformat",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 24
-    },
-    {
-      "icon": {
-        "paths": [
-          "M256 128h512v128h-512v-128zM896 320h-768c-35.2 0-64 28.8-64 64v256c0 35.2 28.796 64 64 64h128v192h512v-192h128c35.2 0 64-28.8 64-64v-256c0-35.2-28.8-64-64-64zM704 832h-384v-256h384v256zM910.4 416c0 25.626-20.774 46.4-46.398 46.4s-46.402-20.774-46.402-46.4 20.778-46.4 46.402-46.4c25.626 0 46.398 20.774 46.398 46.4z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57378,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 30,
-        "order": 26,
-        "prevSize": 32,
-        "code": 57378,
-        "name": "print",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 25
-    },
-    {
-      "icon": {
-        "paths": [
-          "M384 128c-123.712 0-224 100.288-224 224s100.288 224 224 224v320h128v-640h64v640h128v-640h128v-128h-448z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57390,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 31,
-        "order": 27,
-        "prevSize": 32,
-        "code": 57390,
-        "name": "visualchars",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 26
-    },
-    {
-      "icon": {
-        "paths": [
-          "M448 128c-123.712 0-224 100.288-224 224s100.288 224 224 224v320h128v-640h64v640h128v-640h128v-128h-448zM64 896l224-192-224-192z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57391,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 32,
-        "order": 28,
-        "prevSize": 32,
-        "code": 57391,
-        "name": "ltr",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 27
-    },
-    {
-      "icon": {
-        "paths": [
-          "M416 704l-192-192 192-192-64-64-256 256 256 256zM672 256l-64 64 192 192-192 192 64 64 256-256z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57367,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 38,
-        "order": 29,
-        "prevSize": 32,
-        "code": 57367,
-        "name": "code",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 28
-    },
-    {
-      "icon": {
-        "paths": [
-          "M448 704h128v128h-128v-128zM704 256c35.346 0 64 28.654 64 64v166l-228 154h-92v-64l192-128v-64h-320v-128h384zM512 64c-119.666 0-232.166 46.6-316.784 131.216-84.614 84.618-131.216 197.118-131.216 316.784 0 119.664 46.602 232.168 131.216 316.784 84.618 84.616 197.118 131.216 316.784 131.216 119.664 0 232.168-46.6 316.784-131.216 84.616-84.616 131.216-197.12 131.216-316.784 0-119.666-46.6-232.166-131.216-316.784-84.616-84.616-197.12-131.216-316.784-131.216z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57366,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 39,
-        "order": 30,
-        "prevSize": 32,
-        "code": 57366,
-        "name": "help",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 29
-    },
-    {
-      "icon": {
-        "paths": [
-          "M896 128h-768c-35.2 0-64 28.8-64 64v640c0 35.2 28.8 64 64 64h768c35.2 0 64-28.8 64-64v-640c0-35.2-28.8-64-64-64zM896 831.884c-0.012 0.014-0.030 0.028-0.042 0.042l-191.958-319.926-160 128-224-288-191.968 479.916c-0.010-0.010-0.022-0.022-0.032-0.032v-639.77c0.034-0.040 0.076-0.082 0.114-0.114h767.77c0.040 0.034 0.082 0.076 0.116 0.116v639.768zM640 352c0 53.019 42.981 96 96 96s96-42.981 96-96c0-53.019-42.981-96-96-96-53.019 0-96 42.981-96 96z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57364,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 40,
-        "order": 31,
-        "prevSize": 32,
-        "code": 57364,
-        "name": "image",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 30
-    },
-    {
-      "icon": {
-        "paths": [
-          "M896 128h-768c-35.2 0-64 28.8-64 64v640c0 35.2 28.8 64 64 64h768c35.2 0 64-28.8 64-64v-640c0-35.2-28.8-64-64-64zM256 832h-128v-128h128v128zM256 576h-128v-128h128v128zM256 320h-128v-128h128v128zM704 832h-384v-640h384v640zM896 832h-128v-128h128v128zM896 576h-128v-128h128v128zM896 320h-128v-128h128v128zM384 320v384l288-192z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57365,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 41,
-        "order": 32,
-        "prevSize": 32,
-        "code": 57365,
-        "name": "media",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 31
-    },
-    {
-      "icon": {
-        "paths": [
-          "M77.798 304.624l81.414 50.882c50.802-81.114 128.788-143.454 221.208-174.246l-30.366-91.094c-113.748 37.898-209.728 114.626-272.256 214.458zM673.946 90.166l-30.366 91.094c92.422 30.792 170.404 93.132 221.208 174.248l81.412-50.882c-62.526-99.834-158.506-176.562-272.254-214.46zM607.974 704.008c-4.808 0-9.692-1.090-14.286-3.386l-145.688-72.844v-211.778c0-17.672 14.328-32 32-32s32 14.328 32 32v172.222l110.31 55.156c15.806 7.902 22.214 27.124 14.31 42.932-5.604 11.214-16.908 17.696-28.646 17.698zM512 192c-212.078 0-384 171.922-384 384s171.922 384 384 384c212.078 0 384-171.922 384-384 0-212.078-171.922-384-384-384zM512 864c-159.058 0-288-128.942-288-288s128.942-288 288-288c159.058 0 288 128.942 288 288 0 159.058-128.942 288-288 288z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57368,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 42,
-        "order": 33,
-        "prevSize": 32,
-        "code": 57368,
-        "name": "insertdatetime",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 32
-    },
-    {
-      "icon": {
-        "paths": [
-          "M64 455.746c45.318-49.92 97.162-92.36 153.272-125.124 90.332-52.744 192.246-80.622 294.728-80.622 102.48 0 204.396 27.878 294.726 80.624 56.112 32.764 107.956 75.204 153.274 125.124v-117.432c-33.010-28.118-68.124-53.14-104.868-74.594-105.006-61.314-223.658-93.722-343.132-93.722s-238.128 32.408-343.134 93.72c-36.742 21.454-71.856 46.478-104.866 74.596v117.43zM512 320c-183.196 0-345.838 100.556-448 256 102.162 155.448 264.804 256 448 256 183.196 0 345.838-100.552 448-256-102.162-155.444-264.804-256-448-256zM512 512c0 35.346-28.654 64-64 64s-64-28.654-64-64c0-35.348 28.654-64 64-64s64 28.652 64 64zM728.066 696.662c-67.434 39.374-140.128 59.338-216.066 59.338s-148.632-19.964-216.066-59.338c-51.554-30.104-98.616-71.31-138.114-120.662 39.498-49.35 86.56-90.558 138.116-120.66 13.276-7.752 26.758-14.74 40.426-20.982-10.512 23.742-16.362 50.008-16.362 77.642 0 106.040 85.962 192 192 192 106.040 0 192-85.96 192-192 0-27.634-5.85-53.9-16.36-77.642 13.668 6.244 27.15 13.23 40.426 20.982 51.554 30.102 98.616 71.31 138.116 120.66-39.498 49.352-86.56 90.558-138.116 120.662z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57369,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 43,
-        "order": 34,
-        "prevSize": 32,
-        "code": 57369,
-        "name": "preview",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 33
-    },
-    {
-      "icon": {
-        "paths": [
-          "M651.168 283.834c-24.612-81.962-28.876-91.834-107.168-91.834h-64c-79.618 0-82.664 10.152-108.418 96 0 0.002 0 0.002-0.002 0.004l-143.998 479.996h113.636l57.6-192h226.366l57.6 192h113.63l-145.246-484.166zM437.218 448l38.4-136c10.086-33.618 36.38-30 36.38-30s26.294-3.618 36.38 30h0.004l38.4 136h-149.564z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57370,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 44,
-        "order": 35,
-        "prevSize": 32,
-        "code": 57370,
-        "name": "forecolor",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 34
-    },
-    {
-      "icon": {
-        "paths": [
-          "M576 64c247.424 0 448 200.576 448 448s-200.576 448-448 448v-96c94.024 0 182.418-36.614 248.902-103.098 66.484-66.484 103.098-154.878 103.098-248.902 0-94.022-36.614-182.418-103.098-248.902-66.484-66.484-154.878-103.098-248.902-103.098-94.022 0-182.418 36.614-248.902 103.098-51.14 51.138-84.582 115.246-97.306 184.902h186.208l-224 256-224-256h164.57c31.060-217.102 217.738-384 443.43-384zM768 448v128h-256v-320h128v192z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57384,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 45,
-        "order": 36,
-        "prevSize": 32,
-        "code": 57384,
-        "name": "restoredraft",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 35
-    },
-    {
-      "icon": {
-        "paths": [
-          "M1024 592.458v-160.916l-159.144-15.914c-8.186-30.042-20.088-58.548-35.21-84.98l104.596-127.838-113.052-113.050-127.836 104.596c-26.434-15.124-54.942-27.026-84.982-35.208l-15.914-159.148h-160.916l-15.914 159.146c-30.042 8.186-58.548 20.086-84.98 35.208l-127.838-104.594-113.050 113.050 104.596 127.836c-15.124 26.432-27.026 54.94-35.21 84.98l-159.146 15.916v160.916l159.146 15.914c8.186 30.042 20.086 58.548 35.21 84.982l-104.596 127.836 113.048 113.048 127.838-104.596c26.432 15.124 54.94 27.028 84.98 35.21l15.916 159.148h160.916l15.914-159.144c30.042-8.186 58.548-20.088 84.982-35.21l127.836 104.596 113.048-113.048-104.596-127.836c15.124-26.434 27.028-54.942 35.21-84.98l159.148-15.92zM704 576l-128 128h-128l-128-128v-128l128-128h128l128 128v128z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57346,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 46,
-        "order": 37,
-        "prevSize": 32,
-        "code": 57346,
-        "name": "fullpage",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 36
-    },
-    {
-      "icon": {
-        "paths": [
-          "M768 206v50h128v64h-192v-146l128-60v-50h-128v-64h192v146zM676 256h-136l-188 188-188-188h-136l256 256-256 256h136l188-188 188 188h136l-256-256z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57375,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 47,
-        "order": 38,
-        "prevSize": 32,
-        "code": 57375,
-        "name": "superscript",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 37
-    },
-    {
-      "icon": {
-        "paths": [
-          "M768 910v50h128v64h-192v-146l128-60v-50h-128v-64h192v146zM676 256h-136l-188 188-188-188h-136l256 256-256 256h136l188-188 188 188h136l-256-256z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57374,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 48,
-        "order": 39,
-        "prevSize": 32,
-        "code": 57374,
-        "name": "subscript",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 38
-    },
-    {
-      "icon": {
-        "paths": [
-          "M704 384v-160c0-17.6-14.4-32-32-32h-160v-64c0-35.2-28.8-64-64-64h-128c-35.204 0-64 28.8-64 64v64h-160c-17.602 0-32 14.4-32 32v512c0 17.6 14.398 32 32 32h224v192h576v-576h-192zM320 128.114c0.034-0.038 0.072-0.078 0.114-0.114h127.768c0.042 0.036 0.082 0.076 0.118 0.114l0 63.886h-128v-63.886zM192 320v-64h384v64h-384zM832 896h-448v-448h448v448zM448 512v128h32l32-64h64v192h-48v64h160v-64h-48v-192h64l32 64h32v-128z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "tags": [
-          "pastetext"
-        ],
-        "defaultCode": 57397,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 49,
-        "order": 40,
-        "prevSize": 32,
-        "code": 57397,
-        "name": "pastetext",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 39
-    },
-    {
-      "icon": {
-        "paths": [
-          "M768 256h64v64h-64zM640 384h64v64h-64zM640 512h64v64h-64zM640 640h64v64h-64zM512 512h64v64h-64zM512 640h64v64h-64zM384 640h64v64h-64zM768 384h64v64h-64zM768 512h64v64h-64zM768 640h64v64h-64zM768 768h64v64h-64zM640 768h64v64h-64zM512 768h64v64h-64zM384 768h64v64h-64zM256 768h64v64h-64z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "tags": [
-          "resize",
-          "dots"
-        ],
-        "defaultCode": 57394,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 50,
-        "order": 41,
-        "prevSize": 32,
-        "code": 57394,
-        "name": "resize",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 40
-    },
-    {
-      "icon": {
-        "paths": [
-          "M928 128h-416l-32-64h-352l-64 128h896zM840.34 704h87.66l32-448h-896l64 640h356.080c-104.882-37.776-180.080-138.266-180.080-256 0-149.982 122.018-272 272-272 149.98 0 272 122.018 272 272 0 21.678-2.622 43.15-7.66 64zM874.996 849.75l-134.496-110.692c17.454-28.922 27.5-62.814 27.5-99.058 0-106.040-85.96-192-192-192s-192 85.96-192 192 85.96 192 192 192c36.244 0 70.138-10.046 99.058-27.5l110.692 134.496c22.962 26.678 62.118 28.14 87.006 3.252l5.492-5.492c24.888-24.888 23.426-64.044-3.252-87.006zM576 764c-68.484 0-124-55.516-124-124s55.516-124 124-124 124 55.516 124 124-55.516 124-124 124z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "tags": [
-          "browse"
-        ],
-        "defaultCode": 57396,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 51,
-        "order": 42,
-        "prevSize": 32,
-        "code": 57396,
-        "name": "browse",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 41
-    },
-    {
-      "icon": {
-        "paths": [
-          "M864.408 670.132c-46.47-46.47-106.938-68.004-161.082-62.806l-63.326-63.326 192-192c0 0 128-128 0-256l-320 320-320-320c-128 128 0 256 0 256l192 192-63.326 63.326c-54.144-5.198-114.61 16.338-161.080 62.806-74.98 74.98-85.112 186.418-22.626 248.9 62.482 62.482 173.92 52.354 248.9-22.626 46.47-46.468 68.002-106.938 62.806-161.080l63.326-63.326 63.328 63.328c-5.196 54.144 16.336 114.61 62.806 161.078 74.978 74.98 186.418 85.112 248.898 22.626 62.488-62.482 52.356-173.918-22.624-248.9zM353.124 758.578c-2.212 24.332-15.020 49.826-35.14 69.946-22.212 22.214-51.080 35.476-77.218 35.476-10.524 0-25.298-2.228-35.916-12.848-21.406-21.404-17.376-73.132 22.626-113.136 22.212-22.214 51.080-35.476 77.218-35.476 10.524 0 25.298 2.228 35.916 12.848 13.112 13.11 13.47 32.688 12.514 43.19zM512 608c-35.346 0-64-28.654-64-64s28.654-64 64-64 64 28.654 64 64-28.654 64-64 64zM819.152 851.152c-10.62 10.62-25.392 12.848-35.916 12.848-26.138 0-55.006-13.262-77.218-35.476-20.122-20.12-32.928-45.614-35.138-69.946-0.958-10.502-0.6-30.080 12.514-43.192 10.618-10.622 25.39-12.848 35.916-12.848 26.136 0 55.006 13.262 77.216 35.474 40.004 40.008 44.032 91.736 22.626 113.14z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57351,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 14,
-        "order": 43,
-        "prevSize": 32,
-        "code": 57351,
-        "name": "cut",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 42
-    },
-    {
-      "icon": {
-        "paths": [
-          "M64 192h896v128h-896zM64 576h896v128h-896zM64 384h896v128h-896zM64 768h896v128h-896z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57350,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 15,
-        "order": 44,
-        "prevSize": 32,
-        "code": 57350,
-        "name": "alignjustify",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 43
-    },
-    {
-      "icon": {
-        "paths": [
-          "M64 192h896v128h-896zM64 576h896v128h-896zM256 384h512v128h-512zM256 768h512v128h-512z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57348,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 16,
-        "order": 45,
-        "prevSize": 32,
-        "code": 57348,
-        "name": "aligncenter",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 44
-    },
-    {
-      "icon": {
-        "paths": [
-          "M64 192h896v128h-896zM64 576h896v128h-896zM384 384h576v128h-576zM384 768h576v128h-576z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57349,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 17,
-        "order": 46,
-        "prevSize": 32,
-        "code": 57349,
-        "name": "alignright",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 45
-    },
-    {
-      "icon": {
-        "paths": [
-          "M64 192h896v128h-896zM64 576h896v128h-896zM64 384h576v128h-576zM64 768h576v128h-576z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57347,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 18,
-        "order": 47,
-        "prevSize": 32,
-        "code": 57347,
-        "name": "alignleft",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 46
-    },
-    {
-      "icon": {
-        "paths": [
-          "M320 128c-123.712 0-224 100.288-224 224s100.288 224 224 224v320h128v-640h64v640h128v-640h128v-128h-448zM960 512l-224 192 224 192z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57392,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 33,
-        "order": 48,
-        "prevSize": 32,
-        "code": 57392,
-        "name": "rtl",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 47
-    },
-    {
-      "icon": {
-        "paths": [
-          "M512 384h128v64h-128zM512 768h128v64h-128zM576 576h128v64h-128zM768 576v192h-64v64h128v-256zM384 576h128v64h-128zM320 768h128v64h-128zM320 384h128v64h-128zM192 192v256h64v-192h64v-64zM704 448h128v-256h-64v192h-64zM64 64v896h896v-896h-896zM896 896h-768v-768h768v768zM192 576v256h64v-192h64v-64zM576 192h128v64h-128zM384 192h128v64h-128z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57382,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 34,
-        "order": 49,
-        "prevSize": 32,
-        "code": 57382,
-        "name": "template",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 48
-    },
-    {
-      "icon": {
-        "paths": [
-          "M816 64l16 384h-640l16-384h32l16 320h512l16-320h32zM208 960l-16-320h640l-16 320h-32l-16-256h-512l-16 256h-32zM64 512h128v64h-128zM256 512h128v64h-128zM448 512h128v64h-128zM640 512h128v64h-128zM832 512h128v64h-128z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57383,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 35,
-        "order": 50,
-        "prevSize": 32,
-        "code": 57383,
-        "name": "pagebreak",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 49
-    },
-    {
-      "icon": {
-        "paths": [
-          "M960 128v-64h-192c-35.202 0-64 28.8-64 64v320c0 15.856 5.858 30.402 15.496 41.614l-303.496 260.386-142-148-82 70 224 288 416-448h128v-64h-192v-320h192zM256 512h64v-384c0-35.2-28.8-64-64-64h-128c-35.2 0-64 28.8-64 64v384h64v-192h128v192zM128 256v-128h128v128h-128zM640 448v-96c0-35.2-8.8-64-44-64 35.2 0 44-28.8 44-64v-96c0-35.2-28.8-64-64-64h-192v448h192c35.2 0 64-28.8 64-64zM448 128h128v128h-128v-128zM448 320h128v128h-128v-128z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57380,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 36,
-        "order": 51,
-        "prevSize": 32,
-        "code": 57380,
-        "name": "spellcheck",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 50
-    },
-    {
-      "icon": {
-        "paths": [
-          "M448 512h-128v-128h128v-128h128v128h128v128h-128v128h-128v-128zM960 576v320h-896v-320h128v192h640v-192h128z"
-        ],
-        "attrs": [],
-        "isMulticolor": false,
-        "defaultCode": 57381,
-        "grid": 0
-      },
-      "attrs": [],
-      "properties": {
-        "id": 37,
-        "order": 52,
-        "prevSize": 32,
-        "code": 57381,
-        "name": "nonbreaking",
-        "ligatures": ""
-      },
-      "setIdx": 0,
-      "setId": 2,
-      "iconIdx": 51
-    },
-    {
-      "icon": {
-        "paths": [
-          "M256 352v-128c0-53.020 42.98-96 96-96h32v-128h-32c-123.712 0-224 100.288-224 224v128c0 53.020-42.98 96-96 96h-32v128h32c53.020 0 96 42.98 96 96v128c0 123.71 100.288 224 224 224h32v-128h-32c-53.020 0-96-42.98-96-96v-128c0-62.684-25.758-119.342-67.254-160 41.496-40.658 67.254-97.316 67.254-160z",
-          "M1024 352v-128c0-53.020-42.98-96-96-96h-32v-128h32c123.71 0 224 100.288 224 224v128c0 53.020 42.98 96 96 96h32v128h-32c-53.020 0-96 42.98-96 96v128c0 123.71-100.29 224-224 224h-32v-128h32c53.020 0 96-42.98 96-96v-128c0-62.684 25.758-119.342 67.254-160-41.496-40.658-67.254-97.316-67.254-160z",
-          "M768 320.882c0 70.692-57.308 128-128 128s-128-57.308-128-128c0-70.692 57.308-128 128-128s128 57.308 128 128z",
-          "M640 511.118c-70.692 0-128 57.308-128 128 0 68.732 32 123.216 130.156 127.852-29.19 41.126-73.156 57.366-130.156 62.7v76c0 0 256 22.332 256-266.55-0.25-70.694-57.306-128.002-128-128.002z"
-        ],
-        "width": 1280,
-        "attrs": [],
-        "isMulticolor": false,
-        "tags": [
-          "code",
-          "semicolon",
-          "curly-braces"
-        ],
-        "grid": 16
-      },
-      "attrs": [],
-      "properties": {
-        "order": 1,
-        "id": 0,
-        "prevSize": 16,
-        "code": 58883,
-        "name": "codesample"
-      },
-      "setIdx": 1,
-      "setId": 1,
-      "iconIdx": 0
-    }
-  ],
-  "height": 1024,
-  "metadata": {
-    "name": "tinymce-small"
-  },
-  "preferences": {
-    "showGlyphs": true,
-    "showQuickUse": true,
-    "showQuickUse2": true,
-    "showSVGs": true,
-    "fontPref": {
-      "prefix": "icon-",
-      "metadata": {
-        "fontFamily": "tinymce-small",
-        "majorVersion": 1,
-        "minorVersion": 0
-      },
-      "metrics": {
-        "emSize": 1024,
-        "baseline": 6.25,
-        "whitespace": 50
-      },
-      "showMetrics": false,
-      "showMetadata": false,
-      "showVersion": false,
-      "embed": false
-    },
-    "imagePref": {
-      "prefix": "icon-",
-      "png": true,
-      "useClassSelector": true,
-      "color": 4473924,
-      "bgColor": 16777215
-    },
-    "historySize": 100,
-    "showCodes": true
-  }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.json b/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.json
deleted file mode 100644
index 37e02dd3a0..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/fonts/tinymce.json
+++ /dev/null
@@ -1,3469 +0,0 @@
-{
-    "IcoMoonType": "selection",
-    "icons": [
-    {
-      "icon": {
-        "paths": [
-          "M889.68 166.32c-93.608-102.216-228.154-166.32-377.68-166.32-282.77 0-512 229.23-512 512h96c0-229.75 186.25-416 416-416 123.020 0 233.542 53.418 309.696 138.306l-149.696 149.694h352v-352l-134.32 134.32z",
-          "M928 512c0 229.75-186.25 416-416 416-123.020 0-233.542-53.418-309.694-138.306l149.694-149.694h-352v352l134.32-134.32c93.608 102.216 228.154 166.32 377.68 166.32 282.77 0 512-229.23 512-512h-96z"
-        ],
-        "attrs": [
-          {},
-          {}
-        ],
-        "isMulticolor": false,
-        "isMulticolor2": false,
-        "grid": 16,
-        "tags": [
-          "reload"
-        ]
-      },
-      "attrs": [
-        {},
-        {}
-      ],
-      "properties": {
-        "order": 647,
-        "id": 120,
-        "name": "reload",
-        "prevSize": 32,
-        "code": 59654
-      },
-      "setIdx": 0,
-      "setId": 5,
-      "iconIdx": 0
-    },
-    {
-      "icon": {
-        "paths": [
-          "M0 64h128v128h-128v-128z",
-          "M192 64h832v128h-832v-128z",
-          "M0 448h128v128h-128v-128z",
-          "M192 448h832v128h-832v-128z",
-          "M0 832h128v128h-128v-128z",
-          "M192 832h832v128h-832v-128z",
-          "M192 256h128v128h-128v-128z",
-          "M384 256h640v128h-640v-128z",
-          "M192 640h128v128h-128v-128z",
-          "M384 640h640v128h-640v-128z"
-        ],
-        "attrs": [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
-        "isMulticolor": false,
-        "isMulticolor2": false,
-        "tags": [
-          "toc"
-        ],
-        "grid": 16
-      },
-      "attrs": [
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {}
-      ],
-      "properties": {
-        "order": 646,
-        "id": 1,
-        "name": "toc",
-        "prevSize": 32,
-        "code": 59649
-      },
-      "setIdx": 0,
-      "setId": 6,
-      "iconIdx": 1
-    },
-        {
-            "icon": {
-                "paths": [
-                    "M576.234 289.27l242.712-81.432 203.584 606.784-242.712 81.432zM0 896h256v-704h-256v704zM64 320h128v64h-128v-64zM320 896h256v-704h-256v704zM384 320h128v64h-128v-64z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "books",
-                    "library",
-                    "archive"
-                ],
-                "defaultCode": 57458,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 523,
-                "id": 1722,
-                "prevSize": 32,
-                "code": 59665,
-                "name": "books",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 0
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 416v192c0 17.672 14.328 32 32 32h960c17.672 0 32-14.328 32-32v-192c0-17.672-14.328-32-32-32h-960c-17.672 0-32 14.328-32 32z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "minus",
-                    "minimize",
-                    "subtract"
-                ],
-                "defaultCode": 58229,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 597,
-                "id": 1723,
-                "prevSize": 32,
-                "code": 59705,
-                "name": "minus",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 1
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M992 384h-352v-352c0-17.672-14.328-32-32-32h-192c-17.672 0-32 14.328-32 32v352h-352c-17.672 0-32 14.328-32 32v192c0 17.672 14.328 32 32 32h352v352c0 17.672 14.328 32 32 32h192c17.672 0 32-14.328 32-32v-352h352c17.672 0 32-14.328 32-32v-192c0-17.672-14.328-32-32-32z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "plus",
-                    "add",
-                    "sum"
-                ],
-                "defaultCode": 58230,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 598,
-                "id": 1724,
-                "prevSize": 32,
-                "code": 59706,
-                "name": "plus",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 2
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M521.6 44.8l-67.2 67.2-86.4-86.4-86.4 86.4 86.4 86.4-368 368 432 432 518.4-518.4-428.8-435.2zM435.2 825.6l-262.4-262.4 35.2-35.2 576-51.2-348.8 348.8zM953.6 550.4c-6.4 6.4-16 16-28.8 32-28.8 32-41.6 64-41.6 89.6v0 0 0 0 0 0 0c0 16 6.4 35.2 22.4 48 12.8 12.8 32 22.4 48 22.4s35.2-6.4 48-22.4 22.4-32 22.4-48v0 0 0 0 0 0 0c0-25.6-12.8-54.4-41.6-89.6-9.6-16-22.4-25.6-28.8-32v0z"
-                ],
-                "attrs": [
-                    {}
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "fill"
-                ],
-                "grid": 16
-            },
-            "attrs": [
-                {}
-            ],
-            "properties": {
-                "order": 599,
-                "id": 1695,
-                "prevSize": 32,
-                "code": 59650,
-                "name": "fill"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 3
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 694.4h1024v128h-1024v-128z",
-                    "M0 928h1024v64h-1024v-64z",
-                    "M0 393.6h1024v192h-1024v-192z",
-                    "M0 32h1024v256h-1024v-256z"
-                ],
-                "attrs": [
-                    {},
-                    {},
-                    {},
-                    {}
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "borderwidth"
-                ],
-                "grid": 16
-            },
-            "attrs": [
-                {},
-                {},
-                {},
-                {}
-            ],
-            "properties": {
-                "order": 524,
-                "id": 1696,
-                "prevSize": 32,
-                "code": 59651,
-                "name": "borderwidth"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 4
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M739.2 332.8l-502.4 502.4h-185.6v-185.6l502.4-502.4 185.6 185.6zM803.2 272l-185.6-185.6 67.2-67.2c22.4-22.4 54.4-22.4 76.8 0l108.8 108.8c22.4 22.4 22.4 54.4 0 76.8l-67.2 67.2zM41.6 912h940.8v112h-940.8v-112z"
-                ],
-                "attrs": [
-                    {}
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "line"
-                ],
-                "grid": 16
-            },
-            "attrs": [
-                {}
-            ],
-            "properties": {
-                "order": 525,
-                "id": 1697,
-                "prevSize": 32,
-                "code": 59652,
-                "name": "line"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 5
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 480h1024v64h-1024v-64z",
-                    "M304 48v339.2h-67.2v-272h-67.2v-67.2z",
-                    "M444.8 265.6v54.4h134.4v67.2h-201.6v-153.6l134.4-64v-54.4h-134.4v-67.2h201.6v153.6z",
-                    "M854.4 48v339.2h-204.8v-67.2h137.6v-67.2h-137.6v-70.4h137.6v-67.2h-137.6v-67.2z",
-                    "M115.2 793.6c3.2-57.6 38.4-83.2 108.8-83.2 38.4 0 67.2 9.6 86.4 25.6s25.6 35.2 25.6 70.4v112c0 25.6 0 28.8 9.6 41.6h-73.6c-3.2-9.6-3.2-9.6-6.4-19.2-22.4 19.2-41.6 25.6-70.4 25.6-54.4 0-89.6-32-89.6-76.8s28.8-70.4 99.2-80l38.4-6.4c16-3.2 22.4-6.4 22.4-16 0-12.8-12.8-22.4-38.4-22.4s-41.6 9.6-44.8 28.8h-67.2zM262.4 844.8c-6.4 3.2-12.8 6.4-25.6 6.4l-25.6 6.4c-25.6 6.4-38.4 16-38.4 28.8 0 16 12.8 25.6 35.2 25.6s41.6-9.6 54.4-32v-35.2z",
-                    "M390.4 624h73.6v112c22.4-16 41.6-22.4 67.2-22.4 64 0 105.6 51.2 105.6 124.8 0 76.8-44.8 134.4-108.8 134.4-32 0-48-9.6-67.2-35.2v28.8h-70.4v-342.4zM460.8 838.4c0 41.6 22.4 70.4 51.2 70.4s51.2-28.8 51.2-70.4c0-44.8-19.2-70.4-51.2-70.4-28.8 0-51.2 28.8-51.2 70.4z",
-                    "M851.2 806.4c-3.2-22.4-19.2-35.2-44.8-35.2-32 0-51.2 25.6-51.2 70.4 0 48 19.2 73.6 51.2 73.6 25.6 0 41.6-12.8 44.8-41.6l70.4 3.2c-9.6 60.8-54.4 96-118.4 96-73.6 0-121.6-51.2-121.6-128 0-80 48-131.2 124.8-131.2 64 0 108.8 35.2 112 96h-67.2z"
-                ],
-                "attrs": [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "count"
-                ],
-                "grid": 16
-            },
-            "attrs": [
-                {},
-                {},
-                {},
-                {},
-                {},
-                {},
-                {}
-            ],
-            "properties": {
-                "order": 526,
-                "id": 1698,
-                "prevSize": 32,
-                "code": 59653,
-                "name": "count"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 6
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M553.6 656l-118.4-118.4c80-89.6 137.6-195.2 172.8-304h137.6v-92.8h-326.4v-92.8h-92.8v92.8h-326.4v92.8h518.4c-32 89.6-80 176-147.2 249.6-44.8-48-80-99.2-108.8-156.8h-92.8c35.2 76.8 80 147.2 137.6 211.2l-236.8 233.6 67.2 67.2 233.6-233.6 144 144c3.2 0 38.4-92.8 38.4-92.8zM816 419.2h-92.8l-208 560h92.8l51.2-140.8h220.8l51.2 140.8h92.8l-208-560zM691.2 745.6l76.8-201.6 76.8 201.6h-153.6z"
-                ],
-                "attrs": [
-                    {}
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "translate"
-                ],
-                "grid": 16
-            },
-            "attrs": [
-                {}
-            ],
-            "properties": {
-                "order": 527,
-                "id": 1699,
-                "prevSize": 32,
-                "code": 59655,
-                "name": "translate"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 7
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M576 64h128v128h-128v-128z",
-                    "M576 320h128v128h-128v-128z",
-                    "M320 320h128v128h-128v-128z",
-                    "M576 576h128v128h-128v-128z",
-                    "M320 576h128v128h-128v-128z",
-                    "M320 832h128v128h-128v-128z",
-                    "M576 832h128v128h-128v-128z",
-                    "M320 64h128v128h-128v-128z"
-                ],
-                "attrs": [
-                    {
-                        "opacity": 1,
-                        "visibility": false
-                    },
-                    {
-                        "opacity": 1,
-                        "visibility": false
-                    },
-                    {
-                        "opacity": 1,
-                        "visibility": false
-                    },
-                    {
-                        "opacity": 1,
-                        "visibility": false
-                    },
-                    {
-                        "opacity": 1,
-                        "visibility": false
-                    },
-                    {
-                        "opacity": 1,
-                        "visibility": false
-                    },
-                    {
-                        "opacity": 1,
-                        "visibility": false
-                    },
-                    {
-                        "opacity": 1,
-                        "visibility": false
-                    },
-                    {
-                        "opacity": 1,
-                        "visibility": false
-                    }
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "drag"
-                ],
-                "grid": 16
-            },
-            "attrs": [
-                {
-                    "opacity": 1,
-                    "visibility": false
-                },
-                {
-                    "opacity": 1,
-                    "visibility": false
-                },
-                {
-                    "opacity": 1,
-                    "visibility": false
-                },
-                {
-                    "opacity": 1,
-                    "visibility": false
-                },
-                {
-                    "opacity": 1,
-                    "visibility": false
-                },
-                {
-                    "opacity": 1,
-                    "visibility": false
-                },
-                {
-                    "opacity": 1,
-                    "visibility": false
-                },
-                {
-                    "opacity": 1,
-                    "visibility": false
-                },
-                {
-                    "opacity": 1,
-                    "visibility": false
-                }
-            ],
-            "properties": {
-                "order": 528,
-                "id": 1700,
-                "prevSize": 32,
-                "code": 59656,
-                "name": "drag",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 8
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M1024 590.444l-512-397.426-512 397.428v-162.038l512-397.426 512 397.428zM896 576v384h-256v-256h-256v256h-256v-384l384-288z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "home"
-                ],
-                "defaultCode": 57345,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 529,
-                "id": 1701,
-                "prevSize": 32,
-                "code": 59659,
-                "name": "home",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 9
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M839.432 199.43c27.492 27.492 50.554 78.672 55.552 120.57h-318.984v-318.984c41.898 4.998 93.076 28.060 120.568 55.552l142.864 142.862zM512 384v-384h-368c-44 0-80 36-80 80v864c0 44 36 80 80 80h672c44 0 80-36 80-80v-560h-384zM576 768v192h-192v-192h-160l256-256 256 256h-160z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "upload"
-                ],
-                "defaultCode": 57474,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 530,
-                "id": 1702,
-                "prevSize": 32,
-                "code": 59668,
-                "name": "upload",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 10
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M928 64h-832c-52.8 0-96 43.2-96 96v512c0 52.8 43.2 96 96 96h160v256l307.2-256h364.8c52.8 0 96-43.2 96-96v-512c0-52.8-43.2-96-96-96zM896 640h-379.142l-196.858 174.714v-174.714h-192v-448h768v448z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "bubble"
-                ],
-                "defaultCode": 57703,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 600,
-                "id": 1703,
-                "prevSize": 32,
-                "code": 59676,
-                "name": "bubble",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 11
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M622.826 702.736c-22.11-3.518-22.614-64.314-22.614-64.314s64.968-64.316 79.128-150.802c38.090 0 61.618-91.946 23.522-124.296 1.59-34.054 48.96-267.324-190.862-267.324-239.822 0-192.45 233.27-190.864 267.324-38.094 32.35-14.57 124.296 23.522 124.296 14.158 86.486 79.128 150.802 79.128 150.802s-0.504 60.796-22.614 64.314c-71.22 11.332-337.172 128.634-337.172 257.264h896c0-128.63-265.952-245.932-337.174-257.264z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "user"
-                ],
-                "defaultCode": 57733,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 601,
-                "id": 1704,
-                "prevSize": 32,
-                "code": 59677,
-                "name": "user",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 12
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M592 448h-16v-192c0-105.87-86.13-192-192-192h-128c-105.87 0-192 86.13-192 192v192h-16c-26.4 0-48 21.6-48 48v480c0 26.4 21.6 48 48 48h544c26.4 0 48-21.6 48-48v-480c0-26.4-21.6-48-48-48zM192 256c0-35.29 28.71-64 64-64h128c35.29 0 64 28.71 64 64v192h-256v-192z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "lock"
-                ],
-                "defaultCode": 57811,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 602,
-                "id": 1705,
-                "prevSize": 32,
-                "code": 59686,
-                "name": "lock"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 13
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M768 64c105.87 0 192 86.13 192 192v192h-128v-192c0-35.29-28.71-64-64-64h-128c-35.29 0-64 28.71-64 64v192h16c26.4 0 48 21.6 48 48v480c0 26.4-21.6 48-48 48h-544c-26.4 0-48-21.6-48-48v-480c0-26.4 21.6-48 48-48h400v-192c0-105.87 86.13-192 192-192h128z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "unlock"
-                ],
-                "defaultCode": 57812,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 603,
-                "id": 1706,
-                "prevSize": 32,
-                "code": 59687,
-                "name": "unlock"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 14
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M448 128v-16c0-26.4-21.6-48-48-48h-160c-26.4 0-48 21.6-48 48v16h-192v128h192v16c0 26.4 21.6 48 48 48h160c26.4 0 48-21.6 48-48v-16h576v-128h-576zM256 256v-128h128v128h-128zM832 432c0-26.4-21.6-48-48-48h-160c-26.4 0-48 21.6-48 48v16h-576v128h576v16c0 26.4 21.6 48 48 48h160c26.4 0 48-21.6 48-48v-16h192v-128h-192v-16zM640 576v-128h128v128h-128zM448 752c0-26.4-21.6-48-48-48h-160c-26.4 0-48 21.6-48 48v16h-192v128h192v16c0 26.4 21.6 48 48 48h160c26.4 0 48-21.6 48-48v-16h576v-128h-576v-16zM256 896v-128h128v128h-128z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "settings"
-                ],
-                "defaultCode": 57819,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 604,
-                "id": 1707,
-                "prevSize": 32,
-                "code": 59688,
-                "name": "settings",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 15
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M192 1024h640l64-704h-768zM640 128v-128h-256v128h-320v192l64-64h768l64 64v-192h-320zM576 128h-128v-64h128v64z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "remove2"
-                ],
-                "defaultCode": 57935,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 605,
-                "id": 1708,
-                "prevSize": 32,
-                "code": 59690,
-                "name": "remove2",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 16
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M384 64h256v256h-256zM384 384h256v256h-256zM384 704h256v256h-256z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "menu"
-                ],
-                "defaultCode": 58025,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 606,
-                "id": 1709,
-                "prevSize": 32,
-                "code": 59693,
-                "name": "menu",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 17
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M1009.956 915.76l-437.074-871.112c-16.742-29.766-38.812-44.648-60.882-44.648s-44.14 14.882-60.884 44.648l-437.074 871.112c-33.486 59.532-5 108.24 63.304 108.24h869.308c68.302 0 96.792-48.708 63.302-108.24zM512 896c-35.346 0-64-28.654-64-64 0-35.348 28.654-64 64-64 35.348 0 64 28.652 64 64 0 35.346-28.652 64-64 64zM556 704h-88l-20-256c0-35.346 28.654-64 64-64s64 28.654 64 64l-20 256z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "warning"
-                ],
-                "defaultCode": 58198,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 531,
-                "id": 1710,
-                "prevSize": 32,
-                "code": 59696,
-                "name": "warning"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 18
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M448 704h128v128h-128zM704 256c35.346 0 64 28.654 64 64v192l-192 128h-128v-64l192-128v-64h-320v-128h384zM512 96c-111.118 0-215.584 43.272-294.156 121.844s-121.844 183.038-121.844 294.156c0 111.118 43.272 215.584 121.844 294.156 78.572 78.572 183.038 121.844 294.156 121.844 111.118 0 215.584-43.272 294.156-121.844 78.572-78.572 121.844-183.038 121.844-294.156 0-111.118-43.272-215.584-121.844-294.156-78.572-78.572-183.038-121.844-294.156-121.844zM512 0v0c282.77 0 512 229.23 512 512s-229.23 512-512 512c-282.77 0-512-229.23-512-512 0-282.77 229.23-512 512-512z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "question"
-                ],
-                "defaultCode": 58201,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 532,
-                "id": 1711,
-                "prevSize": 32,
-                "code": 59697,
-                "name": "question",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 19
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM512 896c-212.078 0-384-171.922-384-384s171.922-384 384-384c212.078 0 384 171.922 384 384 0 212.078-171.922 384-384 384zM768 576h-192v192h-128v-192h-192v-128h192v-192h128v192h192z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "pluscircle"
-                ],
-                "defaultCode": 58206,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 533,
-                "id": 1712,
-                "prevSize": 32,
-                "code": 59698,
-                "name": "pluscircle",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 20
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM448 192h128v128h-128v-128zM640 832h-256v-64h64v-256h-64v-64h192v320h64v64z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "info"
-                ],
-                "defaultCode": 58211,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 534,
-                "id": 1713,
-                "prevSize": 32,
-                "code": 59699,
-                "name": "info"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 21
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M1024 736 736 0h-448l-288 288v448l288 288h448l288-288v-448l-288-288zM576 832h-128v-128h128v128zM576 576h-128v-384h128v384z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "notice"
-                ],
-                "defaultCode": 58218,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 535,
-                "id": 1714,
-                "prevSize": 32,
-                "code": 59700,
-                "name": "notice"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 22
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 640l192 192 320-320 320 320 192-192-511.998-512z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "arrowup"
-                ],
-                "defaultCode": 58288,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 536,
-                "id": 1715,
-                "prevSize": 32,
-                "code": 59707,
-                "name": "arrowup",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 23
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M384 0l-192 192 320 320-320 320 192 192 512-512z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "arrowright"
-                ],
-                "defaultCode": 58289,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 537,
-                "id": 1716,
-                "prevSize": 32,
-                "code": 59708,
-                "name": "arrowright",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 24
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M1024 384l-192-192-320 320-320-320-192 192 512 511.998z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "arrowdown"
-                ],
-                "defaultCode": 58290,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 538,
-                "id": 1717,
-                "prevSize": 32,
-                "code": 59709,
-                "name": "arrowdown",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 25
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M768 640l-256-256-256 256z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "arrowup2"
-                ],
-                "defaultCode": 58292,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 539,
-                "id": 1718,
-                "prevSize": 32,
-                "code": 59711,
-                "name": "arrowup2",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 26
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M256 384l256 256 256-256z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "arrowdown2"
-                ],
-                "defaultCode": 58294,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 540,
-                "id": 1719,
-                "prevSize": 32,
-                "code": 59712,
-                "name": "arrowdown2",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 27
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M256 256l256 256 256-256zM255.996 575.996l256 256 256-256z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "menu2"
-                ],
-                "defaultCode": 58393,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 541,
-                "id": 1720,
-                "prevSize": 32,
-                "code": 59713,
-                "name": "menu2",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 28
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M704 576l128-128v512h-768v-768h512l-128 128h-256v512h512zM960 64v352l-130.744-130.744-354.746 354.744h-90.51v-90.512l354.744-354.744-130.744-130.744z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "newtab"
-                ],
-                "defaultCode": 58492,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 607,
-                "id": 1721,
-                "prevSize": 32,
-                "code": 59745,
-                "name": "newtab",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 29
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M960 256v-64l-448 128-448-128v64l320 128v256l-128 448h64l192-448 192 448h64l-128-448v-256zM416 160q0-40 28-68t68-28 68 28 28 68-28 68-68 28-68-28-28-68z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "grid": 16,
-                "tags": [
-                    "a11y"
-                ]
-            },
-            "attrs": [],
-            "properties": {
-                "order": 608,
-                "id": 1694,
-                "prevSize": 32,
-                "code": 59648,
-                "name": "a11y"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 30
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M892.8 982.4l-89.6-89.6c-70.4 80-172.8 131.2-288 131.2-208 0-380.8-166.4-384-377.6 0 0 0 0 0 0 0-3.2 0-3.2 0-6.4s0-3.2 0-6.4v0c0 0 0 0 0-3.2 0 0 0-3.2 0-3.2 3.2-105.6 48-211.2 105.6-304l-192-192 44.8-44.8 182.4 182.4c0 0 0 0 0 0l569.6 569.6c0 0 0 0 0 0l99.2 99.2-48 44.8zM896 633.6c0 0 0 0 0 0 0-3.2 0-6.4 0-6.4-9.6-316.8-384-627.2-384-627.2s-108.8 89.6-208 220.8l70.4 70.4c6.4-9.6 16-22.4 22.4-32 41.6-51.2 83.2-96 115.2-128v0c32 32 73.6 76.8 115.2 128 108.8 137.6 169.6 265.6 172.8 371.2 0 0 0 3.2 0 3.2v0 0c0 3.2 0 3.2 0 6.4s0 3.2 0 3.2v0 0c0 22.4-3.2 41.6-9.6 64l76.8 76.8c16-41.6 28.8-89.6 28.8-137.6 0 0 0 0 0 0 0-3.2 0-3.2 0-6.4s-0-3.2-0-6.4z"
-                ],
-                "attrs": [
-                    {}
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "invert"
-                ],
-                "grid": 16,
-                "defaultCode": 58882
-            },
-            "attrs": [
-                {}
-            ],
-            "properties": {
-                "order": 609,
-                "id": 0,
-                "prevSize": 32,
-                "code": 58882,
-                "name": "invert"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 31
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M928 128h-416l-32-64h-352l-64 128h896zM904.34 704h74.86l44.8-448h-1024l64 640h484.080c-104.882-37.776-180.080-138.266-180.080-256 0-149.982 122.018-272 272-272 149.98 0 272 122.018 272 272 0 21.678-2.622 43.15-7.66 64zM1002.996 913.75l-198.496-174.692c17.454-28.92 27.5-62.814 27.5-99.058 0-106.040-85.96-192-192-192s-192 85.96-192 192 85.96 192 192 192c36.244 0 70.138-10.046 99.058-27.5l174.692 198.496c22.962 26.678 62.118 28.14 87.006 3.252l5.492-5.492c24.888-24.888 23.426-64.044-3.252-87.006zM640 764c-68.484 0-124-55.516-124-124s55.516-124 124-124 124 55.516 124 124-55.516 124-124 124z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "defaultCode": 57396,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 0,
-                "order": 610,
-                "prevSize": 32,
-                "code": 57396,
-                "name": "browse",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 32
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M768 256h64v64h-64zM640 384h64v64h-64zM640 512h64v64h-64zM640 640h64v64h-64zM512 512h64v64h-64zM512 640h64v64h-64zM384 640h64v64h-64zM768 384h64v64h-64zM768 512h64v64h-64zM768 640h64v64h-64zM768 768h64v64h-64zM640 768h64v64h-64zM512 768h64v64h-64zM384 768h64v64h-64zM256 768h64v64h-64z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "resize",
-                    "dots"
-                ],
-                "defaultCode": 57394,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 1,
-                "order": 611,
-                "prevSize": 32,
-                "code": 57394,
-                "name": "resize",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 33
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M832 256h-192v-64l-192-192h-448v768h384v256h640v-576l-192-192zM832 346.51l101.49 101.49h-101.49v-101.49zM448 90.51l101.49 101.49h-101.49v-101.49zM64 64h320v192h192v448h-512v-640zM960 960h-512v-192h192v-448h128v192h192v448z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "copy"
-                ],
-                "defaultCode": 57393,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 2,
-                "order": 612,
-                "prevSize": 32,
-                "code": 57393,
-                "name": "copy",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 34
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M256 64h512v128h-128v768h-128v-768h-128v768h-128v-448c-123.712 0-224-100.288-224-224s100.288-224 224-224zM960 896l-256-224 256-224z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "rtl"
-                ],
-                "defaultCode": 57392,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 3,
-                "order": 613,
-                "prevSize": 32,
-                "code": 57392,
-                "name": "rtl",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 35
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M448 64h512v128h-128v768h-128v-768h-128v768h-128v-448c-123.712 0-224-100.288-224-224s100.288-224 224-224zM64 448l256 224-256 224z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "ltr"
-                ],
-                "defaultCode": 57391,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 4,
-                "order": 542,
-                "prevSize": 32,
-                "code": 57391,
-                "name": "ltr",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 36
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M384 64h512v128h-128v768h-128v-768h-128v768h-128v-448c-123.712 0-224-100.288-224-224s100.288-224 224-224z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "visualchars"
-                ],
-                "defaultCode": 57390,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 5,
-                "order": 543,
-                "prevSize": 32,
-                "code": 57390,
-                "name": "visualchars",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 37
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M731.42 517.036c63.92 47.938 100.58 116.086 100.58 186.964s-36.66 139.026-100.58 186.964c-59.358 44.518-137.284 69.036-219.42 69.036-82.138 0-160.062-24.518-219.42-69.036-63.92-47.938-100.58-116.086-100.58-186.964h128c0 69.382 87.926 128 192 128 104.074 0 192-58.618 192-128 0-69.382-87.926-128-192-128-82.138 0-160.062-24.518-219.42-69.036-63.92-47.94-100.58-116.086-100.58-186.964 0-70.878 36.66-139.024 100.58-186.964 59.358-44.518 137.282-69.036 219.42-69.036 82.136 0 160.062 24.518 219.42 69.036 63.92 47.94 100.58 116.086 100.58 186.964h-128c0-69.382-87.926-128-192-128-104.074 0-192 58.618-192 128 0 69.382 87.926 128 192 128 82.136 0 160.062 24.518 219.42 69.036zM0 512h1024v64h-1024z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "strikethrough"
-                ],
-                "defaultCode": 57389,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 6,
-                "order": 544,
-                "prevSize": 32,
-                "code": 57389,
-                "name": "strikethrough",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 38
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M704 64h128v416c0 159.058-143.268 288-320 288-176.73 0-320-128.942-320-288v-416h128v416c0 40.166 18.238 78.704 51.354 108.506 36.896 33.204 86.846 51.494 140.646 51.494 53.8 0 103.75-18.29 140.646-51.494 33.116-29.802 51.354-68.34 51.354-108.506v-416zM192 832h640v128h-640z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "underline"
-                ],
-                "defaultCode": 57388,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 7,
-                "order": 545,
-                "prevSize": 32,
-                "code": 57388,
-                "name": "underline",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 39
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M896 64v64h-128l-320 768h128v64h-448v-64h128l320-768h-128v-64z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "italic"
-                ],
-                "defaultCode": 57387,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 8,
-                "order": 546,
-                "prevSize": 32,
-                "code": 57387,
-                "name": "italic",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 40
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M707.88 484.652c37.498-44.542 60.12-102.008 60.12-164.652 0-141.16-114.842-256-256-256h-320v896h384c141.158 0 256-114.842 256-256 0-92.956-49.798-174.496-124.12-219.348zM384 192h101.5c55.968 0 101.5 57.42 101.5 128s-45.532 128-101.5 128h-101.5v-256zM543 832h-159v-256h159c58.45 0 106 57.42 106 128s-47.55 128-106 128z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "bold0"
-                ],
-                "defaultCode": 57386,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 9,
-                "order": 547,
-                "prevSize": 32,
-                "code": 57386,
-                "name": "bold",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 41
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M576 64c247.424 0 448 200.576 448 448s-200.576 448-448 448v-96c94.024 0 182.418-36.614 248.902-103.098 66.484-66.484 103.098-154.878 103.098-248.902 0-94.022-36.614-182.418-103.098-248.902-66.484-66.484-154.878-103.098-248.902-103.098-94.022 0-182.418 36.614-248.902 103.098-51.14 51.138-84.582 115.246-97.306 184.902h186.208l-224 256-224-256h164.57c31.060-217.102 217.738-384 443.43-384zM768 448v128h-256v-320h128v192z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "restoredraft"
-                ],
-                "defaultCode": 57384,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 11,
-                "order": 548,
-                "prevSize": 32,
-                "code": 57384,
-                "name": "restoredraft",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 42
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 512h128v64h-128zM192 512h192v64h-192zM448 512h128v64h-128zM640 512h192v64h-192zM896 512h128v64h-128zM880 0l16 448h-768l16-448h32l16 384h640l16-384zM144 1024l-16-384h768l-16 384h-32l-16-320h-640l-16 320z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "pagebreak"
-                ],
-                "defaultCode": 57383,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 12,
-                "order": 549,
-                "prevSize": 32,
-                "code": 57383,
-                "name": "pagebreak",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 43
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M384 192h128v64h-128zM576 192h128v64h-128zM896 192v256h-192v-64h128v-128h-64v-64zM320 384h128v64h-128zM512 384h128v64h-128zM192 256v128h64v64h-128v-256h192v64zM384 576h128v64h-128zM576 576h128v64h-128zM896 576v256h-192v-64h128v-128h-64v-64zM320 768h128v64h-128zM512 768h128v64h-128zM192 640v128h64v64h-128v-256h192v64zM960 64h-896v896h896v-896zM1024 0v0 1024h-1024v-1024h1024z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "template"
-                ],
-                "defaultCode": 57382,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 13,
-                "order": 550,
-                "prevSize": 32,
-                "code": 57382,
-                "name": "template",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 44
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M448 576h-192v-128h192v-192h128v192h192v128h-192v192h-128zM1024 640v384h-1024v-384h128v256h768v-256z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "nonbreaking"
-                ],
-                "defaultCode": 57381,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 14,
-                "order": 551,
-                "prevSize": 32,
-                "code": 57381,
-                "name": "nonbreaking",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 45
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M128 256h128v192h64v-384c0-35.2-28.8-64-64-64h-128c-35.2 0-64 28.8-64 64v384h64v-192zM128 64h128v128h-128v-128zM960 64v-64h-192c-35.202 0-64 28.8-64 64v320c0 35.2 28.798 64 64 64h192v-64h-192v-320h192zM640 160v-96c0-35.2-28.8-64-64-64h-192v448h192c35.2 0 64-28.8 64-64v-96c0-35.2-8.8-64-44-64 35.2 0 44-28.8 44-64zM576 384h-128v-128h128v128zM576 192h-128v-128h128v128zM832 576l-416 448-224-288 82-70 142 148 352-302z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "spellchecker"
-                ],
-                "defaultCode": 57380,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 15,
-                "order": 552,
-                "prevSize": 32,
-                "code": 57380,
-                "name": "spellchecker",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 46
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M704 896h256l64-128v256h-384v-214.214c131.112-56.484 224-197.162 224-361.786 0-214.432-157.598-382.266-352-382.266-194.406 0-352 167.832-352 382.266 0 164.624 92.886 305.302 224 361.786v214.214h-384v-256l64 128h256v-32.59c-187.63-66.46-320-227.402-320-415.41 0-247.424 229.23-448 512-448 282.77 0 512 200.576 512 448 0 188.008-132.37 348.95-320 415.41v32.59z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "charmap"
-                ],
-                "defaultCode": 57376,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 19,
-                "order": 614,
-                "prevSize": 32,
-                "code": 57376,
-                "name": "charmap",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 47
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M768 206v50h128v64h-192v-146l128-60v-50h-128v-64h192v146zM676 256h-136l-188 188-188-188h-136l256 256-256 256h136l188-188 188 188h136l-256-256z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "sup"
-                ],
-                "defaultCode": 57375,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 20,
-                "order": 615,
-                "prevSize": 32,
-                "code": 57375,
-                "name": "sup",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 48
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M768 910v50h128v64h-192v-146l128-60v-50h-128v-64h192v146zM676 256h-136l-188 188-188-188h-136l256 256-256 256h136l188-188 188 188h136l-256-256z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "sub"
-                ],
-                "defaultCode": 57374,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 21,
-                "order": 616,
-                "prevSize": 32,
-                "code": 57374,
-                "name": "sub",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 49
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 896h576v128h-576zM192 0h704v128h-704zM277.388 832l204.688-784.164 123.85 32.328-196.25 751.836zM929.774 1024l-129.774-129.774-129.774 129.774-62.226-62.226 129.774-129.774-129.774-129.774 62.226-62.226 129.774 129.774 129.774-129.774 62.226 62.226-129.774 129.774 129.774 129.774z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "removeformat"
-                ],
-                "defaultCode": 57373,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 22,
-                "order": 617,
-                "prevSize": 32,
-                "code": 57373,
-                "name": "removeformat",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 50
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 448h1024v128h-1024z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "hr"
-                ],
-                "defaultCode": 57372,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 23,
-                "order": 618,
-                "prevSize": 32,
-                "code": 57372,
-                "name": "hr",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 51
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64v896h1024v-896h-1024zM384 640v-192h256v192h-256zM640 704v192h-256v-192h256zM640 192v192h-256v-192h256zM320 192v192h-256v-192h256zM64 448h256v192h-256v-192zM704 448h256v192h-256v-192zM704 384v-192h256v192h-256zM64 704h256v192h-256v-192zM704 896v-192h256v192h-256z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "table"
-                ],
-                "defaultCode": 57371,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 24,
-                "order": 619,
-                "prevSize": 32,
-                "code": 57371,
-                "name": "table",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 52
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M322.018 832l57.6-192h264.764l57.6 192h113.632l-191.996-640h-223.236l-192 640h113.636zM475.618 320h72.764l57.6 192h-187.964l57.6-192z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "forecolor"
-                ],
-                "defaultCode": 57370,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 25,
-                "order": 620,
-                "prevSize": 32,
-                "code": 57370,
-                "name": "forecolor",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 53
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M512 320c-209.368 0-395.244 100.556-512 256 116.756 155.446 302.632 256 512 256 209.368 0 395.244-100.554 512-256-116.756-155.444-302.632-256-512-256zM448 448c35.346 0 64 28.654 64 64s-28.654 64-64 64-64-28.654-64-64 28.654-64 64-64zM773.616 705.296c-39.648 20.258-81.652 35.862-124.846 46.376-44.488 10.836-90.502 16.328-136.77 16.328-46.266 0-92.282-5.492-136.768-16.324-43.194-10.518-85.198-26.122-124.846-46.376-63.020-32.202-120.222-76.41-167.64-129.298 47.418-52.888 104.62-97.1 167.64-129.298 32.336-16.522 66.242-29.946 101.082-40.040-19.888 30.242-31.468 66.434-31.468 105.336 0 106.040 85.962 192 192 192 106.038 0 192-85.96 192-192 0-38.902-11.582-75.094-31.466-105.34 34.838 10.096 68.744 23.52 101.082 40.042 63.022 32.198 120.218 76.408 167.638 129.298-47.42 52.886-104.618 97.1-167.638 129.296zM860.918 243.722c-108.72-55.554-226.112-83.722-348.918-83.722-122.806 0-240.198 28.168-348.918 83.722-58.772 30.032-113.732 67.904-163.082 112.076v109.206c55.338-58.566 120.694-107.754 192.194-144.29 99.62-50.904 207.218-76.714 319.806-76.714s220.186 25.81 319.804 76.716c71.502 36.536 136.858 85.724 192.196 144.29v-109.206c-49.35-44.174-104.308-82.046-163.082-112.078z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "preview"
-                ],
-                "defaultCode": 57369,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 26,
-                "order": 553,
-                "prevSize": 32,
-                "code": 57369,
-                "name": "preview",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 54
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M512 192c-212.076 0-384 171.922-384 384s171.922 384 384 384c212.074 0 384-171.922 384-384s-171.926-384-384-384zM715.644 779.646c-54.392 54.396-126.716 84.354-203.644 84.354s-149.25-29.958-203.646-84.354c-54.396-54.394-84.354-126.718-84.354-203.646s29.958-149.25 84.354-203.646c54.396-54.396 126.718-84.354 203.646-84.354s149.252 29.958 203.642 84.354c54.402 54.396 84.358 126.718 84.358 203.646s-29.958 149.252-84.356 203.646zM325.93 203.862l-42.94-85.878c-98.874 49.536-179.47 130.132-229.006 229.008l85.876 42.94c40.248-80.336 105.732-145.822 186.070-186.070zM884.134 389.93l85.878-42.938c-49.532-98.876-130.126-179.472-229.004-229.008l-42.944 85.878c80.338 40.248 145.824 105.732 186.070 186.068zM512 384h-64v192c0 10.11 4.7 19.11 12.022 24.972l-0.012 0.016 160 128 39.976-49.976-147.986-118.39v-176.622z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "inserttime"
-                ],
-                "defaultCode": 57368,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 27,
-                "order": 554,
-                "prevSize": 32,
-                "code": 57368,
-                "name": "inserttime",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 55
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M320 256l-256 256 256 256h128l-256-256 256-256zM704 256h-128l256 256-256 256h128l256-256z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "code"
-                ],
-                "defaultCode": 57367,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 28,
-                "order": 555,
-                "prevSize": 32,
-                "code": 57367,
-                "name": "code",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 56
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M448 704h128v128h-128zM704 256c35.346 0 64 28.654 64 64v192l-192 128h-128v-64l192-128v-64h-320v-128h384zM512 96c-111.118 0-215.584 43.272-294.156 121.844s-121.844 183.038-121.844 294.156c0 111.118 43.272 215.584 121.844 294.156 78.572 78.572 183.038 121.844 294.156 121.844 111.118 0 215.584-43.272 294.156-121.844 78.572-78.572 121.844-183.038 121.844-294.156 0-111.118-43.272-215.584-121.844-294.156-78.572-78.572-183.038-121.844-294.156-121.844zM512 0v0c282.77 0 512 229.23 512 512s-229.23 512-512 512c-282.77 0-512-229.23-512-512 0-282.77 229.23-512 512-512z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "help"
-                ],
-                "defaultCode": 57366,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 29,
-                "order": 556,
-                "prevSize": 32,
-                "code": 57366,
-                "name": "help",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 57
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 128v768h1024v-768h-1024zM192 832h-128v-128h128v128zM192 576h-128v-128h128v128zM192 320h-128v-128h128v128zM768 832h-512v-640h512v640zM960 832h-128v-128h128v128zM960 576h-128v-128h128v128zM960 320h-128v-128h128v128zM384 320v384l256-192z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "media"
-                ],
-                "defaultCode": 57365,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 30,
-                "order": 557,
-                "prevSize": 32,
-                "code": 57365,
-                "name": "media",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 58
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 128v832h1024v-832h-1024zM960 896h-896v-704h896v704zM704 352c0-53.019 42.981-96 96-96s96 42.981 96 96c0 53.019-42.981 96-96 96-53.019 0-96-42.981-96-96zM896 832h-768l192-512 256 320 128-96z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "image"
-                ],
-                "defaultCode": 57364,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 31,
-                "order": 558,
-                "prevSize": 32,
-                "code": 57364,
-                "name": "image",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 59
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M192 0v1024l320-320 320 320v-1024h-640zM768 869.49l-256-256-256 256v-805.49h512v805.49z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "anchor"
-                ],
-                "defaultCode": 57363,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 32,
-                "order": 559,
-                "prevSize": 32,
-                "code": 57363,
-                "name": "anchor",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 60
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M476.888 675.114c4.56 9.048 6.99 19.158 6.99 29.696 0 17.616-6.744 34.058-18.992 46.308l-163.38 163.38c-12.248 12.248-28.696 18.992-46.308 18.992s-34.060-6.744-46.308-18.992l-99.38-99.38c-12.248-12.25-18.992-28.696-18.992-46.308s6.744-34.060 18.992-46.308l163.38-163.382c12.248-12.246 28.696-18.992 46.308-18.992 10.538 0 20.644 2.43 29.696 6.988l65.338-65.336c-27.87-21.41-61.44-32.16-95.034-32.16-39.986 0-79.972 15.166-110.308 45.502l-163.38 163.382c-60.67 60.67-60.67 159.95 0 220.618l99.38 99.382c30.334 30.332 70.32 45.5 110.306 45.5 39.988 0 79.974-15.168 110.308-45.502l163.38-163.38c55.82-55.82 60.238-144.298 13.344-205.346l-65.34 65.338zM978.496 144.884l-99.38-99.382c-30.334-30.336-70.32-45.502-110.308-45.502-39.986 0-79.97 15.166-110.306 45.502l-163.382 163.382c-55.82 55.82-60.238 144.298-13.342 205.342l65.338-65.34c-4.558-9.050-6.988-19.16-6.988-29.694 0-17.616 6.744-34.060 18.992-46.308l163.382-163.382c12.246-12.248 28.694-18.994 46.306-18.994 17.616 0 34.060 6.746 46.308 18.994l99.38 99.382c12.248 12.248 18.992 28.694 18.992 46.308s-6.744 34.060-18.992 46.308l-163.38 163.382c-12.248 12.248-28.694 18.992-46.308 18.992-10.536 0-20.644-2.43-29.696-6.99l-65.338 65.338c27.872 21.41 61.44 32.16 95.034 32.16 39.988 0 79.974-15.168 110.308-45.504l163.38-163.38c60.672-60.666 60.672-159.944 0-220.614zM233.368 278.624l-191.994-191.994 45.256-45.256 191.994 191.994zM384 0h64v192h-64zM0 384h192v64h-192zM790.632 745.376l191.996 191.996-45.256 45.256-191.996-191.996zM576 832h64v192h-64zM832 576h192v64h-192z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "unlink"
-                ],
-                "defaultCode": 57362,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 33,
-                "order": 560,
-                "prevSize": 32,
-                "code": 57362,
-                "name": "unlink",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 61
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M320 704c17.6 17.6 47.274 16.726 65.942-1.942l316.118-316.116c18.668-18.668 19.54-48.342 1.94-65.942s-47.274-16.726-65.942 1.942l-316.116 316.116c-18.668 18.668-19.542 48.342-1.942 65.942zM476.888 675.112c4.56 9.050 6.99 19.16 6.99 29.696 0 17.616-6.744 34.060-18.992 46.308l-163.382 163.382c-12.248 12.248-28.694 18.992-46.308 18.992s-34.060-6.744-46.308-18.992l-99.382-99.382c-12.248-12.248-18.992-28.694-18.992-46.308s6.744-34.060 18.992-46.308l163.382-163.382c12.248-12.248 28.694-18.994 46.308-18.994 10.536 0 20.644 2.43 29.696 6.99l65.338-65.338c-27.87-21.41-61.44-32.16-95.034-32.16-39.986 0-79.972 15.166-110.308 45.502l-163.382 163.382c-60.67 60.67-60.67 159.948 0 220.618l99.382 99.382c30.334 30.332 70.32 45.5 110.306 45.5 39.988 0 79.974-15.168 110.308-45.502l163.382-163.382c55.82-55.82 60.238-144.298 13.344-205.344l-65.34 65.34zM978.498 144.884l-99.382-99.382c-30.334-30.336-70.32-45.502-110.308-45.502-39.986 0-79.972 15.166-110.308 45.502l-163.382 163.382c-55.82 55.82-60.238 144.298-13.342 205.342l65.338-65.34c-4.558-9.050-6.988-19.16-6.988-29.694 0-17.616 6.744-34.060 18.992-46.308l163.382-163.382c12.248-12.248 28.694-18.994 46.308-18.994s34.060 6.746 46.308 18.994l99.382 99.382c12.248 12.248 18.992 28.694 18.992 46.308s-6.744 34.060-18.992 46.308l-163.382 163.382c-12.248 12.248-28.694 18.992-46.308 18.992-10.536 0-20.644-2.43-29.696-6.99l-65.338 65.338c27.872 21.41 61.44 32.16 95.034 32.16 39.988 0 79.974-15.168 110.308-45.502l163.382-163.382c60.67-60.666 60.67-159.944 0-220.614z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "link"
-                ],
-                "defaultCode": 57361,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 34,
-                "order": 561,
-                "prevSize": 32,
-                "code": 57361,
-                "name": "link",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 62
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64h1024v128h-1024zM384 256h640v128h-640zM384 448h640v128h-640zM384 640h640v128h-640zM0 832h1024v128h-1024zM256 320v384l-256-192z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "outdent"
-                ],
-                "defaultCode": 57357,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 38,
-                "order": 562,
-                "prevSize": 32,
-                "code": 57357,
-                "name": "outdent",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 63
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64h1024v128h-1024zM384 256h640v128h-640zM384 448h640v128h-640zM384 640h640v128h-640zM0 832h1024v128h-1024zM0 704v-384l256 192z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "indent"
-                ],
-                "defaultCode": 57356,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 39,
-                "order": 563,
-                "prevSize": 32,
-                "code": 57356,
-                "name": "indent",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 64
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M384 832h640v128h-640zM384 448h640v128h-640zM384 64h640v128h-640zM192 0v256h-64v-192h-64v-64zM128 526v50h128v64h-192v-146l128-60v-50h-128v-64h192v146zM256 704v320h-192v-64h128v-64h-128v-64h128v-64h-128v-64z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "numlist"
-                ],
-                "defaultCode": 57355,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 40,
-                "order": 621,
-                "prevSize": 32,
-                "code": 57355,
-                "name": "numlist",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 65
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M384 64h640v128h-640v-128zM384 448h640v128h-640v-128zM384 832h640v128h-640v-128zM0 128c0-70.692 57.308-128 128-128 70.692 0 128 57.308 128 128 0 70.692-57.308 128-128 128-70.692 0-128-57.308-128-128zM0 512c0-70.692 57.308-128 128-128 70.692 0 128 57.308 128 128 0 70.692-57.308 128-128 128-70.692 0-128-57.308-128-128zM0 896c0-70.692 57.308-128 128-128 70.692 0 128 57.308 128 128 0 70.692-57.308 128-128 128-70.692 0-128-57.308-128-128z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "bullist"
-                ],
-                "defaultCode": 57354,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 41,
-                "order": 622,
-                "prevSize": 32,
-                "code": 57354,
-                "name": "bullist",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 66
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M64 0h384v64h-384zM576 0h384v64h-384zM952 320h-56v-256h-256v256h-256v-256h-256v256h-56c-39.6 0-72 32.4-72 72v560c0 39.6 32.4 72 72 72h304c39.6 0 72-32.4 72-72v-376h128v376c0 39.6 32.4 72 72 72h304c39.6 0 72-32.4 72-72v-560c0-39.6-32.4-72-72-72zM348 960h-248c-19.8 0-36-14.4-36-32s16.2-32 36-32h248c19.8 0 36 14.4 36 32s-16.2 32-36 32zM544 512h-64c-17.6 0-32-14.4-32-32s14.4-32 32-32h64c17.6 0 32 14.4 32 32s-14.4 32-32 32zM924 960h-248c-19.8 0-36-14.4-36-32s16.2-32 36-32h248c19.8 0 36 14.4 36 32s-16.2 32-36 32z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "searchreplace"
-                ],
-                "defaultCode": 57353,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 42,
-                "order": 623,
-                "prevSize": 32,
-                "code": 57353,
-                "name": "searchreplace",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 67
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M832 320v-160c0-17.6-14.4-32-32-32h-224v-64c0-35.2-28.8-64-64-64h-128c-35.204 0-64 28.8-64 64v64h-224c-17.602 0-32 14.4-32 32v640c0 17.6 14.398 32 32 32h288v192h448l192-192v-512h-192zM384 64.114c0.034-0.038 0.072-0.078 0.114-0.114h127.768c0.042 0.036 0.082 0.076 0.118 0.114l0 63.886h-128v-63.886zM192 256v-64h512v64h-512zM832 933.49v-101.49h101.49l-101.49 101.49zM960 768h-192v192h-320v-576h512v384z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "paste"
-                ],
-                "defaultCode": 57352,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 43,
-                "order": 624,
-                "prevSize": 32,
-                "code": 57352,
-                "name": "paste",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 68
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M890.774 709.154c-45.654-45.556-103.728-69.072-157.946-69.072h-29.112l-63.904-64.008 255.62-256.038c63.904-64.010 63.904-192.028 0-256.038l-383.43 384.056-383.432-384.054c-63.904 64.008-63.904 192.028 0 256.038l255.622 256.034-63.906 64.008h-29.114c-54.22 0-112.292 23.518-157.948 69.076-81.622 81.442-92.65 202.484-24.63 270.35 29.97 29.902 70.288 44.494 112.996 44.494 54.216 0 112.29-23.514 157.946-69.072 53.584-53.464 76.742-124 67.084-185.348l65.384-65.488 65.376 65.488c-9.656 61.348 13.506 131.882 67.084 185.348 45.662 45.558 103.732 69.072 157.948 69.072 42.708 0 83.024-14.592 112.994-44.496 68.020-67.866 56.988-188.908-24.632-270.35zM353.024 845.538c-7.698 17.882-19.010 34.346-33.626 48.926-14.636 14.604-31.172 25.918-49.148 33.624-16.132 6.916-32.96 10.568-48.662 10.568-15.146 0-36.612-3.402-52.862-19.612-16.136-16.104-19.52-37.318-19.52-52.288 0-15.542 3.642-32.21 10.526-48.212 7.7-17.884 19.014-34.346 33.626-48.926 14.634-14.606 31.172-25.914 49.15-33.624 16.134-6.914 32.96-10.568 48.664-10.568 15.146 0 36.612 3.4 52.858 19.614 16.134 16.098 19.522 37.316 19.522 52.284 0.002 15.542-3.638 32.216-10.528 48.214zM512.004 666.596c-49.914 0-90.376-40.532-90.376-90.526 0-49.992 40.462-90.52 90.376-90.52s90.372 40.528 90.372 90.52c0 49.998-40.46 90.526-90.372 90.526zM855.272 919.042c-16.248 16.208-37.712 19.612-52.86 19.612-15.704 0-32.53-3.652-48.666-10.568-17.972-7.706-34.508-19.020-49.142-33.624-14.614-14.58-25.926-31.042-33.626-48.926-6.886-15.998-10.526-32.672-10.526-48.212 0-14.966 3.384-36.188 19.52-52.286 16.246-16.208 37.712-19.614 52.86-19.614 15.7 0 32.53 3.654 48.66 10.568 17.978 7.708 34.516 19.018 49.15 33.624 14.61 14.58 25.924 31.042 33.626 48.926 6.884 15.998 10.526 32.67 10.526 48.212-0.002 14.97-3.39 36.186-19.522 52.288z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "cut"
-                ],
-                "defaultCode": 57351,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 44,
-                "order": 625,
-                "prevSize": 32,
-                "code": 57351,
-                "name": "cut",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 69
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64h1024v128h-1024zM0 256h1024v128h-1024zM0 448h1024v128h-1024zM0 640h1024v128h-1024zM0 832h1024v128h-1024z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "alignjustify"
-                ],
-                "defaultCode": 57350,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 45,
-                "order": 626,
-                "prevSize": 32,
-                "code": 57350,
-                "name": "alignjustify",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 70
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64h1024v128h-1024zM384 256h640v128h-640zM384 640h640v128h-640zM0 448h1024v128h-1024zM0 832h1024v128h-1024z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "alignright"
-                ],
-                "defaultCode": 57349,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 46,
-                "order": 627,
-                "prevSize": 32,
-                "code": 57349,
-                "name": "alignright",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 71
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64h1024v128h-1024zM192 256h640v128h-640zM192 640h640v128h-640zM0 448h1024v128h-1024zM0 832h1024v128h-1024z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "aligncenter"
-                ],
-                "defaultCode": 57348,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 47,
-                "order": 564,
-                "prevSize": 32,
-                "code": 57348,
-                "name": "aligncenter",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 72
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64h1024v128h-1024zM0 256h640v128h-640zM0 640h640v128h-640zM0 448h1024v128h-1024zM0 832h1024v128h-1024z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "alignleft"
-                ],
-                "defaultCode": 57347,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 48,
-                "order": 565,
-                "prevSize": 32,
-                "code": 57347,
-                "name": "alignleft",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 73
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M1024 592.458v-160.916l-159.144-15.914c-8.186-30.042-20.088-58.548-35.21-84.98l104.596-127.838-113.052-113.050-127.836 104.596c-26.434-15.124-54.942-27.026-84.982-35.208l-15.914-159.148h-160.916l-15.914 159.146c-30.042 8.186-58.548 20.086-84.98 35.208l-127.838-104.594-113.050 113.050 104.596 127.836c-15.124 26.432-27.026 54.94-35.21 84.98l-159.146 15.916v160.916l159.146 15.914c8.186 30.042 20.086 58.548 35.21 84.982l-104.596 127.836 113.048 113.048 127.838-104.596c26.432 15.124 54.94 27.028 84.98 35.21l15.916 159.148h160.916l15.914-159.144c30.042-8.186 58.548-20.088 84.982-35.21l127.836 104.596 113.048-113.048-104.596-127.836c15.124-26.434 27.028-54.942 35.21-84.98l159.148-15.92zM704 576l-128 128h-128l-128-128v-128l128-128h128l128 128v128z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "fullpage"
-                ],
-                "defaultCode": 57346,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 49,
-                "order": 566,
-                "prevSize": 32,
-                "code": 57346,
-                "name": "fullpage",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 74
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M903.432 199.43l-142.864-142.862c-31.112-31.112-92.568-56.568-136.568-56.568h-480c-44 0-80 36-80 80v864c0 44 36 80 80 80h736c44 0 80-36 80-80v-608c0-44-25.456-105.458-56.568-136.57zM858.178 244.686c3.13 3.13 6.25 6.974 9.28 11.314h-163.458v-163.456c4.34 3.030 8.184 6.15 11.314 9.28l142.864 142.862zM896 944c0 8.672-7.328 16-16 16h-736c-8.672 0-16-7.328-16-16v-864c0-8.672 7.328-16 16-16h480c4.832 0 10.254 0.61 16 1.704v254.296h254.296c1.094 5.746 1.704 11.166 1.704 16v608z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "newdocument"
-                ],
-                "defaultCode": 57345,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 50,
-                "order": 567,
-                "prevSize": 32,
-                "code": 57345,
-                "name": "newdocument",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 75
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M896 0h-896v1024h1024v-896l-128-128zM512 128h128v256h-128v-256zM896 896h-768v-768h64v320h576v-320h74.978l53.022 53.018v714.982z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "save"
-                ],
-                "defaultCode": 57344,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 51,
-                "order": 568,
-                "prevSize": 32,
-                "code": 57344,
-                "name": "save",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 76
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M128 544l288 288 480-480-128-128-352 352-160-160z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "defaultCode": 57395,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 52,
-                "order": 569,
-                "prevSize": 32,
-                "code": 57395,
-                "name": "checkbox",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 77
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M512 512v128h32l32-64h64v256h-48v64h224v-64h-48v-256h64l32 64h32v-128zM832 320v-160c0-17.6-14.4-32-32-32h-224v-64c0-35.2-28.8-64-64-64h-128c-35.204 0-64 28.8-64 64v64h-224c-17.602 0-32 14.4-32 32v640c0 17.6 14.398 32 32 32h288v192h640v-704h-192zM384 64.114c0.034-0.038 0.072-0.078 0.114-0.114h127.768c0.042 0.036 0.082 0.076 0.118 0.114l0 63.886h-128v-63.886zM192 256v-64h512v64h-512zM960 960h-512v-576h512v576z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "pastetext"
-                ],
-                "defaultCode": 57397,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 53,
-                "order": 570,
-                "prevSize": 32,
-                "code": 57397,
-                "name": "pastetext",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 78
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M1024 0v384l-138.26-138.26-212 212-107.48-107.48 212-212-138.26-138.26zM245.74 138.26l212 212-107.48 107.48-212-212-138.26 138.26v-384h384zM885.74 778.26l138.26-138.26v384h-384l138.26-138.26-212-212 107.48-107.48zM457.74 673.74l-212 212 138.26 138.26h-384v-384l138.26 138.26 212-212z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "fullscreen"
-                ],
-                "defaultCode": 57379,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 16,
-                "order": 571,
-                "prevSize": 32,
-                "code": 57379,
-                "name": "fullscreen",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 79
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M256 64h512v128h-512zM960 256h-896c-35.2 0-64 28.8-64 64v320c0 35.2 28.796 64 64 64h192v256h512v-256h192c35.2 0 64-28.8 64-64v-320c0-35.2-28.8-64-64-64zM704 896h-384v-320h384v320zM974.4 352c0 25.626-20.774 46.4-46.398 46.4-25.626 0-46.402-20.774-46.402-46.4s20.776-46.4 46.402-46.4c25.626 0 46.398 20.774 46.398 46.4z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "print"
-                ],
-                "defaultCode": 57378,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 17,
-                "order": 572,
-                "prevSize": 32,
-                "code": 57378,
-                "name": "print",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 80
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M512 0c-282.77 0-512 229.228-512 512 0 282.77 229.228 512 512 512 282.77 0 512-229.23 512-512 0-282.772-229.23-512-512-512zM512 944c-238.586 0-432-193.412-432-432 0-238.586 193.414-432 432-432 238.59 0 432 193.414 432 432 0 238.588-193.41 432-432 432zM384 320c0 35.346-28.654 64-64 64s-64-28.654-64-64 28.654-64 64-64 64 28.654 64 64zM768 320c0 35.346-28.652 64-64 64s-64-28.654-64-64 28.652-64 64-64 64 28.654 64 64zM512 652c141.074 0 262.688-57.532 318.462-123.192-20.872 171.22-156.288 303.192-318.462 303.192-162.118 0-297.498-132.026-318.444-303.168 55.786 65.646 177.386 123.168 318.444 123.168z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "emoticons"
-                ],
-                "defaultCode": 57377,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 18,
-                "order": 573,
-                "prevSize": 32,
-                "code": 57377,
-                "name": "emoticons",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 81
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M225 448c123.712 0 224 100.29 224 224 0 123.712-100.288 224-224 224-123.712 0-224-100.288-224-224l-1-32c0-247.424 200.576-448 448-448v128c-85.474 0-165.834 33.286-226.274 93.726-11.634 11.636-22.252 24.016-31.83 37.020 11.438-1.8 23.16-2.746 35.104-2.746zM801 448c123.71 0 224 100.29 224 224 0 123.712-100.29 224-224 224-123.71 0-224-100.288-224-224l-1-32c0-247.424 200.576-448 448-448v128c-85.474 0-165.834 33.286-226.274 93.726-11.636 11.636-22.254 24.016-31.832 37.020 11.44-1.8 23.16-2.746 35.106-2.746z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "blockquote"
-                ],
-                "defaultCode": 57358,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 37,
-                "order": 574,
-                "prevSize": 32,
-                "code": 57358,
-                "name": "blockquote",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 82
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M761.862 1024c113.726-206.032 132.888-520.306-313.862-509.824v253.824l-384-384 384-384v248.372c534.962-13.942 594.57 472.214 313.862 775.628z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "undo"
-                ],
-                "defaultCode": 57359,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 36,
-                "order": 628,
-                "prevSize": 32,
-                "code": 57359,
-                "name": "undo",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 83
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M576 248.372v-248.372l384 384-384 384v-253.824c-446.75-10.482-427.588 303.792-313.86 509.824-280.712-303.414-221.1-789.57 313.86-775.628z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "redo"
-                ],
-                "defaultCode": 57360,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 35,
-                "order": 629,
-                "prevSize": 32,
-                "code": 57360,
-                "name": "redo",
-                "ligatures": ""
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 84
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M199.995 381.998v-104.002c0-43.078 34.923-78.001 78.001-78.001h26v-104.002h-26c-100.518 0-182.003 81.485-182.003 182.003v104.002c0 43.078-34.923 78.001-78.001 78.001h-26v104.002h26c43.078 0 78.001 34.923 78.001 78.001v104.002c0 100.515 81.485 182.003 182.003 182.003h26v-104.002h-26c-43.078 0-78.001-34.923-78.001-78.001v-104.002c0-50.931-20.928-96.966-54.646-130.002 33.716-33.036 54.646-79.072 54.646-130.002z",
-                    "M824.005 381.998v-104.002c0-43.078-34.923-78.001-78.001-78.001h-26v-104.002h26c100.515 0 182.003 81.485 182.003 182.003v104.002c0 43.078 34.923 78.001 78.001 78.001h26v104.002h-26c-43.078 0-78.001 34.923-78.001 78.001v104.002c0 100.515-81.488 182.003-182.003 182.003h-26v-104.002h26c43.078 0 78.001-34.923 78.001-78.001v-104.002c0-50.931 20.928-96.966 54.646-130.002-33.716-33.036-54.646-79.072-54.646-130.002z",
-                    "M616.002 356.715c0 57.439-46.562 104.002-104.002 104.002s-104.002-46.562-104.002-104.002c0-57.439 46.562-104.002 104.002-104.002s104.002 46.562 104.002 104.002z",
-                    "M512 511.283c-57.439 0-104.002 46.562-104.002 104.002 0 55.845 26 100.115 105.752 103.88-23.719 33.417-59.441 46.612-105.752 50.944v61.751c0 0 208.003 18.144 208.003-216.577-0.202-57.441-46.56-104.004-104.002-104.004z"
-                ],
-                "width": 1024,
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "code",
-                    "semicolon",
-                    "curly-braces"
-                ],
-                "grid": 16,
-                "defaultCode": 58883
-            },
-            "attrs": [],
-            "properties": {
-                "order": 630,
-                "id": 1,
-                "prevSize": 32,
-                "code": 58883,
-                "name": "codesample"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 85
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M864.626 473.162c-65.754-183.44-205.11-348.15-352.626-473.162-147.516 125.012-286.87 289.722-352.626 473.162-40.664 113.436-44.682 236.562 12.584 345.4 65.846 125.14 198.632 205.438 340.042 205.438s274.196-80.298 340.040-205.44c57.27-108.838 53.25-231.962 12.586-345.398zM738.764 758.956c-43.802 83.252-132.812 137.044-226.764 137.044-55.12 0-108.524-18.536-152.112-50.652 13.242 1.724 26.632 2.652 40.112 2.652 117.426 0 228.668-67.214 283.402-171.242 44.878-85.292 40.978-173.848 23.882-244.338 14.558 28.15 26.906 56.198 36.848 83.932 22.606 63.062 40.024 156.34-5.368 242.604z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "drop"
-                ],
-                "defaultCode": 57381,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 87,
-                "order": 631,
-                "prevSize": 32,
-                "code": 59701,
-                "ligatures": "droplet, color9",
-                "name": "drop"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 86
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M768 128h-512l-256 256 512 576 512-576-256-256zM512 778.666v-2.666h-2.37l-14.222-16h16.592v-16h-30.814l-14.222-16h45.036v-16h-59.258l-14.222-16h73.48v-16h-87.704l-14.222-16h101.926v-16h-116.148l-14.222-16h130.37v-16h-144.592l-14.222-16h158.814v-16h-173.038l-14.222-16h187.26v-16h-201.482l-14.222-16h215.704v-16h-229.926l-14.222-16h244.148v-16h-258.372l-14.222-16h272.594v-16h-286.816l-14.222-16h301.038v-16h-315.26l-14.222-16h329.482v-16h-343.706l-7.344-8.262 139.072-139.072h211.978v3.334h215.314l16 16h-231.314v16h247.314l16 16h-263.314v16h279.314l16 16h-295.314v16h311.314l16 16h-327.314v16h343.312l7.738 7.738-351.050 394.928z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "diamond",
-                    "gem",
-                    "jewelry",
-                    "dualtone"
-                ],
-                "defaultCode": 57889,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 635,
-                "order": 632,
-                "prevSize": 32,
-                "code": 60327,
-                "ligatures": "diamond2, gem2",
-                "name": "sharpen"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 87
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM128 512c0-212.078 171.922-384 384-384v768c-212.078 0-384-171.922-384-384z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "contrast"
-                ],
-                "defaultCode": 58104,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 854,
-                "order": 633,
-                "prevSize": 32,
-                "code": 60628,
-                "ligatures": "contrast",
-                "name": "contrast"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 88
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M893.254 221.254l-90.508-90.508-290.746 290.744-290.746-290.744-90.508 90.506 290.746 290.748-290.746 290.746 90.508 90.508 290.746-290.746 290.746 290.746 90.508-90.51-290.744-290.744z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "remove"
-                ],
-                "defaultCode": 60778,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 24,
-                "order": 634,
-                "prevSize": 32,
-                "code": 60778,
-                "ligatures": "cross2, cancel3",
-                "name": "remove22"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 89
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64v384c0 35.346 28.654 64 64 64s64-28.654 64-64v-229.488l677.488 677.488h-229.488c-35.346 0-64 28.652-64 64 0 35.346 28.654 64 64 64h384c35.346 0 64-28.654 64-64v-384c0-35.348-28.654-64-64-64s-64 28.652-64 64v229.488l-677.488-677.488h229.488c35.346 0 64-28.654 64-64s-28.652-64-64-64h-384c-35.346 0-64 28.654-64 64z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "resize2"
-                ],
-                "defaultCode": 58329,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 1097,
-                "order": 575,
-                "prevSize": 32,
-                "code": 60921,
-                "ligatures": "arrow-resize2, diagonal2",
-                "name": "resize2"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 90
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M483.2 640l-147.2-336c-9.6-25.6-19.2-44.8-25.6-54.4s-16-12.8-25.6-12.8c-16 0-25.6 3.2-28.8 3.2v-70.4c9.6-6.4 25.6-6.4 38.4-9.6 32 0 57.6 6.4 73.6 22.4 6.4 6.4 12.8 16 19.2 25.6 6.4 12.8 12.8 25.6 16 41.6l121.6 291.2 150.4-371.2h92.8l-198.4 470.4v224h-86.4v-224z",
-                    "M0 0v1024h1024v-1024h-1024zM960 960h-896v-896h896v896z"
-                ],
-                "attrs": [
-                    {},
-                    {}
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "gamma2"
-                ],
-                "grid": 16,
-                "defaultCode": 58880
-            },
-            "attrs": [
-                {},
-                {}
-            ],
-            "properties": {
-                "order": 576,
-                "id": 1,
-                "prevSize": 32,
-                "code": 58880,
-                "name": "gamma"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 91
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M627.2 880h-579.2v-396.8h579.2v396.8zM553.6 553.6h-435.2v256h435.2v-256z",
-                    "M259.2 227.2c176-176 457.6-176 633.6 0s176 457.6 0 633.6c-121.6 121.6-297.6 160-454.4 108.8 121.6 28.8 262.4-9.6 361.6-108.8 150.4-150.4 160-384 22.4-521.6-121.6-121.6-320-128-470.4-19.2l86.4 86.4-294.4 22.4 22.4-294.4 92.8 92.8z"
-                ],
-                "attrs": [
-                    {},
-                    {}
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "orientation"
-                ],
-                "grid": 16,
-                "defaultCode": 58881
-            },
-            "attrs": [
-                {},
-                {}
-            ],
-            "properties": {
-                "order": 577,
-                "id": 0,
-                "prevSize": 32,
-                "code": 58881,
-                "name": "orientation"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 92
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M768 544v352h-640v-640h352l128-128h-512c-52.8 0-96 43.2-96 96v704c0 52.8 43.2 96 96 96h704c52.798 0 96-43.2 96-96v-512l-128 128z",
-                    "M864 0l-608 608v160h160l608-608c0-96-64-160-160-160zM416 640l-48-48 480-480 48 48-480 480z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "pencil",
-                    "write",
-                    "edit"
-                ],
-                "defaultCode": 57361,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 68,
-                "order": 578,
-                "prevSize": 32,
-                "code": 59669,
-                "ligatures": "pencil7, write7",
-                "name": "editimage"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 93
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M607.998 128.014c-212.070 0-383.986 171.916-383.986 383.986h-191.994l246.848 246.848 246.848-246.848h-191.994c0-151.478 122.798-274.276 274.276-274.276 151.48 0 274.276 122.798 274.276 274.276 0 151.48-122.796 274.276-274.276 274.276v109.71c212.070 0 383.986-171.916 383.986-383.986s-171.916-383.986-383.986-383.986z"
-                ],
-                "width": 1024,
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "rotate-ccw",
-                    "ccw",
-                    "arrow"
-                ],
-                "defaultCode": 60072,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 22,
-                "order": 579,
-                "prevSize": 32,
-                "code": 60072,
-                "ligatures": "rotate-ccw3, ccw4",
-                "name": "rotateleft"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 94
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M416.002 128.014c212.070 0 383.986 171.916 383.986 383.986h191.994l-246.848 246.848-246.848-246.848h191.994c0-151.478-122.798-274.276-274.276-274.276-151.48 0-274.276 122.798-274.276 274.276 0 151.48 122.796 274.276 274.276 274.276v109.71c-212.070 0-383.986-171.916-383.986-383.986s171.916-383.986 383.986-383.986z"
-                ],
-                "width": 1024,
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "rotate-cw",
-                    "cw",
-                    "arrow"
-                ],
-                "defaultCode": 60073,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 580,
-                "id": 1679,
-                "prevSize": 32,
-                "code": 60073,
-                "ligatures": "rotate-cw3, cw4",
-                "name": "rotateright"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 95
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 384h1024v-384zM1024 960v-384h-1024z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "flip-vertical",
-                    "mirror"
-                ],
-                "defaultCode": 57663,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 403,
-                "order": 581,
-                "prevSize": 32,
-                "code": 60074,
-                "ligatures": "flip-vertical, mirror",
-                "name": "flipv"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 96
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M576 0v1024h384zM0 1024h384v-1024z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "flip-horizontal",
-                    "mirror"
-                ],
-                "defaultCode": 57664,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 405,
-                "order": 582,
-                "prevSize": 32,
-                "code": 60076,
-                "ligatures": "flip-horizontal, mirror3",
-                "name": "fliph"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 97
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M992.262 871.396l-242.552-206.294c-25.074-22.566-51.89-32.926-73.552-31.926 57.256-67.068 91.842-154.078 91.842-249.176 0-212.078-171.922-384-384-384-212.076 0-384 171.922-384 384 0 212.078 171.922 384 384 384 95.098 0 182.108-34.586 249.176-91.844-1 21.662 9.36 48.478 31.926 73.552l206.294 242.552c35.322 39.246 93.022 42.554 128.22 7.356s31.892-92.898-7.354-128.22zM384 640c-141.384 0-256-114.616-256-256s114.616-256 256-256 256 114.616 256 256-114.614 256-256 256zM448 192h-128v128h-128v128h128v128h128v-128h128v-128h-128z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "zoom-in",
-                    "magnifier",
-                    "magnifier-plus",
-                    "enlarge"
-                ],
-                "defaultCode": 57788,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 534,
-                "order": 583,
-                "prevSize": 32,
-                "code": 60213,
-                "ligatures": "zoom-in3, magnifier9",
-                "name": "zoomin"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 98
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M992.262 871.396l-242.552-206.294c-25.074-22.566-51.89-32.926-73.552-31.926 57.256-67.068 91.842-154.078 91.842-249.176 0-212.078-171.922-384-384-384-212.076 0-384 171.922-384 384 0 212.078 171.922 384 384 384 95.098 0 182.108-34.586 249.176-91.844-1 21.662 9.36 48.478 31.926 73.552l206.294 242.552c35.322 39.246 93.022 42.554 128.22 7.356s31.892-92.898-7.354-128.22zM384 640c-141.384 0-256-114.616-256-256s114.616-256 256-256 256 114.616 256 256-114.614 256-256 256zM192 320h384v128h-384z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "zoom-out",
-                    "magnifier",
-                    "magnifier-minus",
-                    "reduce"
-                ],
-                "defaultCode": 57789,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 535,
-                "order": 584,
-                "prevSize": 32,
-                "code": 60214,
-                "ligatures": "zoom-out3, magnifier10",
-                "name": "zoomout"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 99
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M64 192h896v192h-896zM64 448h896v192h-896zM64 704h896v192h-896z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "menu",
-                    "list",
-                    "options",
-                    "lines",
-                    "hamburger"
-                ],
-                "defaultCode": 58031,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "order": 585,
-                "id": 1448,
-                "prevSize": 32,
-                "code": 60522,
-                "ligatures": "menu3, list4",
-                "name": "options"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 100
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M512 832c35.346 0 64 28.654 64 64v64c0 35.346-28.654 64-64 64s-64-28.654-64-64v-64c0-35.346 28.654-64 64-64zM512 192c-35.346 0-64-28.654-64-64v-64c0-35.346 28.654-64 64-64s64 28.654 64 64v64c0 35.346-28.654 64-64 64zM960 448c35.346 0 64 28.654 64 64s-28.654 64-64 64h-64c-35.348 0-64-28.654-64-64s28.652-64 64-64h64zM192 512c0 35.346-28.654 64-64 64h-64c-35.346 0-64-28.654-64-64s28.654-64 64-64h64c35.346 0 64 28.654 64 64zM828.784 738.274l45.256 45.258c24.992 24.99 24.992 65.516 0 90.508-24.994 24.992-65.518 24.992-90.51 0l-45.256-45.256c-24.992-24.99-24.992-65.516 0-90.51 24.994-24.992 65.518-24.992 90.51-0zM195.216 285.726l-45.256-45.256c-24.994-24.994-24.994-65.516 0-90.51s65.516-24.994 90.51 0l45.256 45.256c24.994 24.994 24.994 65.516 0 90.51s-65.516 24.994-90.51 0zM828.784 285.726c-24.992 24.992-65.516 24.992-90.51 0-24.992-24.994-24.992-65.516 0-90.51l45.256-45.254c24.992-24.994 65.516-24.994 90.51 0 24.992 24.994 24.992 65.516 0 90.51l-45.256 45.254zM195.216 738.274c24.992-24.992 65.518-24.992 90.508 0 24.994 24.994 24.994 65.52 0 90.51l-45.254 45.256c-24.994 24.992-65.516 24.992-90.51 0s-24.994-65.518 0-90.508l45.256-45.258z",
-                    "M512 256c-141.384 0-256 114.616-256 256 0 141.382 114.616 256 256 256 141.382 0 256-114.618 256-256 0-141.384-114.616-256-256-256zM512 672c-88.366 0-160-71.634-160-160s71.634-160 160-160 160 71.634 160 160-71.634 160-160 160z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "sun",
-                    "weather"
-                ],
-                "defaultCode": 58094,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 844,
-                "order": 635,
-                "prevSize": 32,
-                "code": 60620,
-                "ligatures": "sun2, weather21",
-                "name": "sun"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 101
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M715.812 64.48c-60.25-34.784-124.618-55.904-189.572-64.48 122.936 160.082 144.768 384.762 37.574 570.42-107.2 185.67-312.688 279.112-512.788 252.68 39.898 51.958 90.376 97.146 150.628 131.934 245.908 141.974 560.37 57.72 702.344-188.198 141.988-245.924 57.732-560.372-188.186-702.356z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "moon",
-                    "night",
-                    "sleep"
-                ],
-                "defaultCode": 58105,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 855,
-                "order": 636,
-                "prevSize": 32,
-                "code": 60621,
-                "ligatures": "moon, night",
-                "name": "moon"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 102
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M672 1024l192-192-320-320 320-320-192-192-512 512z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "arrow-left",
-                    "left",
-                    "previous"
-                ],
-                "defaultCode": 58291,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 1056,
-                "order": 637,
-                "prevSize": 32,
-                "code": 60864,
-                "ligatures": "arrow-left, left4",
-                "name": "arrowleft"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 103
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M832 256l192-192-64-64-192 192h-448v-192h-128v192h-192v128h192v512h512v192h128v-192h192v-128h-192v-448zM320 320h320l-320 320v-320zM384 704l320-320v320h-320z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "tags": [
-                    "crop",
-                    "resize",
-                    "cut"
-                ],
-                "defaultCode": 58428,
-                "grid": 16
-            },
-            "attrs": [],
-            "properties": {
-                "id": 1201,
-                "order": 638,
-                "prevSize": 32,
-                "code": 61048,
-                "ligatures": "crop, resize",
-                "name": "crop"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 104
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64v896h1024v-896h-1024zM640 704v192h-256v-192h256zM640 192v192h-256v-192h256zM320 192v192h-256v-192h256zM704 384v-192h256v192h-256zM64 704h256v192h-256v-192zM704 896v-192h256v192h-256z"
-                ],
-                "attrs": [
-                    {
-                        "fill": "rgb(0, 0, 0)"
-                    }
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "tablerowprops"
-                ],
-                "defaultCode": 58880,
-                "grid": 16
-            },
-            "attrs": [
-                {
-                    "fill": "rgb(0, 0, 0)"
-                }
-            ],
-            "properties": {
-                "id": 1680,
-                "order": 639,
-                "prevSize": 32,
-                "code": 58884,
-                "name": "tablerowprops"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 105
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64v896h1024v-896h-1024zM640 704v192h-256v-192h256zM640 192v192h-256v-192h256zM320 192v192h-256v-192h256zM64 448h256v192h-256v-192zM704 448h256v192h-256v-192zM704 384v-192h256v192h-256zM64 704h256v192h-256v-192zM704 896v-192h256v192h-256z"
-                ],
-                "attrs": [
-                    {
-                        "fill": "rgb(0, 0, 0)"
-                    }
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "tablecellprops"
-                ],
-                "defaultCode": 58881,
-                "grid": 16
-            },
-            "attrs": [
-                {
-                    "fill": "rgb(0, 0, 0)"
-                }
-            ],
-            "properties": {
-                "id": 1681,
-                "order": 640,
-                "prevSize": 32,
-                "code": 58885,
-                "name": "tablecellprops"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 106
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64v832h1024v-832h-1024zM320 832h-256v-192h256v192zM320 576h-256v-192h256v192zM640 832h-256v-192h256v192zM640 576h-256v-192h256v192zM960 832h-256v-192h256v192zM960 576h-256v-192h256v192zM960 320h-896v-192h896v192z"
-                ],
-                "attrs": [
-                    {
-                        "fill": "rgb(0, 0, 0)"
-                    }
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "table2"
-                ],
-                "defaultCode": 58882,
-                "grid": 16
-            },
-            "attrs": [
-                {
-                    "fill": "rgb(0, 0, 0)"
-                }
-            ],
-            "properties": {
-                "id": 1682,
-                "order": 641,
-                "prevSize": 32,
-                "code": 58886,
-                "name": "table2"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 107
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64v896h1024v-896h-1024zM384 896v-448h576v448h-576zM640 192v192h-256v-192h256zM320 192v192h-256v-192h256zM64 448h256v192h-256v-192zM704 384v-192h256v192h-256zM64 704h256v192h-256v-192z"
-                ],
-                "attrs": [
-                    {
-                        "fill": "rgb(0, 0, 0)"
-                    }
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "tablemergecells"
-                ],
-                "defaultCode": 58884,
-                "grid": 16
-            },
-            "attrs": [
-                {
-                    "fill": "rgb(0, 0, 0)"
-                }
-            ],
-            "properties": {
-                "id": 1683,
-                "order": 586,
-                "prevSize": 32,
-                "code": 58887,
-                "name": "tablemergecells"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 108
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M320 771.2v-182.4h-182.4v-89.6h182.4v-182.4h86.4v182.4h185.6v89.6h-185.6v182.4zM0 64v896h1024v-896h-1024zM640 896h-576v-704h576v704zM960 896h-256v-192h256v192zM960 640h-256v-192h256v192zM960 384h-256v-192h256v192z"
-                ],
-                "attrs": [
-                    {
-                        "fill": "rgb(0, 0, 0)"
-                    }
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "tableinsertcolbefore"
-                ],
-                "defaultCode": 58885,
-                "grid": 16
-            },
-            "attrs": [
-                {
-                    "fill": "rgb(0, 0, 0)"
-                }
-            ],
-            "properties": {
-                "id": 1684,
-                "order": 587,
-                "prevSize": 32,
-                "code": 58888,
-                "name": "tableinsertcolbefore"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 109
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M704 316.8v182.4h182.4v89.6h-182.4v182.4h-86.4v-182.4h-185.6v-89.6h185.6v-182.4zM0 64v896h1024v-896h-1024zM320 896h-256v-192h256v192zM320 640h-256v-192h256v192zM320 384h-256v-192h256v192zM960 896h-576v-704h576v704z"
-                ],
-                "attrs": [
-                    {
-                        "fill": "rgb(0, 0, 0)"
-                    }
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "tableinsertcolafter"
-                ],
-                "defaultCode": 58886,
-                "grid": 16
-            },
-            "attrs": [
-                {
-                    "fill": "rgb(0, 0, 0)"
-                }
-            ],
-            "properties": {
-                "id": 1685,
-                "order": 588,
-                "prevSize": 32,
-                "code": 58889,
-                "name": "tableinsertcolafter"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 110
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M691.2 451.2h-144v144h-70.4v-144h-144v-67.2h144v-144h70.4v144h144zM0 64v896h1024v-896h-1024zM320 896h-256v-192h256v192zM640 896h-256v-192h256v192zM960 896h-256v-192h256v192zM960 643.2h-896v-451.2h896v451.2z"
-                ],
-                "attrs": [
-                    {
-                        "fill": "rgb(0, 0, 0)"
-                    }
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "tableinsertrowbefore"
-                ],
-                "defaultCode": 58887,
-                "grid": 16
-            },
-            "attrs": [
-                {
-                    "fill": "rgb(0, 0, 0)"
-                }
-            ],
-            "properties": {
-                "id": 1686,
-                "order": 589,
-                "prevSize": 32,
-                "code": 58890,
-                "name": "tableinsertrowbefore"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 111
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M332.8 636.8h144v-144h70.4v144h144v67.2h-144v144h-70.4v-144h-144zM0 64v896h1024v-896h-1024zM384 192h256v192h-256v-192zM64 192h256v192h-256v-192zM960 896h-896v-451.2h896v451.2zM960 384h-256v-192h256v192z"
-                ],
-                "attrs": [
-                    {
-                        "fill": "rgb(0, 0, 0)"
-                    }
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "tableinsertrowafter"
-                ],
-                "defaultCode": 58888,
-                "grid": 16
-            },
-            "attrs": [
-                {
-                    "fill": "rgb(0, 0, 0)"
-                }
-            ],
-            "properties": {
-                "id": 1687,
-                "order": 590,
-                "prevSize": 32,
-                "code": 58891,
-                "name": "tableinsertrowafter"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 112
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64v896h1024v-896h-1024zM384 192h256v192h-256v-192zM320 896h-256v-192h256v192zM320 640h-256v-192h256v192zM320 384h-256v-192h256v192zM960 896h-576v-448h576v448zM960 384h-256v-192h256v192zM864 803.2l-60.8 60.8-131.2-131.2-131.2 131.2-60.8-60.8 131.2-131.2-131.2-131.2 60.8-60.8 131.2 131.2 131.2-131.2 60.8 60.8-131.2 131.2z"
-                ],
-                "attrs": [
-                    {
-                        "fill": "rgb(0, 0, 0)"
-                    }
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "tablesplitcells"
-                ],
-                "defaultCode": 58890,
-                "grid": 16
-            },
-            "attrs": [
-                {
-                    "fill": "rgb(0, 0, 0)"
-                }
-            ],
-            "properties": {
-                "id": 1688,
-                "order": 591,
-                "prevSize": 32,
-                "code": 58893,
-                "name": "tablesplitcells"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 113
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64h1024v896h-1024v-896zM60.8 192v704h899.2v-704h-899.2zM809.6 748.8l-96 96-204.8-204.8-204.8 204.8-96-96 204.8-204.8-204.8-204.8 96-96 204.8 204.8 204.8-204.8 96 96-204.8 204.8z"
-                ],
-                "attrs": [
-                    {
-                        "fill": "rgb(0, 0, 0)"
-                    }
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "tabledelete"
-                ],
-                "defaultCode": 58891,
-                "grid": 16
-            },
-            "attrs": [
-                {
-                    "fill": "rgb(0, 0, 0)"
-                }
-            ],
-            "properties": {
-                "id": 1689,
-                "order": 592,
-                "prevSize": 32,
-                "code": 58894,
-                "name": "tabledelete"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 114
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64v832h1024v-832h-1024zM640 832h-256v-192h256v192zM640 576h-256v-192h256v192zM640 320h-256v-192h256v192zM960 832h-256v-192h256v192zM960 576h-256v-192h256v192zM960 320h-256v-192h256v192z"
-                ],
-                "attrs": [
-                    {
-                        "fill": "rgb(0, 0, 0)"
-                    }
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "tableleftheader"
-                ],
-                "defaultCode": 58922,
-                "grid": 16
-            },
-            "attrs": [
-                {
-                    "fill": "rgb(0, 0, 0)"
-                }
-            ],
-            "properties": {
-                "id": 1690,
-                "order": 593,
-                "prevSize": 32,
-                "code": 58922,
-                "name": "tableleftheader"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 115
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M0 64v832h1024v-832h-1024zM320 832h-256v-192h256v192zM320 576h-256v-192h256v192zM640 832h-256v-192h256v192zM640 576h-256v-192h256v192zM960 832h-256v-192h256v192zM960 576h-256v-192h256v192z"
-                ],
-                "attrs": [
-                    {
-                        "fill": "rgb(0, 0, 0)"
-                    }
-                ],
-                "isMulticolor": false,
-                "tags": [
-                    "tabletopheader"
-                ],
-                "defaultCode": 58923,
-                "grid": 16
-            },
-            "attrs": [
-                {
-                    "fill": "rgb(0, 0, 0)"
-                }
-            ],
-            "properties": {
-                "id": 1691,
-                "order": 594,
-                "prevSize": 32,
-                "code": 58923,
-                "name": "tabletopheader"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 116
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M886.4 387.2l-156.8 156.8 160 160-76.8 76.8-160-160-156.8 156.8-76.8-73.6 160-160-163.2-163.2 76.8-76.8 163.2 163.2 156.8-156.8 73.6 76.8zM0 64v896h1024v-896h-1024zM960 384h-22.4l-64 64h86.4v192h-89.6l64 64h25.6v192h-896v-192h310.4l64-64h-374.4v-192h371.2l-64-64h-307.2v-192h896v192z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "grid": 16,
-                "tags": [
-                    "tabledeleterow"
-                ],
-                "defaultCode": 59392
-            },
-            "attrs": [],
-            "properties": {
-                "order": 595,
-                "id": 1693,
-                "prevSize": 32,
-                "code": 59392,
-                "name": "tabledeleterow"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 117
-        },
-        {
-            "icon": {
-                "paths": [
-                    "M320 460.8l64 64v12.8l-64 64v-140.8zM640 537.6l64 64v-137.6l-64 64v9.6zM1024 64v896h-1024v-896h1024zM960 192h-256v51.2l-12.8-12.8-51.2 51.2v-89.6h-256v89.6l-51.2-51.2-12.8 12.8v-51.2h-256v704h256v-118.4l35.2 35.2 28.8-28.8v115.2h256v-115.2l48 48 16-16v83.2h256v-707.2zM672 297.6l-156.8 156.8-163.2-163.2-76.8 76.8 163.2 163.2-156.8 156.8 76.8 76.8 156.8-156.8 160 160 76.8-76.8-160-160 156.8-156.8-76.8-76.8z"
-                ],
-                "attrs": [],
-                "isMulticolor": false,
-                "grid": 16,
-                "tags": [
-                    "tabledeletecol"
-                ],
-                "defaultCode": 59393
-            },
-            "attrs": [],
-            "properties": {
-                "order": 596,
-                "id": 1692,
-                "prevSize": 32,
-                "code": 59393,
-                "name": "tabledeletecol"
-            },
-            "setIdx": 2,
-            "setId": 1,
-            "iconIdx": 118
-        }
-    ],
-    "height": 1024,
-    "metadata": {
-        "name": "tinymce"
-    },
-    "preferences": {
-        "showGlyphs": true,
-        "showQuickUse": true,
-        "showQuickUse2": true,
-        "showSVGs": true,
-        "fontPref": {
-            "prefix": "icon-",
-            "metadata": {
-                "fontFamily": "tinymce",
-                "majorVersion": 1,
-                "minorVersion": 0
-            },
-            "metrics": {
-                "emSize": 1024,
-                "baseline": 6.25,
-                "whitespace": 50
-            },
-            "resetPoint": 59649,
-            "embed": false
-        },
-        "imagePref": {
-            "prefix": "icon-",
-            "png": true,
-            "useClassSelector": true,
-            "color": 4473924,
-            "bgColor": 16777215
-        },
-        "historySize": 100,
-        "gridSize": 16,
-        "showGrid": true,
-        "showCodes": true,
-        "showLiga": false
-    }
-}
\ No newline at end of file

From c6d7056a646d02bb4d3177d488274b01361b8ce0 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 9 Aug 2017 19:44:37 +1000
Subject: [PATCH 054/145] Updated to return nulls as opposed to the ex being
 caught with a meaningful message

---
 src/Umbraco.Core/Models/ContentBase.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 0fc3bac044..32eec7f284 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -264,7 +264,7 @@ namespace Umbraco.Core.Models
         /// <returns><see cref="Property"/> Value as an <see cref="object"/></returns>
         public virtual object GetValue(string propertyTypeAlias)
         {
-            return Properties[propertyTypeAlias].Value;
+            return Properties.Contains(propertyTypeAlias) ? Properties[propertyTypeAlias].Value : null;
         }
 
         /// <summary>
@@ -275,8 +275,13 @@ namespace Umbraco.Core.Models
         /// <returns><see cref="Property"/> Value as a <see cref="TPassType"/></returns>
         public virtual TPassType GetValue<TPassType>(string propertyTypeAlias)
         {
+            if (Properties.Contains(propertyTypeAlias) == false)
+            {
+                return default(TPassType);
+            }
+
             var convertAttempt = Properties[propertyTypeAlias].Value.TryConvertTo<TPassType>();
-            return convertAttempt.Success ? convertAttempt.Result : default(TPassType);
+            return convertAttempt.Success ? convertAttempt.Result : default(TPassType);
         }
 
         /// <summary>

From 31cbb79edee8ef6a83b1c76cbbb988b706cf8fd3 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <kontakt@touchnerds.dk>
Date: Wed, 9 Aug 2017 11:48:15 +0200
Subject: [PATCH 055/145] Translate zip-code

---
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index c74fd2907b..8bd0dc8952 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -263,7 +263,7 @@
     <key alias="recycleBinIsEmpty">Papirkurven er nu tom</key>
     <key alias="recycleBinWarning">Når elementer slettes fra papirkurven, slettes de for altid</key>
     <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webservice oplever i øjeblikket problemer, vi ikke har kontrol over. Beklager ulejligheden. ]]></key>
-    <key alias="regexSearchHelp">Søg efter et regulært udtryk for at tilføje validering til et formularfelt. Eksempel: 'e-mail', 'zip-code', 'url'</key>
+    <key alias="regexSearchHelp">Søg efter et regulært udtryk for at tilføje validering til et formularfelt. Eksempel: 'e-mail', 'postnr.', 'url'</key>
     <key alias="removeMacro">Fjern makro</key>
     <key alias="requiredField">Obligatorisk</key>
     <key alias="sitereindexed">Sitet er genindekseret</key>

From d8cfd8f12ed25c69d25b9bc7b60d60b6cbb92d6f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 10 Aug 2017 13:46:18 +1000
Subject: [PATCH 056/145] U4-10274 Umbraco.MemberHasAccess isn't cached

---
 .../Services/PublicAccessServiceExtensions.cs | 20 ++++++-
 src/Umbraco.Web/Models/LoginStatusModel.cs    |  4 +-
 src/Umbraco.Web/Models/ProfileModel.cs        |  4 +-
 src/Umbraco.Web/Models/RegisterModel.cs       |  4 +-
 .../Routing/PublishedContentRequest.cs        | 25 +++++++-
 src/Umbraco.Web/Security/MembershipHelper.cs  | 57 +++++++++++++++++++
 src/Umbraco.Web/Security/WebSecurity.cs       |  4 +-
 src/Umbraco.Web/UmbracoHelper.cs              | 24 +-------
 .../umbraco/users/EditUser.aspx.cs            |  2 +-
 9 files changed, 111 insertions(+), 33 deletions(-)

diff --git a/src/Umbraco.Core/Services/PublicAccessServiceExtensions.cs b/src/Umbraco.Core/Services/PublicAccessServiceExtensions.cs
index 0b682b2b6e..d159e3ae64 100644
--- a/src/Umbraco.Core/Services/PublicAccessServiceExtensions.cs
+++ b/src/Umbraco.Core/Services/PublicAccessServiceExtensions.cs
@@ -72,10 +72,28 @@ namespace Umbraco.Core.Services
 
         public static bool HasAccess(this IPublicAccessService publicAccessService, string path, MembershipUser member, RoleProvider roleProvider)
         {
+            return publicAccessService.HasAccess(path, member.UserName, roleProvider.GetRolesForUser);
+        }
+
+        /// <summary>
+        /// Checks if the member with the specified username has access to the path which is also based on the passed in roles for the member
+        /// </summary>
+        /// <param name="publicAccessService"></param>
+        /// <param name="path"></param>
+        /// <param name="username"></param>
+        /// <param name="rolesCallback">A callback to retrieve the roles for this member</param>
+        /// <returns></returns>
+        public static bool HasAccess(this IPublicAccessService publicAccessService, string path, string username, Func<string, IEnumerable<string>> rolesCallback)
+        {
+            if (rolesCallback == null) throw new ArgumentNullException("roles");
+            if (string.IsNullOrWhiteSpace(username)) throw new ArgumentException("Value cannot be null or whitespace.", "username");
+            if (string.IsNullOrWhiteSpace(path)) throw new ArgumentException("Value cannot be null or whitespace.", "path");
+
             var entry = publicAccessService.GetEntryForContent(path.EnsureEndsWith(path));
             if (entry == null) return true;
 
-            var roles = roleProvider.GetRolesForUser(member.UserName);
+            var roles = rolesCallback(username);
+
             return entry.Rules.Any(x => x.RuleType == Constants.Conventions.PublicAccess.MemberRoleRuleType
                                         && roles.Contains(x.RuleValue));
         }
diff --git a/src/Umbraco.Web/Models/LoginStatusModel.cs b/src/Umbraco.Web/Models/LoginStatusModel.cs
index e10b42b096..23fb2039e9 100644
--- a/src/Umbraco.Web/Models/LoginStatusModel.cs
+++ b/src/Umbraco.Web/Models/LoginStatusModel.cs
@@ -23,9 +23,9 @@ namespace Umbraco.Web.Models
 
         private LoginStatusModel(bool doLookup)
         {
-            if (doLookup && HttpContext.Current != null && ApplicationContext.Current != null)
+            if (doLookup && UmbracoContext.Current != null)
             {
-                var helper = new MembershipHelper(ApplicationContext.Current, new HttpContextWrapper(HttpContext.Current));
+                var helper = new MembershipHelper(UmbracoContext.Current);
                 var model = helper.GetCurrentLoginStatus();
                 if (model != null)
                 {
diff --git a/src/Umbraco.Web/Models/ProfileModel.cs b/src/Umbraco.Web/Models/ProfileModel.cs
index 118f9a9f7a..39043a4b11 100644
--- a/src/Umbraco.Web/Models/ProfileModel.cs
+++ b/src/Umbraco.Web/Models/ProfileModel.cs
@@ -32,9 +32,9 @@ namespace Umbraco.Web.Models
         private ProfileModel(bool doLookup)
         {
             MemberProperties = new List<UmbracoProperty>();
-            if (doLookup)
+            if (doLookup && UmbracoContext.Current != null)
             {
-                var helper = new MembershipHelper(ApplicationContext.Current, new HttpContextWrapper(HttpContext.Current));
+                var helper = new MembershipHelper(UmbracoContext.Current);
                 var model = helper.GetCurrentMemberProfileModel();
                 MemberProperties = model.MemberProperties;
             }   
diff --git a/src/Umbraco.Web/Models/RegisterModel.cs b/src/Umbraco.Web/Models/RegisterModel.cs
index 237f6d7845..b51f09b631 100644
--- a/src/Umbraco.Web/Models/RegisterModel.cs
+++ b/src/Umbraco.Web/Models/RegisterModel.cs
@@ -32,9 +32,9 @@ namespace Umbraco.Web.Models
             MemberProperties = new List<UmbracoProperty>();
             LoginOnSuccess = true;
             CreatePersistentLoginCookie = true;
-            if (doLookup && HttpContext.Current != null && ApplicationContext.Current != null)
+            if (doLookup && UmbracoContext.Current != null)
             {
-                var helper = new MembershipHelper(ApplicationContext.Current, new HttpContextWrapper(HttpContext.Current));
+                var helper = new MembershipHelper(UmbracoContext.Current);
                 var model = helper.CreateRegistrationModel(MemberTypeAlias);
                 MemberProperties = model.MemberProperties;
             }
diff --git a/src/Umbraco.Web/Routing/PublishedContentRequest.cs b/src/Umbraco.Web/Routing/PublishedContentRequest.cs
index 9c21958603..641821ddd6 100644
--- a/src/Umbraco.Web/Routing/PublishedContentRequest.cs
+++ b/src/Umbraco.Web/Routing/PublishedContentRequest.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
+using System.Linq;
 using System.Web;
 using System.Web.Security;
 using Umbraco.Core;
@@ -63,7 +64,7 @@ namespace Umbraco.Web.Routing
 
             Uri = uri;
             RoutingContext = routingContext;
-            GetRolesForLogin = getRolesForLogin;
+            _getRolesForLoginCallback = getRolesForLogin;
 
             _engine = new PublishedContentRequestEngine(
                 routingConfig,
@@ -446,8 +447,28 @@ namespace Umbraco.Web.Routing
         /// Gets or sets the current RoutingContext.
         /// </summary>
         public RoutingContext RoutingContext { get; private set; }
+
+        /// <summary>
+        /// Returns the current members roles if a member is logged in
+        /// </summary>
+        /// <param name="username"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This ensures that the callback is only executed once in case this method is accessed a few times
+        /// </remarks>
+        public IEnumerable<string> GetRolesForLogin(string username)
+        {
+            string[] roles;
+            if (_rolesForLogin.TryGetValue(username, out roles))
+                return roles;
+
+            roles = _getRolesForLoginCallback(username).ToArray();
+            _rolesForLogin[username] = roles;
+            return roles;
+        }
 
-        internal Func<string, IEnumerable<string>> GetRolesForLogin { get; private set; }
+        private readonly IDictionary<string, string[]> _rolesForLogin = new Dictionary<string, string[]>();
+        private readonly Func<string, IEnumerable<string>> _getRolesForLoginCallback;
 
         /// <summary>
         /// The "umbraco page" object.
diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index 605b5137d8..e43adff8b4 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
@@ -14,6 +15,7 @@ using Umbraco.Web.Models;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Core.Cache;
 using Umbraco.Web.Security.Providers;
+using Umbraco.Core.Services;
 using MPE = global::Umbraco.Core.Security.MembershipProviderExtensions;
 
 namespace Umbraco.Web.Security
@@ -28,13 +30,19 @@ namespace Umbraco.Web.Security
         private readonly RoleProvider _roleProvider;
         private readonly ApplicationContext _applicationContext;
         private readonly HttpContextBase _httpContext;
+        private readonly UmbracoContext _umbracoContext;
 
         #region Constructors
+
+        [Obsolete("Use the constructor specifying an UmbracoContext")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public MembershipHelper(ApplicationContext applicationContext, HttpContextBase httpContext)
             : this(applicationContext, httpContext, MPE.GetMembersMembershipProvider(), Roles.Enabled ? Roles.Provider : new MembersRoleProvider(applicationContext.Services.MemberService))
         {            
         }
 
+        [Obsolete("Use the constructor specifying an UmbracoContext")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public MembershipHelper(ApplicationContext applicationContext, HttpContextBase httpContext, MembershipProvider membershipProvider, RoleProvider roleProvider)
         {
             if (applicationContext == null) throw new ArgumentNullException("applicationContext");
@@ -61,9 +69,58 @@ namespace Umbraco.Web.Security
             _applicationContext = umbracoContext.Application;
             _membershipProvider = membershipProvider;
             _roleProvider = roleProvider;
+            _umbracoContext = umbracoContext;
         }
         #endregion
 
+        /// <summary>
+        /// Check if a document object is protected by the "Protect Pages" functionality in umbraco
+        /// </summary>
+        /// <param name="path">The full path of the document object to check</param>
+        /// <returns>True if the document object is protected</returns>
+        public virtual bool IsProtected(string path)
+        {
+            //this is a cached call
+            return _applicationContext.Services.PublicAccessService.IsProtected(path);
+        }
+
+        /// <summary>
+        /// Check if the current user has access to a document
+        /// </summary>
+        /// <param name="path">The full path of the document object to check</param>
+        /// <returns>True if the current user has access or if the current document isn't protected</returns>
+        public virtual bool MemberHasAccess(string path)
+        {
+            //cache this in the request cache
+            return _applicationContext.ApplicationCache.RequestCache.GetCacheItem<bool>(string.Format("{0}.{1}-{2}", typeof(MembershipHelper), "MemberHasAccess", path), () =>
+            {
+                if (IsProtected(path))
+                {
+                    return IsLoggedIn() && HasAccess(path, Roles.Provider);
+                }
+                return true;
+            });
+        }
+
+        /// <summary>
+        /// This will check if the member has access to this path
+        /// </summary>
+        /// <param name="path"></param>        
+        /// <param name="roleProvider"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is essentially the same as the PublicAccessServiceExtensions.HasAccess however this will use the PCR cache 
+        /// of the already looked up roles for the member so this doesn't need to happen more than once.
+        /// This does a safety check in case of things like unit tests where there is no PCR and if that is the case it will use 
+        /// lookup the roles directly.
+        /// </remarks>
+        private bool HasAccess(string path, RoleProvider roleProvider)
+        {
+            return _umbracoContext.PublishedContentRequest == null 
+                ? _applicationContext.Services.PublicAccessService.HasAccess(path, CurrentUserName, roleProvider.GetRolesForUser) 
+                : _applicationContext.Services.PublicAccessService.HasAccess(path, CurrentUserName, _umbracoContext.PublishedContentRequest.GetRolesForLogin);
+        }
+        
         /// <summary>
         /// Returns true if the current membership provider is the Umbraco built-in one.
         /// </summary>
diff --git a/src/Umbraco.Web/Security/WebSecurity.cs b/src/Umbraco.Web/Security/WebSecurity.cs
index cda9f04fad..b12b6ccde0 100644
--- a/src/Umbraco.Web/Security/WebSecurity.cs
+++ b/src/Umbraco.Web/Security/WebSecurity.cs
@@ -48,11 +48,11 @@ namespace Umbraco.Web.Security
             IEnumerable<string> allowGroups = null,
             IEnumerable<int> allowMembers = null)
         {
-            if (HttpContext.Current == null || ApplicationContext.Current == null)
+            if (UmbracoContext.Current == null)
             {
                 return false;
             }
-            var helper = new MembershipHelper(ApplicationContext.Current, new HttpContextWrapper(HttpContext.Current));
+            var helper = new MembershipHelper(UmbracoContext.Current);
             return helper.IsMemberAuthorized(allowAll, allowTypes, allowGroups, allowMembers);
         }
 
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 6f3da17254..28960eb07d 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -17,7 +17,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Web.Mvc;
-using Umbraco.Core.Cache;
+using Umbraco.Core.Cache;
 
 namespace Umbraco.Web
 {
@@ -433,7 +433,7 @@ namespace Umbraco.Web
         /// <returns>True if the document object is protected</returns>
         public bool IsProtected(string path)
         {
-            return UmbracoContext.Application.Services.PublicAccessService.IsProtected(path);
+            return MembershipHelper.IsProtected(path);
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -450,25 +450,7 @@ namespace Umbraco.Web
         /// <returns>True if the current user has access or if the current document isn't protected</returns>
         public bool MemberHasAccess(string path)
         {
-            if (IsProtected(path))
-            {
-                return MembershipHelper.IsLoggedIn()
-                       && UmbracoContext.Application.Services.PublicAccessService.HasAccess(path, GetCurrentMember(), Roles.Provider);
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Gets (or adds) the current member from the current request cache
-        /// </summary>
-        private MembershipUser GetCurrentMember()
-        {
-            return UmbracoContext.Application.ApplicationCache.RequestCache
-                .GetCacheItem<MembershipUser>("UmbracoHelper.GetCurrentMember", () =>
-                {
-                    var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
-                    return provider.GetCurrentUser();
-                });
+            return MembershipHelper.MemberHasAccess(path);
         }
 
 		/// <summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
index 91a8677c81..3a0dc0d274 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
@@ -615,7 +615,7 @@ namespace umbraco.cms.presentation.user
             // update when the AD provider is active.
             if ((BackOfficeProvider is ActiveDirectoryMembershipProvider) == false)
             {
-                var membershipHelper = new MembershipHelper(ApplicationContext, new HttpContextWrapper(Context));
+                var membershipHelper = new MembershipHelper(UmbracoContext.Current);
                 //set the writable properties that we are editing
                 membershipHelper.UpdateMember(membershipUser, BackOfficeProvider,
                                               email.Text.Trim(),

From 21707f9e08b169989319697885c3ef5db83696de Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 10 Aug 2017 14:22:30 +1000
Subject: [PATCH 057/145] Updates the GetMemberGroupsForMember with a username
 to be a single query

---
 .../Repositories/MemberGroupRepository.cs     | 32 ++++++-------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
index e9438b56f6..a358de08d2 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
@@ -184,30 +184,16 @@ namespace Umbraco.Core.Persistence.Repositories
 
         public IEnumerable<IMemberGroup> GetMemberGroupsForMember(string username)
         {
-            //find the member by username
-            var memberSql = new Sql();
-            var memberObjectType = new Guid(Constants.ObjectTypes.Member);
+            var sql = new Sql()
+                .Select("un.*")
+                .From("umbracoNode AS un")
+                .InnerJoin("cmsMember2MemberGroup")
+                .On("un.id = cmsMember2MemberGroup.MemberGroup")
+                .LeftJoin("(SELECT umbracoNode.id, cmsMember.LoginName FROM umbracoNode INNER JOIN cmsMember ON umbracoNode.id = cmsMember.nodeId) AS member")
+                .On("member.id = cmsMember2MemberGroup.Member")
+                .Where("un.nodeObjectType=@objectType", new {objectType = NodeObjectTypeId })
+                .Where("member.LoginName=@loginName", new {loginName = username});
             
-            memberSql.Select("umbracoNode.id")
-                .From<NodeDto>()
-                .InnerJoin<MemberDto>()
-                .On<NodeDto, MemberDto>(dto => dto.NodeId, dto => dto.NodeId)
-                .Where<NodeDto>(x => x.NodeObjectType == memberObjectType)
-                .Where<MemberDto>(x => x.LoginName == username);
-            var memberIdUsername = Database.Fetch<int?>(memberSql).FirstOrDefault();
-            if (memberIdUsername.HasValue == false)
-            {
-                return Enumerable.Empty<IMemberGroup>();
-            }
-
-            var sql = new Sql();
-            sql.Select("umbracoNode.*")
-                .From<NodeDto>()
-                .InnerJoin<Member2MemberGroupDto>()
-                .On<NodeDto, Member2MemberGroupDto>(dto => dto.NodeId, dto => dto.MemberGroup)
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
-                .Where<Member2MemberGroupDto>(x => x.Member == memberIdUsername.Value);
-
             return Database.Fetch<NodeDto>(sql)
                 .DistinctBy(dto => dto.NodeId)
                 .Select(x => _modelFactory.BuildEntity(x));

From ca80a0cddc9c2d179a122b47e73247719bfba627 Mon Sep 17 00:00:00 2001
From: mikkelhm <mikkel@umbraco.com>
Date: Thu, 10 Aug 2017 08:41:06 +0200
Subject: [PATCH 058/145] Bump version to 7.6.6

---
 build/UmbracoVersion.txt                         | 2 +-
 src/SolutionInfo.cs                              | 4 ++--
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt
index 01a820821e..c9c45982be 100644
--- a/build/UmbracoVersion.txt
+++ b/build/UmbracoVersion.txt
@@ -1,2 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.6.5
\ No newline at end of file
+7.6.6
\ No newline at end of file
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index e8a36f0da7..8563cc6b75 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.6.5")]
-[assembly: AssemblyInformationalVersion("7.6.5")]
\ No newline at end of file
+[assembly: AssemblyFileVersion("7.6.6")]
+[assembly: AssemblyInformationalVersion("7.6.6")]
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 0d093c395e..90de48ca2e 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.6.5");
+        private static readonly Version Version = new Version("7.6.6");
 
         /// <summary>
         /// Gets the current version of Umbraco.
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 2b73c24520..a94ac9da58 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -2379,9 +2379,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7650</DevelopmentServerPort>
+          <DevelopmentServerPort>7660</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7650</IISUrl>
+          <IISUrl>http://localhost:7660</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 125c3782744d420dc02fcd0f68702a132bec637a Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 10 Aug 2017 14:11:48 +0200
Subject: [PATCH 059/145] fixes: U4-4848 If "Save and Publish" is clicked
 before page finishes loading, data is lost from MNTP

---
 .../contentpicker/contentpicker.controller.js | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index f04b2b2285..9b3316ec1a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -3,6 +3,17 @@
 
 function contentPickerController($scope, entityResource, editorState, iconHelper, $routeParams, angularHelper, navigationService, $location, miniEditorHelper) {
 
+    var unsubscribe;
+
+    function subscribe() {
+        unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
+            var currIds = _.map($scope.renderModel, function (i) {
+                return $scope.model.config.idType === "udi" ? i.udi : i.id;
+            });
+            $scope.model.value = trim(currIds.join(), ",");
+        });
+    }
+
     function trim(str, chr) {
         var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
         return str.replace(rgxtrim, '');
@@ -231,19 +242,13 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
             }
         });
     };
-        
-    var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
-        var currIds = _.map($scope.renderModel, function (i) {
-            return $scope.model.config.idType === "udi" ? i.udi : i.id;
-        });
-        $scope.model.value = trim(currIds.join(), ",");
-    });
 
     //when the scope is destroyed we need to unsubscribe
     $scope.$on('$destroy', function () {
-        unsubscribe();
+        if(unsubscribe) {
+            unsubscribe();
+        }
     });
-
     
     var modelIds = $scope.model.value ? $scope.model.value.split(',') : [];
 
@@ -266,14 +271,14 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
 
             //everything is loaded, start the watch on the model
             startWatch();
-
+            subscribe();
         });
     }
     else {
         //everything is loaded, start the watch on the model
         startWatch();
+        subscribe();
     }
-    
 
     function setEntityUrl(entity) {
 

From 0e273d1a08faf05eda51341ccabddd2d4198e336 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 11 Aug 2017 15:11:53 +1000
Subject: [PATCH 060/145] U4-7382 Text Properties Containing JSON Are Corrupted
 on Publish

---
 .../PropertyEditors/PropertyValueEditor.cs    |  2 +-
 .../PropertyEditors/TextAreaPropertyEditor.cs |  5 ++
 .../PropertyEditors/TextOnlyValueEditor.cs    | 46 +++++++++++++++++++
 .../PropertyEditors/TextboxPropertyEditor.cs  | 12 +++--
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 5 files changed, 60 insertions(+), 6 deletions(-)
 create mode 100644 src/Umbraco.Web/PropertyEditors/TextOnlyValueEditor.cs

diff --git a/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs b/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs
index 0b083025f7..66a316fd0f 100644
--- a/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs
@@ -293,7 +293,7 @@ namespace Umbraco.Core.PropertyEditors
                             //swallow this exception, we thought it was json but it really isn't so continue returning a string
                         }
                     }
-                    return property.Value.ToString();
+                    return asString;
                 case DataTypeDatabaseType.Integer:
                 case DataTypeDatabaseType.Decimal:
                     //Decimals need to be formatted with invariant culture (dots, not commas)
diff --git a/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
index 7006befdcd..659b1b3224 100644
--- a/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
@@ -6,6 +6,11 @@ namespace Umbraco.Web.PropertyEditors
     [PropertyEditor(Constants.PropertyEditors.TextboxMultipleAlias, "Textarea", "textarea", IsParameterEditor = true, ValueType = PropertyEditorValueTypes.Text, Icon="icon-application-window-alt")]
     public class TextAreaPropertyEditor : PropertyEditor
     {
+        protected override PropertyValueEditor CreateValueEditor()
+        {
+            return new TextOnlyValueEditor(base.CreateValueEditor());
+        }
+
         protected override PreValueEditor CreatePreValueEditor()
         {
             return new TextAreaPreValueEditor();
diff --git a/src/Umbraco.Web/PropertyEditors/TextOnlyValueEditor.cs b/src/Umbraco.Web/PropertyEditors/TextOnlyValueEditor.cs
new file mode 100644
index 0000000000..7222ee13e4
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/TextOnlyValueEditor.cs
@@ -0,0 +1,46 @@
+using System;
+using Umbraco.Core.Models;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Web.PropertyEditors
+{
+    /// <summary>
+    /// Custom value editor which ensures that the value stored is just plain text and that 
+    /// no magic json formatting occurs when translating it to and from the database values
+    /// </summary>
+    public class TextOnlyValueEditor : PropertyValueEditorWrapper
+    {
+        public TextOnlyValueEditor(PropertyValueEditor wrapped) : base(wrapped)
+        {
+        }
+
+        /// <summary>
+        /// A method used to format the database value to a value that can be used by the editor
+        /// </summary>
+        /// <param name="property"></param>
+        /// <param name="propertyType"></param>
+        /// <param name="dataTypeService"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// The object returned will always be a string and if the database type is not a valid string type an exception is thrown
+        /// </remarks>
+        public override object ConvertDbToEditor(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
+        {
+            if (property.Value == null) return string.Empty;
+
+            switch (GetDatabaseType())
+            {
+                case DataTypeDatabaseType.Ntext:
+                case DataTypeDatabaseType.Nvarchar:                    
+                    return property.Value.ToString();
+                case DataTypeDatabaseType.Integer:
+                case DataTypeDatabaseType.Decimal:                   
+                case DataTypeDatabaseType.Date:                    
+                default:
+                    throw new InvalidOperationException("The " + typeof(TextOnlyValueEditor) + " can only be used with string based property editors");
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs
index 0fd243180c..bd07d503fa 100644
--- a/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs
@@ -1,19 +1,21 @@
-using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 using Umbraco.Core;
-using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
 
 namespace Umbraco.Web.PropertyEditors
 {
     [PropertyEditor(Constants.PropertyEditors.TextboxAlias, "Textbox", "textbox", IsParameterEditor = true, Group = "Common")]
     public class TextboxPropertyEditor : PropertyEditor
     {
-        
+        protected override PropertyValueEditor CreateValueEditor()
+        {
+            return new TextOnlyValueEditor(base.CreateValueEditor());
+        }
 
         protected override PreValueEditor CreatePreValueEditor()
         {
@@ -24,7 +26,7 @@ namespace Umbraco.Web.PropertyEditors
         {
             [PreValueField("maxChars", "Maximum allowed characters", "number", Description = "If empty - no character limit")]
             public bool MaxChars { get; set; }
-        }
+        }
 
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0048ef01f9..ea3a0dfa7c 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -403,6 +403,7 @@
     <Compile Include="PropertyEditors\MemberPicker2PropertyEditor.cs" />
     <Compile Include="PropertyEditors\MultiNodeTreePicker2PropertyEditor.cs" />
     <Compile Include="PropertyEditors\RelatedLinks2PropertyEditor.cs" />
+    <Compile Include="PropertyEditors\TextOnlyValueEditor.cs" />
     <Compile Include="PropertyEditors\ValueConverters\ContentPickerPropertyConverter.cs" />
     <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
     <Compile Include="PropertyEditors\ValueConverters\ImageCropDataSetConverter.cs" />

From 13f76d2af9944a62bb8d4c5ce33fd1f0c90d38dc Mon Sep 17 00:00:00 2001
From: Harvey Williams <harveyjwilliams@aol.co.uk>
Date: Fri, 11 Aug 2017 11:42:35 +0100
Subject: [PATCH 061/145] Updated ReplaceLineBreaksForHtml to include \r

I was surprised when this method did not replace a `\r` character with an HTML break. I have updated it to not only replace `\n`, but also `\r\n` and just `\r`.

I think these cases should be considered because of [this SO thread](https://stackoverflow.com/questions/4824621/is-a-new-line-n-or-r-n).

The updated code will not replace `\n\r` with one break but with two.

I used [this SO answer](https://stackoverflow.com/a/8196219/2963111) to update the method.

```
[TestMethod]
public void ReplaceLineBreaksForHtmlTest()
{
    var result = "foo\rbar\nbaz\r\nbiff\n\r".ReplaceLineBreaksForHtml();

    Assert.AreEqual(result, "foo<br />\rbar<br />\nbaz<br />\r\nbiff<br />\n<br />\r");
}
```
---
 src/Umbraco.Web/HtmlStringUtilities.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/HtmlStringUtilities.cs b/src/Umbraco.Web/HtmlStringUtilities.cs
index 24a643b5b0..1737aca365 100644
--- a/src/Umbraco.Web/HtmlStringUtilities.cs
+++ b/src/Umbraco.Web/HtmlStringUtilities.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Web;
+using System.Text.RegularExpressions;
 using HtmlAgilityPack;
 
 namespace Umbraco.Web
@@ -23,7 +24,7 @@ namespace Umbraco.Web
         /// <returns>The text with text line breaks replaced with html linebreaks (<br/>)</returns>
         public string ReplaceLineBreaksForHtml(string text)
         {
-            return text.Replace("\n", "<br/>\n");
+            return Regex.Replace(text, @"(\r\n?|\n)", "<br />$0");
         }
 
         public HtmlString StripHtmlTags(string html, params string[] tags)
@@ -241,4 +242,4 @@ namespace Umbraco.Web
             }
         }
     }
-}
\ No newline at end of file
+}

From 7a5cb7058b798820a598294fe683f1ca5dc7a2fe Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Mon, 14 Aug 2017 11:38:13 +0200
Subject: [PATCH 062/145] U4-10289 IdkMap cache can cause the entity service to
 return invalid results

---
 src/Umbraco.Core/Services/IdkMap.cs           | 53 +++++++++++++------
 .../Services/EntityServiceTests.cs            | 14 +++--
 2 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Core/Services/IdkMap.cs b/src/Umbraco.Core/Services/IdkMap.cs
index 63b203aa0f..af3e4ff50b 100644
--- a/src/Umbraco.Core/Services/IdkMap.cs
+++ b/src/Umbraco.Core/Services/IdkMap.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.UnitOfWork;
@@ -10,8 +11,8 @@ namespace Umbraco.Core.Services
     {
         private readonly IDatabaseUnitOfWorkProvider _uowProvider;
         private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim();
-        private readonly Dictionary<int, Guid> _id2Key = new Dictionary<int, Guid>();
-        private readonly Dictionary<Guid, int> _key2Id = new Dictionary<Guid, int>();
+        private readonly Dictionary<Id2KeyCompositeKey, Guid> _id2Key = new Dictionary<Id2KeyCompositeKey, Guid>();
+        private readonly Dictionary<Key2IdCompositeKey, int> _key2Id = new Dictionary<Key2IdCompositeKey, int>();
 
         public IdkMap(IDatabaseUnitOfWorkProvider uowProvider)
         {
@@ -23,11 +24,12 @@ namespace Umbraco.Core.Services
 
         public Attempt<int> GetIdForKey(Guid key, UmbracoObjectTypes umbracoObjectType)
         {
+            var compositeKey = new Key2IdCompositeKey() { Key = key, UmbracoObjectType = umbracoObjectType };
             int id;
             try
             {
                 _locker.EnterReadLock();
-                if (_key2Id.TryGetValue(key, out id)) return Attempt.Succeed(id);
+                if (_key2Id.TryGetValue(compositeKey, out id)) return Attempt.Succeed(id);
             }
             finally
             {
@@ -48,9 +50,10 @@ namespace Umbraco.Core.Services
 
             try
             {
+                var reversedCompositeKey = new Id2KeyCompositeKey { Id = id, UmbracoObjectType = umbracoObjectType };
                 _locker.EnterWriteLock();
-                _id2Key[id] = key;
-                _key2Id[key] = id;
+                _id2Key[reversedCompositeKey] = key;
+                _key2Id[compositeKey] = id;
             }
             finally
             {
@@ -73,11 +76,12 @@ namespace Umbraco.Core.Services
 
         public Attempt<Guid> GetKeyForId(int id, UmbracoObjectTypes umbracoObjectType)
         {
+            var compositeKey = new Id2KeyCompositeKey() {Id = id, UmbracoObjectType = umbracoObjectType};
             Guid key;
             try
             {
                 _locker.EnterReadLock();
-                if (_id2Key.TryGetValue(id, out key)) return Attempt.Succeed(key);
+                if (_id2Key.TryGetValue(compositeKey, out key)) return Attempt.Succeed(key);
             }
             finally
             {
@@ -98,9 +102,10 @@ namespace Umbraco.Core.Services
 
             try
             {
+                var reversedCompositeKey = new Key2IdCompositeKey {Key = key, UmbracoObjectType = umbracoObjectType};
                 _locker.EnterWriteLock();
-                _id2Key[id] = key;
-                _key2Id[key] = id;
+                _id2Key[compositeKey] = key;
+                _key2Id[reversedCompositeKey] = id;
             }
             finally
             {
@@ -139,10 +144,12 @@ namespace Umbraco.Core.Services
             try
             {
                 _locker.EnterWriteLock();
-                Guid key;
-                if (_id2Key.TryGetValue(id, out key) == false) return;
-                _id2Key.Remove(id);
-                _key2Id.Remove(key);
+                var match = _id2Key.Keys.SingleOrDefault(x => x.Id == id);
+                if (match == null) return;
+                var key = _id2Key[match];
+                var reversedCompositeKey = new Key2IdCompositeKey { Key = key, UmbracoObjectType = match.UmbracoObjectType };
+                _id2Key.Remove(match);
+                _key2Id.Remove(reversedCompositeKey);
             }
             finally
             {
@@ -156,10 +163,12 @@ namespace Umbraco.Core.Services
             try
             {
                 _locker.EnterWriteLock();
-                int id;
-                if (_key2Id.TryGetValue(key, out id) == false) return;
-                _id2Key.Remove(id);
-                _key2Id.Remove(key);
+                var match = _key2Id.Keys.SingleOrDefault(x => x.Key == key);
+                if (match == null) return;
+                var id = _key2Id[match];
+                var reversedCompositeKey = new Id2KeyCompositeKey {Id = id, UmbracoObjectType = match.UmbracoObjectType};
+                _id2Key.Remove(reversedCompositeKey);
+                _key2Id.Remove(match);
             }
             finally
             {
@@ -167,5 +176,17 @@ namespace Umbraco.Core.Services
                     _locker.ExitWriteLock();
             }
         }
+
+        internal class Id2KeyCompositeKey
+        {
+            public int Id { get; set; }
+            public UmbracoObjectTypes UmbracoObjectType { get; set; }
+        }
+
+        internal class Key2IdCompositeKey
+        {
+            public Guid Key { get; set; }
+            public UmbracoObjectTypes UmbracoObjectType { get; set; }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Services/EntityServiceTests.cs b/src/Umbraco.Tests/Services/EntityServiceTests.cs
index 656915c3f9..818e0099e8 100644
--- a/src/Umbraco.Tests/Services/EntityServiceTests.cs
+++ b/src/Umbraco.Tests/Services/EntityServiceTests.cs
@@ -547,9 +547,11 @@ namespace Umbraco.Tests.Services
         public void EntityService_Cannot_Get_Key_For_Id_With_Incorrect_Object_Type()
         {
             var service = ServiceContext.EntityService;
-            var result = service.GetKeyForId(1060, UmbracoObjectTypes.MediaType);
-
-            Assert.IsFalse(result.Success);
+            var result1 = service.GetKeyForId(1060, UmbracoObjectTypes.DocumentType);
+            var result2 = service.GetKeyForId(1060, UmbracoObjectTypes.MediaType);
+
+            Assert.IsTrue(result1.Success);
+            Assert.IsFalse(result2.Success);
         }
 
         [Test]
@@ -566,9 +568,11 @@ namespace Umbraco.Tests.Services
         public void EntityService_Cannot_Get_Id_For_Key_With_Incorrect_Object_Type()
         {
             var service = ServiceContext.EntityService;
-            var result = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.MediaType);
+            var result1 = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.DocumentType);
+            var result2 = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.MediaType);
 
-            Assert.IsFalse(result.Success);
+            Assert.IsTrue(result1.Success);
+            Assert.IsFalse(result2.Success);
         }
 
         private static bool _isSetup = false;

From 46b2d8a4aa696f19d49dddbd57927198aff0d70f Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Mon, 14 Aug 2017 13:34:47 +0200
Subject: [PATCH 063/145] implement equality comparison to prevent duplicates
 in when used in dictionaries.

---
 src/Umbraco.Core/Services/IdkMap.cs | 42 +++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/src/Umbraco.Core/Services/IdkMap.cs b/src/Umbraco.Core/Services/IdkMap.cs
index af3e4ff50b..021f8288cb 100644
--- a/src/Umbraco.Core/Services/IdkMap.cs
+++ b/src/Umbraco.Core/Services/IdkMap.cs
@@ -181,12 +181,54 @@ namespace Umbraco.Core.Services
         {
             public int Id { get; set; }
             public UmbracoObjectTypes UmbracoObjectType { get; set; }
+
+            protected bool Equals(Id2KeyCompositeKey other)
+            {
+                return Id == other.Id && UmbracoObjectType == other.UmbracoObjectType;
+            }
+
+            public override bool Equals(object obj)
+            {
+                if (ReferenceEquals(null, obj)) return false;
+                if (ReferenceEquals(this, obj)) return true;
+                if (obj.GetType() != this.GetType()) return false;
+                return Equals((Id2KeyCompositeKey) obj);
+            }
+
+            public override int GetHashCode()
+            {
+                unchecked
+                {
+                    return (Id * 397) ^ (int) UmbracoObjectType;
+                }
+            }
         }
 
         internal class Key2IdCompositeKey
         {
             public Guid Key { get; set; }
             public UmbracoObjectTypes UmbracoObjectType { get; set; }
+
+            protected bool Equals(Key2IdCompositeKey other)
+            {
+                return Key.Equals(other.Key) && UmbracoObjectType == other.UmbracoObjectType;
+            }
+
+            public override bool Equals(object obj)
+            {
+                if (ReferenceEquals(null, obj)) return false;
+                if (ReferenceEquals(this, obj)) return true;
+                if (obj.GetType() != this.GetType()) return false;
+                return Equals((Key2IdCompositeKey) obj);
+            }
+
+            public override int GetHashCode()
+            {
+                unchecked
+                {
+                    return (Key.GetHashCode() * 397) ^ (int) UmbracoObjectType;
+                }
+            }
         }
     }
 }
\ No newline at end of file

From 1efad782148a49a9b79de07140cb7de7cf1698c9 Mon Sep 17 00:00:00 2001
From: Robert <robe2006@edu.eal.dk>
Date: Mon, 14 Aug 2017 14:58:05 +0200
Subject: [PATCH 064/145] Package-actions link updated

---
 src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
index edd484c82e..45ae18eaf4 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
@@ -203,7 +203,7 @@
                         during installation and uninstallation.
                         <br />
                         All actions are formed as a xml node, containing data for the action to be performed.
-                        <a href="http://our.umbraco.org/wiki/reference/packaging/package-actions
+                        <a href="https://our.umbraco.org/documentation/Reference/Packaging/
 " target="_blank">Package actions documentation</a>
                     </p>
                     <asp:CustomValidator ID="actionsVal" runat="server" OnServerValidate="validateActions"

From 2773102441dbc52c85be28895380007cd9a6c828 Mon Sep 17 00:00:00 2001
From: Robert <robe2006@edu.eal.dk>
Date: Mon, 14 Aug 2017 14:58:48 +0200
Subject: [PATCH 065/145] Fixed tag

---
 src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
index 45ae18eaf4..3ada3db523 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
@@ -189,7 +189,8 @@
                     <asp:TextBox ID="packageControlPath" Width="330px" CssClass="guiInputText" runat="server" />
                     <a href="#" onclick="UmbClientMgr.openModalWindow('developer/packages/directoryBrowser.aspx?target=<%= packageControlPath.ClientID %>','Choose a file or a folder', true, 500, 400); return false;"
                         style="border: none;">
-                         <i class="icon icon-folder"></i>
+                         <i class="icon icon-folder"></i>
+                      </a>
                 </td>
             </tr>
         </table>

From c68d7a33ca62855584bb56ef7ce988a16c6c0cc0 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Mon, 14 Aug 2017 19:57:28 +0200
Subject: [PATCH 066/145] Fix maxchars javascript errors on macro parameter
 editors

---
 .../propertyeditors/textarea/textarea.controller.js | 13 ++++++++++++-
 .../propertyeditors/textbox/textbox.controller.js   | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.controller.js
index 2d4e114dcf..76a3ec2913 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.controller.js
@@ -1,4 +1,15 @@
-function textAreaController($rootScope, $scope, $log) {
+function textAreaController($scope) {
+
+    // macro parameter editor doesn't contains a config object,
+    // so we create a new one to hold any properties 
+    if (!$scope.model.config) {
+        $scope.model.config = {};
+    }
+
+    if (!$scope.model.config.maxChars) {
+        $scope.model.config.maxChars = false;
+    }
+
     $scope.model.maxlength = false;
     if($scope.model.config.maxChars) {
         $scope.model.maxlength = true;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js
index 03f7510112..63dab278e4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js
@@ -1,4 +1,15 @@
-function textboxController($rootScope, $scope, $log) {
+function textboxController($scope) {
+
+    // macro parameter editor doesn't contains a config object,
+    // so we create a new one to hold any properties 
+    if (!$scope.model.config) {
+        $scope.model.config = {};
+    }
+
+    if (!$scope.model.config.maxChars) {
+        $scope.model.config.maxChars = false;
+    }
+
     $scope.model.maxlength = false;
     if($scope.model.config.maxChars) {
         $scope.model.maxlength = true;

From c44b9032618ff647cfb7a8e94a1a62a002bb97ba Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Tue, 15 Aug 2017 10:10:40 +0200
Subject: [PATCH 067/145] changed to private structs and made immutable.

---
 src/Umbraco.Core/Services/IdkMap.cs           | 106 ++++++++++++------
 .../Services/EntityServiceTests.cs            |   6 +-
 2 files changed, 75 insertions(+), 37 deletions(-)

diff --git a/src/Umbraco.Core/Services/IdkMap.cs b/src/Umbraco.Core/Services/IdkMap.cs
index 021f8288cb..17441817ac 100644
--- a/src/Umbraco.Core/Services/IdkMap.cs
+++ b/src/Umbraco.Core/Services/IdkMap.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Core.Services
 
         public Attempt<int> GetIdForKey(Guid key, UmbracoObjectTypes umbracoObjectType)
         {
-            var compositeKey = new Key2IdCompositeKey() { Key = key, UmbracoObjectType = umbracoObjectType };
+            var compositeKey = new Key2IdCompositeKey(key, umbracoObjectType);
             int id;
             try
             {
@@ -50,7 +50,7 @@ namespace Umbraco.Core.Services
 
             try
             {
-                var reversedCompositeKey = new Id2KeyCompositeKey { Id = id, UmbracoObjectType = umbracoObjectType };
+                var reversedCompositeKey = new Id2KeyCompositeKey(id, umbracoObjectType);
                 _locker.EnterWriteLock();
                 _id2Key[reversedCompositeKey] = key;
                 _key2Id[compositeKey] = id;
@@ -76,7 +76,7 @@ namespace Umbraco.Core.Services
 
         public Attempt<Guid> GetKeyForId(int id, UmbracoObjectTypes umbracoObjectType)
         {
-            var compositeKey = new Id2KeyCompositeKey() {Id = id, UmbracoObjectType = umbracoObjectType};
+            var compositeKey = new Id2KeyCompositeKey(id, umbracoObjectType);
             Guid key;
             try
             {
@@ -102,7 +102,7 @@ namespace Umbraco.Core.Services
 
             try
             {
-                var reversedCompositeKey = new Key2IdCompositeKey {Key = key, UmbracoObjectType = umbracoObjectType};
+                var reversedCompositeKey = new Key2IdCompositeKey(key, umbracoObjectType);
                 _locker.EnterWriteLock();
                 _id2Key[compositeKey] = key;
                 _key2Id[reversedCompositeKey] = id;
@@ -144,12 +144,17 @@ namespace Umbraco.Core.Services
             try
             {
                 _locker.EnterWriteLock();
-                var match = _id2Key.Keys.SingleOrDefault(x => x.Id == id);
-                if (match == null) return;
-                var key = _id2Key[match];
-                var reversedCompositeKey = new Key2IdCompositeKey { Key = key, UmbracoObjectType = match.UmbracoObjectType };
-                _id2Key.Remove(match);
-                _key2Id.Remove(reversedCompositeKey);
+                foreach (var compositeKey in _id2Key.Keys)
+                {
+                    if (compositeKey.Id == id)
+                    {
+                        var guid = _id2Key[compositeKey];
+                        var reversedCompositeKey = new Key2IdCompositeKey(guid, compositeKey.UmbracoObjectType);
+                        _id2Key.Remove(compositeKey);
+                        _key2Id.Remove(reversedCompositeKey);
+                        break;
+                    }
+                }
             }
             finally
             {
@@ -163,12 +168,17 @@ namespace Umbraco.Core.Services
             try
             {
                 _locker.EnterWriteLock();
-                var match = _key2Id.Keys.SingleOrDefault(x => x.Key == key);
-                if (match == null) return;
-                var id = _key2Id[match];
-                var reversedCompositeKey = new Id2KeyCompositeKey {Id = id, UmbracoObjectType = match.UmbracoObjectType};
-                _id2Key.Remove(reversedCompositeKey);
-                _key2Id.Remove(match);
+                foreach (var compositeKey in _key2Id.Keys)
+                {
+                    if (compositeKey.Key == key)
+                    {
+                        var id = _key2Id[compositeKey];
+                        var reversedCompositeKey = new Id2KeyCompositeKey(id, compositeKey.UmbracoObjectType);
+                        _id2Key.Remove(reversedCompositeKey);
+                        _key2Id.Remove(compositeKey);
+                        break;
+                    }
+                }
             }
             finally
             {
@@ -177,56 +187,84 @@ namespace Umbraco.Core.Services
             }
         }
 
-        internal class Id2KeyCompositeKey
+        private struct Id2KeyCompositeKey
         {
-            public int Id { get; set; }
-            public UmbracoObjectTypes UmbracoObjectType { get; set; }
+            private readonly int _id;
+            private readonly UmbracoObjectTypes _umbracoObjectType;
 
-            protected bool Equals(Id2KeyCompositeKey other)
+            public int Id
             {
-                return Id == other.Id && UmbracoObjectType == other.UmbracoObjectType;
+                get { return _id; }
+            }
+
+            public UmbracoObjectTypes UmbracoObjectType
+            {
+                get { return _umbracoObjectType; }
+            }
+
+            public Id2KeyCompositeKey(int id, UmbracoObjectTypes umbracoObjectType)
+            {
+                _id = id;
+                _umbracoObjectType = umbracoObjectType;
+            }
+
+            private bool Equals(Id2KeyCompositeKey other)
+            {
+                return _id == other._id && _umbracoObjectType == other._umbracoObjectType;
             }
 
             public override bool Equals(object obj)
             {
                 if (ReferenceEquals(null, obj)) return false;
-                if (ReferenceEquals(this, obj)) return true;
-                if (obj.GetType() != this.GetType()) return false;
-                return Equals((Id2KeyCompositeKey) obj);
+                return obj is Id2KeyCompositeKey && Equals((Id2KeyCompositeKey) obj);
             }
 
             public override int GetHashCode()
             {
                 unchecked
                 {
-                    return (Id * 397) ^ (int) UmbracoObjectType;
+                    return (_id * 397) ^ (int) _umbracoObjectType;
                 }
             }
         }
 
-        internal class Key2IdCompositeKey
+        private struct Key2IdCompositeKey
         {
-            public Guid Key { get; set; }
-            public UmbracoObjectTypes UmbracoObjectType { get; set; }
+            private readonly Guid _key;
+            private readonly UmbracoObjectTypes _umbracoObjectType;
 
-            protected bool Equals(Key2IdCompositeKey other)
+            public Guid Key
             {
-                return Key.Equals(other.Key) && UmbracoObjectType == other.UmbracoObjectType;
+                get { return _key; }
+            }
+
+            public UmbracoObjectTypes UmbracoObjectType
+            {
+                get { return _umbracoObjectType; }
+            }
+
+            public Key2IdCompositeKey(Guid key, UmbracoObjectTypes umbracoObjectType)
+            {
+                _key = key;
+                _umbracoObjectType = umbracoObjectType;
+            }
+
+            private bool Equals(Key2IdCompositeKey other)
+            {
+                return _key.Equals(other._key) && _umbracoObjectType == other._umbracoObjectType;
             }
 
             public override bool Equals(object obj)
             {
                 if (ReferenceEquals(null, obj)) return false;
-                if (ReferenceEquals(this, obj)) return true;
-                if (obj.GetType() != this.GetType()) return false;
-                return Equals((Key2IdCompositeKey) obj);
+                return obj is Key2IdCompositeKey && Equals((Key2IdCompositeKey) obj);
             }
 
             public override int GetHashCode()
             {
                 unchecked
                 {
-                    return (Key.GetHashCode() * 397) ^ (int) UmbracoObjectType;
+                    return (_key.GetHashCode() * 397) ^ (int) _umbracoObjectType;
                 }
             }
         }
diff --git a/src/Umbraco.Tests/Services/EntityServiceTests.cs b/src/Umbraco.Tests/Services/EntityServiceTests.cs
index 818e0099e8..021c0d6c36 100644
--- a/src/Umbraco.Tests/Services/EntityServiceTests.cs
+++ b/src/Umbraco.Tests/Services/EntityServiceTests.cs
@@ -548,8 +548,8 @@ namespace Umbraco.Tests.Services
         {
             var service = ServiceContext.EntityService;
             var result1 = service.GetKeyForId(1060, UmbracoObjectTypes.DocumentType);
-            var result2 = service.GetKeyForId(1060, UmbracoObjectTypes.MediaType);
-
+            var result2 = service.GetKeyForId(1060, UmbracoObjectTypes.MediaType);
+
             Assert.IsTrue(result1.Success);
             Assert.IsFalse(result2.Success);
         }
@@ -569,7 +569,7 @@ namespace Umbraco.Tests.Services
         {
             var service = ServiceContext.EntityService;
             var result1 = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.DocumentType);
-            var result2 = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.MediaType);
+            var result2 = service.GetIdForKey(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.MediaType);
 
             Assert.IsTrue(result1.Success);
             Assert.IsFalse(result2.Success);

From f7097d571c653b14aa92bb63c2950cf8ef3e96d5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 17 Aug 2017 11:38:57 +1000
Subject: [PATCH 068/145] U4-10301 Change the PluginManager hash to use more
 reliable and consistent hashes

---
 src/Umbraco.Core/HashCodeCombiner.cs          |   6 +-
 src/Umbraco.Core/HashGenerator.cs             | 154 +++++++++++++++
 src/Umbraco.Core/PluginManager.cs             | 115 +++++------
 src/Umbraco.Core/StringExtensions.cs          |   2 +-
 .../Sync/WebServiceServerMessenger.cs         |  10 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 +
 src/Umbraco.Tests/HashCodeCombinerTests.cs    |   2 +-
 src/Umbraco.Tests/HashGeneratorTests.cs       | 184 ++++++++++++++++++
 .../Plugins/PluginManagerTests.cs             |  10 +-
 .../Strings/StringExtensionsTests.cs          |   2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 +
 11 files changed, 405 insertions(+), 82 deletions(-)
 create mode 100644 src/Umbraco.Core/HashGenerator.cs
 create mode 100644 src/Umbraco.Tests/HashGeneratorTests.cs

diff --git a/src/Umbraco.Core/HashCodeCombiner.cs b/src/Umbraco.Core/HashCodeCombiner.cs
index d3a55d5256..5f99c65787 100644
--- a/src/Umbraco.Core/HashCodeCombiner.cs
+++ b/src/Umbraco.Core/HashCodeCombiner.cs
@@ -2,17 +2,19 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Text;
 
 namespace Umbraco.Core
 {
     /// <summary>
-    /// Used to create a hash code from multiple objects.
+    /// Used to create a .NET HashCode from multiple objects.
     /// </summary>
     /// <remarks>
     /// .Net has a class the same as this: System.Web.Util.HashCodeCombiner and of course it works for all sorts of things
     /// which we've not included here as we just need a quick easy class for this in order to create a unique
     /// hash of directories/files to see if they have changed.
+    /// 
+    /// NOTE: It's probably best to not relying on the hashing result across AppDomains! If you need a constant/reliable hash value
+    /// between AppDomains use SHA1. This is perfect for hashing things in a very fast way for a single AppDomain.
     /// </remarks>
     internal class HashCodeCombiner
     {
diff --git a/src/Umbraco.Core/HashGenerator.cs b/src/Umbraco.Core/HashGenerator.cs
new file mode 100644
index 0000000000..7306dc9045
--- /dev/null
+++ b/src/Umbraco.Core/HashGenerator.cs
@@ -0,0 +1,154 @@
+using System;
+using System.Globalization;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Used to generate a string hash using crypto libraries over multiple objects
+    /// </summary>
+    /// <remarks>
+    /// This should be used to generate a reliable hash that survives AppDomain restarts. 
+    /// This will use the crypto libs to generate the hash and will try to ensure that 
+    /// strings, etc... are not re-allocated so it's not consuming much memory.
+    /// </remarks>
+    internal class HashGenerator : DisposableObject
+    {
+        public HashGenerator()
+        {
+            _writer = new StreamWriter(_ms, Encoding.Unicode, 1024, leaveOpen: true);
+        }
+
+        private readonly MemoryStream _ms = new MemoryStream();
+        private StreamWriter _writer;
+
+        internal void AddInt(int i)
+        {
+            _writer.Write(i);
+        }
+
+        internal void AddLong(long i)
+        {
+            _writer.Write(i);
+        }
+
+        internal void AddObject(object o)
+        {
+            _writer.Write(o);
+        }
+
+        internal void AddDateTime(DateTime d)
+        {
+            _writer.Write(d.Ticks);;
+        }
+
+        internal void AddString(string s)
+        {
+            if (s != null)
+                _writer.Write(s);
+        }
+
+        internal void AddCaseInsensitiveString(string s)
+        {
+            //I've tried to no allocate a new string with this which can be done if we use the CompareInfo.GetSortKey method which will create a new
+            //byte array that we can use to write to the output, however this also allocates new objects so i really don't think the performance
+            //would be much different. In any case, i'll leave this here for reference. We could write the bytes out based on the sort key,
+            //this is how we could deal with case insensitivity without allocating another string
+            //for reference see: https://stackoverflow.com/a/10452967/694494
+            //we could go a step further and s.Normalize() but we're not really dealing with crazy unicode with this class so far.
+
+            if (s != null)
+                _writer.Write(s.ToUpperInvariant());            
+        }
+
+        internal void AddFileSystemItem(FileSystemInfo f)
+        {
+            //if it doesn't exist, don't proceed.
+            if (f.Exists == false)
+                return;
+
+            AddCaseInsensitiveString(f.FullName);
+            AddDateTime(f.CreationTimeUtc);
+            AddDateTime(f.LastWriteTimeUtc);
+
+            //check if it is a file or folder 
+            var fileInfo = f as FileInfo;
+            if (fileInfo != null)
+            {
+                AddLong(fileInfo.Length);
+            }
+
+            var dirInfo = f as DirectoryInfo;
+            if (dirInfo != null)
+            {
+                foreach (var d in dirInfo.GetFiles())
+                {
+                    AddFile(d);
+                }
+                foreach (var s in dirInfo.GetDirectories())
+                {
+                    AddFolder(s);
+                }
+            }
+        }
+
+        internal void AddFile(FileInfo f)
+        {
+            AddFileSystemItem(f);
+        }
+
+        internal void AddFolder(DirectoryInfo d)
+        {
+            AddFileSystemItem(d);
+        }
+
+        /// <summary>
+        /// Returns the generated hash output of all added objects
+        /// </summary>
+        /// <returns></returns>
+        internal string GenerateHash()
+        {
+            //flush,close,dispose the writer,then create a new one since it's possible to keep adding after GenerateHash is called.
+
+            _writer.Flush();
+            _writer.Close();
+            _writer.Dispose();
+            _writer = new StreamWriter(_ms, Encoding.UTF8, 1024, leaveOpen: true);
+
+            var hashType = CryptoConfig.AllowOnlyFipsAlgorithms ? "SHA1" : "MD5";
+
+            //create an instance of the correct hashing provider based on the type passed in
+            var hasher = HashAlgorithm.Create(hashType);
+            if (hasher == null) throw new InvalidOperationException("No hashing type found by name " + hashType);
+            using (hasher)
+            {
+                var buffer = _ms.GetBuffer();
+                //get the hashed values created by our selected provider
+                var hashedByteArray = hasher.ComputeHash(buffer);
+
+                //create a StringBuilder object
+                var stringBuilder = new StringBuilder();
+
+                //loop to each each byte
+                foreach (var b in hashedByteArray)
+                {
+                    //append it to our StringBuilder
+                    stringBuilder.Append(b.ToString("x2"));
+                }
+
+                //return the hashed value
+                return stringBuilder.ToString();
+            }
+        }
+
+        protected override void DisposeResources()
+        {
+            _writer.Close();
+            _writer.Dispose();
+            _ms.Close();
+            _ms.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/PluginManager.cs b/src/Umbraco.Core/PluginManager.cs
index fe9236c58c..30029d2c87 100644
--- a/src/Umbraco.Core/PluginManager.cs
+++ b/src/Umbraco.Core/PluginManager.cs
@@ -44,8 +44,8 @@ namespace Umbraco.Core
         private readonly object _typesLock = new object();
         private readonly Dictionary<TypeListKey, TypeList> _types = new Dictionary<TypeListKey, TypeList>();
 
-        private long _cachedAssembliesHash = -1;
-        private long _currentAssembliesHash = -1;
+        private string _cachedAssembliesHash = null;
+        private string _currentAssembliesHash = null;
         private IEnumerable<Assembly> _assemblies;
         private bool _reportedChange;
 
@@ -75,9 +75,9 @@ namespace Umbraco.Core
 
             if (detectChanges)
             {
-                //first check if the cached hash is 0, if it is then we ne
+                //first check if the cached hash is string.Empty, if it is then we need
                 //do the check if they've changed
-                RequiresRescanning = (CachedAssembliesHash != CurrentAssembliesHash) || CachedAssembliesHash == 0;
+                RequiresRescanning = (CachedAssembliesHash != CurrentAssembliesHash) || CachedAssembliesHash == string.Empty;
                 //if they have changed, we need to write the new file
                 if (RequiresRescanning)
                 {
@@ -180,23 +180,20 @@ namespace Umbraco.Core
         /// <summary>
         /// Gets the currently cached hash value of the scanned assemblies.
         /// </summary>
-        /// <value>The cached hash value, or 0 if no cache is found.</value>
-        internal long CachedAssembliesHash
+        /// <value>The cached hash value, or string.Empty if no cache is found.</value>
+        internal string CachedAssembliesHash
         {
             get
             {
-                if (_cachedAssembliesHash != -1)
+                if (_cachedAssembliesHash != null)
                     return _cachedAssembliesHash;
 
                 var filePath = GetPluginHashFilePath();
-                if (File.Exists(filePath) == false) return 0;
+                if (File.Exists(filePath) == false) return string.Empty;
 
                 var hash = File.ReadAllText(filePath, Encoding.UTF8);
-
-                long val;
-                if (long.TryParse(hash, out val) == false) return 0;
-
-                _cachedAssembliesHash = val;
+                
+                _cachedAssembliesHash = hash;
                 return _cachedAssembliesHash;
             }
         }
@@ -205,11 +202,11 @@ namespace Umbraco.Core
         /// Gets the current assemblies hash based on creating a hash from the assemblies in various places.
         /// </summary>
         /// <value>The current hash.</value>
-        internal long CurrentAssembliesHash
+        internal string CurrentAssembliesHash
         {
             get
             {
-                if (_currentAssembliesHash != -1)
+                if (_currentAssembliesHash != null)
                     return _currentAssembliesHash;
 
                 _currentAssembliesHash = GetFileHash(new List<Tuple<FileSystemInfo, bool>>
@@ -245,41 +242,40 @@ namespace Umbraco.Core
         /// <returns>The hash.</returns>
         /// <remarks>Each file is a tuple containing the FileInfo object and a boolean which indicates whether to hash the
         /// file properties (false) or the file contents (true).</remarks>
-        internal static long GetFileHash(IEnumerable<Tuple<FileSystemInfo, bool>> filesAndFolders, ProfilingLogger logger)
+        internal static string GetFileHash(IEnumerable<Tuple<FileSystemInfo, bool>> filesAndFolders, ProfilingLogger logger)
         {
             using (logger.TraceDuration<PluginManager>("Determining hash of code files on disk", "Hash determined"))
-            {
-                var hashCombiner = new HashCodeCombiner();
-
+            {                
                 // get the distinct file infos to hash
                 var uniqInfos = new HashSet<string>();
                 var uniqContent = new HashSet<string>();
-
-                foreach (var fileOrFolder in filesAndFolders)
+                using (var generator = new HashGenerator())
                 {
-                    var info = fileOrFolder.Item1;
-                    if (fileOrFolder.Item2)
+                    foreach (var fileOrFolder in filesAndFolders)
                     {
-                        // add each unique file's contents to the hash
-                        // normalize the content for cr/lf and case-sensitivity
-
-                        if (uniqContent.Contains(info.FullName)) continue;
-                        uniqContent.Add(info.FullName);
-                        if (File.Exists(info.FullName) == false) continue;
-                        var content = RemoveCrLf(File.ReadAllText(info.FullName));
-                        hashCombiner.AddCaseInsensitiveString(content);
+                        var info = fileOrFolder.Item1;
+                        if (fileOrFolder.Item2)
+                        {
+                            // add each unique file's contents to the hash
+                            // normalize the content for cr/lf and case-sensitivity
+                            if (uniqContent.Add(info.FullName))
+                            {
+                                if (File.Exists(info.FullName) == false) continue;
+                                var content = RemoveCrLf(File.ReadAllText(info.FullName));
+                                generator.AddCaseInsensitiveString(content);
+                            }
+                        }
+                        else
+                        {
+                            // add each unique folder/file to the hash
+                            if (uniqInfos.Add(info.FullName))
+                            {
+                                generator.AddFileSystemItem(info);
+                            }
+                        }
                     }
-                    else
-                    {
-                        // add each unique folder/file to the hash
-
-                        if (uniqInfos.Contains(info.FullName)) continue;
-                        uniqInfos.Add(info.FullName);
-                        hashCombiner.AddFileSystemItem(info);
-                    }
-                }
-
-                return ConvertHashToInt64(hashCombiner.GetCombinedHashCode());
+                    return generator.GenerateHash();
+                }                
             }
         }
 
@@ -303,34 +299,25 @@ namespace Umbraco.Core
         /// <param name="filesAndFolders">A collection of files.</param>
         /// <param name="logger">A profiling logger.</param>
         /// <returns>The hash.</returns>
-        internal static long GetFileHash(IEnumerable<FileSystemInfo> filesAndFolders, ProfilingLogger logger)
+        internal static string GetFileHash(IEnumerable<FileSystemInfo> filesAndFolders, ProfilingLogger logger)
         {
             using (logger.TraceDuration<PluginManager>("Determining hash of code files on disk", "Hash determined"))
             {
-                var hashCombiner = new HashCodeCombiner();
-
-                // get the distinct file infos to hash
-                var uniqInfos = new HashSet<string>();
-
-                foreach (var fileOrFolder in filesAndFolders)
+                using (var generator = new HashGenerator())
                 {
-                    if (uniqInfos.Contains(fileOrFolder.FullName)) continue;
-                    uniqInfos.Add(fileOrFolder.FullName);
-                    hashCombiner.AddFileSystemItem(fileOrFolder);
-                }
+                    // get the distinct file infos to hash
+                    var uniqInfos = new HashSet<string>();
 
-                return ConvertHashToInt64(hashCombiner.GetCombinedHashCode());
+                    foreach (var fileOrFolder in filesAndFolders)
+                    {
+                        if (uniqInfos.Contains(fileOrFolder.FullName)) continue;
+                        uniqInfos.Add(fileOrFolder.FullName);
+                        generator.AddFileSystemItem(fileOrFolder);
+                    }
+                    return generator.GenerateHash();
+                }                
             }
-        }
-
-        /// <summary>
-        /// Converts a string hash value into an Int64.
-        /// </summary>
-        internal static long ConvertHashToInt64(string val)
-        {
-            long outVal;
-            return long.TryParse(val, NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture, out outVal) ? outVal : 0;
-        }
+        }        
 
         #endregion
 
diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
index dba7f2cfee..b9b9e478dc 100644
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -759,7 +759,7 @@ namespace Umbraco.Core
                 foreach (var b in hashedByteArray)
                 {
                     //append it to our StringBuilder
-                    stringBuilder.Append(b.ToString("x2").ToLower());
+                    stringBuilder.Append(b.ToString("x2"));
                 }
 
                 //return the hashed value
diff --git a/src/Umbraco.Core/Sync/WebServiceServerMessenger.cs b/src/Umbraco.Core/Sync/WebServiceServerMessenger.cs
index e5717fbfdc..09b845d29a 100644
--- a/src/Umbraco.Core/Sync/WebServiceServerMessenger.cs
+++ b/src/Umbraco.Core/Sync/WebServiceServerMessenger.cs
@@ -126,10 +126,12 @@ namespace Umbraco.Core.Sync
 
         public static string GetServerHash(string machineName, string appDomainAppId)
         {
-            var hasher = new HashCodeCombiner();
-            hasher.AddCaseInsensitiveString(appDomainAppId);
-            hasher.AddCaseInsensitiveString(machineName);
-            return hasher.GetCombinedHashCode();
+            using (var generator = new HashGenerator())
+            {
+                generator.AddString(machineName);
+                generator.AddString(appDomainAppId);
+                return generator.GenerateHash();
+            }
         }
 
         protected override bool RequiresDistributed(IEnumerable<IServerAddress> servers, ICacheRefresher refresher, MessageType messageType)
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 24fdf32150..5fa4325814 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -342,6 +342,7 @@
     <Compile Include="Events\SupersedeEventAttribute.cs" />
     <Compile Include="Exceptions\ConnectionException.cs" />
     <Compile Include="HashCodeHelper.cs" />
+    <Compile Include="HashGenerator.cs" />
     <Compile Include="IHttpContextAccessor.cs" />
     <Compile Include="Models\EntityBase\IDeletableEntity.cs" />
     <Compile Include="Models\IUserControl.cs" />
diff --git a/src/Umbraco.Tests/HashCodeCombinerTests.cs b/src/Umbraco.Tests/HashCodeCombinerTests.cs
index 8d1ad021dd..08eacd655b 100644
--- a/src/Umbraco.Tests/HashCodeCombinerTests.cs
+++ b/src/Umbraco.Tests/HashCodeCombinerTests.cs
@@ -6,7 +6,7 @@ using Umbraco.Core;
 
 namespace Umbraco.Tests
 {
-	[TestFixture]
+    [TestFixture]
 	public class HashCodeCombinerTests 
 	{
 
diff --git a/src/Umbraco.Tests/HashGeneratorTests.cs b/src/Umbraco.Tests/HashGeneratorTests.cs
new file mode 100644
index 0000000000..179b4eaeaa
--- /dev/null
+++ b/src/Umbraco.Tests/HashGeneratorTests.cs
@@ -0,0 +1,184 @@
+using System;
+using System.IO;
+using System.Reflection;
+using NUnit.Framework;
+using Umbraco.Core;
+
+namespace Umbraco.Tests
+{
+    [TestFixture]
+    public class HashGeneratorTests
+    {
+        private string Generate(bool isCaseSensitive, params string[] strs)
+        {
+            using (var generator = new HashGenerator())
+            {
+                foreach (var str in strs)
+                {
+                    if (isCaseSensitive)
+                        generator.AddString(str);
+                    else
+                        generator.AddCaseInsensitiveString(str);
+                }
+                return generator.GenerateHash();
+            }
+        }
+
+        [Test]
+        public void Generate_Hash_Multiple_Strings_Case_Sensitive()
+        {
+            
+            var hash1 = Generate(true, "hello", "world");
+            var hash2 = Generate(true, "hello", "world");
+            var hashFalse1 = Generate(true, "hello", "worlD");
+            var hashFalse2 = Generate(true, "hEllo", "world");
+
+            Assert.AreEqual(hash1, hash2);
+            Assert.AreNotEqual(hash1, hashFalse1);
+            Assert.AreNotEqual(hash1, hashFalse2);
+        }
+
+        [Test]
+        public void Generate_Hash_Multiple_Strings_Case_Insensitive()
+        {
+            var hash1 = Generate(false, "hello", "world");
+            var hash2 = Generate(false, "hello", "world");
+            var hashFalse1 = Generate(false, "hello", "worlD");
+            var hashFalse2 = Generate(false, "hEllo", "world");
+
+            Assert.AreEqual(hash1, hash2);
+            Assert.AreEqual(hash1, hashFalse1);
+            Assert.AreEqual(hash1, hashFalse2);
+        }
+
+        private DirectoryInfo PrepareFolder()
+        {
+            var assDir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory;
+            var dir = Directory.CreateDirectory(Path.Combine(assDir.FullName, "HashCombiner", Guid.NewGuid().ToString("N")));
+            foreach (var f in dir.GetFiles())
+            {
+                f.Delete();
+            }
+            return dir;
+        }
+
+        [Test]
+        public void HashCombiner_Test_String()
+        {
+            using (var combiner1 = new HashGenerator())
+            using (var combiner2 = new HashGenerator())
+            {
+                combiner1.AddCaseInsensitiveString("Hello");
+                combiner2.AddCaseInsensitiveString("hello");
+                Assert.AreEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+                combiner2.AddCaseInsensitiveString("world");
+                Assert.AreNotEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+            }
+            
+        }
+
+        [Test]
+        public void HashCombiner_Test_Int()
+        {
+            using (var combiner1 = new HashGenerator())
+            using (var combiner2 = new HashGenerator())
+            {
+                combiner1.AddInt(1234);
+                combiner2.AddInt(1234);
+                Assert.AreEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+                combiner2.AddInt(1);
+                Assert.AreNotEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+            }
+        }
+
+        [Test]
+        public void HashCombiner_Test_DateTime()
+        {
+            using (var combiner1 = new HashGenerator())
+            using (var combiner2 = new HashGenerator())
+            {
+                var dt = DateTime.Now;
+                combiner1.AddDateTime(dt);
+                combiner2.AddDateTime(dt);
+                Assert.AreEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+                combiner2.AddDateTime(DateTime.Now);
+                Assert.AreNotEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+            }            
+        }
+
+        [Test]
+        public void HashCombiner_Test_File()
+        {
+            using (var combiner1 = new HashGenerator())
+            using (var combiner2 = new HashGenerator())
+            using (var combiner3 = new HashGenerator())
+            {
+                var dir = PrepareFolder();
+                var file1Path = Path.Combine(dir.FullName, "hastest1.txt");
+                File.Delete(file1Path);
+                using (var file1 = File.CreateText(Path.Combine(dir.FullName, "hastest1.txt")))
+                {
+                    file1.WriteLine("hello");
+                }
+                var file2Path = Path.Combine(dir.FullName, "hastest2.txt");
+                File.Delete(file2Path);
+                using (var file2 = File.CreateText(Path.Combine(dir.FullName, "hastest2.txt")))
+                {
+                    //even though files are the same, the dates are different
+                    file2.WriteLine("hello");
+                }
+
+                combiner1.AddFile(new FileInfo(file1Path));
+
+                combiner2.AddFile(new FileInfo(file1Path));
+
+                combiner3.AddFile(new FileInfo(file2Path));
+
+                Assert.AreEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+                Assert.AreNotEqual(combiner1.GenerateHash(), combiner3.GenerateHash());
+
+                combiner2.AddFile(new FileInfo(file2Path));
+
+                Assert.AreNotEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+            }
+        }
+
+        [Test]
+        public void HashCombiner_Test_Folder()
+        {
+            using (var combiner1 = new HashGenerator())
+            using (var combiner2 = new HashGenerator())
+            using (var combiner3 = new HashGenerator())
+            {
+                var dir = PrepareFolder();
+                var file1Path = Path.Combine(dir.FullName, "hastest1.txt");
+                File.Delete(file1Path);
+                using (var file1 = File.CreateText(Path.Combine(dir.FullName, "hastest1.txt")))
+                {
+                    file1.WriteLine("hello");
+                }
+
+                //first test the whole folder
+                combiner1.AddFolder(dir);
+
+                combiner2.AddFolder(dir);
+
+                Assert.AreEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+
+                //now add a file to the folder
+
+                var file2Path = Path.Combine(dir.FullName, "hastest2.txt");
+                File.Delete(file2Path);
+                using (var file2 = File.CreateText(Path.Combine(dir.FullName, "hastest2.txt")))
+                {
+                    //even though files are the same, the dates are different
+                    file2.WriteLine("hello");
+                }
+
+                combiner3.AddFolder(dir);
+
+                Assert.AreNotEqual(combiner1.GenerateHash(), combiner3.GenerateHash());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Plugins/PluginManagerTests.cs b/src/Umbraco.Tests/Plugins/PluginManagerTests.cs
index 333970bf67..15d7a7ffda 100644
--- a/src/Umbraco.Tests/Plugins/PluginManagerTests.cs
+++ b/src/Umbraco.Tests/Plugins/PluginManagerTests.cs
@@ -218,15 +218,7 @@ AnotherContentFinder
             //ensure they are all found
             Assert.IsTrue(plugins.Result.ContainsAll(shouldContain));
         }
-
-        [Test]
-        public void PluginHash_From_String()
-        {
-            var s = "hello my name is someone".GetHashCode().ToString("x", CultureInfo.InvariantCulture);
-            var output = PluginManager.ConvertHashToInt64(s);
-            Assert.AreNotEqual(0, output);
-        }
-
+        
         [Test]
         public void Get_Plugins_Hash()
         {
diff --git a/src/Umbraco.Tests/Strings/StringExtensionsTests.cs b/src/Umbraco.Tests/Strings/StringExtensionsTests.cs
index 199bd9254d..e0e80f3ab2 100644
--- a/src/Umbraco.Tests/Strings/StringExtensionsTests.cs
+++ b/src/Umbraco.Tests/Strings/StringExtensionsTests.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Tests.Strings
         {
             ShortStringHelperResolver.Reset();
         }
-
+        
         [TestCase("hello", "world", false)]
         [TestCase("hello", "hello", true)]
         [TestCase("hellohellohellohellohellohellohello", "hellohellohellohellohellohellohelloo", false)]
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 067109d8bf..5048bad14e 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -165,6 +165,7 @@
     <Compile Include="Cache\CacheRefresherEventHandlerTests.cs" />
     <Compile Include="Dependencies\NuGet.cs" />
     <Compile Include="CallContextTests.cs" />
+    <Compile Include="HashGeneratorTests.cs" />
     <Compile Include="Issues\U9560.cs" />
     <Compile Include="Collections\OrderedHashSetTests.cs" />
     <Compile Include="IO\ShadowFileSystemTests.cs" />

From 300c9aa25815b2c713a33f93e04a4eea77c8abbe Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 17 Aug 2017 12:10:34 +1000
Subject: [PATCH 069/145] fix test

---
 src/Umbraco.Tests/Cache/CacheRefresherTests.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Tests/Cache/CacheRefresherTests.cs b/src/Umbraco.Tests/Cache/CacheRefresherTests.cs
index 33dfd16743..189848651a 100644
--- a/src/Umbraco.Tests/Cache/CacheRefresherTests.cs
+++ b/src/Umbraco.Tests/Cache/CacheRefresherTests.cs
@@ -9,10 +9,10 @@ namespace Umbraco.Tests.Cache
     public class CacheRefresherTests
     {
         [TestCase("", "123456", "testmachine", true)] //empty hash will continue
-        [TestCase("fffffff28449cf33", "123456", "testmachine", false)] //match, don't continue
-        [TestCase("fffffff28449cf33", "12345", "testmachine", true)] // no match, continue
-        [TestCase("fffffff28449cf33", "123456", "testmachin", true)] // same
-        [TestCase("fffffff28449cf3", "123456", "testmachine", true)] // same
+        [TestCase("2e6deefea4444a69dbd15a01b4c2749d", "123456", "testmachine", false)] //match, don't continue
+        [TestCase("2e6deefea4444a69dbd15a01b4c2749d", "12345", "testmachine", true)] // no match, continue
+        [TestCase("2e6deefea4444a69dbd15a01b4c2749d", "123456", "testmachin", true)] // same
+        [TestCase("2e6deefea4444a69dbd15a01b4c2749", "123456", "testmachine", true)] // same
         public void Continue_Refreshing_For_Request(string hash, string appDomainAppId, string machineName, bool expected)
         {
             if (expected)

From 7213e3a6a0ef3701f4789182045cedb7c00063d7 Mon Sep 17 00:00:00 2001
From: Robert <robe2006@edu.eal.dk>
Date: Thu, 17 Aug 2017 12:06:32 +0200
Subject: [PATCH 070/145] Adding and removing text boxes should work properly
 now

Thanks Mads :)
---
 .../editor/umbfocusbackwards.directive.js     | 42 -------------------
 .../multipletextbox.controller.js             | 27 ++++++++----
 .../multipletextbox/multipletextbox.html      |  2 +-
 3 files changed, 21 insertions(+), 50 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbfocusbackwards.directive.js

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbfocusbackwards.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbfocusbackwards.directive.js
deleted file mode 100644
index c696c6cb28..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbfocusbackwards.directive.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives: focusNow
-@restrict A
-
-@description
-Use this directive focus backwards in a list of elements.
-You need to toggle the attribute's value everytime you delete an element to trigger the observe event.
-$scope.focusMe = ($scope.focusMe === true)? false: true;
-
-<h3>Example</h3>
-
-<div ui-sortable="sortableOptions" ng-model="model.value">
-    <div class="control-group" ng-repeat="item in model.value">
-
-      <i class="icon icon-navigation handle"></i>
-      <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" ng-keyup="addRemoveOnKeyDown($event, $index)" focus-Backwards="{{focusMe}}" />
-      <a prevent-default href="" localize="title" title="@content_removeTextBox" ng-show="model.value.length > model.config.min" ng-click="remove($index)">
-       <i class="icon icon-remove"></i>
-
-      </a>
-    </div>
-  </div>
-**/
-angular.module("umbraco").directive("focusBackwards", function ($timeout) {
-    return {
-        restrict: "A",
-        link: function (scope, element, attrs) {
-            attrs.$observe("focusBackwards", function (value) {
-                if (value === "true") {
-                    $timeout(function () {
-                        element.focus();
-                    });
-                } else {
-                    $timeout(function () {
-                        element.focus();
-                    });
-                }
-            });
-        }
-    };
-});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
index 6582e975e2..254c905d4b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
@@ -1,4 +1,4 @@
-function MultipleTextBoxController($scope) {
+function MultipleTextBoxController($scope, $timeout) {
 
     $scope.sortableOptions = {
         axis: 'y',
@@ -22,18 +22,23 @@
     }
 
     //TODO add focus to newly created text box or the first in line after deletion
-    $scope.addRemoveOnKeyDown = function (event, index) {
+    $scope.addRemoveOnKeyDown = function (event, index) {
+
         var txtBoxValue = $scope.model.value[index];
 
-        event.preventDefault();
+        var newItemIndex;
 
+        event.preventDefault();
+
         switch (event.keyCode) {
             case 13:
                 if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
                     $scope.model.value.push({ value: "" });
 
+                    newItemIndex = $scope.model.value.length - 1;
+
                     //Focus on the newly added value
-                    $scope.focusMe = false;
+                    $scope.model.value[newItemIndex].hasFocus = true;
                 }
                 break;
             case 8:
@@ -45,11 +50,19 @@
                             if (x !== index) {
                                 remainder.push($scope.model.value[x]);
                             }
-                        }
+                        }
+
                         $scope.model.value = remainder;
 
-                        // The role of this statement is to trigger the observe event
-                        $scope.focusMe = ($scope.focusMe === true) ? false : true;
+                        newItemIndex = $scope.model.value.length - 1;
+
+                        //Set focus back on false as the directive only watches for true
+                        $scope.model.value[newItemIndex].hasFocus = false;
+
+                        $timeout(function () {
+                            //Focus on the previous value
+                            $scope.model.value[newItemIndex].hasFocus = true;
+                        });
                     }
                 }
                 break;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index 483bdee838..7a6b4f4a29 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -4,7 +4,7 @@
     <div class="control-group" ng-repeat="item in model.value">
       <i class="icon icon-navigation handle"></i>
       <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor"
-             ng-keyup="addRemoveOnKeyDown($event, $index)" focus-Backwards="{{focusMe}}" />
+             ng-keyup="addRemoveOnKeyDown($event, $index)" focus-when="{{item.hasFocus}}"/>
       <a prevent-default href="" localize="title" title="@content_removeTextBox"
          ng-show="model.value.length > model.config.min"
          ng-click="remove($index)">

From 5e6b5a5cc1779505f10f927e721211a78a5dad89 Mon Sep 17 00:00:00 2001
From: Robert <robe2006@edu.eal.dk>
Date: Thu, 17 Aug 2017 12:09:20 +0200
Subject: [PATCH 071/145] Added a check so it's not possibile to delete the
 texboxes that are set as minimum

---
 .../multipletextbox/multipletextbox.controller.js              | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
index 254c905d4b..36371f6b2c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
@@ -42,9 +42,8 @@
                 }
                 break;
             case 8:
-
                 var remainder = [];
-                if ($scope.model.value.length > 1) {
+                if ($scope.model.value.length > 1 && $scope.model.value.length >= $scope.model.config.max) {
                     if (txtBoxValue.value === "") {
                         for (var x = 0; x < $scope.model.value.length; x++) {
                             if (x !== index) {

From 5a1fc91f3e7a6d56d0ef1dc8a7769018e3ab6ccf Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Thu, 17 Aug 2017 12:50:15 +0200
Subject: [PATCH 072/145] simplified it a bit.

---
 src/Umbraco.Core/Services/IdkMap.cs | 136 ++++++----------------------
 1 file changed, 29 insertions(+), 107 deletions(-)

diff --git a/src/Umbraco.Core/Services/IdkMap.cs b/src/Umbraco.Core/Services/IdkMap.cs
index 17441817ac..224937dddd 100644
--- a/src/Umbraco.Core/Services/IdkMap.cs
+++ b/src/Umbraco.Core/Services/IdkMap.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.UnitOfWork;
@@ -11,8 +10,9 @@ namespace Umbraco.Core.Services
     {
         private readonly IDatabaseUnitOfWorkProvider _uowProvider;
         private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim();
-        private readonly Dictionary<Id2KeyCompositeKey, Guid> _id2Key = new Dictionary<Id2KeyCompositeKey, Guid>();
-        private readonly Dictionary<Key2IdCompositeKey, int> _key2Id = new Dictionary<Key2IdCompositeKey, int>();
+        
+        private readonly Dictionary<int, TypedId<Guid>> _id2Key = new Dictionary<int, TypedId<Guid>>();
+        private readonly Dictionary<Guid, TypedId<int>> _key2Id = new Dictionary<Guid, TypedId<int>>();
 
         public IdkMap(IDatabaseUnitOfWorkProvider uowProvider)
         {
@@ -24,12 +24,11 @@ namespace Umbraco.Core.Services
 
         public Attempt<int> GetIdForKey(Guid key, UmbracoObjectTypes umbracoObjectType)
         {
-            var compositeKey = new Key2IdCompositeKey(key, umbracoObjectType);
-            int id;
+            TypedId<int> id;
             try
             {
                 _locker.EnterReadLock();
-                if (_key2Id.TryGetValue(compositeKey, out id)) return Attempt.Succeed(id);
+                if (_key2Id.TryGetValue(key, out id) && id.UmbracoObjectType == umbracoObjectType) return Attempt.Succeed(id.Id);
             }
             finally
             {
@@ -46,14 +45,13 @@ namespace Umbraco.Core.Services
             }
 
             if (val == null) return Attempt<int>.Fail();
-            id = val.Value;
+            id = new TypedId<int>(val.Value, umbracoObjectType);
 
             try
             {
-                var reversedCompositeKey = new Id2KeyCompositeKey(id, umbracoObjectType);
                 _locker.EnterWriteLock();
-                _id2Key[reversedCompositeKey] = key;
-                _key2Id[compositeKey] = id;
+                _id2Key[id.Id] = new TypedId<Guid>(key, umbracoObjectType);
+                _key2Id[key] = id;
             }
             finally
             {
@@ -61,7 +59,7 @@ namespace Umbraco.Core.Services
                     _locker.ExitWriteLock();
             }
 
-            return Attempt.Succeed(id);
+            return Attempt.Succeed(id.Id);
         }
 
         public Attempt<int> GetIdForUdi(Udi udi)
@@ -76,12 +74,11 @@ namespace Umbraco.Core.Services
 
         public Attempt<Guid> GetKeyForId(int id, UmbracoObjectTypes umbracoObjectType)
         {
-            var compositeKey = new Id2KeyCompositeKey(id, umbracoObjectType);
-            Guid key;
+            TypedId<Guid> key;
             try
             {
                 _locker.EnterReadLock();
-                if (_id2Key.TryGetValue(compositeKey, out key)) return Attempt.Succeed(key);
+                if (_id2Key.TryGetValue(id, out key) && key.UmbracoObjectType == umbracoObjectType) return Attempt.Succeed(key.Id);
             }
             finally
             {
@@ -98,14 +95,13 @@ namespace Umbraco.Core.Services
             }
 
             if (val == null) return Attempt<Guid>.Fail();
-            key = val.Value;
+            key = new TypedId<Guid>(val.Value, umbracoObjectType);
 
             try
             {
-                var reversedCompositeKey = new Key2IdCompositeKey(key, umbracoObjectType);
                 _locker.EnterWriteLock();
-                _id2Key[compositeKey] = key;
-                _key2Id[reversedCompositeKey] = id;
+                _id2Key[id] = key;
+                _key2Id[key.Id] = new TypedId<int>();
             }
             finally
             {
@@ -113,7 +109,7 @@ namespace Umbraco.Core.Services
                     _locker.ExitWriteLock();
             }
 
-            return Attempt.Succeed(key);
+            return Attempt.Succeed(key.Id);
         }
 
         private static Guid GetNodeObjectTypeGuid(UmbracoObjectTypes umbracoObjectType)
@@ -144,17 +140,10 @@ namespace Umbraco.Core.Services
             try
             {
                 _locker.EnterWriteLock();
-                foreach (var compositeKey in _id2Key.Keys)
-                {
-                    if (compositeKey.Id == id)
-                    {
-                        var guid = _id2Key[compositeKey];
-                        var reversedCompositeKey = new Key2IdCompositeKey(guid, compositeKey.UmbracoObjectType);
-                        _id2Key.Remove(compositeKey);
-                        _key2Id.Remove(reversedCompositeKey);
-                        break;
-                    }
-                }
+                TypedId<Guid> key;
+                if (_id2Key.TryGetValue(id, out key) == false) return;
+                _id2Key.Remove(id);
+                _key2Id.Remove(key.Id);
             }
             finally
             {
@@ -168,17 +157,10 @@ namespace Umbraco.Core.Services
             try
             {
                 _locker.EnterWriteLock();
-                foreach (var compositeKey in _key2Id.Keys)
-                {
-                    if (compositeKey.Key == key)
-                    {
-                        var id = _key2Id[compositeKey];
-                        var reversedCompositeKey = new Id2KeyCompositeKey(id, compositeKey.UmbracoObjectType);
-                        _id2Key.Remove(reversedCompositeKey);
-                        _key2Id.Remove(compositeKey);
-                        break;
-                    }
-                }
+                TypedId<int> id;
+                if (_key2Id.TryGetValue(key, out id) == false) return;
+                _id2Key.Remove(id.Id);
+                _key2Id.Remove(key);
             }
             finally
             {
@@ -187,12 +169,12 @@ namespace Umbraco.Core.Services
             }
         }
 
-        private struct Id2KeyCompositeKey
+        private struct TypedId<T>
         {
-            private readonly int _id;
+            private readonly T _id;
             private readonly UmbracoObjectTypes _umbracoObjectType;
-
-            public int Id
+            
+            public T Id
             {
                 get { return _id; }
             }
@@ -202,70 +184,10 @@ namespace Umbraco.Core.Services
                 get { return _umbracoObjectType; }
             }
 
-            public Id2KeyCompositeKey(int id, UmbracoObjectTypes umbracoObjectType)
+            public TypedId(T id, UmbracoObjectTypes umbracoObjectType)
             {
+                _umbracoObjectType = umbracoObjectType;
                 _id = id;
-                _umbracoObjectType = umbracoObjectType;
-            }
-
-            private bool Equals(Id2KeyCompositeKey other)
-            {
-                return _id == other._id && _umbracoObjectType == other._umbracoObjectType;
-            }
-
-            public override bool Equals(object obj)
-            {
-                if (ReferenceEquals(null, obj)) return false;
-                return obj is Id2KeyCompositeKey && Equals((Id2KeyCompositeKey) obj);
-            }
-
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    return (_id * 397) ^ (int) _umbracoObjectType;
-                }
-            }
-        }
-
-        private struct Key2IdCompositeKey
-        {
-            private readonly Guid _key;
-            private readonly UmbracoObjectTypes _umbracoObjectType;
-
-            public Guid Key
-            {
-                get { return _key; }
-            }
-
-            public UmbracoObjectTypes UmbracoObjectType
-            {
-                get { return _umbracoObjectType; }
-            }
-
-            public Key2IdCompositeKey(Guid key, UmbracoObjectTypes umbracoObjectType)
-            {
-                _key = key;
-                _umbracoObjectType = umbracoObjectType;
-            }
-
-            private bool Equals(Key2IdCompositeKey other)
-            {
-                return _key.Equals(other._key) && _umbracoObjectType == other._umbracoObjectType;
-            }
-
-            public override bool Equals(object obj)
-            {
-                if (ReferenceEquals(null, obj)) return false;
-                return obj is Key2IdCompositeKey && Equals((Key2IdCompositeKey) obj);
-            }
-
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    return (_key.GetHashCode() * 397) ^ (int) _umbracoObjectType;
-                }
             }
         }
     }

From 168dc0e5da2e18249f31fea3c325a1d89d4371d3 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Fri, 18 Aug 2017 11:24:51 +0200
Subject: [PATCH 073/145] small UX refinements

---
 .../multipletextbox.controller.js             | 61 +++++++++++--------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
index 36371f6b2c..3e15fb7541 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
@@ -1,5 +1,7 @@
 function MultipleTextBoxController($scope, $timeout) {
 
+    var backspaceHits = 0;
+
     $scope.sortableOptions = {
         axis: 'y',
         containment: 'parent',
@@ -21,60 +23,68 @@
         }
     }
 
-    //TODO add focus to newly created text box or the first in line after deletion
-    $scope.addRemoveOnKeyDown = function (event, index) {
+    $scope.addRemoveOnKeyDown = function (event, index) {
 
         var txtBoxValue = $scope.model.value[index];
 
-        var newItemIndex;
-
         event.preventDefault();
-
+
         switch (event.keyCode) {
             case 13:
-                if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
-                    $scope.model.value.push({ value: "" });
-
-                    newItemIndex = $scope.model.value.length - 1;
-
+                if ($scope.model.config.max <= 0 && txtBoxValue.value || $scope.model.value.length < $scope.model.config.max && txtBoxValue.value) {
+                    var newItemIndex = index + 1;
+                    $scope.model.value.splice(newItemIndex, 0, { value: "" });
                     //Focus on the newly added value
                     $scope.model.value[newItemIndex].hasFocus = true;
                 }
                 break;
             case 8:
-                var remainder = [];
-                if ($scope.model.value.length > 1 && $scope.model.value.length >= $scope.model.config.max) {
-                    if (txtBoxValue.value === "") {
+
+                if ($scope.model.value.length > $scope.model.config.min) {
+                    var remainder = [];
+
+                    // Used to require an extra hit on backspace for the field to be removed
+                    if(txtBoxValue.value === "") {
+                        backspaceHits++;
+                    } else {
+                        backspaceHits = 0;
+                    }
+
+                    if (txtBoxValue.value === "" && backspaceHits === 2) {
                         for (var x = 0; x < $scope.model.value.length; x++) {
                             if (x !== index) {
                                 remainder.push($scope.model.value[x]);
                             }
-                        }
+                        }
 
                         $scope.model.value = remainder;
 
-                        newItemIndex = $scope.model.value.length - 1;
-
-                        //Set focus back on false as the directive only watches for true
-                        $scope.model.value[newItemIndex].hasFocus = false;
+                        var prevItemIndex = index - 1;
 
-                        $timeout(function () {
-                            //Focus on the previous value
-                            $scope.model.value[newItemIndex].hasFocus = true;
-                        });
+                        //Set focus back on false as the directive only watches for true
+                        if(prevItemIndex >= 0) {
+                            $scope.model.value[prevItemIndex].hasFocus = false;
+                            $timeout(function () {
+                                //Focus on the previous value
+                                $scope.model.value[prevItemIndex].hasFocus = true;
+                            });
+                        }
+
+                        backspaceHits = 0;
                     }
                 }
+
                 break;
             default:
         }
     }
 
-
-
     $scope.add = function () {
         if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
             $scope.model.value.push({ value: "" });
-            $scope.focusMe = false;
+            // focus new value
+            var newItemIndex = $scope.model.value.length - 1;
+            $scope.model.value[newItemIndex].hasFocus = true;
         }
     };
 
@@ -86,7 +96,6 @@
             }
         }
         $scope.model.value = remainder;
-        $scope.focusMe = true;
     };
 
 }

From 528656a33795e61ab11c5f58110e7aad4efba27e Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Fri, 18 Aug 2017 11:44:44 +0200
Subject: [PATCH 074/145] using val.value directly.

---
 src/Umbraco.Core/Services/IdkMap.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Services/IdkMap.cs b/src/Umbraco.Core/Services/IdkMap.cs
index 224937dddd..015bb104dc 100644
--- a/src/Umbraco.Core/Services/IdkMap.cs
+++ b/src/Umbraco.Core/Services/IdkMap.cs
@@ -45,13 +45,12 @@ namespace Umbraco.Core.Services
             }
 
             if (val == null) return Attempt<int>.Fail();
-            id = new TypedId<int>(val.Value, umbracoObjectType);
 
             try
             {
                 _locker.EnterWriteLock();
-                _id2Key[id.Id] = new TypedId<Guid>(key, umbracoObjectType);
-                _key2Id[key] = id;
+                _id2Key[val.Value] = new TypedId<Guid>(key, umbracoObjectType);
+                _key2Id[key] = new TypedId<int>(val.Value, umbracoObjectType);
             }
             finally
             {
@@ -59,7 +58,7 @@ namespace Umbraco.Core.Services
                     _locker.ExitWriteLock();
             }
 
-            return Attempt.Succeed(id.Id);
+            return Attempt.Succeed(val.Value);
         }
 
         public Attempt<int> GetIdForUdi(Udi udi)
@@ -95,13 +94,12 @@ namespace Umbraco.Core.Services
             }
 
             if (val == null) return Attempt<Guid>.Fail();
-            key = new TypedId<Guid>(val.Value, umbracoObjectType);
 
             try
             {
                 _locker.EnterWriteLock();
-                _id2Key[id] = key;
-                _key2Id[key.Id] = new TypedId<int>();
+                _id2Key[id] = new TypedId<Guid>(val.Value, umbracoObjectType); ;
+                _key2Id[val.Value] = new TypedId<int>();
             }
             finally
             {
@@ -109,7 +107,7 @@ namespace Umbraco.Core.Services
                     _locker.ExitWriteLock();
             }
 
-            return Attempt.Succeed(key.Id);
+            return Attempt.Succeed(val.Value);
         }
 
         private static Guid GetNodeObjectTypeGuid(UmbracoObjectTypes umbracoObjectType)

From 86bc701511608894336d48d6bbb627791e6ffb4c Mon Sep 17 00:00:00 2001
From: Anders Bjerner <abjerner@skybrud.dk>
Date: Mon, 21 Aug 2017 14:16:01 +0200
Subject: [PATCH 075/145] Typo

Very minor typo, but still ;)
---
 src/Umbraco.Core/StringExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
index 87b4c676b5..d6abc597e3 100644
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -633,7 +633,7 @@ namespace Umbraco.Core
         }
 
         /// <summary>
-        /// Ensures that the folder path endds with a DirectorySeperatorChar
+        /// Ensures that the folder path ends with a DirectorySeperatorChar
         /// </summary>
         /// <param name="currentFolder"></param>
         /// <returns></returns>

From a0785f2e0d8bd7e5486d1e155b8f69d76d42c57f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 23 Aug 2017 16:22:01 +1000
Subject: [PATCH 076/145] backports U4-10349 Optimize EnsureUniqueNodeName

---
 .../Repositories/ContentRepository.cs         |  27 +----
 .../DataTypeDefinitionRepository.cs           |  29 +----
 .../Repositories/MediaRepository.cs           |  27 +----
 .../Repositories/SimilarNodeName.cs           | 112 ++++++++++++++++++
 .../Repositories/SimilarNodeNameComparer.cs   |  45 -------
 src/Umbraco.Core/Umbraco.Core.csproj          |   2 +-
 .../Repositories/SimilarNodeNameTests.cs      |  98 +++++++++++++++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 +
 8 files changed, 221 insertions(+), 120 deletions(-)
 create mode 100644 src/Umbraco.Core/Persistence/Repositories/SimilarNodeName.cs
 delete mode 100644 src/Umbraco.Core/Persistence/Repositories/SimilarNodeNameComparer.cs
 create mode 100644 src/Umbraco.Tests/Persistence/Repositories/SimilarNodeNameTests.cs

diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
index f3d199e175..eac9d197be 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
@@ -1122,31 +1122,10 @@ ORDER BY cmsContentVersion.id DESC
             if (EnsureUniqueNaming == false)
                 return nodeName;
 
-            var sql = new Sql();
-            sql.Select("*")
-               .From<NodeDto>()
-               .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId && x.ParentId == parentId && x.Text.StartsWith(nodeName));
+            var names = Database.Fetch<SimilarNodeName>("SELECT id, text AS name FROM umbracoNode WHERE nodeObjectType=@objectType AND parentId=@parentId",
+                new { objectType = NodeObjectTypeId, parentId });
 
-            int uniqueNumber = 1;
-            var currentName = nodeName;
-
-            var dtos = Database.Fetch<NodeDto>(sql);
-            if (dtos.Any())
-            {
-                var results = dtos.OrderBy(x => x.Text, new SimilarNodeNameComparer());
-                foreach (var dto in results)
-                {
-                    if (id != 0 && id == dto.NodeId) continue;
-
-                    if (dto.Text.ToLowerInvariant().Equals(currentName.ToLowerInvariant()))
-                    {
-                        currentName = nodeName + string.Format(" ({0})", uniqueNumber);
-                        uniqueNumber++;
-                    }
-                }
-            }
-
-            return currentName;
+            return SimilarNodeName.GetUniqueName(names, id, nodeName);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
index 1690b36148..eb64ea190b 100644
--- a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
@@ -450,33 +450,10 @@ AND umbracoNode.id <> @id",
 
         private string EnsureUniqueNodeName(string nodeName, int id = 0)
         {
+            var names = Database.Fetch<SimilarNodeName>("SELECT id, text AS name FROM umbracoNode WHERE nodeObjectType=@objectType",
+                new { objectType = NodeObjectTypeId });
 
-
-            var sql = new Sql();
-            sql.Select("*")
-               .From<NodeDto>(SqlSyntax)
-               .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId && x.Text.StartsWith(nodeName));
-
-            int uniqueNumber = 1;
-            var currentName = nodeName;
-
-            var dtos = Database.Fetch<NodeDto>(sql);
-            if (dtos.Any())
-            {
-                var results = dtos.OrderBy(x => x.Text, new SimilarNodeNameComparer());
-                foreach (var dto in results)
-                {
-                    if (id != 0 && id == dto.NodeId) continue;
-
-                    if (dto.Text.ToLowerInvariant().Equals(currentName.ToLowerInvariant()))
-                    {
-                        currentName = nodeName + string.Format(" ({0})", uniqueNumber);
-                        uniqueNumber++;
-                    }
-                }
-            }
-
-            return currentName;
+            return SimilarNodeName.GetUniqueName(names, id, nodeName);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
index c9f06c6c75..598b16d78d 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
@@ -584,31 +584,10 @@ namespace Umbraco.Core.Persistence.Repositories
             if (EnsureUniqueNaming == false)
                 return nodeName;
 
-            var sql = new Sql();
-            sql.Select("*")
-               .From<NodeDto>()
-               .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId && x.ParentId == parentId && x.Text.StartsWith(nodeName));
+            var names = Database.Fetch<SimilarNodeName>("SELECT id, text AS name FROM umbracoNode WHERE nodeObjectType=@objectType AND parentId=@parentId", 
+                new { objectType = NodeObjectTypeId, parentId });
 
-            int uniqueNumber = 1;
-            var currentName = nodeName;
-
-            var dtos = Database.Fetch<NodeDto>(sql);
-            if (dtos.Any())
-            {
-                var results = dtos.OrderBy(x => x.Text, new SimilarNodeNameComparer());
-                foreach (var dto in results)
-                {
-                    if (id != 0 && id == dto.NodeId) continue;
-
-                    if (dto.Text.ToLowerInvariant().Equals(currentName.ToLowerInvariant()))
-                    {
-                        currentName = nodeName + string.Format(" ({0})", uniqueNumber);
-                        uniqueNumber++;
-                    }
-                }
-            }
-
-            return currentName;
+            return SimilarNodeName.GetUniqueName(names, id, nodeName);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/SimilarNodeName.cs b/src/Umbraco.Core/Persistence/Repositories/SimilarNodeName.cs
new file mode 100644
index 0000000000..371f73b27f
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Repositories/SimilarNodeName.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    internal class SimilarNodeName
+    {
+        private int _numPos = -2;
+
+        public int Id { get; set; }
+        public string Name { get; set; }
+
+        // cached - reused
+        public int NumPos
+        {
+            get
+            {
+                if (_numPos != -2) return _numPos;
+
+                var name = Name;
+
+                if (name[name.Length - 1] != ')')
+                    return _numPos = -1;
+
+                var pos = name.LastIndexOf('(');
+                if (pos < 2 || pos == name.Length - 2) // < 2 and not < 0, because we want at least "x ("
+                    return _numPos = -1;
+
+                return _numPos = pos;
+            }
+        }
+
+        // not cached - used only once
+        public int NumVal
+        {
+            get
+            {
+                if (NumPos < 0)
+                    throw new InvalidOperationException();
+                int num;
+                if (int.TryParse(Name.Substring(NumPos + 1, Name.Length - 2 - NumPos), out num))
+                    return num;
+                return 0;
+            }
+        }
+
+        // compare without allocating, nor parsing integers
+        internal class Comparer : IComparer<SimilarNodeName>
+        {
+            public int Compare(SimilarNodeName x, SimilarNodeName y)
+            {
+                if (x == null) throw new ArgumentNullException("x");
+                if (y == null) throw new ArgumentNullException("y");
+
+                var xpos = x.NumPos;
+                var ypos = y.NumPos;
+
+                var xname = x.Name;
+                var yname = y.Name;
+
+                if (xpos < 0 || ypos < 0 || xpos != ypos)
+                    return string.Compare(xname, yname, StringComparison.Ordinal);
+
+                // compare the part before (number)
+                var n = string.Compare(xname, 0, yname, 0, xpos, StringComparison.Ordinal);
+                if (n != 0)
+                    return n;
+
+                // compare (number) lengths
+                var diff = xname.Length - yname.Length;
+                if (diff != 0) return diff < 0 ? -1 : +1;
+
+                // actually compare (number)
+                var i = xpos;
+                while (i < xname.Length - 1)
+                {
+                    if (xname[i] != yname[i])
+                        return xname[i] < yname[i] ? -1 : +1;
+                    i++;
+                }
+                return 0;
+            }
+        }
+
+        // gets a unique name
+        public static string GetUniqueName(IEnumerable<SimilarNodeName> names, int nodeId, string nodeName)
+        {
+            var uniqueNumber = 1;
+            var uniqueing = false;
+            foreach (var name in names.OrderBy(x => x, new Comparer()))
+            {
+                // ignore self
+                if (nodeId != 0 && name.Id == nodeId) continue;
+
+                if (uniqueing)
+                {
+                    if (name.NumPos > 0 && name.Name.StartsWith(nodeName) && name.NumVal == uniqueNumber)
+                        uniqueNumber++;
+                    else
+                        break;
+                }
+                else if (name.Name.InvariantEquals(nodeName))
+                {
+                    uniqueing = true;
+                }
+            }
+
+            return uniqueing ? string.Concat(nodeName, " (", uniqueNumber.ToString(), ")") : nodeName;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Repositories/SimilarNodeNameComparer.cs b/src/Umbraco.Core/Persistence/Repositories/SimilarNodeNameComparer.cs
deleted file mode 100644
index ce25486422..0000000000
--- a/src/Umbraco.Core/Persistence/Repositories/SimilarNodeNameComparer.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Comparer that takes into account the duplicate index of a node name
-    /// This is needed as a normal alphabetic sort would go Page (1), Page (10), Page (2) etc.
-    /// </summary>
-    internal class SimilarNodeNameComparer : IComparer<string>
-    {
-        public int Compare(string x, string y)
-        {
-            if (x.LastIndexOf('(') != -1 && x.LastIndexOf(')') == x.Length - 1 && y.LastIndexOf(')') == y.Length - 1)
-            {
-                if (x.ToLower().Substring(0, x.LastIndexOf('(')) == y.ToLower().Substring(0, y.LastIndexOf('(')))
-                {
-                    int xDuplicateIndex = ExtractDuplicateIndex(x);
-                    int yDuplicateIndex = ExtractDuplicateIndex(y);
-
-                    if (xDuplicateIndex != 0 && yDuplicateIndex != 0)
-                    {
-                        return xDuplicateIndex.CompareTo(yDuplicateIndex);
-                    }
-                }
-            }
-            return String.Compare(x.ToLower(), y.ToLower(), StringComparison.Ordinal);
-        }
-
-        private int ExtractDuplicateIndex(string text)
-        {
-            int index = 0;
-
-            if (text.LastIndexOf('(') != -1 && text.LastIndexOf('(') < text.Length - 2)
-            {
-                int startPos = text.LastIndexOf('(') + 1;
-                int length = text.Length - 1 - startPos;
-
-                int.TryParse(text.Substring(startPos, length), out index);
-            }
-
-            return index;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 24fdf32150..228905226f 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -586,6 +586,7 @@
     <Compile Include="Persistence\Repositories\MigrationEntryRepository.cs" />
     <Compile Include="Persistence\Repositories\PublicAccessRepository.cs" />
     <Compile Include="Persistence\Repositories\RedirectUrlRepository.cs" />
+    <Compile Include="Persistence\Repositories\SimilarNodeName.cs" />
     <Compile Include="Persistence\Repositories\UserControlRepository.cs" />
     <Compile Include="Persistence\Repositories\XsltFileRepository.cs" />
     <Compile Include="Persistence\Repositories\TaskRepository.cs" />
@@ -1188,7 +1189,6 @@
     <Compile Include="Persistence\Repositories\RepositoryBase.cs" />
     <Compile Include="Persistence\Repositories\ScriptRepository.cs" />
     <Compile Include="Persistence\Repositories\ServerRegistrationRepository.cs" />
-    <Compile Include="Persistence\Repositories\SimilarNodeNameComparer.cs" />
     <Compile Include="Persistence\Repositories\StylesheetRepository.cs" />
     <Compile Include="Persistence\Repositories\TemplateRepository.cs" />
     <Compile Include="Persistence\Repositories\UserRepository.cs" />
diff --git a/src/Umbraco.Tests/Persistence/Repositories/SimilarNodeNameTests.cs b/src/Umbraco.Tests/Persistence/Repositories/SimilarNodeNameTests.cs
new file mode 100644
index 0000000000..72f3e39874
--- /dev/null
+++ b/src/Umbraco.Tests/Persistence/Repositories/SimilarNodeNameTests.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using Umbraco.Core.Persistence.Repositories;
+
+namespace Umbraco.Tests.Persistence.Repositories
+{
+    [TestFixture]
+    public class SimilarNodeNameTests
+    {
+        [TestCase("Alpha", "Alpha", 0)]
+        [TestCase("Alpha", "ALPHA", +1)] // case is important
+        [TestCase("Alpha", "Bravo", -1)]
+        [TestCase("Bravo", "Alpha", +1)]
+        [TestCase("Alpha (1)", "Alpha (1)", 0)]
+        [TestCase("Alpha", "Alpha (1)", -1)]
+        [TestCase("Alpha (1)", "Alpha", +1)]
+        [TestCase("Alpha (1)", "Alpha (2)", -1)]
+        [TestCase("Alpha (2)", "Alpha (1)", +1)]
+        [TestCase("Alpha (2)", "Alpha (10)", -1)] // this is the real stuff
+        [TestCase("Alpha (10)", "Alpha (2)", +1)] // this is the real stuff
+        [TestCase("Kilo", "Golf (2)", +1)]
+        [TestCase("Kilo (1)", "Golf (2)", +1)]
+        public void ComparerTest(string name1, string name2, int expected)
+        {
+            var comparer = new SimilarNodeName.Comparer();
+
+            var result = comparer.Compare(new SimilarNodeName { Name = name1 }, new SimilarNodeName { Name = name2 });
+            if (expected == 0)
+                Assert.AreEqual(0, result);
+            else if (expected < 0)
+                Assert.IsTrue(result < 0, "Expected <0 but was " + result);
+            else if (expected > 0)
+                Assert.IsTrue(result > 0, "Expected >0 but was " + result);
+        }
+
+        [Test]
+        public void OrderByTest()
+        {
+            var names = new[]
+            {
+                new SimilarNodeName { Id = 1, Name = "Alpha (2)" },
+                new SimilarNodeName { Id = 2, Name = "Alpha" },
+                new SimilarNodeName { Id = 3, Name = "Golf" },
+                new SimilarNodeName { Id = 4, Name = "Zulu" },
+                new SimilarNodeName { Id = 5, Name = "Mike" },
+                new SimilarNodeName { Id = 6, Name = "Kilo (1)" },
+                new SimilarNodeName { Id = 7, Name = "Yankee" },
+                new SimilarNodeName { Id = 8, Name = "Kilo" },
+                new SimilarNodeName { Id = 9, Name = "Golf (2)" },
+                new SimilarNodeName { Id = 10, Name = "Alpha (1)" },
+            };
+
+            var ordered = names.OrderBy(x => x, new SimilarNodeName.Comparer()).ToArray();
+
+            var i = 0;
+            Assert.AreEqual(2, ordered[i++].Id);
+            Assert.AreEqual(10, ordered[i++].Id);
+            Assert.AreEqual(1, ordered[i++].Id);
+            Assert.AreEqual(3, ordered[i++].Id);
+            Assert.AreEqual(9, ordered[i++].Id);
+            Assert.AreEqual(8, ordered[i++].Id);
+            Assert.AreEqual(6, ordered[i++].Id);
+            Assert.AreEqual(5, ordered[i++].Id);
+            Assert.AreEqual(7, ordered[i++].Id);
+            Assert.AreEqual(4, ordered[i++].Id);
+        }
+
+        [TestCase(0, "Charlie", "Charlie")]
+        [TestCase(0, "Zulu", "Zulu (1)")]
+        [TestCase(0, "Golf", "Golf (1)")]
+        [TestCase(0, "Kilo", "Kilo (2)")]
+        [TestCase(0, "Alpha", "Alpha (3)")]
+        [TestCase(0, "Kilo (1)", "Kilo (1) (1)")] // though... we might consider "Kilo (2)"
+        [TestCase(6, "Kilo (1)", "Kilo (1)")] // because of the id
+        public void Test(int nodeId, string nodeName, string expected)
+        {
+            var names = new[]
+            {
+                new SimilarNodeName { Id = 1, Name = "Alpha (2)" },
+                new SimilarNodeName { Id = 2, Name = "Alpha" },
+                new SimilarNodeName { Id = 3, Name = "Golf" },
+                new SimilarNodeName { Id = 4, Name = "Zulu" },
+                new SimilarNodeName { Id = 5, Name = "Mike" },
+                new SimilarNodeName { Id = 6, Name = "Kilo (1)" },
+                new SimilarNodeName { Id = 7, Name = "Yankee" },
+                new SimilarNodeName { Id = 8, Name = "Kilo" },
+                new SimilarNodeName { Id = 9, Name = "Golf (2)" },
+                new SimilarNodeName { Id = 10, Name = "Alpha (1)" },
+            };
+
+            Assert.AreEqual(expected, SimilarNodeName.GetUniqueName(names, nodeId, nodeName));
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 067109d8bf..6859cb899f 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -163,6 +163,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Cache\CacheRefresherEventHandlerTests.cs" />
+    <Compile Include="Persistence\Repositories\SimilarNodeNameTests.cs" />
     <Compile Include="Dependencies\NuGet.cs" />
     <Compile Include="CallContextTests.cs" />
     <Compile Include="Issues\U9560.cs" />

From 1e45f85f7c553e554b88230189ba974da4c76403 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 24 Aug 2017 15:21:54 +1000
Subject: [PATCH 077/145] Updates the underlying event args base class's
 AdditionalData dictionary to be IDictionary instead of ReadOnlyDictionary.
 Ensures the same args are used for both events when Deleting Templates.

---
 src/Umbraco.Core/Events/CancellableEventArgs.cs | 13 ++++++-------
 src/Umbraco.Core/Services/FileService.cs        | 15 +++++++++------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Core/Events/CancellableEventArgs.cs b/src/Umbraco.Core/Events/CancellableEventArgs.cs
index a102ea66ef..451c3e80f4 100644
--- a/src/Umbraco.Core/Events/CancellableEventArgs.cs
+++ b/src/Umbraco.Core/Events/CancellableEventArgs.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Core.Events
         {
             CanCancel = canCancel;
             Messages = messages;
-            AdditionalData = new ReadOnlyDictionary<string, object>(additionalData);
+            AdditionalData = additionalData;
         }
 
         public CancellableEventArgs(bool canCancel, EventMessages eventMessages)
@@ -26,7 +26,7 @@ namespace Umbraco.Core.Events
             if (eventMessages == null) throw new ArgumentNullException("eventMessages");
             CanCancel = canCancel;
             Messages = eventMessages;
-            AdditionalData = new ReadOnlyDictionary<string, object>(new Dictionary<string, object>());
+            AdditionalData = new Dictionary<string, object>();
         }
 
         public CancellableEventArgs(bool canCancel)
@@ -34,7 +34,7 @@ namespace Umbraco.Core.Events
 			CanCancel = canCancel;
             //create a standalone messages
             Messages = new EventMessages();
-            AdditionalData = new ReadOnlyDictionary<string, object>(new Dictionary<string, object>());
+            AdditionalData = new Dictionary<string, object>();
         }
 
         public CancellableEventArgs(EventMessages eventMessages)
@@ -92,13 +92,12 @@ namespace Umbraco.Core.Events
         public EventMessages Messages { get; private set; }
 
         /// <summary>
-        /// In some cases raised evens might need to contain additional arbitrary readonly data which can be read by event subscribers
+        /// In some cases raised evens might need to contain additional arbitrary data which can be read by event subscribers
         /// </summary>
         /// <remarks>
-        /// This allows for a bit of flexibility in our event raising - it's not pretty but we need to maintain backwards compatibility 
-        /// so we cannot change the strongly typed nature for some events.
+        /// This also allows for storing stateful data between a start ("ing") event and a end ("ed") event for event handlers
         /// </remarks>
-        public ReadOnlyDictionary<string, object> AdditionalData { get; private set; }
+        public IDictionary<string, object> AdditionalData { get; private set; }
 
 	    public bool Equals(CancellableEventArgs other)
 	    {
diff --git a/src/Umbraco.Core/Services/FileService.cs b/src/Umbraco.Core/Services/FileService.cs
index 4833401df8..08e18672f0 100644
--- a/src/Umbraco.Core/Services/FileService.cs
+++ b/src/Umbraco.Core/Services/FileService.cs
@@ -562,18 +562,21 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                var repository = RepositoryFactory.CreateTemplateRepository(uow);
-
-                if (uow.Events.DispatchCancelable(DeletingTemplate, this, new DeleteEventArgs<ITemplate>(template)))
+                var repository = RepositoryFactory.CreateTemplateRepository(uow);
+
+                var args = new DeleteEventArgs<ITemplate>(template);
+                
+                if (uow.Events.DispatchCancelable(DeletingTemplate, this, args))
                 {
                     uow.Commit();
                     return;
                 }
-
+                
                 repository.Delete(template);
 
-                uow.Events.Dispatch(DeletedTemplate, this, new DeleteEventArgs<ITemplate>(template, false));
-
+                args.CanCancel = false;
+                uow.Events.Dispatch(DeletedTemplate, this, args);
+                
                 Audit(uow, AuditType.Delete, "Delete Template performed by user", userId, template.Id);
                 uow.Commit();
             }

From 085c06e043b0436230181b67d9c54463d752dde7 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 24 Aug 2017 16:22:50 +1000
Subject: [PATCH 078/145] Adds EventState to the event args instead of trying
 to change the AdditionalData which is a breaking change. Updates FileService
 and ContentService to use one event arg insteance for both before/after
 events so that the EventState flows and so we are allocating less objects.

---
 .../Events/CancellableEventArgs.cs            |  22 ++-
 src/Umbraco.Core/Events/MoveEventArgs.cs      |  21 ++-
 .../Events/RecycleBinEventArgs.cs             |   2 +-
 src/Umbraco.Core/Services/ContentService.cs   | 134 ++++++++++++------
 src/Umbraco.Core/Services/FileService.cs      |  58 ++++----
 .../Routing/RedirectTrackingEventHandler.cs   |   1 +
 6 files changed, 158 insertions(+), 80 deletions(-)

diff --git a/src/Umbraco.Core/Events/CancellableEventArgs.cs b/src/Umbraco.Core/Events/CancellableEventArgs.cs
index 451c3e80f4..a245aeb367 100644
--- a/src/Umbraco.Core/Events/CancellableEventArgs.cs
+++ b/src/Umbraco.Core/Events/CancellableEventArgs.cs
@@ -18,7 +18,8 @@ namespace Umbraco.Core.Events
         {
             CanCancel = canCancel;
             Messages = messages;
-            AdditionalData = additionalData;
+            AdditionalData = new ReadOnlyDictionary<string, object>(additionalData);
+            EventState = new Dictionary<string, object>();
         }
 
         public CancellableEventArgs(bool canCancel, EventMessages eventMessages)
@@ -26,7 +27,8 @@ namespace Umbraco.Core.Events
             if (eventMessages == null) throw new ArgumentNullException("eventMessages");
             CanCancel = canCancel;
             Messages = eventMessages;
-            AdditionalData = new Dictionary<string, object>();
+            AdditionalData = new ReadOnlyDictionary<string, object>(new Dictionary<string, object>());
+            EventState = new Dictionary<string, object>();
         }
 
         public CancellableEventArgs(bool canCancel)
@@ -34,7 +36,8 @@ namespace Umbraco.Core.Events
 			CanCancel = canCancel;
             //create a standalone messages
             Messages = new EventMessages();
-            AdditionalData = new Dictionary<string, object>();
+            AdditionalData = new ReadOnlyDictionary<string, object>(new Dictionary<string, object>());
+		    EventState = new Dictionary<string, object>();
         }
 
         public CancellableEventArgs(EventMessages eventMessages)
@@ -92,12 +95,19 @@ namespace Umbraco.Core.Events
         public EventMessages Messages { get; private set; }
 
         /// <summary>
-        /// In some cases raised evens might need to contain additional arbitrary data which can be read by event subscribers
+        /// In some cases raised evens might need to contain additional arbitrary readonly data which can be read by event subscribers
         /// </summary>
         /// <remarks>
-        /// This also allows for storing stateful data between a start ("ing") event and a end ("ed") event for event handlers
+        /// This allows for a bit of flexibility in our event raising - it's not pretty but we need to maintain backwards compatibility 
+        /// so we cannot change the strongly typed nature for some events.
         /// </remarks>
-        public IDictionary<string, object> AdditionalData { get; private set; }
+        public ReadOnlyDictionary<string, object> AdditionalData { get; private set; }
+
+        /// <summary>
+        /// This can be used by event subscribers to store state in the event args so they easily deal with custom state data between a starting ("ing") 
+        /// event and an ending ("ed") event
+        /// </summary>
+        public IDictionary<string, object> EventState { get; private set; }
 
 	    public bool Equals(CancellableEventArgs other)
 	    {
diff --git a/src/Umbraco.Core/Events/MoveEventArgs.cs b/src/Umbraco.Core/Events/MoveEventArgs.cs
index 228e1ca2f7..1fd9c8671a 100644
--- a/src/Umbraco.Core/Events/MoveEventArgs.cs
+++ b/src/Umbraco.Core/Events/MoveEventArgs.cs
@@ -6,6 +6,8 @@ namespace Umbraco.Core.Events
 {
     public class MoveEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>, IEquatable<MoveEventArgs<TEntity>>
     {
+        private IEnumerable<MoveEventInfo<TEntity>> _moveInfoCollection;
+
         /// <summary>
         /// Constructor accepting a collection of MoveEventInfo objects
         /// </summary>
@@ -107,7 +109,24 @@ namespace Umbraco.Core.Events
         /// <summary>
         /// Gets all MoveEventInfo objects used to create the object
         /// </summary>
-        public IEnumerable<MoveEventInfo<TEntity>> MoveInfoCollection { get; private set; }
+        public IEnumerable<MoveEventInfo<TEntity>> MoveInfoCollection
+        {
+            get { return _moveInfoCollection; }
+            set
+            {
+                var first = _moveInfoCollection.FirstOrDefault();
+                if (first == null)
+                {
+                    throw new InvalidOperationException("MoveInfoCollection must have at least one item");
+                }
+
+                _moveInfoCollection = value;                
+
+                //assign the legacy props                
+                EventObject = first.Entity;
+                ParentId = first.NewParentId;                
+            }
+        }
 
         /// <summary>
         /// The entity being moved
diff --git a/src/Umbraco.Core/Events/RecycleBinEventArgs.cs b/src/Umbraco.Core/Events/RecycleBinEventArgs.cs
index c6d7c659b7..62c00d7c5b 100644
--- a/src/Umbraco.Core/Events/RecycleBinEventArgs.cs
+++ b/src/Umbraco.Core/Events/RecycleBinEventArgs.cs
@@ -107,7 +107,7 @@ namespace Umbraco.Core.Events
         /// <summary>
         /// Boolean indicating whether the Recycle Bin was emptied successfully
         /// </summary>
-        public bool RecycleBinEmptiedSuccessfully { get; private set; }
+        public bool RecycleBinEmptiedSuccessfully { get; set; }
 
         /// <summary>
         /// Boolean indicating whether this event was fired for the Content's Recycle Bin.
diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 3cf8dfcff4..09e6068ce1 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -166,7 +166,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(Creating, this, new NewEventArgs<IContent>(content, contentTypeAlias, parentId)))
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parentId);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
                 {
                     uow.Commit();
                     content.WasCancelled = true;
@@ -175,8 +176,8 @@ namespace Umbraco.Core.Services
 
                 content.CreatorId = userId;
                 content.WriterId = userId;
-
-                uow.Events.Dispatch(Created, this, new NewEventArgs<IContent>(content, false, contentTypeAlias, parentId));
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
 
                 Audit(uow, AuditType.New, string.Format("Content '{0}' was created", name), content.CreatorId, content.Id);
                 uow.Commit();
@@ -209,7 +210,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(Creating, this, new NewEventArgs<IContent>(content, contentTypeAlias, parent)))
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parent);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
                 {
                     uow.Commit();
                     content.WasCancelled = true;
@@ -218,8 +220,8 @@ namespace Umbraco.Core.Services
 
                 content.CreatorId = userId;
                 content.WriterId = userId;
-
-                uow.Events.Dispatch(Created, this, new NewEventArgs<IContent>(content, false, contentTypeAlias, parent));
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
 
                 Audit(uow, AuditType.New, string.Format("Content '{0}' was created", name), content.CreatorId, content.Id);
                 uow.Commit();
@@ -250,14 +252,16 @@ namespace Umbraco.Core.Services
             {
                 //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
                 // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
-                if (uow.Events.DispatchCancelable(Creating, this, new NewEventArgs<IContent>(content, contentTypeAlias, parentId)))
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parentId);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
                 {
                     uow.Commit();
                     content.WasCancelled = true;
                     return content;
                 }
 
-                if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IContent>(content)))
+                var saveEventArgs = new SaveEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     content.WasCancelled = true;
@@ -270,9 +274,10 @@ namespace Umbraco.Core.Services
 
                 repository.AddOrUpdate(content);
                 repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-
-                uow.Events.Dispatch(Saved, this, new SaveEventArgs<IContent>(content, false));
-                uow.Events.Dispatch(Created, this, new NewEventArgs<IContent>(content, false, contentTypeAlias, parentId));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs);
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
 
                 Audit(uow, AuditType.New, string.Format("Content '{0}' was created with Id {1}", name, content.Id), content.CreatorId, content.Id);
                 uow.Commit();
@@ -305,14 +310,16 @@ namespace Umbraco.Core.Services
             {
                 //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
                 // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
-                if (uow.Events.DispatchCancelable(Creating, this, new NewEventArgs<IContent>(content, contentTypeAlias, parent)))
+                var newEventArgs = new NewEventArgs<IContent>(content, contentTypeAlias, parent);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
                 {
                     uow.Commit();
                     content.WasCancelled = true;
                     return content;
                 }
 
-                if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IContent>(content)))
+                var saveEventArgs = new SaveEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     content.WasCancelled = true;
@@ -325,9 +332,10 @@ namespace Umbraco.Core.Services
 
                 repository.AddOrUpdate(content);
                 repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-
-                uow.Events.Dispatch(Saved, this, new SaveEventArgs<IContent>(content, false));
-                uow.Events.Dispatch(Created, this, new NewEventArgs<IContent>(content, false, contentTypeAlias, parent));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs);
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
 
                 Audit(uow, AuditType.New, string.Format("Content '{0}' was created with Id {1}", name, content.Id), content.CreatorId, content.Id);
                 uow.Commit();
@@ -1018,14 +1026,16 @@ namespace Umbraco.Core.Services
                     //see: http://issues.umbraco.org/issue/U4-9336
                     content.EnsureValidPath(Logger, entity => GetById(entity.ParentId), QuickUpdate);
                     var originalPath = content.Path;
-                    if (uow.Events.DispatchCancelable(Trashing, this, new MoveEventArgs<IContent>(evtMsgs, new MoveEventInfo<IContent>(content, originalPath, Constants.System.RecycleBinContent)), "Trashing"))
+                    var moveEventInfo = new MoveEventInfo<IContent>(content, originalPath, Constants.System.RecycleBinContent);
+                    var moveEventArgs = new MoveEventArgs<IContent>(evtMsgs, moveEventInfo);
+                    if (uow.Events.DispatchCancelable(Trashing, this, moveEventArgs, "Trashing"))
                     {
                         uow.Commit();
                         return OperationStatus.Cancelled(evtMsgs);
                     }
                     var moveInfo = new List<MoveEventInfo<IContent>>
                     {
-                        new MoveEventInfo<IContent>(content, originalPath, Constants.System.RecycleBinContent)
+                        moveEventInfo
                     };
 
                     //get descendents to process of the content item that is being moved to trash - must be done before changing the state below
@@ -1052,11 +1062,13 @@ namespace Umbraco.Core.Services
                         descendant.WriterId = userId;
                         descendant.ChangeTrashedState(true, descendant.ParentId);
                         repository.AddOrUpdate(descendant);
-
+                        
                         moveInfo.Add(new MoveEventInfo<IContent>(descendant, descendant.Path, descendant.ParentId));
                     }
 
-                    uow.Events.Dispatch(Trashed, this, new MoveEventArgs<IContent>(false, evtMsgs, moveInfo.ToArray()), "Trashed");
+                    moveEventArgs.CanCancel = false;
+                    moveEventArgs.MoveInfoCollection = moveInfo;
+                    uow.Events.Dispatch(Trashed, this, moveEventArgs, "Trashed");
 
                     Audit(uow, AuditType.Move, "Move Content to Recycle Bin performed by user", userId, content.Id);
                     uow.Commit();
@@ -1183,7 +1195,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IContent>(asArray, evtMsgs)))
+                var saveEventArgs = new SaveEventArgs<IContent>(asArray, evtMsgs);
+                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     return OperationStatus.Cancelled(evtMsgs);
@@ -1224,7 +1237,10 @@ namespace Umbraco.Core.Services
                 }
 
                 if (raiseEvents)
-                    uow.Events.Dispatch(Saved, this, new SaveEventArgs<IContent>(asArray, false, evtMsgs));
+                {
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Saved, this, saveEventArgs);
+                }
 
                 Audit(uow, AuditType.Save, "Bulk Save content performed by user", userId == -1 ? 0 : userId, Constants.System.Root);
                 uow.Commit();
@@ -1250,7 +1266,8 @@ namespace Umbraco.Core.Services
             {
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IContent>(content, evtMsgs), "Deleting"))
+                    var deleteEventArgs = new DeleteEventArgs<IContent>(content, evtMsgs);
+                    if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs, "Deleting"))
                     {
                         uow.Commit();
                         return OperationStatus.Cancelled(evtMsgs);
@@ -1273,8 +1290,8 @@ namespace Umbraco.Core.Services
 
                     repository.Delete(content);
 
-                    var args = new DeleteEventArgs<IContent>(content, false, evtMsgs);
-                    uow.Events.Dispatch(Deleted, this, args, "Deleted");
+                    deleteEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Deleted, this, deleteEventArgs, "Deleted");
 
                     Audit(uow, AuditType.Delete, "Delete Content performed by user", userId, content.Id);
                     uow.Commit();
@@ -1402,7 +1419,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(DeletingVersions, this, new DeleteRevisionsEventArgs(id, dateToRetain: versionDate), "DeletingVersions"))
+                var deleteRevisionsEventArgs = new DeleteRevisionsEventArgs(id, dateToRetain: versionDate);
+                if (uow.Events.DispatchCancelable(DeletingVersions, this, deleteRevisionsEventArgs, "DeletingVersions"))
                 {
                     uow.Commit();
                     return;
@@ -1410,8 +1428,8 @@ namespace Umbraco.Core.Services
 
                 var repository = RepositoryFactory.CreateContentRepository(uow);
                 repository.DeleteVersions(id, versionDate);
-
-                uow.Events.Dispatch(DeletedVersions, this, new DeleteRevisionsEventArgs(id, false, dateToRetain: versionDate), "DeletedVersions");
+                deleteRevisionsEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedVersions, this, deleteRevisionsEventArgs, "DeletedVersions");
 
                 Audit(uow, AuditType.Delete, "Delete Content by version date performed by user", userId, Constants.System.Root);
                 uow.Commit();
@@ -1490,7 +1508,9 @@ namespace Umbraco.Core.Services
 
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (uow.Events.DispatchCancelable(Moving, this, new MoveEventArgs<IContent>(new MoveEventInfo<IContent>(content, content.Path, parentId)), "Moving"))
+                    var moveEventInfo = new MoveEventInfo<IContent>(content, content.Path, parentId);
+                    var moveEventArgs = new MoveEventArgs<IContent>(moveEventInfo);
+                    if (uow.Events.DispatchCancelable(Moving, this, moveEventArgs, "Moving"))
                     {
                         uow.Commit();
                         return;
@@ -1502,7 +1522,9 @@ namespace Umbraco.Core.Services
                     //call private method that does the recursive moving
                     PerformMove(content, parentId, userId, moveInfo);
 
-                    uow.Events.Dispatch(Moved, this, new MoveEventArgs<IContent>(false, moveInfo.ToArray()), "Moved");
+                    moveEventArgs.MoveInfoCollection = moveInfo;
+                    moveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Moved, this, moveEventArgs, "Moved");
 
                     Audit(uow, AuditType.Move, "Move Content performed by user", userId, content.Id);
                     uow.Commit();
@@ -1531,15 +1553,17 @@ namespace Umbraco.Core.Services
 
                     var files = ((ContentRepository)repository).GetFilesInRecycleBinForUploadField();
 
-                    if (uow.Events.DispatchCancelable(EmptyingRecycleBin, this, new RecycleBinEventArgs(nodeObjectType, entities, files)))
+                    var recycleBinEventArgs = new RecycleBinEventArgs(nodeObjectType, entities, files);
+                    if (uow.Events.DispatchCancelable(EmptyingRecycleBin, this, recycleBinEventArgs))
                     {
                         uow.Commit();
                         return;
                     }
 
                     var success = repository.EmptyRecycleBin();
-
-                    uow.Events.Dispatch(EmptiedRecycleBin, this, new RecycleBinEventArgs(nodeObjectType, entities, files, success));
+                    recycleBinEventArgs.CanCancel = false;
+                    recycleBinEventArgs.RecycleBinEmptiedSuccessfully = success;
+                    uow.Events.Dispatch(EmptiedRecycleBin, this, recycleBinEventArgs);
 
                     Audit(uow, AuditType.Delete, "Empty Content Recycle Bin performed by user", 0, Constants.System.RecycleBinContent);
                     uow.Commit();
@@ -1586,7 +1610,8 @@ namespace Umbraco.Core.Services
 
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (uow.Events.DispatchCancelable(Copying, this, new CopyEventArgs<IContent>(content, copy, parentId)))
+                    var copyEventArgs = new CopyEventArgs<IContent>(content, copy, true, parentId, relateToOriginal);
+                    if (uow.Events.DispatchCancelable(Copying, this, copyEventArgs))
                     {
                         uow.Commit();
                         return null;
@@ -1627,7 +1652,8 @@ namespace Umbraco.Core.Services
                             Copy(child, copy.Id, relateToOriginal, true, userId);
                         }
                     }
-                    uow.Events.Dispatch(Copied, this, new CopyEventArgs<IContent>(content, copy, false, parentId, relateToOriginal));
+                    copyEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Copied, this, copyEventArgs);
                     Audit(uow, AuditType.Copy, "Copy Content performed by user", content.WriterId, content.Id);
                     uow.Commit();
                 }
@@ -1647,7 +1673,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(SendingToPublish, this, new SendToPublishEventArgs<IContent>(content)))
+                var sendToPublishEventArgs = new SendToPublishEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(SendingToPublish, this, sendToPublishEventArgs))
                 {
                     uow.Commit();
                     return false;
@@ -1655,8 +1682,8 @@ namespace Umbraco.Core.Services
 
                 //Save before raising event
                 Save(content, userId);
-
-                uow.Events.Dispatch(SentToPublish, this, new SendToPublishEventArgs<IContent>(content, false));
+                sendToPublishEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SentToPublish, this, sendToPublishEventArgs);
 
                 Audit(uow, AuditType.SendToPublish, "Send to Publish performed by user", content.WriterId, content.Id);
                 uow.Commit();
@@ -1683,7 +1710,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(RollingBack, this, new RollbackEventArgs<IContent>(content)))
+                var rollbackEventArgs = new RollbackEventArgs<IContent>(content);
+                if (uow.Events.DispatchCancelable(RollingBack, this, rollbackEventArgs))
                 {
                     uow.Commit();
                     return content;
@@ -1697,8 +1725,8 @@ namespace Umbraco.Core.Services
 
                 repository.AddOrUpdate(content);
                 repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
-
-                uow.Events.Dispatch(RolledBack, this, new RollbackEventArgs<IContent>(content, false));
+                rollbackEventArgs.CanCancel = false;
+                uow.Events.Dispatch(RolledBack, this, rollbackEventArgs);
 
                 Audit(uow, AuditType.RollBack, "Content rollback performed by user", content.WriterId, content.Id);
                 uow.Commit();
@@ -1729,7 +1757,8 @@ namespace Umbraco.Core.Services
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
                     var asArray = items.ToArray();
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IContent>(asArray)))
+                    var saveEventArgs = new SaveEventArgs<IContent>(asArray);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                     {
                         uow.Commit();
                         return false;
@@ -1774,7 +1803,10 @@ namespace Umbraco.Core.Services
                     }
 
                     if (raiseEvents)
-                        uow.Events.Dispatch(Saved, this, new SaveEventArgs<IContent>(asArray, false));
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs);
+                    }
 
                     if (shouldBePublished.Any())
                     {
@@ -2138,7 +2170,8 @@ namespace Umbraco.Core.Services
             {
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IContent>(content, evtMsgs)))
+                    var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                     {
                         uow.Commit();
                         return Attempt.Fail(new PublishStatus(content, PublishStatusType.FailedCancelledByEvent, evtMsgs));
@@ -2193,7 +2226,10 @@ namespace Umbraco.Core.Services
                     }
 
                     if (raiseEvents)
-                        uow.Events.Dispatch(Saved, this, new SaveEventArgs<IContent>(content, false, evtMsgs));
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs);
+                    }
 
                     //Save xml to db and call following method to fire event through PublishingStrategy to update cache
                     if (published)
@@ -2232,7 +2268,8 @@ namespace Umbraco.Core.Services
             {
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IContent>(content, evtMsgs)))
+                    var saveEventArgs = new SaveEventArgs<IContent>(content, evtMsgs);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                     {
                         uow.Commit();
                         return OperationStatus.Cancelled(evtMsgs);
@@ -2261,7 +2298,10 @@ namespace Umbraco.Core.Services
                     repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
 
                     if (raiseEvents)
-                        uow.Events.Dispatch(Saved, this, new SaveEventArgs<IContent>(content, false, evtMsgs));
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs);
+                    }
 
                     Audit(uow, AuditType.Save, "Save Content performed by user", userId, content.Id);
                     uow.Commit();
diff --git a/src/Umbraco.Core/Services/FileService.cs b/src/Umbraco.Core/Services/FileService.cs
index 08e18672f0..916c036a69 100644
--- a/src/Umbraco.Core/Services/FileService.cs
+++ b/src/Umbraco.Core/Services/FileService.cs
@@ -70,7 +70,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(SavingStylesheet, this, new SaveEventArgs<Stylesheet>(stylesheet)))
+                var saveEventArgs = new SaveEventArgs<Stylesheet>(stylesheet);
+                if (uow.Events.DispatchCancelable(SavingStylesheet, this, saveEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -78,8 +79,8 @@ namespace Umbraco.Core.Services
 
                 var repository = RepositoryFactory.CreateStylesheetRepository(uow);
                 repository.AddOrUpdate(stylesheet);
-
-                uow.Events.Dispatch(SavedStylesheet, this, new SaveEventArgs<Stylesheet>(stylesheet, false));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SavedStylesheet, this, saveEventArgs);
 
                 Audit(uow, AuditType.Save, "Save Stylesheet performed by user", userId, -1);
                 uow.Commit();
@@ -103,15 +104,16 @@ namespace Umbraco.Core.Services
                     return;
                 }
 
-                if (uow.Events.DispatchCancelable(DeletingStylesheet, this, new DeleteEventArgs<Stylesheet>(stylesheet)))
+                var deleteEventArgs = new DeleteEventArgs<Stylesheet>(stylesheet);
+                if (uow.Events.DispatchCancelable(DeletingStylesheet, this, deleteEventArgs))
                 {
                     uow.Commit();
                     return;
                 }
 
                 repository.Delete(stylesheet);
-
-                uow.Events.Dispatch(DeletedStylesheet, this, new DeleteEventArgs<Stylesheet>(stylesheet, false));
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedStylesheet, this, deleteEventArgs);
 
                 Audit(uow, AuditType.Delete, string.Format("Delete Stylesheet performed by user"), userId, -1);
                 uow.Commit();
@@ -171,7 +173,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(SavingScript, this, new SaveEventArgs<Script>(script)))
+                var saveEventArgs = new SaveEventArgs<Script>(script);
+                if (uow.Events.DispatchCancelable(SavingScript, this, saveEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -179,8 +182,8 @@ namespace Umbraco.Core.Services
 
                 var repository = RepositoryFactory.CreateScriptRepository(uow);
                 repository.AddOrUpdate(script);
-
-                uow.Events.Dispatch(SavedScript, this, new SaveEventArgs<Script>(script, false));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SavedScript, this, saveEventArgs);
 
                 Audit(uow, AuditType.Save, "Save Script performed by user", userId, -1);
                 uow.Commit();
@@ -204,15 +207,16 @@ namespace Umbraco.Core.Services
                     return;
                 }
 
-                if (uow.Events.DispatchCancelable(DeletingScript, this, new DeleteEventArgs<Script>(script)))
+                var deleteEventArgs = new DeleteEventArgs<Script>(script);
+                if (uow.Events.DispatchCancelable(DeletingScript, this, deleteEventArgs))
                 {
                     uow.Commit();
                     return;
                 }
 
                 repository.Delete(script);
-
-                uow.Events.Dispatch(DeletedScript, this, new DeleteEventArgs<Script>(script, false));
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedScript, this, deleteEventArgs);
 
                 Audit(uow, AuditType.Delete, string.Format("Delete Script performed by user"), userId, -1);
                 uow.Commit();
@@ -289,7 +293,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(SavingTemplate, this, new SaveEventArgs<ITemplate>(template, true, evtMsgs, additionalData)))
+                var saveEventArgs = new SaveEventArgs<ITemplate>(template, true, evtMsgs, additionalData);
+                if (uow.Events.DispatchCancelable(SavingTemplate, this, saveEventArgs))
                 {
                     uow.Commit();
                     return Attempt.Fail(new OperationStatus<ITemplate, OperationStatusType>(template, OperationStatusType.FailedCancelledByEvent, evtMsgs));
@@ -297,8 +302,8 @@ namespace Umbraco.Core.Services
 
                 var repository = RepositoryFactory.CreateTemplateRepository(uow);
                 repository.AddOrUpdate(template);
-
-                uow.Events.Dispatch(SavedTemplate, this, new SaveEventArgs<ITemplate>(template, false, evtMsgs));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SavedTemplate, this, saveEventArgs);
 
                 Audit(uow, AuditType.Save, "Save Template performed by user", userId, template.Id);
                 uow.Commit();
@@ -901,10 +906,11 @@ namespace Umbraco.Core.Services
 
         private Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, PartialViewType partialViewType, string snippetName = null, int userId = 0)
         {
+            var newEventArgs = new NewEventArgs<IPartialView>(partialView, true, partialView.Alias, -1);
             using (var scope = UowProvider.ScopeProvider.CreateScope())
             {
-                scope.Complete(); // always
-                if (scope.Events.DispatchCancelable(CreatingPartialView, this, new NewEventArgs<IPartialView>(partialView, true, partialView.Alias, -1)))
+                scope.Complete(); // always                
+                if (scope.Events.DispatchCancelable(CreatingPartialView, this, newEventArgs))
                     return Attempt<IPartialView>.Fail();
             }
 
@@ -918,8 +924,8 @@ namespace Umbraco.Core.Services
             {
                 var repository = GetPartialViewRepository(partialViewType, uow);
                 repository.AddOrUpdate(partialView);
-
-                uow.Events.Dispatch(CreatedPartialView, this, new NewEventArgs<IPartialView>(partialView, false, partialView.Alias, -1));
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(CreatedPartialView, this, newEventArgs);
 
                 Audit(uow, AuditType.Save, string.Format("Save {0} performed by user", partialViewType), userId, -1);
                 uow.Commit();
@@ -950,15 +956,16 @@ namespace Umbraco.Core.Services
                     return false;
                 }
 
-                if (uow.Events.DispatchCancelable(DeletingPartialView, this, new DeleteEventArgs<IPartialView>(partialView)))
+                var deleteEventArgs = new DeleteEventArgs<IPartialView>(partialView);
+                if (uow.Events.DispatchCancelable(DeletingPartialView, this, deleteEventArgs))
                 {
                     uow.Commit();
                     return false;
                 }
 
                 repository.Delete(partialView);
-
-                uow.Events.Dispatch(DeletedPartialView, this, new DeleteEventArgs<IPartialView>(partialView, false));
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedPartialView, this, deleteEventArgs);
 
                 Audit(uow, AuditType.Delete, string.Format("Delete {0} performed by user", partialViewType), userId, -1);
                 uow.Commit();
@@ -982,7 +989,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(SavingPartialView, this, new SaveEventArgs<IPartialView>(partialView)))
+                var saveEventArgs = new SaveEventArgs<IPartialView>(partialView);
+                if (uow.Events.DispatchCancelable(SavingPartialView, this, saveEventArgs))
                 {
                     uow.Commit();
                     return Attempt<IPartialView>.Fail();
@@ -990,8 +998,8 @@ namespace Umbraco.Core.Services
 
                 var repository = GetPartialViewRepository(partialViewType, uow);
                 repository.AddOrUpdate(partialView);
-
-                uow.Events.Dispatch(SavedPartialView, this, new SaveEventArgs<IPartialView>(partialView, false));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SavedPartialView, this, saveEventArgs);
 
                 Audit(uow, AuditType.Save, string.Format("Save {0} performed by user", partialViewType), userId, -1);
                 uow.Commit();
diff --git a/src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs b/src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
index 80e4192f72..77577e26e2 100644
--- a/src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
+++ b/src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
@@ -271,6 +271,7 @@ namespace Umbraco.Web.Routing
 
         private static void ContentService_Moving(IContentService sender, MoveEventArgs<IContent> e)
         {
+            //TODO: Use the new e.EventState to track state between Moving/Moved events!
             Moving = true;
         }
 

From d0a91bf98bf323902ce57b9dfc9e523d6261bfd3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 24 Aug 2017 16:35:09 +1000
Subject: [PATCH 079/145] Updates ContentTypeService to ensure a single event
 args instance is created per event pair so that EventState flows.

---
 src/Umbraco.Core/Events/DeleteEventArgs.cs    |   3 +-
 .../Services/ContentTypeService.cs            | 100 +++++++++++-------
 2 files changed, 66 insertions(+), 37 deletions(-)

diff --git a/src/Umbraco.Core/Events/DeleteEventArgs.cs b/src/Umbraco.Core/Events/DeleteEventArgs.cs
index d0a4f024e1..188ce70bd1 100644
--- a/src/Umbraco.Core/Events/DeleteEventArgs.cs
+++ b/src/Umbraco.Core/Events/DeleteEventArgs.cs
@@ -99,7 +99,8 @@ namespace Umbraco.Core.Events
 		/// </summary>
 		public IEnumerable<TEntity> DeletedEntities
 		{
-			get { return EventObject; }
+			get { return EventObject; }
+            internal set { EventObject = value; }
 		}
 
         /// <summary>
diff --git a/src/Umbraco.Core/Services/ContentTypeService.cs b/src/Umbraco.Core/Services/ContentTypeService.cs
index 1b6735153d..14ba9f30bf 100644
--- a/src/Umbraco.Core/Services/ContentTypeService.cs
+++ b/src/Umbraco.Core/Services/ContentTypeService.cs
@@ -54,7 +54,8 @@ namespace Umbraco.Core.Services
                         CreatorId = userId
                     };
 
-                    if (uow.Events.DispatchCancelable(SavingContentTypeContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs)))
+                    var saveEventArgs = new SaveEventArgs<EntityContainer>(container, evtMsgs);
+                    if (uow.Events.DispatchCancelable(SavingContentTypeContainer, this, saveEventArgs))
                     {
                         uow.Commit();
                         return Attempt.Fail(new OperationStatus<EntityContainer, OperationStatusType>(container, OperationStatusType.FailedCancelledByEvent, evtMsgs));
@@ -62,8 +63,8 @@ namespace Umbraco.Core.Services
 
                     repo.AddOrUpdate(container);
                     uow.Commit();
-
-                    uow.Events.Dispatch(SavedContentTypeContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs), "SavedContentTypeContainer");
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(SavedContentTypeContainer, this, saveEventArgs, "SavedContentTypeContainer");
                     //TODO: Audit trail ?
 
                     return Attempt.Succeed(new OperationStatus<EntityContainer, OperationStatusType>(container, OperationStatusType.Success, evtMsgs));
@@ -92,7 +93,8 @@ namespace Umbraco.Core.Services
                         CreatorId = userId
                     };
 
-                    if (uow.Events.DispatchCancelable(SavingMediaTypeContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs)))
+                    var saveEventArgs = new SaveEventArgs<EntityContainer>(container, evtMsgs);
+                    if (uow.Events.DispatchCancelable(SavingMediaTypeContainer, this, saveEventArgs))
                     {
                         uow.Commit();
                         return Attempt.Fail(new OperationStatus<EntityContainer, OperationStatusType>(container, OperationStatusType.FailedCancelledByEvent, evtMsgs));
@@ -100,8 +102,8 @@ namespace Umbraco.Core.Services
 
                     repo.AddOrUpdate(container);
                     uow.Commit();
-
-                    uow.Events.Dispatch(SavedMediaTypeContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs), "SavedMediaTypeContainer");
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(SavedMediaTypeContainer, this, saveEventArgs, "SavedMediaTypeContainer");
                     //TODO: Audit trail ?
 
                     return Attempt.Succeed(new OperationStatus<EntityContainer, OperationStatusType>(container, OperationStatusType.Success, evtMsgs));
@@ -289,7 +291,8 @@ namespace Umbraco.Core.Services
                     return OperationStatus.NoOperation(evtMsgs);
                 }
 
-                if (uow.Events.DispatchCancelable(DeletingContentTypeContainer, this, new DeleteEventArgs<EntityContainer>(container, evtMsgs)))
+                var deleteEventArgs = new DeleteEventArgs<EntityContainer>(container, evtMsgs);
+                if (uow.Events.DispatchCancelable(DeletingContentTypeContainer, this, deleteEventArgs))
                 {
                     uow.Commit();
                     return Attempt.Fail(new OperationStatus(OperationStatusType.FailedCancelledByEvent, evtMsgs));
@@ -297,8 +300,8 @@ namespace Umbraco.Core.Services
 
                 repo.Delete(container);
                 uow.Commit();
-
-                uow.Events.Dispatch(DeletedContentTypeContainer, this, new DeleteEventArgs<EntityContainer>(container, evtMsgs), "DeletedContentTypeContainer");
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedContentTypeContainer, this, deleteEventArgs, "DeletedContentTypeContainer");
 
                 return OperationStatus.Success(evtMsgs);
                 //TODO: Audit trail ?
@@ -319,7 +322,8 @@ namespace Umbraco.Core.Services
                     return OperationStatus.NoOperation(evtMsgs);
                 }
 
-                if (uow.Events.DispatchCancelable(DeletingMediaTypeContainer, this, new DeleteEventArgs<EntityContainer>(container, evtMsgs)))
+                var deleteEventArgs = new DeleteEventArgs<EntityContainer>(container, evtMsgs);
+                if (uow.Events.DispatchCancelable(DeletingMediaTypeContainer, this, deleteEventArgs))
                 {
                     uow.Commit();
                     return Attempt.Fail(new OperationStatus(OperationStatusType.FailedCancelledByEvent, evtMsgs));
@@ -327,8 +331,8 @@ namespace Umbraco.Core.Services
 
                 repo.Delete(container);
                 uow.Commit();
-
-                uow.Events.Dispatch(DeletedMediaTypeContainer, this, new DeleteEventArgs<EntityContainer>(container, evtMsgs));
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedMediaTypeContainer, this, deleteEventArgs);
 
                 return OperationStatus.Success(evtMsgs);
                 //TODO: Audit trail ?
@@ -756,7 +760,8 @@ namespace Umbraco.Core.Services
             {
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (uow.Events.DispatchCancelable(SavingContentType, this, new SaveEventArgs<IContentType>(contentType)))
+                    var saveEventArgs = new SaveEventArgs<IContentType>(contentType);
+                    if (uow.Events.DispatchCancelable(SavingContentType, this, saveEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -779,7 +784,8 @@ namespace Umbraco.Core.Services
 
                     UpdateContentXmlStructure(contentType);
 
-                    uow.Events.Dispatch(SavedContentType, this, new SaveEventArgs<IContentType>(contentType, false));
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(SavedContentType, this, saveEventArgs);
 
                     Audit(uow, AuditType.Save, "Save ContentType performed by user", userId, contentType.Id);
                     uow.Commit();
@@ -800,7 +806,8 @@ namespace Umbraco.Core.Services
             {
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (uow.Events.DispatchCancelable(SavingContentType, this, new SaveEventArgs<IContentType>(asArray)))
+                    var saveEventArgs = new SaveEventArgs<IContentType>(asArray);
+                    if (uow.Events.DispatchCancelable(SavingContentType, this, saveEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -825,7 +832,8 @@ namespace Umbraco.Core.Services
 
                     UpdateContentXmlStructure(asArray.Cast<IContentTypeBase>().ToArray());
 
-                    uow.Events.Dispatch(SavedContentType, this, new SaveEventArgs<IContentType>(asArray, false));
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(SavedContentType, this, saveEventArgs);
 
                     Audit(uow, AuditType.Save, "Save ContentTypes performed by user", userId, -1);
                     uow.Commit();
@@ -845,7 +853,8 @@ namespace Umbraco.Core.Services
             {
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (uow.Events.DispatchCancelable(DeletingContentType, this, new DeleteEventArgs<IContentType>(contentType)))
+                    var deleteEventArgs = new DeleteEventArgs<IContentType>(contentType);                    
+                    if (uow.Events.DispatchCancelable(DeletingContentType, this, deleteEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -860,8 +869,9 @@ namespace Umbraco.Core.Services
                     _contentService.DeleteContentOfTypes(deletedContentTypes.Select(x => x.Id), userId);
 
                     repository.Delete(contentType);
-
-                    uow.Events.Dispatch(DeletedContentType, this, new DeleteEventArgs<IContentType>(deletedContentTypes.DistinctBy(x => x.Id), false));
+                    deleteEventArgs.DeletedEntities = deletedContentTypes.DistinctBy(x => x.Id);
+                    deleteEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(DeletedContentType, this, deleteEventArgs);
 
                     Audit(uow, AuditType.Delete, string.Format("Delete ContentType performed by user"), userId, contentType.Id);
                     uow.Commit();
@@ -885,7 +895,8 @@ namespace Umbraco.Core.Services
             {
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (uow.Events.DispatchCancelable(DeletingContentType, this, new DeleteEventArgs<IContentType>(asArray)))
+                    var deleteEventArgs = new DeleteEventArgs<IContentType>(asArray);
+                    if (uow.Events.DispatchCancelable(DeletingContentType, this, deleteEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -906,8 +917,9 @@ namespace Umbraco.Core.Services
                     {
                         repository.Delete(contentType);
                     }
-
-                    uow.Events.Dispatch(DeletedContentType, this, new DeleteEventArgs<IContentType>(deletedContentTypes.DistinctBy(x => x.Id), false));
+                    deleteEventArgs.DeletedEntities = deletedContentTypes.DistinctBy(x => x.Id);
+                    deleteEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(DeletedContentType, this, deleteEventArgs);
 
                     Audit(uow, AuditType.Delete, string.Format("Delete ContentTypes performed by user"), userId, -1);
                     uow.Commit();
@@ -1056,7 +1068,9 @@ namespace Umbraco.Core.Services
             var moveInfo = new List<MoveEventInfo<IMediaType>>();
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(MovingMediaType, this, new MoveEventArgs<IMediaType>(evtMsgs, new MoveEventInfo<IMediaType>(toMove, toMove.Path, containerId))))
+                var moveEventInfo = new MoveEventInfo<IMediaType>(toMove, toMove.Path, containerId);
+                var moveEventArgs = new MoveEventArgs<IMediaType>(evtMsgs, moveEventInfo);
+                if (uow.Events.DispatchCancelable(MovingMediaType, this, moveEventArgs))
                 {
                     uow.Commit();
                     return Attempt.Fail(new OperationStatus<MoveOperationStatusType>(MoveOperationStatusType.FailedCancelledByEvent, evtMsgs));
@@ -1081,7 +1095,9 @@ namespace Umbraco.Core.Services
                     return Attempt.Fail(new OperationStatus<MoveOperationStatusType>(ex.Operation, evtMsgs));
                 }
                 uow.Commit();
-                uow.Events.Dispatch(MovedMediaType, this, new MoveEventArgs<IMediaType>(false, evtMsgs, moveInfo.ToArray()));
+                moveEventArgs.MoveInfoCollection = moveInfo;
+                moveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(MovedMediaType, this, moveEventArgs);
             }
 
             return Attempt.Succeed(
@@ -1095,7 +1111,9 @@ namespace Umbraco.Core.Services
             var moveInfo = new List<MoveEventInfo<IContentType>>();
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(MovingContentType, this, new MoveEventArgs<IContentType>(evtMsgs, new MoveEventInfo<IContentType>(toMove, toMove.Path, containerId))))
+                var moveEventInfo = new MoveEventInfo<IContentType>(toMove, toMove.Path, containerId);
+                var moveEventArgs = new MoveEventArgs<IContentType>(evtMsgs, moveEventInfo);
+                if (uow.Events.DispatchCancelable(MovingContentType, this, moveEventArgs))
                 {
                     uow.Commit();
                     return Attempt.Fail(new OperationStatus<MoveOperationStatusType>(MoveOperationStatusType.FailedCancelledByEvent, evtMsgs));
@@ -1119,8 +1137,10 @@ namespace Umbraco.Core.Services
                     uow.Commit();
                     return Attempt.Fail(new OperationStatus<MoveOperationStatusType>(ex.Operation, evtMsgs));
                 }
+                moveEventArgs.MoveInfoCollection = moveInfo;
+                moveEventArgs.CanCancel = false;
                 uow.Commit();
-                uow.Events.Dispatch(MovedContentType, this, new MoveEventArgs<IContentType>(false, evtMsgs, moveInfo.ToArray()));
+                uow.Events.Dispatch(MovedContentType, this, moveEventArgs);
             }
 
             return Attempt.Succeed(
@@ -1228,7 +1248,8 @@ namespace Umbraco.Core.Services
             {
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (uow.Events.DispatchCancelable(SavingMediaType, this, new SaveEventArgs<IMediaType>(mediaType)))
+                    var saveEventArgs = new SaveEventArgs<IMediaType>(mediaType);
+                    if (uow.Events.DispatchCancelable(SavingMediaType, this, saveEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -1244,8 +1265,8 @@ namespace Umbraco.Core.Services
                     uow.Commit();
 
                     UpdateContentXmlStructure(mediaType);
-
-                    uow.Events.Dispatch(SavedMediaType, this, new SaveEventArgs<IMediaType>(mediaType, false));
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(SavedMediaType, this, saveEventArgs);
 
                     Audit(uow, AuditType.Save, "Save MediaType performed by user", userId, mediaType.Id);
                     uow.Commit();
@@ -1266,7 +1287,8 @@ namespace Umbraco.Core.Services
             {
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (uow.Events.DispatchCancelable(SavingMediaType, this, new SaveEventArgs<IMediaType>(asArray)))
+                    var saveEventArgs = new SaveEventArgs<IMediaType>(asArray);
+                    if (uow.Events.DispatchCancelable(SavingMediaType, this, saveEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -1290,8 +1312,8 @@ namespace Umbraco.Core.Services
                     uow.Commit();
 
                     UpdateContentXmlStructure(asArray.Cast<IContentTypeBase>().ToArray());
-
-                    uow.Events.Dispatch(SavedMediaType, this, new SaveEventArgs<IMediaType>(asArray, false));
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(SavedMediaType, this, saveEventArgs);
 
                     Audit(uow, AuditType.Save, "Save MediaTypes performed by user", userId, -1);
                     uow.Commit();
@@ -1313,7 +1335,8 @@ namespace Umbraco.Core.Services
             {
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (uow.Events.DispatchCancelable(DeletingMediaType, this, new DeleteEventArgs<IMediaType>(mediaType)))
+                    var deleteEventArgs = new DeleteEventArgs<IMediaType>(mediaType);
+                    if (uow.Events.DispatchCancelable(DeletingMediaType, this, deleteEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -1329,7 +1352,9 @@ namespace Umbraco.Core.Services
 
                     repository.Delete(mediaType);
 
-                    uow.Events.Dispatch(DeletedMediaType, this, new DeleteEventArgs<IMediaType>(deletedMediaTypes.DistinctBy(x => x.Id), false));
+                    deleteEventArgs.CanCancel = false;
+                    deleteEventArgs.DeletedEntities = deletedMediaTypes.DistinctBy(x => x.Id);
+                    uow.Events.Dispatch(DeletedMediaType, this, deleteEventArgs);
 
                     Audit(uow, AuditType.Delete, "Delete MediaType performed by user", userId, mediaType.Id);
                     uow.Commit();
@@ -1353,7 +1378,8 @@ namespace Umbraco.Core.Services
             {
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (uow.Events.DispatchCancelable(DeletingMediaType, this, new DeleteEventArgs<IMediaType>(asArray)))
+                    var deleteEventArgs = new DeleteEventArgs<IMediaType>(asArray);
+                    if (uow.Events.DispatchCancelable(DeletingMediaType, this, deleteEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -1375,7 +1401,9 @@ namespace Umbraco.Core.Services
                         repository.Delete(mediaType);
                     }
 
-                    uow.Events.Dispatch(DeletedMediaType, this, new DeleteEventArgs<IMediaType>(deletedMediaTypes.DistinctBy(x => x.Id), false));
+                    deleteEventArgs.DeletedEntities = deletedMediaTypes.DistinctBy(x => x.Id);
+                    deleteEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(DeletedMediaType, this, deleteEventArgs);
 
                     Audit(uow, AuditType.Delete, "Delete MediaTypes performed by user", userId, -1);
                     uow.Commit();

From 9cc466775d2260ea172de2da8bb994fe199ff640 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 24 Aug 2017 16:50:12 +1000
Subject: [PATCH 080/145] Updates more services to only have one event arg
 instance per event pair to flow through EventState

---
 src/Umbraco.Core/Services/DataTypeService.cs  |  39 +++---
 src/Umbraco.Core/Services/DomainService.cs    |  13 +-
 .../Services/LocalizationService.cs           |  27 +++--
 src/Umbraco.Core/Services/MacroService.cs     |  14 ++-
 src/Umbraco.Core/Services/MediaService.cs     | 113 ++++++++++++------
 5 files changed, 132 insertions(+), 74 deletions(-)

diff --git a/src/Umbraco.Core/Services/DataTypeService.cs b/src/Umbraco.Core/Services/DataTypeService.cs
index c01b13136e..0ee3e9b823 100644
--- a/src/Umbraco.Core/Services/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/DataTypeService.cs
@@ -312,7 +312,9 @@ namespace Umbraco.Core.Services
             var moveInfo = new List<MoveEventInfo<IDataTypeDefinition>>();
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(Moving, this, new MoveEventArgs<IDataTypeDefinition>(evtMsgs, new MoveEventInfo<IDataTypeDefinition>(toMove, toMove.Path, parentId))))
+                var moveEventInfo = new MoveEventInfo<IDataTypeDefinition>(toMove, toMove.Path, parentId);
+                var moveEventArgs = new MoveEventArgs<IDataTypeDefinition>(evtMsgs, moveEventInfo);
+                if (uow.Events.DispatchCancelable(Moving, this, moveEventArgs))
                 {
                     uow.Commit();
                     return Attempt.Fail(new OperationStatus<MoveOperationStatusType>(MoveOperationStatusType.FailedCancelledByEvent, evtMsgs));
@@ -338,7 +340,9 @@ namespace Umbraco.Core.Services
                         new OperationStatus<MoveOperationStatusType>(ex.Operation, evtMsgs));
                 }
                 uow.Commit();
-                uow.Events.Dispatch(Moved, this, new MoveEventArgs<IDataTypeDefinition>(false, evtMsgs, moveInfo.ToArray()));
+                moveEventArgs.MoveInfoCollection = moveInfo;
+                moveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Moved, this, moveEventArgs);
             }
 
             return Attempt.Succeed(
@@ -354,7 +358,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinition)))
+                var saveEventArgs = new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinition);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -369,8 +374,8 @@ namespace Umbraco.Core.Services
 
                 dataTypeDefinition.CreatorId = userId;
                 repository.AddOrUpdate(dataTypeDefinition);
-
-                uow.Events.Dispatch(Saved, this, new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinition, false));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs);
 
                 Audit(uow, AuditType.Save, "Save DataTypeDefinition performed by user", userId, dataTypeDefinition.Id);
                 uow.Commit();
@@ -397,9 +402,10 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
+                var saveEventArgs = new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinitions);
                 if (raiseEvents)
-                {
-                    if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinitions)))
+                {                    
+                    if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -415,7 +421,10 @@ namespace Umbraco.Core.Services
                 }
 
                 if (raiseEvents)
-                    uow.Events.Dispatch(Saved, this, new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinitions, false));
+                {
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Saved, this, saveEventArgs);
+                }
 
                 Audit(uow, AuditType.Save, string.Format("Save DataTypeDefinition performed by user"), userId, -1);
                 uow.Commit();
@@ -504,7 +513,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinition)))
+                var saveEventArgs = new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinition);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -526,8 +536,8 @@ namespace Umbraco.Core.Services
 
                 Audit(uow, AuditType.Save, string.Format("Save DataTypeDefinition performed by user"), userId, dataTypeDefinition.Id);
                 uow.Commit();
-
-                uow.Events.Dispatch(Saved, this, new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinition, false));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs);
             }
         }
 
@@ -544,7 +554,8 @@ namespace Umbraco.Core.Services
         {
 			using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IDataTypeDefinition>(dataTypeDefinition)))
+                var deleteEventArgs = new DeleteEventArgs<IDataTypeDefinition>(dataTypeDefinition);
+                if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -556,8 +567,8 @@ namespace Umbraco.Core.Services
 
                 Audit(uow, AuditType.Delete, "Delete DataTypeDefinition performed by user", userId, dataTypeDefinition.Id);
                 uow.Commit();
-
-                uow.Events.Dispatch(Deleted, this, new DeleteEventArgs<IDataTypeDefinition>(dataTypeDefinition, false));
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Deleted, this, deleteEventArgs);
             }
         }
 
diff --git a/src/Umbraco.Core/Services/DomainService.cs b/src/Umbraco.Core/Services/DomainService.cs
index d5637d50be..7051f31fe4 100644
--- a/src/Umbraco.Core/Services/DomainService.cs
+++ b/src/Umbraco.Core/Services/DomainService.cs
@@ -32,7 +32,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IDomain>(domain, evtMsgs)))
+                var deleteEventArgs = new DeleteEventArgs<IDomain>(domain, evtMsgs);
+                if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs))
                 {
                     uow.Commit();
                     return OperationStatus.Cancelled(evtMsgs);
@@ -42,8 +43,8 @@ namespace Umbraco.Core.Services
                 repository.Delete(domain);
                 uow.Commit();
 
-                var args = new DeleteEventArgs<IDomain>(domain, false, evtMsgs);
-                uow.Events.Dispatch(Deleted, this, args);
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Deleted, this, deleteEventArgs);
                 return OperationStatus.Success(evtMsgs);
             }
 
@@ -92,7 +93,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IDomain>(domainEntity, evtMsgs)))
+                var saveEventArgs = new SaveEventArgs<IDomain>(domainEntity, evtMsgs);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     return OperationStatus.Cancelled(evtMsgs);
@@ -101,7 +103,8 @@ namespace Umbraco.Core.Services
                 var repository = RepositoryFactory.CreateDomainRepository(uow);
                 repository.AddOrUpdate(domainEntity);
                 uow.Commit();
-                uow.Events.Dispatch(Saved, this, new SaveEventArgs<IDomain>(domainEntity, false, evtMsgs));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs);
                 return OperationStatus.Success(evtMsgs);
             }
 
diff --git a/src/Umbraco.Core/Services/LocalizationService.cs b/src/Umbraco.Core/Services/LocalizationService.cs
index 33b075e3e0..12a2afb6ad 100644
--- a/src/Umbraco.Core/Services/LocalizationService.cs
+++ b/src/Umbraco.Core/Services/LocalizationService.cs
@@ -79,7 +79,8 @@ namespace Umbraco.Core.Services
                     item.Translations = translations;
                 }
 
-                if (uow.Events.DispatchCancelable(SavingDictionaryItem, this, new SaveEventArgs<IDictionaryItem>(item)))
+                var saveEventArgs = new SaveEventArgs<IDictionaryItem>(item);
+                if (uow.Events.DispatchCancelable(SavingDictionaryItem, this, saveEventArgs))
                 {
                     uow.Commit();
                     return item;
@@ -90,8 +91,8 @@ namespace Umbraco.Core.Services
 
                 //ensure the lazy Language callback is assigned
                 EnsureDictionaryItemLanguageCallback(item);
-
-                uow.Events.Dispatch(SavedDictionaryItem, this, new SaveEventArgs<IDictionaryItem>(item));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SavedDictionaryItem, this, saveEventArgs);
 
                 return item;
             }
@@ -256,7 +257,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(DeletingDictionaryItem, this, new DeleteEventArgs<IDictionaryItem>(dictionaryItem)))
+                var deleteEventArgs = new DeleteEventArgs<IDictionaryItem>(dictionaryItem);
+                if (uow.Events.DispatchCancelable(DeletingDictionaryItem, this, deleteEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -264,8 +266,8 @@ namespace Umbraco.Core.Services
 
                 var repository = RepositoryFactory.CreateDictionaryRepository(uow);
                 repository.Delete(dictionaryItem);
-
-                uow.Events.Dispatch(DeletedDictionaryItem, this, new DeleteEventArgs<IDictionaryItem>(dictionaryItem, false));
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedDictionaryItem, this, deleteEventArgs);
 
                 Audit(uow, AuditType.Delete, "Delete DictionaryItem performed by user", userId, dictionaryItem.Id);
                 uow.Commit();
@@ -336,15 +338,16 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(SavingLanguage, this, new SaveEventArgs<ILanguage>(language)))
+                var saveEventArgs = new SaveEventArgs<ILanguage>(language);
+                if (uow.Events.DispatchCancelable(SavingLanguage, this, saveEventArgs))
                 {
                     uow.Commit();
                     return;
                 }
                 var repository = RepositoryFactory.CreateLanguageRepository(uow);
                 repository.AddOrUpdate(language);
-
-                uow.Events.Dispatch(SavedLanguage, this, new SaveEventArgs<ILanguage>(language, false));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SavedLanguage, this, saveEventArgs);
 
                 Audit(uow, AuditType.Save, "Save Language performed by user", userId, language.Id);
                 uow.Commit();
@@ -360,7 +363,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(DeletingLanguage, this, new DeleteEventArgs<ILanguage>(language)))
+                var deleteEventArgs = new DeleteEventArgs<ILanguage>(language);
+                if (uow.Events.DispatchCancelable(DeletingLanguage, this, deleteEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -369,7 +373,8 @@ namespace Umbraco.Core.Services
                 var repository = RepositoryFactory.CreateLanguageRepository(uow);
                 repository.Delete(language);
 
-                uow.Events.Dispatch(DeletedLanguage, this, new DeleteEventArgs<ILanguage>(language, false));
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedLanguage, this, deleteEventArgs);
 
                 Audit(uow, AuditType.Delete, "Delete Language performed by user", userId, language.Id);
                 uow.Commit();
diff --git a/src/Umbraco.Core/Services/MacroService.cs b/src/Umbraco.Core/Services/MacroService.cs
index d1d5f81da0..bd9ae2e577 100644
--- a/src/Umbraco.Core/Services/MacroService.cs
+++ b/src/Umbraco.Core/Services/MacroService.cs
@@ -144,15 +144,16 @@ namespace Umbraco.Core.Services
         {
 			using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IMacro>(macro)))
+                var deleteEventArgs = new DeleteEventArgs<IMacro>(macro);
+                if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs))
                 {
                     uow.Commit();
                     return;
                 }
 			    var repository = RepositoryFactory.CreateMacroRepository(uow);
 				repository.Delete(macro);
-
-                uow.Events.Dispatch(Deleted, this, new DeleteEventArgs<IMacro>(macro, false));
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Deleted, this, deleteEventArgs);
 
                 Audit(uow, AuditType.Delete, "Delete Macro performed by user", userId, -1);
                 uow.Commit();
@@ -168,7 +169,8 @@ namespace Umbraco.Core.Services
         {            
 			using (var uow = UowProvider.GetUnitOfWork())
 	        {
-                if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IMacro>(macro)))
+	            var saveEventArgs = new SaveEventArgs<IMacro>(macro);
+	            if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -181,8 +183,8 @@ namespace Umbraco.Core.Services
 
                 var repository = RepositoryFactory.CreateMacroRepository(uow);
 		        repository.AddOrUpdate(macro);
-
-                uow.Events.Dispatch(Saved, this, new SaveEventArgs<IMacro>(macro, false));
+	            saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs);
 
                 Audit(uow, AuditType.Save, "Save Macro performed by user", userId, -1);
                 uow.Commit();
diff --git a/src/Umbraco.Core/Services/MediaService.cs b/src/Umbraco.Core/Services/MediaService.cs
index 38c0c20eb2..af2cb3494c 100644
--- a/src/Umbraco.Core/Services/MediaService.cs
+++ b/src/Umbraco.Core/Services/MediaService.cs
@@ -70,7 +70,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(Creating, this, new NewEventArgs<IMedia>(media, mediaTypeAlias, parentId)))
+                var newEventArgs = new NewEventArgs<IMedia>(media, mediaTypeAlias, parentId);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
                 {
                     uow.Commit();
                     media.WasCancelled = true;
@@ -78,7 +79,8 @@ namespace Umbraco.Core.Services
                 }
 
                 media.CreatorId = userId;
-                uow.Events.Dispatch(Created, this, new NewEventArgs<IMedia>(media, false, mediaTypeAlias, parentId));
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
                 Audit(uow, AuditType.New, string.Format("Media '{0}' was created", name), media.CreatorId, media.Id);
                 uow.Commit();
 
@@ -110,7 +112,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(Creating, this, new NewEventArgs<IMedia>(media, mediaTypeAlias, parent)))
+                var newEventArgs = new NewEventArgs<IMedia>(media, mediaTypeAlias, parent);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
                 {
                     uow.Commit();
                     media.WasCancelled = true;
@@ -118,8 +121,8 @@ namespace Umbraco.Core.Services
                 }
 
                 media.CreatorId = userId;
-
-                uow.Events.Dispatch(Created, this, new NewEventArgs<IMedia>(media, false, mediaTypeAlias, parent));
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
 
                 Audit(uow, AuditType.New, string.Format("Media '{0}' was created", name), media.CreatorId, media.Id);
                 uow.Commit();
@@ -150,14 +153,16 @@ namespace Umbraco.Core.Services
             {
                 //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
                 // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
-                if (uow.Events.DispatchCancelable(Creating, this, new NewEventArgs<IMedia>(media, mediaTypeAlias, parentId)))
+                var newEventArgs = new NewEventArgs<IMedia>(media, mediaTypeAlias, parentId);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
                 {
                     uow.Commit();
                     media.WasCancelled = true;
                     return media;
                 }
 
-                if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IMedia>(media)))
+                var saveEventArgs = new SaveEventArgs<IMedia>(media);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     media.WasCancelled = true;
@@ -174,8 +179,10 @@ namespace Umbraco.Core.Services
                     repository.AddOrUpdatePreviewXml(media, m => _entitySerializer.Serialize(this, _dataTypeService, _userService, m));
                 }
 
-                uow.Events.Dispatch(Saved, this, new SaveEventArgs<IMedia>(media, false));
-                uow.Events.Dispatch(Created, this, new NewEventArgs<IMedia>(media, false, mediaTypeAlias, parentId));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs);
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
 
                 Audit(uow, AuditType.New, string.Format("Media '{0}' was created with Id {1}", name, media.Id), media.CreatorId, media.Id);
                 uow.Commit();
@@ -208,14 +215,16 @@ namespace Umbraco.Core.Services
             {
                 //NOTE: I really hate the notion of these Creating/Created events - they are so inconsistent, I've only just found
                 // out that in these 'WithIdentity' methods, the Saving/Saved events were not fired, wtf. Anyways, they're added now.
-                if (uow.Events.DispatchCancelable(Creating, this, new NewEventArgs<IMedia>(media, mediaTypeAlias, parent)))
+                var newEventArgs = new NewEventArgs<IMedia>(media, mediaTypeAlias, parent);
+                if (uow.Events.DispatchCancelable(Creating, this, newEventArgs))
                 {
                     uow.Commit();
                     media.WasCancelled = true;
                     return media;
                 }
 
-                if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IMedia>(media)))
+                var saveEventArgs = new SaveEventArgs<IMedia>(media);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     media.WasCancelled = true;
@@ -232,8 +241,10 @@ namespace Umbraco.Core.Services
                     repository.AddOrUpdatePreviewXml(media, m => _entitySerializer.Serialize(this, _dataTypeService, _userService, m));
                 }
 
-                uow.Events.Dispatch(Saved, this, new SaveEventArgs<IMedia>(media, false));
-                uow.Events.Dispatch(Created, this, new NewEventArgs<IMedia>(media, false, mediaTypeAlias, parent));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs);
+                newEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Created, this, newEventArgs);
 
                 Audit(uow, AuditType.New, string.Format("Media '{0}' was created with Id {1}", name, media.Id), media.CreatorId, media.Id);
                 uow.Commit();
@@ -786,7 +797,9 @@ namespace Umbraco.Core.Services
                 {
                     var originalPath = media.Path;
 
-                    if (uow.Events.DispatchCancelable(Moving, this, new MoveEventArgs<IMedia>(new MoveEventInfo<IMedia>(media, originalPath, parentId)), "Moving"))
+                    var moveEventInfo = new MoveEventInfo<IMedia>(media, originalPath, parentId);
+                    var moveEventArgs = new MoveEventArgs<IMedia>(moveEventInfo);
+                    if (uow.Events.DispatchCancelable(Moving, this, moveEventArgs, "Moving"))
                     {
                         uow.Commit();
                         return;
@@ -802,7 +815,7 @@ namespace Umbraco.Core.Services
                     //used to track all the moved entities to be given to the event
                     var moveInfo = new List<MoveEventInfo<IMedia>>
                     {
-                        new MoveEventInfo<IMedia>(media, originalPath, parentId)
+                        moveEventInfo
                     };
 
                     //Ensure that relevant properties are updated on children
@@ -816,7 +829,9 @@ namespace Umbraco.Core.Services
                         Save(updatedDescendants, userId, false); //no events!
                     }
 
-                    uow.Events.Dispatch(Moved, this, new MoveEventArgs<IMedia>(false, moveInfo.ToArray()), "Moved");
+                    moveEventArgs.MoveInfoCollection = moveInfo;
+                    moveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Moved, this, moveEventArgs, "Moved");
 
                     Audit(uow, AuditType.Move, "Move Media performed by user", userId, media.Id);
                     uow.Commit();
@@ -858,7 +873,8 @@ namespace Umbraco.Core.Services
 
         private Attempt<OperationStatus> DeleteUow(IScopeUnitOfWork uow, IMedia media, int userId, EventMessages evtMsgs)
         {
-            if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IMedia>(media, evtMsgs)))
+            var deleteEventArgs = new DeleteEventArgs<IMedia>(media, evtMsgs);
+            if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs))
             {
                 return OperationStatus.Cancelled(evtMsgs);
             }
@@ -872,9 +888,8 @@ namespace Umbraco.Core.Services
 
             var repository = RepositoryFactory.CreateMediaRepository(uow);
             repository.Delete(media);
-
-            var args = new DeleteEventArgs<IMedia>(media, false, evtMsgs);
-            uow.Events.Dispatch(Deleted, this, args);
+            deleteEventArgs.CanCancel = false;            
+            uow.Events.Dispatch(Deleted, this, deleteEventArgs);
 
             Audit(uow, AuditType.Delete, "Delete Media performed by user", userId, media.Id);
 
@@ -893,7 +908,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IMedia>(media, evtMsgs)))
+                var saveEventArgs = new SaveEventArgs<IMedia>(media, evtMsgs);
+                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     return OperationStatus.Cancelled(evtMsgs);
@@ -921,7 +937,10 @@ namespace Umbraco.Core.Services
                 }
 
                 if (raiseEvents)
-                    uow.Events.Dispatch(Saved, this, new SaveEventArgs<IMedia>(media, false, evtMsgs));
+                {
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Saved, this, saveEventArgs);
+                }
 
                 Audit(uow, AuditType.Save, "Save Media performed by user", userId, media.Id);
                 uow.Commit();
@@ -943,7 +962,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IMedia>(asArray, evtMsgs)))
+                var saveEventArgs = new SaveEventArgs<IMedia>(asArray, evtMsgs);
+                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     return OperationStatus.Cancelled(evtMsgs);
@@ -963,7 +983,10 @@ namespace Umbraco.Core.Services
                 }
 
                 if (raiseEvents)
-                    uow.Events.Dispatch(Saved, this, new SaveEventArgs<IMedia>(asArray, false, evtMsgs));
+                {
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Saved, this, saveEventArgs);
+                }
 
                 Audit(uow, AuditType.Save, "Save Media items performed by user", userId, -1);
                 uow.Commit();
@@ -988,15 +1011,17 @@ namespace Umbraco.Core.Services
 
                     var files = ((MediaRepository)repository).GetFilesInRecycleBinForUploadField();
 
-                    if (uow.Events.DispatchCancelable(EmptyingRecycleBin, this, new RecycleBinEventArgs(nodeObjectType, entities, files)))
+                    var recycleBinEventArgs = new RecycleBinEventArgs(nodeObjectType, entities, files);
+                    if (uow.Events.DispatchCancelable(EmptyingRecycleBin, this, recycleBinEventArgs))
                     {
                         uow.Commit();
                         return;
                     }
 
                     var success = repository.EmptyRecycleBin();
-
-                    uow.Events.Dispatch(EmptiedRecycleBin, this, new RecycleBinEventArgs(nodeObjectType, entities, files, success));
+                    recycleBinEventArgs.CanCancel = false;
+                    recycleBinEventArgs.RecycleBinEmptiedSuccessfully = success;
+                    uow.Events.Dispatch(EmptiedRecycleBin, this, recycleBinEventArgs);
 
                     Audit(uow, AuditType.Delete, "Empty Media Recycle Bin performed by user", 0, -21);
                     uow.Commit();
@@ -1022,7 +1047,8 @@ namespace Umbraco.Core.Services
                 IDictionary<string, IMedia> rootItems;
                 var mediaToDelete = this.TrackDeletionsForDeleteContentOfTypes(mediaTypeIds, repository, out rootItems).ToArray();
 
-                if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IMedia>(mediaToDelete), "Deleting"))
+                var deleteEventArgs = new DeleteEventArgs<IMedia>(mediaToDelete);
+                if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs, "Deleting"))
                 {
                     uow.Commit();
                     return;
@@ -1094,14 +1120,16 @@ namespace Umbraco.Core.Services
                     //see: http://issues.umbraco.org/issue/U4-9336
                     media.EnsureValidPath(Logger, entity => GetById(entity.ParentId), QuickUpdate);
                     var originalPath = media.Path;
-                    if (uow.Events.DispatchCancelable(Trashing, this, new MoveEventArgs<IMedia>(new MoveEventInfo<IMedia>(media, originalPath, Constants.System.RecycleBinMedia)), "Trashing"))
+                    var moveEventInfo = new MoveEventInfo<IMedia>(media, originalPath, Constants.System.RecycleBinMedia);
+                    var moveEventArgs = new MoveEventArgs<IMedia>(moveEventInfo);
+                    if (uow.Events.DispatchCancelable(Trashing, this, moveEventArgs, "Trashing"))
                     {
                         uow.Commit();
                         return OperationStatus.Cancelled(evtMsgs);
                     }
                     var moveInfo = new List<MoveEventInfo<IMedia>>
                     {
-                        new MoveEventInfo<IMedia>(media, originalPath, Constants.System.RecycleBinMedia)
+                        moveEventInfo
                     };
 
                     //get descendents to process of the content item that is being moved to trash - must be done before changing the state below,
@@ -1124,7 +1152,9 @@ namespace Umbraco.Core.Services
                         moveInfo.Add(new MoveEventInfo<IMedia>(descendant, descendant.Path, descendant.ParentId));
                     }
 
-                    uow.Events.Dispatch(Trashed, this, new MoveEventArgs<IMedia>(false, evtMsgs, moveInfo.ToArray()), "Trashed");
+                    moveEventArgs.MoveInfoCollection = moveInfo;
+                    moveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Trashed, this, moveEventArgs, "Trashed");
 
                     Audit(uow, AuditType.Move, "Move Media to Recycle Bin performed by user", userId, media.Id);
                     uow.Commit();
@@ -1167,12 +1197,14 @@ namespace Umbraco.Core.Services
 
         private void DeleteVersions(IScopeUnitOfWork uow, int id, DateTime versionDate, int userId = 0)
         {
-            if (uow.Events.DispatchCancelable(DeletingVersions, this, new DeleteRevisionsEventArgs(id, dateToRetain: versionDate)))
+            var deleteRevisionsEventArgs = new DeleteRevisionsEventArgs(id, dateToRetain: versionDate);
+            if (uow.Events.DispatchCancelable(DeletingVersions, this, deleteRevisionsEventArgs))
                 return;
 
             var repository = RepositoryFactory.CreateMediaRepository(uow);
             repository.DeleteVersions(id, versionDate);
-            uow.Events.Dispatch(DeletedVersions, this, new DeleteRevisionsEventArgs(id, false, dateToRetain: versionDate));
+            deleteRevisionsEventArgs.CanCancel = false;
+            uow.Events.Dispatch(DeletedVersions, this, deleteRevisionsEventArgs);
             Audit(uow, AuditType.Delete, "Delete Media by version date performed by user", userId, -1);
         }
 
@@ -1188,7 +1220,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(DeletingVersions, this, new DeleteRevisionsEventArgs(id, specificVersion: versionId)))
+                var deleteRevisionsEventArgs = new DeleteRevisionsEventArgs(id, specificVersion: versionId);
+                if (uow.Events.DispatchCancelable(DeletingVersions, this, deleteRevisionsEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -1202,8 +1235,8 @@ namespace Umbraco.Core.Services
 
                 var repository = RepositoryFactory.CreateMediaRepository(uow);
                 repository.DeleteVersion(versionId);
-
-                uow.Events.Dispatch(DeletedVersions, this, new DeleteRevisionsEventArgs(id, false, specificVersion: versionId));
+                deleteRevisionsEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedVersions, this, deleteRevisionsEventArgs);
 
                 Audit(uow, AuditType.Delete, "Delete Media by version performed by user", userId, -1);
                 uow.Commit();
@@ -1246,7 +1279,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IMedia>(asArray)))
+                var saveEventArgs = new SaveEventArgs<IMedia>(asArray);
+                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     return false;
@@ -1278,7 +1312,10 @@ namespace Umbraco.Core.Services
                 }
 
                 if (raiseEvents)
-                    uow.Events.Dispatch(Saved, this, new SaveEventArgs<IMedia>(asArray, false));
+                {
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Saved, this, saveEventArgs);
+                }
 
                 Audit(uow, AuditType.Sort, "Sorting Media performed by user", userId, 0);
                 uow.Commit();

From c3b1aa36b885f94cd59d3641f6f59aa3eaad08c5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 24 Aug 2017 17:19:57 +1000
Subject: [PATCH 081/145] Updates remaining services with one event arg
 instance for both event pairs to flow the EventState

---
 .../Services/MemberGroupService.cs            | 16 ++++---
 src/Umbraco.Core/Services/MemberService.cs    | 32 +++++++++-----
 .../Services/MemberTypeService.cs             | 30 +++++++------
 .../Services/PublicAccessService.cs           | 26 ++++++-----
 src/Umbraco.Core/Services/RelationService.cs  | 37 ++++++++++------
 src/Umbraco.Core/Services/UserService.cs      | 43 +++++++++++++------
 6 files changed, 120 insertions(+), 64 deletions(-)

diff --git a/src/Umbraco.Core/Services/MemberGroupService.cs b/src/Umbraco.Core/Services/MemberGroupService.cs
index 1e99caa7f4..78d8581577 100644
--- a/src/Umbraco.Core/Services/MemberGroupService.cs
+++ b/src/Umbraco.Core/Services/MemberGroupService.cs
@@ -71,7 +71,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IMemberGroup>(memberGroup)))
+                var saveEventArgs = new SaveEventArgs<IMemberGroup>(memberGroup);
+                if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -81,17 +82,19 @@ namespace Umbraco.Core.Services
                 repository.AddOrUpdate(memberGroup);
                 uow.Commit();
                 if (raiseEvents)
-                    uow.Events.Dispatch(Saved, this, new SaveEventArgs<IMemberGroup>(memberGroup, false));
+                {
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Saved, this, saveEventArgs);
+                }
             }
-
-
         }
 
         public void Delete(IMemberGroup memberGroup)
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IMemberGroup>(memberGroup)))
+                var deleteEventArgs = new DeleteEventArgs<IMemberGroup>(memberGroup);
+                if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -99,7 +102,8 @@ namespace Umbraco.Core.Services
                 var repository = RepositoryFactory.CreateMemberGroupRepository(uow);
                 repository.Delete(memberGroup);
                 uow.Commit();
-                uow.Events.Dispatch(Deleted, this, new DeleteEventArgs<IMemberGroup>(memberGroup, false));
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Deleted, this, deleteEventArgs);
             }
         }
 
diff --git a/src/Umbraco.Core/Services/MemberService.cs b/src/Umbraco.Core/Services/MemberService.cs
index 26e74f66cc..c59ca55c64 100644
--- a/src/Umbraco.Core/Services/MemberService.cs
+++ b/src/Umbraco.Core/Services/MemberService.cs
@@ -234,7 +234,8 @@ namespace Umbraco.Core.Services
                     var query = Query<IMember>.Builder.Where(x => x.ContentTypeId == memberTypeId);
                     var members = repository.GetByQuery(query).ToArray();
 
-                    if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IMember>(members)))
+                    var deleteEventArgs = new DeleteEventArgs<IMember>(members);
+                    if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -862,7 +863,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IMember>(member)))
+                var saveEventArgs = new SaveEventArgs<IMember>(member);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     member.WasCancelled = true;
@@ -881,7 +883,8 @@ namespace Umbraco.Core.Services
 
                 uow.Commit();
 
-                uow.Events.Dispatch(Saved, this, new SaveEventArgs<IMember>(member, false));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs);
                 uow.Events.Dispatch(Created, this, new NewEventArgs<IMember>(member, false, memberType.Alias, -1));
             }
 
@@ -958,7 +961,8 @@ namespace Umbraco.Core.Services
 
         private void Delete(IScopeUnitOfWork uow, IMember member)
         {
-            if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IMember>(member)))
+            var deleteEventArgs = new DeleteEventArgs<IMember>(member);
+            if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs))
             {
                 uow.Commit();
                 return;
@@ -968,8 +972,8 @@ namespace Umbraco.Core.Services
             repository.Delete(member);
             uow.Commit();
 
-            var args = new DeleteEventArgs<IMember>(member, false);
-            uow.Events.Dispatch(Deleted, this, args);
+            deleteEventArgs.CanCancel = false;
+            uow.Events.Dispatch(Deleted, this, deleteEventArgs);
         }
 
         /// <summary>
@@ -982,9 +986,10 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
+                var saveEventArgs = new SaveEventArgs<IMember>(entity);
                 if (raiseEvents)
                 {
-                    if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IMember>(entity)))
+                    if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -1008,7 +1013,10 @@ namespace Umbraco.Core.Services
                 uow.Commit();
 
                 if (raiseEvents)
-                    uow.Events.Dispatch(Saved, this, new SaveEventArgs<IMember>(entity, false));
+                {
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Saved, this, saveEventArgs);
+                }
             }
 
         }
@@ -1027,7 +1035,8 @@ namespace Umbraco.Core.Services
             {
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IMember>(asArray)))
+                    var saveEventArgs = new SaveEventArgs<IMember>(asArray);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -1049,7 +1058,10 @@ namespace Umbraco.Core.Services
                     uow.Commit();
 
                     if (raiseEvents)
-                        uow.Events.Dispatch(Saved, this, new SaveEventArgs<IMember>(asArray, false));
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs);
+                    }
                 }
 
 
diff --git a/src/Umbraco.Core/Services/MemberTypeService.cs b/src/Umbraco.Core/Services/MemberTypeService.cs
index 9ba34df10a..4784479338 100644
--- a/src/Umbraco.Core/Services/MemberTypeService.cs
+++ b/src/Umbraco.Core/Services/MemberTypeService.cs
@@ -80,7 +80,8 @@ namespace Umbraco.Core.Services
             {
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IMemberType>(memberType)))
+                    var saveEventArgs = new SaveEventArgs<IMemberType>(memberType);
+                    if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -101,7 +102,8 @@ namespace Umbraco.Core.Services
                     UpdateContentXmlStructure(memberType);
                     uow.Commit(); // actually commit uow
 
-                    uow.Events.Dispatch(Saved, this, new SaveEventArgs<IMemberType>(memberType, false));
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Saved, this, saveEventArgs);
                 }
             }
         }
@@ -114,7 +116,8 @@ namespace Umbraco.Core.Services
             {
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<IMemberType>(asArray)))
+                    var saveEventArgs = new SaveEventArgs<IMemberType>(asArray);
+                    if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -131,8 +134,8 @@ namespace Umbraco.Core.Services
 
                     UpdateContentXmlStructure(asArray.Cast<IContentTypeBase>().ToArray());
                     uow.Commit(); // actually commit uow
-
-                    uow.Events.Dispatch(Saved, this, new SaveEventArgs<IMemberType>(asArray, false));
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Saved, this, saveEventArgs);
                 }
             }
 
@@ -142,10 +145,11 @@ namespace Umbraco.Core.Services
         {
             using (new WriteLock(Locker))
             {
+                var deleteEventArgs = new DeleteEventArgs<IMemberType>(memberType);
                 using (var scope = UowProvider.ScopeProvider.CreateScope())
                 {
-                    scope.Complete(); // always
-                    if (scope.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IMemberType>(memberType)))
+                    scope.Complete(); // always                    
+                    if (scope.Events.DispatchCancelable(Deleting, this, deleteEventArgs))
                         return;
                 }
 
@@ -157,7 +161,8 @@ namespace Umbraco.Core.Services
                     repository.Delete(memberType);
                     uow.Commit();
 
-                    uow.Events.Dispatch(Deleted, this, new DeleteEventArgs<IMemberType>(memberType, false));
+                    deleteEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Deleted, this, deleteEventArgs);
                 }
             }
         }
@@ -168,10 +173,11 @@ namespace Umbraco.Core.Services
 
             using (new WriteLock(Locker))
             {
+                var deleteEventArgs = new DeleteEventArgs<IMemberType>(asArray);
                 using (var scope = UowProvider.ScopeProvider.CreateScope())
                 {
-                    scope.Complete(); // always
-                    if (scope.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IMemberType>(asArray)))
+                    scope.Complete(); // always                    
+                    if (scope.Events.DispatchCancelable(Deleting, this, deleteEventArgs))
                         return;
                 }
 
@@ -189,8 +195,8 @@ namespace Umbraco.Core.Services
                     }
 
                     uow.Commit();
-
-                    uow.Events.Dispatch(Deleted, this, new DeleteEventArgs<IMemberType>(asArray, false));
+                    deleteEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(Deleted, this, deleteEventArgs);
                 }
             }
         }
diff --git a/src/Umbraco.Core/Services/PublicAccessService.cs b/src/Umbraco.Core/Services/PublicAccessService.cs
index 660642416b..dea0709ac9 100644
--- a/src/Umbraco.Core/Services/PublicAccessService.cs
+++ b/src/Umbraco.Core/Services/PublicAccessService.cs
@@ -148,7 +148,8 @@ namespace Umbraco.Core.Services
                     return Attempt<OperationStatus<PublicAccessEntry, OperationStatusType>>.Succeed(new OperationStatus<PublicAccessEntry, OperationStatusType>(entry, OperationStatusType.Success, evtMsgs));
                 }
 
-                if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<PublicAccessEntry>(entry, evtMsgs)))
+                var saveEventArgs = new SaveEventArgs<PublicAccessEntry>(entry, evtMsgs);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     return Attempt<OperationStatus<PublicAccessEntry, OperationStatusType>>.Fail(
@@ -158,8 +159,8 @@ namespace Umbraco.Core.Services
                 repo.AddOrUpdate(entry);
 
                 uow.Commit();
-
-                uow.Events.Dispatch(Saved, this, new SaveEventArgs<PublicAccessEntry>(entry, false, evtMsgs));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs);
                 return Attempt<OperationStatus<PublicAccessEntry, OperationStatusType>>.Succeed(
                     new OperationStatus<PublicAccessEntry, OperationStatusType>(entry, OperationStatusType.Success, evtMsgs));
             }
@@ -193,7 +194,8 @@ namespace Umbraco.Core.Services
 
                 entry.RemoveRule(existingRule);
 
-                if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<PublicAccessEntry>(entry, evtMsgs)))
+                var saveEventArgs = new SaveEventArgs<PublicAccessEntry>(entry, evtMsgs);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     return OperationStatus.Cancelled(evtMsgs);
@@ -202,8 +204,8 @@ namespace Umbraco.Core.Services
                 repo.AddOrUpdate(entry);
 
                 uow.Commit();
-
-                uow.Events.Dispatch(Saved, this, new SaveEventArgs<PublicAccessEntry>(entry, false, evtMsgs));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs);
                 return OperationStatus.Success(evtMsgs);
             }
 
@@ -219,7 +221,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(Saving, this, new SaveEventArgs<PublicAccessEntry>(entry, evtMsgs)))
+                var saveEventArgs = new SaveEventArgs<PublicAccessEntry>(entry, evtMsgs);
+                if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
                 {
                     uow.Commit();
                     return OperationStatus.Cancelled(evtMsgs);
@@ -228,7 +231,8 @@ namespace Umbraco.Core.Services
                 var repo = RepositoryFactory.CreatePublicAccessRepository(uow);
                 repo.AddOrUpdate(entry);
                 uow.Commit();
-                uow.Events.Dispatch(Saved, this, new SaveEventArgs<PublicAccessEntry>(entry, false, evtMsgs));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Saved, this, saveEventArgs);
                 return OperationStatus.Success(evtMsgs);
             }
 
@@ -245,7 +249,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<PublicAccessEntry>(entry, evtMsgs)))
+                var deleteEventArgs = new DeleteEventArgs<PublicAccessEntry>(entry, evtMsgs);
+                if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs))
                 {
                     uow.Commit();
                     return OperationStatus.Cancelled(evtMsgs);
@@ -254,7 +259,8 @@ namespace Umbraco.Core.Services
                 var repo = RepositoryFactory.CreatePublicAccessRepository(uow);
                 repo.Delete(entry);
                 uow.Commit();
-                uow.Events.Dispatch(Deleted, this, new DeleteEventArgs<PublicAccessEntry>(entry, false, evtMsgs));
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(Deleted, this, deleteEventArgs);
                 return OperationStatus.Success(evtMsgs);
             }
 
diff --git a/src/Umbraco.Core/Services/RelationService.cs b/src/Umbraco.Core/Services/RelationService.cs
index 39dc908fde..b05e8e2391 100644
--- a/src/Umbraco.Core/Services/RelationService.cs
+++ b/src/Umbraco.Core/Services/RelationService.cs
@@ -412,7 +412,8 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.GetUnitOfWork())
             {
                 var repository = RepositoryFactory.CreateRelationRepository(uow);
-                if (uow.Events.DispatchCancelable(SavingRelation, this, new SaveEventArgs<IRelation>(relation)))
+                var saveEventArgs = new SaveEventArgs<IRelation>(relation);
+                if (uow.Events.DispatchCancelable(SavingRelation, this, saveEventArgs))
                 {
                     uow.Commit();
                     return relation;
@@ -420,7 +421,8 @@ namespace Umbraco.Core.Services
 
                 repository.AddOrUpdate(relation);
                 uow.Commit();
-                uow.Events.Dispatch(SavedRelation, this, new SaveEventArgs<IRelation>(relation, false));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SavedRelation, this, saveEventArgs);
                 return relation;
             }
         }
@@ -442,7 +444,8 @@ namespace Umbraco.Core.Services
 
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(SavingRelation, this, new SaveEventArgs<IRelation>(relation)))
+                var saveEventArgs = new SaveEventArgs<IRelation>(relation);
+                if (uow.Events.DispatchCancelable(SavingRelation, this, saveEventArgs))
                 {
                     uow.Commit();
                     return relation;
@@ -450,8 +453,8 @@ namespace Umbraco.Core.Services
                 var repository = RepositoryFactory.CreateRelationRepository(uow);
                 repository.AddOrUpdate(relation);
                 uow.Commit();
-
-                uow.Events.Dispatch(SavedRelation, this, new SaveEventArgs<IRelation>(relation, false));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SavedRelation, this, saveEventArgs);
                 return relation;
             }
         }
@@ -568,7 +571,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(SavingRelation, this, new SaveEventArgs<IRelation>(relation)))
+                var saveEventArgs = new SaveEventArgs<IRelation>(relation);
+                if (uow.Events.DispatchCancelable(SavingRelation, this, saveEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -576,7 +580,8 @@ namespace Umbraco.Core.Services
                 var repository = RepositoryFactory.CreateRelationRepository(uow);
                 repository.AddOrUpdate(relation);
                 uow.Commit();
-                uow.Events.Dispatch(SavedRelation, this, new SaveEventArgs<IRelation>(relation, false));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SavedRelation, this, saveEventArgs);
             }
         }
 
@@ -588,7 +593,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(SavingRelationType, this, new SaveEventArgs<IRelationType>(relationType)))
+                var saveEventArgs = new SaveEventArgs<IRelationType>(relationType);
+                if (uow.Events.DispatchCancelable(SavingRelationType, this, saveEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -596,7 +602,8 @@ namespace Umbraco.Core.Services
                 var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
                 repository.AddOrUpdate(relationType);
                 uow.Commit();
-                uow.Events.Dispatch(SavedRelationType, this, new SaveEventArgs<IRelationType>(relationType, false));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SavedRelationType, this, saveEventArgs);
             }
         }
 
@@ -608,7 +615,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(DeletingRelation, this, new DeleteEventArgs<IRelation>(relation)))
+                var deleteEventArgs = new DeleteEventArgs<IRelation>(relation);
+                if (uow.Events.DispatchCancelable(DeletingRelation, this, deleteEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -616,7 +624,8 @@ namespace Umbraco.Core.Services
                 var repository = RepositoryFactory.CreateRelationRepository(uow);
                 repository.Delete(relation);
                 uow.Commit();
-                uow.Events.Dispatch(DeletedRelation, this, new DeleteEventArgs<IRelation>(relation, false));
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedRelation, this, deleteEventArgs);
             }
         }
 
@@ -628,7 +637,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(DeletingRelationType, this, new DeleteEventArgs<IRelationType>(relationType)))
+                var deleteEventArgs = new DeleteEventArgs<IRelationType>(relationType);
+                if (uow.Events.DispatchCancelable(DeletingRelationType, this, deleteEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -636,7 +646,8 @@ namespace Umbraco.Core.Services
                 var repository = RepositoryFactory.CreateRelationTypeRepository(uow);
                 repository.Delete(relationType);
                 uow.Commit();
-                uow.Events.Dispatch(DeletedRelationType, this, new DeleteEventArgs<IRelationType>(relationType, false));
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedRelationType, this, deleteEventArgs);
             }
         }
 
diff --git a/src/Umbraco.Core/Services/UserService.cs b/src/Umbraco.Core/Services/UserService.cs
index 68aa66e231..d268581f69 100644
--- a/src/Umbraco.Core/Services/UserService.cs
+++ b/src/Umbraco.Core/Services/UserService.cs
@@ -178,7 +178,8 @@ namespace Umbraco.Core.Services
                 user.AddAllowedSection("content");
                 user.AddAllowedSection("media");
 
-                if (uow.Events.DispatchCancelable(SavingUser, this, new SaveEventArgs<IUser>(user)))
+                var saveEventArgs = new SaveEventArgs<IUser>(user);
+                if (uow.Events.DispatchCancelable(SavingUser, this, saveEventArgs))
                 {
                     uow.Commit();
                     return user;
@@ -186,8 +187,8 @@ namespace Umbraco.Core.Services
 
                 repository.AddOrUpdate(user);
                 uow.Commit();
-
-                uow.Events.Dispatch(SavedUser, this, new SaveEventArgs<IUser>(user, false));
+                saveEventArgs.CanCancel = false;
+                uow.Events.Dispatch(SavedUser, this, saveEventArgs);
 
                 return user;
             }
@@ -314,7 +315,8 @@ namespace Umbraco.Core.Services
             {
                 using (var uow = UowProvider.GetUnitOfWork())
                 {
-                    if (uow.Events.DispatchCancelable(DeletingUser, this, new DeleteEventArgs<IUser>(user)))
+                    var deleteEventArgs = new DeleteEventArgs<IUser>(user);
+                    if (uow.Events.DispatchCancelable(DeletingUser, this, deleteEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -322,7 +324,8 @@ namespace Umbraco.Core.Services
                     var repository = RepositoryFactory.CreateUserRepository(uow);
                     repository.Delete(user);
                     uow.Commit();
-                    uow.Events.Dispatch(DeletedUser, this, new DeleteEventArgs<IUser>(user, false));
+                    deleteEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(DeletedUser, this, deleteEventArgs);
                 }
             }
         }
@@ -337,7 +340,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (raiseEvents && uow.Events.DispatchCancelable(SavingUser, this, new SaveEventArgs<IUser>(entity)))
+                var saveEventArgs = new SaveEventArgs<IUser>(entity);
+                if (raiseEvents && uow.Events.DispatchCancelable(SavingUser, this, saveEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -363,7 +367,10 @@ namespace Umbraco.Core.Services
                     uow.Commit();
 
                     if (raiseEvents)
-                        uow.Events.Dispatch(SavedUser, this, new SaveEventArgs<IUser>(entity, false));
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(SavedUser, this, saveEventArgs);
+                    }
                 }
                 catch (DbException ex)
                 {
@@ -391,9 +398,10 @@ namespace Umbraco.Core.Services
             var asArray = entities.ToArray();
             using (var uow = UowProvider.GetUnitOfWork())
             {
+                var saveEventArgs = new SaveEventArgs<IUser>(asArray);
                 if (raiseEvents)
                 {
-                    if (uow.Events.DispatchCancelable(SavingUser, this, new SaveEventArgs<IUser>(asArray)))
+                    if (uow.Events.DispatchCancelable(SavingUser, this, saveEventArgs))
                     {
                         uow.Commit();
                         return;
@@ -416,7 +424,10 @@ namespace Umbraco.Core.Services
                 uow.Commit();
 
                 if (raiseEvents)
-                    uow.Events.Dispatch(SavedUser, this, new SaveEventArgs<IUser>(asArray, false));
+                {
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(SavedUser, this, saveEventArgs);
+                }
             }
 
 
@@ -719,7 +730,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (raiseEvents && uow.Events.DispatchCancelable(SavingUserType, this, new SaveEventArgs<IUserType>(userType)))
+                var saveEventArgs = new SaveEventArgs<IUserType>(userType);
+                if (raiseEvents && uow.Events.DispatchCancelable(SavingUserType, this, saveEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -729,7 +741,10 @@ namespace Umbraco.Core.Services
                 repository.AddOrUpdate(userType);
                 uow.Commit();
                 if (raiseEvents)
-                    uow.Events.Dispatch(SavedUserType, this, new SaveEventArgs<IUserType>(userType, false));
+                {
+                    saveEventArgs.CanCancel = false;
+                    uow.Events.Dispatch(SavedUserType, this, saveEventArgs);
+                }
             }
         }
 
@@ -741,7 +756,8 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                if (uow.Events.DispatchCancelable(DeletingUserType, this, new DeleteEventArgs<IUserType>(userType)))
+                var deleteEventArgs = new DeleteEventArgs<IUserType>(userType);
+                if (uow.Events.DispatchCancelable(DeletingUserType, this, deleteEventArgs))
                 {
                     uow.Commit();
                     return;
@@ -749,7 +765,8 @@ namespace Umbraco.Core.Services
                 var repository = RepositoryFactory.CreateUserTypeRepository(uow);
                 repository.Delete(userType);
                 uow.Commit();
-                uow.Events.Dispatch(DeletedUserType, this, new DeleteEventArgs<IUserType>(userType, false));
+                deleteEventArgs.CanCancel = false;
+                uow.Events.Dispatch(DeletedUserType, this, deleteEventArgs);
             }
         }
 

From 1dade7bfd28cc89e053be8242e2998757300466d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 24 Aug 2017 17:22:33 +1000
Subject: [PATCH 082/145] fixes tests

---
 src/Umbraco.Core/Events/MoveEventArgs.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Events/MoveEventArgs.cs b/src/Umbraco.Core/Events/MoveEventArgs.cs
index 1fd9c8671a..18c02ff46a 100644
--- a/src/Umbraco.Core/Events/MoveEventArgs.cs
+++ b/src/Umbraco.Core/Events/MoveEventArgs.cs
@@ -114,7 +114,7 @@ namespace Umbraco.Core.Events
             get { return _moveInfoCollection; }
             set
             {
-                var first = _moveInfoCollection.FirstOrDefault();
+                var first = value.FirstOrDefault();
                 if (first == null)
                 {
                     throw new InvalidOperationException("MoveInfoCollection must have at least one item");

From 93cd03da2839872e0fae9a97babd89c6b6546280 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 24 Aug 2017 18:38:40 +1000
Subject: [PATCH 083/145] minor code cleanup

---
 src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs | 10 ++++++++--
 src/Umbraco.Web/Cache/TemplateCacheRefresher.cs     | 10 ++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
index df25d9dfe0..beab3e6cf0 100644
--- a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
+++ b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
@@ -670,7 +670,10 @@ namespace Umbraco.Web.Cache
         /// <param name="e"></param>
         static void FileService_DeletedTemplate(IFileService sender, DeleteEventArgs<ITemplate> e)
         {
-            e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveTemplateCache(x.Id));
+            foreach (var x in e.DeletedEntities)
+            {
+                DistributedCache.Instance.RemoveTemplateCache(x.Id);
+            }
         }
 
         /// <summary>
@@ -680,7 +683,10 @@ namespace Umbraco.Web.Cache
         /// <param name="e"></param>
         static void FileService_SavedTemplate(IFileService sender, SaveEventArgs<ITemplate> e)
         {
-            e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshTemplateCache(x.Id));
+            foreach (var x in e.SavedEntities)
+            {
+                DistributedCache.Instance.RefreshTemplateCache(x.Id);
+            }
         }
 
         #endregion
diff --git a/src/Umbraco.Web/Cache/TemplateCacheRefresher.cs b/src/Umbraco.Web/Cache/TemplateCacheRefresher.cs
index 04f3d2b4fb..783d19a664 100644
--- a/src/Umbraco.Web/Cache/TemplateCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/TemplateCacheRefresher.cs
@@ -24,18 +24,12 @@ namespace Umbraco.Web.Cache
 
         public override string Name
         {
-            get
-            {
-                return "Template cache refresher";
-            }
+            get { return "Template cache refresher"; }
         }
 
         public override Guid UniqueIdentifier
         {
-            get
-            {
-                return new Guid(DistributedCache.TemplateRefresherId);
-            }
+            get { return DistributedCache.TemplateRefresherGuid; }
         }
 
         public override void Refresh(int id)

From e71e9d7efbd2398997a6d1548ee7d1a8af928253 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 18 Aug 2017 14:50:20 +1000
Subject: [PATCH 084/145] U4-10249 FolderAndFilePermissions HealthCheck causes
 the application to restart

(cherry picked from commit bdb991f6dc0598e2b33afb2385ad4f1be2c48502)
---
 .../FolderAndFilePermissionsCheck.cs          | 23 +++++++-
 .../Install/FilePermissionHelper.cs           | 57 ++++++++++++++++++-
 2 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
index 36e774287b..ff8c2646cc 100644
--- a/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
+++ b/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
@@ -59,12 +59,10 @@ namespace Umbraco.Web.HealthCheck.Checks.Permissions
             // in ALL circumstances or just some
             var pathsToCheck = new Dictionary<string, PermissionCheckRequirement>
             {
-                { SystemDirectories.AppCode, PermissionCheckRequirement.Optional },
                 { SystemDirectories.Data, PermissionCheckRequirement.Required },
                 { SystemDirectories.Packages, PermissionCheckRequirement.Required},
                 { SystemDirectories.Preview, PermissionCheckRequirement.Required },
                 { SystemDirectories.AppPlugins, PermissionCheckRequirement.Required },
-                { SystemDirectories.Bin, PermissionCheckRequirement.Optional },
                 { SystemDirectories.Config, PermissionCheckRequirement.Optional },
                 { SystemDirectories.Css, PermissionCheckRequirement.Optional },
                 { SystemDirectories.Masterpages, PermissionCheckRequirement.Optional },
@@ -77,12 +75,33 @@ namespace Umbraco.Web.HealthCheck.Checks.Permissions
                 { SystemDirectories.Xslt, PermissionCheckRequirement.Optional },
             };
 
+            //These are special paths to check that will restart an app domain if a file is written to them,
+            //so these need to be tested differently
+            var pathsToCheckWithRestarts = new Dictionary<string, PermissionCheckRequirement>
+            {
+                { SystemDirectories.AppCode, PermissionCheckRequirement.Optional },
+                { SystemDirectories.Bin, PermissionCheckRequirement.Optional }
+            };
+
             // Run checks for required and optional paths for modify permission
             List<string> requiredFailedPaths;
             List<string> optionalFailedPaths;
             var requiredPathCheckResult = FilePermissionHelper.TestDirectories(GetPathsToCheck(pathsToCheck, PermissionCheckRequirement.Required), out requiredFailedPaths);
             var optionalPathCheckResult = FilePermissionHelper.TestDirectories(GetPathsToCheck(pathsToCheck, PermissionCheckRequirement.Optional), out optionalFailedPaths);
 
+            //now check the special folders
+            List<string> requiredFailedPaths2;
+            List<string> optionalFailedPaths2;
+            var requiredPathCheckResult2 = FilePermissionHelper.TestDirectories(GetPathsToCheck(pathsToCheckWithRestarts, PermissionCheckRequirement.Required), out requiredFailedPaths2, writeCausesRestart:true);
+            var optionalPathCheckResult2 = FilePermissionHelper.TestDirectories(GetPathsToCheck(pathsToCheckWithRestarts, PermissionCheckRequirement.Optional), out optionalFailedPaths2, writeCausesRestart: true);
+
+            requiredPathCheckResult = requiredPathCheckResult && requiredPathCheckResult2;
+            optionalPathCheckResult = optionalPathCheckResult && optionalPathCheckResult2;
+
+            //combine the paths
+            requiredFailedPaths = requiredFailedPaths.Concat(requiredFailedPaths2).ToList();
+            optionalFailedPaths = requiredFailedPaths.Concat(optionalFailedPaths2).ToList();
+
             return GetStatus(requiredPathCheckResult, requiredFailedPaths, optionalPathCheckResult, optionalFailedPaths, PermissionCheckFor.Folder);
         }
 
diff --git a/src/Umbraco.Web/Install/FilePermissionHelper.cs b/src/Umbraco.Web/Install/FilePermissionHelper.cs
index 87491b93a8..a91bd6d306 100644
--- a/src/Umbraco.Web/Install/FilePermissionHelper.cs
+++ b/src/Umbraco.Web/Install/FilePermissionHelper.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.IO;
+using System.Security.AccessControl;
 using Umbraco.Core.IO;
 using umbraco;
 
@@ -37,8 +38,19 @@ namespace Umbraco.Web.Install
 
             return errorReport.Any() == false;
         }
-
-        public static bool TestDirectories(string[] directories, out List<string> errorReport)
+
+        /// <summary>
+        /// This will test the directories for write access
+        /// </summary>
+        /// <param name="directories"></param>
+        /// <param name="errorReport"></param>
+        /// <param name="writeCausesRestart">
+        /// If this is false, the easiest way to test for write access is to write a temp file, however some folder will cause
+        /// an App Domain restart if a file is written to the folder, so in that case we need to use the ACL APIs which aren't as
+        /// reliable but we cannot write a file since it will cause an app domain restart.
+        /// </param>
+        /// <returns></returns>
+        public static bool TestDirectories(string[] directories, out List<string> errorReport, bool writeCausesRestart = false)
         {
             errorReport = new List<string>();
             bool succes = true;
@@ -46,7 +58,11 @@ namespace Umbraco.Web.Install
             {
                 if (Directory.Exists(dir) == false) continue;
 
-                bool result = SaveAndDeleteFile(IOHelper.MapPath(dir + "/configWizardPermissionTest.txt"));
+                var folder = IOHelper.MapPath(dir);
+
+                var result = writeCausesRestart
+                    ? HasWritePermissionOnDir(folder)
+                    : SaveAndDeleteFile(Path.Combine(folder, "configWizardPermissionTest.txt"));
 
                 if (result == false)
                 {
@@ -131,7 +147,42 @@ namespace Umbraco.Web.Install
             {
                 return false;
             }
+        }
 
+        private static bool HasWritePermissionOnDir(string path)
+        {
+            var writeAllow = false;
+            var writeDeny = false;
+            var accessControlList = Directory.GetAccessControl(path);
+            if (accessControlList == null)
+                return false;
+            AuthorizationRuleCollection accessRules;
+            try
+            {
+                accessRules = accessControlList.GetAccessRules(true, true, typeof(System.Security.Principal.SecurityIdentifier));
+                if (accessRules == null)
+                    return false;
+            }
+            catch (Exception e)
+            {
+                //This is not 100% accurate btw because it could turn out that the current user doesn't
+                //have access to read the current permissions but does have write access.
+                //I think this is an edge case however
+                return false;
+            }
+
+            foreach (FileSystemAccessRule rule in accessRules)
+            {
+                if ((FileSystemRights.Write & rule.FileSystemRights) != FileSystemRights.Write)
+                    continue;
+
+                if (rule.AccessControlType == AccessControlType.Allow)
+                    writeAllow = true;
+                else if (rule.AccessControlType == AccessControlType.Deny)
+                    writeDeny = true;
+            }
+
+            return writeAllow && writeDeny == false;
         }
 
         private static bool OpenFileForWrite(string file)

From c468e4736e2753d410b860cfe0c5a3f51a687a7d Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Fri, 25 Aug 2017 14:19:25 +0200
Subject: [PATCH 085/145] bower name should be lowercase

---
 src/Umbraco.Web.UI.Client/bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json
index b539217338..dabd110ea9 100644
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -1,5 +1,5 @@
 {
-  "name": "Umbraco",
+  "name": "umbraco",
   "version": "7",
   "homepage": "https://github.com/umbraco/Umbraco-CMS",
   "authors": [

From 0089f79bd7d04ac17c787e1f0aa7c801f4cebe77 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Fri, 25 Aug 2017 14:22:42 +0200
Subject: [PATCH 086/145] add tasks for ngdocs

---
 src/Umbraco.Web.UI.Client/gulpfile.js  | 57 +++++++++++++++++++++++++-
 src/Umbraco.Web.UI.Client/package.json |  6 ++-
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index cb1883d3ed..9e32bb85de 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -6,17 +6,21 @@ var sourcemaps = require('gulp-sourcemaps');
 var wrap = require("gulp-wrap-js");
 var sort = require('gulp-sort');
 var uglify = require('gulp-uglify');
+var connect = require('gulp-connect');
+var open = require('gulp-open');
+var runSequence = require('run-sequence');
 
 var _ = require('lodash');
 var MergeStream = require('merge-stream');
 
-
 //Less + css
 var postcss = require('gulp-postcss');
 var less = require('gulp-less');
 var autoprefixer = require('autoprefixer');
 var cssnano = require('cssnano');
 
+// Documentation
+var gulpDocs = require('gulp-ngdocs');
 
 /***************************************************************
 Helper functions
@@ -280,4 +284,55 @@ gulp.task('watch', defaultTasks, function () {
     );
 
     return stream;    
+});
+
+/**************************
+ * Build Backoffice UI API documentation
+ **************************/
+gulp.task('docs', [], function (cb) {
+
+    var options = {
+        html5Mode: false,
+        startPage: '/api',
+        title: "Umbraco Backoffice UI API Documentation",
+        dest: 'docs/api',
+        styles: ['docs/umb-docs.css'],
+        image: "https://our.umbraco.org/assets/images/logo.svg"
+    }
+
+    return gulpDocs.sections({
+        api: {
+            glob: ['src/common/**/*.js', 'docs/src/api/**/*.ngdoc'],
+            api: true,
+            title: 'API Documentation'
+        }
+    })
+    .pipe(gulpDocs.process(options))
+    .pipe(gulp.dest('docs/api'));
+    cb();
+});
+
+gulp.task('connect:docs', function (cb) {
+    connect.server({
+        root: 'docs/api',
+        livereload: true,
+        fallback: 'docs/api/index.html',
+        port: 8880
+    });
+    cb();
+});
+
+gulp.task('open:docs', function (cb) {
+    
+    var options = {
+        uri: 'http://localhost:8880/index.html'
+    };
+
+    gulp.src(__filename)
+    .pipe(open(options));
+    cb();
+});
+
+gulp.task('docserve', function(cb) {
+    runSequence('docs', 'connect:docs', 'open:docs', cb);
 });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 89dcd3a0db..19b124cd07 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -26,7 +26,10 @@
     "cssnano": "^3.7.6",
     "gulp": "^3.9.1",
     "gulp-concat": "^2.6.0",
+    "gulp-connect": "^5.0.0",
     "gulp-less": "^3.1.0",
+    "gulp-ngdocs": "^0.3.0",
+    "gulp-open": "^2.0.0",
     "gulp-postcss": "^6.2.0",
     "gulp-rename": "^1.2.2",
     "gulp-sort": "^2.0.0",
@@ -40,6 +43,7 @@
     "karma-jasmine": "^1.1.0",
     "karma-phantomjs-launcher": "^1.0.4",
     "lodash": "^4.16.3",
-    "merge-stream": "^1.0.1"
+    "merge-stream": "^1.0.1",
+    "run-sequence": "^2.1.0"
   }
 }

From 9917fb20cafda619d54fc6be067c1a1b07fe7b48 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 25 Aug 2017 16:13:04 +0200
Subject: [PATCH 087/145] U4-10356 Update default Config/Lang after each update

Also makes sure UserExtensions returns the correct language
---
 src/Umbraco.Core/Models/UserExtensions.cs       | 5 +++--
 src/Umbraco.Web/Editors/BackOfficeController.cs | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs
index ece63b4889..a6f388addc 100644
--- a/src/Umbraco.Core/Models/UserExtensions.cs
+++ b/src/Umbraco.Core/Models/UserExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;
 
@@ -12,7 +13,7 @@ namespace Umbraco.Core.Models
         /// </summary>
         /// <param name="user"></param>
         /// <param name="textService"></param>
-        /// <returns></returns>      
+        /// <returns></returns>
         public static CultureInfo GetUserCulture(this IUser user, ILocalizedTextService textService)
         {
             if (user == null) throw new ArgumentNullException("user");
@@ -34,7 +35,7 @@ namespace Umbraco.Core.Models
             catch (CultureNotFoundException)
             {
                 //return the default one
-                return CultureInfo.GetCultureInfo("en");
+                return CultureInfo.GetCultureInfo(GlobalSettings.DefaultUILanguage);
             }
         }
 
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index f8419fef1e..66e80a76e2 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -113,7 +113,7 @@ namespace Umbraco.Web.Editors
                 ? Security.IsAuthenticated()
                     //current culture is set at the very beginning of each request
                     ? Thread.CurrentThread.CurrentCulture
-                    : CultureInfo.GetCultureInfo("en")
+                    : CultureInfo.GetCultureInfo(GlobalSettings.DefaultUILanguage)
                 : CultureInfo.GetCultureInfo(culture);
 
             var textForCulture = Services.TextService.GetAllStoredValues(cultureInfo)

From f2db0fe80e8cb98a5a87e0610cbcde1dbf5a9d8f Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 25 Aug 2017 22:00:41 +0200
Subject: [PATCH 088/145] U4-10358 Upgrade error from 7.1.8 to 7.6.5: The index
 'IX_umbracoNodeUniqueID' is dependent on column 'uniqueID'

Removes migration that would add wrongly named index to a table, only to immediately be removed again in 7.3.0
---
 .../AddIndexToUmbracoNodeTable.cs             | 46 -------------------
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 -
 2 files changed, 47 deletions(-)
 delete mode 100644 src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AddIndexToUmbracoNodeTable.cs

diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AddIndexToUmbracoNodeTable.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AddIndexToUmbracoNodeTable.cs
deleted file mode 100644
index 7d5109a1db..0000000000
--- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AddIndexToUmbracoNodeTable.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Linq;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.SqlSyntax;
-
-namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwoZero
-{
-    [Migration("7.2.0", 3, Constants.System.UmbracoMigrationName)]
-    public class AddIndexToUmbracoNodeTable : MigrationBase
-    {
-        private readonly bool _skipIndexCheck;
-
-        internal AddIndexToUmbracoNodeTable(ISqlSyntaxProvider sqlSyntax, ILogger logger, bool skipIndexCheck) : base(sqlSyntax, logger)
-        {
-            _skipIndexCheck = skipIndexCheck;
-        }
-
-        public AddIndexToUmbracoNodeTable(ISqlSyntaxProvider sqlSyntax, ILogger logger) : base(sqlSyntax, logger)
-        {
-        }
-
-        public override void Up()
-        {
-            var dbIndexes = _skipIndexCheck ? new DbIndexDefinition[] { } : SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition
-                {
-                    TableName = x.Item1,
-                    IndexName = x.Item2,
-                    ColumnName = x.Item3,
-                    IsUnique = x.Item4
-                }).ToArray();
-
-            //make sure it doesn't already exist
-            if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoNodeUniqueID")) == false)
-            {
-				Create.Index("IX_umbracoNodeUniqueID").OnTable("umbracoNode").OnColumn("uniqueID").Ascending().WithOptions().NonClustered();
-            }
-        }
-
-        public override void Down()
-        {
-            Delete.Index("IX_umbracoNodeUniqueID").OnTable("umbracoNode");
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 228905226f..fcc2e5bb70 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -765,7 +765,6 @@
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwoZero\AddMissingForeignKeyForContentType.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwoZero\AlterDataTypePreValueTable.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenOneZero\AssignMissingPrimaryForMySqlKeys.cs" />
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwoZero\AddIndexToUmbracoNodeTable.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwoZero\RemoveCmsDocumentAliasColumn.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSeven\AssignMissingKeysAndIndexes.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSixTwoZero\AssignMissingPrimaryForMySqlKeys.cs" />

From 5cbe2b6ce09116f50237a5cd845d47b2aff9716a Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Mon, 28 Aug 2017 14:41:54 +0200
Subject: [PATCH 089/145] Add tasks for karma testing

---
 src/Umbraco.Web.UI.Client/gulpfile.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index 9e32bb85de..bae17d3da1 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -22,6 +22,9 @@ var cssnano = require('cssnano');
 // Documentation
 var gulpDocs = require('gulp-ngdocs');
 
+// Testing
+var karmaServer = require('karma').Server;
+
 /***************************************************************
 Helper functions
 ***************************************************************/
@@ -335,4 +338,25 @@ gulp.task('open:docs', function (cb) {
 
 gulp.task('docserve', function(cb) {
     runSequence('docs', 'connect:docs', 'open:docs', cb);
+});
+
+/**************************
+ * Build tests
+ **************************/
+
+ // Karma test
+gulp.task('test:unit', function() {
+    new karmaServer({
+        configFile: __dirname + "/test/config/karma.conf.js",
+        keepalive: true 
+    })
+    .start();
+});
+
+gulp.task('test:e2e', function() {
+    new karmaServer({
+        configFile: __dirname + "/test/config/e2e.js",
+        keepalive: true 
+    })
+    .start();
 });
\ No newline at end of file

From aa5d7fc9fc66318b28831d1c05f26214e57c7042 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Mon, 28 Aug 2017 15:42:31 +0200
Subject: [PATCH 090/145] only use source maps when developing

---
 src/Umbraco.Web.UI.Client/gulpfile.js  | 58 +++++++++++++++++++-------
 src/Umbraco.Web.UI.Client/package.json |  1 +
 2 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index bae17d3da1..28c45317ca 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -9,6 +9,7 @@ var uglify = require('gulp-uglify');
 var connect = require('gulp-connect');
 var open = require('gulp-open');
 var runSequence = require('run-sequence');
+var gulpif = require('gulp-if');
 
 var _ = require('lodash');
 var MergeStream = require('merge-stream');
@@ -28,15 +29,15 @@ var karmaServer = require('karma').Server;
 /***************************************************************
 Helper functions
 ***************************************************************/
-function processJs(files, out) {
+function processJs(files, out, makeSourcemaps) {
     
     return gulp.src(files)
      .pipe(sort())
-     .pipe(sourcemaps.init())
+     .pipe(gulpif(makeSourcemaps, sourcemaps.init()))
      .pipe(concat(out))
      .pipe(wrap('(function(){\n%= body %\n})();'))
      .pipe(uglify({ mangle: false }))
-     .pipe(sourcemaps.write())
+     .pipe(gulpif(makeSourcemaps, sourcemaps.write()))
      .pipe(gulp.dest(root + targets.js));
 
      console.log(out + " compiled");
@@ -117,11 +118,23 @@ var targets = {
 
 
 /**************************
- * Runs the default tasks for the project to prepare backoffice files
+ * Main tasks for the project to prepare backoffice files
  **************************/
-var defaultTasks = ["dependencies","js", "less", "views"];
-gulp.task("default", defaultTasks);
 
+ // Build - build the files ready for production
+gulp.task('build', function(cb) {
+    runSequence(["dependencies", "js:production", "less", "views"], "test:unit", cb);
+});
+
+// Dev - build the files ready for development and start watchers
+gulp.task('dev', function(cb) {
+    runSequence(["dependencies", "js:development", "less", "views"], "watch", cb);
+});
+
+// Docserve - build and open the back office documentation
+gulp.task('docserve', function(cb) {
+    runSequence('docs', 'connect:docs', 'open:docs', cb);
+});
 
 /**************************
  * Task processes and copies all dependencies, either installed by bower, npm or stored locally in the project
@@ -195,7 +208,7 @@ gulp.task('dependencies', function () {
 /**************************
  * Copies all angular JS files into their seperate umbraco.*.js file
  **************************/
-gulp.task('js', function () { 
+gulp.task('js:production', function () { 
   
     //we run multiple streams, so merge them all together
     var stream = new MergeStream();
@@ -206,12 +219,29 @@ gulp.task('js', function () {
         );
 
      _.forEach(sources.js, function (group) {
-        stream.add (processJs(group.files, group.out) );
+        stream.add (processJs(group.files, group.out, false) );
      });
 
      return stream;
 });
 
+gulp.task('js:development', function () { 
+    
+    //we run multiple streams, so merge them all together
+    var stream = new MergeStream();
+
+    stream.add(
+        gulp.src(sources.globs.js)
+            .pipe(gulp.dest(root + targets.js))
+        );
+
+    _.forEach(sources.js, function (group) {
+        stream.add (processJs(group.files, group.out, true) );
+    });
+
+    return stream;
+});
+
 gulp.task('less', function () {
     
     var stream = new MergeStream();
@@ -243,7 +273,7 @@ gulp.task('views', function () {
 });
 
 
-gulp.task('watch', defaultTasks, function () {
+gulp.task('watch', function () {
 
     var stream = new MergeStream();
 
@@ -286,7 +316,7 @@ gulp.task('watch', defaultTasks, function () {
         .pipe(gulp.dest(root + targets.js))
     );
 
-    return stream;    
+    return stream;
 });
 
 /**************************
@@ -336,10 +366,6 @@ gulp.task('open:docs', function (cb) {
     cb();
 });
 
-gulp.task('docserve', function(cb) {
-    runSequence('docs', 'connect:docs', 'open:docs', cb);
-});
-
 /**************************
  * Build tests
  **************************/
@@ -348,7 +374,7 @@ gulp.task('docserve', function(cb) {
 gulp.task('test:unit', function() {
     new karmaServer({
         configFile: __dirname + "/test/config/karma.conf.js",
-        keepalive: true 
+        keepalive: true
     })
     .start();
 });
@@ -356,7 +382,7 @@ gulp.task('test:unit', function() {
 gulp.task('test:e2e', function() {
     new karmaServer({
         configFile: __dirname + "/test/config/e2e.js",
-        keepalive: true 
+        keepalive: true
     })
     .start();
 });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 19b124cd07..d2a5b6ac41 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -27,6 +27,7 @@
     "gulp": "^3.9.1",
     "gulp-concat": "^2.6.0",
     "gulp-connect": "^5.0.0",
+    "gulp-if": "^2.0.2",
     "gulp-less": "^3.1.0",
     "gulp-ngdocs": "^0.3.0",
     "gulp-open": "^2.0.0",

From 6bf0d6e1755309651a84c8b25b71d29e82bfb4f8 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 28 Aug 2017 20:36:56 +0200
Subject: [PATCH 091/145] U4-10363 417 missing token error due to invalid
 cookie name

Manually parse the cookie header instead of using the buggy extension method
---
 .../Filters/AngularAntiForgeryHelper.cs       | 46 ++++++++++++++-----
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs b/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs
index 962183f7ef..0f2a7ac442 100644
--- a/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs
+++ b/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
-using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Web.Helpers;
 using Umbraco.Core;
@@ -30,8 +28,6 @@ namespace Umbraco.Web.WebApi.Filters
         /// </summary>
         public const string AngularHeadername = "X-XSRF-TOKEN";
 
-        
-
         /// <summary>
         /// Returns 2 tokens - one for the cookie value and one that angular should set as the header value
         /// </summary>
@@ -68,8 +64,8 @@ namespace Umbraco.Web.WebApi.Filters
             return true;
         }
 
-        internal static bool ValidateHeaders(            
-            KeyValuePair<string, IEnumerable<string>>[] requestHeaders, 
+        internal static bool ValidateHeaders(
+            KeyValuePair<string, IEnumerable<string>>[] requestHeaders,
             string cookieToken,
             out string failedReason)
         {
@@ -86,7 +82,7 @@ namespace Umbraco.Web.WebApi.Filters
                 .Select(z => z.Value)
                 .SelectMany(z => z)
                 .FirstOrDefault();
-            
+
             // both header and cookie must be there
             if (cookieToken == null || headerToken == null)
             {
@@ -111,15 +107,41 @@ namespace Umbraco.Web.WebApi.Filters
         /// <returns></returns>
         public static bool ValidateHeaders(HttpRequestHeaders requestHeaders, out string failedReason)
         {
-            var cookieToken = requestHeaders
-                .GetCookies()
-                .Select(c => c[CsrfValidationCookieName])
-                .FirstOrDefault();
+            var cookieToken = GetCookie(requestHeaders, CsrfValidationCookieName);
 
             return ValidateHeaders(
                 requestHeaders.ToDictionary(x => x.Key, x => x.Value).ToArray(),
-                cookieToken == null ? null : cookieToken.Value,
+                cookieToken == null ? null : cookieToken,
                 out failedReason);
         }
+
+        /// <summary>
+        /// Retrieves an individual cookie from the cookies collection
+        /// Adapted from: https://stackoverflow.com/a/29057304/5018
+        /// </summary>
+        /// <param name="requestHeaders"></param>
+        /// <param name="cookieName"></param>
+        /// <returns></returns>
+        private static string GetCookie(HttpRequestHeaders requestHeaders, string cookieName)
+        {
+            var cookieRequestHeader = requestHeaders.Where(h => h.Key.Equals("Cookie", StringComparison.InvariantCultureIgnoreCase)).ToArray();
+            if (cookieRequestHeader.Any() == false)
+                return null;
+
+            var cookiesHeader = cookieRequestHeader.FirstOrDefault();
+            if (cookiesHeader.Value == null)
+                return null;
+
+            var cookiesHeaderValue = cookiesHeader.Value.FirstOrDefault();
+            if (cookiesHeaderValue == null)
+                return null;
+
+            var cookieCollection = cookiesHeaderValue.Split(';');
+            var cookiePair = cookieCollection.FirstOrDefault(c => c.Trim().StartsWith(cookieName, StringComparison.InvariantCultureIgnoreCase));
+            if (cookiePair == null)
+                return null;
+
+            return cookiePair.Trim().Substring(cookieName.Length + 1);
+        }
     }
 }
\ No newline at end of file

From d71b8a139fb692261cedffc92396ef0ec1849931 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Aug 2017 10:50:20 +1000
Subject: [PATCH 092/145] Moves GetCookieValue to an extension method, cleans
 up code, adds unit tests

---
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  1 +
 .../Web/HttpCookieExtensionsTests.cs          | 44 +++++++++++++++++++
 src/Umbraco.Web/HttpCookieExtensions.cs       | 37 ++++++++++++++++
 .../Filters/AngularAntiForgeryHelper.cs       | 32 +-------------
 4 files changed, 84 insertions(+), 30 deletions(-)
 create mode 100644 src/Umbraco.Tests/Web/HttpCookieExtensionsTests.cs

diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index ebee151364..39ad21f15c 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -212,6 +212,7 @@
     <Compile Include="Collections\DeepCloneableListTests.cs" />
     <Compile Include="Web\Controllers\BackOfficeControllerUnitTests.cs" />
     <Compile Include="DelegateExtensionsTests.cs" />
+    <Compile Include="Web\HttpCookieExtensionsTests.cs" />
     <Compile Include="Web\Mvc\RenderIndexActionSelectorAttributeTests.cs" />
     <Compile Include="Persistence\Repositories\AuditRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\DomainRepositoryTest.cs" />
diff --git a/src/Umbraco.Tests/Web/HttpCookieExtensionsTests.cs b/src/Umbraco.Tests/Web/HttpCookieExtensionsTests.cs
new file mode 100644
index 0000000000..f13b94a669
--- /dev/null
+++ b/src/Umbraco.Tests/Web/HttpCookieExtensionsTests.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Web;
+
+namespace Umbraco.Tests.Web
+{
+    [TestFixture]
+    public class HttpCookieExtensionsTests
+    {
+        [TestCase("hello=world;cookies=are fun;", "hello", "world", true)]
+        [TestCase("HELlo=world;cookies=are fun", "hello", "world", true)]
+        [TestCase("HELlo= world;cookies=are fun", "hello", "world", true)]
+        [TestCase("HELlo =world;cookies=are fun", "hello", "world", true)]
+        [TestCase("hello = world;cookies=are fun;", "hello", "world", true)]
+        [TestCase("hellos=world;cookies=are fun", "hello", "world", false)]
+        [TestCase("hello=world;cookies?=are fun?", "hello", "world", true)]
+        [TestCase("hel?lo=world;cookies=are fun?", "hel?lo", "world", true)]
+        public void Get_Cookie_Value_From_HttpRequestHeaders(string cookieHeaderVal, string cookieName, string cookieVal, bool matches)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://test.com");
+            var requestHeaders = request.Headers;
+            requestHeaders.Add("Cookie", cookieHeaderVal);
+
+            var valueFromHeader = requestHeaders.GetCookieValue(cookieName);
+
+            if (matches)
+            {
+                Assert.IsNotNull(valueFromHeader);
+                Assert.AreEqual(cookieVal, valueFromHeader);
+            }
+            else
+            {
+                Assert.IsNull(valueFromHeader);
+            }                
+        }
+    }
+}
diff --git a/src/Umbraco.Web/HttpCookieExtensions.cs b/src/Umbraco.Web/HttpCookieExtensions.cs
index 7aec1466da..d67e1894fd 100644
--- a/src/Umbraco.Web/HttpCookieExtensions.cs
+++ b/src/Umbraco.Web/HttpCookieExtensions.cs
@@ -16,6 +16,43 @@ namespace Umbraco.Web
     /// </remarks> 
     internal static class HttpCookieExtensions
     {
+        /// <summary>
+        /// Retrieves an individual cookie from the cookies collection
+        /// </summary>
+        /// <param name="requestHeaders"></param>
+        /// <param name="cookieName"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Adapted from: https://stackoverflow.com/a/29057304/5018 because there's an issue with .NET WebApi cookie parsing logic 
+        /// when using requestHeaders.GetCookies() when an invalid cookie name is present.
+        /// </remarks>
+        public static string GetCookieValue(this HttpRequestHeaders requestHeaders, string cookieName)
+        {
+            var cookieRequestHeader = requestHeaders
+                .Where(h => h.Key.Equals("Cookie", StringComparison.InvariantCultureIgnoreCase))
+                .ToArray();
+
+            if (cookieRequestHeader.Length == 0)
+                return null;
+
+            var cookiesHeader = cookieRequestHeader[0];
+            
+            var cookiesHeaderValue = cookiesHeader.Value.FirstOrDefault();
+            if (cookiesHeaderValue == null)
+                return null;
+
+            var cookieCollection = cookiesHeaderValue.Split(new[] {';'}, StringSplitOptions.RemoveEmptyEntries);
+            foreach (var cookieNameValue in cookieCollection)
+            {
+                var parts = cookieNameValue.Split(new[] {'='}, StringSplitOptions.RemoveEmptyEntries);
+                if (parts.Length != 2) continue;
+                if (parts[0].Trim().InvariantEquals(cookieName))
+                    return parts[1].Trim();
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Removes the cookie from the request and the response if it exists
         /// </summary>
diff --git a/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs b/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs
index 0f2a7ac442..b83b4114a3 100644
--- a/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs
+++ b/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs
@@ -107,41 +107,13 @@ namespace Umbraco.Web.WebApi.Filters
         /// <returns></returns>
         public static bool ValidateHeaders(HttpRequestHeaders requestHeaders, out string failedReason)
         {
-            var cookieToken = GetCookie(requestHeaders, CsrfValidationCookieName);
+            var cookieToken = requestHeaders.GetCookieValue(CsrfValidationCookieName);
 
             return ValidateHeaders(
                 requestHeaders.ToDictionary(x => x.Key, x => x.Value).ToArray(),
                 cookieToken == null ? null : cookieToken,
                 out failedReason);
         }
-
-        /// <summary>
-        /// Retrieves an individual cookie from the cookies collection
-        /// Adapted from: https://stackoverflow.com/a/29057304/5018
-        /// </summary>
-        /// <param name="requestHeaders"></param>
-        /// <param name="cookieName"></param>
-        /// <returns></returns>
-        private static string GetCookie(HttpRequestHeaders requestHeaders, string cookieName)
-        {
-            var cookieRequestHeader = requestHeaders.Where(h => h.Key.Equals("Cookie", StringComparison.InvariantCultureIgnoreCase)).ToArray();
-            if (cookieRequestHeader.Any() == false)
-                return null;
-
-            var cookiesHeader = cookieRequestHeader.FirstOrDefault();
-            if (cookiesHeader.Value == null)
-                return null;
-
-            var cookiesHeaderValue = cookiesHeader.Value.FirstOrDefault();
-            if (cookiesHeaderValue == null)
-                return null;
-
-            var cookieCollection = cookiesHeaderValue.Split(';');
-            var cookiePair = cookieCollection.FirstOrDefault(c => c.Trim().StartsWith(cookieName, StringComparison.InvariantCultureIgnoreCase));
-            if (cookiePair == null)
-                return null;
-
-            return cookiePair.Trim().Substring(cookieName.Length + 1);
-        }
+        
     }
 }
\ No newline at end of file

From ca0024623691bfaa67599d0a40f25491b2109a69 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Aug 2017 11:10:28 +1000
Subject: [PATCH 093/145] another update to perform a little better again
 (cookies are read VERY often)

---
 src/Umbraco.Web/HttpCookieExtensions.cs | 35 +++++++++++--------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Web/HttpCookieExtensions.cs b/src/Umbraco.Web/HttpCookieExtensions.cs
index d67e1894fd..d2133927a0 100644
--- a/src/Umbraco.Web/HttpCookieExtensions.cs
+++ b/src/Umbraco.Web/HttpCookieExtensions.cs
@@ -28,26 +28,23 @@ namespace Umbraco.Web
         /// </remarks>
         public static string GetCookieValue(this HttpRequestHeaders requestHeaders, string cookieName)
         {
-            var cookieRequestHeader = requestHeaders
-                .Where(h => h.Key.Equals("Cookie", StringComparison.InvariantCultureIgnoreCase))
-                .ToArray();
-
-            if (cookieRequestHeader.Length == 0)
-                return null;
-
-            var cookiesHeader = cookieRequestHeader[0];
-            
-            var cookiesHeaderValue = cookiesHeader.Value.FirstOrDefault();
-            if (cookiesHeaderValue == null)
-                return null;
-
-            var cookieCollection = cookiesHeaderValue.Split(new[] {';'}, StringSplitOptions.RemoveEmptyEntries);
-            foreach (var cookieNameValue in cookieCollection)
+            foreach (var header in requestHeaders)
             {
-                var parts = cookieNameValue.Split(new[] {'='}, StringSplitOptions.RemoveEmptyEntries);
-                if (parts.Length != 2) continue;
-                if (parts[0].Trim().InvariantEquals(cookieName))
-                    return parts[1].Trim();
+                if (header.Key.Equals("Cookie", StringComparison.InvariantCultureIgnoreCase) == false)
+                    continue;
+                
+                var cookiesHeaderValue = header.Value.FirstOrDefault();
+                if (cookiesHeaderValue == null)
+                    return null;
+
+                var cookieCollection = cookiesHeaderValue.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var cookieNameValue in cookieCollection)
+                {
+                    var parts = cookieNameValue.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntries);
+                    if (parts.Length != 2) continue;
+                    if (parts[0].Trim().Equals(cookieName, StringComparison.InvariantCultureIgnoreCase))
+                        return parts[1].Trim();
+                }
             }
 
             return null;

From 13e2112c3c02f57a2dad3cb265b24d5871181954 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Aug 2017 11:56:38 +1000
Subject: [PATCH 094/145] U4-10361 Creating new member when
 `AllowManuallyChangingPassword="false"` - can't set a password

---
 src/Umbraco.Core/Constants-Security.cs        |  2 +
 .../Models/Identity/IdentityModelMappings.cs  |  2 +-
 .../Repositories/MemberRepository.cs          | 15 ++++++-
 .../Security/BackOfficeUserStore.cs           |  2 +-
 .../Security/MembershipProviderBase.cs        | 40 +++++++++++++++----
 src/Umbraco.Core/Services/IMemberService.cs   | 12 ++++--
 .../Services/MemberServiceTests.cs            | 33 +++++++++++++++
 .../TestHelpers/Entities/MockedMember.cs      | 23 +++++++++++
 .../Providers/MembersMembershipProvider.cs    |  7 ++++
 9 files changed, 122 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Core/Constants-Security.cs b/src/Umbraco.Core/Constants-Security.cs
index bd2e1c5acf..e4f2e5b4a8 100644
--- a/src/Umbraco.Core/Constants-Security.cs
+++ b/src/Umbraco.Core/Constants-Security.cs
@@ -14,6 +14,8 @@ namespace Umbraco.Core
             public const string BackOfficeTokenAuthenticationType = "UmbracoBackOfficeToken";
             public const string BackOfficeTwoFactorAuthenticationType = "UmbracoTwoFactorCookie";
 
+            internal const string EmptyPasswordPrefix = "___UIDEMPTYPWORD__";
+
             /// <summary>
             /// The prefix used for external identity providers for their authentication type
             /// </summary>
diff --git a/src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs b/src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
index fab34e5f17..78b58fc0d6 100644
--- a/src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
+++ b/src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Core.Models.Identity
 
         private string GetPasswordHash(string storedPass)
         {
-            return storedPass.StartsWith("___UIDEMPTYPWORD__") ? null : storedPass;
+            return storedPass.StartsWith(Constants.Security.EmptyPasswordPrefix) ? null : storedPass;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
index 2ef795282b..74c8b45621 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
@@ -4,6 +4,7 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
+using Microsoft.AspNet.Identity;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.EntityBase;
@@ -230,7 +231,19 @@ namespace Umbraco.Core.Persistence.Repositories
             Database.Insert(dto.ContentVersionDto);
 
             //Create the first entry in cmsMember
-            dto.NodeId = nodeDto.NodeId;
+            dto.NodeId = nodeDto.NodeId;
+
+            //if the password is empty, generate one with the special prefix
+            //this will hash the guid with a salt so should be nicely random
+            if (entity.RawPasswordValue.IsNullOrWhiteSpace())
+            {
+                var aspHasher = new PasswordHasher();
+                dto.Password = Constants.Security.EmptyPasswordPrefix +
+                               aspHasher.HashPassword(Guid.NewGuid().ToString("N"));
+                //re-assign
+                entity.RawPasswordValue = dto.Password;
+            }
+
             Database.Insert(dto);
 
             //Create the PropertyData for this version - cmsPropertyData
diff --git a/src/Umbraco.Core/Security/BackOfficeUserStore.cs b/src/Umbraco.Core/Security/BackOfficeUserStore.cs
index 7d5774c870..bb5fc0cabd 100644
--- a/src/Umbraco.Core/Security/BackOfficeUserStore.cs
+++ b/src/Umbraco.Core/Security/BackOfficeUserStore.cs
@@ -93,7 +93,7 @@ namespace Umbraco.Core.Security
             {
                 //this will hash the guid with a salt so should be nicely random
                 var aspHasher = new PasswordHasher();
-                member.RawPasswordValue = "___UIDEMPTYPWORD__" +
+                member.RawPasswordValue = Constants.Security.EmptyPasswordPrefix +
                     aspHasher.HashPassword(Guid.NewGuid().ToString("N"));
 
             }
diff --git a/src/Umbraco.Core/Security/MembershipProviderBase.cs b/src/Umbraco.Core/Security/MembershipProviderBase.cs
index 4d4dad3fe8..2cef4a9aab 100644
--- a/src/Umbraco.Core/Security/MembershipProviderBase.cs
+++ b/src/Umbraco.Core/Security/MembershipProviderBase.cs
@@ -64,6 +64,19 @@ namespace Umbraco.Core.Security
         {
             get { return false; }
         }
+
+        /// <summary>
+        /// Returns the raw password value for a given user
+        /// </summary>
+        /// <param name="username"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// By default this will return an invalid attempt, inheritors will need to override this to support it
+        /// </remarks>
+        protected virtual Attempt<string> GetRawPassword(string username)
+        {
+            return Attempt<string>.Fail();
+        }
 
         private string _applicationName;
         private bool _enablePasswordReset;
@@ -299,7 +312,7 @@ namespace Umbraco.Core.Security
         /// Processes a request to update the password for a membership user.
         /// </summary>
         /// <param name="username">The user to update the password for.</param>
-        /// <param name="oldPassword">This property is ignore for this provider</param>
+        /// <param name="oldPassword">Required to change a user password if the user is not new and AllowManuallyChangingPassword is false</param>
         /// <param name="newPassword">The new password for the specified user.</param>
         /// <returns>
         /// true if the password was updated successfully; otherwise, false.
@@ -309,10 +322,17 @@ namespace Umbraco.Core.Security
         /// </remarks>       
         public override bool ChangePassword(string username, string oldPassword, string newPassword)
         {
+            string rawPasswordValue = string.Empty;
             if (oldPassword.IsNullOrWhiteSpace() && AllowManuallyChangingPassword == false)
-            {
-                //If the old password is empty and AllowManuallyChangingPassword is false, than this provider cannot just arbitrarily change the password
-                throw new NotSupportedException("This provider does not support manually changing the password");
+            {
+                //we need to lookup the member since this could be a brand new member without a password set
+                var rawPassword = GetRawPassword(username);
+                rawPasswordValue = rawPassword.Success ? rawPassword.Result : string.Empty;
+                if (rawPassword.Success == false || rawPasswordValue.StartsWith(Constants.Security.EmptyPasswordPrefix) == false)
+                {
+                    //If the old password is empty and AllowManuallyChangingPassword is false, than this provider cannot just arbitrarily change the password
+                    throw new NotSupportedException("This provider does not support manually changing the password");
+                }
             }
 
             var args = new ValidatePasswordEventArgs(username, newPassword, false);
@@ -325,10 +345,14 @@ namespace Umbraco.Core.Security
                 throw new MembershipPasswordException("Change password canceled due to password validation failure.");
             }
 
-            //Special case to allow changing password without validating existing credentials
-            //This is used during installation only
-            if (AllowManuallyChangingPassword == false && ApplicationContext.Current != null
-                && ApplicationContext.Current.IsConfigured == false && oldPassword == "default")
+            //Special cases to allow changing password without validating existing credentials
+            // * the member is new and doesn't have a password set
+            // * during installation to set the admin password
+            if (AllowManuallyChangingPassword == false
+                && (rawPasswordValue.StartsWith(Constants.Security.EmptyPasswordPrefix)
+                    || (ApplicationContext.Current != null
+                        && ApplicationContext.Current.IsConfigured == false
+                        && oldPassword == "default")))
             {
                 return PerformChangePassword(username, oldPassword, newPassword);
             }
diff --git a/src/Umbraco.Core/Services/IMemberService.cs b/src/Umbraco.Core/Services/IMemberService.cs
index 38f53f2d68..9153d23da9 100644
--- a/src/Umbraco.Core/Services/IMemberService.cs
+++ b/src/Umbraco.Core/Services/IMemberService.cs
@@ -119,10 +119,16 @@ namespace Umbraco.Core.Services
         IMember CreateMemberWithIdentity(string username, string email, string name, IMemberType memberType);
 
         /// <summary>
-        /// This is simply a helper method which essentially just wraps the MembershipProvider's ChangePassword method
+        /// This is simply a helper method which essentially just wraps the MembershipProvider's ChangePassword method which can be 
+        /// used during Member creation.
         /// </summary>
-        /// <remarks>This method exists so that Umbraco developers can use one entry point to create/update 
-        /// Members if they choose to. </remarks>
+        /// <remarks>
+        /// This method exists so that Umbraco developers can use this entry point to set a password when Creating members ...
+        /// this will not work for updating members in most cases (depends on your membership provider settings)
+        /// 
+        /// It is preferred to use the membership APIs for working with passwords, in the near future this method will be obsoleted
+        /// and the ASP.NET Identity APIs should be used instead.
+        /// </remarks>
         /// <param name="member">The Member to save the password for</param>
         /// <param name="password">The password to encrypt and save</param>
         void SavePassword(IMember member, string password);
diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs
index e5ccee5576..b2c0f63d5f 100644
--- a/src/Umbraco.Tests/Services/MemberServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs
@@ -34,6 +34,39 @@ namespace Umbraco.Tests.Services
             base.TearDown();
         }
 
+        [Test]
+        public void Can_Set_Password_On_New_Member()
+        {
+            IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
+            ServiceContext.MemberTypeService.Save(memberType);
+            //this will construct a member without a password
+            var member = MockedMember.CreateSimpleMember(memberType, "test", "test@test.com", "test");
+            ServiceContext.MemberService.Save(member);
+
+            Assert.IsTrue(member.RawPasswordValue.StartsWith(Constants.Security.EmptyPasswordPrefix));
+
+            ServiceContext.MemberService.SavePassword(member, "hello123456$!");
+            
+            var foundMember = ServiceContext.MemberService.GetById(member.Id);
+            Assert.IsNotNull(foundMember);
+            Assert.AreNotEqual("hello123456$!", foundMember.RawPasswordValue);
+            Assert.IsFalse(member.RawPasswordValue.StartsWith(Constants.Security.EmptyPasswordPrefix));
+        }
+
+        [Test]
+        public void Can_Not_Set_Password_On_Existing_Member()
+        {
+            IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
+            ServiceContext.MemberTypeService.Save(memberType);
+            //this will construct a member with a password
+            var member = MockedMember.CreateSimpleMember(memberType, "test", "test@test.com", "hello123456$!", "test");
+            ServiceContext.MemberService.Save(member);
+
+            Assert.IsFalse(member.RawPasswordValue.StartsWith(Constants.Security.EmptyPasswordPrefix));
+
+            Assert.Throws<NotSupportedException>(() => ServiceContext.MemberService.SavePassword(member, "HELLO123456$!"));
+        }
+
         [Test]
         public void Can_Create_Member()
         {
diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs b/src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
index 7308c5c01e..b58c10031d 100644
--- a/src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
+++ b/src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
@@ -31,6 +31,29 @@ namespace Umbraco.Tests.TestHelpers.Entities
             return member;
         }
 
+        public static Member CreateSimpleMember(IMemberType contentType, string name, string email, string username, Guid? key = null)
+        {
+            var member = new Member(name, email, username, contentType)
+            {
+                CreatorId = 0,
+                Email = email,
+                Username = username
+            };
+
+            if (key.HasValue)
+            {
+                member.Key = key.Value;
+            }
+
+            member.SetValue("title", name + " member");
+            member.SetValue("bodyText", "This is a subpage");
+            member.SetValue("author", "John Doe");
+
+            member.ResetDirtyProperties(false);
+
+            return member;
+        }
+
         public static IEnumerable<IMember> CreateSimpleMember(IMemberType memberType, int amount, Action<int, IMember> onCreating = null)
         {
             var list = new List<IMember>();
diff --git a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
index 4576b36da9..88bc36c8d7 100644
--- a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
@@ -89,6 +89,13 @@ namespace Umbraco.Web.Security.Providers
             }
         }
 
+        protected override Attempt<string> GetRawPassword(string username)
+        {
+            var found = MemberService.GetByUsername(username);
+            if (found == null) return Attempt<string>.Fail();
+            return Attempt.Succeed(found.RawPasswordValue);
+        }
+
         public override string DefaultMemberTypeAlias
         {
             get

From a95afa610ff6e883182891e97245ba3da8271099 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Aug 2017 12:01:32 +1000
Subject: [PATCH 095/145] updates unit test config to work with new unit tests

---
 src/Umbraco.Tests/App.config | 88 ++++++++++--------------------------
 1 file changed, 23 insertions(+), 65 deletions(-)

diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
index 84256a1e9b..deac14ef8c 100644
--- a/src/Umbraco.Tests/App.config
+++ b/src/Umbraco.Tests/App.config
@@ -2,12 +2,12 @@
 <configuration>
   <configSections>
 
-    <sectionGroup name="umbracoConfiguration">    
+    <sectionGroup name="umbracoConfiguration">
       <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" />
     </sectionGroup>
-    
+
   </configSections>
-  
+
   <umbracoConfiguration>
     <FileSystemProviders>
       <Provider alias="media" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
@@ -52,7 +52,7 @@
       </Provider>
     </FileSystemProviders>
   </umbracoConfiguration>
-  
+
   <appSettings>
     <add key="umbracoConfigurationStatus" value="6.0.0" />
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
@@ -64,7 +64,7 @@
     <add key="umbracoDefaultUILanguage" value="en" />
     <add key="umbracoUseSSL" value="false" />
   </appSettings>
-  
+
   <connectionStrings>
     <add name="umbracoDbDSN" connectionString="Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;" providerName="System.Data.SqlServerCe.4.0" />
   </connectionStrings>
@@ -83,6 +83,21 @@
     <compilation defaultLanguage="c#" debug="true" batch="false" targetFramework="4.0"></compilation>
     <machineKey validationKey="5E7B955FCE36F5F2A867C2A0D85DC61E7FEA9E15F1561E8386F78BFE9EE23FF18B21E6A44AA17300B3B9D5DBEB37AA61A2C73884A5BBEDA6D3B14BA408A7A8CD" decryptionKey="116B853D031219E404E088FCA0986D6CF2DFA77E1957B59FCC9404B8CA3909A1" validation="SHA1" decryption="AES" />
     <!--<trust level="Medium" originUrl=".*"/>-->
+    <!-- Membership Provider -->
+    <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
+      <providers>
+        <clear />
+        <add name="UmbracoMembershipProvider" type="Umbraco.Web.Security.Providers.MembersMembershipProvider, Umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="10" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Member" passwordFormat="Hashed" allowManuallyChangingPassword="false" />
+        <add name="UsersMembershipProvider" type="Umbraco.Web.Security.Providers.UsersMembershipProvider, Umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="10" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" allowManuallyChangingPassword="false" />
+      </providers>
+    </membership>
+    <!-- Role Provider -->
+    <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
+      <providers>
+        <clear />
+        <add name="UmbracoRoleProvider" type="Umbraco.Web.Security.Providers.MembersRoleProvider" />
+      </providers>
+    </roleManager>
     <!-- Sitemap provider-->
     <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
       <providers>
@@ -92,124 +107,67 @@
     </siteMap>
   </system.web>
 
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+  </startup>
   <runtime>
-
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-
       <dependentAssembly>
-
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
         <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-
       </dependentAssembly>
-
       <dependentAssembly>
-
         <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-
       </dependentAssembly>
-
       <dependentAssembly>
-
         <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
         <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-
       </dependentAssembly>
-
       <dependentAssembly>
-        
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        
         <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
-        
       </dependentAssembly>
-      
       <dependentAssembly>
-
         <assemblyIdentity name="MiniProfiler" publicKeyToken="b44f9351044011a3" culture="neutral" />
-
         <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
-
       </dependentAssembly>
-
       <dependentAssembly>
-
         <assemblyIdentity name="NuGet.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
         <bindingRedirect oldVersion="0.0.0.0-1.0.11220.104" newVersion="1.0.11220.104" />
-
       </dependentAssembly>
-
       <dependentAssembly>
-
         <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-
         <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-
       </dependentAssembly>
-
       <dependentAssembly>
-
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
         <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-
       </dependentAssembly>
-
       <dependentAssembly>
-
         <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
         <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-
       </dependentAssembly>
-
       <dependentAssembly>
-
         <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
         <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-
       </dependentAssembly>
-
       <dependentAssembly>
-
         <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
         <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-
       </dependentAssembly>
-
       <dependentAssembly>
-
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
         <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-
       </dependentAssembly>
-
       <dependentAssembly>
-
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
         <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-
       </dependentAssembly>
-
       <dependentAssembly>
-
         <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
-
         <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
-
       </dependentAssembly>
-
     </assemblyBinding>
-
   </runtime>
 </configuration>

From dcc037446449d4524e8bebf70f5fc7ba8d07c680 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Aug 2017 15:18:16 +1000
Subject: [PATCH 096/145] trying to fix unit tests

---
 src/Umbraco.Tests/App.config | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
index deac14ef8c..0f7a67e290 100644
--- a/src/Umbraco.Tests/App.config
+++ b/src/Umbraco.Tests/App.config
@@ -87,22 +87,22 @@
     <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
       <providers>
         <clear />
-        <add name="UmbracoMembershipProvider" type="Umbraco.Web.Security.Providers.MembersMembershipProvider, Umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="10" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Member" passwordFormat="Hashed" allowManuallyChangingPassword="false" />
-        <add name="UsersMembershipProvider" type="Umbraco.Web.Security.Providers.UsersMembershipProvider, Umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="10" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" allowManuallyChangingPassword="false" />
+        <add name="UmbracoMembershipProvider" type="Umbraco.Web.Security.Providers.MembersMembershipProvider, umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="10" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Member" passwordFormat="Hashed" allowManuallyChangingPassword="false" />
+        <add name="UsersMembershipProvider" type="Umbraco.Web.Security.Providers.UsersMembershipProvider, umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="10" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" allowManuallyChangingPassword="false" />
       </providers>
     </membership>
     <!-- Role Provider -->
     <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
       <providers>
         <clear />
-        <add name="UmbracoRoleProvider" type="Umbraco.Web.Security.Providers.MembersRoleProvider" />
+        <add name="UmbracoRoleProvider" type="Umbraco.Web.Security.Providers.MembersRoleProvider, umbraco" />
       </providers>
     </roleManager>
     <!-- Sitemap provider-->
     <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
       <providers>
         <clear />
-        <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
+        <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider, umbraco" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
       </providers>
     </siteMap>
   </system.web>

From 78e66ce25f00c1d056c2477e80bc643893a973b8 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 29 Aug 2017 16:34:30 +1000
Subject: [PATCH 097/145] ok, hope this fixes tests

---
 src/Umbraco.Core/Services/MemberService.cs       | 11 +++++++----
 src/Umbraco.Tests/App.config                     | 16 +---------------
 src/Umbraco.Tests/Services/MemberServiceTests.cs | 14 +++++++++++++-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Core/Services/MemberService.cs b/src/Umbraco.Core/Services/MemberService.cs
index 26e74f66cc..b5e9ffa7cc 100644
--- a/src/Umbraco.Core/Services/MemberService.cs
+++ b/src/Umbraco.Core/Services/MemberService.cs
@@ -25,8 +25,11 @@ namespace Umbraco.Core.Services
     {
         private readonly IMemberGroupService _memberGroupService;
         private readonly EntityXmlSerializer _entitySerializer = new EntityXmlSerializer();
-        private readonly IDataTypeService _dataTypeService;
-        private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim();
+        private readonly IDataTypeService _dataTypeService;        
+        private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim();
+
+        //only for unit tests!
+        internal MembershipProviderBase MembershipProvider { get; set; }
 
         public MemberService(IDatabaseUnitOfWorkProvider provider, RepositoryFactory repositoryFactory, ILogger logger, IEventMessagesFactory eventMessagesFactory, IMemberGroupService memberGroupService, IDataTypeService dataTypeService)
             : base(provider, repositoryFactory, logger, eventMessagesFactory)
@@ -35,7 +38,7 @@ namespace Umbraco.Core.Services
             if (dataTypeService == null) throw new ArgumentNullException("dataTypeService");
             _memberGroupService = memberGroupService;
             _dataTypeService = dataTypeService;
-        }
+        }        
 
         #region IMemberService Implementation
 
@@ -91,7 +94,7 @@ namespace Umbraco.Core.Services
         {
             if (member == null) throw new ArgumentNullException("member");
 
-            var provider = MembershipProviderExtensions.GetMembersMembershipProvider();
+            var provider = MembershipProvider ?? MembershipProviderExtensions.GetMembersMembershipProvider();            
             if (provider.IsUmbracoMembershipProvider())
             {
                 provider.ChangePassword(member.Username, "", password);
diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
index 0f7a67e290..f302da7ebe 100644
--- a/src/Umbraco.Tests/App.config
+++ b/src/Umbraco.Tests/App.config
@@ -83,21 +83,7 @@
     <compilation defaultLanguage="c#" debug="true" batch="false" targetFramework="4.0"></compilation>
     <machineKey validationKey="5E7B955FCE36F5F2A867C2A0D85DC61E7FEA9E15F1561E8386F78BFE9EE23FF18B21E6A44AA17300B3B9D5DBEB37AA61A2C73884A5BBEDA6D3B14BA408A7A8CD" decryptionKey="116B853D031219E404E088FCA0986D6CF2DFA77E1957B59FCC9404B8CA3909A1" validation="SHA1" decryption="AES" />
     <!--<trust level="Medium" originUrl=".*"/>-->
-    <!-- Membership Provider -->
-    <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
-      <providers>
-        <clear />
-        <add name="UmbracoMembershipProvider" type="Umbraco.Web.Security.Providers.MembersMembershipProvider, umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="10" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Member" passwordFormat="Hashed" allowManuallyChangingPassword="false" />
-        <add name="UsersMembershipProvider" type="Umbraco.Web.Security.Providers.UsersMembershipProvider, umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="10" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" allowManuallyChangingPassword="false" />
-      </providers>
-    </membership>
-    <!-- Role Provider -->
-    <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
-      <providers>
-        <clear />
-        <add name="UmbracoRoleProvider" type="Umbraco.Web.Security.Providers.MembersRoleProvider, umbraco" />
-      </providers>
-    </roleManager>
+  
     <!-- Sitemap provider-->
     <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
       <providers>
diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs
index b2c0f63d5f..4ba3866c64 100644
--- a/src/Umbraco.Tests/Services/MemberServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Linq;
+using System.Web.Security;
+using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Events;
@@ -12,9 +14,11 @@ using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
+using Umbraco.Web.Security.Providers;
 
 namespace Umbraco.Tests.Services
 {
@@ -26,6 +30,14 @@ namespace Umbraco.Tests.Services
         public override void Initialize()
         {
             base.Initialize();
+
+            //hack! but we have no choice until we remove the SavePassword method from IMemberService
+            var providerMock = new Mock<MembersMembershipProvider>(ServiceContext.MemberService) { CallBase = true };
+            providerMock.Setup(@base => @base.AllowManuallyChangingPassword).Returns(false);
+            providerMock.Setup(@base => @base.PasswordFormat).Returns(MembershipPasswordFormat.Hashed);
+            var provider = providerMock.Object;
+
+            ((MemberService)ServiceContext.MemberService).MembershipProvider = provider;
         }
 
         [TearDown]
@@ -33,7 +45,7 @@ namespace Umbraco.Tests.Services
         {
             base.TearDown();
         }
-
+        
         [Test]
         public void Can_Set_Password_On_New_Member()
         {

From 70231fcee238ee2e1d06e472537a2a29bd2d92a1 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 29 Aug 2017 10:26:11 +0200
Subject: [PATCH 098/145] fix codemirror folder structure

---
 src/Umbraco.Web.UI.Client/bower.json  |  3 +-
 src/Umbraco.Web.UI.Client/gulpfile.js | 55 ++++++++++++++++++---------
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json
index dabd110ea9..11196da4dd 100644
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -40,7 +40,8 @@
     "ignore": [
       "font-awesome",
       "angular",
-      "bootstrap"
+      "bootstrap",
+      "codemirror"
     ],
     
     "sources": {
diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index 28c45317ca..89b686116a 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -149,31 +149,50 @@ gulp.task('dependencies', function () {
 
     //Tinymce
     stream.add(
-            gulp.src("./bower_components/tinymce/plugins/**")
-                .pipe(gulp.dest(root + targets.lib + "/tinymce/plugins/"))
-        );
+        gulp.src("./bower_components/tinymce/plugins/**")
+            .pipe(gulp.dest(root + targets.lib + "/tinymce/plugins/"))
+    );
 
     //font-awesome
     stream.add(
-            gulp.src("./bower_components/font-awesome/{fonts,css}/*")
-                .pipe(gulp.dest(root + targets.lib + "/font-awesome"))
-        );
+        gulp.src("./bower_components/font-awesome/{fonts,css}/*")
+            .pipe(gulp.dest(root + targets.lib + "/font-awesome"))
+    );
     
     // ace Editor
     stream.add(
-            gulp.src(["bower_components/ace-builds/src-min-noconflict/ace.js",
-        "bower_components/ace-builds/src-min-noconflict/ext-language_tools.js",
-        "bower_components/ace-builds/src-min-noconflict/ext-searchbox.js",
-        "bower_components/ace-builds/src-min-noconflict/ext-settings_menu.js",
-        "bower_components/ace-builds/src-min-noconflict/snippets/text.js",
-        "bower_components/ace-builds/src-min-noconflict/snippets/javascript.js",
-        "bower_components/ace-builds/src-min-noconflict/theme-chrome.js",
-        "bower_components/ace-builds/src-min-noconflict/mode-razor.js",
-        "bower_components/ace-builds/src-min-noconflict/mode-javascript.js",
-        "bower_components/ace-builds/src-min-noconflict/worker-javascript.js"],
-        {base: "./bower_components/ace-builds/"})
+        gulp.src(["bower_components/ace-builds/src-min-noconflict/ace.js",
+            "bower_components/ace-builds/src-min-noconflict/ext-language_tools.js",
+            "bower_components/ace-builds/src-min-noconflict/ext-searchbox.js",
+            "bower_components/ace-builds/src-min-noconflict/ext-settings_menu.js",
+            "bower_components/ace-builds/src-min-noconflict/snippets/text.js",
+            "bower_components/ace-builds/src-min-noconflict/snippets/javascript.js",
+            "bower_components/ace-builds/src-min-noconflict/theme-chrome.js",
+            "bower_components/ace-builds/src-min-noconflict/mode-razor.js",
+            "bower_components/ace-builds/src-min-noconflict/mode-javascript.js",
+            "bower_components/ace-builds/src-min-noconflict/worker-javascript.js"],
+            { base: "./bower_components/ace-builds/" })
             .pipe(gulp.dest(root + targets.lib + "/ace-builds"))
-        );
+    );
+
+    // code mirror
+    stream.add(
+        gulp.src([
+            "bower_components/codemirror/lib/codemirror.js",
+            "bower_components/codemirror/lib/codemirror.css",
+
+            "bower_components/codemirror/mode/css/*",
+            "bower_components/codemirror/mode/javascript/*",
+            "bower_components/codemirror/mode/xml/*",
+            "bower_components/codemirror/mode/htmlmixed/*",
+
+            "bower_components/codemirror/addon/search/*",
+            "bower_components/codemirror/addon/edit/*",
+            "bower_components/codemirror/addon/selection/*",
+            "bower_components/codemirror/addon/dialog/*"],
+            { base: "./bower_components/codemirror/" })
+            .pipe(gulp.dest(root + targets.lib + "/codemirror"))
+    );
 
     //copy over libs which are not on bower (/lib) and 
     //libraries that have been managed by bower-installer (/lib-bower)

From d300bf8d6db3d6ce4485db0d2ba23566648f0f6b Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 29 Aug 2017 11:17:52 +0200
Subject: [PATCH 099/145] U4-10367 417 missing token error due to cookie being
 overwritten

Changes the cookie and header names to be Umbraco specific
---
 .../src/common/security/securityinterceptor.js            | 2 ++
 src/Umbraco.Web.UI.Client/src/init.js                     | 2 +-
 .../umbraco_client/Application/Extensions.js              | 2 +-
 .../WebApi/Filters/AngularAntiForgeryHelper.cs            | 8 ++++----
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/security/securityinterceptor.js b/src/Umbraco.Web.UI.Client/src/common/security/securityinterceptor.js
index 024e8d5a43..6596ad759f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/security/securityinterceptor.js
+++ b/src/Umbraco.Web.UI.Client/src/common/security/securityinterceptor.js
@@ -103,5 +103,7 @@ angular.module('umbraco.security.interceptor')
 
     // We have to add the interceptor to the queue as a string because the interceptor depends upon service instances that are not available in the config block.
     .config(['$httpProvider', function ($httpProvider) {
+        $httpProvider.defaults.xsrfHeaderName = 'X-UMB-XSRF-TOKEN';
+        $httpProvider.defaults.xsrfCookieName = 'UMB-XSRF-TOKEN';
         $httpProvider.responseInterceptors.push('securityInterceptor');
     }]);
diff --git a/src/Umbraco.Web.UI.Client/src/init.js b/src/Umbraco.Web.UI.Client/src/init.js
index 016c33015d..62156a8455 100644
--- a/src/Umbraco.Web.UI.Client/src/init.js
+++ b/src/Umbraco.Web.UI.Client/src/init.js
@@ -7,7 +7,7 @@ app.run(['userService', '$log', '$rootScope', '$location', 'navigationService',
         // it cannot be static
         $.ajaxSetup({
             beforeSend: function (xhr) {
-                xhr.setRequestHeader("X-XSRF-TOKEN", $cookies["XSRF-TOKEN"]);
+                xhr.setRequestHeader("X-UMB-XSRF-TOKEN", $cookies["UMB-XSRF-TOKEN"]);
             }
         });
 
diff --git a/src/Umbraco.Web.UI/umbraco_client/Application/Extensions.js b/src/Umbraco.Web.UI/umbraco_client/Application/Extensions.js
index 63870fad08..de12c6194f 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Application/Extensions.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Application/Extensions.js
@@ -369,7 +369,7 @@
                 if (parts.length === 2) return parts.pop().split(";").shift();
             }
 
-            xhr.setRequestHeader("X-XSRF-TOKEN", getCookie("XSRF-TOKEN"));
+            xhr.setRequestHeader("X-UMB-XSRF-TOKEN", getCookie("UMB-XSRF-TOKEN"));
         }
     });
 
diff --git a/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs b/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs
index b83b4114a3..dfeeee536d 100644
--- a/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs
+++ b/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs
@@ -16,17 +16,17 @@ namespace Umbraco.Web.WebApi.Filters
         /// <summary>
         /// The cookie name that is used to store the validation value
         /// </summary>
-        public const string CsrfValidationCookieName = "XSRF-V";
+        public const string CsrfValidationCookieName = "UMB-XSRF-V";
 
         /// <summary>
-        /// The cookie name that is set for angular to use to pass in to the header value for "X-XSRF-TOKEN"
+        /// The cookie name that is set for angular to use to pass in to the header value for "X-UMB-XSRF-TOKEN"
         /// </summary>
-        public const string AngularCookieName = "XSRF-TOKEN";
+        public const string AngularCookieName = "UMB-XSRF-TOKEN";
 
         /// <summary>
         /// The header name that angular uses to pass in the token to validate the cookie
         /// </summary>
-        public const string AngularHeadername = "X-XSRF-TOKEN";
+        public const string AngularHeadername = "X-UMB-XSRF-TOKEN";
 
         /// <summary>
         /// Returns 2 tokens - one for the cookie value and one that angular should set as the header value

From 1307cb117337f55979f953bb1b9ee7e8323fe1af Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 29 Aug 2017 11:39:16 +0200
Subject: [PATCH 100/145] add themes for tinymce - they are needed for loading
 it

---
 src/Umbraco.Web.UI.Client/gulpfile.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index 89b686116a..e9acb1d10a 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -149,8 +149,10 @@ gulp.task('dependencies', function () {
 
     //Tinymce
     stream.add(
-        gulp.src("./bower_components/tinymce/plugins/**")
-            .pipe(gulp.dest(root + targets.lib + "/tinymce/plugins/"))
+        gulp.src(["./bower_components/tinymce/plugins/**",
+            "./bower_components/tinymce/themes/**"],
+            { base: "./bower_components/tinymce/" })
+            .pipe(gulp.dest(root + targets.lib + "/tinymce"))
     );
 
     //font-awesome

From 7ccfc79080a0383912f87484c9e100b3c56d1572 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 29 Aug 2017 12:40:57 +0200
Subject: [PATCH 101/145] update BuildBelle.bat to use gulp build task

---
 build/BuildBelle.bat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/BuildBelle.bat b/build/BuildBelle.bat
index a6fafd669e..7f13d548dc 100644
--- a/build/BuildBelle.bat
+++ b/build/BuildBelle.bat
@@ -57,13 +57,13 @@ IF NOT [%npmPath%] == [] GOTO :build
     ECHO Change directory to %CD%\..\src\Umbraco.Web.UI.Client\
     CD %CD%\..\src\Umbraco.Web.UI.Client\
 
-    ECHO Do npm install and the grunt build of Belle
+    ECHO Do npm install and the gulp build of Belle
     call npm cache clean --quiet
 
     call npm install -g gulp-cli --quiet
     call npm install -g bower --quiet
     call npm install --quiet
-    call gulp --buildversion=%release%
+    call gulp build --buildversion=%release%
 
     ECHO Move back to the build folder
     CD "%buildFolder%"
\ No newline at end of file

From ce8390768e01c52c31835934111037d01dc2981b Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 29 Aug 2017 14:17:41 +0200
Subject: [PATCH 102/145] Source maps gets cached really hard in the browser so
 I will remove them for now until we find a solution to clear them

---
 src/Umbraco.Web.UI.Client/gulpfile.js  | 33 ++++----------------------
 src/Umbraco.Web.UI.Client/package.json |  3 ---
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index e9acb1d10a..9bce49b145 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -2,14 +2,11 @@
 var watch = require('gulp-watch');
 var concat = require('gulp-concat');
 var rename = require('gulp-rename');
-var sourcemaps = require('gulp-sourcemaps');
 var wrap = require("gulp-wrap-js");
 var sort = require('gulp-sort');
-var uglify = require('gulp-uglify');
 var connect = require('gulp-connect');
 var open = require('gulp-open');
 var runSequence = require('run-sequence');
-var gulpif = require('gulp-if');
 
 var _ = require('lodash');
 var MergeStream = require('merge-stream');
@@ -29,15 +26,12 @@ var karmaServer = require('karma').Server;
 /***************************************************************
 Helper functions
 ***************************************************************/
-function processJs(files, out, makeSourcemaps) {
+function processJs(files, out) {
     
     return gulp.src(files)
      .pipe(sort())
-     .pipe(gulpif(makeSourcemaps, sourcemaps.init()))
      .pipe(concat(out))
      .pipe(wrap('(function(){\n%= body %\n})();'))
-     .pipe(uglify({ mangle: false }))
-     .pipe(gulpif(makeSourcemaps, sourcemaps.write()))
      .pipe(gulp.dest(root + targets.js));
 
      console.log(out + " compiled");
@@ -123,12 +117,12 @@ var targets = {
 
  // Build - build the files ready for production
 gulp.task('build', function(cb) {
-    runSequence(["dependencies", "js:production", "less", "views"], "test:unit", cb);
+    runSequence(["dependencies", "js", "less", "views"], "test:unit", cb);
 });
 
 // Dev - build the files ready for development and start watchers
 gulp.task('dev', function(cb) {
-    runSequence(["dependencies", "js:development", "less", "views"], "watch", cb);
+    runSequence(["dependencies", "js", "less", "views"], "watch", cb);
 });
 
 // Docserve - build and open the back office documentation
@@ -229,7 +223,7 @@ gulp.task('dependencies', function () {
 /**************************
  * Copies all angular JS files into their seperate umbraco.*.js file
  **************************/
-gulp.task('js:production', function () { 
+gulp.task('js', function () { 
   
     //we run multiple streams, so merge them all together
     var stream = new MergeStream();
@@ -240,29 +234,12 @@ gulp.task('js:production', function () {
         );
 
      _.forEach(sources.js, function (group) {
-        stream.add (processJs(group.files, group.out, false) );
+        stream.add (processJs(group.files, group.out) );
      });
 
      return stream;
 });
 
-gulp.task('js:development', function () { 
-    
-    //we run multiple streams, so merge them all together
-    var stream = new MergeStream();
-
-    stream.add(
-        gulp.src(sources.globs.js)
-            .pipe(gulp.dest(root + targets.js))
-        );
-
-    _.forEach(sources.js, function (group) {
-        stream.add (processJs(group.files, group.out, true) );
-    });
-
-    return stream;
-});
-
 gulp.task('less', function () {
     
     var stream = new MergeStream();
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index d2a5b6ac41..d95652bba2 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -27,15 +27,12 @@
     "gulp": "^3.9.1",
     "gulp-concat": "^2.6.0",
     "gulp-connect": "^5.0.0",
-    "gulp-if": "^2.0.2",
     "gulp-less": "^3.1.0",
     "gulp-ngdocs": "^0.3.0",
     "gulp-open": "^2.0.0",
     "gulp-postcss": "^6.2.0",
     "gulp-rename": "^1.2.2",
     "gulp-sort": "^2.0.0",
-    "gulp-sourcemaps": "^2.6.0",
-    "gulp-uglify": "^3.0.0",
     "gulp-watch": "^4.3.10",
     "gulp-wrap": "^0.13.0",
     "gulp-wrap-js": "^0.4.1",

From 1bda9f32c189c471322e6458f183b31f94acd42f Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 29 Aug 2017 14:27:43 +0200
Subject: [PATCH 103/145] only copy minified version of font-awesome

---
 src/Umbraco.Web.UI.Client/gulpfile.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index 9bce49b145..b1839d1e6f 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -151,7 +151,9 @@ gulp.task('dependencies', function () {
 
     //font-awesome
     stream.add(
-        gulp.src("./bower_components/font-awesome/{fonts,css}/*")
+        gulp.src(["./bower_components/font-awesome/fonts/*",
+            "./bower_components/font-awesome/css/font-awesome.min.css"],
+            { base: "./bower_components/font-awesome/" })
             .pipe(gulp.dest(root + targets.lib + "/font-awesome"))
     );
     

From 110a3b2a12e058b6277fecfb558e523096cbadd9 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 29 Aug 2017 14:35:54 +0200
Subject: [PATCH 104/145] add small interval to file watcher to keep windows
 calm

---
 src/Umbraco.Web.UI.Client/gulpfile.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index b1839d1e6f..be72090661 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -276,6 +276,7 @@ gulp.task('views', function () {
 gulp.task('watch', function () {
 
     var stream = new MergeStream();
+    var watchInterval = 500;
 
     //Setup a watcher for all groups of javascript files
     _.forEach(sources.js, function (group) {
@@ -284,7 +285,7 @@ gulp.task('watch', function () {
 
             stream.add( 
 
-                watch(group.files, { ignoreInitial: true }, function (file) {
+                watch(group.files, { ignoreInitial: true, interval: watchInterval }, function (file) {
 
                     console.info(file.path + " has changed, added to:  " + group.out);
                     processJs(group.files, group.out);
@@ -299,20 +300,20 @@ gulp.task('watch', function () {
 
     stream.add( 
         //watch all less files and trigger the less task
-        watch(sources.globs.less, { ignoreInitial: true }, function () {
+        watch(sources.globs.less, { ignoreInitial: true, interval: watchInterval }, function () {
             gulp.run(['less']);
         })
     );
 
     //watch all views - copy single file changes
     stream.add( 
-        watch(sources.globs.views)
+        watch(sources.globs.views, { interval: watchInterval })
         .pipe(gulp.dest(root + targets.views))
     );
 
     //watch all app js files that will not be merged - copy single file changes
     stream.add( 
-        watch(sources.globs.js)
+        watch(sources.globs.js, { interval: watchInterval })
         .pipe(gulp.dest(root + targets.js))
     );
 

From b10e646adeafb78c8f71ab18a2c91550c12ff0fa Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 29 Aug 2017 14:53:44 +0200
Subject: [PATCH 105/145] remove grunt file

---
 src/Umbraco.Web.UI.Client/gruntFile.js | 597 -------------------------
 1 file changed, 597 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI.Client/gruntFile.js

diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js
deleted file mode 100644
index 83cb15df64..0000000000
--- a/src/Umbraco.Web.UI.Client/gruntFile.js
+++ /dev/null
@@ -1,597 +0,0 @@
-module.exports = function (grunt) {
-
-
-
-    // Default task.
-    grunt.registerTask('default', ['jshint:dev', 'build', 'karma:unit']);
-    grunt.registerTask('dev', ['jshint:dev', 'build-dev', 'webserver', 'open:dev', 'watch']);
-    grunt.registerTask('docserve', ['docs:api', 'connect:docserver', 'open:docs', 'watch:docs']);
-    grunt.registerTask('vs', ['jshint:dev', 'build-dev', 'watch']);
-
-    //TODO: Too much watching, this brings windows to it's knees when in dev mode
-    //run by the watch task
-    grunt.registerTask('watch-js', ['jshint:dev', 'concat', 'copy:app', 'copy:mocks', 'copy:canvasdesigner', 'copy:vs', 'karma:unit']);
-    grunt.registerTask('watch-less', ['recess:build', 'recess:installer', 'recess:nonodes', 'recess:canvasdesigner', 'postcss', 'copy:canvasdesigner', 'copy:assets', 'copy:vs']);
-    grunt.registerTask('watch-html', ['copy:views', 'copy:vs']);
-    grunt.registerTask('watch-installer', ['concat:install', 'concat:installJs', 'copy:installer', 'copy:vs']);
-    grunt.registerTask('watch-canvasdesigner', ['copy:canvasdesigner', 'concat:canvasdesignerJs', 'copy:vs']);
-    grunt.registerTask('watch-test', ['jshint:dev', 'karma:unit']);
-
-    //triggered from grunt
-    grunt.registerTask('build', ['concat', 'recess:build', 'recess:installer', 'recess:nonodes', 'recess:canvasdesigner', 'postcss', 'bower-install-simple', 'bower', 'copy', 'clean:post']);
-
-    //triggered from grunt dev vs or grunt vs
-    grunt.registerTask('build-dev', ['clean:pre', 'concat', 'recess:build', 'recess:installer', 'recess:nonodes', 'postcss', 'bower-install-simple', 'bower', 'copy']);
-
-    //utillity tasks
-    grunt.registerTask('docs', ['ngdocs']);
-    grunt.registerTask('webserver', ['connect:devserver']);
-
-
-    // Print a timestamp (useful for when watching)
-    grunt.registerTask('timestamp', function () {
-        grunt.log.subhead(Date());
-    });
-
-    // Project configuration.
-    grunt.initConfig({
-        buildVersion: grunt.option('buildversion') || '7',
-        connect: {
-            devserver: {
-                options: {
-                    port: 9990,
-                    hostname: '0.0.0.0',
-                    base: './build',
-                    middleware: function(connect, options) {
-                        return [
-                            //uncomment to enable CSP
-                            // util.csp(),
-                            //util.rewrite(),
-                            connect.favicon('images/favicon.ico'),
-                            connect.static(options.base),
-                            connect.directory(options.base)
-                        ];
-                    }
-                }
-            },
-            testserver: {},
-            docserver: {
-                options: {
-                    port: 8880,
-                    hostname: '0.0.0.0',
-                    base: './docs/api',
-                    middleware: function(connect, options) {
-                        return [
-                            //uncomment to enable CSP
-                            // util.csp(),
-                            //util.rewrite(),
-                            connect.static(options.base),
-                            connect.directory(options.base)
-                        ];
-                    }
-                }
-            },
-        },
-
-        open: {
-            dev: {
-                path: 'http://localhost:9990/belle/'
-            },
-            docs: {
-                path: 'http://localhost:8880/index.html'
-            }
-        },
-
-        distdir: 'build/belle',
-        vsdir: '../Umbraco.Web.UI/umbraco',
-        pkg: grunt.file.readJSON('package.json'),
-        banner:
-            '/*! <%= pkg.title || pkg.name %>\n' +
-                '<%= pkg.homepage ? " * " + pkg.homepage + "\\n" : "" %>' +
-                ' * Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author %>;\n' +
-                ' * Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %>\n */\n',
-        src: {
-            js: ['src/**/*.js', 'src/*.js'],
-
-            common: ['src/common/**/*.js'],
-            controllers: ['src/**/*.controller.js'],
-
-            specs: ['test/**/*.spec.js'],
-            scenarios: ['test/**/*.scenario.js'],
-            samples: ['sample files/*.js'],
-            html: ['src/index.html', 'src/install.html'],
-
-            everything: ['src/**/*.*', 'test/**/*.*', 'docs/**/*.*'],
-
-            tpl: {
-                app: ['src/views/**/*.html'],
-                common: ['src/common/**/*.tpl.html']
-            },
-            less: ['src/less/belle.less'], // recess:build doesn't accept ** in its file patterns
-            prod: ['<%= distdir %>/js/*.js']
-        },
-
-        clean: {
-            pre: ['<%= distdir %>/*'],
-            post: ['<%= distdir %>/js/*.dev.js']
-        },
-
-        copy: {
-            assets: {
-                files: [{ dest: '<%= distdir %>/assets', src: '**', expand: true, cwd: 'src/assets/' }]
-            },
-
-            config: {
-                files: [{ dest: '<%= distdir %>/../config', src: '**', expand: true, cwd: 'src/config/' }]
-            },
-
-            installer: {
-                files: [{ dest: '<%= distdir %>/views/install', src: '**/*.html', expand: true, cwd: 'src/installer/steps' }]
-            },
-
-            canvasdesigner: {
-                files: [
-                    { dest: '<%= distdir %>/preview', src: '**/*.html', expand: true, cwd: 'src/canvasdesigner' },
-                    { dest: '<%= distdir %>/preview/editors', src: '**/*.html', expand: true, cwd: 'src/canvasdesigner/editors' },
-                    { dest: '<%= distdir %>/assets/less', src: '**/*.less', expand: true, cwd: 'src/canvasdesigner/editors' },
-                    { dest: '<%= distdir %>/js', src: 'canvasdesigner.config.js', expand: true, cwd: 'src/canvasdesigner/config' },
-                    { dest: '<%= distdir %>/js', src: 'canvasdesigner.palettes.js', expand: true, cwd: 'src/canvasdesigner/config' },
-                    { dest: '<%= distdir %>/js', src: 'canvasdesigner.front.js', expand: true, cwd: 'src/canvasdesigner' }
-                ]
-            },
-
-            vendor: {
-                files: [{ dest: '<%= distdir %>/lib', src: '**', expand: true, cwd: 'lib/' }]
-            },
-
-            views: {
-                files: [{ dest: '<%= distdir %>/views', src: ['**/*.*', '!**/*.controller.js'], expand: true, cwd: 'src/views' }]
-            },
-
-            app: {
-                files: [
-                    { dest: '<%= distdir %>/js', src: '*.js', expand: true, cwd: 'src/' }
-                ]
-            },
-
-            mocks: {
-                files: [{ dest: '<%= distdir %>/js', src: '*.js', expand: true, cwd: 'src/common/mocks/' }]
-            },
-
-            vs: {
-                files: [
-                    //everything except the index.html root file!
-                    //then we need to figure out how to not copy all the test stuff either!?
-                    { dest: '<%= vsdir %>/assets', src: '**', expand: true, cwd: '<%= distdir %>/assets' },
-                    { dest: '<%= vsdir %>/js', src: '**', expand: true, cwd: '<%= distdir %>/js' },
-                    { dest: '<%= vsdir %>/views', src: '**', expand: true, cwd: '<%= distdir %>/views' },
-                    { dest: '<%= vsdir %>/preview', src: '**', expand: true, cwd: '<%= distdir %>/preview' },
-                    { dest: '<%= vsdir %>/lib', src: '**', expand: true, cwd: '<%= distdir %>/lib' }
-                ]
-            }
-        },
-
-        karma: {
-            unit: { configFile: 'test/config/karma.conf.js', keepalive: true },
-            e2e: { configFile: 'test/config/e2e.js', keepalive: true },
-            watch: { configFile: 'test/config/unit.js', singleRun: false, autoWatch: true, keepalive: true }
-        },
-
-        concat: {
-            index: {
-                src: ['src/index.html'],
-                dest: '<%= distdir %>/index.html',
-                options: {
-                    process: true
-                }
-            },
-            install: {
-                src: ['src/installer/installer.html'],
-                dest: '<%= distdir %>/installer.html',
-                options: {
-                    process: true
-                }
-            },
-
-            installJs: {
-                src: ['src/installer/**/*.js'],
-                dest: '<%= distdir %>/js/umbraco.installer.js',
-                options: {
-                    banner: "<%= banner %>\n(function() { \n\n angular.module('umbraco.install', []); \n",
-                    footer: "\n\n})();"
-                }
-            },
-
-            canvasdesignerJs: {
-                src: ['src/canvasdesigner/canvasdesigner.global.js', 'src/canvasdesigner/canvasdesigner.controller.js', 'src/canvasdesigner/editors/*.js', 'src/canvasdesigner/lib/*.js'],
-                dest: '<%= distdir %>/js/canvasdesigner.panel.js'
-            },
-
-            controllers: {
-                src: ['src/controllers/**/*.controller.js', 'src/views/**/*.controller.js'],
-                dest: '<%= distdir %>/js/umbraco.controllers.js',
-                options: {
-                    banner: "<%= banner %>\n(function() { \n\n",
-                    footer: "\n\n})();"
-                }
-            },
-
-            services: {
-                src: ['src/common/services/*.js'],
-                dest: '<%= distdir %>/js/umbraco.services.js',
-                options: {
-                    banner: "<%= banner %>\n(function() { \n\n",
-                    footer: "\n\n})();"
-                }
-            },
-
-            security: {
-                src: ['src/common/security/*.js'],
-                dest: '<%= distdir %>/js/umbraco.security.js',
-                options: {
-                    banner: "<%= banner %>\n(function() { \n\n",
-                    footer: "\n\n})();"
-                }
-            },
-
-            resources: {
-                src: ['src/common/resources/*.js'],
-                dest: '<%= distdir %>/js/umbraco.resources.js',
-                options: {
-                    banner: "<%= banner %>\n(function() { \n\n",
-                    footer: "\n\n})();"
-                }
-            },
-
-            testing: {
-                src: ['src/common/mocks/*/*.js'],
-                dest: '<%= distdir %>/js/umbraco.testing.js',
-                options: {
-                    banner: "<%= banner %>\n(function() { \n\n",
-                    footer: "\n\n})();"
-                }
-            },
-
-            directives: {
-                src: ['src/common/directives/**/*.js'],
-                dest: '<%= distdir %>/js/umbraco.directives.js',
-                options: {
-                    banner: "<%= banner %>\n(function() { \n\n",
-                    footer: "\n\n})();"
-                }
-            },
-
-            filters: {
-                src: ['src/common/filters/*.js'],
-                dest: '<%= distdir %>/js/umbraco.filters.js',
-                options: {
-                    banner: "<%= banner %>\n(function() { \n\n",
-                    footer: "\n\n})();"
-                }
-            }
-        },
-
-        uglify: {
-            options: {
-                mangle: true
-            },
-            combine: {
-                files: {
-                    '<%= distdir %>/js/umbraco.min.js': ['<%= distdir %>/js/umbraco.*.js']
-                }
-            }
-        },
-
-        recess: {
-            build: {
-                files: {
-                    '<%= distdir %>/assets/css/<%= pkg.name %>.css':
-                    ['<%= src.less %>']
-                },
-                options: {
-                    compile: true,
-                    compress: true
-                }
-            },
-            nonodes: {
-                files: {
-                    '<%= distdir %>/assets/css/nonodes.style.min.css':
-                    ['src/less/pages/nonodes.less']
-                },
-                options: {
-                    compile: true,
-                    compress: true
-                }
-            },
-            installer: {
-                files: {
-                    '<%= distdir %>/assets/css/installer.css':
-                    ['src/less/installer.less']
-                },
-                options: {
-                    compile: true,
-                    compress: true
-                }
-            },
-            canvasdesigner: {
-                files: {
-                    '<%= distdir %>/assets/css/canvasdesigner.css':
-                    ['src/less/canvas-designer.less', 'src/less/helveticons.less']
-                },
-                options: {
-                    compile: true,
-                    compress: true
-                }
-            }
-        },
-
-        postcss: {
-           options: {
-              processors: [
-                 // add vendor prefixes
-                 require('autoprefixer-core')({
-                    browsers: 'last 2 versions'
-                 })
-              ]
-           },
-           dist: {
-              src: '<%= distdir %>/assets/css/<%= pkg.name %>.css'
-           }
-        },
-
-        ngTemplateCache: {
-            views: {
-                files: {
-                    '<%= distdir %>/js/umbraco.views.js': 'src/views/**/*.html'
-                },
-                options: {
-                    trim: 'src/',
-                    module: 'umbraco.views'
-                }
-            }
-        },
-
-        watch: {
-            docs: {
-                files: ['docs/src/**/*.md'],
-                tasks: ['watch-docs', 'timestamp']
-            },
-            css: {
-                files: 'src/**/*.less',
-                tasks: ['watch-less', 'timestamp'],
-                options: {
-                    livereload: true,
-                },
-            },
-            js: {
-                files: ['src/**/*.js', 'src/*.js'],
-                tasks: ['watch-js', 'timestamp'],
-            },
-            test: {
-                files: ['test/**/*.js'],
-                tasks: ['watch-test', 'timestamp'],
-            },
-            installer: {
-                files: ['src/installer/**/*.*'],
-                tasks: ['watch-installer', 'timestamp'],
-            },
-            canvasdesigner: {
-                files: ['src/canvasdesigner/**/*.*'],
-                tasks: ['watch-canvasdesigner', 'timestamp'],
-            },
-            html: {
-                files: ['src/views/**/*.html', 'src/*.html'],
-                tasks: ['watch-html', 'timestamp']
-            },
-			options: { 
-                interval: 500
-            }
-        },
-
-
-        ngdocs: {
-            options: {
-                dest: 'docs/api',
-                startPage: '/api',
-                title: "Umbraco Backoffice UI API Documentation",
-                html5Mode: false,
-                styles: [
-                    'docs/umb-docs.css'
-                ],
-                image: "https://our.umbraco.org/assets/images/logo.svg"
-            },
-            api: {
-                src: ['src/common/**/*.js', 'docs/src/api/**/*.ngdoc'],
-                title: 'API Documentation'
-            },
-            tutorials: {
-                src: [],
-                title: ''
-            }
-        },
-
-        eslint:{
-            src: ['<%= src.common %>','<%= src.controllers %>'],
-            options: {quiet: true}
-        },
-
-        jshint: {
-            dev: {
-                files: {
-                    src: ['<%= src.common %>']
-                },
-                options: {
-                    curly: true,
-                    eqeqeq: true,
-                    immed: true,
-                    latedef: "nofunc",
-                    newcap: true,
-                    noarg: true,
-                    sub: true,
-                    boss: true,
-                    //NOTE: This is required so it doesn't barf on reserved words like delete when doing $http.delete
-                    es5: true,
-                    eqnull: true,
-                    //NOTE: we need to use eval sometimes so ignore it
-                    evil: true,
-                    //NOTE: we need to check for strings such as "javascript:" so don't throw errors regarding those
-                    scripturl: true,
-                    //NOTE: we ignore tabs vs spaces because enforcing that causes lots of errors depending on the text editor being used
-                    smarttabs: true,
-                    globals: {}
-                }
-            },
-            build: {
-                files: {
-                    src: ['<%= src.prod %>']
-                },
-                options: {
-                    curly: true,
-                    eqeqeq: true,
-                    immed: true,
-                    latedef: "nofunc",
-                    newcap: true,
-                    noarg: true,
-                    sub: true,
-                    boss: true,
-                    //NOTE: This is required so it doesn't barf on reserved words like delete when doing $http.delete
-                    es5: true,
-                    eqnull: true,
-                    //NOTE: we need to use eval sometimes so ignore it
-                    evil: true,
-                    //NOTE: we need to check for strings such as "javascript:" so don't throw errors regarding those
-                    scripturl: true,
-                    //NOTE: we ignore tabs vs spaces because enforcing that causes lots of errors depending on the text editor being used
-                    smarttabs: true,
-                    globalstrict: true,
-                    globals: { $: false, jQuery: false, define: false, require: false, window: false }
-                }
-            }
-        },
-
-        bower: {
-            dev: {
-                dest: '<%= distdir %>/lib',
-                options: {
-                    expand: true,
-                    ignorePackages: ['bootstrap'],
-                    packageSpecific: {
-                        'moment': {
-                            keepExpandedHierarchy: false,
-                            files: ['min/moment-with-locales.js']
-                        },
-                        'typeahead.js': {
-                            keepExpandedHierarchy: false,
-                            files: ['dist/typeahead.bundle.min.js']
-                        },
-                        'underscore': {
-                            files: ['underscore-min.js', 'underscore-min.map']
-                        },
-                        'rgrove-lazyload': {
-                            files: ['lazyload.js']
-                        },
-                        'bootstrap-social': {
-                            files: ['bootstrap-social.css']
-                        },
-                        'font-awesome': {
-                            files: ['css/font-awesome.min.css', 'fonts/*']
-                        },
-                        "jquery": {
-                            keepExpandedHierarchy: false,
-                            files: ['dist/jquery.min.js', 'dist/jquery.min.map']
-                        },
-                        'jquery-ui': {
-                            keepExpandedHierarchy: false,
-                            files: ['jquery-ui.min.js']
-                        },
-                        'jquery-migrate': {
-                            keepExpandedHierarchy: false,
-                            files: ['jquery-migrate.min.js']
-                        },
-                        'tinymce': {
-                            files: ['plugins/**', 'themes/**', 'tinymce.min.js']
-                        },
-                        'angular-dynamic-locale': {
-                            files: ['tmhDynamicLocale.min.js', 'tmhDynamicLocale.min.js.map']
-                        },
-                        'ng-file-upload': {
-                            keepExpandedHierarchy: false,
-                            files: ['ng-file-upload.min.js']
-                        },
-                        'angular-local-storage': {
-                            keepExpandedHierarchy: false,
-                            files: ['dist/angular-local-storage.min.js']
-                        },
-                        'codemirror': {
-                            files: [
-                                'lib/codemirror.js',
-                                'lib/codemirror.css',
-
-                                'mode/css/*',
-                                'mode/javascript/*',
-                                'mode/xml/*',
-                                'mode/htmlmixed/*',
-
-                                'addon/search/*',
-                                'addon/edit/*',
-                                'addon/selection/*',
-                                'addon/dialog/*'
-                            ]
-                        },
-                        'ace-builds': {
-                           files: [
-                                'src-min-noconflict/ace.js',
-                                
-                                'src-min-noconflict/ext-language_tools.js',
-                                'src-min-noconflict/ext-searchbox.js',
-                                'src-min-noconflict/ext-settings_menu.js',
-
-                                'src-min-noconflict/snippets/text.js',
-                                'src-min-noconflict/snippets/javascript.js',
-                                
-                                'src-min-noconflict/theme-chrome.js',
-                                
-                                'src-min-noconflict/mode-razor.js',
-                                'src-min-noconflict/mode-javascript.js',
-                                
-                                'src-min-noconflict/worker-javascript.js',
-                            ]
-                       }
-                    }
-                }
-            },
-            options: {
-                expand: true
-            }
-        },
-
-        "bower-install-simple": {
-            options: {
-                color: true
-            },
-            "dev": {}
-        }
-    });
-
-
-
-    grunt.loadNpmTasks('grunt-contrib-concat');
-    grunt.loadNpmTasks('grunt-contrib-jshint');
-    grunt.loadNpmTasks('grunt-contrib-clean');
-    grunt.loadNpmTasks('grunt-contrib-copy');
-    grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-recess');
-    grunt.loadNpmTasks('grunt-postcss');
-
-    grunt.loadNpmTasks('grunt-karma');
-
-    grunt.loadNpmTasks('grunt-open');
-    grunt.loadNpmTasks('grunt-contrib-connect');
-    grunt.loadNpmTasks("grunt-bower-install-simple");
-    grunt.loadNpmTasks('grunt-bower');
-    grunt.loadNpmTasks('grunt-ngdocs');
-
-    grunt.loadNpmTasks('grunt-eslint');
-    grunt.loadNpmTasks('grunt-hustler');
-};

From 06a87bc341d6a66b61242dccab8bd598283c99ed Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 29 Aug 2017 14:56:17 +0200
Subject: [PATCH 106/145] update readme

---
 README.md                           |  4 +-
 src/Umbraco.Web.UI.Client/README.md | 97 -----------------------------
 2 files changed, 1 insertion(+), 100 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI.Client/README.md

diff --git a/README.md b/README.md
index a9559c1850..a724b3531a 100644
--- a/README.md
+++ b/README.md
@@ -12,9 +12,7 @@ Umbraco is a free open source Content Management System built on the ASP.NET pla
 
 ## Building Umbraco from source ##
 
-The easiest way to get started is to run `build/build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `grunt vs` in `src\Umbraco.Web.UI.Client`.
- 
-If you're interested in making changes to Belle without running Visual Studio make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). 
+The easiest way to get started is to run `build/build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `gulp dev` in `src\Umbraco.Web.UI.Client`.
 
 Note that you can always [download a nightly build](http://nightly.umbraco.org/?container=umbraco-750) so you don't have to build the code yourself.
 
diff --git a/src/Umbraco.Web.UI.Client/README.md b/src/Umbraco.Web.UI.Client/README.md
deleted file mode 100644
index 6001d65271..0000000000
--- a/src/Umbraco.Web.UI.Client/README.md
+++ /dev/null
@@ -1,97 +0,0 @@
-#Belle
-
-Umbraco 7 UI, codename "Belle" Built on AngularJS, bower, Lazyload.js and Twitter Bootstrap
-
-
-##Introduction
-Slides from the initial demonstration of Belle done at the Umbraco DK Fest can be found here: 
-
-http://rawgithub.com/umbraco/Umbraco.Web.Ui.Client/build/master/Presentation/index.html
-  
-
-##Running the site with mocked data
-
-This won't require any database or setup, as everything is running through node. All you have to do is install 
-node and grunt on either windows or OSX and the entire setup is ready for you.
-
-
-###Install node.js
-We need node to run tests and automated less compiling and other automated tasks. go to http://nodejs.org. Node.js is a powerfull javascript engine, which allows us to run all our tests and tasks written in javascript locally.
-
-*note:* On windows you might need to restart explorer.exe to register node.
-
-
-###Install dependencies
-Next we need to install all the required packages. This is done with the package tool, included with node.js, open /src/Umbraco.Web.UI.Client in cmd.exe or osx terminal and run the command:
-
-	npm install
-
-this will fetch all needed packages to your local machine.
-
-
-###Install grunt globally
-Grunt is a task runner for node.js, and we use it for all automated tasks in the build process. For convenience we need to install it globally on your machine, so it can be used directly in cmd.exe or the terminal.
-
-So run the command:
-
-	npm install grunt-cli -g
-
-*note:* On windows you might need to restart explorer.exe to register the grunt cmd.
-
-*note:* On OSX you might need to run:
-	
-	sudo npm install grunt-cli -g
-
-Now that you have node and grunt installed, you can open `/src/Umbraco.Web.UI.Client` in either `cmd.exe` or terminal and run: 
-
-	grunt dev
-
-This will build the site, merge less files, run tests and create the /Build folder, and finally open the site in your
-browser.
-
-
-##Limitations
-The current prototype simply uses in-memory storage, so no database dependencies. It is aimed at showing UI, not a complete functional client-server setup. 
-
-
-##Project Structure
-
-All project files are located in /src/Umbraco.Web.UI.Client which only contains client-side files, everything 
-related to asp.net are in /src/Umbraco.Web.UI
-
-after building Belle files are located in /build/belle, with all files following AngularJs 
-conventions:
-
-###Folders
-- */Umbraco.Web.Ui.Client/build/lib:* Dependencies
-- */Umbraco.Web.Ui.Client/build/js:* Application javascript files
-- */Umbraco.Web.Ui.Client/build/views/common/:* Main application views
-- */Umbraco.Web.Ui.Client/build/views/[sectioname]/pagename Editors html
-- */Umbraco.Web.Ui.Client/build/views/propertyeditors:* Property Editors html
-
-
-###Files
-- */Umbraco.Web.Ui.Client/build/js/app.js:* Main umbraco application / modules
-- */Umbraco.Web.Ui.Client/build/js/loader.js:* lazyload configuration for dependencies
-- */Umbraco.Web.Ui.Client/build/js/routes.js:* Application routes
-- */Umbraco.Web.Ui.Client/build/js/umbraco.controllers.js:* Application controllers
-- */Umbraco.Web.Ui.Client/build/js/umbraco.services.js:* Application services
-- */Umbraco.Web.Ui.Client/build/js/umbraco.filters.js:* Application filters
-- */Umbraco.Web.Ui.Client/build/js/umbraco.directives.js:* Application directives
-- */Umbraco.Web.Ui.Client/build/js/umbraco.resources.js:* Application resources, like content, media, users, members etc
-- */Umbraco.Web.Ui.Client/build/js/umbraco.mocks.js:* Fake Application resources, for running the app without a server
- 
-##Getting started
-The current app is built, following conventions from angularJs and bootstrap. To get started with the applicaton you will need to atleast know the basics of these frameworks 
-
-###AngularJS
-- Excellent introduction videos on http://www.egghead.io/
-- Official guide at: http://docs.angularjs.org/guide/
-
-###Require.js
-- Introduction: http://javascriptplayground.com/blog/2012/07/requirejs-amd-tutorial-introduction
-- Require.js website: http://requirejs.org/
-
-
-
-

From 8c998fd4e663a4ff6066d6a55207862e3c83aa4a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 30 Aug 2017 11:02:58 +1000
Subject: [PATCH 107/145] Creates a virtual ConfigureUmbracoUserManager in
 UmbracoDefaultOwinStartup so inheritors can just override that if they want
 to simplify the startup owin code process

---
 src/Umbraco.Web/UmbracoDefaultOwinStartup.cs | 21 +++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
index c11252d2ca..5773d88f73 100644
--- a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
+++ b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
@@ -37,12 +37,7 @@ namespace Umbraco.Web
         protected virtual void ConfigureServices(IAppBuilder app)
         {
             app.SetUmbracoLoggerFactory();
-
-            //Configure the Identity user manager for use with Umbraco Back office
-            // (EXPERT: an overload accepts a custom BackOfficeUserStore implementation)
-            app.ConfigureUserManagerForUmbracoBackOffice(
-                ApplicationContext,
-                Core.Security.MembershipProviderExtensions.GetUsersMembershipProvider().AsUmbracoMembershipProvider());            
+            ConfigureUmbracoUserManager(app);
         }
 
         /// <summary>
@@ -62,7 +57,19 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// Raised when the middelware has been configured
+        /// Configure the Identity user manager for use with Umbraco Back office
+        /// </summary>
+        /// <param name="app"></param>
+        protected virtual void ConfigureUmbracoUserManager(IAppBuilder app)
+        {
+            // (EXPERT: an overload accepts a custom BackOfficeUserStore implementation)
+            app.ConfigureUserManagerForUmbracoBackOffice(
+                ApplicationContext,
+                Core.Security.MembershipProviderExtensions.GetUsersMembershipProvider().AsUmbracoMembershipProvider());
+        }
+
+        /// <summary>
+        /// Raised when the middleware has been configured
         /// </summary>
         public static event EventHandler<OwinMiddlewareConfiguredEventArgs> MiddlewareConfigured;
 

From 0babb7f28ad48068cd992bea6222b7959d10bfa3 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 31 Aug 2017 17:57:01 +0200
Subject: [PATCH 108/145] deploy-358 - reduce allocations in
 CancellableEventArgs

---
 .../Events/CancellableEventArgs.cs            | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Core/Events/CancellableEventArgs.cs b/src/Umbraco.Core/Events/CancellableEventArgs.cs
index a245aeb367..7a10623427 100644
--- a/src/Umbraco.Core/Events/CancellableEventArgs.cs
+++ b/src/Umbraco.Core/Events/CancellableEventArgs.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Security.Permissions;
-using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Core.Events
 {
@@ -13,13 +12,15 @@ namespace Umbraco.Core.Events
 	public class CancellableEventArgs : EventArgs, IEquatable<CancellableEventArgs>
     {
 		private bool _cancel;
+        private Dictionary<string, object> _eventState;
+
+        private static readonly ReadOnlyDictionary<string, object> EmptyAdditionalData = new ReadOnlyDictionary<string, object>(new Dictionary<string, object>());
 
         public CancellableEventArgs(bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
         {
             CanCancel = canCancel;
             Messages = messages;
             AdditionalData = new ReadOnlyDictionary<string, object>(additionalData);
-            EventState = new Dictionary<string, object>();
         }
 
         public CancellableEventArgs(bool canCancel, EventMessages eventMessages)
@@ -27,8 +28,7 @@ namespace Umbraco.Core.Events
             if (eventMessages == null) throw new ArgumentNullException("eventMessages");
             CanCancel = canCancel;
             Messages = eventMessages;
-            AdditionalData = new ReadOnlyDictionary<string, object>(new Dictionary<string, object>());
-            EventState = new Dictionary<string, object>();
+            AdditionalData = EmptyAdditionalData;
         }
 
         public CancellableEventArgs(bool canCancel)
@@ -36,19 +36,16 @@ namespace Umbraco.Core.Events
 			CanCancel = canCancel;
             //create a standalone messages
             Messages = new EventMessages();
-            AdditionalData = new ReadOnlyDictionary<string, object>(new Dictionary<string, object>());
-		    EventState = new Dictionary<string, object>();
+		    AdditionalData = EmptyAdditionalData;
         }
 
         public CancellableEventArgs(EventMessages eventMessages)
             : this(true, eventMessages)
-        {
-        }
+        { }
 
         public CancellableEventArgs()
 			: this(true)
-		{
-		}
+		{ }
 
 		/// <summary>
 		/// Flag to determine if this instance will support being cancellable
@@ -98,16 +95,19 @@ namespace Umbraco.Core.Events
         /// In some cases raised evens might need to contain additional arbitrary readonly data which can be read by event subscribers
         /// </summary>
         /// <remarks>
-        /// This allows for a bit of flexibility in our event raising - it's not pretty but we need to maintain backwards compatibility 
+        /// This allows for a bit of flexibility in our event raising - it's not pretty but we need to maintain backwards compatibility
         /// so we cannot change the strongly typed nature for some events.
         /// </remarks>
         public ReadOnlyDictionary<string, object> AdditionalData { get; private set; }
 
         /// <summary>
-        /// This can be used by event subscribers to store state in the event args so they easily deal with custom state data between a starting ("ing") 
+        /// This can be used by event subscribers to store state in the event args so they easily deal with custom state data between a starting ("ing")
         /// event and an ending ("ed") event
-        /// </summary>
-        public IDictionary<string, object> EventState { get; private set; }
+        /// </summary>
+        public IDictionary<string, object> EventState
+        {
+            get { return _eventState ?? (_eventState = new Dictionary<string, object>()); }
+        }
 
 	    public bool Equals(CancellableEventArgs other)
 	    {
@@ -120,13 +120,13 @@ namespace Umbraco.Core.Events
 	    {
 	        if (ReferenceEquals(null, obj)) return false;
 	        if (ReferenceEquals(this, obj)) return true;
-	        if (obj.GetType() != this.GetType()) return false;
+	        if (obj.GetType() != GetType()) return false;
 	        return Equals((CancellableEventArgs) obj);
 	    }
 
 	    public override int GetHashCode()
 	    {
-	        return (AdditionalData != null ? AdditionalData.GetHashCode() : 0);
+	        return AdditionalData != null ? AdditionalData.GetHashCode() : 0;
 	    }
 
 	    public static bool operator ==(CancellableEventArgs left, CancellableEventArgs right)
@@ -136,7 +136,7 @@ namespace Umbraco.Core.Events
 
 	    public static bool operator !=(CancellableEventArgs left, CancellableEventArgs right)
 	    {
-	        return !Equals(left, right);
+	        return Equals(left, right) == false;
 	    }
 	}
 }
\ No newline at end of file

From 41e419a49eb11e8087586147f8e031c0c202e8b7 Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Fri, 1 Sep 2017 13:48:39 +0200
Subject: [PATCH 109/145] =?UTF-8?q?U4-10370=20Culture=20and=20hostnames=20?=
 =?UTF-8?q?with=20"=C3=A6=C3=B8=C3=A5"=20after=20/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Umbraco.Web/Routing/DomainHelper.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Routing/DomainHelper.cs b/src/Umbraco.Web/Routing/DomainHelper.cs
index 6934b08cf2..0a6c8fb8c7 100644
--- a/src/Umbraco.Web/Routing/DomainHelper.cs
+++ b/src/Umbraco.Web/Routing/DomainHelper.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
@@ -269,7 +270,7 @@ namespace Umbraco.Web.Routing
         /// <remarks>Eg the relative part of <c>/foo/bar/nil</c> to domain <c>example.com/foo</c> is <c>/bar/nil</c>.</remarks>
         public static string PathRelativeToDomain(Uri domainUri, string path)
         {
-            return path.Substring(domainUri.AbsolutePath.Length).EnsureStartsWith('/');
+            return Uri.EscapeUriString(path).Substring(domainUri.AbsolutePath.Length).EnsureStartsWith('/');
         }
 
         #endregion

From 22cef52261e10ab6a6c204673b3eeb7844a50fda Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Fri, 1 Sep 2017 13:50:51 +0200
Subject: [PATCH 110/145] removing using.

---
 src/Umbraco.Web/Routing/DomainHelper.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web/Routing/DomainHelper.cs b/src/Umbraco.Web/Routing/DomainHelper.cs
index 0a6c8fb8c7..ab2c14f009 100644
--- a/src/Umbraco.Web/Routing/DomainHelper.cs
+++ b/src/Umbraco.Web/Routing/DomainHelper.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;

From 207d6b53b53b797c81f6ee1494f9e1fc92d389dc Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@barend.se>
Date: Mon, 4 Sep 2017 11:22:56 +0200
Subject: [PATCH 111/145] Fixed .umb-panel-header-content-wrapper height

The .umb-panel-header-content-wrapper was 1 pixel higher than the parent .umb-panel-header, now both heights are 99px.
---
 src/Umbraco.Web.UI.Client/src/less/panel.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less
index 7c18b79c81..0b6505dfa7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/panel.less
@@ -356,7 +356,7 @@
 .umb-panel-header-content-wrapper {
   display: flex;
   flex-direction: column;
-  height: 100px;
+  height: 99px;
   padding: 0 20px;
 }
 

From 9a06c3a5ffe5e63853e3d4ee7d88c3871065e83c Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 4 Sep 2017 11:30:53 +0200
Subject: [PATCH 112/145] Implement
 ILocalizationService.GetDictionaryItemKeyMap

---
 .../Repositories/DictionaryRepository.cs      | 13 ++++++++
 .../Interfaces/IDictionaryRepository.cs       |  1 +
 .../Services/ILocalizationService.cs          |  6 ++++
 .../Services/LocalizationService.cs           |  9 ++++++
 .../Repositories/DictionaryRepositoryTest.cs  | 30 +++++++++++++++----
 5 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs
index 968c2d9cb0..7196165e6f 100644
--- a/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs
@@ -260,6 +260,19 @@ namespace Umbraco.Core.Persistence.Repositories
             return GetByQuery(query);
         }
 
+        public Dictionary<string, Guid> GetDictionaryItemKeyMap()
+        {
+            var columns = new[] { "key", "id" }.Select(x => (object) SqlSyntax.GetQuotedColumnName(x)).ToArray();
+            var sql = new Sql().Select(columns).From<DictionaryDto>(SqlSyntax);
+            return Database.Fetch<DictionaryItemKeyIdDto>(sql).ToDictionary(x => x.Key, x => x.Id);
+        }
+
+        private class DictionaryItemKeyIdDto
+        {
+            public string Key { get; set; }
+            public Guid Id { get; set; }
+        }
+
         public IEnumerable<IDictionaryItem> GetDictionaryItemDescendants(Guid? parentId)
         {
             //This methods will look up children at each level, since we do not store a path for dictionary (ATM), we need to do a recursive
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDictionaryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDictionaryRepository.cs
index d030bcda2a..5c120c76cb 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDictionaryRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDictionaryRepository.cs
@@ -9,5 +9,6 @@ namespace Umbraco.Core.Persistence.Repositories
         IDictionaryItem Get(Guid uniqueId);
         IDictionaryItem Get(string key);
         IEnumerable<IDictionaryItem> GetDictionaryItemDescendants(Guid? parentId);
+        Dictionary<string, Guid> GetDictionaryItemKeyMap();
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/ILocalizationService.cs b/src/Umbraco.Core/Services/ILocalizationService.cs
index e6563b7ee9..a49b8e203e 100644
--- a/src/Umbraco.Core/Services/ILocalizationService.cs
+++ b/src/Umbraco.Core/Services/ILocalizationService.cs
@@ -136,5 +136,11 @@ namespace Umbraco.Core.Services
         /// <param name="language"><see cref="ILanguage"/> to delete</param>
         /// <param name="userId">Optional id of the user deleting the language</param>
         void Delete(ILanguage language, int userId = 0);
+
+        /// <summary>
+        /// Gets the full dictionary key map.
+        /// </summary>
+        /// <returns>The full dictionary key map.</returns>
+        Dictionary<string, Guid> GetDictionaryItemKeyMap();
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/LocalizationService.cs b/src/Umbraco.Core/Services/LocalizationService.cs
index 12a2afb6ad..fa09d539ee 100644
--- a/src/Umbraco.Core/Services/LocalizationService.cs
+++ b/src/Umbraco.Core/Services/LocalizationService.cs
@@ -405,6 +405,15 @@ namespace Umbraco.Core.Services
             }
         }
 
+        public Dictionary<string, Guid> GetDictionaryItemKeyMap()
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateDictionaryRepository(uow);
+                return repository.GetDictionaryItemKeyMap();
+            }
+        }
+
         #region Event Handlers
         /// <summary>
         /// Occurs before Delete
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs
index 3a85978f40..5527817caa 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Moq;
 using NUnit.Framework;
@@ -122,7 +123,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 //re-get
                 dictionaryItem = repository.Get(dictionaryItem.Id);
-               
+
 
                 // Assert
                 Assert.That(dictionaryItem, Is.Not.Null);
@@ -140,10 +141,10 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             var provider = new PetaPocoUnitOfWorkProvider(Logger);
             var unitOfWork = provider.GetUnitOfWork();
-            
+
             using (var repository = CreateRepository(unitOfWork))
             {
-                var dictionaryItem = (IDictionaryItem) new DictionaryItem("Testing1235");                
+                var dictionaryItem = (IDictionaryItem) new DictionaryItem("Testing1235");
 
                 repository.AddOrUpdate(dictionaryItem);
                 unitOfWork.Commit();
@@ -160,7 +161,6 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         }
 
-
         [Test]
         public void Can_Perform_GetAll_On_DictionaryRepository()
         {
@@ -319,7 +319,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             unitOfWork.Commit();
 
             var dictionaryItem = (DictionaryItem)repository.Get(1);
-            
+
             // Assert
             Assert.That(dictionaryItem, Is.Not.Null);
             Assert.That(dictionaryItem.Translations.Count(), Is.EqualTo(3));
@@ -364,6 +364,24 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
         }
 
+        [Test]
+        public void Can_Perform_GetDictionaryItemKeyMap_On_DictionaryRepository()
+        {
+            Dictionary<string, Guid> keyMap;
+
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            using (var unitOfWork = provider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = CreateRepository(unitOfWork);
+                keyMap = repository.GetDictionaryItemKeyMap();
+            }
+
+            Assert.IsNotNull(keyMap);
+            Assert.IsNotEmpty(keyMap);
+            foreach (var kvp in keyMap)
+                Console.WriteLine("{0}: {1}", kvp.Key, kvp.Value);
+        }
+
         [TearDown]
         public override void TearDown()
         {

From 895faf41b1187c823f80081461b50b47c926f722 Mon Sep 17 00:00:00 2001
From: mikkelhm <mikkel@umbraco.com>
Date: Mon, 4 Sep 2017 12:28:16 +0200
Subject: [PATCH 113/145] Update version to 7.6.7

---
 build/UmbracoVersion.txt                         | 2 +-
 src/SolutionInfo.cs                              | 4 ++--
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt
index c9c45982be..dfbf91c009 100644
--- a/build/UmbracoVersion.txt
+++ b/build/UmbracoVersion.txt
@@ -1,2 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.6.6
\ No newline at end of file
+7.6.7
\ No newline at end of file
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 8563cc6b75..bf5ba3392f 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.6.6")]
-[assembly: AssemblyInformationalVersion("7.6.6")]
\ No newline at end of file
+[assembly: AssemblyFileVersion("7.6.7")]
+[assembly: AssemblyInformationalVersion("7.6.7")]
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 90de48ca2e..19b1c2c405 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.6.6");
+        private static readonly Version Version = new Version("7.6.7");
 
         /// <summary>
         /// Gets the current version of Umbraco.
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index a94ac9da58..86bca220a6 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -2379,9 +2379,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7660</DevelopmentServerPort>
+          <DevelopmentServerPort>7670</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7660</IISUrl>
+          <IISUrl>http://localhost:7670</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 2121b7c8a0d2980b0498ead1e1927f92a48ce134 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 4 Sep 2017 14:07:06 +0200
Subject: [PATCH 114/145] Node version

---
 build/BuildBelle.bat | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/BuildBelle.bat b/build/BuildBelle.bat
index 7f13d548dc..4d0be2c571 100644
--- a/build/BuildBelle.bat
+++ b/build/BuildBelle.bat
@@ -5,8 +5,8 @@ SETLOCAL
 SET toolsFolder=%CD%\tools\
 ECHO Current folder: %CD%
 
-SET nodeFileName=node-v6.9.1-win-x86.7z
-SET nodeExtractFolder=%toolsFolder%node.js.691
+SET nodeFileName=node-v6.11.2-win-x86.7z
+SET nodeExtractFolder=%toolsFolder%node.js.6112
 
 SET nuGetExecutable=%CD%\tools\nuget.exe
 IF NOT EXIST "%nuGetExecutable%" (
@@ -25,8 +25,8 @@ FOR /f "delims=" %%A in ('dir "%toolsFolder%7-Zip.CommandLine.*" /b') DO SET "se
 MOVE "%sevenZipExePath%tools\7za.exe" "%toolsFolder%7za.exe"
 
 IF NOT EXIST "%nodeExtractFolder%" (
-	ECHO Downloading http://nodejs.org/dist/v6.9.1/%nodeFileName% to %toolsFolder%%nodeFileName%
-	powershell -Command "(New-Object Net.WebClient).DownloadFile('http://nodejs.org/dist/v6.9.1/%nodeFileName%', '%toolsFolder%%nodeFileName%')"
+	ECHO Downloading http://nodejs.org/dist/v6.11.2/%nodeFileName% to %toolsFolder%%nodeFileName%
+	powershell -Command "(New-Object Net.WebClient).DownloadFile('http://nodejs.org/dist/v6.11.2/%nodeFileName%', '%toolsFolder%%nodeFileName%')"
 	ECHO Extracting %nodeFileName% to %nodeExtractFolder%
 	"%toolsFolder%\7za.exe" x "%toolsFolder%\%nodeFileName%" -o"%nodeExtractFolder%" -aos > nul
 )

From 344b52d10fcec4514e6d9d74dfd16d51df72b7e9 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 4 Sep 2017 17:04:48 +0200
Subject: [PATCH 115/145] deploy-391 - allow for id reservation

---
 src/Umbraco.Core/Constants-ObjectTypes.cs     |  2 ++
 .../Repositories/ContentRepository.cs         | 19 +++++++++-
 .../Repositories/MediaRepository.cs           | 35 ++++++++++++++-----
 src/Umbraco.Core/Services/EntityService.cs    | 29 +++++++++++++++
 src/Umbraco.Core/Services/IEntityService.cs   | 10 +++++-
 5 files changed, 84 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Core/Constants-ObjectTypes.cs b/src/Umbraco.Core/Constants-ObjectTypes.cs
index 4a79437c61..1fbc1ec62b 100644
--- a/src/Umbraco.Core/Constants-ObjectTypes.cs
+++ b/src/Umbraco.Core/Constants-ObjectTypes.cs
@@ -222,6 +222,8 @@ namespace Umbraco.Core
             /// Guid for a Forms DataSource.
             /// </summary>
             public static readonly Guid LanguageGuid = new Guid(Language);
+
+            public static readonly Guid IdReservationGuid = new Guid("92849B1E-3904-4713-9356-F646F87C25F4");
         }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
index eac9d197be..a01cbaa2e8 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
@@ -435,7 +435,24 @@ namespace Umbraco.Core.Persistence.Repositories
             nodeDto.Path = parent.Path;
             nodeDto.Level = short.Parse(level.ToString(CultureInfo.InvariantCulture));
             nodeDto.SortOrder = sortOrder;
-            var o = Database.IsNew(nodeDto) ? Convert.ToInt32(Database.Insert(nodeDto)) : Database.Update(nodeDto);
+
+            // note:
+            // there used to be a check on Database.IsNew(nodeDto) here to either Insert or Update,
+            // but I cannot figure out what was the point, as the node should obviously be new if
+            // we reach that point - removed.
+
+            // see if there's a reserved identifier for this unique id
+            var sql = new Sql("SELECT id FROM umbracoNode WHERE uniqueID=@0 AND nodeObjectType=@1", nodeDto.UniqueId, Constants.ObjectTypes.IdReservationGuid);
+            var id = Database.ExecuteScalar<int>(sql);
+            if (id > 0)
+            {
+                nodeDto.NodeId = id;
+                Database.Update(nodeDto);
+            }
+            else
+            {
+                Database.Insert(nodeDto);
+            }
 
             //Update with new correct path
             nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
index 598b16d78d..b22e8981b9 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
@@ -84,7 +84,7 @@ namespace Umbraco.Core.Persistence.Repositories
         #endregion
 
         #region Overrides of PetaPocoRepositoryBase<int,IMedia>
-        
+
         protected override Sql GetBaseQuery(BaseQueryType queryType)
         {
             var sql = new Sql();
@@ -153,7 +153,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// This is the underlying method that processes most queries for this repository
         /// </summary>
         /// <param name="sqlFull">
-        /// The full SQL to select all media data 
+        /// The full SQL to select all media data
         /// </param>
         /// <param name="pagingSqlQuery">
         /// The Id SQL to just return all media ids - used to process the properties for the media item
@@ -164,7 +164,7 @@ namespace Umbraco.Core.Persistence.Repositories
         {
             // fetch returns a list so it's ok to iterate it in this method
             var dtos = Database.Fetch<ContentVersionDto, ContentDto, NodeDto>(sqlFull);
-            
+
             //This is a tuple list identifying if the content item came from the cache or not
             var content = new List<Tuple<IMedia, bool>>();
             var defs = new DocumentDefinitionCollection();
@@ -180,7 +180,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 if (withCache)
                 {
                     var cached = IsolatedCache.GetCacheItem<IMedia>(GetCacheIdKey<IMedia>(dto.NodeId));
-                    //only use this cached version if the dto returned is the same version - this is just a safety check, media doesn't 
+                    //only use this cached version if the dto returned is the same version - this is just a safety check, media doesn't
                     //store different versions, but just in case someone corrupts some data we'll double check to be sure.
                     if (cached != null && cached.Version == dto.VersionId)
                     {
@@ -303,7 +303,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 .From<ContentXmlDto>(SqlSyntax)
                 .InnerJoin<NodeDto>(SqlSyntax)
                 .On<ContentXmlDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId);
-                
+
             if (contentTypeIdsA.Length > 0)
             {
                 xmlIdsQuery.InnerJoin<ContentDto>(SqlSyntax)
@@ -314,7 +314,7 @@ namespace Umbraco.Core.Persistence.Repositories
             }
 
             xmlIdsQuery.Where<NodeDto>(dto => dto.NodeObjectType == mediaObjectType, SqlSyntax);
-            
+
             var allXmlIds = Database.Fetch<int>(xmlIdsQuery);
 
             var toRemove = allXmlIds.Except(allMediaIds).ToArray();
@@ -380,7 +380,24 @@ namespace Umbraco.Core.Persistence.Repositories
             nodeDto.Path = parent.Path;
             nodeDto.Level = short.Parse(level.ToString(CultureInfo.InvariantCulture));
             nodeDto.SortOrder = sortOrder;
-            var o = Database.IsNew(nodeDto) ? Convert.ToInt32(Database.Insert(nodeDto)) : Database.Update(nodeDto);
+
+            // note:
+            // there used to be a check on Database.IsNew(nodeDto) here to either Insert or Update,
+            // but I cannot figure out what was the point, as the node should obviously be new if
+            // we reach that point - removed.
+
+            // see if there's a reserved identifier for this unique id
+            var sql = new Sql("SELECT id FROM umbracoNode WHERE uniqueID=@0 AND nodeObjectType=@1", nodeDto.UniqueId, Constants.ObjectTypes.IdReservationGuid);
+            var id = Database.ExecuteScalar<int>(sql);
+            if (id > 0)
+            {
+                nodeDto.NodeId = id;
+                Database.Update(nodeDto);
+            }
+            else
+            {
+                Database.Insert(nodeDto);
+            }
 
             //Update with new correct path
             nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
@@ -564,7 +581,7 @@ namespace Umbraco.Core.Persistence.Repositories
         private IMedia CreateMediaFromDto(ContentVersionDto dto, Sql docSql)
         {
             var contentType = _mediaTypeRepository.Get(dto.ContentDto.ContentTypeId);
-            
+
             var media = MediaFactory.BuildEntity(dto, contentType);
 
             var docDef = new DocumentDefinition(dto, contentType);
@@ -584,7 +601,7 @@ namespace Umbraco.Core.Persistence.Repositories
             if (EnsureUniqueNaming == false)
                 return nodeName;
 
-            var names = Database.Fetch<SimilarNodeName>("SELECT id, text AS name FROM umbracoNode WHERE nodeObjectType=@objectType AND parentId=@parentId", 
+            var names = Database.Fetch<SimilarNodeName>("SELECT id, text AS name FROM umbracoNode WHERE nodeObjectType=@objectType AND parentId=@parentId",
                 new { objectType = NodeObjectTypeId, parentId });
 
             return SimilarNodeName.GetUniqueName(names, id, nodeName);
diff --git a/src/Umbraco.Core/Services/EntityService.cs b/src/Umbraco.Core/Services/EntityService.cs
index 04d6c276b2..c10311dc01 100644
--- a/src/Umbraco.Core/Services/EntityService.cs
+++ b/src/Umbraco.Core/Services/EntityService.cs
@@ -646,5 +646,34 @@ namespace Umbraco.Core.Services
                 return exists;
             }
         }
+
+        /// <inheritdoc />
+        public int ReserveId(Guid key)
+        {
+            NodeDto node;
+            using (var scope = UowProvider.ScopeProvider.CreateScope())
+            {
+                var sql = new Sql("SELECT * FROM umbracoNode WHERE uniqueID=@0 AND nodeObjectType=@1", key, Constants.ObjectTypes.IdReservationGuid);
+                node = scope.Database.SingleOrDefault<NodeDto>(sql);
+                if (node != null) throw new InvalidOperationException("An identifier has already been reserved for this Udi.");
+                node = new NodeDto
+                {
+                    UniqueId = key,
+                    Text = "RESERVED.ID",
+                    NodeObjectType = Constants.ObjectTypes.IdReservationGuid,
+
+                    CreateDate = DateTime.Now,
+                    UserId = 0,
+                    ParentId = -1,
+                    Level = 1,
+                    Path = "-1",
+                    SortOrder = 0,
+                    Trashed = false
+                };
+                scope.Database.Insert(node);
+                scope.Complete();
+            }
+            return node.NodeId;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/IEntityService.cs b/src/Umbraco.Core/Services/IEntityService.cs
index 82e5227cf2..d1da84a1c8 100644
--- a/src/Umbraco.Core/Services/IEntityService.cs
+++ b/src/Umbraco.Core/Services/IEntityService.cs
@@ -170,7 +170,7 @@ namespace Umbraco.Core.Services
         /// <param name="totalRecords"></param>
         /// <param name="orderBy"></param>
         /// <param name="orderDirection"></param>
-        /// <param name="filter"></param>        
+        /// <param name="filter"></param>
         /// <returns></returns>
         IEnumerable<IUmbracoEntity> GetPagedDescendants(int id, UmbracoObjectTypes umbracoObjectType, long pageIndex, int pageSize, out long totalRecords,
             string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "");
@@ -270,5 +270,13 @@ namespace Umbraco.Core.Services
         /// <param name="umbracoObjectType"><see cref="UmbracoObjectTypes"/></param>
         /// <returns>Type of the entity</returns>
         Type GetEntityType(UmbracoObjectTypes umbracoObjectType);
+
+        /// <summary>
+        /// Reserves an identifier for a key.
+        /// </summary>
+        /// <param name="key">They key.</param>
+        /// <returns>The identifier.</returns>
+        /// <remarks>When a new content or a media is saved with the key, it will have the reserved identifier.</remarks>
+        int ReserveId(Guid key);
     }
 }
\ No newline at end of file

From 84fd5dc2ee52a713f5fe168ab38c1bcab8fbb285 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 4 Sep 2017 19:49:28 +0200
Subject: [PATCH 116/145] perfs - IContentService.IsPublishable

---
 src/Umbraco.Core/EnumerableExtensions.cs      | 11 +++
 src/Umbraco.Core/Services/ContentService.cs   | 67 +++++++------------
 .../Services/ContentServiceTests.cs           | 15 +++++
 3 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/src/Umbraco.Core/EnumerableExtensions.cs b/src/Umbraco.Core/EnumerableExtensions.cs
index e8565f3bc7..bb115b394d 100644
--- a/src/Umbraco.Core/EnumerableExtensions.cs
+++ b/src/Umbraco.Core/EnumerableExtensions.cs
@@ -295,5 +295,16 @@ namespace Umbraco.Core
             return list1Groups.Count == list2Groups.Count
                && list1Groups.All(g => g.Count() == list2Groups[g.Key].Count());
         }
+
+        public static IEnumerable<T> SkipLast<T>(this IEnumerable<T> source)
+        {
+            using (var e = source.GetEnumerator())
+            {
+                if (e.MoveNext() == false) yield break;
+
+                for (var value = e.Current; e.MoveNext(); value = e.Current)
+                    yield return value;
+            }
+        }
     }
 }
diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 09e6068ce1..913a83c1cd 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -903,15 +903,30 @@ namespace Umbraco.Core.Services
         /// <returns>True if the Content can be published, otherwise False</returns>
         public bool IsPublishable(IContent content)
         {
-            //If the passed in content has yet to be saved we "fallback" to checking the Parent
-            //because if the Parent is publishable then the current content can be Saved and Published
-            if (content.HasIdentity == false)
-            {
-                var parent = GetById(content.ParentId);
-                return IsPublishable(parent, true);
-            }
+            // get ids from path
+            // skip the first one that has to be -1 - and we don't care
+            // skip the last one that has to be "this" - and it's ok to stop at the parent
+            var ids = content.Path.Split(',').Skip(1).SkipLast().Select(int.Parse).ToArray();
+            if (ids.Length == 0)
+                return false;
 
-            return IsPublishable(content, false);
+            // if the first one is recycle bin, fail fast
+            if (ids[0] == Constants.System.RecycleBinContent)
+                return false;
+
+            // fixme - move to repository?
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var sql = new Sql(@"
+                    SELECT id 
+                    FROM umbracoNode
+                    JOIN cmsDocument ON umbracoNode.id=cmsDocument.nodeId AND cmsDocument.published=@0
+                    WHERE umbracoNode.trashed=@1 AND umbracoNode.id IN (@2)",
+                    true, false, ids);
+                Console.WriteLine(sql.SQL);
+                var x = uow.Database.Fetch<int>(sql);
+                return ids.Length == x.Count;
+            }
         }
 
         /// <summary>
@@ -1062,7 +1077,7 @@ namespace Umbraco.Core.Services
                         descendant.WriterId = userId;
                         descendant.ChangeTrashedState(true, descendant.ParentId);
                         repository.AddOrUpdate(descendant);
-                        
+
                         moveInfo.Add(new MoveEventInfo<IContent>(descendant, descendant.Path, descendant.ParentId));
                     }
 
@@ -2311,40 +2326,6 @@ namespace Umbraco.Core.Services
             }
         }
 
-        /// <summary>
-        /// Checks if the passed in <see cref="IContent"/> can be published based on the anscestors publish state.
-        /// </summary>
-        /// <remarks>
-        /// Check current is only used when falling back to checking the Parent of non-saved content, as
-        /// non-saved content doesn't have a valid path yet.
-        /// </remarks>
-        /// <param name="content"><see cref="IContent"/> to check if anscestors are published</param>
-        /// <param name="checkCurrent">Boolean indicating whether the passed in content should also be checked for published versions</param>
-        /// <returns>True if the Content can be published, otherwise False</returns>
-        private bool IsPublishable(IContent content, bool checkCurrent)
-        {
-            var ids = content.Path.Split(',').Select(int.Parse).ToList();
-            foreach (var id in ids)
-            {
-                //If Id equals that of the recycle bin we return false because nothing in the bin can be published
-                if (id == Constants.System.RecycleBinContent)
-                    return false;
-
-                //We don't check the System Root, so just continue
-                if (id == Constants.System.Root) continue;
-
-                //If the current id equals that of the passed in content and if current shouldn't be checked we skip it.
-                if (checkCurrent == false && id == content.Id) continue;
-
-                //Check if the content for the current id is published - escape the loop if we encounter content that isn't published
-                var hasPublishedVersion = HasPublishedVersion(id);
-                if (hasPublishedVersion == false)
-                    return false;
-            }
-
-            return true;
-        }
-
         private PublishStatusType CheckAndLogIsPublishable(IContent content)
         {
             //Check if parent is published (although not if its a root node) - if parent isn't published this Content cannot be published
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 79bf91716e..6c1f388ee5 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -998,6 +998,21 @@ namespace Umbraco.Tests.Services
             Assert.That(content.Published, Is.True);
         }
 
+        [Test]
+        public void IsPublishable()
+        {
+            // Arrange
+            var contentService = ServiceContext.ContentService;
+            var parent = contentService.CreateContent("parent", -1, "umbTextpage");
+            contentService.SaveAndPublishWithStatus(parent);
+            var content = contentService.CreateContent("child", parent, "umbTextpage");
+            contentService.Save(content);
+
+            Assert.IsTrue(contentService.IsPublishable(content));
+            contentService.UnPublish(parent);
+            Assert.IsFalse(contentService.IsPublishable(content));
+        }
+
         [Test]
         public void Can_Publish_Content_WithEvents()
         {

From e511554a427d20d675662a87add4abbd0fca2afb Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 4 Sep 2017 20:10:19 +0200
Subject: [PATCH 117/145] Adds less as a dependency so that the build can
 complete

---
 src/Umbraco.Web.UI.Client/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index d95652bba2..98b1102aa4 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -40,6 +40,7 @@
     "karma": "^1.7.0",
     "karma-jasmine": "^1.1.0",
     "karma-phantomjs-launcher": "^1.0.4",
+	"less": "^2.6.1",
     "lodash": "^4.16.3",
     "merge-stream": "^1.0.1",
     "run-sequence": "^2.1.0"

From ad19eb8dff7b48ee7898a4e98c20aa87b0ef3f32 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 4 Sep 2017 20:14:31 +0200
Subject: [PATCH 118/145] Update node version and remove unused npm reference

---
 build/BuildBelle.bat | 45 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/build/BuildBelle.bat b/build/BuildBelle.bat
index 4d0be2c571..cc6ce2202c 100644
--- a/build/BuildBelle.bat
+++ b/build/BuildBelle.bat
@@ -5,8 +5,10 @@ SETLOCAL
 SET toolsFolder=%CD%\tools\
 ECHO Current folder: %CD%
 
-SET nodeFileName=node-v6.11.2-win-x86.7z
-SET nodeExtractFolder=%toolsFolder%node.js.6112
+SET nodeVersion=6.11.2
+
+SET nodeFileName=node-v%nodeVersion%-win-x86.7z
+SET nodeExtractFolder=%toolsFolder%node.js.%nodeVersion%
 
 SET nuGetExecutable=%CD%\tools\nuget.exe
 IF NOT EXIST "%nuGetExecutable%" (
@@ -25,44 +27,41 @@ FOR /f "delims=" %%A in ('dir "%toolsFolder%7-Zip.CommandLine.*" /b') DO SET "se
 MOVE "%sevenZipExePath%tools\7za.exe" "%toolsFolder%7za.exe"
 
 IF NOT EXIST "%nodeExtractFolder%" (
-	ECHO Downloading http://nodejs.org/dist/v6.11.2/%nodeFileName% to %toolsFolder%%nodeFileName%
-	powershell -Command "(New-Object Net.WebClient).DownloadFile('http://nodejs.org/dist/v6.11.2/%nodeFileName%', '%toolsFolder%%nodeFileName%')"
+	ECHO Downloading http://nodejs.org/dist/v%nodeVersion%/%nodeFileName% to %toolsFolder%%nodeFileName%
+	powershell -Command "(New-Object Net.WebClient).DownloadFile('http://nodejs.org/dist/v%nodeVersion%/%nodeFileName%', '%toolsFolder%%nodeFileName%')"
 	ECHO Extracting %nodeFileName% to %nodeExtractFolder%
 	"%toolsFolder%\7za.exe" x "%toolsFolder%\%nodeFileName%" -o"%nodeExtractFolder%" -aos > nul
 )
 FOR /f "delims=" %%A in ('dir "%nodeExtractFolder%\node*" /b') DO SET "nodePath=%nodeExtractFolder%\%%A"
-
-SET drive=%CD:~0,2%
-SET nuGetFolder=%drive%\packages\
-FOR /f "delims=" %%A in ('dir "%nuGetFolder%npm.*" /b') DO SET "npmPath=%nuGetFolder%%%A\"
-
-IF [%npmPath%] == [] GOTO :installnpm 
-IF NOT [%npmPath%] == [] GOTO :build
-
-:installnpm
-	ECHO Downloading npm
-	ECHO Configured packages folder: %nuGetFolder%	
-	ECHO Installing Npm NuGet Package
-	"%nuGetExecutable%" install Npm -OutputDirectory %nuGetFolder% -Verbosity detailed
-	REM Ensures that we look for the just downloaded NPM, not whatever the user has installed on their machine
-	FOR /f "delims=" %%A in ('dir %nuGetFolder%npm.* /b') DO SET "npmPath=%nuGetFolder%%%A\"
-	GOTO :build
-
+	
 :build
-    ECHO Adding Npm and Node to path 
+    ECHO Adding Node to path 
     REM SETLOCAL is on, so changes to the path not persist to the actual user's path
-    PATH="%npmPath%";"%nodePath%";%PATH%
+    PATH="%nodePath%";%PATH%
+
+    ECHO Node version is: 
+    call node -v
+	
+    ECHO npm version is:
+    call npm -v
+
     SET buildFolder=%CD%
 
     ECHO Change directory to %CD%\..\src\Umbraco.Web.UI.Client\
     CD %CD%\..\src\Umbraco.Web.UI.Client\
 
     ECHO Do npm install and the gulp build of Belle
+	
+    ECHO Clean npm cache 
     call npm cache clean --quiet
 
+    ECHO Installing gulp cli
     call npm install -g gulp-cli --quiet
+    ECHO Installing bower
     call npm install -g bower --quiet
+    ECHO Doing npm install
     call npm install --quiet
+    ECHO Executing gulp build
     call gulp build --buildversion=%release%
 
     ECHO Move back to the build folder

From e7c231c5a87071ae24feb6900997509cc3a97715 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 5 Sep 2017 15:23:18 +0200
Subject: [PATCH 119/145] Support IdReservation in IdkMap

---
 src/Umbraco.Core/Constants-ObjectTypes.cs     | 10 +++++++++-
 src/Umbraco.Core/Models/UmbracoObjectTypes.cs |  9 ++++++++-
 src/Umbraco.Core/Services/IdkMap.cs           |  8 ++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Constants-ObjectTypes.cs b/src/Umbraco.Core/Constants-ObjectTypes.cs
index 1fbc1ec62b..a1e6e55ee9 100644
--- a/src/Umbraco.Core/Constants-ObjectTypes.cs
+++ b/src/Umbraco.Core/Constants-ObjectTypes.cs
@@ -223,7 +223,15 @@ namespace Umbraco.Core
             /// </summary>
             public static readonly Guid LanguageGuid = new Guid(Language);
 
-            public static readonly Guid IdReservationGuid = new Guid("92849B1E-3904-4713-9356-F646F87C25F4");
+            /// <summary>
+            /// Guid for an Identifier Reservation.
+            /// </summary>
+            public const string IdReservation = "92849B1E-3904-4713-9356-F646F87C25F4";
+
+            /// <summary>
+            /// Guid for an Identifier Reservation.
+            /// </summary>
+            public static readonly Guid IdReservationGuid = new Guid(IdReservation);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs
index d0136a10a4..d4caaef768 100644
--- a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs
+++ b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs
@@ -185,6 +185,13 @@ namespace Umbraco.Core.Models
         /// </summary>
         [UmbracoObjectType(Constants.ObjectTypes.Language)]
         [FriendlyName("Language")]
-        Language
+        Language,
+
+        /// <summary>
+        /// Reserved Identifier
+        /// </summary>
+        [UmbracoObjectType(Constants.ObjectTypes.IdReservation)]
+        [FriendlyName("Identifier Reservation")]
+        IdReservation
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/IdkMap.cs b/src/Umbraco.Core/Services/IdkMap.cs
index 015bb104dc..411316fca2 100644
--- a/src/Umbraco.Core/Services/IdkMap.cs
+++ b/src/Umbraco.Core/Services/IdkMap.cs
@@ -46,6 +46,10 @@ namespace Umbraco.Core.Services
 
             if (val == null) return Attempt<int>.Fail();
 
+            // cache reservations, when something is saved this cache is cleared anyways
+            //if (umbracoObjectType == UmbracoObjectTypes.IdReservation)
+            //    Attempt.Succeed(val.Value);
+
             try
             {
                 _locker.EnterWriteLock();
@@ -95,6 +99,10 @@ namespace Umbraco.Core.Services
 
             if (val == null) return Attempt<Guid>.Fail();
 
+            // cache reservations, when something is saved this cache is cleared anyways
+            //if (umbracoObjectType == UmbracoObjectTypes.IdReservation)
+            //    Attempt.Succeed(val.Value);
+
             try
             {
                 _locker.EnterWriteLock();

From 1578bc8cc7d5fe2d70cd00b255d278e77d6b822d Mon Sep 17 00:00:00 2001
From: Tom Fulton <tom.fulton-contractor@nreca.coop>
Date: Tue, 5 Sep 2017 13:20:18 -0400
Subject: [PATCH 120/145] U4-8886 - TinyMCE - highlight media picker toolbar
 icon when image selected

---
 src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 8753bb5316..86de5b586d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -87,6 +87,7 @@ function tinyMceService(dialogService, $log, imageHelper, $http, $timeout, macro
             editor.addButton('umbmediapicker', {
                 icon: 'custom icon-picture',
                 tooltip: 'Media Picker',
+                stateSelector: 'img',
                 onclick: function () {
 
                     var selectedElm = editor.selection.getNode(),

From 8d6c8ef282799dfe96082a3b31b205a967194543 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 6 Sep 2017 14:20:09 +0200
Subject: [PATCH 121/145] perfs - support LocalDb

---
 src/Umbraco.Core/CoreBootManager.cs     |  23 +
 src/Umbraco.Core/Persistence/LocalDb.cs | 959 ++++++++++++++++++++++++
 src/Umbraco.Core/Umbraco.Core.csproj    |   1 +
 3 files changed, 983 insertions(+)
 create mode 100644 src/Umbraco.Core/Persistence/LocalDb.cs

diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs
index dcce15f419..a0455d820a 100644
--- a/src/Umbraco.Core/CoreBootManager.cs
+++ b/src/Umbraco.Core/CoreBootManager.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Configuration;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Web;
 using AutoMapper;
@@ -399,6 +400,28 @@ namespace Umbraco.Core
             if (ApplicationContext.IsConfigured == false) return;
             if (ApplicationContext.DatabaseContext.IsDatabaseConfigured == false) return;
 
+            // deal with localdb
+            var databaseContext = ApplicationContext.DatabaseContext;
+            var localdbex = new Regex(@"\(localdb\)\\([a-zA-Z0-9-_]+)(;|$)");
+            var m = localdbex.Match(databaseContext.ConnectionString);
+            if (m.Success)
+            {
+                var instanceName = m.Groups[1].Value;
+                ProfilingLogger.Logger.Info<CoreBootManager>(string.Format("LocalDb instance \"{0}\"", instanceName));
+
+                var localDb = new LocalDb();
+                if (localDb.IsAvailable == false)
+                    throw new UmbracoStartupFailedException("Umbraco cannot start. LocalDb is not available.");
+
+                if (localDb.InstanceExists(m.Groups[1].Value) == false)
+                {
+                    if (localDb.CreateInstance(instanceName) == false)
+                        throw new UmbracoStartupFailedException(string.Format("Umbraco cannot start. LocalDb cannot create instance \"{0}\".", instanceName));
+                    if (localDb.StartInstance(instanceName) == false)
+                        throw new UmbracoStartupFailedException(string.Format("Umbraco cannot start. LocalDb cannot start instance \"{0}\".", instanceName));
+                }
+            }
+
             //try now
             if (ApplicationContext.DatabaseContext.CanConnect)
                 return;
diff --git a/src/Umbraco.Core/Persistence/LocalDb.cs b/src/Umbraco.Core/Persistence/LocalDb.cs
new file mode 100644
index 0000000000..084122ac3a
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/LocalDb.cs
@@ -0,0 +1,959 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+
+namespace Umbraco.Core.Persistence
+{
+    /// <summary>
+    /// Manages LocalDB databases.
+    /// </summary>
+    /// <remarks>
+    /// <para>Latest version is SQL Server 2016 Express LocalDB,
+    /// see https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/sql-server-2016-express-localdb
+    /// which can be installed by downloading the Express installer from https://www.microsoft.com/en-us/sql-server/sql-server-downloads
+    /// (about 5MB) then select 'download media' to download SqlLocalDB.msi (about 44MB), which you can execute. This installs
+    /// LocalDB only. Though you probably want to install the full Express. You may also want to install SQL Server Management
+    /// Studio which can be used to connect to LocalDB databases.</para>
+    /// <para>See also https://github.com/ritterim/automation-sql which is a somewhat simpler version of this.</para>
+    /// </remarks>
+    public class LocalDb
+    {
+        private int _version;
+        private bool _hasVersion;
+
+        #region Availability & Version
+
+        /// <summary>
+        /// Gets the LocalDb installed version.
+        /// </summary>
+        /// <remarks>If more than one version is installed, returns the highest available. Returns
+        /// the major version as an integer e.g. 11, 12...</remarks>
+        /// <exception cref="InvalidOperationException">Thrown when LocalDb is not available.</exception>
+        public int Version
+        {
+            get
+            {
+                EnsureVersion();
+                if (_version <= 0)
+                    throw new InvalidOperationException("LocalDb is not available.");
+                return _version;
+            }
+        }
+
+        /// <summary>
+        /// Ensures that the LocalDb version is detected.
+        /// </summary>
+        private void EnsureVersion()
+        {
+            if (_hasVersion) return;
+            DetectVersion();
+            _hasVersion = true;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether LocalDb is available.
+        /// </summary>
+        public bool IsAvailable
+        {
+            get
+            {
+                EnsureVersion();
+                return _version > 0;
+            }
+        }
+
+        /// <summary>
+        /// Ensures that LocalDb is available.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">Thrown when LocalDb is not available.</exception>
+        private void EnsureAvailable()
+        {
+            if (IsAvailable == false)
+                throw new InvalidOperationException("LocalDb is not available.");
+        }
+
+        /// <summary>
+        /// Detects LocalDb installed version.
+        /// </summary>
+        /// <remarks>If more than one version is installed, the highest available is detected.</remarks>
+        private void DetectVersion()
+        {
+            _hasVersion = true;
+            _version = -1;
+
+            var programFiles = Environment.GetEnvironmentVariable("ProgramFiles");
+            if (programFiles == null) return;
+
+            // detect 14, 13, 12, 11
+            for (var i = 14; i > 10; i--)
+            {
+                var path = Path.Combine(programFiles, string.Format(@"Microsoft SQL Server\{0}0\Tools\Binn\SqlLocalDB.exe", i));
+                if (File.Exists(path) == false) continue;
+                _version = i;
+                break;
+            }
+        }
+
+        #endregion
+
+        #region Instances
+
+        /// <summary>
+        /// Gets the name of existing LocalDb instances.
+        /// </summary>
+        /// <returns>The name of existing LocalDb instances.</returns>
+        /// <exception cref="InvalidOperationException">Thrown when LocalDb is not available.</exception>
+        public string[] GetInstances()
+        {
+            EnsureAvailable();
+            string output, error;
+            var rc = ExecuteSqlLocalDb("i", out output, out error); // info
+            if (rc != 0 || error != string.Empty) return null;
+            return output.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether a LocalDb instance exists.
+        /// </summary>
+        /// <param name="instanceName">The name of the instance.</param>
+        /// <returns>A value indicating whether a LocalDb instance with the specified name exists.</returns>
+        /// <exception cref="InvalidOperationException">Thrown when LocalDb is not available.</exception>
+        public bool InstanceExists(string instanceName)
+        {
+            EnsureAvailable();
+            var instances = GetInstances();
+            return instances != null && instances.Contains(instanceName);
+        }
+
+        /// <summary>
+        /// Creates a LocalDb instance.
+        /// </summary>
+        /// <param name="instanceName">The name of the instance.</param>
+        /// <returns>A value indicating whether the instance was created without errors.</returns>
+        /// <exception cref="InvalidOperationException">Thrown when LocalDb is not available.</exception>
+        public bool CreateInstance(string instanceName)
+        {
+            EnsureAvailable();
+            string output, error;
+            return ExecuteSqlLocalDb(string.Format("c \"{0}\"", instanceName), out output, out error) == 0 && error == string.Empty;
+        }
+
+        /// <summary>
+        /// Drops a LocalDb instance.
+        /// </summary>
+        /// <param name="instanceName">The name of the instance.</param>
+        /// <returns>A value indicating whether the instance was dropped without errors.</returns>
+        /// <exception cref="InvalidOperationException">Thrown when LocalDb is not available.</exception>
+        /// <remarks>
+        /// When an instance is dropped all the attached database files are deleted.
+        /// Successful if the instance does not exist.
+        /// </remarks>
+        public bool DropInstance(string instanceName)
+        {
+            EnsureAvailable();
+            var instance = GetInstance(instanceName);
+            if (instance == null) return true;
+            instance.DropDatabases(); // else the files remain
+
+            // -i force NOWAIT, -k kills
+            string output, error;
+            return ExecuteSqlLocalDb(string.Format("p \"{0}\" -i", instanceName), out output, out error) == 0 && error == string.Empty
+                   && ExecuteSqlLocalDb(string.Format("d \"{0}\"", instanceName), out output, out error) == 0 && error == string.Empty;
+        }
+
+        /// <summary>
+        /// Stops a LocalDb instance.
+        /// </summary>
+        /// <param name="instanceName">The name of the instance.</param>
+        /// <returns>A value indicating whether the instance was stopped without errors.</returns>
+        /// <exception cref="InvalidOperationException">Thrown when LocalDb is not available.</exception>
+        /// <remarks>
+        /// Successful if the instance does not exist.
+        /// </remarks>
+        public bool StopInstance(string instanceName)
+        {
+            EnsureAvailable();
+            if (InstanceExists(instanceName) == false) return true;
+
+            // -i force NOWAIT, -k kills
+            string output, error;
+            return ExecuteSqlLocalDb(string.Format("p \"{0}\" -i", instanceName), out output, out error) == 0 && error == string.Empty;
+        }
+
+        /// <summary>
+        /// Stops a LocalDb instance.
+        /// </summary>
+        /// <param name="instanceName">The name of the instance.</param>
+        /// <returns>A value indicating whether the instance was started without errors.</returns>
+        /// <exception cref="InvalidOperationException">Thrown when LocalDb is not available.</exception>
+        /// <remarks>
+        /// Failed if the instance does not exist.
+        /// </remarks>
+        public bool StartInstance(string instanceName)
+        {
+            EnsureAvailable();
+            if (InstanceExists(instanceName) == false) return false;
+            string output, error;
+            return ExecuteSqlLocalDb(string.Format("s \"{0}\"", instanceName), out output, out error) == 0 && error == string.Empty;
+        }
+
+        /// <summary>
+        /// Gets a LocalDb instance.
+        /// </summary>
+        /// <param name="instanceName">The name of the instance.</param>
+        /// <returns>The instance with the specified name if it exists, otherwise null.</returns>
+        /// <exception cref="InvalidOperationException">Thrown when LocalDb is not available.</exception>
+        public Instance GetInstance(string instanceName)
+        {
+            EnsureAvailable();
+            return InstanceExists(instanceName) ? new Instance(instanceName) : null;
+        }
+
+        #endregion
+
+        #region Databases
+
+        /// <summary>
+        /// Represents a LocalDb instance.
+        /// </summary>
+        /// <remarks>
+        /// LocalDb is assumed to be available, and the instance is assumed to exist.
+        /// </remarks>
+        public class Instance
+        {
+            private readonly string _masterCstr;
+
+            /// <summary>
+            /// Gets the name of the instance.
+            /// </summary>
+            public string InstanceName { get; private set; }
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="Instance"/> class.
+            /// </summary>
+            /// <param name="instanceName"></param>
+            public Instance(string instanceName)
+            {
+                InstanceName = instanceName;
+                _masterCstr = string.Format(@"Server=(localdb)\{0};Integrated Security=True;", instanceName);
+            }
+
+            /// <summary>
+            /// Gets a LocalDb connection string.
+            /// </summary>
+            /// <param name="databaseName">The name of the database.</param>
+            /// <returns>The connection string for the specified database.</returns>
+            /// <remarks>
+            /// The database should exist in the LocalDb instance.
+            /// </remarks>
+            public string GetConnectionString(string databaseName)
+            {
+                return _masterCstr + string.Format(@"Database={0};", databaseName);
+            }
+
+            /// <summary>
+            /// Gets a LocalDb connection string for an attached database.
+            /// </summary>
+            /// <param name="databaseName">The name of the database.</param>
+            /// <param name="filesPath">The directory containing database files.</param>
+            /// <returns>The connection string for the specified database.</returns>
+            /// <remarks>
+            /// The database should not exist in the LocalDb instance.
+            /// It will be attached with its name being its MDF filename (full path), uppercased, when
+            /// the first connection is opened, and remain attached until explicitely detached.
+            /// </remarks>
+            public string GetAttachedConnectionString(string databaseName, string filesPath)
+            {
+                string logName, baseFilename, baseLogFilename, mdfFilename, ldfFilename;
+                GetDatabaseFiles(databaseName, filesPath, out logName, out baseFilename, out baseLogFilename, out mdfFilename, out ldfFilename);
+
+                return _masterCstr + string.Format(@"AttachDbFileName='{0}';", mdfFilename);
+            }
+
+            /// <summary>
+            /// Gets the name of existing databases.
+            /// </summary>
+            /// <returns>The name of existing databases.</returns>
+            public string[] GetDatabases()
+            {
+                var userDatabases = new List<string>();
+
+                using (var conn = new SqlConnection(_masterCstr))
+                using (var cmd = conn.CreateCommand())
+                {
+                    conn.Open();
+
+                    var databases = new Dictionary<string, string>();
+
+                    SetCommand(cmd, @"
+                        SELECT name, filename FROM sys.sysdatabases");
+
+                    using (var reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            databases[reader.GetString(0)] = reader.GetString(1);
+                        }
+                    }
+
+                    foreach (var database in databases)
+                    {
+                        var dbname = database.Key;
+
+                        if (dbname == "master" || dbname == "tempdb" || dbname == "model" || dbname == "msdb")
+                            continue;
+
+                        // fixme - shall we deal with stale databases?
+                        // fixme - is it always ok to assume file names?
+                        //var mdf = database.Value;
+                        //var ldf = mdf.Replace(".mdf", "_log.ldf");
+                        //if (staleOnly && File.Exists(mdf) && File.Exists(ldf))
+                        //    continue;
+
+                        //ExecuteDropDatabase(cmd, dbname, mdf, ldf);
+                        //count++;
+
+                        userDatabases.Add(dbname);
+                    }
+                }
+
+                return userDatabases.ToArray();
+            }
+
+            /// <summary>
+            /// Gets a value indicating whether a database exists.
+            /// </summary>
+            /// <param name="databaseName">The name of the database.</param>
+            /// <returns>A value indicating whether a database with the specified name exists.</returns>
+            /// <remarks>
+            /// A database exists if it is registered in the instance, and its files exist. If the database
+            /// is registered but some of its files are missing, the database is dropped.
+            /// </remarks>
+            public bool DatabaseExists(string databaseName)
+            {
+                using (var conn = new SqlConnection(_masterCstr))
+                using (var cmd = conn.CreateCommand())
+                {
+                    conn.Open();
+
+                    var mdf = GetDatabase(cmd, databaseName);
+                    if (mdf == null) return false;
+
+                    // it can exist, even though its files have been deleted
+                    // if files exist assume all is ok (should we try to connect?)
+                    var ldf = GetLogFilename(mdf);
+                    if (File.Exists(mdf) && File.Exists(ldf))
+                        return true;
+
+                    ExecuteDropDatabase(cmd, databaseName, mdf, ldf);
+                }
+
+                return false;
+            }
+
+            /// <summary>
+            /// Creates a new database.
+            /// </summary>
+            /// <param name="databaseName">The name of the database.</param>
+            /// <param name="filesPath">The directory containing database files.</param>
+            /// <returns>A value indicating whether the database was created without errors.</returns>
+            /// <remarks>
+            /// Failed if a database with the specified name already exists in the instance,
+            /// or if the database files already exist in the specified directory.
+            /// </remarks>
+            public bool CreateDatabase(string databaseName, string filesPath)
+            {
+                string logName, baseFilename, baseLogFilename, mdfFilename, ldfFilename;
+                GetDatabaseFiles(databaseName, filesPath, out logName, out baseFilename, out baseLogFilename, out mdfFilename, out ldfFilename);
+
+                using (var conn = new SqlConnection(_masterCstr))
+                using (var cmd = conn.CreateCommand())
+                {
+                    conn.Open();
+
+                    var mdf = GetDatabase(cmd, databaseName);
+                    if (mdf != null) return false;
+
+                    // cannot use parameters on CREATE DATABASE
+                    // ie "CREATE DATABASE @0 ..." does not work
+                    SetCommand(cmd, string.Format(@"
+                        CREATE DATABASE {0} 
+                            ON (NAME=N{1}, FILENAME={2})
+                            LOG ON (NAME=N{3}, FILENAME={4})",
+                        QuotedName(databaseName),
+                        QuotedName(databaseName, '\''), QuotedName(mdfFilename, '\''),
+                        QuotedName(logName, '\''), QuotedName(ldfFilename, '\'')));
+
+                    var unused = cmd.ExecuteNonQuery();
+                }
+                return true;
+            }
+
+            /// <summary>
+            /// Drops a database.
+            /// </summary>
+            /// <param name="databaseName">The name of the database.</param>
+            /// <returns>A value indicating whether the database was dropped without errors.</returns>
+            /// <remarks>
+            /// Successful if the database does not exist.
+            /// Deletes the database files.
+            /// </remarks>
+            public bool DropDatabase(string databaseName)
+            {
+                using (var conn = new SqlConnection(_masterCstr))
+                using (var cmd = conn.CreateCommand())
+                {
+                    conn.Open();
+
+                    SetCommand(cmd, @"
+                        SELECT name, filename FROM master.dbo.sysdatabases WHERE ('[' + name + ']' = @0 OR name = @0)",
+                        databaseName);
+
+                    var mdf = GetDatabase(cmd, databaseName);
+                    if (mdf == null) return true;
+
+                    ExecuteDropDatabase(cmd, databaseName, mdf);
+                }
+
+                return true;
+            }
+
+            /// <summary>
+            /// Drops stale databases.
+            /// </summary>
+            /// <returns>The number of databases that were dropped.</returns>
+            /// <remarks>
+            /// A database is considered stale when its files cannot be found.
+            /// </remarks>
+            public int DropStaleDatabases()
+            {
+                return DropDatabases(true);
+            }
+
+            /// <summary>
+            /// Drops databases.
+            /// </summary>
+            /// <param name="staleOnly">A value indicating whether to delete only stale database.</param>
+            /// <returns>The number of databases that were dropped.</returns>
+            /// <remarks>
+            /// A database is considered stale when its files cannot be found.
+            /// </remarks>
+            public int DropDatabases(bool staleOnly = false)
+            {
+                var count = 0;
+                using (var conn = new SqlConnection(_masterCstr))
+                using (var cmd = conn.CreateCommand())
+                {
+                    conn.Open();
+
+                    var databases = new Dictionary<string, string>();
+
+                    SetCommand(cmd, @"
+                        SELECT name, filename FROM sys.sysdatabases");
+
+                    using (var reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            databases[reader.GetString(0)] = reader.GetString(1);
+                        }
+                    }
+
+                    foreach (var database in databases)
+                    {
+                        var dbname = database.Key;
+
+                        if (dbname == "master" || dbname == "tempdb" || dbname == "model" || dbname == "msdb")
+                            continue;
+
+                        var mdf = database.Value;
+                        var ldf = mdf.Replace(".mdf", "_log.ldf");
+                        if (staleOnly && File.Exists(mdf) && File.Exists(ldf))
+                            continue;
+
+                        ExecuteDropDatabase(cmd, dbname, mdf, ldf);
+                        count++;
+                    }
+                }
+
+                return count;
+            }
+
+            /// <summary>
+            /// Detaches a database.
+            /// </summary>
+            /// <param name="databaseName">The name of the database.</param>
+            /// <returns>The directory containing the database files.</returns>
+            /// <exception cref="InvalidOperationException">Thrown when a database with the specified name does not exist.</exception>
+            public string DetachDatabase(string databaseName)
+            {
+                using (var conn = new SqlConnection(_masterCstr))
+                using (var cmd = conn.CreateCommand())
+                {
+                    conn.Open();
+
+                    var mdf = GetDatabase(cmd, databaseName);
+                    if (mdf == null)
+                        throw new InvalidOperationException("Database does not exist.");
+
+                    DetachDatabase(cmd, databaseName);
+
+                    return Path.GetDirectoryName(mdf);
+                }
+            }
+
+            /// <summary>
+            /// Attaches a database.
+            /// </summary>
+            /// <param name="databaseName">The name of the database.</param>
+            /// <param name="filesPath">The directory containing database files.</param>
+            /// <exception cref="InvalidOperationException">Thrown when a database with the specified name already exists.</exception>
+            public void AttachDatabase(string databaseName, string filesPath)
+            {
+                using (var conn = new SqlConnection(_masterCstr))
+                using (var cmd = conn.CreateCommand())
+                {
+                    conn.Open();
+
+                    var mdf = GetDatabase(cmd, databaseName);
+                    if (mdf != null)
+                        throw new InvalidOperationException("Database already exists.");
+
+                    AttachDatabase(cmd, databaseName, filesPath);
+                }
+            }
+
+            /// <summary>
+            /// Gets the file names of a database.
+            /// </summary>
+            /// <param name="databaseName">The name of the database.</param>
+            /// <param name="mdfName">The MDF logical name.</param>
+            /// <param name="ldfName">The LDF logical name.</param>
+            /// <param name="mdfFilename">The MDF filename.</param>
+            /// <param name="ldfFilename">The LDF filename.</param>
+            public void GetFilenames(string databaseName,
+                out string mdfName, out string ldfName,
+                out string mdfFilename, out string ldfFilename)
+            {
+                using (var conn = new SqlConnection(_masterCstr))
+                using (var cmd = conn.CreateCommand())
+                {
+                    conn.Open();
+
+                    GetFilenames(cmd, databaseName, out mdfName, out ldfName, out mdfFilename, out ldfFilename);
+                }
+            }
+
+            /// <summary>
+            /// Kills all existing connections.
+            /// </summary>
+            /// <param name="databaseName">The name of the database.</param>
+            public void KillConnections(string databaseName)
+            {
+                using (var conn = new SqlConnection(_masterCstr))
+                using (var cmd = conn.CreateCommand())
+                {
+                    conn.Open();
+
+                    SetCommand(cmd, @"
+                        DECLARE @sql VARCHAR(MAX);
+                        SELECT @sql = COALESCE(@sql,'') + 'kill ' + CONVERT(VARCHAR, SPId) + ';'
+                            FROM master.sys.sysprocesses
+                            WHERE DBId = DB_ID(@0) AND SPId <> @@SPId;
+                        EXEC(@sql);",
+                        databaseName);
+                    cmd.ExecuteNonQuery();
+                }
+            }
+
+            /// <summary>
+            /// Gets a database.
+            /// </summary>
+            /// <param name="cmd">The Sql Command.</param>
+            /// <param name="databaseName">The name of the database.</param>
+            /// <returns>The full filename of the MDF file, if the database exists, otherwise null.</returns>
+            private static string GetDatabase(SqlCommand cmd, string databaseName)
+            {
+                SetCommand(cmd, @"
+                    SELECT name, filename FROM master.dbo.sysdatabases WHERE ('[' + name + ']' = @0 OR name = @0)",
+                    databaseName);
+
+                string mdf = null;
+                using (var reader = cmd.ExecuteReader())
+                {
+                    if (reader.Read())
+                        mdf = reader.GetString(1) ?? string.Empty;
+                    while (reader.Read())
+                    {
+                    }
+                }
+
+                return mdf;
+            }
+
+            /// <summary>
+            /// Drops a database and its files.
+            /// </summary>
+            /// <param name="cmd">The Sql command.</param>
+            /// <param name="databaseName">The name of the database.</param>
+            /// <param name="mdf">The name of the database (MDF) file.</param>
+            /// <param name="ldf">The name of the log (LDF) file.</param>
+            private static void ExecuteDropDatabase(SqlCommand cmd, string databaseName, string mdf, string ldf = null)
+            {
+                try
+                {
+                    // cannot use parameters on ALTER DATABASE
+                    // ie "ALTER DATABASE @0 ..." does not work
+                    SetCommand(cmd, string.Format(@"
+                        ALTER DATABASE {0} SET SINGLE_USER WITH ROLLBACK IMMEDIATE",
+                        QuotedName(databaseName)));
+
+                    var unused1 = cmd.ExecuteNonQuery();
+                }
+                catch (SqlException e)
+                {
+                    if (e.Message.Contains("Unable to open the physical file") && e.Message.Contains("Operating system error 2:"))
+                    {
+                        // quite probably, the files were missing
+                        // yet, it should be possible to drop the database anyways
+                        // but we'll have to deal with the files
+                    }
+                    else
+                    {
+                        // no idea, throw
+                        throw;
+                    }
+                }
+
+                // cannot use parameters on DROP DATABASE
+                // ie "DROP DATABASE @0 ..." does not work
+                SetCommand(cmd, string.Format(@"
+                    DROP DATABASE {0}",
+                    QuotedName(databaseName)));
+
+                var unused2 = cmd.ExecuteNonQuery();
+
+                // be absolutely sure
+                if (File.Exists(mdf)) File.Delete(mdf);
+                ldf = ldf ?? GetLogFilename(mdf);
+                if (File.Exists(ldf)) File.Delete(ldf);
+            }
+
+            /// <summary>
+            /// Gets the log (LDF) filename corresponding to a database (MDF) filename.
+            /// </summary>
+            /// <param name="mdfFilename">The MDF filename.</param>
+            /// <returns></returns>
+            private static string GetLogFilename(string mdfFilename)
+            {
+                if (mdfFilename.EndsWith(".mdf") == false)
+                    throw new ArgumentException("Not a valid MDF filename (no .mdf extension).", "mdfFilename");
+                return mdfFilename.Substring(0, mdfFilename.Length - ".mdf".Length) + "_log.ldf";
+            }
+
+            /// <summary>
+            /// Detaches a database.
+            /// </summary>
+            /// <param name="cmd">The Sql command.</param>
+            /// <param name="databaseName">The name of the database.</param>
+            private static void DetachDatabase(SqlCommand cmd, string databaseName)
+            {
+                // cannot use parameters on ALTER DATABASE
+                // ie "ALTER DATABASE @0 ..." does not work
+                SetCommand(cmd, string.Format(@"
+                    ALTER DATABASE {0} SET SINGLE_USER WITH ROLLBACK IMMEDIATE",
+                    QuotedName(databaseName)));
+
+                var unused1 = cmd.ExecuteNonQuery();
+
+                SetCommand(cmd, @"
+                    EXEC sp_detach_db @dbname=@0",
+                    databaseName);
+
+                var unused2 = cmd.ExecuteNonQuery();
+            }
+
+            /// <summary>
+            /// Attaches a database.
+            /// </summary>
+            /// <param name="cmd">The Sql command.</param>
+            /// <param name="databaseName">The name of the database.</param>
+            /// <param name="filesPath">The directory containing database files.</param>
+            private static void AttachDatabase(SqlCommand cmd, string databaseName, string filesPath)
+            {
+                string logName, baseFilename, baseLogFilename, mdfFilename, ldfFilename;
+                GetDatabaseFiles(databaseName, filesPath, out logName, out baseFilename, out baseLogFilename, out mdfFilename, out ldfFilename);
+
+                // cannot use parameters on CREATE DATABASE
+                // ie "CREATE DATABASE @0 ..." does not work
+                SetCommand(cmd, string.Format(@"
+                        CREATE DATABASE {0} 
+                            ON (NAME=N{1}, FILENAME={2})
+                            LOG ON (NAME=N{3}, FILENAME={4})
+                            FOR ATTACH",
+                    QuotedName(databaseName),
+                    QuotedName(databaseName, '\''), QuotedName(mdfFilename, '\''),
+                    QuotedName(logName, '\''), QuotedName(ldfFilename, '\'')));
+
+                var unused = cmd.ExecuteNonQuery();
+            }
+
+            /// <summary>
+            /// Sets a database command.
+            /// </summary>
+            /// <param name="cmd">The command.</param>
+            /// <param name="sql">The command text.</param>
+            /// <param name="args">The command arguments.</param>
+            /// <remarks>
+            /// The command text must refer to arguments as @0, @1... each referring
+            /// to the corresponding position in <paramref name="args"/>.
+            /// </remarks>
+            private static void SetCommand(SqlCommand cmd, string sql, params object[] args)
+            {
+                cmd.CommandType = CommandType.Text;
+                cmd.CommandText = sql;
+                cmd.Parameters.Clear();
+                for (var i = 0; i < args.Length; i++)
+                    cmd.Parameters.AddWithValue("@" + i, args[i]);
+            }
+
+            /// <summary>
+            /// Gets the file names of a database.
+            /// </summary>
+            /// <param name="cmd">The Sql command.</param>
+            /// <param name="databaseName">The name of the database.</param>
+            /// <param name="mdfName">The MDF logical name.</param>
+            /// <param name="ldfName">The LDF logical name.</param>
+            /// <param name="mdfFilename">The MDF filename.</param>
+            /// <param name="ldfFilename">The LDF filename.</param>
+            private void GetFilenames(SqlCommand cmd, string databaseName,
+                out string mdfName, out string ldfName,
+                out string mdfFilename, out string ldfFilename)
+            {
+                mdfName = ldfName = mdfFilename = ldfFilename = null;
+
+                SetCommand(cmd, @"
+                    SELECT DB_NAME(database_id), type_desc, name, physical_name
+                    FROM master.sys.master_files
+                    WHERE database_id=DB_ID(@0)",
+                    databaseName);
+                using (var reader = cmd.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        var type = reader.GetString(1);
+                        if (type == "ROWS")
+                        {
+                            mdfName = reader.GetString(2);
+                            ldfName = reader.GetString(3);
+                        }
+                        else if (type == "LOG")
+                        {
+                            ldfName = reader.GetString(2);
+                            ldfFilename = reader.GetString(3);
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Copy database files.
+        /// </summary>
+        /// <param name="databaseName">The name of the source database.</param>
+        /// <param name="filesPath">The directory containing source database files.</param>
+        /// <param name="targetDatabaseName">The name of the target database.</param>
+        /// <param name="targetFilesPath">The directory containing target database files.</param>
+        /// <param name="sourceExtension">The source database files extension.</param>
+        /// <param name="targetExtension">The target database files extension.</param>
+        /// <param name="overwrite">A value indicating whether to overwrite the target files.</param>
+        /// <param name="delete">A value indicating whether to delete the source files.</param>
+        /// <remarks>
+        /// The <paramref name="targetDatabaseName"/>, <paramref name="targetFilesPath"/>, <paramref name="sourceExtension"/>
+        /// and <paramref name="targetExtension"/> parameters are optional. If they result in target being identical
+        /// to source, no copy is performed. If <paramref name="delete"/> is false, nothing happens, otherwise the source
+        /// files are deleted.
+        /// If target is not identical to source, files are copied or moved, depending on the value of <paramref name="delete"/>.
+        /// Extensions are used eg to copy MyDatabase.mdf to MyDatabase.mdf.temp.
+        /// </remarks>
+        public void CopyDatabaseFiles(string databaseName, string filesPath,
+            string targetDatabaseName = null, string targetFilesPath = null,
+            string sourceExtension = null, string targetExtension = null,
+            bool overwrite = false, bool delete = false)
+        {
+            var nop = (targetFilesPath == null || targetFilesPath == filesPath)
+                      && (targetDatabaseName == null || targetDatabaseName == databaseName)
+                      && (sourceExtension == null && targetExtension == null || sourceExtension == targetExtension);
+            if (nop && delete == false) return;
+
+            string logName, baseFilename, baseLogFilename, mdfFilename, ldfFilename;
+            GetDatabaseFiles(databaseName, filesPath,
+                out logName, out baseFilename, out baseLogFilename, out mdfFilename, out ldfFilename);
+
+            if (sourceExtension != null)
+            {
+                mdfFilename += "." + sourceExtension;
+                ldfFilename += "." + sourceExtension;
+            }
+
+            if (nop)
+            {
+                // delete
+                if (File.Exists(mdfFilename)) File.Delete(mdfFilename);
+                if (File.Exists(ldfFilename)) File.Delete(ldfFilename);
+            }
+            else
+            {
+                // copy or copy+delete ie move
+                string targetLogName, targetBaseFilename, targetLogFilename, targetMdfFilename, targetLdfFilename;
+                GetDatabaseFiles(targetDatabaseName ?? databaseName, targetFilesPath ?? filesPath,
+                    out targetLogName, out targetBaseFilename, out targetLogFilename, out targetMdfFilename, out targetLdfFilename);
+
+                if (targetExtension != null)
+                {
+                    targetMdfFilename += "." + targetExtension;
+                    targetLdfFilename += "." + targetExtension;
+                }
+
+                if (delete)
+                {
+                    if (overwrite && File.Exists(targetMdfFilename)) File.Delete(targetMdfFilename);
+                    if (overwrite && File.Exists(targetLdfFilename)) File.Delete(targetLdfFilename);
+                    File.Move(mdfFilename, targetMdfFilename);
+                    File.Move(ldfFilename, targetLdfFilename);
+                }
+                else
+                {
+                    File.Copy(mdfFilename, targetMdfFilename, overwrite);
+                    File.Copy(ldfFilename, targetLdfFilename, overwrite);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether database files exist.
+        /// </summary>
+        /// <param name="databaseName">The name of the source database.</param>
+        /// <param name="filesPath">The directory containing source database files.</param>
+        /// <param name="extension">The database files extension.</param>
+        /// <returns>A value indicating whether the database files exist.</returns>
+        /// <remarks>
+        /// Extensions are used eg to copy MyDatabase.mdf to MyDatabase.mdf.temp.
+        /// </remarks>
+        public bool DatabaseFilesExist(string databaseName, string filesPath, string extension = null)
+        {
+            string logName, baseFilename, baseLogFilename, mdfFilename, ldfFilename;
+            GetDatabaseFiles(databaseName, filesPath,
+                out logName, out baseFilename, out baseLogFilename, out mdfFilename, out ldfFilename);
+
+            if (extension != null)
+            {
+                mdfFilename += "." + extension;
+                ldfFilename += "." + extension;
+            }
+
+            return File.Exists(mdfFilename) && File.Exists(ldfFilename);
+        }
+
+        /// <summary>
+        /// Gets the name of the database files.
+        /// </summary>
+        /// <param name="databaseName">The name of the database.</param>
+        /// <param name="filesPath">The directory containing database files.</param>
+        /// <param name="logName">The name of the log.</param>
+        /// <param name="baseFilename">The base filename (the MDF filename without the .mdf extension).</param>
+        /// <param name="baseLogFilename">The base log filename (the LDF filename without the .ldf extension).</param>
+        /// <param name="mdfFilename">The MDF filename.</param>
+        /// <param name="ldfFilename">The LDF filename.</param>
+        private static void GetDatabaseFiles(string databaseName, string filesPath,
+            out string logName,
+            out string baseFilename, out string baseLogFilename,
+            out string mdfFilename, out string ldfFilename)
+        {
+            logName = databaseName + "_log";
+            baseFilename = Path.Combine(filesPath, databaseName);
+            baseLogFilename = Path.Combine(filesPath, logName);
+            mdfFilename = baseFilename + ".mdf";
+            ldfFilename = baseFilename + "_log.ldf";
+        }
+
+        #endregion
+
+        #region SqlLocalDB
+
+        /// <summary>
+        /// Executes the SqlLocalDB command.
+        /// </summary>
+        /// <param name="args">The arguments.</param>
+        /// <param name="output">The command standard output.</param>
+        /// <param name="error">The command error output.</param>
+        /// <returns>The process exit code.</returns>
+        /// <remarks>
+        /// Execution is successful if the exit code is zero, and error is empty.
+        /// </remarks>
+        private int ExecuteSqlLocalDb(string args, out string output, out string error)
+        {
+            var programFiles = Environment.GetEnvironmentVariable("ProgramFiles");
+            if (programFiles == null)
+            {
+                output = string.Empty;
+                error = "SqlLocalDB.exe not found";
+                return -1;
+            }
+
+            var path = Path.Combine(programFiles, string.Format(@"Microsoft SQL Server\{0}0\Tools\Binn\SqlLocalDB.exe", _version));
+
+            var p = new Process
+            {
+                StartInfo =
+                {
+                    UseShellExecute = false,
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true,
+                    FileName = path,
+                    Arguments = args,
+                    CreateNoWindow = true,
+                    WindowStyle = ProcessWindowStyle.Hidden
+                }
+            };
+            p.Start();
+            output = p.StandardOutput.ReadToEnd();
+            error = p.StandardError.ReadToEnd();
+            p.WaitForExit();
+
+            return p.ExitCode;
+        }
+
+        /// <summary>
+        /// Returns a Unicode string with the delimiters added to make the input string a valid SQL Server delimited identifier. 
+        /// </summary>
+        /// <param name="name">The name to quote.</param>
+        /// <param name="quote">A quote character.</param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is a C# implementation of T-SQL QUOTEDNAME.
+        /// <paramref name="quote"/> is optional, it can be '[' (default), ']', '\'' or '"'.
+        /// </remarks>
+        private static string QuotedName(string name, char quote = '[')
+        {
+            switch (quote)
+            {
+                case '[':
+                case ']':
+                    return "[" + name.Replace("]", "]]") + "]";
+                case '\'':
+                    return "'" + name.Replace("'", "''") + "'";
+                case '"':
+                    return "\"" + name.Replace("\"", "\"\"") + "\"";
+                default:
+                    throw new NotSupportedException("Not a valid quote character.");
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index ec6bfebd5b..8854c3c4ab 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -496,6 +496,7 @@
     <Compile Include="Persistence\Factories\PublicAccessEntryFactory.cs" />
     <Compile Include="Persistence\Factories\TaskFactory.cs" />
     <Compile Include="Persistence\Factories\TaskTypeFactory.cs" />
+    <Compile Include="Persistence\LocalDb.cs" />
     <Compile Include="Persistence\LockedRepository.cs" />
     <Compile Include="Persistence\LockingRepository.cs" />
     <Compile Include="Persistence\Mappers\AccessMapper.cs" />

From dbda6689b68bb429e8463e7a35b5d1811e37fc0a Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 5 Sep 2017 14:51:56 +0200
Subject: [PATCH 122/145] perfs - suspendable

---
 src/Umbraco.Core/Umbraco.Core.csproj          |   3 +
 .../Cache/CacheRefresherEventHandler.cs       |   2 +
 src/Umbraco.Web/Cache/PageCacheRefresher.cs   |  41 +++----
 .../Scheduling/ScheduledPublishing.cs         |   3 +
 src/Umbraco.Web/Search/ExamineEvents.cs       |  88 +++++++------
 src/Umbraco.Web/Suspendable.cs                | 116 ++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 +
 .../umbraco.presentation/content.cs           |   1 +
 8 files changed, 196 insertions(+), 59 deletions(-)
 create mode 100644 src/Umbraco.Web/Suspendable.cs

diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 8854c3c4ab..77e84da945 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -134,6 +134,9 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="umbraco">
+      <HintPath>..\Umbraco.Web.UI\Bin\umbraco.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SolutionInfo.cs">
diff --git a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
index beab3e6cf0..6fcdf2fcf3 100644
--- a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
+++ b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
@@ -823,6 +823,8 @@ namespace Umbraco.Web.Cache
                     var handler = FindHandler(e);
                     if (handler == null) continue;
 
+                    ApplicationContext.Current.ProfilingLogger.Logger.Info<CacheRefresherEventHandler>("Handling " + e.Sender + " " + e.EventName);
+
                     handler.Invoke(null, new[] { e.Sender, e.Args });
                 }
             }
diff --git a/src/Umbraco.Web/Cache/PageCacheRefresher.cs b/src/Umbraco.Web/Cache/PageCacheRefresher.cs
index e884c9b3b8..d9bb7e9b88 100644
--- a/src/Umbraco.Web/Cache/PageCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/PageCacheRefresher.cs
@@ -50,8 +50,9 @@ namespace Umbraco.Web.Cache
         /// </summary>
         public override void RefreshAll()
         {
-            content.Instance.RefreshContentFromDatabase();
-            XmlPublishedContent.ClearRequest();
+            if (Suspendable.PageCacheRefresher.CanRefreshDocumentCacheFromDatabase)
+                content.Instance.RefreshContentFromDatabase();
+            ClearCaches();
             base.RefreshAll();
         }
 
@@ -61,11 +62,9 @@ namespace Umbraco.Web.Cache
         /// <param name="id">The id.</param>
         public override void Refresh(int id)
         {
-            ApplicationContext.Current.ApplicationCache.ClearPartialViewCache();
-            content.Instance.UpdateDocumentCache(id);
-            XmlPublishedContent.ClearRequest();
-            DistributedCache.Instance.ClearAllMacroCacheOnCurrentServer();
-            DistributedCache.Instance.ClearXsltCacheOnCurrentServer();
+            if (Suspendable.PageCacheRefresher.CanUpdateDocumentCache)
+                content.Instance.UpdateDocumentCache(id);
+            ClearCaches();
             base.Refresh(id);
         }
 
@@ -75,35 +74,35 @@ namespace Umbraco.Web.Cache
         /// <param name="id">The id.</param>
         public override void Remove(int id)
         {
-            ApplicationContext.Current.ApplicationCache.ClearPartialViewCache();
-            content.Instance.ClearDocumentCache(id, false);
-            XmlPublishedContent.ClearRequest();
-            DistributedCache.Instance.ClearAllMacroCacheOnCurrentServer();
-            DistributedCache.Instance.ClearXsltCacheOnCurrentServer();
-            ClearAllIsolatedCacheByEntityType<PublicAccessEntry>();
+            if (Suspendable.PageCacheRefresher.CanUpdateDocumentCache)
+                content.Instance.ClearDocumentCache(id, false);
+            ClearCaches();
             base.Remove(id);
         }
 
         public override void Refresh(IContent instance)
         {
-            ApplicationContext.Current.ApplicationCache.ClearPartialViewCache();
-            content.Instance.UpdateDocumentCache(new Document(instance));
-            XmlPublishedContent.ClearRequest();
-            DistributedCache.Instance.ClearAllMacroCacheOnCurrentServer();
-            DistributedCache.Instance.ClearXsltCacheOnCurrentServer();
-            ClearAllIsolatedCacheByEntityType<PublicAccessEntry>();
+            if (Suspendable.PageCacheRefresher.CanUpdateDocumentCache)
+                content.Instance.UpdateDocumentCache(new Document(instance));
+            ClearCaches();
             base.Refresh(instance);
         }
 
         public override void Remove(IContent instance)
+        {
+            if (Suspendable.PageCacheRefresher.CanUpdateDocumentCache)
+                content.Instance.ClearDocumentCache(new Document(instance), false);
+            ClearCaches();
+            base.Remove(instance);
+        }
+
+        private void ClearCaches()
         {
             ApplicationContext.Current.ApplicationCache.ClearPartialViewCache();
-            content.Instance.ClearDocumentCache(new Document(instance), false);
             XmlPublishedContent.ClearRequest();
             DistributedCache.Instance.ClearAllMacroCacheOnCurrentServer();
             DistributedCache.Instance.ClearXsltCacheOnCurrentServer();
             ClearAllIsolatedCacheByEntityType<PublicAccessEntry>();
-            base.Remove(instance);
         }
     }
 }
diff --git a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
index 24359d2b50..96cf724d02 100644
--- a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
+++ b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
@@ -27,6 +27,9 @@ namespace Umbraco.Web.Scheduling
         {
             if (_appContext == null) return true; // repeat...
 
+            if (Suspendable.ScheduledPublishing.CanRun == false)
+                return true; // repeat, later
+
             switch (_appContext.GetCurrentServerRole())
             {
                 case ServerRole.Slave:
diff --git a/src/Umbraco.Web/Search/ExamineEvents.cs b/src/Umbraco.Web/Search/ExamineEvents.cs
index 7fbbf29b89..e018bac214 100644
--- a/src/Umbraco.Web/Search/ExamineEvents.cs
+++ b/src/Umbraco.Web/Search/ExamineEvents.cs
@@ -24,7 +24,6 @@ namespace Umbraco.Web.Search
 	/// </summary>
 	public sealed class ExamineEvents : ApplicationEventHandler
 	{
-		
 		/// <summary>
 		/// Once the application has started we should bind to all events and initialize the providers.
 		/// </summary>
@@ -32,9 +31,9 @@ namespace Umbraco.Web.Search
 		/// <param name="applicationContext"></param>
 		/// <remarks>
 		/// We need to do this on the Started event as to guarantee that all resolvers are setup properly.
-		/// </remarks>		
+		/// </remarks>
 		protected override void ApplicationStarted(UmbracoApplicationBase httpApplication, ApplicationContext applicationContext)
-		{            
+		{
             LogHelper.Info<ExamineEvents>("Initializing Examine and binding to business logic events");
 
 			var registeredProviders = ExamineManager.Instance.IndexProviderCollection
@@ -46,14 +45,14 @@ namespace Umbraco.Web.Search
 			if (registeredProviders == 0)
 				return;
 
-            //Bind to distributed cache events - this ensures that this logic occurs on ALL servers that are taking part 
+            //Bind to distributed cache events - this ensures that this logic occurs on ALL servers that are taking part
             // in a load balanced environment.
             CacheRefresherBase<UnpublishedPageCacheRefresher>.CacheUpdated += UnpublishedPageCacheRefresherCacheUpdated;
             CacheRefresherBase<PageCacheRefresher>.CacheUpdated += PublishedPageCacheRefresherCacheUpdated;
             CacheRefresherBase<MediaCacheRefresher>.CacheUpdated += MediaCacheRefresherCacheUpdated;
             CacheRefresherBase<MemberCacheRefresher>.CacheUpdated += MemberCacheRefresherCacheUpdated;
             CacheRefresherBase<ContentTypeCacheRefresher>.CacheUpdated += ContentTypeCacheRefresherCacheUpdated;
-            
+
 			var contentIndexer = ExamineManager.Instance.IndexProviderCollection[Constants.Examine.InternalIndexer] as UmbracoContentIndexer;
 			if (contentIndexer != null)
 			{
@@ -77,6 +76,9 @@ namespace Umbraco.Web.Search
         /// </remarks>
 	    static void ContentTypeCacheRefresherCacheUpdated(ContentTypeCacheRefresher sender, CacheRefresherEventArgs e)
         {
+            if (Suspendable.ExamineEvents.CanIndex == false)
+                return;
+
             var indexersToUpdated = ExamineManager.Instance.IndexProviderCollection.OfType<UmbracoContentIndexer>();
             foreach (var provider in indexersToUpdated)
             {
@@ -114,7 +116,7 @@ namespace Umbraco.Web.Search
                     }
                 }
 
-                //TODO: We need to update Examine to support re-indexing multiple items at once instead of one by one which will speed up 
+                //TODO: We need to update Examine to support re-indexing multiple items at once instead of one by one which will speed up
                 // the re-indexing process, we don't want to revert to rebuilding the whole thing!
 
                 if (contentTypesChanged.Count > 0)
@@ -129,8 +131,8 @@ namespace Umbraco.Web.Search
                             {
                                 ReIndexForContent(contentItem, contentItem.HasPublishedVersion && contentItem.Trashed == false);
                             }
-                        }                        
-                    }                    
+                        }
+                    }
                 }
                 if (mediaTypesChanged.Count > 0)
                 {
@@ -163,11 +165,14 @@ namespace Umbraco.Web.Search
                     }
                 }
             }
-            
+
         }
 
 	    static void MemberCacheRefresherCacheUpdated(MemberCacheRefresher sender, CacheRefresherEventArgs e)
 	    {
+	        if (Suspendable.ExamineEvents.CanIndex == false)
+	            return;
+
             switch (e.MessageType)
             {
                 case MessageType.RefreshById:
@@ -215,6 +220,9 @@ namespace Umbraco.Web.Search
         /// <param name="e"></param>
 	    static void MediaCacheRefresherCacheUpdated(MediaCacheRefresher sender, CacheRefresherEventArgs e)
         {
+            if (Suspendable.ExamineEvents.CanIndex == false)
+                return;
+
             switch (e.MessageType)
             {
                 case MessageType.RefreshById:
@@ -252,13 +260,13 @@ namespace Umbraco.Web.Search
                                     if (media1 != null)
                                     {
                                         ReIndexForMedia(media1, media1.Trashed == false);
-                                    }                                    
+                                    }
                                     break;
                                 case MediaCacheRefresher.OperationType.Trashed:
-                                    
+
                                     //keep if trashed for indexes supporting unpublished
                                     //(delete the index from all indexes not supporting unpublished content)
-                                    
+
                                     DeleteIndexForEntity(payload.Id, true);
 
                                     //We then need to re-index this item for all indexes supporting unpublished content
@@ -272,20 +280,20 @@ namespace Umbraco.Web.Search
                                 case MediaCacheRefresher.OperationType.Deleted:
 
                                     //permanently remove from all indexes
-                                    
+
                                     DeleteIndexForEntity(payload.Id, false);
 
                                     break;
                                 default:
                                     throw new ArgumentOutOfRangeException();
-                            }                            
-                        }                        
+                            }
+                        }
                     }
 
                     break;
-                case MessageType.RefreshByInstance:                    
-                case MessageType.RemoveByInstance:                    
-                case MessageType.RefreshAll:                
+                case MessageType.RefreshByInstance:
+                case MessageType.RemoveByInstance:
+                case MessageType.RefreshAll:
                 default:
                     //We don't support these, these message types will not fire for media
                     break;
@@ -302,6 +310,9 @@ namespace Umbraco.Web.Search
         /// </remarks>
         static void PublishedPageCacheRefresherCacheUpdated(PageCacheRefresher sender, CacheRefresherEventArgs e)
         {
+            if (Suspendable.ExamineEvents.CanIndex == false)
+                return;
+
             switch (e.MessageType)
             {
                 case MessageType.RefreshById:
@@ -312,8 +323,8 @@ namespace Umbraco.Web.Search
                     }
                     break;
                 case MessageType.RemoveById:
-                    
-                    //This is triggered when the item has been unpublished or trashed (which also performs an unpublish).                    
+
+                    //This is triggered when the item has been unpublished or trashed (which also performs an unpublish).
 
                     var c2 = ApplicationContext.Current.Services.ContentService.GetById((int)e.MessageObject);
                     if (c2 != null)
@@ -368,6 +379,9 @@ namespace Umbraco.Web.Search
         /// </remarks>
 	    static void UnpublishedPageCacheRefresherCacheUpdated(UnpublishedPageCacheRefresher sender, CacheRefresherEventArgs e)
         {
+            if (Suspendable.ExamineEvents.CanIndex == false)
+                return;
+
             switch (e.MessageType)
             {
                 case MessageType.RefreshById:
@@ -378,9 +392,9 @@ namespace Umbraco.Web.Search
                     }
                     break;
                 case MessageType.RemoveById:
-                    
+
                     // This is triggered when the item is permanently deleted
-                    
+
                     DeleteIndexForEntity((int)e.MessageObject, false);
                     break;
                 case MessageType.RefreshByInstance:
@@ -399,7 +413,7 @@ namespace Umbraco.Web.Search
                     {
                         DeleteIndexForEntity(c4.Id, false);
                     }
-                    break;                
+                    break;
                 case MessageType.RefreshByJson:
 
                     var jsonPayloads = UnpublishedPageCacheRefresher.DeserializeFromJsonPayload((string)e.MessageObject);
@@ -409,29 +423,28 @@ namespace Umbraco.Web.Search
                         {
                             switch (payload.Operation)
                             {
-                                case UnpublishedPageCacheRefresher.OperationType.Deleted:                                   
+                                case UnpublishedPageCacheRefresher.OperationType.Deleted:
 
                                     //permanently remove from all indexes
-                                    
+
                                     DeleteIndexForEntity(payload.Id, false);
 
                                     break;
                                 default:
                                     throw new ArgumentOutOfRangeException();
-                            }                            
-                        }                        
+                            }
+                        }
                     }
 
                     break;
 
-                case MessageType.RefreshAll:                
+                case MessageType.RefreshAll:
                 default:
                     //We don't support these, these message types will not fire for unpublished content
                     break;
             }
         }
 
-		
         private static void ReIndexForMember(IMember member)
 		{
 		    ExamineManager.Instance.ReIndexNode(
@@ -447,7 +460,7 @@ namespace Umbraco.Web.Search
 		/// </summary>
 		/// <param name="sender"></param>
 		/// <param name="e"></param>
-		
+
 		private static void IndexerDocumentWriting(object sender, DocumentWritingEventArgs e)
 		{
 			if (e.Fields.Keys.Contains("nodeName"))
@@ -463,7 +476,7 @@ namespace Umbraco.Web.Search
 										));
 			}
 		}
-        
+
         private static void ReIndexForMedia(IMedia sender, bool isMediaPublished)
         {
             var xml = sender.ToXml();
@@ -497,7 +510,7 @@ namespace Umbraco.Web.Search
 
                     //if keepIfUnpublished == true then only delete this item from indexes not supporting unpublished content,
                     // otherwise if keepIfUnpublished == false then remove from all indexes
-                
+
                     .Where(x => keepIfUnpublished == false || x.SupportUnpublishedContent == false)
 	                .Where(x => x.EnableDefaultEventHandler));
 	    }
@@ -518,7 +531,7 @@ namespace Umbraco.Web.Search
             ExamineManager.Instance.ReIndexNode(
                 xml, IndexTypes.Content,
 	            ExamineManager.Instance.IndexProviderCollection.OfType<BaseUmbracoIndexer>()
-                    
+
 	                //Index this item for all indexers if the content is published, otherwise if the item is not published
 	                // then only index this for indexers supporting unpublished content
 
@@ -531,10 +544,10 @@ namespace Umbraco.Web.Search
 		/// </summary>
 		/// <param name="node"></param>
 		/// <param name="cacheOnly">true if data is going to be returned from cache</param>
-		/// <returns></returns>		
+		/// <returns></returns>
         [Obsolete("This method is no longer used and will be removed from the core in future versions, the cacheOnly parameter has no effect. Use the other ToXDocument overload instead")]
 		public static XDocument ToXDocument(Content node, bool cacheOnly)
-		{			
+		{
 			return ToXDocument(node);
 		}
 
@@ -542,7 +555,7 @@ namespace Umbraco.Web.Search
 		/// Converts a content node to Xml
 		/// </summary>
 		/// <param name="node"></param>
-		/// <returns></returns>		
+		/// <returns></returns>
 		private static XDocument ToXDocument(Content node)
 		{
             if (TypeHelper.IsTypeAssignableFrom<Document>(node))
@@ -561,7 +574,7 @@ namespace Umbraco.Web.Search
 
 			if (xNode.Attributes["nodeTypeAlias"] == null)
 			{
-				//we'll add the nodeTypeAlias ourselves                                
+				//we'll add the nodeTypeAlias ourselves
 				XmlAttribute d = xDoc.CreateAttribute("nodeTypeAlias");
 				d.Value = node.ContentType.Alias;
 				xNode.Attributes.Append(d);
@@ -569,6 +582,5 @@ namespace Umbraco.Web.Search
 
 			return new XDocument(ExamineXmlExtensions.ToXElement(xNode));
 		}
-
 	}
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Suspendable.cs b/src/Umbraco.Web/Suspendable.cs
new file mode 100644
index 0000000000..29e8c3a540
--- /dev/null
+++ b/src/Umbraco.Web/Suspendable.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Diagnostics;
+using Examine;
+using Examine.Providers;
+using Umbraco.Core;
+using Umbraco.Web.Cache;
+
+namespace Umbraco.Web
+{
+    public static class Suspendable
+    {
+        public static class PageCacheRefresher
+        {
+            private static bool _tried, _suspended;
+
+            public static bool CanRefreshDocumentCacheFromDatabase
+            {
+                get
+                {
+                    // trying a full refresh
+                    if (_suspended == false) return true;
+                    _tried = true; // remember we tried
+                    return false;
+                }
+            }
+
+            public static bool CanUpdateDocumentCache
+            {
+                get
+                {
+                    // trying a partial update
+                    // ok if not suspended, or if we haven't done a full already
+                    return _suspended == false || _tried == false;
+                }
+            }
+
+            public static void SuspendDocumentCache()
+            {
+                ApplicationContext.Current.ProfilingLogger.Logger.Info(typeof (PageCacheRefresher), "Suspend document cache.");
+                _suspended = true;
+            }
+
+            public static void ResumeDocumentCache()
+            {
+                _suspended = false;
+
+                ApplicationContext.Current.ProfilingLogger.Logger.Info(typeof (PageCacheRefresher), string.Format("Resume document cache (reload:{0}).", _tried ? "true" : "false"));
+
+                if (_tried == false) return;
+                _tried = false;
+
+                var pageRefresher = CacheRefreshersResolver.Current.GetById(new Guid(DistributedCache.PageCacheRefresherId));
+                pageRefresher.RefreshAll();
+            }
+        }
+
+        public static class ExamineEvents
+        {
+            private static bool _tried, _suspended;
+
+            public static bool CanIndex
+            {
+                get
+                {
+                    if (_suspended == false) return true;
+                    _tried = true; // remember we tried
+                    return false;
+                }
+            }
+
+            public static void SuspendIndexers()
+            {
+                ApplicationContext.Current.ProfilingLogger.Logger.Info(typeof (ExamineEvents), "Suspend indexers.");
+                _suspended = true;
+            }
+
+            public static void ResumeIndexers()
+            {
+                _suspended = false;
+
+                ApplicationContext.Current.ProfilingLogger.Logger.Info(typeof (ExamineEvents), string.Format("Resume indexers (rebuild:{0}).", _tried ? "true" : "false"));
+
+                if (_tried == false) return;
+                _tried = false;
+
+                // fixme - could we fork this on a background thread?
+                foreach (BaseIndexProvider indexer in ExamineManager.Instance.IndexProviderCollection)
+                {
+                    indexer.RebuildIndex();
+                }
+            }
+        }
+
+        public static class ScheduledPublishing
+        {
+            private static bool _suspended;
+
+            public static bool CanRun
+            {
+                get { return _suspended == false; }
+            }
+
+            public static void Suspend()
+            {
+                ApplicationContext.Current.ProfilingLogger.Logger.Info(typeof (ScheduledPublishing), "Suspend scheduled publishing.");
+                _suspended = true;
+            }
+
+            public static void Resume()
+            {
+                ApplicationContext.Current.ProfilingLogger.Logger.Info(typeof (ScheduledPublishing), "Resume scheduled publishing.");
+                _suspended = false;
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ea3a0dfa7c..f8d6f9080e 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -435,6 +435,7 @@
     <Compile Include="Models\Mapping\PropertyTypeGroupResolver.cs" />
     <Compile Include="Security\Identity\PreviewAuthenticationMiddleware.cs" />
     <Compile Include="SingletonHttpContextAccessor.cs" />
+    <Compile Include="Suspendable.cs" />
     <Compile Include="Trees\ContentTypeTreeController.cs" />
     <Compile Include="Trees\PackagesTreeController.cs" />
     <Compile Include="Trees\MediaTypeTreeController.cs" />
diff --git a/src/Umbraco.Web/umbraco.presentation/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs
index 54bb1ac2f1..a7d40fa088 100644
--- a/src/Umbraco.Web/umbraco.presentation/content.cs
+++ b/src/Umbraco.Web/umbraco.presentation/content.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Text;

From b02b2a61f038b1f2e0564b6a9025df0fe7634148 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 7 Sep 2017 12:16:04 +0200
Subject: [PATCH 123/145] perfs - deploy context isCancelled

---
 src/Umbraco.Core/Deploy/IDeployContext.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Umbraco.Core/Deploy/IDeployContext.cs b/src/Umbraco.Core/Deploy/IDeployContext.cs
index 7d4066e015..531ed9dae4 100644
--- a/src/Umbraco.Core/Deploy/IDeployContext.cs
+++ b/src/Umbraco.Core/Deploy/IDeployContext.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 
 namespace Umbraco.Core.Deploy
 {
@@ -38,5 +39,10 @@ namespace Umbraco.Core.Deploy
         /// <param name="key">The key of the item.</param>
         /// <returns>The item with the specified key and type, if any, else null.</returns>
         T Item<T>(string key) where T : class;
+
+        ///// <summary>
+        ///// Gets the global deployment cancellation token.
+        ///// </summary>
+        //CancellationToken CancellationToken { get; }
     }
 }
\ No newline at end of file

From d6f8b878d29264d30f55782fb7552cd213ca33e7 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 7 Sep 2017 13:45:56 +0200
Subject: [PATCH 124/145] perfs - cleanup

---
 src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
index 6fcdf2fcf3..879f74bccd 100644
--- a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
+++ b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
@@ -822,9 +822,6 @@ namespace Umbraco.Web.Cache
                 {
                     var handler = FindHandler(e);
                     if (handler == null) continue;
-
-                    ApplicationContext.Current.ProfilingLogger.Logger.Info<CacheRefresherEventHandler>("Handling " + e.Sender + " " + e.EventName);
-
                     handler.Invoke(null, new[] { e.Sender, e.Args });
                 }
             }
@@ -833,7 +830,7 @@ namespace Umbraco.Web.Cache
                 if (tempContext != null)
                     tempContext.Dispose();
             }
-            
+
         }
 
         /// <summary>

From 7003ef8d26b860b5db7e82ad0c0867683422bb57 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 7 Sep 2017 20:42:12 +0200
Subject: [PATCH 125/145] Remove circular dependency

---
 src/Umbraco.Core/Umbraco.Core.csproj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 77e84da945..8854c3c4ab 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -134,9 +134,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="umbraco">
-      <HintPath>..\Umbraco.Web.UI\Bin\umbraco.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SolutionInfo.cs">

From 96c9ecbdd738e83edb5884596e66014c42aa4509 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 7 Sep 2017 21:39:41 +0200
Subject: [PATCH 126/145] fix calc functions

---
 src/Umbraco.Web.UI.Client/src/less/application/grid.less        | 2 +-
 src/Umbraco.Web.UI.Client/src/less/canvas-designer.less         | 2 +-
 src/Umbraco.Web.UI.Client/src/less/components/overlays.less     | 2 +-
 src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less | 2 +-
 src/Umbraco.Web.UI.Client/src/less/sections.less                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/application/grid.less b/src/Umbraco.Web.UI.Client/src/less/application/grid.less
index 8348b072b1..f6879bb679 100644
--- a/src/Umbraco.Web.UI.Client/src/less/application/grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/application/grid.less
@@ -125,7 +125,7 @@ body {
 
 @media (max-width: 500px) {
     #search-form .form-search {
-        width: ~"(calc(~'100%' - ~'80px'))";
+        width: calc(100% - 80px);
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
index e7aa9d859f..095027d86b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
@@ -14,7 +14,7 @@ body {
     overflow: hidden;
     height: 100%;
     width: 100%;
-    width: ~"(calc(~'100%' - ~'80px'))"; // 80px is the fixed left menu for toggling the different browser sizes
+    width: calc(100% - 80px); // 80px is the fixed left menu for toggling the different browser sizes
     position: absolute;
     padding: 0;
     margin: 0;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
index c7e91c1a44..0a8dfe6f71 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
@@ -155,7 +155,7 @@
 @media (max-width: 500px) {
     .umb-overlay.umb-overlay-left {
         margin-left: 41px;
-        width: ~"(calc(~'100%' - ~'41px'))";
+        width: calc(100% - 41px);
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
index e053d58a7f..1ca6bf6067 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
@@ -329,7 +329,7 @@ a.umb-package-details__back-link {
 .umb-package-details__main-content {
     flex: 1 1 auto;
     margin-right: 40px;
-    width: ~"(calc(~'100%' - ~'@{sidebarwidth}' - ~'40px'))"; // Make sure that the main content area doesn't gets affected by inline styling
+    width: calc(~'100%' - ~'@{sidebarwidth}' - ~'40px'); // Make sure that the main content area doesn't gets affected by inline styling
 }
 
 .umb-package-details__sidebar {
diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less
index d73e24e4ea..85a33c84b8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/sections.less
+++ b/src/Umbraco.Web.UI.Client/src/less/sections.less
@@ -126,7 +126,7 @@ ul.sections li.help {
 	bottom: 0;
 	left: 0;
 	display: block;
-	width: ~"(calc(~'100%' - ~'5px'))"; //subtract 4px orange border + 1px border-right for sections
+	width: calc(100% - 5px); //subtract 4px orange border + 1px border-right for sections
 }
 
 ul.sections li.help a {

From dad4eafebda1340f92e24f01aeeee893bd882dc1 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 7 Sep 2017 22:25:45 +0200
Subject: [PATCH 127/145] Enable RDP to figure out gulp build problem

---
 appveyor.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index dc6e22edbf..4c9a33fd23 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,9 @@
 version: '{build}'
 shallow_clone: true
+
+init:
+  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+  
 build_script:
 - cmd: >-
     SET SLN=%CD%

From 0713f12ba6abfdf5c23b2b86afb88568e9f392dd Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 8 Sep 2017 12:02:20 +1000
Subject: [PATCH 128/145] makes new classes internal

---
 src/Umbraco.Core/Persistence/LocalDb.cs | 2 +-
 src/Umbraco.Web/Suspendable.cs          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/LocalDb.cs b/src/Umbraco.Core/Persistence/LocalDb.cs
index 084122ac3a..f706979e17 100644
--- a/src/Umbraco.Core/Persistence/LocalDb.cs
+++ b/src/Umbraco.Core/Persistence/LocalDb.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Core.Persistence
     /// Studio which can be used to connect to LocalDB databases.</para>
     /// <para>See also https://github.com/ritterim/automation-sql which is a somewhat simpler version of this.</para>
     /// </remarks>
-    public class LocalDb
+    internal class LocalDb
     {
         private int _version;
         private bool _hasVersion;
diff --git a/src/Umbraco.Web/Suspendable.cs b/src/Umbraco.Web/Suspendable.cs
index 29e8c3a540..db4ef53485 100644
--- a/src/Umbraco.Web/Suspendable.cs
+++ b/src/Umbraco.Web/Suspendable.cs
@@ -7,7 +7,7 @@ using Umbraco.Web.Cache;
 
 namespace Umbraco.Web
 {
-    public static class Suspendable
+    internal static class Suspendable
     {
         public static class PageCacheRefresher
         {

From 22bd6cd989e2596b69339d9b344e14bcc759e82b Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Fri, 8 Sep 2017 11:25:41 +0200
Subject: [PATCH 129/145] U4-10392 Culture and hostnames with special
 characters can register as collisions

---
 src/Umbraco.Web/Routing/DomainHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Routing/DomainHelper.cs b/src/Umbraco.Web/Routing/DomainHelper.cs
index ab2c14f009..88488db83f 100644
--- a/src/Umbraco.Web/Routing/DomainHelper.cs
+++ b/src/Umbraco.Web/Routing/DomainHelper.cs
@@ -269,7 +269,7 @@ namespace Umbraco.Web.Routing
         /// <remarks>Eg the relative part of <c>/foo/bar/nil</c> to domain <c>example.com/foo</c> is <c>/bar/nil</c>.</remarks>
         public static string PathRelativeToDomain(Uri domainUri, string path)
         {
-            return Uri.EscapeUriString(path).Substring(domainUri.AbsolutePath.Length).EnsureStartsWith('/');
+            return path.Substring(domainUri.GetAbsolutePathDecoded().Length).EnsureStartsWith('/');
         }
 
         #endregion

From 35fc997d9f5703a144244a1b519cd0734adf63c6 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Fri, 8 Sep 2017 13:13:26 +0200
Subject: [PATCH 130/145] fix stylesheets for canvas designer/preview

---
 src/Umbraco.Web.UI.Client/gulpfile.js                   | 4 ++--
 src/Umbraco.Web.UI.Client/src/less/canvas-designer.less | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index be72090661..30ef9c749f 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -38,7 +38,7 @@ function processJs(files, out) {
 }
 
 function processLess(files, out) {
-   
+
     var processors = [
          autoprefixer,
          cssnano
@@ -64,7 +64,7 @@ var sources = {
     less: {
         installer: { files: ["src/less/installer.less"], out: "installer.css" },
         nonodes: { files: ["src/less/pages/nonodes.less"], out: "nonodes.style.min.css"},
-        preview: { files: ['src/less/canvas-designer.less', 'src/less/helveticons.less'], out: "canvasdesigner.css" },
+        preview: { files: ["src/less/canvas-designer.less"], out: "canvasdesigner.css" },
         umbraco: { files: ["src/less/belle.less"], out: "umbraco.css" }
     },
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
index 095027d86b..7410c09580 100644
--- a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
@@ -1,4 +1,6 @@
 
+@import "helveticons.less";
+
 /******* font-face *******/
 
 @font-face {
@@ -14,7 +16,7 @@ body {
     overflow: hidden;
     height: 100%;
     width: 100%;
-    width: calc(100% - 80px); // 80px is the fixed left menu for toggling the different browser sizes
+    width: calc(~"100% - 80px"); // 80px is the fixed left menu for toggling the different browser sizes
     position: absolute;
     padding: 0;
     margin: 0;

From 733c92086723a4c30f85356487459ce264b88676 Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Fri, 8 Sep 2017 13:57:28 +0200
Subject: [PATCH 131/145] using string.replace instead of regex.

adding unit test.
---
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  1 +
 .../Web/Mvc/HtmlStringUtilitiesTests.cs       | 26 ++++++++++++++
 src/Umbraco.Web/HtmlStringUtilities.cs        |  3 +-
 src/Umbraco.Web/UmbracoHelper.cs              | 34 +++++++++----------
 .../umbraco.presentation/library.cs           |  8 ++---
 5 files changed, 49 insertions(+), 23 deletions(-)
 create mode 100644 src/Umbraco.Tests/Web/Mvc/HtmlStringUtilitiesTests.cs

diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 39ad21f15c..9f2d9c3a05 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -213,6 +213,7 @@
     <Compile Include="Web\Controllers\BackOfficeControllerUnitTests.cs" />
     <Compile Include="DelegateExtensionsTests.cs" />
     <Compile Include="Web\HttpCookieExtensionsTests.cs" />
+    <Compile Include="Web\Mvc\HtmlStringUtilitiesTests.cs" />
     <Compile Include="Web\Mvc\RenderIndexActionSelectorAttributeTests.cs" />
     <Compile Include="Persistence\Repositories\AuditRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\DomainRepositoryTest.cs" />
diff --git a/src/Umbraco.Tests/Web/Mvc/HtmlStringUtilitiesTests.cs b/src/Umbraco.Tests/Web/Mvc/HtmlStringUtilitiesTests.cs
new file mode 100644
index 0000000000..c84d578d14
--- /dev/null
+++ b/src/Umbraco.Tests/Web/Mvc/HtmlStringUtilitiesTests.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using Umbraco.Web;
+
+namespace Umbraco.Tests.Web.Mvc
+{
+    [TestFixture]
+    public class HtmlStringUtilitiesTests
+    {
+        private HtmlStringUtilities _htmlStringUtilities;
+
+        [SetUp]
+        public virtual void Initialize()
+        {
+            
+            _htmlStringUtilities = new HtmlStringUtilities();
+        }
+
+        [Test]
+        public void ReplaceLineBreaksWithHtmlBreak()
+        {
+            var output = _htmlStringUtilities.ReplaceLineBreaksForHtml("<div><h1>hello world</h1><p>hello world\r\nhello world\rhello world\nhello world</p></div>");
+            var expected = "<div><h1>hello world</h1><p>hello world<br />hello world<br />hello world<br />hello world</p></div>";
+            Assert.AreEqual(expected, output);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/HtmlStringUtilities.cs b/src/Umbraco.Web/HtmlStringUtilities.cs
index 1737aca365..11ba7a4d83 100644
--- a/src/Umbraco.Web/HtmlStringUtilities.cs
+++ b/src/Umbraco.Web/HtmlStringUtilities.cs
@@ -4,7 +4,6 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Web;
-using System.Text.RegularExpressions;
 using HtmlAgilityPack;
 
 namespace Umbraco.Web
@@ -24,7 +23,7 @@ namespace Umbraco.Web
         /// <returns>The text with text line breaks replaced with html linebreaks (<br/>)</returns>
         public string ReplaceLineBreaksForHtml(string text)
         {
-            return Regex.Replace(text, @"(\r\n?|\n)", "<br />$0");
+            return text.Replace("\r\n", @"<br />").Replace("\n", @"<br />").Replace("\r", @"<br />");
         }
 
         public HtmlString StripHtmlTags(string html, params string[] tags)
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 28960eb07d..40126a175f 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -17,7 +17,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Web.Mvc;
-using Umbraco.Core.Cache;
+using Umbraco.Core.Cache;
 
 namespace Umbraco.Web
 {
@@ -517,10 +517,10 @@ namespace Umbraco.Web
         public string UrlAbsolute(int contentId)
         {
             return UrlProvider.GetUrl(contentId, true);
-        }
-
+        }
+
         #endregion
-
+
         #region Members
 
         public IPublishedContent TypedMember(Udi id)
@@ -533,7 +533,7 @@ namespace Umbraco.Web
         public IPublishedContent TypedMember(Guid id)
         {
             return MembershipHelper.GetByProviderKey(id);
-        }
+        }
 
         public IPublishedContent TypedMember(object id)
         {
@@ -620,7 +620,7 @@ namespace Umbraco.Web
         {
             return ContentQuery.TypedContent(id);
         }
-
+
         /// <summary>
         /// Gets a content item from the cache
         /// </summary>
@@ -968,10 +968,10 @@ namespace Umbraco.Web
             }
             guidIds = list;
             return true;
-        }
-
+        }
+
         #endregion
-
+
         #region Media
 
         public IPublishedContent TypedMedia(Udi id)
@@ -982,15 +982,15 @@ namespace Umbraco.Web
         }
 
         public IPublishedContent TypedMedia(Guid id)
-        {
-            //TODO: This is horrible but until the media cache properly supports GUIDs we have no choice here and 
-            // currently there won't be any way to add this method correctly to `ITypedPublishedContentQuery` without breaking an interface and adding GUID support for media
-
+        {
+            //TODO: This is horrible but until the media cache properly supports GUIDs we have no choice here and 
+            // currently there won't be any way to add this method correctly to `ITypedPublishedContentQuery` without breaking an interface and adding GUID support for media
+
             var entityService = UmbracoContext.Application.Services.EntityService;
             var mediaAttempt = entityService.GetIdForKey(id, UmbracoObjectTypes.Media);
             return mediaAttempt.Success ? ContentQuery.TypedMedia(mediaAttempt.Result) : null;
-        }
-
+        }
+
         /// <summary>
         /// Overloaded method accepting an 'object' type
         /// </summary>
@@ -1018,8 +1018,8 @@ namespace Umbraco.Web
             if (ConvertIdObjectToUdi(id, out udiId))
                 return TypedMedia(udiId);
             return null;
-        }
-
+        }
+
         public IPublishedContent TypedMedia(int id)
 		{
             return ContentQuery.TypedMedia(id);
diff --git a/src/Umbraco.Web/umbraco.presentation/library.cs b/src/Umbraco.Web/umbraco.presentation/library.cs
index 4ab89c5c7d..34136e8532 100644
--- a/src/Umbraco.Web/umbraco.presentation/library.cs
+++ b/src/Umbraco.Web/umbraco.presentation/library.cs
@@ -1393,17 +1393,17 @@ namespace umbraco
         /// <returns>An XpathNodeIterator containing the current page as Xml.</returns>
         public static XPathNodeIterator GetXmlNodeCurrent()
         {
-            var pageId = "";
+            var pageId = "";
 
             try
             {
                 var nav = Umbraco.Web.UmbracoContext.Current.ContentCache.GetXPathNavigator();
-                var pageIdItem = HttpContext.Current.Items["pageID"];
-
+                var pageIdItem = HttpContext.Current.Items["pageID"];
+
                 if (pageIdItem == null)
                 {
                     throw new NullReferenceException("pageID not found in the current HTTP context");
-                }
+                }
 
                 pageId = pageIdItem.ToString();
                 nav.MoveToId(pageId);

From 7012633fdd727f6d752f406eda4fe68914bdae45 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 8 Sep 2017 13:08:57 +0200
Subject: [PATCH 132/145] Install gulp before gulp-cli

---
 build/BuildBelle.bat | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/BuildBelle.bat b/build/BuildBelle.bat
index cc6ce2202c..579718bf70 100644
--- a/build/BuildBelle.bat
+++ b/build/BuildBelle.bat
@@ -54,8 +54,10 @@ FOR /f "delims=" %%A in ('dir "%nodeExtractFolder%\node*" /b') DO SET "nodePath=
 	
     ECHO Clean npm cache 
     call npm cache clean --quiet
-
-    ECHO Installing gulp cli
+    
+	ECHO Installing gulp
+	call npm install -g gulp --quiet
+	ECHO Installing gulp cli
     call npm install -g gulp-cli --quiet
     ECHO Installing bower
     call npm install -g bower --quiet

From 9946d36d00b418c39efb6a34f65d3a405a1d2f98 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 8 Sep 2017 13:09:41 +0200
Subject: [PATCH 133/145] Ignore npm-debug.log

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 7a8ea8d3df..9e622fec7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,3 +146,4 @@ build/msbuild.log
 src/packages/
 build/tools/
 src/PrecompiledWeb/*
+npm-debug.log

From 09c23e93c2ffd2e3a94bda255ae1bed34ed2dd16 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 8 Sep 2017 13:10:09 +0200
Subject: [PATCH 134/145] Looks for the build output app.js to determine if we
 need to call BuildBelle.bat

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 86bca220a6..ff4f0ed7bc 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -2427,12 +2427,13 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
     <!-- Create ClientDependency.config file from Template if it doesn't exist -->
     <Copy SourceFiles="$(ProjectDir)Config\ClientDependency.Release.config" DestinationFiles="$(ProjectDir)Config\ClientDependency.config" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="!Exists('$(ProjectDir)Config\ClientDependency.config')" />
     <!-- Only runs if the Belle build folder doesn't yet exist -->
-    <CallTarget Targets="BelleBuild" Condition="!Exists('$(ProjectDir)\..\Umbraco.Web.UI.Client\build')" />
+    <CallTarget Targets="BelleBuild" Condition="!Exists('$(ProjectDir)\..\Umbraco.Web.UI\Umbraco\js\app.js')" />
   </Target>
   <Target Name="AfterBuild">
     <Copy SourceFiles="$(ProjectDir)Web.$(Configuration).config.transformed" DestinationFiles="$(ProjectDir)Web.config" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="$(BuildingInsideVisualStudio) == true" />
   </Target>
   <Target Name="BelleBuild" BeforeTargets="Rebuild">
+	<Message Text="Building Belle (due to a rebuild or this being the first build)" Importance="high" />
     <!-- Only runs when a Rebuild is requested -->
     <ReadLinesFromFile File="$(ProjectDir)\..\..\build\UmbracoVersion.txt">
       <Output TaskParameter="Lines" PropertyName="VersionNumber" />

From 8544aa685b0c72311d9542e270bb65f656646460 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 8 Sep 2017 13:29:00 +0200
Subject: [PATCH 135/145] VS loves managing whitespace.. go ahead then

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index ff4f0ed7bc..feb654f3c9 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -2433,7 +2433,7 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
     <Copy SourceFiles="$(ProjectDir)Web.$(Configuration).config.transformed" DestinationFiles="$(ProjectDir)Web.config" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="$(BuildingInsideVisualStudio) == true" />
   </Target>
   <Target Name="BelleBuild" BeforeTargets="Rebuild">
-	<Message Text="Building Belle (due to a rebuild or this being the first build)" Importance="high" />
+    <Message Text="Building Belle (due to a rebuild or this being the first build)" Importance="high" />
     <!-- Only runs when a Rebuild is requested -->
     <ReadLinesFromFile File="$(ProjectDir)\..\..\build\UmbracoVersion.txt">
       <Output TaskParameter="Lines" PropertyName="VersionNumber" />

From 87c2c5455c82f6a7c0130bc0089b0426a92a32de Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 8 Sep 2017 13:32:20 +0200
Subject: [PATCH 136/145] We don't have node_modules in this directory any more

---
 build/Build.bat | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/build/Build.bat b/build/Build.bat
index da34691c3d..eaa4b7f7ce 100644
--- a/build/Build.bat
+++ b/build/Build.bat
@@ -170,10 +170,6 @@ ECHO.
 %MSBUILD% "Build.proj" /p:BUILD_RELEASE=%RELEASE% /p:BUILD_COMMENT=%COMMENT% /p:NugetPackagesDirectory="%nuGetFolder%" /p:VSWherePath=%VSWherePath% /consoleloggerparameters:Summary;ErrorsOnly /fileLogger
 IF ERRORLEVEL 1 GOTO error
 
-ECHO.
-ECHO Setting node_modules folder to hidden to prevent VS13 from crashing on it while loading the websites project
-attrib +h ..\src\Umbraco.Web.UI.Client\node_modules
-
 IF %SKIPNUGET% EQU 1 GOTO success
 
 ECHO.

From e254dddbd42b826cefa6be5030e05656110763d0 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 8 Sep 2017 13:33:47 +0200
Subject: [PATCH 137/145] Copy the js and lib files from the correct
 directories

---
 build/Build.proj | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/build/Build.proj b/build/Build.proj
index 1f57ca5915..426b191207 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -162,11 +162,16 @@
 
   <Target Name="CopyBelleBuild" DependsOnTargets="CopyLibraries" >
     <ItemGroup>
-      <BelleFiles Include="..\src\Umbraco.Web.UI.Client\build\belle\**\*.*" Exclude="..\src\Umbraco.Web.UI.Client\build\belle\index.html" />
+      <BelleFiles Include="..\src\Umbraco.Web.UI\Umbraco\js\**\*.*" />
+	  <BelleLibFiles Include="..\src\Umbraco.Web.UI\Umbraco\lib\**\*.*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(BelleFiles)"
-          DestinationFiles="@(BelleFiles->'$(WebAppFolder)umbraco\%(RecursiveDir)%(Filename)%(Extension)')"
+          DestinationFiles="@(BelleFiles->'$(WebAppFolder)umbraco\js\%(RecursiveDir)%(Filename)%(Extension)')"
+          OverwriteReadOnlyFiles="true"
+          SkipUnchangedFiles="false" />
+    <Copy SourceFiles="@(BelleLibFiles)"
+          DestinationFiles="@(BelleLibFiles->'$(WebAppFolder)umbraco\lib\%(RecursiveDir)%(Filename)%(Extension)')"
           OverwriteReadOnlyFiles="true"
           SkipUnchangedFiles="false" />
   </Target>

From 708d060c3b60a8556cb7e59d42d8f8f6a5dec1f3 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 8 Sep 2017 13:52:51 +0200
Subject: [PATCH 138/145] Fix up BuildBelle.bat

---
 build/BuildBelle.bat | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/build/BuildBelle.bat b/build/BuildBelle.bat
index 579718bf70..f5906efb7d 100644
--- a/build/BuildBelle.bat
+++ b/build/BuildBelle.bat
@@ -49,21 +49,21 @@ FOR /f "delims=" %%A in ('dir "%nodeExtractFolder%\node*" /b') DO SET "nodePath=
 
     ECHO Change directory to %CD%\..\src\Umbraco.Web.UI.Client\
     CD %CD%\..\src\Umbraco.Web.UI.Client\
-
-    ECHO Do npm install and the gulp build of Belle
-	
-    ECHO Clean npm cache 
-    call npm cache clean --quiet
     
-	ECHO Installing gulp
-	call npm install -g gulp --quiet
-	ECHO Installing gulp cli
-    call npm install -g gulp-cli --quiet
+    ECHO Clean npm cache 
+    call npm cache clean
+	
     ECHO Installing bower
-    call npm install -g bower --quiet
-    ECHO Doing npm install
-    call npm install --quiet
-    ECHO Executing gulp build
+    call npm install -g bower
+	
+    ECHO Installing gulp & gulp cli
+    call npm install -g gulp
+    call npm install -g gulp-cli
+	
+    ECHO Executing npm install
+    call npm install
+	
+    ECHO Do gulp build of Belle
     call gulp build --buildversion=%release%
 
     ECHO Move back to the build folder

From 7b641f4771c0c836c67ad798cbfb067ffc2c3322 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 8 Sep 2017 14:45:00 +0200
Subject: [PATCH 139/145] Adds missing files for the build server

---
 build/Build.proj | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/build/Build.proj b/build/Build.proj
index 426b191207..019670c932 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -162,18 +162,36 @@
 
   <Target Name="CopyBelleBuild" DependsOnTargets="CopyLibraries" >
     <ItemGroup>
-      <BelleFiles Include="..\src\Umbraco.Web.UI\Umbraco\js\**\*.*" />
+      <BelleAssetsFiles Include="..\src\Umbraco.Web.UI\Umbraco\assets\**\*.*" />
+	  <BelleJsFiles Include="..\src\Umbraco.Web.UI\Umbraco\Js\**\*.*" />
 	  <BelleLibFiles Include="..\src\Umbraco.Web.UI\Umbraco\lib\**\*.*" />
+	  <BelleViewsFiles Include="..\src\Umbraco.Web.UI\Umbraco\Views\**\*.*" />
+	  <BellePreviewFiles Include="..\src\Umbraco.Web.UI\Umbraco\Preview\**\*.*" />
+	  <BelleInstallerFile Include="..\src\Umbraco.Web.UI\Umbraco\installer.html" />	  
     </ItemGroup>
 
-    <Copy SourceFiles="@(BelleFiles)"
-          DestinationFiles="@(BelleFiles->'$(WebAppFolder)umbraco\js\%(RecursiveDir)%(Filename)%(Extension)')"
+    <Copy SourceFiles="@(BelleAssetsFiles)"
+          DestinationFiles="@(BelleAssetsFiles->'$(WebAppFolder)umbraco\assets\%(RecursiveDir)%(Filename)%(Extension)')"
+          OverwriteReadOnlyFiles="true"
+          SkipUnchangedFiles="false" />
+    <Copy SourceFiles="@(BelleJsFiles)"
+          DestinationFiles="@(BelleJsFiles->'$(WebAppFolder)umbraco\Js\%(RecursiveDir)%(Filename)%(Extension)')"
           OverwriteReadOnlyFiles="true"
           SkipUnchangedFiles="false" />
     <Copy SourceFiles="@(BelleLibFiles)"
           DestinationFiles="@(BelleLibFiles->'$(WebAppFolder)umbraco\lib\%(RecursiveDir)%(Filename)%(Extension)')"
           OverwriteReadOnlyFiles="true"
           SkipUnchangedFiles="false" />
+    <Copy SourceFiles="@(BelleViewsFiles)"
+          DestinationFiles="@(BelleViewsFiles->'$(WebAppFolder)umbraco\Views\%(RecursiveDir)%(Filename)%(Extension)')"
+          OverwriteReadOnlyFiles="true"
+          SkipUnchangedFiles="false" />
+    <Copy SourceFiles="@(BellePreviewFiles)"
+          DestinationFiles="@(BellePreviewFiles->'$(WebAppFolder)umbraco\preview\%(RecursiveDir)%(Filename)%(Extension)')"
+          OverwriteReadOnlyFiles="true"
+          SkipUnchangedFiles="false" />
+    <Copy SourceFiles="@(BelleInstallerFile)"
+        DestinationFiles="@(BelleInstallerFile->'$(WebAppFolder)umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
 
   <Target Name="CopyLibraries" DependsOnTargets="OffsetTimestamps" >

From ce63251206dbe90834b49a2899dd26b22bb2021a Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 8 Sep 2017 14:53:33 +0200
Subject: [PATCH 140/145] Adds missing file to gulp build

---
 src/Umbraco.Web.UI.Client/gulpfile.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index 30ef9c749f..d2963ab1a3 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -87,7 +87,8 @@ var sources = {
     views:{
         umbraco: {files: ["src/views/**/*html"], folder: ""},
         preview: { files: ["src/canvasdesigner/**/*.html"], folder: "../preview"},
-        installer: {files: ["src/installer/steps/*.html"], folder: "install"}
+        installer: {files: ["src/installer/steps/*.html"], folder: "install"},
+        installerIndex: {files: ["src/installer/installer.html"], out: "installer.html"}
     },
 
     //globs for file-watching

From 32999b7e19e3829be3fc6790e9c2dddd32ae4997 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 8 Sep 2017 14:58:50 +0200
Subject: [PATCH 141/145] Correction, we don't need this file after all :-)

---
 src/Umbraco.Web.UI.Client/gulpfile.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index d2963ab1a3..30ef9c749f 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -87,8 +87,7 @@ var sources = {
     views:{
         umbraco: {files: ["src/views/**/*html"], folder: ""},
         preview: { files: ["src/canvasdesigner/**/*.html"], folder: "../preview"},
-        installer: {files: ["src/installer/steps/*.html"], folder: "install"},
-        installerIndex: {files: ["src/installer/installer.html"], out: "installer.html"}
+        installer: {files: ["src/installer/steps/*.html"], folder: "install"}
     },
 
     //globs for file-watching

From 718ed19fb914dbb5fc41fc390e472c060de51fd3 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 8 Sep 2017 15:05:15 +0200
Subject: [PATCH 142/145] Forgot to remove this.. Seb is getting tired!

---
 build/Build.proj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build/Build.proj b/build/Build.proj
index 019670c932..b2175ef925 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -167,7 +167,6 @@
 	  <BelleLibFiles Include="..\src\Umbraco.Web.UI\Umbraco\lib\**\*.*" />
 	  <BelleViewsFiles Include="..\src\Umbraco.Web.UI\Umbraco\Views\**\*.*" />
 	  <BellePreviewFiles Include="..\src\Umbraco.Web.UI\Umbraco\Preview\**\*.*" />
-	  <BelleInstallerFile Include="..\src\Umbraco.Web.UI\Umbraco\installer.html" />	  
     </ItemGroup>
 
     <Copy SourceFiles="@(BelleAssetsFiles)"
@@ -190,8 +189,6 @@
           DestinationFiles="@(BellePreviewFiles->'$(WebAppFolder)umbraco\preview\%(RecursiveDir)%(Filename)%(Extension)')"
           OverwriteReadOnlyFiles="true"
           SkipUnchangedFiles="false" />
-    <Copy SourceFiles="@(BelleInstallerFile)"
-        DestinationFiles="@(BelleInstallerFile->'$(WebAppFolder)umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
 
   <Target Name="CopyLibraries" DependsOnTargets="OffsetTimestamps" >

From 55e0af118a008d0880b2977c6621b5ed84f830db Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 8 Sep 2017 23:29:16 +0200
Subject: [PATCH 143/145] Weirdly this errored out on 7.7 with a "Task 'cli' is
 not in your gulpfile" error..

not sure why this exact same file works in this branch
---
 build/BuildBelle.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/BuildBelle.bat b/build/BuildBelle.bat
index f5906efb7d..dfbe634393 100644
--- a/build/BuildBelle.bat
+++ b/build/BuildBelle.bat
@@ -56,7 +56,7 @@ FOR /f "delims=" %%A in ('dir "%nodeExtractFolder%\node*" /b') DO SET "nodePath=
     ECHO Installing bower
     call npm install -g bower
 	
-    ECHO Installing gulp & gulp cli
+    ECHO Installing gulp and gulp cli
     call npm install -g gulp
     call npm install -g gulp-cli
 	

From 406a206b03d0f38f48102ef42cb41e2ecddb7612 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 8 Sep 2017 23:50:15 +0200
Subject: [PATCH 144/145] Apparently we still have a node_modules folder, but
 no more xslt folder though!

---
 build/Build.bat | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/Build.bat b/build/Build.bat
index eaa4b7f7ce..65522fff6b 100644
--- a/build/Build.bat
+++ b/build/Build.bat
@@ -172,10 +172,15 @@ IF ERRORLEVEL 1 GOTO error
 
 IF %SKIPNUGET% EQU 1 GOTO success
 
+IF EXIST ..\src\Umbraco.Web.UI.Client\node_modules (
+	ECHO.
+	ECHO Setting node_modules folder to hidden to prevent Visual Studio from crashing on it while loading the websites project
+	attrib +h ..\src\Umbraco.Web.UI.Client\node_modules
+)
+
 ECHO.
 ECHO Adding Web.config transform files to the NuGet package
 REN .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
-REN .\_BuildOutput\WebApp\Xslt\Web.config Web.config.transform
 
 ECHO.
 ECHO Packing the NuGet release files

From 37c4fc5f74f242a6f38dd4155ddd5162782a51cb Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sat, 9 Sep 2017 00:02:08 +0200
Subject: [PATCH 145/145] Don't try to remove directories that don't exist

---
 build/Build.bat | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/Build.bat b/build/Build.bat
index 65522fff6b..4a02d637b8 100644
--- a/build/Build.bat
+++ b/build/Build.bat
@@ -91,14 +91,15 @@ SET PATH="%MSBUILDPATH%";%PATH%
 
 ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %RELEASE%
 
-ECHO.
-ECHO Removing the belle build folder and bower_components folder to make sure everything is clean as a whistle
-RD ..\src\Umbraco.Web.UI.Client\build /Q /S
-RD ..\src\Umbraco.Web.UI.Client\bower_components /Q /S
+IF EXIST ..\src\Umbraco.Web.UI.Client\bower_components (
+	ECHO.
+	ECHO Removing the bower_components folder to make sure everything is clean as a whistle
+	RD ..\src\Umbraco.Web.UI.Client\bower_components /Q /S
+)
 
 ECHO.
 ECHO Removing existing built files to make sure everything is clean as a whistle
-RMDIR /Q /S _BuildOutput
+RMDIR /Q /S _BuildOutput 2>NUL
 DEL /F /Q UmbracoCms.*.zip 2>NUL
 DEL /F /Q UmbracoExamine.*.zip 2>NUL
 DEL /F /Q UmbracoCms.*.nupkg 2>NUL