diff --git a/.editorconfig b/.editorconfig
index 5a35b71ce6..ca85827de8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,40 +1,43 @@
-# editorconfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Default settings:
-# A newline ending every file
-# Use 4 spaces as indentation
-[*]
-insert_final_newline = true
-end_of_line = crlf
-indent_style = space
-indent_size = 4
-
-# Trim trailing whitespace, limited support.
-# https://github.com/editorconfig/editorconfig/wiki/Property-research:-Trim-trailing-spaces
-trim_trailing_whitespace = true
-
-[*.{cs,vb}]
-dotnet_style_predefined_type_for_locals_parameters_members = true:error
-
-dotnet_naming_rule.private_members_with_underscore.symbols  = private_fields
-dotnet_naming_rule.private_members_with_underscore.style    = prefix_underscore
-dotnet_naming_rule.private_members_with_underscore.severity = suggestion
-
-dotnet_naming_symbols.private_fields.applicable_kinds           = field
-dotnet_naming_symbols.private_fields.applicable_accessibilities = private
-
-dotnet_naming_style.prefix_underscore.capitalization = camel_case
-dotnet_naming_style.prefix_underscore.required_prefix = _
-
-# https://github.com/MicrosoftDocs/visualstudio-docs/blob/master/docs/ide/editorconfig-code-style-settings-reference.md
-[*.cs]
-csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
+# editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Default settings:
+# A newline ending every file
+# Use 4 spaces as indentation
+[*]
+insert_final_newline = true
+end_of_line = crlf
+indent_style = space
+indent_size = 4
+
+# Trim trailing whitespace, limited support.
+# https://github.com/editorconfig/editorconfig/wiki/Property-research:-Trim-trailing-spaces
+trim_trailing_whitespace = true
+
+[*.{cs,vb}]
+dotnet_style_predefined_type_for_locals_parameters_members = true:error
+
+dotnet_naming_rule.private_members_with_underscore.symbols  = private_fields
+dotnet_naming_rule.private_members_with_underscore.style    = prefix_underscore
+dotnet_naming_rule.private_members_with_underscore.severity = suggestion
+
+dotnet_naming_symbols.private_fields.applicable_kinds           = field
+dotnet_naming_symbols.private_fields.applicable_accessibilities = private
+
+dotnet_naming_style.prefix_underscore.capitalization = camel_case
+dotnet_naming_style.prefix_underscore.required_prefix = _
+
+# https://github.com/MicrosoftDocs/visualstudio-docs/blob/master/docs/ide/editorconfig-code-style-settings-reference.md
+[*.cs]
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
 csharp_prefer_braces = false : none
-
-[*.{js,less}]
+
+[*.js]
+trim_trailing_whitespace = true
+
+[*.less]
 trim_trailing_whitespace = false
diff --git a/.github/BUILD.md b/.github/BUILD.md
index ad33872423..5f962a8911 100644
--- a/.github/BUILD.md
+++ b/.github/BUILD.md
@@ -39,7 +39,7 @@ To build Umbraco, fire up PowerShell and move to Umbraco's repository root (the
 
     build/build.ps1
     
-If you only see a build.bat-file, you're probably on the wrong branch. If you switch to the correct branch (dev-v8) the file will appear and you can build it.
+If you only see a build.bat-file, you're probably on the wrong branch. If you switch to the correct branch (v8/contrib) the file will appear and you can build it.
 
 You might run into [Powershell quirks](#powershell-quirks).
 
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
index 1526c54656..e97b03e7e3 100644
--- a/.github/CODE_OF_CONDUCT.md
+++ b/.github/CODE_OF_CONDUCT.md
@@ -1,32 +1,92 @@
-# Code Of Conduct
- 
-Our informal code of conduct concentrates on the values we, as Umbraco HQ, have set for ourselves and for our community. We expect you to be a friend. 
-Instead of listing out all the exact "do's" and "don't's" we want to challenge you to think about our values and apply them:
+# Umbraco Code of Conduct
 
-If there's a need to talk to Umbraco HQ about anything, please make sure to send a mail to [Sebastiaan Janssen - sj@umbraco.dk](mailto:sj@umbraco.dk).
+## Preamble
 
-## Be a Friend
+We are the friendly CMS. And our friendliness stems from our values. That's why we have set for ourselves, Umbraco HQ, and the community, five values to guide us in everything we do:  
 
-We welcome and thank you for registering at Our Umbraco. Find below the values that govern Umbraco and which you accept by using Our Umbraco.
+* Trust - We believe in and empower  people
+* Respect - We treat others as we would like to be treated
+* Open - We share our thoughts and knowledge 
+* Hungry - We want to do things better, best is next 
+* Friendly - We want to build long-lasting relationships
 
-## Trust
+With these values in mind, we want to offer the Umbraco community a code of conduct that specifies a baseline standard of behavior so that people with different social values and communication styles can work together.  
 
-Assume positive intent and try to understand before being understood.
+This code of conduct is based on the widely used Contributor Covenant, as described in [https://www.contributor-covenant.org/](https://www.contributor-covenant.org/)  
 
-## Respect
+## Our Pledge
 
-Treat others as you would like to be treated.
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.  
 
-This also goes for treating the HQ with respect. For example: don’t promote products on [our.umbraco.com](https://our.umbraco.com) that directly compete with our commercial offerings which enables us to work for a sustainable Umbraco.
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.  
 
-## Open
+## Our Standards
+Examples of behavior that contributes to a positive environment for our community include:  
 
-Be honest and straightforward. Tell it as it is. Share thoughts and knowledge and engage in collaboration.
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community
 
-## Hungry
+Examples of unacceptable behavior include:  
 
-Don't rest on your laurels and never accept the status quo. Contribute and give back to fellow Umbracians.
+* The use of sexualized language or imagery, and sexual attention or advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
 
-## Friendly
+## Enforcement Responsibilities
 
-Don’t judge upon mistakes made but rather upon the speed and quality with which mistakes are corrected. Friendly posts and contributions generate smiles and build long lasting relationships.
\ No newline at end of file
+Community leaders (e.g. Meetup & festival organizers, moderators, maintainers, ...) are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.  
+
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.  
+
+Specific enforcement steps are listed in the [Code of Conduct Enforcement Guidelines](https://github.com/umbraco/Umbraco-CMS/blob/v8/contrib/.github/CODE_OF_CONDUCT_ENFORCEMENT.md) document which is an appendix of this document, updated and maintained by the Code of Conduct Team.
+
+## Scope
+This Code of Conduct applies within all community spaces and events supported by Umbraco HQ or using the Umbraco name. It also applies when an individual is officially representing the community in public spaces. 
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior, may be reported at [conduct@umbraco.com](mailto:conduct@umbraco.com). All complaints will be reviewed and investigated promptly and fairly.  
+
+Or alternatively, you can reach out directly to any of the team members behind the address above:  
+
+* Sebastiaan Janssen (He, Him - Languages spoken: English, Dutch, Danish(Read)) [sebastiaan@umbraco.com](mailto:sebastiaan@umbraco.com)
+* Ilham Boulghallat (She, Her - Languages spoken: English, French, Arabic) [ilham@umbraco.com](mailto:ilham@umbraco.com)
+* Arnold Visser (He, Him - Languages spoken: English, Dutch) [arnold@umbraco.com](mailto:arnold@umbraco.com)
+
+The review process is done with full respect for the privacy and security of the reporter of any incident.  
+
+People with a conflict of interest should exclude themselves or if necessary be excluded by the other team members.  
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+**1. Correction**  
+Community Impact: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.  
+
+Consequence: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+**2. Warning**  
+Community Impact: A violation through a single incident or series of actions.  
+
+Consequence: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+**3. Temporary Ban**  
+Community Impact: A serious violation of community standards, including sustained inappropriate behavior.  
+
+Consequence: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+**4. Permanent Ban**  
+Community Impact: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.  
+
+Consequence: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+This Code of Conduct is adapted from the Contributor Covenant, version 2.0, available at [https://www.contributor-covenant.org/version/2/0/code_of_conduct.html](https://www.contributor-covenant.org/version/2/0/code_of_conduct.html).  
+
+This Code of Conduct will be maintained and reviewed by the team listed above. 
\ No newline at end of file
diff --git a/.github/CODE_OF_CONDUCT_ENFORCEMENT.md b/.github/CODE_OF_CONDUCT_ENFORCEMENT.md
new file mode 100644
index 0000000000..2bb45644c2
--- /dev/null
+++ b/.github/CODE_OF_CONDUCT_ENFORCEMENT.md
@@ -0,0 +1,57 @@
+# Umbraco Code of Conduct Enforcement guidelines - Consequence Ladder  
+
+These are the steps followed by the [Umbraco Code of Conduct Team](https://github.com/umbraco/Umbraco-CMS/blob/v8/contrib/.github/CODE_OF_CONDUCT.md) when we respond to an issue or incident brought to our attention by a community member.  
+
+This is an appendix to the Code of Conduct and is updated and maintained by the Code of Conduct Team.  
+
+To make sure that all reports will be reviewed and investigated promptly and fairly, as highlighted in the Umbraco Code of Conduct, we are following [Mozilla’s Consequence Ladder approach](https://github.com/mozilla/inclusion/blob/master/code-of-conduct-enforcement/consequence-ladder.md).  
+
+This approach helps the Team enforce the Code of Conduct in a structured manner and can be used as a way of communicating escalation. Each time the Team takes an action (warning, ban) the individual is made aware of future consequences. The Team can either follow the order of the levels in the ladder or decide to jump levels. When needed, the team can go directly to a permanent ban.  
+
+**Level 0: No Action**  
+Recommendations do not indicate a violation of the Code of Conduct.  
+
+**Level 1: Simple Warning Issued**  
+A private, written warning from the Code of Conduct Team, with clarity of violation, consequences of continued behavior.  
+
+**Level 2: Warning**  
+A private, written warning from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:  
+
+* Communication of next-level consequences if behaviors are repeated (according to this ladder).  
+
+**Level 3: Warning + Mandatory Cooling Off Period (Access Retained)**  
+A private warning from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:  
+
+* Request to avoid interaction on community messaging platforms (public forums, Our, commenting on issues).  
+  * This includes avoiding any interactions in any Umbraco channels, spaces/offices, as well as external channels like social media (e.g. Twitter, Facebook, LinkedIn). For example, 'following/liking/retweeting' would be considered a violation of these terms, and consequence would escalate according to this ladder.  
+* Require they do not interact with others in the report, or those who they suspect are involved in the report.  
+* Suggestions for 'out of office' type of message on platforms, to reduce curiosity, or suspicion among those not involved.  
+
+**Level 4: Temporary Ban (Access Revoked)**  
+Private communication of ban from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:  
+
+* 3-6 months imposed break.  
+* All accounts deactivated, or blocked during this time (Our, HQ Slack if applicable).  
+* Require to avoid interaction on community messaging platforms (public forums, Our, commenting on issues).  
+  * This includes avoiding any interactions in any Umbraco channels, spaces/offices, as well as external channels like social media (e.g. Twitter, Facebook, LinkedIn). For example, 'following/liking/retweeting' would be considered a violation of these terms, and consequence would escalate according to this ladder.  
+* All community leadership roles (e.g. Community Teams, Meetup/festival organizer, Commit right on Github..) suspended. (onboarding/reapplication required outside of this process)  
+* No attendance at Umbraco events during the ban period.  
+* Not allowed to enter Umbraco HQ offices during the ban period.  
+* Permission to use the MVP title, if applicable, is revoked during this ban period.  
+* The community leaders running events and other initiatives are informed of the ban.  
+
+**Level 5: Permanent Ban**  
+Private communication of ban from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:  
+
+* All accounts deactivated permanently.  
+* No attendance at Umbraco events going forward.  
+* Not allowed to enter Umbraco HQ offices permanently.  
+* All community leadership roles (e.g. Community Teams, Meetup/festival organizer, Commit right on Github..) permanently suspended.  
+* Permission to use the MVP title, if applicable, revoked.  
+* The community leaders running events and other initiatives are informed of the ban.  
+
+
+Sources:  
+* [Mozilla Code of Conduct - Enforcement Consequence Ladder](https://github.com/mozilla/inclusion/blob/master/code-of-conduct-enforcement/consequence-ladder.md)  
+* [Drupal Conflict Resolution Policy and Process](https://www.drupal.org/conflict-resolution)  
+* [Django Code of Conduct - Enforcement Manual](https://www.djangoproject.com/conduct/enforcement-manual/)  
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 5537a46ef8..f4e237a1f2 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -102,10 +102,11 @@ That said, the Umbraco development team likes to follow the hints that ReSharper
 
 The Core Contributors team consists of one member of Umbraco HQ, [Sebastiaan](https://github.com/nul800sebastiaan), who gets assistance from the following community members who have comitted to volunteering their free time:
 
-- [Anders Bjerner](https://github.com/abjerner)
-- [Emma Burstow](https://github.com/emmaburstow)
-- [Poornima Nayar](https://github.com/poornimanayar)
-- [Kenn Jacobsen](https://twitter.com/KennJacobsen_DK)
+- [Nathan Woulfe](https://github.com/nathanwoulfe)
+- [Joe Glombek](https://github.com/glombek)
+- [Laura Weatherhead](https://github.com/lssweatherhead)
+- [Michael Latouche](https://github.com/mikecp)
+- [Owain Williams](https://github.com/OwainWilliams)
 
 
 These wonderful people aim to provide you with a first reply to your PR, review and test out your changes and on occasions, they might ask more questions. If they are happy with your work, they'll let Umbraco HQ know by approving the PR. Hq will have final sign-off and will check the work again before it is merged. 
@@ -123,12 +124,12 @@ You can get in touch with [the core contributors team](#the-core-contributors-te
 
 In order to build the Umbraco source code locally, first make sure you have the following installed.
 
-  * [Visual Studio 2017 v15.9.7+](https://visualstudio.microsoft.com/vs/)
+  * [Visual Studio 2019 v16.3+ (with .NET Core 3.0)](https://visualstudio.microsoft.com/vs/)
   * [Node.js v10+](https://nodejs.org/en/download/)
   * npm v6.4.1+ (installed with Node.js)
   * [Git command line](https://git-scm.com/download/)
 
-The easiest way to get started is to open `src\umbraco.sln` in Visual Studio 2017 (version 15.9.7 or higher, [the community edition is free](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) for you to use to contribute to Open Source projects). In Visual Studio, find the Task Runner Explorer (in the View menu under Other Windows) and run the build task under the gulpfile.
+The easiest way to get started is to open `src\umbraco.sln` in Visual Studio 2019 (version 16.3 or higher, [the community edition is free](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) for you to use to contribute to Open Source projects). In Visual Studio, find the Task Runner Explorer (in the View menu under Other Windows) and run the build task under the gulpfile.
 
 Alternatively, you can run `build.ps1` from the Powershell command line, 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`. See [this page](BUILD.md) for more details.
 
diff --git a/.github/ISSUE_TEMPLATE/3_BugNetCore.md b/.github/ISSUE_TEMPLATE/3_BugNetCore.md
new file mode 100644
index 0000000000..989904d4d8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3_BugNetCore.md
@@ -0,0 +1,65 @@
+---
+name: 🌟 .Net Core Bug Report 
+about: For bugs specifically for the upcoming .NET Core release of Umbraco, don't use this if you're working with Umbraco version 7 or 8
+labels: project/net-core
+---
+
+ℹ️ If this bug **also** appears on the current version 8 of Umbraco then please [report it as a regular bug](https://github.com/umbraco/Umbraco-CMS/issues/new?template=1_Bug.md), fixes in version 8 will be merged to the .NET Core version.
+
+A brief description of the issue goes here.
+
+<!--
+
+Please fill out the rest of the details in the issue template below. 
+The more details you can give us, the easier it will be for us
+to determine the cause of a problem.
+
+-->
+
+
+Reproduction
+------------
+
+If you're filing a bug, please describe how to reproduce it. Include as much
+relevant information as possible, such as:
+
+### Bug summary
+
+<!--
+    * Write a short summary of the bug
+    * Try to pinpoint it as much as possible
+    * Try to state the _actual problem_, and not just what you _think_ the
+      solution might be.
+-->
+
+### Specifics
+
+<!--
+    * Mention the URL where this bug occurs, if applicable
+    * What version of Umbraco are you using (down to the very last digit!)
+    * What browser and version you are using
+    * Please mention if you've checked it in other browsers as well
+    * Please include *full error messages* and *screenshots* if possible
+-->
+
+### Steps to reproduce
+
+<!--
+    * Clearly mention the steps to reproduce the bug
+-->
+
+### Expected result
+
+<!--
+    * What did you _expect_ that would happen on your Umbraco site?
+    * Describe the intended/desired outcome after you did the steps mentioned.
+-->
+
+### Actual result
+
+<!--
+    * What is the actual result of the above steps?
+    * Describe the behaviour of the bug
+    * Please, please include **error messages** and screenshots. They might mean
+      nothing to you, but they are _very_ helpful to us.
+-->
diff --git a/.github/ISSUE_TEMPLATE/3_Support_question.md b/.github/ISSUE_TEMPLATE/3_Support_question.md
deleted file mode 100644
index 829df982f9..0000000000
--- a/.github/ISSUE_TEMPLATE/3_Support_question.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: ⁉️ Support Question
-about: Having trouble with Umbraco? -> https://our.umbraco.com
----
-
-This issue tracker is NOT meant for support questions. If you have a question,
-please join us on the forum at https://our.umbraco.com.
-
-Thanks!
diff --git a/.github/ISSUE_TEMPLATE/4_Documentation_issue.md b/.github/ISSUE_TEMPLATE/4_Documentation_issue.md
deleted file mode 100644
index 8893647aa8..0000000000
--- a/.github/ISSUE_TEMPLATE/4_Documentation_issue.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: 📖 Documentation Issue
-about: See https://github.com/umbraco/UmbracoDocs/issues for documentation issues
----
-
-The Umbraco documentation has its own dedicated repository. Please open your
-documentation-related issue at https://github.com/umbraco/UmbracoDocs/issues
-
-Thanks!
diff --git a/.github/ISSUE_TEMPLATE/5_Security_issue.md b/.github/ISSUE_TEMPLATE/5_Security_issue.md
deleted file mode 100644
index 84c5f5989c..0000000000
--- a/.github/ISSUE_TEMPLATE/5_Security_issue.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: 🔐 Security Issue
-about: Discovered a Security Issue in Umbraco?
----
-
-⚠️ PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, SEE BELOW.
-
-If you have found a security issue in Umbraco, please send the details to
-security@umbraco.com and don't disclose it publicly until we can provide a fix for
-it. If you wish, we'll credit you for finding verified issues, when we release
-the patched version.
-
-❗ Please read more about how to report security issues on https://umbraco.com/security
-
-A note on "Self XSS"
---------------------
-
-Umbraco is a CMS, that allows users to edit content on a website. As such,
-all _authenticated users_ can:
-
- - Edit content, and (depending on the field types) insert HTML and CSS in that
-   content, with a variety of allowed attributes.
- - Depending on the user level: Edit template files, and insert C#, HTML, CSS and
-   javascript in so on.
- - Upload files to the site, which will become publicly available.
-
-We see these functionalities as _features_, and not as security issues. Please
-report the mentioned items only if they can be performed by non-authorized
-users, or other exploitable vulnerabilities.
-
-Thanks!
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..37d1be9158
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: true
+contact_links:
+    - name: ⁉️ Support Question
+      url: https://our.umbraco.com
+      about: This issue tracker is NOT meant for support questions. If you have a question, please join us on the forum.
+    - name: 📖 Documentation Issue
+      url: https://github.com/umbraco/UmbracoDocs/issues
+      about: Documentation issues should be reported on the Umbraco documentation repository.
+    - name: 🔐 Security Issue
+      url: https://umbraco.com/about-us/trust-center/security-and-umbraco/how-to-report-a-vulnerability-in-umbraco/
+      about: Discovered a Security Issue in Umbraco?
\ No newline at end of file
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000000..4dfa5a83b9
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,61 @@
+name: "Code scanning - action"
+
+on:
+  push:
+    branches: [v8/contrib,v8/dev,v8/bug,v8/feature]
+  pull_request:
+    # The branches below must be a subset of the branches above
+  schedule:
+    - cron: '0 7 * * 2'
+
+jobs:
+  CodeQL-Build:
+
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      # with:
+      #   languages: go, javascript, csharp, python, cpp, java
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+    
+    - name: configure Pagefile
+      uses: al-cheb/configure-pagefile-action@v1.2
+      with:
+          minimum-size: 8GB
+          maximum-size: 32GB
+          
+    - run: |
+        echo "Run Umbraco-CMS build"
+        pwsh -command .\build\build.ps1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
+      with:
+        config-file: ./.github/codeql-config.yml
+
+
diff --git a/.github/workflows/codeql-config.yml b/.github/workflows/codeql-config.yml
new file mode 100644
index 0000000000..59b55e48ec
--- /dev/null
+++ b/.github/workflows/codeql-config.yml
@@ -0,0 +1,13 @@
+name: "CodeQL config"
+on:
+  push:
+    branches: [v8/contrib,v8/dev]
+paths-ignore: 
+  - node_modules
+  - Umbraco.TestData
+  - Umbraco.Tests
+  - Umbraco.Tests.AcceptanceTest
+  - Umbraco.Tests.Benchmarks
+  - bin
+paths:
+  - src   
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 927c2ef570..ebbfe93576 100644
--- a/.gitignore
+++ b/.gitignore
@@ -167,6 +167,7 @@ build/temp/
 # eof
 /src/Umbraco.Web.UI.Client/TESTS-*.xml
 /src/ApiDocs/api/*
+/src/Umbraco.Web.UI.Client/package-lock.json
 
 # Acceptance tests
 cypress.env.json
@@ -174,3 +175,6 @@ cypress.env.json
 /src/Umbraco.Tests.AcceptanceTest/package-lock.json
 /src/Umbraco.Tests.AcceptanceTest/cypress/videos/
 /src/Umbraco.Tests.AcceptanceTest/cypress/screenshots/
+src/Umbraco.Web.UI/Umbraco/telemetrics-id.umb
+
+/src/Umbraco.Web.UI/config/umbracoSettings.config
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 72619db02e..48f5f32222 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -42,6 +42,8 @@
                 <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
                 <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
                 <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
+                <dependency id="HtmlSanitizer" version="[4.0.217,4.999999)" />
+                <dependency id="MessagePack" version="[2.1.165,2.999999)" />
 
             </group>
 
diff --git a/build/NuSpecs/tools/ReadmeUpgrade.txt b/build/NuSpecs/tools/ReadmeUpgrade.txt
index 91d49d896c..fd1b2174e2 100644
--- a/build/NuSpecs/tools/ReadmeUpgrade.txt
+++ b/build/NuSpecs/tools/ReadmeUpgrade.txt
@@ -11,7 +11,7 @@ Y88   88Y 888  888  888 888 d88P 888    888  888 Y88b.    Y88..88P
 
 Don't forget to build!
 
-We've done our best to transform your configuration files but in case something is not quite right: we recommmend you look in source control for the previous version so you can find the original files before they were transformed.
+We've done our best to transform your configuration files but in case something is not quite right: we recommend you look in source control for the previous version so you can find the original files before they were transformed.
 
 This NuGet package includes build targets that extend the creation of a deploy package, which is generated by
 Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use
diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt
index 2b79f95c70..e215bdbf29 100644
--- a/build/NuSpecs/tools/Web.config.install.xdt
+++ b/build/NuSpecs/tools/Web.config.install.xdt
@@ -1,139 +1,136 @@
 <?xml version="1.0"?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <configSections xdt:Transform="InsertIfMissing" />
-  <configSections>
-    <sectionGroup name="applicationSettings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
-      <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="dashBoard" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </sectionGroup>
-  </configSections>
+    <configSections xdt:Transform="InsertIfMissing" />
+    <configSections>
+        <sectionGroup name="applicationSettings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)">
+            <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+            <section name="dashBoard" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        </sectionGroup>
+    </configSections>
 
-  <appSettings xdt:Transform="InsertIfMissing" />
-  <appSettings>
-    <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
-	<add key="Umbraco.ModelsBuilder.Enable" value="false" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
-	<add key="Umbraco.ModelsBuilder.ModelsMode" value="Nothing" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
-  </appSettings>
+    <appSettings xdt:Transform="InsertIfMissing" />
+    <appSettings>
+        <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+        <add key="Umbraco.ModelsBuilder.Enable" value="false" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+        <add key="Umbraco.ModelsBuilder.ModelsMode" value="Nothing" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+    </appSettings>
 
-  <umbracoConfiguration xdt:Transform="InsertIfMissing">
-    <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-    <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="Remove" />
-    <HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-  </umbracoConfiguration>
+    <umbracoConfiguration xdt:Transform="InsertIfMissing" />
+    <umbracoConfiguration>
+        <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+        <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="Remove" />
+        <HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+    </umbracoConfiguration>
 
-  <system.data xdt:Transform="InsertIfMissing">
-    <DbProviderFactories xdt:Transform="InsertIfMissing">
-      <remove invariant="System.Data.SqlServerCe.4.0" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
-      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
-    </DbProviderFactories>
-  </system.data>
-  <clientDependency xdt:Transform="RemoveAttributes(version)" />
+    <system.data xdt:Transform="InsertIfMissing" />
+    <system.data>
+        <DbProviderFactories xdt:Transform="InsertIfMissing" />
+        <DbProviderFactories>
+            <remove invariant="System.Data.SqlServerCe.4.0" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
+            <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
+        </DbProviderFactories>
+    </system.data>
 
-  <system.web xdt:Transform="InsertIfMissing" />
-  <system.web>
-    <siteMap xdt:Transform="Remove" />
-    <httpRuntime xdt:Transform="InsertIfMissing" />
-    <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
-    <httpRuntime targetFramework="4.7.2" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
+    <clientDependency xdt:Transform="RemoveAttributes(version)" />
 
-    <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
-    <roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>
-    <profile defaultProvider="DefaultProfileProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>>
-    <sessionState customProvider="DefaultSessionProvider" xdt:Locator="Match(customProvider)" xdt:Transform="Remove"/>
-    <compilation xdt:Transform="InsertIfMissing" />
+    <system.web xdt:Transform="InsertIfMissing" />
+    <system.web>
+        <siteMap xdt:Transform="Remove" />
+        <httpRuntime xdt:Transform="InsertIfMissing" />
+        <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
+        <httpRuntime targetFramework="4.7.2" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
+        <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
+        <roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
+        <profile defaultProvider="DefaultProfileProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
+        <sessionState customProvider="DefaultSessionProvider" xdt:Locator="Match(customProvider)" xdt:Transform="Remove" />
+        <compilation xdt:Transform="InsertIfMissing" />
+        <xhtmlConformance xdt:Transform="Remove" />
 
-    <xhtmlConformance xdt:Transform="Remove" />
+        <httpModules xdt:Transform="InsertIfMissing" />
+        <httpModules>
+            <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <!-- Don't remove the leading space below, this is to fix a quirk for a lot of releases where we added it with the space by default -->
+            <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule, Umbraco.Web" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        </httpModules>
 
-    <httpModules xdt:Transform="InsertIfMissing" />
-    <httpModules>
-      <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,Umbraco.Web" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </httpModules>
+        <httpHandlers xdt:Transform="InsertIfMissing" />
+        <httpHandlers>
+            <add path="GoogleSpellChecker.ashx" xdt:Locator="Match(path)" xdt:Transform="Remove" />
+        </httpHandlers>
+    </system.web>
 
-    <httpHandlers xdt:Transform="InsertIfMissing" />
-    <httpHandlers>
-      <add path="GoogleSpellChecker.ashx" xdt:Locator="Match(path)" xdt:Transform="Remove"  />
-    </httpHandlers>
-  </system.web>
+    <system.webServer xdt:Transform="InsertIfMissing" />
+    <system.webServer>
+        <modules xdt:Transform="InsertIfMissing" />
+        <modules runAllManagedModulesForAllRequests="true" xdt:Transform="SetAttributes(runAllManagedModulesForAllRequests)" />
+        <modules>
+            <remove name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <remove name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <remove name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <!-- Don't remove the leading space below, this is to fix a quirk for a lot of releases where we added it with the space by default -->
+            <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule, Umbraco.Web" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        </modules>
 
-  <system.webServer xdt:Transform="InsertIfMissing" />
-  <system.webServer>
-    <modules xdt:Transform="InsertIfMissing" />
-    <modules runAllManagedModulesForAllRequests="true" xdt:Transform="SetAttributes(runAllManagedModulesForAllRequests)">
-      <remove name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <remove name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <remove name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        <staticContent xdt:Transform="InsertIfMissing" />
+        <staticContent>
+            <remove fileExtension=".svg" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".svg" mimeType="image/svg+xml" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <remove fileExtension=".woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".woff" mimeType="font/woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <remove fileExtension=".woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".woff2" mimeType="font/woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <remove fileExtension=".less" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".less" mimeType="text/css" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+        </staticContent>
 
-      <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <!-- Note, we're removing the one that starts with a space here, don't correct it -->
-      <!-- This to fix a quirk we for a lot of releases where we added it with the space by default -->
-      <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,Umbraco.Web" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </modules>
+        <handlers>
+            <remove name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        </handlers>
 
-    <staticContent xdt:Transform="InsertIfMissing" />
-    <staticContent>
-      <remove fileExtension=".svg" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".svg" mimeType="image/svg+xml" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <remove fileExtension=".woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <remove fileExtension=".woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <remove fileExtension=".less" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".less" mimeType="text/css" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-    </staticContent>
+        <security xdt:Transform="InsertIfMissing" />
+        <security>
+            <requestFiltering xdt:Transform="InsertIfMissing" />
+            <requestFiltering>
+                <requestLimits maxAllowedContentLength="52428800" xdt:Transform="InsertIfMissing" />
+            </requestFiltering>
+        </security>
 
-    <handlers>
-      <remove name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    </handlers>
+    </system.webServer>
 
-    <security xdt:Transform="InsertIfMissing">
-      <requestFiltering xdt:Transform="InsertIfMissing">
-        <requestLimits maxAllowedContentLength="52428800" xdt:Transform="InsertIfMissing" />
-      </requestFiltering>
-    </security>
-
-  </system.webServer>
-
-  <runtime xdt:Transform="InsertIfMissing" />
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing" />
-  </runtime>
-
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='HtmlAgilityPack')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='AutoMapper')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Newtonsoft.Json')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Mvc')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.WebPages.Razor')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Http')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.OAuth')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.Cookies')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='log4net')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Data.SqlServerCe')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.ValueTuple')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Collections.Immutable')" xdt:Transform="Remove" />
-    </assemblyBinding>
-  </runtime>
-
- <runtime>
+    <runtime xdt:Transform="InsertIfMissing" />
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing" />
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='HtmlAgilityPack')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='AutoMapper')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Newtonsoft.Json')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Mvc')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.WebPages.Razor')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Http')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.OAuth')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.Cookies')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='log4net')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Data.SqlServerCe')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.ValueTuple')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Collections.Immutable')" xdt:Transform="Remove" />
             <dependentAssembly xdt:Transform="Insert">
                 <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
@@ -177,20 +174,21 @@
         </assemblyBinding>
     </runtime>
 
-  <system.web.webPages.razor xdt:Transform="Remove" />
+    <system.web.webPages.razor xdt:Transform="Remove" />
 
-  <location path="umbraco" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
-  <location path="umbraco" xdt:Locator="Match(path)">
-    <system.webServer xdt:Transform="InsertIfMissing">
-      <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
-    </system.webServer>
-  </location>
-
-  <location path="App_Plugins" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
-  <location path="App_Plugins" xdt:Locator="Match(path)">
-    <system.webServer xdt:Transform="InsertIfMissing">
-      <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
-    </system.webServer>
-  </location>
+    <location path="umbraco" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
+    <location path="umbraco" xdt:Locator="Match(path)">
+        <system.webServer xdt:Transform="InsertIfMissing" />
+        <system.webServer>
+            <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
+        </system.webServer>
+    </location>
 
+    <location path="App_Plugins" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
+    <location path="App_Plugins" xdt:Locator="Match(path)">
+        <system.webServer xdt:Transform="InsertIfMissing" />
+        <system.webServer>
+            <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
+        </system.webServer>
+    </location>
 </configuration>
diff --git a/build/build-bootstrap.ps1 b/build/build-bootstrap.ps1
index 82c789ff22..9a31a57acf 100644
--- a/build/build-bootstrap.ps1
+++ b/build/build-bootstrap.ps1
@@ -34,6 +34,7 @@
     if (-not (test-path $nuget))
     {
       Write-Host "Download NuGet..."
+      [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
       Invoke-WebRequest $source -OutFile $nuget
       if (-not $?) { throw "Failed to download NuGet." }
     }
diff --git a/build/build.ps1 b/build/build.ps1
index c2c5bdd232..15d455b976 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -125,7 +125,23 @@
         $error.Clear()
 
         Write-Output "### gulp build for version $($this.Version.Release)" >> $log 2>&1
-        npx gulp build --buildversion=$this.Version.Release >> $log 2>&1
+        npm run build --buildversion=$this.Version.Release >> $log 2>&1
+		
+		# We can ignore this warning, we need to update to node 12 at some point - https://github.com/jsdom/jsdom/issues/2939
+		$indexes = [System.Collections.ArrayList]::new()
+		$index = 0;
+		$error | ForEach-Object {
+			# Find which of the errors is the ExperimentalWarning
+			if($_.ToString().Contains("ExperimentalWarning: The fs.promises API is experimental")) {
+				[void]$indexes.Add($index)
+			}
+			$index++
+		}
+		$indexes | ForEach-Object {
+			# Loop through the list of indexes and remove the errors that we expect and feel confident we can ignore
+			$error.Remove($error[$_])
+		}
+		
         if (-not $?) { throw "Failed to build" } # that one is expected to work
     } finally {
         Pop-Location
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 5587979a6c..3ecfd20f03 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -2,7 +2,7 @@
 using System.Resources;
 
 [assembly: AssemblyCompany("Umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2020")]
+[assembly: AssemblyCopyright("Copyright © Umbraco 2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.7.0")]
-[assembly: AssemblyInformationalVersion("8.7.0")]
+[assembly: AssemblyFileVersion("8.11.1")]
+[assembly: AssemblyInformationalVersion("8.11.1")]
diff --git a/src/Umbraco.Core/Collections/EventClearingObservableCollection.cs b/src/Umbraco.Core/Collections/EventClearingObservableCollection.cs
new file mode 100644
index 0000000000..af25cc1b4a
--- /dev/null
+++ b/src/Umbraco.Core/Collections/EventClearingObservableCollection.cs
@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+
+namespace Umbraco.Core.Collections
+{
+    /// <summary>
+    /// Allows clearing all event handlers
+    /// </summary>
+    /// <typeparam name="TValue"></typeparam>
+    public class EventClearingObservableCollection<TValue> : ObservableCollection<TValue>, INotifyCollectionChanged
+    {
+        public EventClearingObservableCollection()
+        {
+        }
+
+        public EventClearingObservableCollection(List<TValue> list) : base(list)
+        {
+        }
+
+        public EventClearingObservableCollection(IEnumerable<TValue> collection) : base(collection)
+        {
+        }
+
+        // need to explicitly implement with event accessor syntax in order to override in order to to clear
+        // c# events are weird, they do not behave the same way as other c# things that are 'virtual',
+        // a good article is here: https://medium.com/@unicorn_dev/virtual-events-in-c-something-went-wrong-c6f6f5fbe252
+        // and https://stackoverflow.com/questions/2268065/c-sharp-language-design-explicit-interface-implementation-of-an-event
+        private NotifyCollectionChangedEventHandler _changed;
+        event NotifyCollectionChangedEventHandler INotifyCollectionChanged.CollectionChanged
+        {
+            add { _changed += value; }
+            remove { _changed -= value; }
+        }
+
+        /// <summary>
+        /// Clears all event handlers for the <see cref="CollectionChanged"/> event
+        /// </summary>
+        public void ClearCollectionChangedEvents() => _changed = null;
+    }
+}
diff --git a/src/Umbraco.Core/Collections/ObservableDictionary.cs b/src/Umbraco.Core/Collections/ObservableDictionary.cs
index c6aedab377..fd9e469f07 100644
--- a/src/Umbraco.Core/Collections/ObservableDictionary.cs
+++ b/src/Umbraco.Core/Collections/ObservableDictionary.cs
@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Linq;
 using System.Runtime.Serialization;
 
 namespace Umbraco.Core.Collections
 {
+
     /// <summary>
     /// An ObservableDictionary
     /// </summary>
@@ -15,7 +18,7 @@ namespace Umbraco.Core.Collections
     /// </remarks>
     /// <typeparam name="TValue">The type of elements contained in the BindableCollection</typeparam>
     /// <typeparam name="TKey">The type of the indexing key</typeparam>
-    public class ObservableDictionary<TKey, TValue> : ObservableCollection<TValue>, IReadOnlyDictionary<TKey, TValue>, IDictionary<TKey, TValue>
+    public class ObservableDictionary<TKey, TValue> : ObservableCollection<TValue>, IReadOnlyDictionary<TKey, TValue>, IDictionary<TKey, TValue>, INotifyCollectionChanged
     {
         protected Dictionary<TKey, int> Indecies { get; }
         protected Func<TValue, TKey> KeySelector { get; }
@@ -74,6 +77,22 @@ namespace Umbraco.Core.Collections
 
         #endregion
 
+        // need to explicitly implement with event accessor syntax in order to override in order to to clear
+        // c# events are weird, they do not behave the same way as other c# things that are 'virtual',
+        // a good article is here: https://medium.com/@unicorn_dev/virtual-events-in-c-something-went-wrong-c6f6f5fbe252
+        // and https://stackoverflow.com/questions/2268065/c-sharp-language-design-explicit-interface-implementation-of-an-event
+        private NotifyCollectionChangedEventHandler _changed;
+        event NotifyCollectionChangedEventHandler INotifyCollectionChanged.CollectionChanged
+        {
+            add { _changed += value; }
+            remove { _changed -= value; }
+        }
+
+        /// <summary>
+        /// Clears all <see cref="CollectionChanged"/> event handlers
+        /// </summary>
+        public void ClearCollectionChangedEvents() => _changed = null;
+
         public bool ContainsKey(TKey key)
         {
             return Indecies.ContainsKey(key);
diff --git a/src/Umbraco.Core/Compose/AuditEventsComponent.cs b/src/Umbraco.Core/Compose/AuditEventsComponent.cs
index 033b46c13f..62610ca9c7 100644
--- a/src/Umbraco.Core/Compose/AuditEventsComponent.cs
+++ b/src/Umbraco.Core/Compose/AuditEventsComponent.cs
@@ -42,7 +42,19 @@ namespace Umbraco.Core.Compose
         }
 
         public void Terminate()
-        { }
+        {
+            UserService.SavedUserGroup -= OnSavedUserGroupWithUsers;
+
+            UserService.SavedUser -= OnSavedUser;
+            UserService.DeletedUser -= OnDeletedUser;
+            UserService.UserGroupPermissionsAssigned -= UserGroupPermissionAssigned;
+
+            MemberService.Saved -= OnSavedMember;
+            MemberService.Deleted -= OnDeletedMember;
+            MemberService.AssignedRoles -= OnAssignedRoles;
+            MemberService.RemovedRoles -= OnRemovedRoles;
+            MemberService.Exported -= OnMemberExported;
+        }
 
         internal static IUser UnknownUser => new User { Id = Constants.Security.UnknownUserId, Name = Constants.Security.UnknownUserName, Email = "" };
 
diff --git a/src/Umbraco.Core/Compose/RelateOnCopyComponent.cs b/src/Umbraco.Core/Compose/RelateOnCopyComponent.cs
index b56ff8b87e..a9f9ed1ee0 100644
--- a/src/Umbraco.Core/Compose/RelateOnCopyComponent.cs
+++ b/src/Umbraco.Core/Compose/RelateOnCopyComponent.cs
@@ -14,7 +14,9 @@ namespace Umbraco.Core.Compose
         }
 
         public void Terminate()
-        { }
+        {
+            ContentService.Copied -= ContentServiceCopied;
+        }
 
         private static void ContentServiceCopied(IContentService sender, Events.CopyEventArgs<IContent> e)
         {
diff --git a/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs b/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
index 4e01c50fc6..a216a584ba 100644
--- a/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
+++ b/src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
@@ -18,7 +18,12 @@ namespace Umbraco.Core.Compose
         }
 
         public void Terminate()
-        { }
+        {
+            ContentService.Moved -= ContentService_Moved;
+            ContentService.Trashed -= ContentService_Trashed;
+            MediaService.Moved -= MediaService_Moved;
+            MediaService.Trashed -= MediaService_Trashed;
+        }
 
         private static void ContentService_Moved(IContentService sender, MoveEventArgs<IContent> e)
         {
diff --git a/src/Umbraco.Core/Composing/Current.cs b/src/Umbraco.Core/Composing/Current.cs
index a06f09baf6..a4ccd59f9d 100644
--- a/src/Umbraco.Core/Composing/Current.cs
+++ b/src/Umbraco.Core/Composing/Current.cs
@@ -30,6 +30,7 @@ namespace Umbraco.Core.Composing
     public static class Current
     {
         private static IFactory _factory;
+        private static IRuntimeState _state;
 
         // TODO: get rid of these oddities
         // we don't want Umbraco tests to die because the container has not been properly initialized,
@@ -125,7 +126,17 @@ namespace Umbraco.Core.Composing
                ?? new ProfilingLogger(Logger, Profiler);
 
         public static IRuntimeState RuntimeState
-            => Factory.GetInstance<IRuntimeState>();
+        {
+            get
+            {
+                return _state ?? Factory.GetInstance<IRuntimeState>();
+            }
+            internal set
+            {
+                // this is only used when the boot entirely fails, we need to manually set this so we can report
+                _state = value;
+            }
+        }
 
         public static TypeLoader TypeLoader
             => Factory.GetInstance<TypeLoader>();
diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
index 5ad1e43580..394d9480ae 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Core/Composing/TypeFinder.cs
@@ -35,7 +35,7 @@ namespace Umbraco.Core.Composing
                 var s = ConfigurationManager.AppSettings[Constants.AppSettings.AssembliesAcceptingLoadExceptions];
                 return _assembliesAcceptingLoadExceptions = string.IsNullOrWhiteSpace(s)
                     ? Array.Empty<string>()
-                    : s.Split(',').Select(x => x.Trim()).ToArray();
+                    : s.Split(Constants.CharArrays.Comma).Select(x => x.Trim()).ToArray();
             }
         }
 
diff --git a/src/Umbraco.Core/CompositionExtensions.cs b/src/Umbraco.Core/CompositionExtensions.cs
index ced9a9386a..2fcf446d6b 100644
--- a/src/Umbraco.Core/CompositionExtensions.cs
+++ b/src/Umbraco.Core/CompositionExtensions.cs
@@ -64,7 +64,7 @@ namespace Umbraco.Core
             => composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>();
 
         /// <summary>
-        /// Gets the url segment providers collection builder.
+        /// Gets the URL segment providers collection builder.
         /// </summary>
         /// <param name="composition">The composition.</param>
         public static UrlSegmentProviderCollectionBuilder UrlSegmentProviders(this Composition composition)
diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index a888e3c42b..1d1ccaf7b4 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -68,9 +68,9 @@ namespace Umbraco.Core.Configuration
         internal static bool? HasSmtpServer { get; set; }
 
         /// <summary>
-        /// Gets the reserved urls from web.config.
+        /// Gets the reserved URLs from web.config.
         /// </summary>
-        /// <value>The reserved urls.</value>
+        /// <value>The reserved URLs.</value>
         public string ReservedUrls
         {
             get
@@ -145,6 +145,20 @@ namespace Umbraco.Core.Configuration
             }
         }
 
+        /// <summary>
+        /// Gets the path to folder containing the icons used in the umbraco backoffice (/umbraco/assets/icons by default).
+        /// </summary>
+        /// <value>The icons path.</value>
+        public string IconsPath
+        {
+            get
+            {
+                return ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.IconsPath)
+                    ? IOHelper.ResolveUrl(Constants.AppSettings.IconsPath)
+                    : $"{Path}/assets/icons";
+            }
+        }
+
         /// <summary>
         /// Gets or sets the configuration status. This will return the version number of the currently installed umbraco instance.
         /// </summary>
@@ -340,10 +354,10 @@ namespace Umbraco.Core.Configuration
         }
 
         /// <summary>
-        /// Gets a value indicating whether umbraco should hide top level nodes from generated urls.
+        /// Gets a value indicating whether umbraco should hide top level nodes from generated URLs.
         /// </summary>
         /// <value>
-        ///     <c>true</c> if umbraco hides top level nodes from urls; otherwise, <c>false</c>.
+        ///     <c>true</c> if umbraco hides top level nodes from URLs; otherwise, <c>false</c>.
         /// </value>
         public bool HideTopLevelNodeFromPath
         {
@@ -377,5 +391,28 @@ namespace Umbraco.Core.Configuration
                 }
             }
         }
+
+
+        /// <summary>
+        /// An int value representing the time in milliseconds to lock the database for a write operation
+        /// </summary>
+        /// <remarks>
+        /// The default value is 1800 milliseconds
+        /// </remarks>
+        /// <value>The timeout in milliseconds.</value>
+        public int SqlWriteLockTimeOut
+        {
+            get
+            {
+                try
+                {
+                    return int.Parse(ConfigurationManager.AppSettings[Constants.AppSettings.SqlWriteLockTimeOut]);
+                }
+                catch
+                {
+                    return 1800;
+                }
+            }
+        }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
index bc76caacee..e8fea7f27d 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Core.Configuration
             var path = globalSettings.Path;
             if (path.StartsWith(SystemDirectories.Root)) // beware of TrimStart, see U4-2518
                 path = path.Substring(SystemDirectories.Root.Length);
-            return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
+            return path.TrimStart(Constants.CharArrays.Tilde).TrimStart(Constants.CharArrays.ForwardSlash).Replace('/', '-').Trim().ToLower();
         }
 
     }
diff --git a/src/Umbraco.Core/Configuration/IGlobalSettings.cs b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
index b96434c30c..483829f85f 100644
--- a/src/Umbraco.Core/Configuration/IGlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
@@ -1,14 +1,14 @@
 namespace Umbraco.Core.Configuration
 {
     /// <summary>
-    /// Contains general settings information for the entire Umbraco instance based on information from  web.config appsettings 
+    /// Contains general settings information for the entire Umbraco instance based on information from  web.config appsettings
     /// </summary>
     public interface IGlobalSettings
     {
         /// <summary>
-        /// Gets the reserved urls from web.config.
+        /// Gets the reserved URLs from web.config.
         /// </summary>
-        /// <value>The reserved urls.</value>
+        /// <value>The reserved URLs.</value>
         string ReservedUrls { get; }
 
         /// <summary>
@@ -21,7 +21,12 @@
         /// Gets the path to umbraco's root directory (/umbraco by default).
         /// </summary>
         string Path { get; }
-        
+
+        /// <summary>
+        /// Gets the path to umbraco's icons directory (/umbraco/assets/icons by default).
+        /// </summary>
+        string IconsPath { get; }
+
         /// <summary>
         /// Gets or sets the configuration status. This will return the version number of the currently installed umbraco instance.
         /// </summary>
@@ -40,10 +45,10 @@
         string DefaultUILanguage { get; }
 
         /// <summary>
-        /// Gets a value indicating whether umbraco should hide top level nodes from generated urls.
+        /// Gets a value indicating whether umbraco should hide top level nodes from generated URLs.
         /// </summary>
         /// <value>
-        /// 	<c>true</c> if umbraco hides top level nodes from urls; otherwise, <c>false</c>.
+        /// 	<c>true</c> if umbraco hides top level nodes from URLs; otherwise, <c>false</c>.
         /// </value>
         bool HideTopLevelNodeFromPath { get; }
 
@@ -67,5 +72,10 @@
         /// Gets the location of temporary files.
         /// </summary>
         string LocalTempPath { get; }
+
+        /// <summary>
+        /// Gets the write lock timeout.
+        /// </summary>
+        int SqlWriteLockTimeOut { get; }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs
index 79bff51d05..a84ae3d31c 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs
@@ -8,5 +8,10 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         internal TourConfigElement Tours => (TourConfigElement)this["tours"];
 
         ITourSection IBackOfficeSection.Tours => Tours;
+
+        [ConfigurationProperty("id", DefaultValue = "")]
+        internal string Id => (string)base["id"];
+
+        string IBackOfficeSection.Id => (string)base["id"];
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
index 77ad7df0dc..3ebb632882 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
@@ -40,6 +40,9 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         [ConfigurationProperty("loginBackgroundImage")]
         internal InnerTextConfigurationElement<string> LoginBackgroundImage => GetOptionalTextElement("loginBackgroundImage", string.Empty);
 
+        [ConfigurationProperty("loginLogoImage")]
+        internal InnerTextConfigurationElement<string> LoginLogoImage => GetOptionalTextElement("loginLogoImage", "assets/img/application/umbraco_logo_white.svg");
+
         string IContentSection.NotificationEmailAddress => Notifications.NotificationEmailAddress;
 
         bool IContentSection.DisableHtmlEmail => Notifications.DisableHtmlEmail;
@@ -61,5 +64,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         bool IContentSection.ShowDeprecatedPropertyEditors => ShowDeprecatedPropertyEditors;
 
         string IContentSection.LoginBackgroundImage => LoginBackgroundImage;
+
+        string IContentSection.LoginLogoImage => LoginLogoImage;
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs
index 82cc5928cf..b3980d236a 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         {
             if (contentConfig == null) throw new ArgumentNullException(nameof(contentConfig));
             if (extension == null) return false;
-            extension = extension.TrimStart('.');
+            extension = extension.TrimStart(Constants.CharArrays.Period);
             return contentConfig.ImageFileTypes.InvariantContains(extension);
         }
 
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
index 36dd6a22ed..32e8e4e3ec 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
@@ -1,7 +1,10 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
+using System;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
 {
     public interface IBackOfficeSection
     {
         ITourSection Tours { get; }
+        string Id { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
index 228b0923dc..0f52adf02e 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
@@ -32,5 +32,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         bool ShowDeprecatedPropertyEditors { get; }
 
         string LoginBackgroundImage { get; }
+
+        string LoginLogoImage { get; }
     }
 }
diff --git a/src/Umbraco.Core/Constants-AppSettings.cs b/src/Umbraco.Core/Constants-AppSettings.cs
index 704617d90c..0182034011 100644
--- a/src/Umbraco.Core/Constants-AppSettings.cs
+++ b/src/Umbraco.Core/Constants-AppSettings.cs
@@ -43,6 +43,11 @@ namespace Umbraco.Core
             /// </summary>
             public const string Path = "Umbraco.Core.Path";
 
+            /// <summary>
+            /// Gets the path to umbraco's icons directory (/umbraco/assets/icons by default).
+            /// </summary>
+            public const string IconsPath = "Umbraco.Icons.Path";
+
             /// <summary>
             /// Gets the path to the css directory (/css by default).
             /// </summary>
@@ -59,7 +64,7 @@ namespace Umbraco.Core
             public const string MediaPath = "umbracoMediaPath";
 
             /// <summary>
-            /// The reserved urls from web.config.
+            /// The reserved URLs from web.config.
             /// </summary>
             public const string ReservedUrls = "Umbraco.Core.ReservedUrls";
 
@@ -96,7 +101,7 @@ namespace Umbraco.Core
             public const string DefaultUILanguage = "Umbraco.Core.DefaultUILanguage";
 
             /// <summary>
-            /// A true/false value indicating whether umbraco should hide top level nodes from generated urls.
+            /// A true/false value indicating whether umbraco should hide top level nodes from generated URLs.
             /// </summary>
             public const string HideTopLevelNodeFromPath = "Umbraco.Core.HideTopLevelNodeFromPath";
 
@@ -135,6 +140,14 @@ namespace Umbraco.Core
                 /// </summary>
                 public const string DatabaseFactoryServerVersion = "Umbraco.Core.Debug.DatabaseFactoryServerVersion";
             }
+
+            /// <summary>
+            /// An int value representing the time in milliseconds to lock the database for a write operation
+            /// </summary>
+            /// <remarks>
+            /// The default value is 1800 milliseconds
+            /// </remarks>
+            public const string SqlWriteLockTimeOut = "Umbraco.Core.SqlWriteLockTimeOut";
         }
     }
 }
diff --git a/src/Umbraco.Core/Constants-CharArrays.cs b/src/Umbraco.Core/Constants-CharArrays.cs
new file mode 100644
index 0000000000..2f8292b4a4
--- /dev/null
+++ b/src/Umbraco.Core/Constants-CharArrays.cs
@@ -0,0 +1,138 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core
+{
+    public static partial class Constants
+    {
+        /// <summary>
+        /// Char Arrays to avoid allocations
+        /// </summary>
+        public static class CharArrays
+        {
+            /// <summary>
+            /// Char array containing only /
+            /// </summary>
+            public static readonly char[] ForwardSlash = new char[] { '/' };
+
+            /// <summary>
+            /// Char array containing only \
+            /// </summary>
+            public static readonly char[] Backslash = new char[] { '\\' };
+
+            /// <summary>
+            /// Char array containing only '
+            /// </summary>
+            public static readonly char[] SingleQuote = new char[] { '\'' };
+
+            /// <summary>
+            /// Char array containing only "
+            /// </summary>
+            public static readonly char[] DoubleQuote = new char[] { '\"' };
+
+
+            /// <summary>
+            /// Char array containing ' "
+            /// </summary>
+            public static readonly char[] DoubleQuoteSingleQuote = new char[] { '\"', '\'' };
+
+            /// <summary>
+            /// Char array containing only _
+            /// </summary>
+            public static readonly char[] Underscore = new char[] { '_' };
+
+            /// <summary>
+            /// Char array containing \n \r
+            /// </summary>
+            public static readonly char[] LineFeedCarriageReturn = new char[] { '\n', '\r' };
+
+
+            /// <summary>
+            /// Char array containing \n
+            /// </summary>
+            public static readonly char[] LineFeed = new char[] { '\n' };
+
+            /// <summary>
+            /// Char array containing only ,
+            /// </summary>
+            public static readonly char[] Comma = new char[] { ',' };
+
+            /// <summary>
+            /// Char array containing only &
+            /// </summary>
+            public static readonly char[] Ampersand = new char[] { '&' };
+
+            /// <summary>
+            /// Char array containing only \0
+            /// </summary>
+            public static readonly char[] NullTerminator = new char[] { '\0' };
+
+            /// <summary>
+            /// Char array containing only .
+            /// </summary>
+            public static readonly char[] Period = new char[] { '.' };
+
+            /// <summary>
+            /// Char array containing only ~
+            /// </summary>
+            public static readonly char[] Tilde = new char[] { '~' };
+            /// <summary>
+            /// Char array containing ~ /
+            /// </summary>
+            public static readonly char[] TildeForwardSlash = new char[] { '~', '/' };
+
+            /// <summary>
+            /// Char array containing only ?
+            /// </summary>
+            public static readonly char[] QuestionMark = new char[] { '?' };
+
+            /// <summary>
+            /// Char array containing ? &
+            /// </summary>
+            public static readonly char[] QuestionMarkAmpersand = new char[] { '?', '&' };
+
+            /// <summary>
+            /// Char array containing XML 1.1 whitespace chars
+            /// </summary>
+            public static readonly char[] XmlWhitespaceChars = new char[] { ' ', '\t', '\r', '\n' };
+
+            /// <summary>
+            /// Char array containing only the Space char
+            /// </summary>
+            public static readonly char[] Space = new char[] { ' ' };
+
+            /// <summary>
+            /// Char array containing only ;
+            /// </summary>
+            public static readonly char[] Semicolon = new char[] { ';' };
+
+            /// <summary>
+            /// Char array containing a comma and a space
+            /// </summary>
+            public static readonly char[] CommaSpace = new char[] { ',', ' ' };
+
+            /// <summary>
+            /// Char array containing  _ -
+            /// </summary>
+            public static readonly char[] UnderscoreDash = new char[] { '_', '-' };
+
+            /// <summary>
+            /// Char array containing =
+            /// </summary>
+            public static readonly char[] EqualsChar = new char[] { '=' };
+
+            /// <summary>
+            /// Char array containing >
+            /// </summary>
+            public static readonly char[] GreaterThan = new char[] { '>' };
+
+            /// <summary>
+            /// Char array containing |
+            /// </summary>
+            public static readonly char[] VerticalTab = new char[] { '|' };
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Constants-Icons.cs b/src/Umbraco.Core/Constants-Icons.cs
index 05213ed1c4..d5cc37c9a5 100644
--- a/src/Umbraco.Core/Constants-Icons.cs
+++ b/src/Umbraco.Core/Constants-Icons.cs
@@ -24,6 +24,26 @@
             /// </summary>
             public const string DataType = "icon-autofill";
 
+            /// <summary>
+            /// System dictionary icon
+            /// </summary>
+            public const string Dictionary = "icon-book-alt";
+
+            /// <summary>
+            /// System generic folder icon
+            /// </summary>
+            public const string Folder = "icon-folder";
+
+            /// <summary>
+            /// System language icon
+            /// </summary>
+            public const string Language = "icon-globe";
+
+            /// <summary>
+            /// System logviewer icon
+            /// </summary>
+            public const string LogViewer = "icon-box-alt";
+
             /// <summary>
             /// System list view icon
             /// </summary>
@@ -69,6 +89,11 @@
             /// </summary>
             public const string MemberType = "icon-users";
 
+            /// <summary>
+            /// System packages icon
+            /// </summary>
+            public const string Packages = "icon-box";
+            
             /// <summary>
             /// System property editor icon
             /// </summary>
diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index eb2b3525a7..90f5fbd0d0 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -36,6 +36,11 @@ namespace Umbraco.Core
             /// </summary>
             public static class Aliases
             {
+                /// <summary>
+                /// Block List.
+                /// </summary>
+                public const string BlockList = "Umbraco.BlockList";
+
                 /// <summary>
                 /// CheckBox List.
                 /// </summary>
@@ -187,7 +192,7 @@ namespace Umbraco.Core
                 public const string NestedContent = "Umbraco.NestedContent";
 
                 /// <summary>
-                /// Alias for the multi url picker editor.
+                /// Alias for the multi URL picker editor.
                 /// </summary>
                 public const string MultiUrlPicker = "Umbraco.MultiUrlPicker";
             }
diff --git a/src/Umbraco.Core/Constants-Security.cs b/src/Umbraco.Core/Constants-Security.cs
index 43c989805b..f900288ef5 100644
--- a/src/Umbraco.Core/Constants-Security.cs
+++ b/src/Umbraco.Core/Constants-Security.cs
@@ -56,6 +56,8 @@ namespace Umbraco.Core
             public const string AllowedApplicationsClaimType = "http://umbraco.org/2015/02/identity/claims/backoffice/allowedapp";
             public const string SessionIdClaimType = "http://umbraco.org/2015/02/identity/claims/backoffice/sessionid";
 
+            public const string BackOfficeExternalLoginOptionsProperty = "UmbracoBackOfficeExternalLoginOptions";
+
         }
     }
 }
diff --git a/src/Umbraco.Core/Constants-SqlTemplates.cs b/src/Umbraco.Core/Constants-SqlTemplates.cs
index 984bc495b0..8529e6bfbc 100644
--- a/src/Umbraco.Core/Constants-SqlTemplates.cs
+++ b/src/Umbraco.Core/Constants-SqlTemplates.cs
@@ -14,7 +14,30 @@
                 public const string GetParentNode = "Umbraco.Core.VersionableRepository.GetParentNode";
                 public const string GetReservedId = "Umbraco.Core.VersionableRepository.GetReservedId";
             }
+            public static class RelationRepository
+            {
+                public const string DeleteByParentAll = "Umbraco.Core.RelationRepository.DeleteByParent";
+                public const string DeleteByParentIn = "Umbraco.Core.RelationRepository.DeleteByParentIn";
+            }
 
+            public static class DataTypeRepository
+            {
+                public const string EnsureUniqueNodeName = "Umbraco.Core.DataTypeDefinitionRepository.EnsureUniqueNodeName";
+            }
+
+            internal static class NuCacheDatabaseDataSource
+            {
+                public const string WhereNodeId = "Umbraco.Web.PublishedCache.NuCache.DataSource.WhereNodeId";
+                public const string WhereNodeIdX = "Umbraco.Web.PublishedCache.NuCache.DataSource.WhereNodeIdX";
+                public const string SourcesSelectUmbracoNodeJoin = "Umbraco.Web.PublishedCache.NuCache.DataSource.SourcesSelectUmbracoNodeJoin";
+                public const string ContentSourcesSelect = "Umbraco.Web.PublishedCache.NuCache.DataSource.ContentSourcesSelect";                
+                public const string ContentSourcesCount = "Umbraco.Web.PublishedCache.NuCache.DataSource.ContentSourcesCount";
+                public const string MediaSourcesSelect = "Umbraco.Web.PublishedCache.NuCache.DataSource.MediaSourcesSelect";
+                public const string MediaSourcesCount = "Umbraco.Web.PublishedCache.NuCache.DataSource.MediaSourcesCount";
+                public const string ObjectTypeNotTrashedFilter = "Umbraco.Web.PublishedCache.NuCache.DataSource.ObjectTypeNotTrashedFilter";
+                public const string OrderByLevelIdSortOrder = "Umbraco.Web.PublishedCache.NuCache.DataSource.OrderByLevelIdSortOrder";
+
+            }
         }
     }
 }
diff --git a/src/Umbraco.Core/Constants-SvgSanitizer.cs b/src/Umbraco.Core/Constants-SvgSanitizer.cs
new file mode 100644
index 0000000000..c92b9f56c7
--- /dev/null
+++ b/src/Umbraco.Core/Constants-SvgSanitizer.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core
+{
+    public static partial class Constants
+    {
+        /// <summary>
+        /// Defines the alias identifiers for Umbraco's core application sections.
+        /// </summary>
+        public static class SvgSanitizer
+        {
+            /// <summary>
+            /// Allowlist for SVG attributes.
+            /// </summary>
+            public static readonly IList<string> Attributes = new [] { "accent-height", "accumulate", "additive", "alignment-baseline", "allowReorder", "alphabetic", "amplitude", "arabic-form", "ascent", "attributeName", "attributeType", "autoReverse", "azimuth", "baseFrequency", "baseline-shift", "baseProfile", "bbox", "begin", "bias", "by", "calcMode", "cap-height", "class", "clip", "clipPathUnits", "clip-path", "clip-rule", "color", "color-interpolation", "color-interpolation-filters", "color-profile", "color-rendering", "contentScriptType", "contentStyleType", "cursor", "cx", "cy", "d", "decelerate", "descent", "diffuseConstant", "direction", "display", "divisor", "dominant-baseline", "dur", "dx", "dy", "edgeMode", "elevation", "enable-background", "end", "exponent", "externalResourcesRequired", "Section", "fill", "fill-opacity", "fill-rule", "filter", "filterRes", "filterUnits", "flood-color", "flood-opacity", "font-family", "font-size", "font-size-adjust", "font-stretch", "font-style", "font-variant", "font-weight", "format", "from", "fr", "fx", "fy", "g1", "g2", "glyph-name", "glyph-orientation-horizontal", "glyph-orientation-vertical", "glyphRef", "gradientTransform", "gradientUnits", "hanging", "height", "href", "hreflang", "horiz-adv-x", "horiz-origin-x", "ISection", "id", "ideographic", "image-rendering", "in", "in2", "intercept", "k", "k1", "k2", "k3", "k4", "kernelMatrix", "kernelUnitLength", "kerning", "keyPoints", "keySplines", "keyTimes", "lang", "lengthAdjust", "letter-spacing", "lighting-color", "limitingConeAngle", "local", "MSection", "marker-end", "marker-mid", "marker-start", "markerHeight", "markerUnits", "markerWidth", "mask", "maskContentUnits", "maskUnits", "mathematical", "max", "media", "method", "min", "mode", "NSection", "name", "numOctaves", "offset", "opacity", "operator", "order", "orient", "orientation", "origin", "overflow", "overline-position", "overline-thickness", "panose-1", "paint-order", "path", "pathLength", "patternContentUnits", "patternTransform", "patternUnits", "ping", "pointer-events", "points", "pointsAtX", "pointsAtY", "pointsAtZ", "preserveAlpha", "preserveAspectRatio", "primitiveUnits", "r", "radius", "referrerPolicy", "refX", "refY", "rel", "rendering-intent", "repeatCount", "repeatDur", "requiredExtensions", "requiredFeatures", "restart", "result", "rotate", "rx", "ry", "scale", "seed", "shape-rendering", "slope", "spacing", "specularConstant", "specularExponent", "speed", "spreadMethod", "startOffset", "stdDeviation", "stemh", "stemv", "stitchTiles", "stop-color", "stop-opacity", "strikethrough-position", "strikethrough-thickness", "string", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "surfaceScale", "systemLanguage", "tabindex", "tableValues", "target", "targetX", "targetY", "text-anchor", "text-decoration", "text-rendering", "textLength", "to", "transform", "type", "u1", "u2", "underline-position", "underline-thickness", "unicode", "unicode-bidi", "unicode-range", "units-per-em", "v-alphabetic", "v-hanging", "v-ideographic", "v-mathematical", "values", "vector-effect", "version", "vert-adv-y", "vert-origin-x", "vert-origin-y", "viewBox", "viewTarget", "visibility", "width", "widths", "word-spacing", "writing-mode", "x", "x-height", "x1", "x2", "xChannelSelector", "xlink:actuate", "xlink:arcrole", "xlink:href", "xlink:role", "xlink:show", "xlink:title", "xlink:type", "xml:base", "xml:lang", "xml:space", "y", "y1", "y2", "yChannelSelector", "z", "zoomAndPan" };
+
+            /// <summary>
+            /// Allowlist for SVG tabs.
+            /// </summary>
+            public static readonly IList<string> Tags = new [] { "a", "altGlyph", "altGlyphDef", "altGlyphItem", "animate", "animateColor", "animateMotion", "animateTransform", "circle", "clipPath", "color-profile", "cursor", "defs", "desc", "discard", "ellipse", "feBlend", "feColorMatrix", "feComponentTransfer", "feComposite", "feConvolveMatrix", "feDiffuseLighting", "feDisplacementMap", "feDistantLight", "feDropShadow", "feFlood", "feFuncA", "feFuncB", "feFuncG", "feFuncR", "feGaussianBlur", "feImage", "feMerge", "feMergeNode", "feMorphology", "feOffset", "fePointLight", "feSpecularLighting", "feSpotLight", "feTile", "feTurbulence", "filter", "font", "font-face", "font-face-format", "font-face-name", "font-face-src", "font-face-uri", "foreignObject", "g", "glyph", "glyphRef", "hatch", "hatchpath", "hkern", "image", "line", "linearGradient", "marker", "mask", "mesh", "meshgradient", "meshpatch", "meshrow", "metadata", "missing-glyph", "mpath", "path", "pattern", "polygon", "polyline", "radialGradient", "rect", "set", "solidcolor", "stop", "svg", "switch", "symbol", "text", "textPath", "title", "tref", "tspan", "unknown", "use", "view", "vkern" };
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Constants-Web.cs b/src/Umbraco.Core/Constants-Web.cs
index 64216ba571..80906a0663 100644
--- a/src/Umbraco.Core/Constants-Web.cs
+++ b/src/Umbraco.Core/Constants-Web.cs
@@ -17,6 +17,11 @@
             /// The preview cookie name
             /// </summary>
             public const string PreviewCookieName = "UMB_PREVIEW";
+            /// <summary>
+
+            /// Client-side cookie that determines whether the user has accepted to be in Preview Mode when visiting the website.
+            /// </summary>
+            public const string AcceptPreviewCookieName = "UMB-WEBSITE-PREVIEW-ACCEPT";
 
             public const string InstallerCookieName = "umb_installId";
         }
diff --git a/src/Umbraco.Core/Contants-UdiEntityType.cs b/src/Umbraco.Core/Contants-UdiEntityType.cs
index 75a137bd2e..1ed862f328 100644
--- a/src/Umbraco.Core/Contants-UdiEntityType.cs
+++ b/src/Umbraco.Core/Contants-UdiEntityType.cs
@@ -25,6 +25,7 @@ namespace Umbraco.Core
                     { Unknown, UdiType.Unknown },
 
                     { AnyGuid, UdiType.GuidUdi },
+                    { Element, UdiType.GuidUdi },
                     { Document, UdiType.GuidUdi },
                     { DocumentBlueprint, UdiType.GuidUdi },
                     { Media, UdiType.GuidUdi },
@@ -64,6 +65,8 @@ namespace Umbraco.Core
 
             public const string AnyGuid = "any-guid"; // that one is for tests
 
+            public const string Element = "element";
+
             public const string Document = "document";
 
             public const string DocumentBlueprint = "document-blueprint";
diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
index 7bce23e98e..eb6339741a 100644
--- a/src/Umbraco.Core/ContentExtensions.cs
+++ b/src/Umbraco.Core/ContentExtensions.cs
@@ -119,6 +119,15 @@ namespace Umbraco.Core
             return false;
         }
 
+        /// <summary>
+        /// Returns all properties based on the editorAlias
+        /// </summary>
+        /// <param name="content"></param>
+        /// <param name="editorAlias"></param>
+        /// <returns></returns>
+        public static IEnumerable<Property> GetPropertiesByEditor(this IContentBase content, string editorAlias)
+            => content.Properties.Where(x => x.PropertyType.PropertyEditorAlias == editorAlias);
+
         /// <summary>
         /// Returns properties that do not belong to a group
         /// </summary>
diff --git a/src/Umbraco.Core/DictionaryExtensions.cs b/src/Umbraco.Core/DictionaryExtensions.cs
index d9e998dbd1..88a042dbd5 100644
--- a/src/Umbraco.Core/DictionaryExtensions.cs
+++ b/src/Umbraco.Core/DictionaryExtensions.cs
@@ -253,7 +253,7 @@ namespace Umbraco.Core
             {
                 builder.Append(String.Format("{0}={1}&", HttpUtility.UrlEncode(i.Key), i.Value == null ? string.Empty : HttpUtility.UrlEncode(i.Value.ToString())));
             }
-            return builder.ToString().TrimEnd('&');
+            return builder.ToString().TrimEnd(Constants.CharArrays.Ampersand);
         }
 
         /// <summary>The get entry ignore case.</summary>
diff --git a/src/Umbraco.Core/Exceptions/UnattendedInstallException.cs b/src/Umbraco.Core/Exceptions/UnattendedInstallException.cs
new file mode 100644
index 0000000000..6f672d17cd
--- /dev/null
+++ b/src/Umbraco.Core/Exceptions/UnattendedInstallException.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Exceptions
+{
+    /// <summary>
+    /// An exception that is thrown if an unattended installation occurs.
+    /// </summary>
+    [Serializable]
+    public class UnattendedInstallException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnattendedInstallException" /> class.
+        /// </summary>
+        public UnattendedInstallException()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnattendedInstallException" /> class with a specified error message.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        public UnattendedInstallException(string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnattendedInstallException" /> class with a specified error message
+        /// and a reference to the inner exception which is the cause of this exception.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        /// <param name="innerException">The inner exception, or null.</param>
+        public UnattendedInstallException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnattendedInstallException" /> class.
+        /// </summary>
+        /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext" /> that contains contextual information about the source or destination.</param>
+        protected UnattendedInstallException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.Core/GuidUdi.cs b/src/Umbraco.Core/GuidUdi.cs
index d78a33a435..3743f6f108 100644
--- a/src/Umbraco.Core/GuidUdi.cs
+++ b/src/Umbraco.Core/GuidUdi.cs
@@ -33,8 +33,8 @@ namespace Umbraco.Core
             : base(uriValue)
         {
             Guid guid;
-            if (Guid.TryParse(uriValue.AbsolutePath.TrimStart('/'), out guid) == false)
-                throw new FormatException("Url \"" + uriValue + "\" is not a guid entity id.");
+            if (Guid.TryParse(uriValue.AbsolutePath.TrimStart(Constants.CharArrays.ForwardSlash), out guid) == false)
+                throw new FormatException("URI \"" + uriValue + "\" is not a GUID entity ID.");
 
             Guid = guid;
         }
@@ -48,7 +48,7 @@ namespace Umbraco.Core
         {
             var udi = Udi.Parse(s);
             if (udi is GuidUdi == false)
-                throw new FormatException("String \"" + s + "\" is not a guid entity id.");
+                throw new FormatException("String \"" + s + "\" is not a GUID entity id.");
 
             return (GuidUdi) udi;
         }
diff --git a/src/Umbraco.Core/HttpContextExtensions.cs b/src/Umbraco.Core/HttpContextExtensions.cs
index 22eb4d1917..e9ac1aa861 100644
--- a/src/Umbraco.Core/HttpContextExtensions.cs
+++ b/src/Umbraco.Core/HttpContextExtensions.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Core
                 if (string.IsNullOrEmpty(ipAddress))
                     return request.UserHostAddress;
 
-                var addresses = ipAddress.Split(',');
+                var addresses = ipAddress.Split(Constants.CharArrays.Comma);
                 if (addresses.Length != 0)
                     return addresses[0];
 
diff --git a/src/Umbraco.Core/IO/IFileSystem.cs b/src/Umbraco.Core/IO/IFileSystem.cs
index 0405c5925a..9de1ea40f2 100644
--- a/src/Umbraco.Core/IO/IFileSystem.cs
+++ b/src/Umbraco.Core/IO/IFileSystem.cs
@@ -102,7 +102,7 @@ namespace Umbraco.Core.IO
         /// <summary>
         /// Returns the application relative path to the file.
         /// </summary>
-        /// <param name="fullPathOrUrl">The full path or url.</param>
+        /// <param name="fullPathOrUrl">The full path or URL.</param>
         /// <returns>
         /// The <see cref="string"/> representing the relative path.
         /// </returns>
@@ -118,11 +118,11 @@ namespace Umbraco.Core.IO
         string GetFullPath(string path);
 
         /// <summary>
-        /// Returns the application relative url to the file.
+        /// Returns the application relative URL to the file.
         /// </summary>
-        /// <param name="path">The path to return the url for.</param>
+        /// <param name="path">The path to return the URL for.</param>
         /// <returns>
-        /// <see cref="string"/> representing the relative url.
+        /// <see cref="string"/> representing the relative URL.
         /// </returns>
         string GetUrl(string path);
 
diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index 53aa5a8179..8661f73fb1 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Core.IO
                 retval = virtualPath.Replace("~", SystemDirectories.Root);
 
             if (virtualPath.StartsWith("/") && virtualPath.StartsWith(SystemDirectories.Root) == false)
-                retval = SystemDirectories.Root + "/" + virtualPath.TrimStart('/');
+                retval = SystemDirectories.Root + "/" + virtualPath.TrimStart(Constants.CharArrays.ForwardSlash);
 
             return retval;
         }
@@ -98,11 +98,11 @@ namespace Umbraco.Core.IO
                 if (String.IsNullOrEmpty(path) == false && (path.StartsWith("~") || path.StartsWith(SystemDirectories.Root)))
                     return HostingEnvironment.MapPath(path);
                 else
-                    return HostingEnvironment.MapPath("~/" + path.TrimStart('/'));
+                    return HostingEnvironment.MapPath("~/" + path.TrimStart(Constants.CharArrays.ForwardSlash));
             }
 
             var root = GetRootDirectorySafe();
-            var newPath = path.TrimStart('~', '/').Replace('/', IOHelper.DirSepChar);
+            var newPath = path.TrimStart(Constants.CharArrays.TildeForwardSlash).Replace('/', IOHelper.DirSepChar);
             var retval = root + IOHelper.DirSepChar.ToString(CultureInfo.InvariantCulture) + newPath;
 
             return retval;
@@ -121,7 +121,7 @@ namespace Umbraco.Core.IO
             if (string.IsNullOrEmpty(retval))
                 retval = standardPath;
 
-            return retval.TrimEnd('/');
+            return retval.TrimEnd(Constants.CharArrays.ForwardSlash);
         }
 
         internal static string ReturnPath(string settingsKey, string standardPath)
@@ -188,7 +188,7 @@ namespace Umbraco.Core.IO
         internal static bool VerifyFileExtension(string filePath, IEnumerable<string> validFileExtensions)
         {
             var ext = Path.GetExtension(filePath);
-            return ext != null && validFileExtensions.Contains(ext.TrimStart('.'));
+            return ext != null && validFileExtensions.Contains(ext.TrimStart(Constants.CharArrays.Period));
         }
 
         public static bool PathStartsWith(string path, string root, char separator)
diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
index 96aaf7ca27..a833ba43af 100644
--- a/src/Umbraco.Core/IO/PhysicalFileSystem.cs
+++ b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.IO
         // (is used in GetRelativePath)
         private readonly string _rootPathFwd;
 
-        // the relative url, using url separator chars, NOT ending with a separator
+        // the relative URL, using URL separator chars, NOT ending with a separator
         // eg "" or "/Views" or "/Media" or "/<vpath>/Media" in case of a virtual path
         private readonly string _rootUrl;
 
@@ -33,7 +33,7 @@ namespace Umbraco.Core.IO
 
             _rootPath = EnsureDirectorySeparatorChar(IOHelper.MapPath(virtualRoot)).TrimEnd(Path.DirectorySeparatorChar);
             _rootPathFwd = EnsureUrlSeparatorChar(_rootPath);
-            _rootUrl = EnsureUrlSeparatorChar(IOHelper.ResolveUrl(virtualRoot)).TrimEnd('/');
+            _rootUrl = EnsureUrlSeparatorChar(IOHelper.ResolveUrl(virtualRoot)).TrimEnd(Constants.CharArrays.ForwardSlash);
         }
 
         public PhysicalFileSystem(string rootPath, string rootUrl)
@@ -54,7 +54,7 @@ namespace Umbraco.Core.IO
 
             _rootPath = EnsureDirectorySeparatorChar(rootPath).TrimEnd(Path.DirectorySeparatorChar);
             _rootPathFwd = EnsureUrlSeparatorChar(_rootPath);
-            _rootUrl = EnsureUrlSeparatorChar(rootUrl).TrimEnd('/');
+            _rootUrl = EnsureUrlSeparatorChar(rootUrl).TrimEnd(Constants.CharArrays.ForwardSlash);
         }
 
         /// <summary>
@@ -243,9 +243,9 @@ namespace Umbraco.Core.IO
         }
 
         /// <summary>
-        /// Gets the filesystem-relative path of a full path or of an url.
+        /// Gets the filesystem-relative path of a full path or of an URL.
         /// </summary>
-        /// <param name="fullPathOrUrl">The full path or url.</param>
+        /// <param name="fullPathOrUrl">The full path or URL.</param>
         /// <returns>The path, relative to this filesystem's root.</returns>
         /// <remarks>
         /// <para>The relative path is relative to this filesystem's root, not starting with any
@@ -253,18 +253,18 @@ namespace Umbraco.Core.IO
         /// </remarks>
         public string GetRelativePath(string fullPathOrUrl)
         {
-            // test url
-            var path = fullPathOrUrl.Replace('\\', '/'); // ensure url separator char
+            // test URL
+            var path = fullPathOrUrl.Replace('\\', '/'); // ensure URL separator char
 
-            // if it starts with the root url, strip it and trim the starting slash to make it relative
+            // if it starts with the root URL, strip it and trim the starting slash to make it relative
             // eg "/Media/1234/img.jpg" => "1234/img.jpg"
             if (IOHelper.PathStartsWith(path, _rootUrl, '/'))
-                return path.Substring(_rootUrl.Length).TrimStart('/');
+                return path.Substring(_rootUrl.Length).TrimStart(Constants.CharArrays.ForwardSlash);
 
             // if it starts with the root path, strip it and trim the starting slash to make it relative
             // eg "c:/websites/test/root/Media/1234/img.jpg" => "1234/img.jpg"
             if (IOHelper.PathStartsWith(path, _rootPathFwd, '/'))
-                return path.Substring(_rootPathFwd.Length).TrimStart('/');
+                return path.Substring(_rootPathFwd.Length).TrimStart(Constants.CharArrays.ForwardSlash);
 
             // unchanged - what else?
             return path;
@@ -319,14 +319,14 @@ namespace Umbraco.Core.IO
         }
 
         /// <summary>
-        /// Gets the url.
+        /// Gets the URL.
         /// </summary>
         /// <param name="path">The filesystem-relative path.</param>
-        /// <returns>The url.</returns>
+        /// <returns>The URL.</returns>
         /// <remarks>All separators are forward-slashes.</remarks>
         public string GetUrl(string path)
         {
-            path = EnsureUrlSeparatorChar(path).Trim('/');
+            path = EnsureUrlSeparatorChar(path).Trim(Constants.CharArrays.ForwardSlash);
             return _rootUrl + "/" + path;
         }
 
diff --git a/src/Umbraco.Core/IO/ShadowFileSystem.cs b/src/Umbraco.Core/IO/ShadowFileSystem.cs
index 84ff1b428b..0e9390d13f 100644
--- a/src/Umbraco.Core/IO/ShadowFileSystem.cs
+++ b/src/Umbraco.Core/IO/ShadowFileSystem.cs
@@ -182,7 +182,7 @@ namespace Umbraco.Core.IO
             if (Nodes.TryGetValue(normPath, out sf) && sf.IsExist && (sf.IsDir || overrideIfExists == false))
                 throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
 
-            var parts = normPath.Split('/');
+            var parts = normPath.Split(Constants.CharArrays.ForwardSlash);
             for (var i = 0; i < parts.Length - 1; i++)
             {
                 var dirPath = string.Join("/", parts.Take(i + 1));
@@ -297,7 +297,7 @@ namespace Umbraco.Core.IO
             if (Nodes.TryGetValue(normPath, out sf) && sf.IsExist && (sf.IsDir || overrideIfExists == false))
                 throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
 
-            var parts = normPath.Split('/');
+            var parts = normPath.Split(Constants.CharArrays.ForwardSlash);
             for (var i = 0; i < parts.Length - 1; i++)
             {
                 var dirPath = string.Join("/", parts.Take(i + 1));
diff --git a/src/Umbraco.Core/IO/SystemDirectories.cs b/src/Umbraco.Core/IO/SystemDirectories.cs
index b4688d2e9f..485fd7f965 100644
--- a/src/Umbraco.Core/IO/SystemDirectories.cs
+++ b/src/Umbraco.Core/IO/SystemDirectories.cs
@@ -11,6 +11,8 @@ namespace Umbraco.Core.IO
 
         public static string Data => "~/App_Data";
 
+        public static string LogFiles => Data + "/Logs";
+
         public static string TempData => Data + "/TEMP";
 
         public static string TempFileUploads => TempData + "/FileUploads";
diff --git a/src/Umbraco.Core/IO/SystemFiles.cs b/src/Umbraco.Core/IO/SystemFiles.cs
index 12e3f57d99..337c97d081 100644
--- a/src/Umbraco.Core/IO/SystemFiles.cs
+++ b/src/Umbraco.Core/IO/SystemFiles.cs
@@ -7,6 +7,8 @@ namespace Umbraco.Core.IO
     {
         public static string TinyMceConfig => SystemDirectories.Config + "/tinyMceConfig.config";
 
+        public static string UmbracoSettings => SystemDirectories.Config + "/UmbracoSettings.config";
+
         // TODO: Kill this off we don't have umbraco.config XML cache we now have NuCache
         public static string GetContentCacheXml(IGlobalSettings globalSettings)
         {
diff --git a/src/Umbraco.Core/IRuntimeState.cs b/src/Umbraco.Core/IRuntimeState.cs
index 30c768ab01..9f188b5308 100644
--- a/src/Umbraco.Core/IRuntimeState.cs
+++ b/src/Umbraco.Core/IRuntimeState.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Core
         ServerRole ServerRole { get; }
 
         /// <summary>
-        /// Gets the Umbraco application url.
+        /// Gets the Umbraco application URL.
         /// </summary>
         /// <remarks>This is eg "http://www.example.com".</remarks>
         Uri ApplicationUrl { get; }
diff --git a/src/Umbraco.Core/Logging/LoggingTaskExtension.cs b/src/Umbraco.Core/Logging/LoggingTaskExtension.cs
index 1f742133c3..2e3aa0a883 100644
--- a/src/Umbraco.Core/Logging/LoggingTaskExtension.cs
+++ b/src/Umbraco.Core/Logging/LoggingTaskExtension.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Umbraco.Core.Logging
@@ -14,7 +15,12 @@ namespace Umbraco.Core.Logging
         /// </summary>
         public static Task LogErrors(this Task task, Action<string, Exception> logMethod)
         {
-            return task.ContinueWith(t => LogErrorsInner(t, logMethod), TaskContinuationOptions.OnlyOnFaulted);
+            return task.ContinueWith(
+                t => LogErrorsInner(t, logMethod),
+                CancellationToken.None,
+                TaskContinuationOptions.OnlyOnFaulted,
+                // Must explicitly specify this, see https://blog.stephencleary.com/2013/10/continuewith-is-dangerous-too.html
+                TaskScheduler.Default);
         }
 
         /// <summary>
@@ -26,7 +32,10 @@ namespace Umbraco.Core.Logging
         /// </summary>
         public static Task LogErrorsWaitable(this Task task, Action<string, Exception> logMethod)
         {
-            return task.ContinueWith(t => LogErrorsInner(t, logMethod));
+            return task.ContinueWith(
+                t => LogErrorsInner(t, logMethod),
+                // Must explicitly specify this, see https://blog.stephencleary.com/2013/10/continuewith-is-dangerous-too.html
+                TaskScheduler.Default);
         }
 
         private static void LogErrorsInner(Task task, Action<string, Exception> logAction)
diff --git a/src/Umbraco.Core/Logging/Serilog/LoggerConfigExtensions.cs b/src/Umbraco.Core/Logging/Serilog/LoggerConfigExtensions.cs
index 951d6f8787..6f8c32cf0c 100644
--- a/src/Umbraco.Core/Logging/Serilog/LoggerConfigExtensions.cs
+++ b/src/Umbraco.Core/Logging/Serilog/LoggerConfigExtensions.cs
@@ -7,6 +7,7 @@ using Serilog.Core;
 using Serilog.Events;
 using Serilog.Formatting;
 using Serilog.Formatting.Compact;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging.Serilog.Enrichers;
 
 namespace Umbraco.Core.Logging.Serilog
@@ -26,7 +27,7 @@ namespace Umbraco.Core.Logging.Serilog
 
             //Set this environment variable - so that it can be used in external config file
             //add key="serilog:write-to:RollingFile.pathFormat" value="%BASEDIR%\logs\log.txt" />
-            Environment.SetEnvironmentVariable("BASEDIR", AppDomain.CurrentDomain.BaseDirectory, EnvironmentVariableTarget.Process);
+            Environment.SetEnvironmentVariable("BASEDIR", IOHelper.MapPath("/").TrimEnd("\\"), EnvironmentVariableTarget.Process);
             Environment.SetEnvironmentVariable("MACHINENAME", Environment.MachineName, EnvironmentVariableTarget.Process);
 
             logConfig.MinimumLevel.Verbose() //Set to highest level of logging (as any sinks may want to restrict it to Errors only)
@@ -54,7 +55,7 @@ namespace Umbraco.Core.Logging.Serilog
         {
             //Main .txt logfile - in similar format to older Log4Net output
             //Ends with ..txt as Date is inserted before file extension substring
-            logConfig.WriteTo.File($@"{AppDomain.CurrentDomain.BaseDirectory}\App_Data\Logs\UmbracoTraceLog.{Environment.MachineName}..txt",
+            logConfig.WriteTo.File(IOHelper.MapPath(SystemDirectories.LogFiles + $"/UmbracoTraceLog.{Environment.MachineName}..txt"),
                 shared: true,
                 rollingInterval: RollingInterval.Day,
                 restrictedToMinimumLevel: minimumLevel,
@@ -110,7 +111,8 @@ namespace Umbraco.Core.Logging.Serilog
         {
             //.clef format (Compact log event format, that can be imported into local SEQ & will make searching/filtering logs easier)
             //Ends with ..txt as Date is inserted before file extension substring
-            logConfig.WriteTo.File(new CompactJsonFormatter(), $@"{AppDomain.CurrentDomain.BaseDirectory}\App_Data\Logs\UmbracoTraceLog.{Environment.MachineName}..json",
+            logConfig.WriteTo.File(new CompactJsonFormatter(),
+                IOHelper.MapPath(SystemDirectories.LogFiles + $"/UmbracoTraceLog.{Environment.MachineName}..json"),
                 shared: true,
                 rollingInterval: RollingInterval.Day, //Create a new JSON file every day
                 retainedFileCountLimit: retainedFileCount, //Setting to null means we keep all files - default is 31 days
@@ -127,7 +129,7 @@ namespace Umbraco.Core.Logging.Serilog
         public static LoggerConfiguration ReadFromConfigFile(this LoggerConfiguration logConfig)
         {
             //Read from main serilog.config file
-            logConfig.ReadFrom.AppSettings(filePath: AppDomain.CurrentDomain.BaseDirectory + @"\config\serilog.config");
+            logConfig.ReadFrom.AppSettings(filePath: IOHelper.MapPath(SystemDirectories.Config + "/serilog.config"));
 
             return logConfig;
         }
@@ -141,7 +143,7 @@ namespace Umbraco.Core.Logging.Serilog
         {
             //A nested logger - where any user configured sinks via config can not effect the main 'umbraco' logger above
             logConfig.WriteTo.Logger(cfg =>
-                cfg.ReadFrom.AppSettings(filePath: AppDomain.CurrentDomain.BaseDirectory + @"\config\serilog.user.config"));
+                cfg.ReadFrom.AppSettings(filePath: IOHelper.MapPath(SystemDirectories.Config + "/serilog.user.config")));
 
             return logConfig;
         }
diff --git a/src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs b/src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs
index bbe2f3704d..533c9847ce 100644
--- a/src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs
+++ b/src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using Newtonsoft.Json;
 using Serilog.Events;
 using Serilog.Formatting.Compact.Reader;
+using Umbraco.Core.IO;
 
 namespace Umbraco.Core.Logging.Viewer
 {
@@ -16,7 +17,7 @@ namespace Umbraco.Core.Logging.Viewer
         public JsonLogViewer(ILogger logger, string logsPath = "", string searchPath = "") : base(searchPath)
         {
             if (string.IsNullOrEmpty(logsPath))
-                logsPath = $@"{AppDomain.CurrentDomain.BaseDirectory}\App_Data\Logs\";
+                logsPath = IOHelper.MapPath(SystemDirectories.LogFiles);
 
             _logsPath = logsPath;
             _logger = logger;
@@ -62,7 +63,7 @@ namespace Umbraco.Core.Logging.Viewer
             var logs = new List<LogEvent>();
 
             //Log Directory
-            var logDirectory = $@"{AppDomain.CurrentDomain.BaseDirectory}\App_Data\Logs\";
+            var logDirectory = _logsPath;
 
             var count = 0;
 
diff --git a/src/Umbraco.Core/Media/IEmbedProvider.cs b/src/Umbraco.Core/Media/IEmbedProvider.cs
index 99b162e0b7..39da6fae0d 100644
--- a/src/Umbraco.Core/Media/IEmbedProvider.cs
+++ b/src/Umbraco.Core/Media/IEmbedProvider.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Core.Media
         string[] UrlSchemeRegex { get; }
 
         /// <summary>
-        /// A collection of querystring request parameters to append to the API Url
+        /// A collection of querystring request parameters to append to the API URL
         /// </summary>
         /// <example>?key=value&key2=value2</example>
         Dictionary<string, string> RequestParams { get; }
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseBuilder.cs b/src/Umbraco.Core/Migrations/Install/DatabaseBuilder.cs
index d5d8bbab6f..fb9b8af46d 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseBuilder.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseBuilder.cs
@@ -112,6 +112,14 @@ namespace Umbraco.Core.Migrations.Install
             }
         }
 
+        internal bool IsUmbracoInstalled()
+        {
+            using (var scope = _scopeProvider.CreateScope(autoComplete: true))
+            {
+                return scope.Database.IsUmbracoInstalled(_logger);
+            }
+        }
+
         #endregion
 
         #region Configure Connection String
@@ -346,7 +354,7 @@ namespace Umbraco.Core.Migrations.Install
             var sqlCeDatabaseExists = false;
             if (dbIsSqlCe)
             {
-                var parts = databaseSettings.ConnectionString.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+                var parts = databaseSettings.ConnectionString.Split(Constants.CharArrays.Semicolon, StringSplitOptions.RemoveEmptyEntries);
                 var dataSourcePart = parts.FirstOrDefault(x => x.InvariantStartsWith("Data Source="));
                 if (dataSourcePart != null)
                 {
@@ -391,15 +399,15 @@ namespace Umbraco.Core.Migrations.Install
         private DatabaseSchemaResult ValidateSchema(IScope scope)
         {
             if (_databaseFactory.Initialized == false)
-                return new DatabaseSchemaResult(_databaseFactory.SqlContext.SqlSyntax);
+                return new DatabaseSchemaResult();
 
             if (_databaseSchemaValidationResult != null)
                 return _databaseSchemaValidationResult;
 
-            var database = scope.Database;
-            var dbSchema = new DatabaseSchemaCreator(database, _logger);
-            _databaseSchemaValidationResult = dbSchema.ValidateSchema();
+            _databaseSchemaValidationResult = scope.Database.ValidateSchema(_logger);
+
             scope.Complete();
+
             return _databaseSchemaValidationResult;
         }
 
@@ -438,11 +446,9 @@ namespace Umbraco.Core.Migrations.Install
 
                 var schemaResult = ValidateSchema();
                 var hasInstalledVersion = schemaResult.DetermineHasInstalledVersion();
-                //var installedSchemaVersion = schemaResult.DetermineInstalledVersion();
-                //var hasInstalledVersion = !installedSchemaVersion.Equals(new Version(0, 0, 0));
 
-                //If Configuration Status is empty and the determined version is "empty" its a new install - otherwise upgrade the existing
-                if (string.IsNullOrEmpty(_globalSettings.ConfigurationStatus) && !hasInstalledVersion)
+                //If the determined version is "empty" its a new install - otherwise upgrade the existing
+                if (!hasInstalledVersion)
                 {
                     if (_runtime.Level == RuntimeLevel.Run)
                         throw new Exception("Umbraco is already configured!");
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
index eab7afe308..e9580da74a 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
@@ -21,8 +21,13 @@ namespace Umbraco.Core.Migrations.Install
 
         public DatabaseSchemaCreator(IUmbracoDatabase database, ILogger logger)
         {
-            _database = database;
-            _logger = logger;
+            _database = database ?? throw new ArgumentNullException(nameof(database));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+
+            if (_database?.SqlContext?.SqlSyntax == null)
+            {
+                throw new InvalidOperationException("No SqlContext has been assigned to the database");
+            }
         }
 
         private ISqlSyntaxProvider SqlSyntax => _database.SqlContext.SqlSyntax;
@@ -143,7 +148,7 @@ namespace Umbraco.Core.Migrations.Install
 
         internal DatabaseSchemaResult ValidateSchema(IEnumerable<Type> orderedTables)
         {
-            var result = new DatabaseSchemaResult(SqlSyntax);
+            var result = new DatabaseSchemaResult();
 
             result.IndexDefinitions.AddRange(SqlSyntax.GetDefinedIndexes(_database)
                 .Select(x => new DbIndexDefinition(x)));
@@ -445,14 +450,14 @@ namespace Umbraco.Core.Migrations.Install
             }
 
             //Execute the Create Table sql
-            var created = _database.Execute(new Sql(createSql));
-                    _logger.Info<DatabaseSchemaCreator>("Create Table {TableName} ({Created}): \n {Sql}", tableName, created, createSql);
+            _database.Execute(new Sql(createSql));
+            _logger.Info<DatabaseSchemaCreator>("Create Table {TableName}: \n {Sql}", tableName, createSql);
 
             //If any statements exists for the primary key execute them here
             if (string.IsNullOrEmpty(createPrimaryKeySql) == false)
             {
-                var createdPk = _database.Execute(new Sql(createPrimaryKeySql));
-                _logger.Info<DatabaseSchemaCreator>("Create Primary Key ({CreatedPk}):\n {Sql}", createdPk, createPrimaryKeySql);
+                _database.Execute(new Sql(createPrimaryKeySql));
+                _logger.Info<DatabaseSchemaCreator>("Create Primary Key:\n {Sql}", createPrimaryKeySql);
             }
 
             if (SqlSyntax.SupportsIdentityInsert() && tableDefinition.Columns.Any(x => x.IsIdentity))
@@ -469,24 +474,24 @@ namespace Umbraco.Core.Migrations.Install
             //Loop through index statements and execute sql
             foreach (var sql in indexSql)
             {
-                var createdIndex = _database.Execute(new Sql(sql));
-                _logger.Info<DatabaseSchemaCreator>("Create Index ({CreatedIndex}):\n {Sql}", createdIndex, sql);
+                _database.Execute(new Sql(sql));
+                _logger.Info<DatabaseSchemaCreator>("Create Index:\n {Sql}", sql);
             }
 
             //Loop through foreignkey statements and execute sql
             foreach (var sql in foreignSql)
             {
-                var createdFk = _database.Execute(new Sql(sql));
-                _logger.Info<DatabaseSchemaCreator>("Create Foreign Key ({CreatedFk}):\n {Sql}", createdFk, sql);
+                _database.Execute(new Sql(sql));
+                _logger.Info<DatabaseSchemaCreator>("Create Foreign Key:\n {Sql}", sql);
             }
 
             if (overwrite)
             {
-                        _logger.Info<Database>("Table {TableName} was recreated", tableName);
+                _logger.Info<Database>("Table {TableName} was recreated", tableName);
             }
             else
             {
-                        _logger.Info<Database>("New table {TableName} was created", tableName);
+                _logger.Info<Database>("New table {TableName} was created", tableName);
 
             }
         }
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs
index f21216fde3..c0d8eff311 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.SqlSyntax;
 
 namespace Umbraco.Core.Migrations.Install
 {
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Migrations.Install
     /// </summary>
     internal class DatabaseSchemaResult
     {
-        public DatabaseSchemaResult(ISqlSyntaxProvider sqlSyntax)
+        public DatabaseSchemaResult()
         {
             Errors = new List<Tuple<string, string>>();
             TableDefinitions = new List<TableDefinition>();
diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index f0cfc08281..2a24c800b5 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -7,6 +7,9 @@ using Umbraco.Core.Migrations.Upgrade.V_8_0_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_0_1;
 using Umbraco.Core.Migrations.Upgrade.V_8_1_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_6_0;
+using Umbraco.Core.Migrations.Upgrade.V_8_9_0;
+using Umbraco.Core.Migrations.Upgrade.V_8_10_0;
+using Umbraco.Core.Migrations.Upgrade.V_8_12_0;
 
 namespace Umbraco.Core.Migrations.Upgrade
 {
@@ -175,25 +178,35 @@ namespace Umbraco.Core.Migrations.Upgrade
             To<MergeDateAndDateTimePropertyEditor>("{78BAF571-90D0-4D28-8175-EF96316DA789}");
             // release-8.0.0
 
-            // to 8.0.1...
+            // to 8.0.1
             To<ChangeNuCacheJsonFormat>("{80C0A0CB-0DD5-4573-B000-C4B7C313C70D}");
             // release-8.0.1
 
-            // to 8.1.0...
+            // to 8.1.0
             To<ConvertTinyMceAndGridMediaUrlsToLocalLink>("{B69B6E8C-A769-4044-A27E-4A4E18D1645A}");
             To<RenameUserLoginDtoDateIndex>("{0372A42B-DECF-498D-B4D1-6379E907EB94}");
             To<FixContentNuCascade>("{5B1E0D93-F5A3-449B-84BA-65366B84E2D4}");
 
-            // to 8.6.0...
+            // to 8.6.0
             To<UpdateRelationTypeTable>("{4759A294-9860-46BC-99F9-B4C975CAE580}");
             To<AddNewRelationTypes>("{0BC866BC-0665-487A-9913-0290BD0169AD}");
             To<AddPropertyTypeValidationMessageColumns>("{3D67D2C8-5E65-47D0-A9E1-DC2EE0779D6B}");
             To<MissingContentVersionsIndexes>("{EE288A91-531B-4995-8179-1D62D9AA3E2E}");
             To<AddMainDomLock>("{2AB29964-02A1-474D-BD6B-72148D2A53A2}");
 
-
+            // to 8.7.0
             To<MissingDictionaryIndex>("{a78e3369-8ea3-40ec-ad3f-5f76929d2b20}");
 
+            // to 8.9.0
+            To<ExternalLoginTableUserData>("{B5838FF5-1D22-4F6C-BCEB-F83ACB14B575}");
+
+            // to 8.10.0
+            To<AddPropertyTypeLabelOnTopColumn>("{D6A8D863-38EC-44FB-91EC-ACD6A668BD18}");
+
+            // to 8.12.0...
+            To<AddCmsContentNuByteColumn>("{8DDDCD0B-D7D5-4C97-BD6A-6B38CA65752F}");
+            To<UpgradedIncludeIndexes>("{4695D0C9-0729-4976-985B-048D503665D8}");
+
             //FINAL
         }
     }
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigrationBase.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigrationBase.cs
index 605f8a9eed..423ba71401 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigrationBase.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigrationBase.cs
@@ -30,7 +30,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
 
         protected int[] ConvertStringValues(string val)
         {
-            var splitVals = val.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+            var splitVals = val.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries);
 
             var intVals = splitVals
                 .Select(x => int.TryParse(x, out var i) ? i : int.MinValue)
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_10_0/AddPropertyTypeLabelOnTopColumn.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_10_0/AddPropertyTypeLabelOnTopColumn.cs
new file mode 100644
index 0000000000..206ea2be02
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_10_0/AddPropertyTypeLabelOnTopColumn.cs
@@ -0,0 +1,20 @@
+using System.Linq;
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_10_0
+{
+
+    public class AddPropertyTypeLabelOnTopColumn : MigrationBase
+    {
+        public AddPropertyTypeLabelOnTopColumn(IMigrationContext context)
+            : base(context)
+        { }
+
+        public override void Migrate()
+        {
+            var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToList();
+
+            AddColumnIfNotExists<PropertyTypeDto>(columns, "labelOnTop");
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/AddCmsContentNuByteColumn.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/AddCmsContentNuByteColumn.cs
new file mode 100644
index 0000000000..7c793688ec
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/AddCmsContentNuByteColumn.cs
@@ -0,0 +1,21 @@
+using System.Linq;
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_12_0
+{
+    public class AddCmsContentNuByteColumn : MigrationBase
+    {
+        public AddCmsContentNuByteColumn(IMigrationContext context)
+            : base(context)
+        {
+
+        }
+
+        public override void Migrate()
+        {
+            var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToList();
+
+            AddColumnIfNotExists<ContentNuDto>(columns, "dataRaw");
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/UpgradedIncludeIndexes.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/UpgradedIncludeIndexes.cs
new file mode 100644
index 0000000000..d88abdef75
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/UpgradedIncludeIndexes.cs
@@ -0,0 +1,65 @@
+using System.Linq;
+using Umbraco.Core.Migrations.Expressions.Execute.Expressions;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_12_0
+{
+    public class UpgradedIncludeIndexes : MigrationBase
+    {
+        public UpgradedIncludeIndexes(IMigrationContext context)
+            : base(context)
+        {
+
+        }
+
+        public override void Migrate()
+        {
+            // Need to drop the FK for the redirect table before modifying the unique id index
+            Delete.ForeignKey()
+                .FromTable(Constants.DatabaseSchema.Tables.RedirectUrl)
+                .ForeignColumn("contentKey")
+                .ToTable(NodeDto.TableName)
+                .PrimaryColumn("uniqueID")
+                .Do();
+            var nodeDtoIndexes = new[] { $"IX_{NodeDto.TableName}_UniqueId", $"IX_{NodeDto.TableName}_ObjectType", $"IX_{NodeDto.TableName}_Level" };
+            DeleteIndexes<NodeDto>(nodeDtoIndexes);                       // delete existing ones
+            CreateIndexes<NodeDto>(nodeDtoIndexes);                       // update/add 
+            // Now re-create the FK for the redirect table
+            Create.ForeignKey()
+                .FromTable(Constants.DatabaseSchema.Tables.RedirectUrl)
+                .ForeignColumn("contentKey")
+                .ToTable(NodeDto.TableName)
+                .PrimaryColumn("uniqueID")
+                .Do();
+
+
+            var contentVersionIndexes = new[] { $"IX_{ContentVersionDto.TableName}_NodeId", $"IX_{ContentVersionDto.TableName}_Current" };
+            DeleteIndexes<ContentVersionDto>(contentVersionIndexes);        // delete existing ones
+            CreateIndexes<ContentVersionDto>(contentVersionIndexes);        // update/add 
+        }
+
+        private void DeleteIndexes<T>(params string[] toDelete)
+        {
+            var tableDef = DefinitionFactory.GetTableDefinition(typeof(T), Context.SqlContext.SqlSyntax);
+
+            foreach (var i in toDelete)
+                if (IndexExists(i))
+                    Delete.Index(i).OnTable(tableDef.Name).Do();
+
+        }
+
+        private void CreateIndexes<T>(params string[] toCreate)
+        {
+            var tableDef = DefinitionFactory.GetTableDefinition(typeof(T), Context.SqlContext.SqlSyntax);
+
+            foreach (var c in toCreate)
+            {
+                // get the definition by name
+                var index = tableDef.Indexes.First(x => x.Name == c);
+                new ExecuteSqlStatementExpression(Context) { SqlStatement = Context.SqlContext.SqlSyntax.Format(index) }.Execute();
+            }
+
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_9_0/ExternalLoginTableUserData.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_9_0/ExternalLoginTableUserData.cs
new file mode 100644
index 0000000000..45bc1c620b
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_9_0/ExternalLoginTableUserData.cs
@@ -0,0 +1,20 @@
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_9_0
+{
+    public class ExternalLoginTableUserData : MigrationBase
+    {
+        public ExternalLoginTableUserData(IMigrationContext context)
+            : base(context)
+        {
+        }
+
+        /// <summary>
+        /// Adds new column to the External Login table
+        /// </summary>
+        public override void Migrate()
+        {
+            AddColumn<ExternalLoginDto>(Constants.DatabaseSchema.Tables.ExternalLogin, "userData");
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Models/Blocks/BlockEditorData.cs b/src/Umbraco.Core/Models/Blocks/BlockEditorData.cs
new file mode 100644
index 0000000000..d8186f0dfa
--- /dev/null
+++ b/src/Umbraco.Core/Models/Blocks/BlockEditorData.cs
@@ -0,0 +1,45 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Models.Blocks
+{
+
+    /// <summary>
+    /// Convertable block data from json
+    /// </summary>
+    public class BlockEditorData
+    {
+        private readonly string _propertyEditorAlias;
+
+        public static BlockEditorData Empty { get; } = new BlockEditorData();
+
+        private BlockEditorData()
+        {
+            BlockValue = new BlockValue();
+        }
+
+        public BlockEditorData(string propertyEditorAlias,
+            IEnumerable<ContentAndSettingsReference> references,
+            BlockValue blockValue)
+        {
+            if (string.IsNullOrWhiteSpace(propertyEditorAlias))
+                throw new ArgumentException($"'{nameof(propertyEditorAlias)}' cannot be null or whitespace", nameof(propertyEditorAlias));
+            _propertyEditorAlias = propertyEditorAlias;
+            BlockValue = blockValue ?? throw new ArgumentNullException(nameof(blockValue));
+            References = references != null ? new List<ContentAndSettingsReference>(references) : throw new ArgumentNullException(nameof(references));
+        }
+
+        /// <summary>
+        /// Returns the layout for this specific property editor
+        /// </summary>
+        public JToken Layout => BlockValue.Layout.TryGetValue(_propertyEditorAlias, out var layout) ? layout : null;
+
+        /// <summary>
+        /// Returns the reference to the original BlockValue
+        /// </summary>
+        public BlockValue BlockValue { get; }
+
+        public List<ContentAndSettingsReference> References { get; } = new List<ContentAndSettingsReference>();
+    }
+}
diff --git a/src/Umbraco.Core/Models/Blocks/BlockEditorDataConverter.cs b/src/Umbraco.Core/Models/Blocks/BlockEditorDataConverter.cs
new file mode 100644
index 0000000000..802e8c2ee3
--- /dev/null
+++ b/src/Umbraco.Core/Models/Blocks/BlockEditorDataConverter.cs
@@ -0,0 +1,68 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.Linq;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Models.Blocks
+{
+
+    /// <summary>
+    /// Converts the block json data into objects
+    /// </summary>
+    public abstract class BlockEditorDataConverter
+    {
+        private readonly string _propertyEditorAlias;
+
+        protected BlockEditorDataConverter(string propertyEditorAlias)
+        {
+            _propertyEditorAlias = propertyEditorAlias;
+        }
+
+        public BlockEditorData ConvertFrom(JToken json)
+        {
+            var value = json.ToObject<BlockValue>();
+            return Convert(value);
+        }
+
+        public bool TryDeserialize(string json, out BlockEditorData blockEditorData)
+        {
+            try
+            {
+                var value = JsonConvert.DeserializeObject<BlockValue>(json);
+                blockEditorData = Convert(value);
+                return true;
+            }
+            catch (System.Exception)
+            {
+                blockEditorData = null;
+                return false;
+            }
+        }
+
+        public BlockEditorData Deserialize(string json)
+        {
+            var value = JsonConvert.DeserializeObject<BlockValue>(json);
+            return Convert(value);
+        }
+
+        private BlockEditorData Convert(BlockValue value)
+        {
+            if (value.Layout == null)
+                return BlockEditorData.Empty;
+
+            var references = value.Layout.TryGetValue(_propertyEditorAlias, out var layout)
+                ? GetBlockReferences(layout)
+                : Enumerable.Empty<ContentAndSettingsReference>();
+
+            return new BlockEditorData(_propertyEditorAlias, references, value);
+        }
+
+        /// <summary>
+        /// Return the collection of <see cref="IBlockReference"/> from the block editor's Layout (which could be an array or an object depending on the editor)
+        /// </summary>
+        /// <param name="jsonLayout"></param>
+        /// <returns></returns>
+        protected abstract IEnumerable<ContentAndSettingsReference> GetBlockReferences(JToken jsonLayout);
+
+    }
+}
diff --git a/src/Umbraco.Core/Models/Blocks/BlockItemData.cs b/src/Umbraco.Core/Models/Blocks/BlockItemData.cs
new file mode 100644
index 0000000000..02432766b0
--- /dev/null
+++ b/src/Umbraco.Core/Models/Blocks/BlockItemData.cs
@@ -0,0 +1,62 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Serialization;
+
+namespace Umbraco.Core.Models.Blocks
+{
+    /// <summary>
+    /// Represents a single block's data in raw form
+    /// </summary>
+    public class BlockItemData
+    {
+        [JsonProperty("contentTypeKey")]
+        public Guid ContentTypeKey { get; set; }
+
+        /// <summary>
+        /// not serialized, manually set and used during internally
+        /// </summary>
+        [JsonIgnore]
+        public string ContentTypeAlias { get; set; }
+
+        [JsonProperty("udi")]
+        [JsonConverter(typeof(UdiJsonConverter))]
+        public Udi Udi { get; set; }
+
+        [JsonIgnore]
+        public Guid Key => Udi != null ? ((GuidUdi)Udi).Guid : throw new InvalidOperationException("No Udi assigned");
+
+        /// <summary>
+        /// The remaining properties will be serialized to a dictionary
+        /// </summary>
+        /// <remarks>
+        /// The JsonExtensionDataAttribute is used to put the non-typed properties into a bucket
+        /// http://www.newtonsoft.com/json/help/html/DeserializeExtensionData.htm
+        /// NestedContent serializes to string, int, whatever eg
+        ///   "stringValue":"Some String","numericValue":125,"otherNumeric":null
+        /// </remarks>
+        [JsonExtensionData]
+        public Dictionary<string, object> RawPropertyValues { get; set; } = new Dictionary<string, object>();
+
+        /// <summary>
+        /// Used during deserialization to convert the raw property data into data with a property type context
+        /// </summary>
+        [JsonIgnore]
+        public IDictionary<string, BlockPropertyValue> PropertyValues { get; set; } = new Dictionary<string, BlockPropertyValue>();
+
+        /// <summary>
+        /// Used during deserialization to populate the property value/property type of a block item content property
+        /// </summary>
+        public class BlockPropertyValue
+        {
+            public BlockPropertyValue(object value, PropertyType propertyType)
+            {
+                Value = value;
+                PropertyType = propertyType ?? throw new ArgumentNullException(nameof(propertyType));
+            }
+
+            public object Value { get; }
+            public PropertyType PropertyType { get; }
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Models/Blocks/BlockListEditorDataConverter.cs b/src/Umbraco.Core/Models/Blocks/BlockListEditorDataConverter.cs
new file mode 100644
index 0000000000..23f69922d9
--- /dev/null
+++ b/src/Umbraco.Core/Models/Blocks/BlockListEditorDataConverter.cs
@@ -0,0 +1,22 @@
+using Newtonsoft.Json.Linq;
+using System.Linq;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Models.Blocks
+{
+    /// <summary>
+    /// Data converter for the block list property editor
+    /// </summary>
+    public class BlockListEditorDataConverter : BlockEditorDataConverter
+    {
+        public BlockListEditorDataConverter() : base(Constants.PropertyEditors.Aliases.BlockList)
+        {
+        }
+
+        protected override IEnumerable<ContentAndSettingsReference> GetBlockReferences(JToken jsonLayout)
+        {
+            var blockListLayout = jsonLayout.ToObject<IEnumerable<BlockListLayoutItem>>();
+            return blockListLayout.Select(x => new ContentAndSettingsReference(x.ContentUdi, x.SettingsUdi)).ToList();
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Models/Blocks/BlockListItem.cs b/src/Umbraco.Core/Models/Blocks/BlockListItem.cs
new file mode 100644
index 0000000000..620c3d9fe0
--- /dev/null
+++ b/src/Umbraco.Core/Models/Blocks/BlockListItem.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Umbraco.Core.Models.Blocks
+{
+    /// <summary>
+    /// Represents a layout item for the Block List editor.
+    /// </summary>
+    /// <seealso cref="Umbraco.Core.Models.Blocks.IBlockReference{Umbraco.Core.Models.PublishedContent.IPublishedElement}" />
+    [DataContract(Name = "block", Namespace = "")]
+    public class BlockListItem : IBlockReference<IPublishedElement>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BlockListItem" /> class.
+        /// </summary>
+        /// <param name="contentUdi">The content UDI.</param>
+        /// <param name="content">The content.</param>
+        /// <param name="settingsUdi">The settings UDI.</param>
+        /// <param name="settings">The settings.</param>
+        /// <exception cref="System.ArgumentNullException">contentUdi
+        /// or
+        /// content</exception>
+        public BlockListItem(Udi contentUdi, IPublishedElement content, Udi settingsUdi, IPublishedElement settings)
+        {
+            ContentUdi = contentUdi ?? throw new ArgumentNullException(nameof(contentUdi));
+            Content = content ?? throw new ArgumentNullException(nameof(content));
+            SettingsUdi = settingsUdi;
+            Settings = settings;
+        }
+
+        /// <summary>
+        /// Gets the content UDI.
+        /// </summary>
+        /// <value>
+        /// The content UDI.
+        /// </value>
+        [DataMember(Name = "contentUdi")]
+        public Udi ContentUdi { get; }
+
+        /// <summary>
+        /// Gets the content.
+        /// </summary>
+        /// <value>
+        /// The content.
+        /// </value>
+        [DataMember(Name = "content")]
+        public IPublishedElement Content { get; }
+
+        /// <summary>
+        /// Gets the settings UDI.
+        /// </summary>
+        /// <value>
+        /// The settings UDI.
+        /// </value>
+        [DataMember(Name = "settingsUdi")]
+        public Udi SettingsUdi { get; }
+
+        /// <summary>
+        /// Gets the settings.
+        /// </summary>
+        /// <value>
+        /// The settings.
+        /// </value>
+        [DataMember(Name = "settings")]
+        public IPublishedElement Settings { get; }
+    }
+
+    /// <summary>
+    /// Represents a layout item with a generic content type for the Block List editor.
+    /// </summary>
+    /// <typeparam name="T">The type of the content.</typeparam>
+    /// <seealso cref="Umbraco.Core.Models.Blocks.IBlockReference{Umbraco.Core.Models.PublishedContent.IPublishedElement}" />
+    public class BlockListItem<T> : BlockListItem
+        where T : IPublishedElement
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BlockListItem{T}" /> class.
+        /// </summary>
+        /// <param name="contentUdi">The content UDI.</param>
+        /// <param name="content">The content.</param>
+        /// <param name="settingsUdi">The settings UDI.</param>
+        /// <param name="settings">The settings.</param>
+        public BlockListItem(Udi contentUdi, T content, Udi settingsUdi, IPublishedElement settings)
+            : base(contentUdi, content, settingsUdi, settings)
+        {
+            Content = content;
+        }
+
+        /// <summary>
+        /// Gets the content.
+        /// </summary>
+        /// <value>
+        /// The content.
+        /// </value>
+        public new T Content { get; }
+    }
+
+    /// <summary>
+    /// Represents a layout item with generic content and settings types for the Block List editor.
+    /// </summary>
+    /// <typeparam name="TContent">The type of the content.</typeparam>
+    /// <typeparam name="TSettings">The type of the settings.</typeparam>
+    /// <seealso cref="Umbraco.Core.Models.Blocks.IBlockReference{Umbraco.Core.Models.PublishedContent.IPublishedElement}" />
+    public class BlockListItem<TContent, TSettings> : BlockListItem<TContent>
+        where TContent : IPublishedElement
+        where TSettings : IPublishedElement
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BlockListItem{TContent, TSettings}" /> class.
+        /// </summary>
+        /// <param name="contentUdi">The content udi.</param>
+        /// <param name="content">The content.</param>
+        /// <param name="settingsUdi">The settings udi.</param>
+        /// <param name="settings">The settings.</param>
+        public BlockListItem(Udi contentUdi, TContent content, Udi settingsUdi, TSettings settings)
+            : base(contentUdi, content, settingsUdi, settings)
+        {
+            Settings = settings;
+        }
+
+        /// <summary>
+        /// Gets the settings.
+        /// </summary>
+        /// <value>
+        /// The settings.
+        /// </value>
+        public new TSettings Settings { get; }
+    }
+}
diff --git a/src/Umbraco.Core/Models/Blocks/BlockListLayoutItem.cs b/src/Umbraco.Core/Models/Blocks/BlockListLayoutItem.cs
new file mode 100644
index 0000000000..5de44e16c1
--- /dev/null
+++ b/src/Umbraco.Core/Models/Blocks/BlockListLayoutItem.cs
@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+using Umbraco.Core.Serialization;
+
+namespace Umbraco.Core.Models.Blocks
+{
+    /// <summary>
+    /// Used for deserializing the block list layout
+    /// </summary>
+    public class BlockListLayoutItem
+    {
+        [JsonProperty("contentUdi", Required = Required.Always)]
+        [JsonConverter(typeof(UdiJsonConverter))]
+        public Udi ContentUdi { get; set; }
+
+        [JsonProperty("settingsUdi", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(UdiJsonConverter))]
+        public Udi SettingsUdi { get; set; }
+    }
+}
diff --git a/src/Umbraco.Core/Models/Blocks/BlockListModel.cs b/src/Umbraco.Core/Models/Blocks/BlockListModel.cs
new file mode 100644
index 0000000000..9a3a26ab30
--- /dev/null
+++ b/src/Umbraco.Core/Models/Blocks/BlockListModel.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Models.Blocks
+{
+    /// <summary>
+    /// The strongly typed model for the Block List editor.
+    /// </summary>
+    /// <seealso cref="System.Collections.ObjectModel.ReadOnlyCollection{Umbraco.Core.Models.Blocks.BlockListItem}" />
+    [DataContract(Name = "blockList", Namespace = "")]
+    public class BlockListModel : ReadOnlyCollection<BlockListItem>
+    {
+        /// <summary>
+        /// Gets the empty <see cref="BlockListModel" />.
+        /// </summary>
+        /// <value>
+        /// The empty <see cref="BlockListModel" />.
+        /// </value>
+        public static BlockListModel Empty { get; } = new BlockListModel();
+
+        /// <summary>
+        /// Prevents a default instance of the <see cref="BlockListModel" /> class from being created.
+        /// </summary>
+        private BlockListModel()
+            : this(new List<BlockListItem>())
+        { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BlockListModel" /> class.
+        /// </summary>
+        /// <param name="list">The list to wrap.</param>
+        public BlockListModel(IList<BlockListItem> list)
+            : base(list)
+        { }
+
+        /// <summary>
+        /// Gets the <see cref="BlockListItem" /> with the specified content key.
+        /// </summary>
+        /// <value>
+        /// The <see cref="BlockListItem" />.
+        /// </value>
+        /// <param name="contentKey">The content key.</param>
+        /// <returns>
+        /// The <see cref="BlockListItem" /> with the specified content key.
+        /// </returns>
+        public BlockListItem this[Guid contentKey] => this.FirstOrDefault(x => x.Content.Key == contentKey);
+
+        /// <summary>
+        /// Gets the <see cref="BlockListItem" /> with the specified content UDI.
+        /// </summary>
+        /// <value>
+        /// The <see cref="BlockListItem" />.
+        /// </value>
+        /// <param name="contentUdi">The content UDI.</param>
+        /// <returns>
+        /// The <see cref="BlockListItem" /> with the specified content UDI.
+        /// </returns>
+        public BlockListItem this[Udi contentUdi] => contentUdi is GuidUdi guidUdi ? this.FirstOrDefault(x => x.Content.Key == guidUdi.Guid) : null;
+    }
+}
diff --git a/src/Umbraco.Core/Models/Blocks/BlockValue.cs b/src/Umbraco.Core/Models/Blocks/BlockValue.cs
new file mode 100644
index 0000000000..4700ddfd3b
--- /dev/null
+++ b/src/Umbraco.Core/Models/Blocks/BlockValue.cs
@@ -0,0 +1,18 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Models.Blocks
+{
+    public class BlockValue
+    {
+        [JsonProperty("layout")]
+        public IDictionary<string, JToken> Layout { get; set; }
+
+        [JsonProperty("contentData")]
+        public List<BlockItemData> ContentData { get; set; } = new List<BlockItemData>();
+
+        [JsonProperty("settingsData")]
+        public List<BlockItemData> SettingsData { get; set; } = new List<BlockItemData>();
+    }
+}
diff --git a/src/Umbraco.Core/Models/Blocks/ContentAndSettingsReference.cs b/src/Umbraco.Core/Models/Blocks/ContentAndSettingsReference.cs
new file mode 100644
index 0000000000..f7222fe140
--- /dev/null
+++ b/src/Umbraco.Core/Models/Blocks/ContentAndSettingsReference.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Models.Blocks
+{
+    public struct ContentAndSettingsReference : IEquatable<ContentAndSettingsReference>
+    {
+        public ContentAndSettingsReference(Udi contentUdi, Udi settingsUdi)
+        {
+            ContentUdi = contentUdi ?? throw new ArgumentNullException(nameof(contentUdi));
+            SettingsUdi = settingsUdi;
+        }
+
+        public Udi ContentUdi { get; }
+
+        public Udi SettingsUdi { get; }
+
+        public override bool Equals(object obj) => obj is ContentAndSettingsReference reference && Equals(reference);
+
+        public bool Equals(ContentAndSettingsReference other) => other != null
+            && EqualityComparer<Udi>.Default.Equals(ContentUdi, other.ContentUdi)
+            && EqualityComparer<Udi>.Default.Equals(SettingsUdi, other.SettingsUdi);
+
+        public override int GetHashCode() => (ContentUdi, SettingsUdi).GetHashCode();
+
+        public static bool operator ==(ContentAndSettingsReference left, ContentAndSettingsReference right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(ContentAndSettingsReference left, ContentAndSettingsReference right)
+        {
+            return !(left == right);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Models/Blocks/IBlockReference.cs b/src/Umbraco.Core/Models/Blocks/IBlockReference.cs
new file mode 100644
index 0000000000..7f5c835b3c
--- /dev/null
+++ b/src/Umbraco.Core/Models/Blocks/IBlockReference.cs
@@ -0,0 +1,37 @@
+namespace Umbraco.Core.Models.Blocks
+{
+    /// <summary>
+    /// Represents a data item reference for a Block Editor implementation.
+    /// </summary>
+    /// <remarks>
+    /// See: https://github.com/umbraco/rfcs/blob/907f3758cf59a7b6781296a60d57d537b3b60b8c/cms/0011-block-data-structure.md#strongly-typed
+    /// </remarks>
+    public interface IBlockReference
+    {
+        /// <summary>
+        /// Gets the content UDI.
+        /// </summary>
+        /// <value>
+        /// The content UDI.
+        /// </value>
+        Udi ContentUdi { get; }
+    }
+
+    /// <summary>
+    /// Represents a data item reference with settings for a Block editor implementation.
+    /// </summary>
+    /// <typeparam name="TSettings">The type of the settings.</typeparam>
+    /// <remarks>
+    /// See: https://github.com/umbraco/rfcs/blob/907f3758cf59a7b6781296a60d57d537b3b60b8c/cms/0011-block-data-structure.md#strongly-typed
+    /// </remarks>
+    public interface IBlockReference<TSettings> : IBlockReference
+    {
+        /// <summary>
+        /// Gets the settings.
+        /// </summary>
+        /// <value>
+        /// The settings.
+        /// </value>
+        TSettings Settings { get; }
+    }
+}
diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index c5930bf998..04f49e704e 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -98,10 +98,15 @@ namespace Umbraco.Core.Models
             set
             {
                 if (_schedule != null)
-                    _schedule.CollectionChanged -= ScheduleCollectionChanged;
+                {
+                    _schedule.ClearCollectionChangedEvents();
+                }
+                    
                 SetPropertyValueAndDetectChanges(value, ref _schedule, nameof(ContentSchedule));
                 if (_schedule != null)
+                {
                     _schedule.CollectionChanged += ScheduleCollectionChanged;
+                }   
             }
         }
 
@@ -223,10 +228,16 @@ namespace Umbraco.Core.Models
             }
             set
             {
-                if (_publishInfos != null) _publishInfos.CollectionChanged -= PublishNamesCollectionChanged;
+                if (_publishInfos != null)
+                {
+                    _publishInfos.ClearCollectionChangedEvents();
+                }
+
                 _publishInfos = value;
                 if (_publishInfos != null)
+                {
                     _publishInfos.CollectionChanged += PublishNamesCollectionChanged;
+                }   
             }
         }
 
@@ -321,7 +332,7 @@ namespace Umbraco.Core.Models
             else
                 Properties.EnsurePropertyTypes(contentType.CompositionPropertyTypes);
 
-            Properties.CollectionChanged -= PropertiesChanged; // be sure not to double add
+            Properties.ClearCollectionChangedEvents(); // be sure not to double add
             Properties.CollectionChanged += PropertiesChanged;
         }
 
@@ -438,7 +449,7 @@ namespace Umbraco.Core.Models
             //if culture infos exist then deal with event bindings
             if (clonedContent._publishInfos != null)
             {
-                clonedContent._publishInfos.CollectionChanged -= PublishNamesCollectionChanged;          //clear this event handler if any
+                clonedContent._publishInfos.ClearCollectionChangedEvents();          //clear this event handler if any
                 clonedContent._publishInfos = (ContentCultureInfosCollection)_publishInfos.DeepClone(); //manually deep clone
                 clonedContent._publishInfos.CollectionChanged += clonedContent.PublishNamesCollectionChanged;    //re-assign correct event handler
             }
@@ -446,7 +457,7 @@ namespace Umbraco.Core.Models
             //if properties exist then deal with event bindings
             if (clonedContent._schedule != null)
             {
-                clonedContent._schedule.CollectionChanged -= ScheduleCollectionChanged;         //clear this event handler if any
+                clonedContent._schedule.ClearCollectionChangedEvents();         //clear this event handler if any
                 clonedContent._schedule = (ContentScheduleCollection)_schedule.DeepClone();     //manually deep clone
                 clonedContent._schedule.CollectionChanged += clonedContent.ScheduleCollectionChanged;   //re-assign correct event handler
             }
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index d02ea82012..cbdee479fe 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -138,7 +138,11 @@ namespace Umbraco.Core.Models
             get => _properties;
             set
             {
-                if (_properties != null) _properties.CollectionChanged -= PropertiesChanged;
+                if (_properties != null)
+                {
+                    _properties.ClearCollectionChangedEvents();
+                }
+
                 _properties = value;
                 _properties.CollectionChanged += PropertiesChanged;
             }
@@ -173,10 +177,15 @@ namespace Umbraco.Core.Models
             }
             set
             {
-                if (_cultureInfos != null) _cultureInfos.CollectionChanged -= CultureInfosCollectionChanged;
+                if (_cultureInfos != null)
+                {
+                    _cultureInfos.ClearCollectionChangedEvents();
+                }
                 _cultureInfos = value;
                 if (_cultureInfos != null)
+                {
                     _cultureInfos.CollectionChanged += CultureInfosCollectionChanged;
+                }   
             }
         }
 
@@ -479,7 +488,7 @@ namespace Umbraco.Core.Models
             //if culture infos exist then deal with event bindings
             if (clonedContent._cultureInfos != null)
             {
-                clonedContent._cultureInfos.CollectionChanged -= CultureInfosCollectionChanged;          //clear this event handler if any
+                clonedContent._cultureInfos.ClearCollectionChangedEvents();          //clear this event handler if any
                 clonedContent._cultureInfos = (ContentCultureInfosCollection)_cultureInfos.DeepClone(); //manually deep clone
                 clonedContent._cultureInfos.CollectionChanged += clonedContent.CultureInfosCollectionChanged;    //re-assign correct event handler
             }
@@ -487,7 +496,7 @@ namespace Umbraco.Core.Models
             //if properties exist then deal with event bindings
             if (clonedContent._properties != null)
             {
-                clonedContent._properties.CollectionChanged -= PropertiesChanged;         //clear this event handler if any
+                clonedContent._properties.ClearCollectionChangedEvents();         //clear this event handler if any
                 clonedContent._properties = (PropertyCollection)_properties.DeepClone(); //manually deep clone
                 clonedContent._properties.CollectionChanged += clonedContent.PropertiesChanged;   //re-assign correct event handler
             }
diff --git a/src/Umbraco.Core/Models/ContentCultureInfosCollection.cs b/src/Umbraco.Core/Models/ContentCultureInfosCollection.cs
index 9bc78fc56d..07ee661497 100644
--- a/src/Umbraco.Core/Models/ContentCultureInfosCollection.cs
+++ b/src/Umbraco.Core/Models/ContentCultureInfosCollection.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Core.Models
         public ContentCultureInfosCollection()
             : base(x => x.Culture, StringComparer.InvariantCultureIgnoreCase)
         { }
-        
+
         /// <summary>
         /// Adds or updates a <see cref="ContentCultureInfos"/> instance.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/ContentScheduleCollection.cs b/src/Umbraco.Core/Models/ContentScheduleCollection.cs
index 6c7dd79312..0ebcc0fe4b 100644
--- a/src/Umbraco.Core/Models/ContentScheduleCollection.cs
+++ b/src/Umbraco.Core/Models/ContentScheduleCollection.cs
@@ -14,6 +14,11 @@ namespace Umbraco.Core.Models
 
         public event NotifyCollectionChangedEventHandler CollectionChanged;
 
+        /// <summary>
+        /// Clears all <see cref="CollectionChanged"/> event handlers
+        /// </summary>
+        public void ClearCollectionChangedEvents() => CollectionChanged = null;
+
         private void OnCollectionChanged(NotifyCollectionChangedEventArgs args)
         {
             CollectionChanged?.Invoke(this, args);
diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs
index 04bcb7424a..4865db428a 100644
--- a/src/Umbraco.Core/Models/ContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBase.cs
@@ -262,7 +262,10 @@ namespace Umbraco.Core.Models
             set
             {
                 if (_noGroupPropertyTypes != null)
-                    _noGroupPropertyTypes.CollectionChanged -= PropertyTypesChanged;
+                {
+                    _noGroupPropertyTypes.ClearCollectionChangedEvents();
+                }
+
                 _noGroupPropertyTypes = new PropertyTypeCollection(SupportsPublishing, value);
                 _noGroupPropertyTypes.CollectionChanged += PropertyTypesChanged;
                 PropertyTypesChanged(_noGroupPropertyTypes, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
@@ -480,14 +483,14 @@ namespace Umbraco.Core.Models
                 // its ignored from the auto-clone process because its return values are unions, not raw and
                 // we end up with duplicates, see: http://issues.umbraco.org/issue/U4-4842
 
-                clonedEntity._noGroupPropertyTypes.CollectionChanged -= PropertyTypesChanged;                    //clear this event handler if any
+                clonedEntity._noGroupPropertyTypes.ClearCollectionChangedEvents();                    //clear this event handler if any
                 clonedEntity._noGroupPropertyTypes = (PropertyTypeCollection) _noGroupPropertyTypes.DeepClone(); //manually deep clone
                 clonedEntity._noGroupPropertyTypes.CollectionChanged += clonedEntity.PropertyTypesChanged;              //re-assign correct event handler
             }
 
             if (clonedEntity._propertyGroups != null)
             {
-                clonedEntity._propertyGroups.CollectionChanged -= PropertyGroupsChanged;              //clear this event handler if any
+                clonedEntity._propertyGroups.ClearCollectionChangedEvents();              //clear this event handler if any
                 clonedEntity._propertyGroups = (PropertyGroupCollection) _propertyGroups.DeepClone(); //manually deep clone
                 clonedEntity._propertyGroups.CollectionChanged += clonedEntity.PropertyGroupsChanged;        //re-assign correct event handler
             }
diff --git a/src/Umbraco.Core/Models/Entities/IMediaEntitySlim.cs b/src/Umbraco.Core/Models/Entities/IMediaEntitySlim.cs
index 9440000146..f7daf79ec9 100644
--- a/src/Umbraco.Core/Models/Entities/IMediaEntitySlim.cs
+++ b/src/Umbraco.Core/Models/Entities/IMediaEntitySlim.cs
@@ -7,7 +7,7 @@
     {
 
         /// <summary>
-        /// The media file's path/url
+        /// The media file's path/URL
         /// </summary>
         string MediaPath { get; }
     }
diff --git a/src/Umbraco.Core/Models/IContentBase.cs b/src/Umbraco.Core/Models/IContentBase.cs
index 0f660181fb..f4fae44ffc 100644
--- a/src/Umbraco.Core/Models/IContentBase.cs
+++ b/src/Umbraco.Core/Models/IContentBase.cs
@@ -4,6 +4,7 @@ using Umbraco.Core.Models.Entities;
 
 namespace Umbraco.Core.Models
 {
+
     /// <summary>
     /// Provides a base class for content items.
     /// </summary>
diff --git a/src/Umbraco.Core/Models/IReadOnlyContentBase.cs b/src/Umbraco.Core/Models/IReadOnlyContentBase.cs
new file mode 100644
index 0000000000..3ed39b63ab
--- /dev/null
+++ b/src/Umbraco.Core/Models/IReadOnlyContentBase.cs
@@ -0,0 +1,72 @@
+using System;
+
+namespace Umbraco.Core.Models
+{
+    public interface IReadOnlyContentBase
+    {
+        /// <summary>
+        /// Gets the integer identifier of the entity.
+        /// </summary>
+        int Id { get; }
+
+        /// <summary>
+        /// Gets the Guid unique identifier of the entity.
+        /// </summary>
+        Guid Key { get; }
+
+        /// <summary>
+        /// Gets the creation date.
+        /// </summary>
+        DateTime CreateDate { get; }
+
+        /// <summary>
+        /// Gets the last update date.
+        /// </summary>
+        DateTime UpdateDate { get; }
+
+        /// <summary>
+        /// Gets the name of the entity.
+        /// </summary>
+        string Name { get; }
+
+        /// <summary>
+        /// Gets the identifier of the user who created this entity.
+        /// </summary>
+        int CreatorId { get; }
+
+        /// <summary>
+        /// Gets the identifier of the parent entity.
+        /// </summary>
+        int ParentId { get; }
+
+        /// <summary>
+        /// Gets the level of the entity.
+        /// </summary>
+        int Level { get; }
+
+        /// <summary>
+        /// Gets the path to the entity.
+        /// </summary>
+        string Path { get; }
+
+        /// <summary>
+        /// Gets the sort order of the entity.
+        /// </summary>
+        int SortOrder { get; }
+
+        /// <summary>
+        /// Gets the content type id
+        /// </summary>
+        int ContentTypeId { get; }
+
+        /// <summary>
+        /// Gets the identifier of the writer.
+        /// </summary>
+        int WriterId { get; }
+
+        /// <summary>
+        /// Gets the version identifier.
+        /// </summary>
+        int VersionId { get; }
+    }
+}
diff --git a/src/Umbraco.Core/Models/IRedirectUrl.cs b/src/Umbraco.Core/Models/IRedirectUrl.cs
index e066881645..527dad57da 100644
--- a/src/Umbraco.Core/Models/IRedirectUrl.cs
+++ b/src/Umbraco.Core/Models/IRedirectUrl.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.Models.Entities;
 namespace Umbraco.Core.Models
 {
     /// <summary>
-    /// Represents a redirect url.
+    /// Represents a redirect URL.
     /// </summary>
     public interface IRedirectUrl : IEntity, IRememberBeingDirty
     {
@@ -22,7 +22,7 @@ namespace Umbraco.Core.Models
         Guid ContentKey { get; set; }
 
         /// <summary>
-        /// Gets or sets the redirect url creation date.
+        /// Gets or sets the redirect URL creation date.
         /// </summary>
         [DataMember]
         DateTime CreateDateUtc { get; set; }
@@ -34,7 +34,7 @@ namespace Umbraco.Core.Models
         string Culture { get; set; }
 
         /// <summary>
-        /// Gets or sets the redirect url route.
+        /// Gets or sets the redirect URL route.
         /// </summary>
         /// <remarks>Is a proper Umbraco route eg /path/to/foo or 123/path/tofoo.</remarks>
         [DataMember]
diff --git a/src/Umbraco.Core/Models/IconModel.cs b/src/Umbraco.Core/Models/IconModel.cs
new file mode 100644
index 0000000000..0de44301bb
--- /dev/null
+++ b/src/Umbraco.Core/Models/IconModel.cs
@@ -0,0 +1,8 @@
+namespace Umbraco.Core.Models
+{
+    public class IconModel
+    {
+        public string Name { get; set; }
+        public string SvgString { get; set; }
+    }
+}
diff --git a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
index 8dc056d555..d2899caccc 100644
--- a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
+++ b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
+using Umbraco.Core.Collections;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Membership;
@@ -62,7 +63,7 @@ namespace Umbraco.Core.Models.Identity
             _culture = Current.Configs.Global().DefaultUILanguage; // TODO: inject
 
             // must initialize before setting groups
-            _roles = new ObservableCollection<IdentityUserRole<string>>();
+            _roles = new EventClearingObservableCollection<IdentityUserRole<string>>();
             _roles.CollectionChanged += _roles_CollectionChanged;
 
             // use the property setters - they do more than just setting a field
@@ -223,7 +224,7 @@ namespace Umbraco.Core.Models.Identity
                 _groups = value;
 
                 //now clear all roles and re-add them
-                _roles.CollectionChanged -= _roles_CollectionChanged;
+                _roles.ClearCollectionChangedEvents();
                 _roles.Clear();
                 foreach (var identityUserRole in _groups.Select(x => new IdentityUserRole<string>
                 {
@@ -275,16 +276,23 @@ namespace Umbraco.Core.Models.Identity
         {
             get
             {
-                if (_getLogins != null && _getLogins.IsValueCreated == false)
+                // return if it exists
+                if (_logins != null) return _logins;
+
+                _logins = new ObservableCollection<IIdentityUserLogin>();
+
+                // if the callback is there and hasn't been created yet then execute it and populate the logins
+                if (_getLogins != null && !_getLogins.IsValueCreated)
                 {
-                    _logins = new ObservableCollection<IIdentityUserLogin>();
                     foreach (var l in _getLogins.Value)
                     {
                         _logins.Add(l);
                     }
-                    //now assign events
-                    _logins.CollectionChanged += Logins_CollectionChanged;
                 }
+
+                //now assign events
+                _logins.CollectionChanged += Logins_CollectionChanged;
+
                 return _logins;
             }
         }
@@ -299,7 +307,7 @@ namespace Umbraco.Core.Models.Identity
             _beingDirty.OnPropertyChanged(nameof(Roles));
         }
 
-        private readonly ObservableCollection<IdentityUserRole<string>> _roles;
+        private readonly EventClearingObservableCollection<IdentityUserRole<string>> _roles;
 
         /// <summary>
         /// helper method to easily add a role without having to deal with IdentityUserRole{T}
diff --git a/src/Umbraco.Core/Models/Identity/ExternalLogin.cs b/src/Umbraco.Core/Models/Identity/ExternalLogin.cs
new file mode 100644
index 0000000000..6e4abf2906
--- /dev/null
+++ b/src/Umbraco.Core/Models/Identity/ExternalLogin.cs
@@ -0,0 +1,24 @@
+using System;
+
+namespace Umbraco.Core.Models.Identity
+{
+    /// <inheritdoc />
+    public class ExternalLogin : IExternalLogin
+    {
+        public ExternalLogin(string loginProvider, string providerKey, string userData = null)
+        {
+            LoginProvider = loginProvider ?? throw new ArgumentNullException(nameof(loginProvider));
+            ProviderKey = providerKey ?? throw new ArgumentNullException(nameof(providerKey));
+            UserData = userData;
+        }
+
+        /// <inheritdoc />
+        public string LoginProvider { get; }
+
+        /// <inheritdoc />
+        public string ProviderKey { get;  }
+
+        /// <inheritdoc />
+        public string UserData { get; }
+    }
+}
diff --git a/src/Umbraco.Core/Models/Identity/IExternalLogin.cs b/src/Umbraco.Core/Models/Identity/IExternalLogin.cs
new file mode 100644
index 0000000000..68f66a5cee
--- /dev/null
+++ b/src/Umbraco.Core/Models/Identity/IExternalLogin.cs
@@ -0,0 +1,12 @@
+namespace Umbraco.Core.Models.Identity
+{
+    /// <summary>
+    /// Used to persist external login data for a user
+    /// </summary>
+    public interface IExternalLogin
+    {
+        string LoginProvider { get; }
+        string ProviderKey { get; }
+        string UserData { get; }
+    }
+}
diff --git a/src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs b/src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs
index 276f601771..feb8af24f3 100644
--- a/src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs
+++ b/src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs
@@ -2,23 +2,30 @@
 
 namespace Umbraco.Core.Models.Identity
 {
+    // TODO: Merge these in v8! This is here purely for backward compat
+
+    public interface IIdentityUserLoginExtended : IIdentityUserLogin
+    {
+        /// <summary>
+        /// Used to store any arbitrary data for the user and external provider - like user tokens returned from the provider
+        /// </summary>
+        string UserData { get; set; }
+    }
+
     public interface IIdentityUserLogin : IEntity, IRememberBeingDirty
     {
         /// <summary>
         /// The login provider for the login (i.e. Facebook, Google)
-        ///
         /// </summary>
         string LoginProvider { get; set; }
 
         /// <summary>
         /// Key representing the login for the provider
-        ///
         /// </summary>
         string ProviderKey { get; set; }
 
         /// <summary>
         /// User Id for the user who owns this login
-        ///
         /// </summary>
         int UserId { get; set; }
     }
diff --git a/src/Umbraco.Core/Models/Identity/IdentityUserLogin.cs b/src/Umbraco.Core/Models/Identity/IdentityUserLogin.cs
index 5876f420b4..66911b08ac 100644
--- a/src/Umbraco.Core/Models/Identity/IdentityUserLogin.cs
+++ b/src/Umbraco.Core/Models/Identity/IdentityUserLogin.cs
@@ -3,11 +3,11 @@ using Umbraco.Core.Models.Entities;
 
 namespace Umbraco.Core.Models.Identity
 {
+
     /// <summary>
     /// Entity type for a user's login (i.e. Facebook, Google)
-    ///
     /// </summary>
-    public class IdentityUserLogin : EntityBase, IIdentityUserLogin
+    public class IdentityUserLogin : EntityBase, IIdentityUserLoginExtended
     {
         public IdentityUserLogin(string loginProvider, string providerKey, int userId)
         {
@@ -25,22 +25,16 @@ namespace Umbraco.Core.Models.Identity
             CreateDate = createDate;
         }
 
-        /// <summary>
-        /// The login provider for the login (i.e. Facebook, Google)
-        ///
-        /// </summary>
+        /// <inheritdoc />
         public string LoginProvider { get; set; }
 
-        /// <summary>
-        /// Key representing the login for the provider
-        ///
-        /// </summary>
+        /// <inheritdoc />
         public string ProviderKey { get; set; }
 
-        /// <summary>
-        /// User Id for the user who owns this login
-        ///
-        /// </summary>
+        /// <inheritdoc />
         public int UserId { get; set; }
+
+        /// <inheritdoc />
+        public string UserData { get; set; }
     }
 }
diff --git a/src/Umbraco.Core/Models/Media.cs b/src/Umbraco.Core/Models/Media.cs
index 002611c09c..87ec9196d6 100644
--- a/src/Umbraco.Core/Models/Media.cs
+++ b/src/Umbraco.Core/Models/Media.cs
@@ -77,7 +77,7 @@ namespace Umbraco.Core.Models
             else
                 Properties.EnsurePropertyTypes(contentType.CompositionPropertyTypes);
 
-            Properties.CollectionChanged -= PropertiesChanged; // be sure not to double add
+            Properties.ClearCollectionChangedEvents(); // be sure not to double add
             Properties.CollectionChanged += PropertiesChanged;
         }
     }
diff --git a/src/Umbraco.Core/Models/MediaExtensions.cs b/src/Umbraco.Core/Models/MediaExtensions.cs
index 96f183b6e6..c985ace8b0 100644
--- a/src/Umbraco.Core/Models/MediaExtensions.cs
+++ b/src/Umbraco.Core/Models/MediaExtensions.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Core.Models
     public static class MediaExtensions
     {
         /// <summary>
-        /// Gets the url of a media item.
+        /// Gets the URL of a media item.
         /// </summary>
         public static string GetUrl(this IMedia media, string propertyAlias, ILogger logger)
         {
@@ -29,7 +29,7 @@ namespace Umbraco.Core.Models
         }
 
         /// <summary>
-        /// Gets the urls of a media item.
+        /// Gets the URLs of a media item.
         /// </summary>
         public static string[] GetUrls(this IMedia media, IContentSection contentSection, ILogger logger)
         {
diff --git a/src/Umbraco.Core/Models/PathValidationExtensions.cs b/src/Umbraco.Core/Models/PathValidationExtensions.cs
index 2db954b316..4ade88f621 100644
--- a/src/Umbraco.Core/Models/PathValidationExtensions.cs
+++ b/src/Umbraco.Core/Models/PathValidationExtensions.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Core.Models
             if (entity.Path.IsNullOrWhiteSpace())
                 throw new InvalidDataException($"The content item {entity.NodeId} has an empty path: {entity.Path} with parentID: {entity.ParentId}");
 
-            var pathParts = entity.Path.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+            var pathParts = entity.Path.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries);
             if (pathParts.Length < 2)
             {
                 //a path cannot be less than 2 parts, at a minimum it must be root (-1) and it's own id
@@ -53,7 +53,7 @@ namespace Umbraco.Core.Models
             if (entity.Path.IsNullOrWhiteSpace())
                 return false;
 
-            var pathParts = entity.Path.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+            var pathParts = entity.Path.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries);
             if (pathParts.Length < 2)
             {
                 //a path cannot be less than 2 parts, at a minimum it must be root (-1) and it's own id
diff --git a/src/Umbraco.Core/Models/PropertyCollection.cs b/src/Umbraco.Core/Models/PropertyCollection.cs
index c587a45424..a73df6a095 100644
--- a/src/Umbraco.Core/Models/PropertyCollection.cs
+++ b/src/Umbraco.Core/Models/PropertyCollection.cs
@@ -7,6 +7,7 @@ using System.Runtime.Serialization;
 
 namespace Umbraco.Core.Models
 {
+
     /// <summary>
     /// Represents a collection of property values.
     /// </summary>
@@ -168,6 +169,8 @@ namespace Umbraco.Core.Models
         /// </summary>
         public event NotifyCollectionChangedEventHandler CollectionChanged;
 
+        public void ClearCollectionChangedEvents() => CollectionChanged = null;
+
         protected virtual void OnCollectionChanged(NotifyCollectionChangedEventArgs args)
         {
             CollectionChanged?.Invoke(this, args);
diff --git a/src/Umbraco.Core/Models/PropertyGroup.cs b/src/Umbraco.Core/Models/PropertyGroup.cs
index 2e6da5d837..022fb6ed03 100644
--- a/src/Umbraco.Core/Models/PropertyGroup.cs
+++ b/src/Umbraco.Core/Models/PropertyGroup.cs
@@ -66,7 +66,10 @@ namespace Umbraco.Core.Models
             set
             {
                 if (_propertyTypes != null)
-                    _propertyTypes.CollectionChanged -= PropertyTypesChanged;
+                {
+                    _propertyTypes.ClearCollectionChangedEvents();
+                }
+                    
                 _propertyTypes = value;
 
                 // since we're adding this collection to this group,
@@ -100,7 +103,7 @@ namespace Umbraco.Core.Models
 
             if (clonedEntity._propertyTypes != null)
             {
-                clonedEntity._propertyTypes.CollectionChanged -= PropertyTypesChanged;             //clear this event handler if any
+                clonedEntity._propertyTypes.ClearCollectionChangedEvents();             //clear this event handler if any
                 clonedEntity._propertyTypes = (PropertyTypeCollection) _propertyTypes.DeepClone(); //manually deep clone
                 clonedEntity._propertyTypes.CollectionChanged += clonedEntity.PropertyTypesChanged;       //re-assign correct event handler
             }
diff --git a/src/Umbraco.Core/Models/PropertyGroupCollection.cs b/src/Umbraco.Core/Models/PropertyGroupCollection.cs
index 5422dfb792..973147b3fb 100644
--- a/src/Umbraco.Core/Models/PropertyGroupCollection.cs
+++ b/src/Umbraco.Core/Models/PropertyGroupCollection.cs
@@ -160,6 +160,11 @@ namespace Umbraco.Core.Models
 
         public event NotifyCollectionChangedEventHandler CollectionChanged;
 
+        /// <summary>
+        /// Clears all <see cref="CollectionChanged"/> event handlers
+        /// </summary>
+        public void ClearCollectionChangedEvents() => CollectionChanged = null;
+
         protected virtual void OnCollectionChanged(NotifyCollectionChangedEventArgs args)
         {
             CollectionChanged?.Invoke(this, args);
diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs
index 75c2a7cc00..abdbbfd8db 100644
--- a/src/Umbraco.Core/Models/PropertyType.cs
+++ b/src/Umbraco.Core/Models/PropertyType.cs
@@ -31,6 +31,7 @@ namespace Umbraco.Core.Models
         private string _validationRegExp;
         private string _validationRegExpMessage;
         private ContentVariation _variations;
+        private bool _labelOnTop;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PropertyType"/> class.
@@ -205,6 +206,16 @@ namespace Umbraco.Core.Models
             set => SetPropertyValueAndDetectChanges(value, ref _mandatoryMessage, nameof(MandatoryMessage));
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the label of this property type should be displayed on top.
+        /// </summary>
+        [DataMember]
+        public bool LabelOnTop
+        {
+            get => _labelOnTop;
+            set => SetPropertyValueAndDetectChanges(value, ref _labelOnTop, nameof(LabelOnTop));
+        }
+
         /// <summary>
         /// Gets of sets the sort order of the property type.
         /// </summary>
@@ -438,7 +449,7 @@ namespace Umbraco.Core.Models
             base.PerformDeepClone(clone);
 
             var clonedEntity = (PropertyType)clone;
-            
+
             //need to manually assign the Lazy value as it will not be automatically mapped
             if (PropertyGroupId != null)
             {
diff --git a/src/Umbraco.Core/Models/PropertyTypeCollection.cs b/src/Umbraco.Core/Models/PropertyTypeCollection.cs
index 6e41f0d12b..cc9d00fa5d 100644
--- a/src/Umbraco.Core/Models/PropertyTypeCollection.cs
+++ b/src/Umbraco.Core/Models/PropertyTypeCollection.cs
@@ -162,7 +162,11 @@ namespace Umbraco.Core.Models
         }
 
         public event NotifyCollectionChangedEventHandler CollectionChanged;
-
+        
+        /// <summary>
+        /// Clears all <see cref="CollectionChanged"/> event handlers
+        /// </summary>
+        public void ClearCollectionChangedEvents() => CollectionChanged = null;
         protected virtual void OnCollectionChanged(NotifyCollectionChangedEventArgs args)
         {
             CollectionChanged?.Invoke(this, args);
diff --git a/src/Umbraco.Core/Models/PublicAccessEntry.cs b/src/Umbraco.Core/Models/PublicAccessEntry.cs
index cfb30de147..cc86b797cb 100644
--- a/src/Umbraco.Core/Models/PublicAccessEntry.cs
+++ b/src/Umbraco.Core/Models/PublicAccessEntry.cs
@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
 using System.Runtime.Serialization;
+using Umbraco.Core.Collections;
 using Umbraco.Core.Models.Entities;
 
 namespace Umbraco.Core.Models
@@ -12,7 +13,7 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class PublicAccessEntry : EntityBase
     {
-        private readonly ObservableCollection<PublicAccessRule> _ruleCollection;
+        private readonly EventClearingObservableCollection<PublicAccessRule> _ruleCollection;
         private int _protectedNodeId;
         private int _noAccessNodeId;
         private int _loginNodeId;
@@ -28,7 +29,7 @@ namespace Umbraco.Core.Models
             NoAccessNodeId = noAccessNode.Id;
             _protectedNodeId = protectedNode.Id;
 
-            _ruleCollection = new ObservableCollection<PublicAccessRule>(ruleCollection);
+            _ruleCollection = new EventClearingObservableCollection<PublicAccessRule>(ruleCollection);
             _ruleCollection.CollectionChanged += _ruleCollection_CollectionChanged;
 
             foreach (var rule in _ruleCollection)
@@ -44,7 +45,7 @@ namespace Umbraco.Core.Models
             NoAccessNodeId = noAccessNodeId;
             _protectedNodeId = protectedNodeId;
 
-            _ruleCollection = new ObservableCollection<PublicAccessRule>(ruleCollection);
+            _ruleCollection = new EventClearingObservableCollection<PublicAccessRule>(ruleCollection);
             _ruleCollection.CollectionChanged += _ruleCollection_CollectionChanged;
 
             foreach (var rule in _ruleCollection)
@@ -148,7 +149,7 @@ namespace Umbraco.Core.Models
 
             if (cloneEntity._ruleCollection != null)
             {
-                cloneEntity._ruleCollection.CollectionChanged -= _ruleCollection_CollectionChanged;       //clear this event handler if any
+                cloneEntity._ruleCollection.ClearCollectionChangedEvents();       //clear this event handler if any
                 cloneEntity._ruleCollection.CollectionChanged += cloneEntity._ruleCollection_CollectionChanged; //re-assign correct event handler
             }
         }
diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
index 4e154bf514..23861dfa9d 100644
--- a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Core.Models.PublishedContent
         string Name { get; }
 
         /// <summary>
-        /// Gets the url segment of the content item for the current culture.
+        /// Gets the URL segment of the content item for the current culture.
         /// </summary>
         string UrlSegment { get; }
 
@@ -93,7 +93,7 @@ namespace Umbraco.Core.Models.PublishedContent
         DateTime UpdateDate { get; }
 
         /// <summary>
-        /// Gets the url of the content item for the current culture.
+        /// Gets the URL of the content item for the current culture.
         /// </summary>
         /// <remarks>
         /// <para>The value of this property is contextual. It depends on the 'current' request uri,
diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedContentType.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedContentType.cs
index ab6920377c..cfc789324a 100644
--- a/src/Umbraco.Core/Models/PublishedContent/IPublishedContentType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedContentType.cs
@@ -1,7 +1,21 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace Umbraco.Core.Models.PublishedContent
 {
+    /// <summary>
+    /// Represents an <see cref="IPublishedElement"/> type.
+    /// </summary>
+    /// <remarks>Instances implementing the <see cref="IPublishedContentType"/> interface should be
+    /// immutable, ie if the content type changes, then a new instance needs to be created.</remarks>
+    public interface IPublishedContentType2 : IPublishedContentType
+    {
+        /// <summary>
+        /// Gets the unique key for the content type.
+        /// </summary>
+        Guid Key { get; }
+    }
+
     /// <summary>
     /// Represents an <see cref="IPublishedElement"/> type.
     /// </summary>
diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedContentTypeFactory.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedContentTypeFactory.cs
index 89009ac7b8..1a29f970d9 100644
--- a/src/Umbraco.Core/Models/PublishedContent/IPublishedContentTypeFactory.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedContentTypeFactory.cs
@@ -1,5 +1,6 @@
 namespace Umbraco. Core.Models.PublishedContent
 {
+
     /// <summary>
     /// Creates published content types.
     /// </summary>
diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedModelFactory.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedModelFactory.cs
index ae4caf352e..60fa0fe603 100644
--- a/src/Umbraco.Core/Models/PublishedContent/IPublishedModelFactory.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedModelFactory.cs
@@ -3,6 +3,7 @@ using System.Collections;
 
 namespace Umbraco.Core.Models.PublishedContent
 {
+
     /// <summary>
     /// Provides the published model creation service.
     /// </summary>
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs
index bfc65b70d6..033396e4a1 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtensionsForModels.cs
@@ -3,6 +3,7 @@ using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Models.PublishedContent
 {
+
     /// <summary>
     /// Provides strongly typed published content models services.
     /// </summary>
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
index 458b63ade3..7aa9b0dfd9 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Core.Models.PublishedContent
     /// </summary>
     /// <remarks>Instances of the <see cref="PublishedContentType"/> class are immutable, ie
     /// if the content type changes, then a new class needs to be created.</remarks>
-    public class PublishedContentType : IPublishedContentType
+    public class PublishedContentType : IPublishedContentType2
     {
         private readonly IPublishedPropertyType[] _propertyTypes;
 
@@ -20,7 +20,7 @@ namespace Umbraco.Core.Models.PublishedContent
         /// Initializes a new instance of the <see cref="PublishedContentType"/> class with a content type.
         /// </summary>
         public PublishedContentType(IContentTypeComposition contentType, IPublishedContentTypeFactory factory)
-            : this(contentType.Id, contentType.Alias, contentType.GetItemType(), contentType.CompositionAliases(), contentType.Variations, contentType.IsElement)
+            : this(contentType.Key, contentType.Id, contentType.Alias, contentType.GetItemType(), contentType.CompositionAliases(), contentType.Variations, contentType.IsElement)
         {
             var propertyTypes = contentType.CompositionPropertyTypes
                 .Select(x => factory.CreatePropertyType(this, x))
@@ -40,8 +40,20 @@ namespace Umbraco.Core.Models.PublishedContent
         /// <remarks>
         /// <para>Values are assumed to be consistent and are not checked.</para>
         /// </remarks>
+        public PublishedContentType(Guid key, int id, string alias, PublishedItemType itemType, IEnumerable<string> compositionAliases, IEnumerable<PublishedPropertyType> propertyTypes, ContentVariation variations, bool isElement = false)
+            : this(key, id, alias, itemType, compositionAliases, variations, isElement)
+        {
+            var propertyTypesA = propertyTypes.ToArray();
+            foreach (var propertyType in propertyTypesA)
+                propertyType.ContentType = this;
+            _propertyTypes = propertyTypesA;
+
+            InitializeIndexes();
+        }
+
+        [Obsolete("Use the overload specifying a key instead")]
         public PublishedContentType(int id, string alias, PublishedItemType itemType, IEnumerable<string> compositionAliases, IEnumerable<PublishedPropertyType> propertyTypes, ContentVariation variations, bool isElement = false)
-            : this (id, alias, itemType, compositionAliases, variations, isElement)
+            : this (Guid.Empty, id, alias, itemType, compositionAliases, variations, isElement)
         {
             var propertyTypesA = propertyTypes.ToArray();
             foreach (var propertyType in propertyTypesA)
@@ -57,16 +69,26 @@ namespace Umbraco.Core.Models.PublishedContent
         /// <remarks>
         /// <para>Values are assumed to be consistent and are not checked.</para>
         /// </remarks>
+        public PublishedContentType(Guid key, int id, string alias, PublishedItemType itemType, IEnumerable<string> compositionAliases, Func<IPublishedContentType, IEnumerable<IPublishedPropertyType>> propertyTypes, ContentVariation variations, bool isElement = false)
+            : this(key, id, alias, itemType, compositionAliases, variations, isElement)
+        {
+            _propertyTypes = propertyTypes(this).ToArray();
+
+            InitializeIndexes();
+        }
+        
+        [Obsolete("Use the overload specifying a key instead")]
         public PublishedContentType(int id, string alias, PublishedItemType itemType, IEnumerable<string> compositionAliases, Func<IPublishedContentType, IEnumerable<IPublishedPropertyType>> propertyTypes, ContentVariation variations, bool isElement = false)
-            : this(id, alias, itemType, compositionAliases, variations, isElement)
+            : this(Guid.Empty, id, alias, itemType, compositionAliases, variations, isElement)
         {
             _propertyTypes = propertyTypes(this).ToArray();
 
             InitializeIndexes();
         }
 
-        private PublishedContentType(int id, string alias, PublishedItemType itemType, IEnumerable<string> compositionAliases, ContentVariation variations, bool isElement)
+        private PublishedContentType(Guid key, int id, string alias, PublishedItemType itemType, IEnumerable<string> compositionAliases, ContentVariation variations, bool isElement)
         {
+            Key = key;
             Id = id;
             Alias = alias;
             ItemType = itemType;
@@ -116,6 +138,9 @@ namespace Umbraco.Core.Models.PublishedContent
 
         #region Content type
 
+        /// <inheritdoc />
+        public Guid Key { get; }
+
         /// <inheritdoc />
         public int Id { get; }
 
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeExtensions.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeExtensions.cs
new file mode 100644
index 0000000000..feab33c1d6
--- /dev/null
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeExtensions.cs
@@ -0,0 +1,24 @@
+using System;
+
+namespace Umbraco.Core.Models.PublishedContent
+{
+    public static class PublishedContentTypeExtensions
+    {
+        /// <summary>
+        /// Get the GUID key from an <see cref="IPublishedContentType"/>
+        /// </summary>
+        /// <param name="publishedContentType"></param>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public static bool TryGetKey(this IPublishedContentType publishedContentType, out Guid key)
+        {
+            if (publishedContentType is IPublishedContentType2 contentTypeWithKey)
+            {
+                key = contentTypeWithKey.Key;
+                return true;
+            }
+            key = Guid.Empty;
+            return false;                
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
index 34094508c3..c1548d3c3d 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
@@ -35,18 +35,18 @@ namespace Umbraco.Core.Models.PublishedContent
         /// This method is for tests and is not intended to be used directly from application code.
         /// </summary>
         /// <remarks>Values are assumed to be consisted and are not checked.</remarks>
-        internal IPublishedContentType CreateContentType(int id, string alias, Func<IPublishedContentType, IEnumerable<IPublishedPropertyType>> propertyTypes, ContentVariation variations = ContentVariation.Nothing, bool isElement = false)
+        internal IPublishedContentType CreateContentType(Guid key, int id, string alias, Func<IPublishedContentType, IEnumerable<IPublishedPropertyType>> propertyTypes, ContentVariation variations = ContentVariation.Nothing, bool isElement = false)
         {
-            return new PublishedContentType(id, alias, PublishedItemType.Content, Enumerable.Empty<string>(), propertyTypes, variations, isElement);
+            return new PublishedContentType(key, id, alias, PublishedItemType.Content, Enumerable.Empty<string>(), propertyTypes, variations, isElement);
         }
 
         /// <summary>
         /// This method is for tests and is not intended to be used directly from application code.
         /// </summary>
         /// <remarks>Values are assumed to be consisted and are not checked.</remarks>
-        internal IPublishedContentType CreateContentType(int id, string alias, IEnumerable<string> compositionAliases, Func<IPublishedContentType, IEnumerable<IPublishedPropertyType>> propertyTypes, ContentVariation variations = ContentVariation.Nothing, bool isElement = false)
+        internal IPublishedContentType CreateContentType(Guid key, int id, string alias, IEnumerable<string> compositionAliases, Func<IPublishedContentType, IEnumerable<IPublishedPropertyType>> propertyTypes, ContentVariation variations = ContentVariation.Nothing, bool isElement = false)
         {
-            return new PublishedContentType(id, alias, PublishedItemType.Content, compositionAliases, propertyTypes, variations, isElement);
+            return new PublishedContentType(key, id, alias, PublishedItemType.Content, compositionAliases, propertyTypes, variations, isElement);
         }
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedCultureInfos.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedCultureInfos.cs
index 908b97fc36..58241ade24 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedCultureInfos.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedCultureInfos.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Core.Models.PublishedContent
         internal string Name { get; }
 
         /// <summary>
-        /// Gets the url segment of the item.
+        /// Gets the URL segment of the item.
         /// </summary>
         internal string UrlSegment { get; }
 
diff --git a/src/Umbraco.Core/Models/PublishedContent/UrlMode.cs b/src/Umbraco.Core/Models/PublishedContent/UrlMode.cs
index 4cd6a680f4..d11459bb9e 100644
--- a/src/Umbraco.Core/Models/PublishedContent/UrlMode.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/UrlMode.cs
@@ -1,27 +1,27 @@
 namespace Umbraco.Core.Models.PublishedContent
 {
     /// <summary>
-    /// Specifies the type of urls that the url provider should produce, Auto is the default.
+    /// Specifies the type of URLs that the URL provider should produce, Auto is the default.
     /// </summary>
     public enum UrlMode
     {
         /// <summary>
-        /// Indicates that the url provider should do what it has been configured to do.
+        /// Indicates that the URL provider should do what it has been configured to do.
         /// </summary>
         Default = 0,
 
         /// <summary>
-        /// Indicates that the url provider should produce relative urls exclusively.
+        /// Indicates that the URL provider should produce relative URLs exclusively.
         /// </summary>
         Relative,
 
         /// <summary>
-        /// Indicates that the url provider should produce absolute urls exclusively.
+        /// Indicates that the URL provider should produce absolute URLs exclusively.
         /// </summary>
         Absolute,
 
         /// <summary>
-        /// Indicates that the url provider should determine automatically whether to return relative or absolute urls.
+        /// Indicates that the URL provider should determine automatically whether to return relative or absolute URLs.
         /// </summary>
         Auto
     }
diff --git a/src/Umbraco.Core/Models/Range.cs b/src/Umbraco.Core/Models/Range.cs
index 83afa11658..108d564665 100644
--- a/src/Umbraco.Core/Models/Range.cs
+++ b/src/Umbraco.Core/Models/Range.cs
@@ -1,52 +1,130 @@
 using System;
+using System.Globalization;
+
 namespace Umbraco.Core.Models
 {
-    // <summary>The Range class. Adapted from http://stackoverflow.com/questions/5343006/is-there-a-c-sharp-type-for-representing-an-integer-range</summary>
-    /// <typeparam name="T">Generic parameter.</typeparam>
-    public class Range<T> where T : IComparable<T>
+    /// <summary>
+    /// Represents a range with a minimum and maximum value.
+    /// </summary>
+    /// <typeparam name="T">The type of the minimum and maximum values.</typeparam>
+    /// <seealso cref="System.IEquatable{Umbraco.Core.Models.Range{T}}" />
+    public class Range<T> : IEquatable<Range<T>>
+        where T : IComparable<T>
     {
-        /// <summary>Minimum value of the range.</summary>
+        /// <summary>
+        /// Gets or sets the minimum value.
+        /// </summary>
+        /// <value>
+        /// The minimum value.
+        /// </value>
         public T Minimum { get; set; }
 
-        /// <summary>Maximum value of the range.</summary>
+        /// <summary>
+        /// Gets or sets the maximum value.
+        /// </summary>
+        /// <value>
+        /// The maximum value.
+        /// </value>
         public T Maximum { get; set; }
 
-        /// <summary>Presents the Range in readable format.</summary>
-        /// <returns>String representation of the Range</returns>
-        public override string ToString()
-        {
-            return string.Format("{0},{1}", this.Minimum, this.Maximum);
-        }
+        /// <summary>
+        /// Returns a <see cref="System.String" /> that represents this instance.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String" /> that represents this instance.
+        /// </returns>
+        public override string ToString() => this.ToString("{0},{1}", CultureInfo.InvariantCulture);
 
-        /// <summary>Determines if the range is valid.</summary>
-        /// <returns>True if range is valid, else false</returns>
-        public bool IsValid()
-        {
-            return this.Minimum.CompareTo(this.Maximum) <= 0;
-        }
+        /// <summary>
+        /// Returns a <see cref="System.String" /> that represents this instance.
+        /// </summary>
+        /// <param name="format">A composite format string for a single value (minimum and maximum are equal). Use {0} for the minimum and {1} for the maximum value.</param>
+        /// <param name="formatRange">A composite format string for the range values. Use {0} for the minimum and {1} for the maximum value.</param>
+        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+        /// <returns>
+        /// A <see cref="System.String" /> that represents this instance.
+        /// </returns>
+        public string ToString(string format, string formatRange, IFormatProvider provider = null) => this.ToString(this.Minimum.CompareTo(this.Maximum) == 0 ? format : formatRange, provider);
 
-        /// <summary>Determines if the provided value is inside the range.</summary>
-        /// <param name="value">The value to test</param>
-        /// <returns>True if the value is inside Range, else false</returns>
-        public bool ContainsValue(T value)
-        {
-            return (this.Minimum.CompareTo(value) <= 0) && (value.CompareTo(this.Maximum) <= 0);
-        }
+        /// <summary>
+        /// Returns a <see cref="System.String" /> that represents this instance.
+        /// </summary>
+        /// <param name="format">A composite format string for the range values. Use {0} for the minimum and {1} for the maximum value.</param>
+        /// <param name="provider">An object that supplies culture-specific formatting information.</param>
+        /// <returns>
+        /// A <see cref="System.String" /> that represents this instance.
+        /// </returns>
+        public string ToString(string format, IFormatProvider provider = null) => string.Format(provider, format, this.Minimum, this.Maximum);
 
-        /// <summary>Determines if this Range is inside the bounds of another range.</summary>
-        /// <param name="Range">The parent range to test on</param>
-        /// <returns>True if range is inclusive, else false</returns>
-        public bool IsInsideRange(Range<T> range)
-        {
-            return this.IsValid() && range.IsValid() && range.ContainsValue(this.Minimum) && range.ContainsValue(this.Maximum);
-        }
+        /// <summary>
+        /// Determines whether this range is valid (the minimum value is lower than or equal to the maximum value).
+        /// </summary>
+        /// <returns>
+        ///   <c>true</c> if this range is valid; otherwise, <c>false</c>.
+        /// </returns>
+        public bool IsValid() => this.Minimum.CompareTo(this.Maximum) <= 0;
 
-        /// <summary>Determines if another range is inside the bounds of this range.</summary>
-        /// <param name="Range">The child range to test</param>
-        /// <returns>True if range is inside, else false</returns>
-        public bool ContainsRange(Range<T> range)
-        {
-            return this.IsValid() && range.IsValid() && this.ContainsValue(range.Minimum) && this.ContainsValue(range.Maximum);
-        }
+        /// <summary>
+        /// Determines whether this range contains the specified value.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>
+        ///   <c>true</c> if this range contains the specified value; otherwise, <c>false</c>.
+        /// </returns>
+        public bool ContainsValue(T value) => this.Minimum.CompareTo(value) <= 0 && value.CompareTo(this.Maximum) <= 0;
+
+        /// <summary>
+        /// Determines whether this range is inside the specified range.
+        /// </summary>
+        /// <param name="range">The range.</param>
+        /// <returns>
+        ///   <c>true</c> if this range is inside the specified range; otherwise, <c>false</c>.
+        /// </returns>
+        public bool IsInsideRange(Range<T> range) => this.IsValid() && range.IsValid() && range.ContainsValue(this.Minimum) && range.ContainsValue(this.Maximum);
+
+        /// <summary>
+        /// Determines whether this range contains the specified range.
+        /// </summary>
+        /// <param name="range">The range.</param>
+        /// <returns>
+        ///   <c>true</c> if this range contains the specified range; otherwise, <c>false</c>.
+        /// </returns>
+        public bool ContainsRange(Range<T> range) => this.IsValid() && range.IsValid() && this.ContainsValue(range.Minimum) && this.ContainsValue(range.Maximum);
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object" />, is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object" /> to compare with this instance.</param>
+        /// <returns>
+        ///   <c>true</c> if the specified <see cref="System.Object" /> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj) => obj is Range<T> other && this.Equals(other);
+
+        /// <summary>
+        /// Indicates whether the current object is equal to another object of the same type.
+        /// </summary>
+        /// <param name="other">An object to compare with this object.</param>
+        /// <returns>
+        ///   <see langword="true" /> if the current object is equal to the <paramref name="other" /> parameter; otherwise, <see langword="false" />.
+        /// </returns>
+        public bool Equals(Range<T> other) => other != null && this.Equals(other.Minimum, other.Maximum);
+
+        /// <summary>
+        /// Determines whether the specified <paramref name="minimum" /> and <paramref name="maximum" /> values are equal to this instance values.
+        /// </summary>
+        /// <param name="minimum">The minimum value.</param>
+        /// <param name="maximum">The maximum value.</param>
+        /// <returns>
+        ///   <c>true</c> if the specified <paramref name="minimum" /> and <paramref name="maximum" /> values are equal to this instance values; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(T minimum, T maximum) => this.Minimum.CompareTo(minimum) == 0 && this.Maximum.CompareTo(maximum) == 0;
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode() => (this.Minimum, this.Maximum).GetHashCode();
     }
 }
diff --git a/src/Umbraco.Core/Models/ReadOnlyContentBaseAdapter.cs b/src/Umbraco.Core/Models/ReadOnlyContentBaseAdapter.cs
new file mode 100644
index 0000000000..f707d2ab1c
--- /dev/null
+++ b/src/Umbraco.Core/Models/ReadOnlyContentBaseAdapter.cs
@@ -0,0 +1,42 @@
+using System;
+
+namespace Umbraco.Core.Models
+{
+    internal struct ReadOnlyContentBaseAdapter : IReadOnlyContentBase
+    {
+        private readonly IContentBase _content;
+
+        private ReadOnlyContentBaseAdapter(IContentBase content)
+        {
+            _content = content ?? throw new ArgumentNullException(nameof(content));
+        }
+
+        public static ReadOnlyContentBaseAdapter Create(IContentBase content) => new ReadOnlyContentBaseAdapter(content);
+
+        public int Id => _content.Id;
+
+        public Guid Key => _content.Key;
+
+        public DateTime CreateDate => _content.CreateDate;
+
+        public DateTime UpdateDate => _content.UpdateDate;
+
+        public string Name => _content.Name;
+
+        public int CreatorId => _content.CreatorId;
+
+        public int ParentId => _content.ParentId;
+
+        public int Level => _content.Level;
+
+        public string Path => _content.Path;
+
+        public int SortOrder => _content.SortOrder;
+
+        public int ContentTypeId => _content.ContentTypeId;
+
+        public int WriterId => _content.WriterId;
+
+        public int VersionId => _content.VersionId;
+    }
+}
diff --git a/src/Umbraco.Core/Models/ServerRegistration.cs b/src/Umbraco.Core/Models/ServerRegistration.cs
index 7dae5d5393..a862b11c23 100644
--- a/src/Umbraco.Core/Models/ServerRegistration.cs
+++ b/src/Umbraco.Core/Models/ServerRegistration.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Core.Models
         /// Initializes a new instance of the <see cref="ServerRegistration"/> class.
         /// </summary>
         /// <param name="id">The unique id of the server registration.</param>
-        /// <param name="serverAddress">The server url.</param>
+        /// <param name="serverAddress">The server URL.</param>
         /// <param name="serverIdentity">The unique server identity.</param>
         /// <param name="registered">The date and time the registration was created.</param>
         /// <param name="accessed">The date and time the registration was last accessed.</param>
@@ -45,7 +45,7 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerRegistration"/> class.
         /// </summary>
-        /// <param name="serverAddress">The server url.</param>
+        /// <param name="serverAddress">The server URL.</param>
         /// <param name="serverIdentity">The unique server identity.</param>
         /// <param name="registered">The date and time the registration was created.</param>
         public ServerRegistration(string serverAddress, string serverIdentity, DateTime registered)
@@ -58,7 +58,7 @@ namespace Umbraco.Core.Models
         }
 
         /// <summary>
-        /// Gets or sets the server url.
+        /// Gets or sets the server URL.
         /// </summary>
         public string ServerAddress
         {
diff --git a/src/Umbraco.Core/Models/SimpleContentType.cs b/src/Umbraco.Core/Models/SimpleContentType.cs
index 5c81017ec8..45b9d0ecfc 100644
--- a/src/Umbraco.Core/Models/SimpleContentType.cs
+++ b/src/Umbraco.Core/Models/SimpleContentType.cs
@@ -37,6 +37,7 @@ namespace Umbraco.Core.Models
             if (contentType == null) throw new ArgumentNullException(nameof(contentType));
 
             Id = contentType.Id;
+            Key = contentType.Key;
             Alias = contentType.Alias;
             Variations = contentType.Variations;
             Icon = contentType.Icon;
@@ -51,6 +52,8 @@ namespace Umbraco.Core.Models
 
         public int Id { get; }
 
+        public Guid Key { get; }
+
         /// <inheritdoc />
         public ITemplate DefaultTemplate { get;  }
 
@@ -109,13 +112,14 @@ namespace Umbraco.Core.Models
         string ITreeEntity.Name { get => this.Name; set => throw new NotImplementedException(); }
         int IEntity.Id { get => this.Id; set => throw new NotImplementedException(); }
         bool IEntity.HasIdentity => this.Id != default;
+        Guid IEntity.Key { get => this.Key; set => throw new NotImplementedException(); }
+
         int ITreeEntity.CreatorId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         int ITreeEntity.ParentId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         int ITreeEntity.Level { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         string ITreeEntity.Path { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         int ITreeEntity.SortOrder { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        bool ITreeEntity.Trashed => throw new NotImplementedException();
-        Guid IEntity.Key { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        bool ITreeEntity.Trashed => throw new NotImplementedException();        
         DateTime IEntity.CreateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         DateTime IEntity.UpdateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         DateTime? IEntity.DeleteDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index 6a5acb0dc7..4d1f12baaa 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -522,7 +522,7 @@ namespace Umbraco.Core.Packaging
                     && ((string)infoElement.Element("Master")).IsNullOrWhiteSpace())
                 {
                     var alias = documentType.Element("Info").Element("Alias").Value;
-                    var folders = foldersAttribute.Value.Split('/');
+                    var folders = foldersAttribute.Value.Split(Constants.CharArrays.ForwardSlash);
                     var rootFolder = HttpUtility.UrlDecode(folders[0]);
                     //level 1 = root level folders, there can only be one with the same name
                     var current = _contentTypeService.GetContainers(rootFolder, 1).FirstOrDefault();
@@ -604,6 +604,8 @@ namespace Umbraco.Core.Packaging
             var defaultTemplateElement = infoElement.Element("DefaultTemplate");
 
             contentType.Name = infoElement.Element("Name").Value;
+            if (infoElement.Element("Key") != null)
+                contentType.Key = new Guid(infoElement.Element("Key").Value);
             contentType.Icon = infoElement.Element("Icon").Value;
             contentType.Thumbnail = infoElement.Element("Thumbnail").Value;
             contentType.Description = infoElement.Element("Description").Value;
@@ -798,8 +800,13 @@ namespace Umbraco.Core.Packaging
                     SortOrder = sortOrder,
                     Variations = property.Element("Variations") != null
                         ? (ContentVariation)Enum.Parse(typeof(ContentVariation), property.Element("Variations").Value)
-                        : ContentVariation.Nothing
+                        : ContentVariation.Nothing,
+                    LabelOnTop = property.Element("LabelOnTop") != null
+                        ? property.Element("LabelOnTop").Value.ToLowerInvariant().Equals("true")
+                        : false
                 };
+                if (property.Element("Key") != null)
+                    propertyType.Key = new Guid(property.Element("Key").Value);
 
                 var tab = (string)property.Element("Tab");
                 if (string.IsNullOrEmpty(tab))
@@ -935,7 +942,7 @@ namespace Umbraco.Core.Packaging
                 if (foldersAttribute != null)
                 {
                     var name = datatypeElement.Attribute("Name").Value;
-                    var folders = foldersAttribute.Value.Split('/');
+                    var folders = foldersAttribute.Value.Split(Constants.CharArrays.ForwardSlash);
                     var rootFolder = HttpUtility.UrlDecode(folders[0]);
                     //there will only be a single result by name for level 1 (root) containers
                     var current = _dataTypeService.GetContainers(rootFolder, 1).FirstOrDefault();
diff --git a/src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs b/src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs
index 50cb692530..1bba373218 100644
--- a/src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs
+++ b/src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs
@@ -44,13 +44,13 @@ namespace Umbraco.Core.Packaging
                 Actions = xml.Element("actions")?.ToString(SaveOptions.None) ?? "<actions></actions>", //take the entire outer xml value
                 ContentNodeId = xml.Element("content")?.AttributeValue<string>("nodeId") ?? string.Empty,
                 ContentLoadChildNodes = xml.Element("content")?.AttributeValue<bool>("loadChildNodes") ?? false,
-                Macros = xml.Element("macros")?.Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList() ?? new List<string>(),
-                Templates = xml.Element("templates")?.Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList() ?? new List<string>(),
-                Stylesheets = xml.Element("stylesheets")?.Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList() ?? new List<string>(),
-                DocumentTypes = xml.Element("documentTypes")?.Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList() ?? new List<string>(),
-                Languages = xml.Element("languages")?.Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList() ?? new List<string>(),
-                DictionaryItems = xml.Element("dictionaryitems")?.Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList() ?? new List<string>(),
-                DataTypes = xml.Element("datatypes")?.Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList() ?? new List<string>(),
+                Macros = xml.Element("macros")?.Value.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).ToList() ?? new List<string>(),
+                Templates = xml.Element("templates")?.Value.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).ToList() ?? new List<string>(),
+                Stylesheets = xml.Element("stylesheets")?.Value.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).ToList() ?? new List<string>(),
+                DocumentTypes = xml.Element("documentTypes")?.Value.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).ToList() ?? new List<string>(),
+                Languages = xml.Element("languages")?.Value.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).ToList() ?? new List<string>(),
+                DictionaryItems = xml.Element("dictionaryitems")?.Value.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).ToList() ?? new List<string>(),
+                DataTypes = xml.Element("datatypes")?.Value.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).ToList() ?? new List<string>(),
                 Files = xml.Element("files")?.Elements("file").Select(x => x.Value).ToList() ?? new List<string>()
             };
 
diff --git a/src/Umbraco.Core/Persistence/DatabaseAnnotations/IndexAttribute.cs b/src/Umbraco.Core/Persistence/DatabaseAnnotations/IndexAttribute.cs
index 138dceff09..5aaabbfa6f 100644
--- a/src/Umbraco.Core/Persistence/DatabaseAnnotations/IndexAttribute.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseAnnotations/IndexAttribute.cs
@@ -31,5 +31,10 @@ namespace Umbraco.Core.Persistence.DatabaseAnnotations
         /// Gets or sets the column name(s) for the current index
         /// </summary>
         public string ForColumns { get; set; }
+
+        /// <summary>
+        /// Gets or sets the column name(s) for the columns to include in the index
+        /// </summary>
+        public string IncludeColumns { get; set; }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/DatabaseAnnotations/SpecialDbTypes.cs b/src/Umbraco.Core/Persistence/DatabaseAnnotations/SpecialDbTypes.cs
index 4b606bc0f5..6d211ebbd9 100644
--- a/src/Umbraco.Core/Persistence/DatabaseAnnotations/SpecialDbTypes.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseAnnotations/SpecialDbTypes.cs
@@ -7,6 +7,7 @@
     public enum SpecialDbTypes
     {
         NTEXT,
-        NCHAR
+        NCHAR,
+        NVARCHARMAX
     }
 }
diff --git a/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs
index 5925e58afc..e6f06e4200 100644
--- a/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs
@@ -160,12 +160,20 @@ namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 
             if (string.IsNullOrEmpty(attribute.ForColumns) == false)
             {
-                var columns = attribute.ForColumns.Split(',').Select(p => p.Trim());
+                var columns = attribute.ForColumns.Split(Constants.CharArrays.Comma).Select(p => p.Trim());
                 foreach (var column in columns)
                 {
                     definition.Columns.Add(new IndexColumnDefinition {Name = column, Direction = Direction.Ascending});
                 }
             }
+            if (string.IsNullOrEmpty(attribute.IncludeColumns) == false)
+            {
+                var columns = attribute.IncludeColumns.Split(',').Select(p => p.Trim());
+                foreach (var column in columns)
+                {
+                    definition.IncludeColumns.Add(new IndexColumnDefinition { Name = column, Direction = Direction.Ascending });
+                }
+            }
             return definition;
         }
     }
diff --git a/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs
index 582f9a40f7..20f75d38c8 100644
--- a/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs
@@ -6,17 +6,13 @@ namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
     public class IndexDefinition
     {
-        public IndexDefinition()
-        {
-            Columns = new List<IndexColumnDefinition>();
-        }
-
         public virtual string Name { get; set; }
         public virtual string SchemaName { get; set; }
         public virtual string TableName { get; set; }
         public virtual string ColumnName { get; set; }
 
-        public virtual ICollection<IndexColumnDefinition> Columns { get; set; }
+        public virtual ICollection<IndexColumnDefinition> Columns { get; set; } = new List<IndexColumnDefinition>();
+        public virtual ICollection<IndexColumnDefinition> IncludeColumns { get; set; } = new List<IndexColumnDefinition>();
         public IndexTypes IndexType { get; set; }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Dtos/ContentNuDto.cs b/src/Umbraco.Core/Persistence/Dtos/ContentNuDto.cs
index c6269d5317..a2f36584e0 100644
--- a/src/Umbraco.Core/Persistence/Dtos/ContentNuDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/ContentNuDto.cs
@@ -25,9 +25,16 @@ namespace Umbraco.Core.Persistence.Dtos
         /// </remarks>
         [Column("data")]
         [SpecialDbType(SpecialDbTypes.NTEXT)]
+        [NullSetting(NullSetting = NullSettings.Null)]
         public string Data { get; set; }
 
         [Column("rv")]
         public long Rv { get; set; }
+
+        [Column("dataRaw")]
+        [NullSetting(NullSetting = NullSettings.Null)]
+        public byte[] RawData { get; set; }
+
+       
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs b/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs
index 4b203c128f..f9bf283be9 100644
--- a/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Persistence.Dtos
 
         [Column("nodeId")]
         [ForeignKey(typeof(ContentDto))]
-        [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_NodeId", ForColumns = "nodeId,current")]
+        [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_NodeId", ForColumns = "nodeId,current", IncludeColumns = "id,versionDate,text,userId")]
         public int NodeId { get; set; }
 
         [Column("versionDate")] // TODO: db rename to 'updateDate'
@@ -32,6 +32,7 @@ namespace Umbraco.Core.Persistence.Dtos
         public int? UserId { get => _userId == 0 ? null : _userId; set => _userId = value; } //return null if zero
 
         [Column("current")]
+        [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_Current", IncludeColumns = "nodeId")]
         public bool Current { get; set; }
 
         // about current:
diff --git a/src/Umbraco.Core/Persistence/Dtos/ExternalLoginDto.cs b/src/Umbraco.Core/Persistence/Dtos/ExternalLoginDto.cs
index 1b774854a6..0a56552000 100644
--- a/src/Umbraco.Core/Persistence/Dtos/ExternalLoginDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/ExternalLoginDto.cs
@@ -14,9 +14,13 @@ namespace Umbraco.Core.Persistence.Dtos
         [PrimaryKeyColumn(Name = "PK_umbracoExternalLogin")]
         public int Id { get; set; }
 
+        // TODO: This is completely missing a FK!!?
+
         [Column("userId")]
         public int UserId { get; set; }
 
+        // TODO: There should be an index on both LoginProvider and ProviderKey
+
         [Column("loginProvider")]
         [Length(4000)]
         [NullSetting(NullSetting = NullSettings.NotNull)]
@@ -30,5 +34,13 @@ namespace Umbraco.Core.Persistence.Dtos
         [Column("createDate")]
         [Constraint(Default = SystemMethods.CurrentDateTime)]
         public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// Used to store any arbitrary data for the user and external provider - like user tokens returned from the provider
+        /// </summary>
+        [Column("userData")]
+        [NullSetting(NullSetting = NullSettings.Null)]
+        [SpecialDbType(SpecialDbTypes.NTEXT)]
+        public string UserData { get; set; }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs b/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs
index 5800efb97a..207195e594 100644
--- a/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Core.Persistence.Dtos
 
         [Column("uniqueId")]
         [NullSetting(NullSetting = NullSettings.NotNull)]
-        [Index(IndexTypes.UniqueNonClustered, Name = "IX_" + TableName + "_UniqueId")]
+        [Index(IndexTypes.UniqueNonClustered, Name = "IX_" + TableName + "_UniqueId", IncludeColumns = "parentId,level,path,sortOrder,trashed,nodeUser,text,createDate")]
         [Constraint(Default = SystemMethods.NewGuid)]
         public Guid UniqueId { get; set; }
 
@@ -29,7 +29,9 @@ namespace Umbraco.Core.Persistence.Dtos
         [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_ParentId")]
         public int ParentId { get; set; }
 
+        // NOTE: This index is primarily for the nucache data lookup, see https://github.com/umbraco/Umbraco-CMS/pull/8365#issuecomment-673404177
         [Column("level")]
+        [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_Level", ForColumns = "level,parentId,sortOrder,nodeObjectType,trashed", IncludeColumns = "nodeUser,path,uniqueId,createDate")]
         public short Level { get; set; }
 
         [Column("path")]
@@ -55,8 +57,8 @@ namespace Umbraco.Core.Persistence.Dtos
         public string Text { get; set; }
 
         [Column("nodeObjectType")] // TODO: db rename to 'objectType'
-        [NullSetting(NullSetting = NullSettings.Null)]
-        [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_ObjectType")]
+        [NullSetting(NullSetting = NullSettings.Null)]        
+        [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_ObjectType", ForColumns = "nodeObjectType,trashed", IncludeColumns = "uniqueId,parentId,level,path,sortOrder,nodeUser,text,createDate")]
         public Guid? NodeObjectType { get; set; }
 
         [Column("createDate")]
diff --git a/src/Umbraco.Core/Persistence/Dtos/PropertyTypeDto.cs b/src/Umbraco.Core/Persistence/Dtos/PropertyTypeDto.cs
index 3e8d6e7496..572201c94a 100644
--- a/src/Umbraco.Core/Persistence/Dtos/PropertyTypeDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/PropertyTypeDto.cs
@@ -62,6 +62,10 @@ namespace Umbraco.Core.Persistence.Dtos
         [Length(2000)]
         public string Description { get; set; }
 
+        [Column("labelOnTop")]
+        [Constraint(Default = "0")]
+        public bool LabelOnTop { get; set; }
+
         [Column("variations")]
         [Constraint(Default = "1" /*ContentVariation.InvariantNeutral*/)]
         public byte Variations { get; set; }
diff --git a/src/Umbraco.Core/Persistence/Dtos/PropertyTypeReadOnlyDto.cs b/src/Umbraco.Core/Persistence/Dtos/PropertyTypeReadOnlyDto.cs
index 4c352a0134..d2001c00d5 100644
--- a/src/Umbraco.Core/Persistence/Dtos/PropertyTypeReadOnlyDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/PropertyTypeReadOnlyDto.cs
@@ -44,6 +44,9 @@ namespace Umbraco.Core.Persistence.Dtos
         [Column("Description")]
         public string Description { get; set; }
 
+        [Column("labelOnTop")]
+        public bool LabelOnTop { get; set; }
+
         /* cmsMemberType */
         [Column("memberCanEdit")]
         public bool CanEdit { get; set; }
diff --git a/src/Umbraco.Core/Persistence/Factories/ExternalLoginFactory.cs b/src/Umbraco.Core/Persistence/Factories/ExternalLoginFactory.cs
index 4309fe511f..6c1af68acd 100644
--- a/src/Umbraco.Core/Persistence/Factories/ExternalLoginFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/ExternalLoginFactory.cs
@@ -1,13 +1,17 @@
-using Umbraco.Core.Models.Identity;
+using System;
+using Umbraco.Core.Models.Identity;
 using Umbraco.Core.Persistence.Dtos;
 
 namespace Umbraco.Core.Persistence.Factories
 {
     internal static class ExternalLoginFactory
     {
-        public static IIdentityUserLogin BuildEntity(ExternalLoginDto dto)
+        public static IIdentityUserLoginExtended BuildEntity(ExternalLoginDto dto)
         {
-            var entity = new IdentityUserLogin(dto.Id, dto.LoginProvider, dto.ProviderKey, dto.UserId, dto.CreateDate);
+            var entity = new IdentityUserLogin(dto.Id, dto.LoginProvider, dto.ProviderKey, dto.UserId, dto.CreateDate)
+            {
+                UserData = dto.UserData
+            };
 
             // reset dirty initial properties (U4-1946)
             entity.ResetDirtyProperties(false);
@@ -16,13 +20,30 @@ namespace Umbraco.Core.Persistence.Factories
 
         public static ExternalLoginDto BuildDto(IIdentityUserLogin entity)
         {
+            var asExtended = entity as IIdentityUserLoginExtended;
             var dto = new ExternalLoginDto
             {
                 Id = entity.Id,
                 CreateDate = entity.CreateDate,
                 LoginProvider = entity.LoginProvider,
                 ProviderKey = entity.ProviderKey,
-                UserId = entity.UserId
+                UserId = entity.UserId,
+                UserData = asExtended?.UserData
+            };
+
+            return dto;
+        }
+
+        public static ExternalLoginDto BuildDto(int userId, IExternalLogin entity, int? id = null)
+        {
+            var dto = new ExternalLoginDto
+            {
+                Id = id ?? default,
+                UserId = userId,
+                LoginProvider = entity.LoginProvider,
+                ProviderKey = entity.ProviderKey,
+                UserData = entity.UserData,
+                CreateDate = DateTime.Now
             };
 
             return dto;
diff --git a/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs b/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
index dc1629e8f7..f139619302 100644
--- a/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
@@ -132,7 +132,8 @@ namespace Umbraco.Core.Persistence.Factories
                 ValidationRegExp = propertyType.ValidationRegExp,
                 ValidationRegExpMessage = propertyType.ValidationRegExpMessage,
                 UniqueId = propertyType.Key,
-                Variations = (byte)propertyType.Variations
+                Variations = (byte)propertyType.Variations,
+                LabelOnTop = propertyType.LabelOnTop
             };
 
             if (tabId != default)
diff --git a/src/Umbraco.Core/Persistence/FaultHandling/Strategies/SqlAzureTransientErrorDetectionStrategy.cs b/src/Umbraco.Core/Persistence/FaultHandling/Strategies/SqlAzureTransientErrorDetectionStrategy.cs
index 849fd35fad..f763594616 100644
--- a/src/Umbraco.Core/Persistence/FaultHandling/Strategies/SqlAzureTransientErrorDetectionStrategy.cs
+++ b/src/Umbraco.Core/Persistence/FaultHandling/Strategies/SqlAzureTransientErrorDetectionStrategy.cs
@@ -4,6 +4,10 @@ using System.Data.SqlClient;
 
 namespace Umbraco.Core.Persistence.FaultHandling.Strategies
 {
+    // See https://docs.microsoft.com/en-us/azure/azure-sql/database/troubleshoot-common-connectivity-issues
+    // Also we could just use the nuget package instead https://www.nuget.org/packages/EnterpriseLibrary.TransientFaultHandling/ ?
+    // but i guess that's not netcore so we'll just leave it.
+
     /// <summary>
     /// Provides the transient error detection logic for transient faults that are specific to SQL Azure.
     /// </summary>
@@ -71,7 +75,7 @@ namespace Umbraco.Core.Persistence.FaultHandling.Strategies
         /// Determines whether the specified exception represents a transient failure that can be compensated by a retry.
         /// </summary>
         /// <param name="ex">The exception object to be verified.</param>
-        /// <returns>True if the specified exception is considered as transient, otherwise false.</returns>
+        /// <returns>true if the specified exception is considered as transient; otherwise, false.</returns>
         public bool IsTransient(Exception ex)
         {
             if (ex != null)
@@ -97,40 +101,50 @@ namespace Umbraco.Core.Persistence.FaultHandling.Strategies
 
                                 return true;
 
-                            // SQL Error Code: 40197
-                            // The service has encountered an error processing your request. Please try again.
-                            case 40197:
+                            // SQL Error Code: 10928
+                            // Resource ID: %d. The %s limit for the database is %d and has been reached.
+                            case 10928:
+                            // SQL Error Code: 10929
+                            // Resource ID: %d. The %s minimum guarantee is %d, maximum limit is %d and the current usage for the database is %d. 
+                            // However, the server is currently too busy to support requests greater than %d for this database.
+                            case 10929:
                             // SQL Error Code: 10053
                             // A transport-level error has occurred when receiving results from the server.
                             // An established connection was aborted by the software in your host machine.
                             case 10053:
                             // SQL Error Code: 10054
-                            // A transport-level error has occurred when sending the request to the server.
+                            // A transport-level error has occurred when sending the request to the server. 
                             // (provider: TCP Provider, error: 0 - An existing connection was forcibly closed by the remote host.)
                             case 10054:
                             // SQL Error Code: 10060
-                            // A network-related or instance-specific error occurred while establishing a connection to SQL Server.
-                            // The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server
-                            // is configured to allow remote connections. (provider: TCP Provider, error: 0 - A connection attempt failed
-                            // because the connected party did not properly respond after a period of time, or established connection failed
+                            // A network-related or instance-specific error occurred while establishing a connection to SQL Server. 
+                            // The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server 
+                            // is configured to allow remote connections. (provider: TCP Provider, error: 0 - A connection attempt failed 
+                            // because the connected party did not properly respond after a period of time, or established connection failed 
                             // because connected host has failed to respond.)"}
                             case 10060:
+                            // SQL Error Code: 40197
+                            // The service has encountered an error processing your request. Please try again.
+                            case 40197:
+                            // SQL Error Code: 40540
+                            // The service has encountered an error processing your request. Please try again.
+                            case 40540:
                             // SQL Error Code: 40613
-                            // Database XXXX on server YYYY is not currently available. Please retry the connection later. If the problem persists, contact customer
+                            // Database XXXX on server YYYY is not currently available. Please retry the connection later. If the problem persists, contact customer 
                             // support, and provide them the session tracing ID of ZZZZZ.
                             case 40613:
                             // SQL Error Code: 40143
                             // The service has encountered an error processing your request. Please try again.
                             case 40143:
                             // SQL Error Code: 233
-                            // The client was unable to establish a connection because of an error during connection initialization process before login.
-                            // Possible causes include the following: the client tried to connect to an unsupported version of SQL Server; the server was too busy
-                            // to accept new connections; or there was a resource limitation (insufficient memory or maximum allowed connections) on the server.
+                            // The client was unable to establish a connection because of an error during connection initialization process before login. 
+                            // Possible causes include the following: the client tried to connect to an unsupported version of SQL Server; the server was too busy 
+                            // to accept new connections; or there was a resource limitation (insufficient memory or maximum allowed connections) on the server. 
                             // (provider: TCP Provider, error: 0 - An existing connection was forcibly closed by the remote host.)
                             case 233:
                             // SQL Error Code: 64
-                            // A connection was successfully established with the server, but then an error occurred during the login process.
-                            // (provider: TCP Provider, error: 0 - The specified network name is no longer available.)
+                            // A connection was successfully established with the server, but then an error occurred during the login process. 
+                            // (provider: TCP Provider, error: 0 - The specified network name is no longer available.) 
                             case 64:
                             // DBNETLIB Error Code: 20
                             // The instance of SQL Server you attempted to connect to does not support encryption.
diff --git a/src/Umbraco.Core/Persistence/Mappers/PropertyTypeMapper.cs b/src/Umbraco.Core/Persistence/Mappers/PropertyTypeMapper.cs
index 6f22b61f9a..d44618cc96 100644
--- a/src/Umbraco.Core/Persistence/Mappers/PropertyTypeMapper.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/PropertyTypeMapper.cs
@@ -29,6 +29,7 @@ namespace Umbraco.Core.Persistence.Mappers
             DefineMap<PropertyType, PropertyTypeDto>(nameof(PropertyType.SortOrder), nameof(PropertyTypeDto.SortOrder));
             DefineMap<PropertyType, PropertyTypeDto>(nameof(PropertyType.ValidationRegExp), nameof(PropertyTypeDto.ValidationRegExp));
             DefineMap<PropertyType, PropertyTypeDto>(nameof(PropertyType.ValidationRegExpMessage), nameof(PropertyTypeDto.ValidationRegExpMessage));
+            DefineMap<PropertyType, PropertyTypeDto>(nameof(PropertyType.LabelOnTop), nameof(PropertyTypeDto.LabelOnTop));
             DefineMap<PropertyType, DataTypeDto>(nameof(PropertyType.PropertyEditorAlias), nameof(DataTypeDto.EditorAlias));
             DefineMap<PropertyType, DataTypeDto>(nameof(PropertyType.ValueStorageType), nameof(DataTypeDto.DbType));
         }
diff --git a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
index 10db1ca18e..bff682d095 100644
--- a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
+++ b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Data.SqlServerCe;
+using System.Data.SqlTypes;
 using System.Linq;
 using NPoco;
 using Umbraco.Core.Persistence.SqlSyntax;
@@ -210,7 +211,15 @@ namespace Umbraco.Core.Persistence
                             if (IncludeColumn(pocoData, columns[i]))
                             {
                                 var val = columns[i].Value.GetValue(record);
-                                updatableRecord.SetValue(i, val);
+                                if (val is byte[])
+                                {
+                                    var bytes = val as byte[];
+                                    updatableRecord.SetSqlBinary(i, new SqlBinary(bytes));
+                                }
+                                else
+                                {
+                                    updatableRecord.SetValue(i, val);
+                                }
                             }
                         }
                         resultSet.Insert(updatableRecord);
diff --git a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs
index 152dcbe6d3..c2100d97ad 100644
--- a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs
+++ b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs
@@ -27,12 +27,13 @@ namespace Umbraco.Core.Persistence
         /// The number of rows to load per page
         /// </param>
         /// <param name="sql"></param>
+        /// <param name="sqlCount">Specify a custom Sql command to get the total count, if null is specified than the auto-generated sql count will be used</param>
         /// <returns></returns>
         /// <remarks>
         /// NPoco's normal Page returns a List{T} but sometimes we don't want all that in memory and instead want to
         /// iterate over each row with a reader using Query vs Fetch.
         /// </remarks>
-        internal static IEnumerable<T> QueryPaged<T>(this IDatabase database, long pageSize, Sql sql)
+        internal static IEnumerable<T> QueryPaged<T>(this IDatabase database, long pageSize, Sql sql, Sql sqlCount)
         {
             var sqlString = sql.SQL;
             var sqlArgs = sql.Arguments;
@@ -42,12 +43,12 @@ namespace Umbraco.Core.Persistence
             do
             {
                 // Get the paged queries
-                database.BuildPageQueries<T>(pageIndex * pageSize, pageSize, sqlString, ref sqlArgs, out var sqlCount, out var sqlPage);
+                database.BuildPageQueries<T>(pageIndex * pageSize, pageSize, sqlString, ref sqlArgs, out var generatedSqlCount, out var sqlPage);
 
                 // get the item count once
                 if (itemCount == null)
                 {
-                    itemCount = database.ExecuteScalar<int>(sqlCount, sqlArgs);
+                    itemCount = database.ExecuteScalar<int>(sqlCount?.SQL ?? generatedSqlCount, sqlCount?.Arguments ?? sqlArgs);
                 }
                 pageIndex++;
 
@@ -60,6 +61,22 @@ namespace Umbraco.Core.Persistence
             } while ((pageIndex * pageSize) < itemCount);
         }
 
+        /// <summary>
+        /// Iterates over the result of a paged data set with a db reader
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="database"></param>
+        /// <param name="pageSize">
+        /// The number of rows to load per page
+        /// </param>
+        /// <param name="sql"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// NPoco's normal Page returns a List{T} but sometimes we don't want all that in memory and instead want to
+        /// iterate over each row with a reader using Query vs Fetch.
+        /// </remarks>
+        internal static IEnumerable<T> QueryPaged<T>(this IDatabase database, long pageSize, Sql sql) => database.QueryPaged<T>(pageSize, sql, null);
+
         // NOTE
         //
         // proper way to do it with TSQL and SQLCE
diff --git a/src/Umbraco.Core/Persistence/PocoDataDataReader.cs b/src/Umbraco.Core/Persistence/PocoDataDataReader.cs
index 1d7d301b87..460a4d3d90 100644
--- a/src/Umbraco.Core/Persistence/PocoDataDataReader.cs
+++ b/src/Umbraco.Core/Persistence/PocoDataDataReader.cs
@@ -79,6 +79,9 @@ namespace Umbraco.Core.Persistence
                         case SpecialDbTypes.NCHAR:
                             sqlDbType = SqlDbType.NChar;
                             break;
+                        case SpecialDbTypes.NVARCHARMAX:
+                            sqlDbType = SqlDbType.NVarChar;
+                            break;
                         default:
                             throw new ArgumentOutOfRangeException();
                     }
diff --git a/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs b/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
index d04930fa92..388286a79b 100644
--- a/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
+++ b/src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
@@ -328,8 +328,11 @@ namespace Umbraco.Core.Persistence.Querying
             {
                 case ExpressionType.MemberAccess:
                     // false property , i.e. x => !Trashed
-                    SqlParameters.Add(true);
-                    return Visited ? string.Empty : $"NOT ({o} = @{SqlParameters.Count - 1})";
+                    // BUT we don't want to do a NOT SQL statement since this generally results in indexes not being used
+                    // so we want to do an == false
+                    SqlParameters.Add(false);
+                    return Visited ? string.Empty : $"{o} = @{SqlParameters.Count - 1}";
+                    //return Visited ? string.Empty : $"NOT ({o} = @{SqlParameters.Count - 1})";
                 default:
                     // could be anything else, such as: x => !x.Path.StartsWith("-20")
                     return Visited ? string.Empty : string.Concat("NOT (", o, ")");
@@ -744,7 +747,9 @@ namespace Umbraco.Core.Persistence.Querying
 
             var c = exp[0];
             return (c == '"' || c == '`' || c == '\'') && exp[exp.Length - 1] == c
-                ? exp.Substring(1, exp.Length - 2)
+                ? exp.Length == 1
+                    ? string.Empty
+                    : exp.Substring(1, exp.Length - 2)
                 : exp;
         }
     }
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
index fc5382499f..0971b2047a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
@@ -12,6 +12,11 @@ namespace Umbraco.Core.Persistence.Repositories
         /// </summary>
         void ClearSchedule(DateTime date);
 
+        void ClearSchedule(DateTime date, ContentScheduleAction action);
+
+        bool HasContentForExpiration(DateTime date);
+        bool HasContentForRelease(DateTime date);
+
         /// <summary>
         /// Gets <see cref="IContent"/> objects having an expiration date before (lower than, or equal to) a specified date.
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs
index 6d145e9961..a5a93449d3 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Microsoft.AspNet.Identity;
 using Umbraco.Core.Models.Identity;
 
@@ -6,7 +7,9 @@ namespace Umbraco.Core.Persistence.Repositories
 {
     public interface IExternalLoginRepository : IReadWriteQueryRepository<int, IIdentityUserLogin>
     {
+        [Obsolete("Use the overload specifying IIdentityUserLoginExtended instead")]
         void SaveUserLogins(int memberId, IEnumerable<UserLoginInfo> logins);
+        void Save(int userId, IEnumerable<IExternalLogin> logins);
         void DeleteUserLogins(int memberId);
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/IMemberGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMemberGroupRepository.cs
index 9c75c051bd..d63b1bb9db 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IMemberGroupRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IMemberGroupRepository.cs
@@ -1,10 +1,18 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
     public interface IMemberGroupRepository : IReadWriteQueryRepository<int, IMemberGroup>
     {
+        /// <summary>
+        /// Gets a member group by it's uniqueId
+        /// </summary>
+        /// <param name="uniqueId"></param>
+        /// <returns></returns>
+        IMemberGroup Get(Guid uniqueId);
+
         /// <summary>
         /// Gets a member group by it's name
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/IMemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMemberRepository.cs
index 245c024356..c737c2bf66 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IMemberRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IMemberRepository.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Querying;
 
@@ -6,6 +7,8 @@ namespace Umbraco.Core.Persistence.Repositories
 {
     public interface IMemberRepository : IContentRepository<int, IMember>
     {
+        IMember GetByUsername(string username);
+
         /// <summary>
         /// Finds members in a given role
         /// </summary>
@@ -35,5 +38,17 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <param name="query"></param>
         /// <returns></returns>
         int GetCountByQuery(IQuery<IMember> query);
+
+        /// <summary>
+        /// Sets a members last login date based on their username
+        /// </summary>
+        /// <param name="username"></param>
+        /// <param name="date"></param>
+        /// <remarks>
+        /// This is a specialized method because whenever a member logs in, the membership provider requires us to set the 'online' which requires
+        /// updating their login date. This operation must be fast and cannot use database locks which is fine if we are only executing a single query
+        /// for this data since there won't be any other data contention issues.
+        /// </remarks>
+        void SetLastLogin(string username, DateTime date);
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs
index d05f4e007c..36f885520d 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs
@@ -10,72 +10,80 @@ namespace Umbraco.Core.Persistence.Repositories
     public interface IRedirectUrlRepository : IReadWriteQueryRepository<Guid, IRedirectUrl>
     {
         /// <summary>
-        /// Gets a redirect url.
+        /// Gets a redirect URL.
         /// </summary>
-        /// <param name="url">The Umbraco redirect url route.</param>
+        /// <param name="url">The Umbraco redirect URL route.</param>
         /// <param name="contentKey">The content unique key.</param>
         /// <param name="culture">The culture.</param>
         /// <returns></returns>
         IRedirectUrl Get(string url, Guid contentKey, string culture);
 
         /// <summary>
-        /// Deletes a redirect url.
+        /// Deletes a redirect URL.
         /// </summary>
-        /// <param name="id">The redirect url identifier.</param>
+        /// <param name="id">The redirect URL identifier.</param>
         void Delete(Guid id);
 
         /// <summary>
-        /// Deletes all redirect urls.
+        /// Deletes all redirect URLs.
         /// </summary>
         void DeleteAll();
 
         /// <summary>
-        /// Deletes all redirect urls for a given content.
+        /// Deletes all redirect URLs for a given content.
         /// </summary>
         /// <param name="contentKey">The content unique key.</param>
         void DeleteContentUrls(Guid contentKey);
 
         /// <summary>
-        /// Gets the most recent redirect url corresponding to an Umbraco redirect url route.
+        /// Gets the most recent redirect URL corresponding to an Umbraco redirect URL route.
         /// </summary>
-        /// <param name="url">The Umbraco redirect url route.</param>
-        /// <returns>The most recent redirect url corresponding to the route.</returns>
+        /// <param name="url">The Umbraco redirect URL route.</param>
+        /// <returns>The most recent redirect URL corresponding to the route.</returns>
         IRedirectUrl GetMostRecentUrl(string url);
 
         /// <summary>
-        /// Gets all redirect urls for a content item.
+        /// Gets the most recent redirect URL corresponding to an Umbraco redirect URL route.
+        /// </summary>
+        /// <param name="url">The Umbraco redirect URL route.</param>
+        /// <param name="culture">The culture the domain is associated with</param>
+        /// <returns>The most recent redirect URL corresponding to the route.</returns>
+        IRedirectUrl GetMostRecentUrl(string url, string culture);
+
+        /// <summary>
+        /// Gets all redirect URLs for a content item.
         /// </summary>
         /// <param name="contentKey">The content unique key.</param>
-        /// <returns>All redirect urls for the content item.</returns>
+        /// <returns>All redirect URLs for the content item.</returns>
         IEnumerable<IRedirectUrl> GetContentUrls(Guid contentKey);
 
         /// <summary>
-        /// Gets all redirect urls.
+        /// Gets all redirect URLs.
         /// </summary>
         /// <param name="pageIndex">The page index.</param>
         /// <param name="pageSize">The page size.</param>
-        /// <param name="total">The total count of redirect urls.</param>
-        /// <returns>The redirect urls.</returns>
+        /// <param name="total">The total count of redirect URLs.</param>
+        /// <returns>The redirect URLs.</returns>
         IEnumerable<IRedirectUrl> GetAllUrls(long pageIndex, int pageSize, out long total);
 
         /// <summary>
-        /// Gets all redirect urls below a given content item.
+        /// Gets all redirect URLs below a given content item.
         /// </summary>
         /// <param name="rootContentId">The content unique identifier.</param>
         /// <param name="pageIndex">The page index.</param>
         /// <param name="pageSize">The page size.</param>
-        /// <param name="total">The total count of redirect urls.</param>
-        /// <returns>The redirect urls.</returns>
+        /// <param name="total">The total count of redirect URLs.</param>
+        /// <returns>The redirect URLs.</returns>
         IEnumerable<IRedirectUrl> GetAllUrls(int rootContentId, long pageIndex, int pageSize, out long total);
 
         /// <summary>
-        /// Searches for all redirect urls that contain a given search term in their URL property.
+        /// Searches for all redirect URLs that contain a given search term in their URL property.
         /// </summary>
         /// <param name="searchTerm">The term to search for.</param>
         /// <param name="pageIndex">The page index.</param>
         /// <param name="pageSize">The page size.</param>
-        /// <param name="total">The total count of redirect urls.</param>
-        /// <returns>The redirect urls.</returns>
+        /// <param name="total">The total count of redirect URLs.</param>
+        /// <returns>The redirect URLs.</returns>
         IEnumerable<IRedirectUrl> SearchUrls(string searchTerm, long pageIndex, int pageSize, out long total);
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
index d56724db9f..1aabb51d6c 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
@@ -514,7 +514,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 currentParentIds.Add(node.NodeId);
 
                 // paths parts without the roots
-                var pathParts = node.Path.Split(',').Where(x => !rootIds.Contains(int.Parse(x))).ToArray();
+                var pathParts = node.Path.Split(Constants.CharArrays.Comma).Where(x => !rootIds.Contains(int.Parse(x))).ToArray();
 
                 if (!prevParentIds.Contains(node.ParentId))
                 {
@@ -897,7 +897,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             var template = SqlContext.Templates.Get(Constants.SqlTemplates.VersionableRepository.EnsureUniqueNodeName, tsql => tsql
                 .Select<NodeDto>(x => Alias(x.NodeId, "id"), x => Alias(x.Text, "name"))
                 .From<NodeDto>()
-                .Where<NodeDto>(x => x.NodeObjectType == SqlTemplate.Arg<Guid>("nodeObjectType") && x.ParentId == SqlTemplate.Arg<int>("parentId")));
+                .Where<NodeDto>(x => x.NodeObjectType == SqlTemplate.Arg<Guid>("nodeObjectType") && x.ParentId == SqlTemplate.Arg<int>("parentId"))
+            );
 
             var sql = template.Sql(NodeObjectTypeId, parentId);
             var names = Database.Fetch<SimilarNodeName>(sql);
@@ -907,28 +908,43 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected virtual int GetNewChildSortOrder(int parentId, int first)
         {
-            var template = SqlContext.Templates.Get(Constants.SqlTemplates.VersionableRepository.GetSortOrder, tsql =>
-                tsql.Select($"COALESCE(MAX(sortOrder),{first - 1})").From<NodeDto>().Where<NodeDto>(x => x.ParentId == SqlTemplate.Arg<int>("parentId") && x.NodeObjectType == NodeObjectTypeId)
+            var template = SqlContext.Templates.Get(Constants.SqlTemplates.VersionableRepository.GetSortOrder, tsql => tsql
+                .Select("MAX(sortOrder)")
+                .From<NodeDto>()
+                .Where<NodeDto>(x => x.NodeObjectType == SqlTemplate.Arg<Guid>("nodeObjectType") && x.ParentId == SqlTemplate.Arg<int>("parentId"))
             );
 
-            return Database.ExecuteScalar<int>(template.Sql(new { parentId })) + 1;
+            var sql = template.Sql(NodeObjectTypeId, parentId);
+            var sortOrder = Database.ExecuteScalar<int?>(sql);
+
+            return (sortOrder + 1) ?? first;
         }
 
         protected virtual NodeDto GetParentNodeDto(int parentId)
         {
-            var template = SqlContext.Templates.Get(Constants.SqlTemplates.VersionableRepository.GetParentNode, tsql =>
-                tsql.Select<NodeDto>().From<NodeDto>().Where<NodeDto>(x => x.NodeId == SqlTemplate.Arg<int>("parentId"))
+            var template = SqlContext.Templates.Get(Constants.SqlTemplates.VersionableRepository.GetParentNode, tsql => tsql
+                .Select<NodeDto>()
+                .From<NodeDto>()
+                .Where<NodeDto>(x => x.NodeId == SqlTemplate.Arg<int>("parentId"))
             );
 
-            return Database.Fetch<NodeDto>(template.Sql(parentId)).First();
+            var sql = template.Sql(parentId);
+            var nodeDto = Database.First<NodeDto>(sql);
+
+            return nodeDto;
         }
 
         protected virtual int GetReservedId(Guid uniqueId)
         {
-            var template = SqlContext.Templates.Get(Constants.SqlTemplates.VersionableRepository.GetReservedId, tsql =>
-                tsql.Select<NodeDto>(x => x.NodeId).From<NodeDto>().Where<NodeDto>(x => x.UniqueId == SqlTemplate.Arg<Guid>("uniqueId") && x.NodeObjectType == Constants.ObjectTypes.IdReservation)
+            var template = SqlContext.Templates.Get(Constants.SqlTemplates.VersionableRepository.GetReservedId, tsql => tsql
+                .Select<NodeDto>(x => x.NodeId)
+                .From<NodeDto>()
+                .Where<NodeDto>(x => x.UniqueId == SqlTemplate.Arg<Guid>("uniqueId") && x.NodeObjectType == Constants.ObjectTypes.IdReservation)
             );
-            var id = Database.ExecuteScalar<int?>(template.Sql(new { uniqueId = uniqueId }));
+
+            var sql = template.Sql(new { uniqueId });
+            var id = Database.ExecuteScalar<int?>(sql);
+
             return id ?? 0;
         }
 
@@ -987,6 +1003,81 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         }
 
+        /// <summary>
+        /// Inserts property values for the content entity
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="publishedVersionId"></param>
+        /// <param name="edited"></param>
+        /// <param name="editedCultures"></param>
+        /// <remarks>
+        /// Used when creating a new entity
+        /// </remarks>
+        protected void InsertPropertyValues(TEntity entity, int publishedVersionId, out bool edited, out HashSet<string> editedCultures)
+        {
+            // persist the property data
+            var propertyDataDtos = PropertyFactory.BuildDtos(entity.ContentType.Variations, entity.VersionId, publishedVersionId, entity.Properties, LanguageRepository, out edited, out editedCultures);
+            foreach (var propertyDataDto in propertyDataDtos)
+            {
+                Database.Insert(propertyDataDto);
+            }
+            // TODO: we can speed this up: Use BulkInsert and then do one SELECT to re-retrieve the property data inserted with assigned IDs.
+            // This is a perfect thing to benchmark with Benchmark.NET to compare perf between Nuget releases.
+        }
+
+        /// <summary>
+        /// Used to atomically replace the property values for the entity version specified
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="versionId"></param>
+        /// <param name="publishedVersionId"></param>
+        /// <param name="edited"></param>
+        /// <param name="editedCultures"></param>
+
+        protected void ReplacePropertyValues(TEntity entity, int versionId, int publishedVersionId, out bool edited, out HashSet<string> editedCultures)
+        {
+            // Replace the property data.
+            // Lookup the data to update with a UPDLOCK (using ForUpdate()) this is because we need to be atomic
+            // and handle DB concurrency. Doing a clear and then re-insert is prone to concurrency issues.
+
+            var propDataSql = SqlContext.Sql().Select("*").From<PropertyDataDto>().Where<PropertyDataDto>(x => x.VersionId == versionId).ForUpdate();
+            var existingPropData = Database.Fetch<PropertyDataDto>(propDataSql);
+            var propertyTypeToPropertyData = new Dictionary<(int propertyTypeId, int versionId, int? languageId, string segment), PropertyDataDto>();
+            var existingPropDataIds = new List<int>();
+            foreach (var p in existingPropData)
+            {
+                existingPropDataIds.Add(p.Id);
+                propertyTypeToPropertyData[(p.PropertyTypeId, p.VersionId, p.LanguageId, p.Segment)] = p;
+            }
+            var propertyDataDtos = PropertyFactory.BuildDtos(entity.ContentType.Variations, entity.VersionId, publishedVersionId, entity.Properties, LanguageRepository, out edited, out editedCultures);
+
+            foreach (var propertyDataDto in propertyDataDtos)
+            {
+
+                // Check if this already exists and update, else insert a new one
+                if (propertyTypeToPropertyData.TryGetValue((propertyDataDto.PropertyTypeId, propertyDataDto.VersionId, propertyDataDto.LanguageId, propertyDataDto.Segment), out var propData))
+                {
+                    propertyDataDto.Id = propData.Id;
+                    Database.Update(propertyDataDto);
+                }
+                else
+                {
+                    // TODO: we can speed this up: Use BulkInsert and then do one SELECT to re-retrieve the property data inserted with assigned IDs.
+                    // This is a perfect thing to benchmark with Benchmark.NET to compare perf between Nuget releases.
+                    Database.Insert(propertyDataDto);
+                }
+
+                // track which ones have been processed
+                existingPropDataIds.Remove(propertyDataDto.Id);
+            }
+            // For any remaining that haven't been processed they need to be deleted
+            if (existingPropDataIds.Count > 0)
+            {
+                Database.Execute(SqlContext.Sql().Delete<PropertyDataDto>().WhereIn<PropertyDataDto>(x => x.Id, existingPropDataIds));
+            }
+
+        }
+
         private class NodeIdKey
         {
             [Column("id")]
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
index 7781e2e38a..90774e4c0b 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
@@ -303,7 +303,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 SortOrder = dto.SortOrder,
                 ValidationRegExp = dto.ValidationRegExp,
                 ValidationRegExpMessage = dto.ValidationRegExpMessage,
-                Variations = (ContentVariation)dto.Variations
+                Variations = (ContentVariation)dto.Variations,
+                LabelOnTop = dto.LabelOnTop
             };
         }
     }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
index 359b967dab..483f2393af 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
@@ -134,7 +134,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             if (objectTypes.Any())
             {
-                sql = sql.Where("umbracoNode.nodeObjectType IN (@objectTypes)", objectTypes);
+                sql = sql.Where("umbracoNode.nodeObjectType IN (@objectTypes)", new { objectTypes = objectTypes });
             }
 
             return Database.Fetch<string>(sql);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index 357798a8a9..ed0c288691 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -448,8 +448,14 @@ AND umbracoNode.id <> @id",
                     // The composed property is only considered segment variant when the base content type is also segment variant.
                     // Example: Culture variant content type with a Culture+Segment variant property type will become ContentVariation.Culture
                     var target = newContentTypeVariation & composedPropertyType.Variations;
+                    // Determine the previous variation
+                    // We have to compare with the old content type variation because the composed property might already have changed
+                    // Example: A property with variations in an element type with variations is used in a document without
+                    //          when you enable variations the property has already enabled variations from the element type,
+                    //          but it's still a change from nothing because the document did not have variations, but it does now.
+                    var from = oldContentTypeVariation & composedPropertyType.Variations;
 
-                    propertyTypeVariationChanges[composedPropertyType.Id] = (composedPropertyType.Variations, target);
+                    propertyTypeVariationChanges[composedPropertyType.Id] = (from, target);
                 }
             }
 
@@ -1184,7 +1190,7 @@ AND umbracoNode.id <> @id",
         {
             // first clear dependencies
             Database.Delete<TagRelationshipDto>("WHERE propertyTypeId = @Id", new { Id = propertyTypeId });
-            Database.Delete<PropertyDataDto>("WHERE propertytypeid = @Id", new { Id = propertyTypeId });
+            Database.Delete<PropertyDataDto>("WHERE propertyTypeId = @Id", new { Id = propertyTypeId });
 
             // then delete the property type
             Database.Delete<PropertyTypeDto>("WHERE contentTypeId = @Id AND id = @PropertyTypeId",
@@ -1312,7 +1318,7 @@ WHERE cmsContentType." + aliasColumn + @" LIKE @pattern",
         /// <inheritdoc />
         public bool HasContainerInPath(string contentPath)
         {
-            var ids = contentPath.Split(',').Select(int.Parse).ToArray();
+            var ids = contentPath.Split(Constants.CharArrays.Comma).Select(int.Parse).ToArray();
             return HasContainerInPath(ids);
         }
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs
index 9ccf6e9623..cba030e17a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeRepository.cs
@@ -303,7 +303,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         private string EnsureUniqueNodeName(string nodeName, int id = 0)
         {
-            var template = SqlContext.Templates.Get("Umbraco.Core.DataTypeDefinitionRepository.EnsureUniqueNodeName", tsql => tsql
+            var template = SqlContext.Templates.Get(Constants.SqlTemplates.DataTypeRepository.EnsureUniqueNodeName, tsql => tsql
                 .Select<NodeDto>(x => Alias(x.NodeId, "id"), x => Alias(x.Text, "name"))
                 .From<NodeDto>()
                 .Where<NodeDto>(x => x.NodeObjectType == SqlTemplate.Arg<Guid>("nodeObjectType")));
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index db1e2b350d..09d41a49a0 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -610,17 +610,11 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                     Database.Insert(documentVersionDto);
                 }
 
-                // replace the property data (rather than updating)
+            // replace the property data (rather than updating)
                 // only need to delete for the version that existed, the new version (if any) has no property data yet
-                var versionToDelete = publishing ? entity.PublishedVersionId : entity.VersionId;
-                var deletePropertyDataSql = Sql().Delete<PropertyDataDto>().Where<PropertyDataDto>(x => x.VersionId == versionToDelete);
-                Database.Execute(deletePropertyDataSql);
-
-                // insert property data
-                var propertyDataDtos = PropertyFactory.BuildDtos(entity.ContentType.Variations, entity.VersionId, publishing ? entity.PublishedVersionId : 0,
-                    entity.Properties, LanguageRepository, out var edited, out var editedCultures);
-                foreach (var propertyDataDto in propertyDataDtos)
-                    Database.Insert(propertyDataDto);
+            var versionToDelete = publishing ? entity.PublishedVersionId : entity.VersionId;
+            // insert property data
+            ReplacePropertyValues(entity, versionToDelete, publishing ? entity.PublishedVersionId : 0, out var edited, out var editedCultures);
 
                 // if !publishing, we may have a new name != current publish name,
                 // also impacts 'edited'
@@ -900,7 +894,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             if (content.ParentId == -1)
                 return content.Published;
 
-            var ids = content.Path.Split(',').Skip(1).Select(int.Parse);
+            var ids = content.Path.Split(Constants.CharArrays.Comma).Skip(1).Select(int.Parse);
 
             var sql = SqlContext.Sql()
                 .SelectCount<NodeDto>(x => x.NodeId)
@@ -1017,6 +1011,37 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             Database.Execute(sql);
         }
 
+        /// <inheritdoc />
+        public void ClearSchedule(DateTime date, ContentScheduleAction action)
+        {
+            var a = action.ToString();
+            var sql = Sql().Delete<ContentScheduleDto>().Where<ContentScheduleDto>(x => x.Date <= date && x.Action == a);
+            Database.Execute(sql);
+        }
+
+        private Sql GetSqlForHasScheduling(ContentScheduleAction action, DateTime date)
+        {
+            var template = SqlContext.Templates.Get("Umbraco.Core.DocumentRepository.GetSqlForHasScheduling", tsql => tsql
+                .SelectCount()
+                    .From<ContentScheduleDto>()
+                    .Where<ContentScheduleDto>(x => x.Action == SqlTemplate.Arg<string>("action") && x.Date <= SqlTemplate.Arg<DateTime>("date")));
+
+            var sql = template.Sql(action.ToString(), date);
+            return sql;
+        }
+
+        public bool HasContentForExpiration(DateTime date)
+        {
+            var sql = GetSqlForHasScheduling(ContentScheduleAction.Expire, date);
+            return Database.ExecuteScalar<int>(sql) > 0;
+        }
+
+        public bool HasContentForRelease(DateTime date)
+        {
+            var sql = GetSqlForHasScheduling(ContentScheduleAction.Release, date);
+            return Database.ExecuteScalar<int>(sql) > 0;
+        }
+
         /// <inheritdoc />
         public IEnumerable<IContent> GetContentForRelease(DateTime date)
         {
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
index 24040bf393..a7502a338a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
@@ -369,7 +369,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
                 if (isContent || isMedia || isMember)
                     sql
-                        .AndSelect<ContentVersionDto>(x => Alias(x.Id, "versionId"))
+                        .AndSelect<ContentVersionDto>(x => Alias(x.Id, "versionId"), x=>x.VersionDate)
                         .AndSelect<ContentTypeDto>(x => x.Alias, x => x.Icon, x => x.Thumbnail, x => x.IsContainer, x => x.Variations);
 
                 if (isContent)
@@ -490,7 +490,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             if (isContent || isMedia || isMember)
                 sql
-                    .AndBy<ContentVersionDto>(x => x.Id)
+                    .AndBy<ContentVersionDto>(x => x.Id, x => x.VersionDate)
                     .AndBy<ContentTypeDto>(x => x.Alias, x => x.Icon, x => x.Thumbnail, x => x.IsContainer, x => x.Variations);
 
             if (defaultSort)
@@ -594,6 +594,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             public string Text { get; set; }
             public Guid NodeObjectType { get; set; }
             public DateTime CreateDate { get; set; }
+            public DateTime VersionDate { get; set; }
             public int Children { get; set; }
             public int VersionId { get; set; }
             public string Alias { get; set; }
@@ -627,6 +628,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         {
             entity.Trashed = dto.Trashed;
             entity.CreateDate = dto.CreateDate;
+            entity.UpdateDate = dto.VersionDate;
             entity.CreatorId = dto.UserId ?? Constants.Security.UnknownUserId;
             entity.Id = dto.NodeId;
             entity.Key = dto.UniqueId;
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs
index f708590ea8..ad53a2d522 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs
@@ -22,25 +22,65 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         public void DeleteUserLogins(int memberId)
         {
-            Database.Execute("DELETE FROM ExternalLogins WHERE UserId=@userId", new { userId = memberId });
+            Database.Delete<ExternalLoginDto>("WHERE userId=@userId", new { userId = memberId });
+        }
+
+        public void Save(int userId, IEnumerable<IExternalLogin> logins)
+        {
+            var sql = Sql()
+                .Select<ExternalLoginDto>()
+                .From<ExternalLoginDto>()
+                .Where<ExternalLoginDto>(x => x.UserId == userId)
+                .ForUpdate();
+
+            // deduplicate the logins
+            logins = logins.DistinctBy(x => x.ProviderKey + x.LoginProvider).ToList();
+
+            var toUpdate = new Dictionary<int, IExternalLogin>();
+            var toDelete = new List<int>();
+            var toInsert = new List<IExternalLogin>(logins);
+
+            var existingLogins = Database.Query<ExternalLoginDto>(sql).OrderByDescending(x => x.CreateDate).ToList();
+            // used to track duplicates so they can be removed
+            var keys = new HashSet<(string, string)>();
+            
+            foreach (var existing in existingLogins)
+            {
+                if (!keys.Add((existing.ProviderKey, existing.LoginProvider)))
+                {
+                    // if it already exists we need to remove this one
+                    toDelete.Add(existing.Id);
+                }
+                else
+                {
+                    var found = logins.FirstOrDefault(x =>
+                    x.LoginProvider.Equals(existing.LoginProvider, StringComparison.InvariantCultureIgnoreCase)
+                    && x.ProviderKey.Equals(existing.ProviderKey, StringComparison.InvariantCultureIgnoreCase));
+
+                    if (found != null)
+                    {
+                        toUpdate.Add(existing.Id, found);
+                        // if it's an update then it's not an insert
+                        toInsert.RemoveAll(x => x.ProviderKey == found.ProviderKey && x.LoginProvider == found.LoginProvider);
+                    }
+                    else
+                    {
+                        toDelete.Add(existing.Id);
+                    }
+                }
+            }
+
+            // do the deletes, updates and inserts
+            if (toDelete.Count > 0)
+                Database.DeleteMany<ExternalLoginDto>().Where(x => toDelete.Contains(x.Id)).Execute();
+            foreach (var u in toUpdate)
+                Database.Update(ExternalLoginFactory.BuildDto(userId, u.Value, u.Key));
+            Database.InsertBulk(toInsert.Select(i => ExternalLoginFactory.BuildDto(userId, i)));
         }
 
         public void SaveUserLogins(int memberId, IEnumerable<UserLoginInfo> logins)
         {
-            //clear out logins for member
-            Database.Execute("DELETE FROM umbracoExternalLogin WHERE userId=@userId", new { userId = memberId });
-
-            //add them all
-            foreach (var l in logins)
-            {
-                Database.Insert(new ExternalLoginDto
-                {
-                    LoginProvider = l.LoginProvider,
-                    ProviderKey = l.ProviderKey,
-                    UserId = memberId,
-                    CreateDate = DateTime.Now
-                });
-            }
+            Save(memberId, logins.Select(x => new ExternalLogin(x.LoginProvider, x.ProviderKey)));
         }
 
         protected override IIdentityUserLogin PerformGet(int id)
@@ -67,7 +107,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 return PerformGetAllOnIds(ids);
             }
 
-            var sql = GetBaseQuery(false);
+            var sql = GetBaseQuery(false).OrderByDescending<ExternalLoginDto>(x => x.CreateDate);
 
             return ConvertFromDtos(Database.Fetch<ExternalLoginDto>(sql))
                 .ToArray();// we don't want to re-iterate again!
@@ -103,7 +143,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             foreach (var dto in dtos)
             {
-                yield return Get(dto.Id);
+                yield return ExternalLoginFactory.BuildEntity(dto);
             }
         }
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
index 242f21c749..02bef366cb 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
@@ -186,7 +186,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             const string pattern = ".*[_][0-9]+[x][0-9]+[.].*";
             var isResized = Regex.IsMatch(mediaPath, pattern);
 
-            // If the image has been resized we strip the "_403x328" of the original "/media/1024/koala_403x328.jpg" url.
+            // If the image has been resized we strip the "_403x328" of the original "/media/1024/koala_403x328.jpg" URL.
             if (isResized)
             {
                 var underscoreIndex = mediaPath.LastIndexOf('_');
@@ -281,9 +281,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             Database.Insert(mediaVersionDto);
 
             // persist the property data
-            var propertyDataDtos = PropertyFactory.BuildDtos(entity.ContentType.Variations, entity.VersionId, 0, entity.Properties, LanguageRepository, out _, out _);
-            foreach (var propertyDataDto in propertyDataDtos)
-                Database.Insert(propertyDataDto);
+            InsertPropertyValues(entity, 0, out _, out _);
 
             // set tags
             SetEntityTags(entity, _tagRepository);
@@ -346,11 +344,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 Database.Update(mediaVersionDto);
 
                 // replace the property data
-                var deletePropertyDataSql = SqlContext.Sql().Delete<PropertyDataDto>().Where<PropertyDataDto>(x => x.VersionId == entity.VersionId);
-                Database.Execute(deletePropertyDataSql);
-                var propertyDataDtos = PropertyFactory.BuildDtos(entity.ContentType.Variations, entity.VersionId, 0, entity.Properties, LanguageRepository, out _, out _);
-                foreach (var propertyDataDto in propertyDataDtos)
-                    Database.Insert(propertyDataDto);
+                ReplacePropertyValues(entity, entity.VersionId, 0, out _, out _);
 
                 SetEntityTags(entity, _tagRepository);
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
index c138550de5..edd6dc0ebb 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override string GetBaseWhereClause()
         {
-            return "umbracoNode.id = @id";
+            return $"{Constants.DatabaseSchema.Tables.Node}.id = @id";
         }
 
         protected override IEnumerable<string> GetDeleteClauses()
@@ -115,6 +115,16 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             entity.ResetDirtyProperties();
         }
 
+        public IMemberGroup Get(Guid uniqueId)
+        {
+            var sql = GetBaseQuery(false);
+            sql.Where("umbracoNode.uniqueId = @uniqueId", new { uniqueId });
+
+            var dto = Database.Fetch<NodeDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
+
+            return dto == null ? null : MemberGroupFactory.BuildEntity(dto);
+        }
+
         public IMemberGroup GetByName(string name)
         {
             return IsolatedCache.GetCacheItem<IMemberGroup>(
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
index 42e7d1c32f..78dbbe317a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
@@ -25,6 +25,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         private readonly IMemberTypeRepository _memberTypeRepository;
         private readonly ITagRepository _tagRepository;
         private readonly IMemberGroupRepository _memberGroupRepository;
+        private readonly IRepositoryCachePolicy<IMember, string> _memberByUsernameCachePolicy;
 
         public MemberRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger,
             IMemberTypeRepository memberTypeRepository, IMemberGroupRepository memberGroupRepository, ITagRepository tagRepository, ILanguageRepository languageRepository, IRelationRepository relationRepository, IRelationTypeRepository relationTypeRepository,
@@ -34,6 +35,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             _memberTypeRepository = memberTypeRepository ?? throw new ArgumentNullException(nameof(memberTypeRepository));
             _tagRepository = tagRepository ?? throw new ArgumentNullException(nameof(tagRepository));
             _memberGroupRepository = memberGroupRepository;
+
+            _memberByUsernameCachePolicy = new DefaultRepositoryCachePolicy<IMember, string>(GlobalIsolatedCache, ScopeAccessor, DefaultOptions);
         }
 
         protected override MemberRepository This => this;
@@ -242,8 +245,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             }
             entity.AddingEntity();
 
-            var member = (Member) entity;
-
             // ensure that strings don't contain characters that are invalid in xml
             // TODO: do we really want to keep doing this here?
             entity.SanitizeEntityPropertiesForXmlStorage();
@@ -301,7 +302,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             contentVersionDto.NodeId = nodeDto.NodeId;
             contentVersionDto.Current = true;
             Database.Insert(contentVersionDto);
-            member.VersionId = contentVersionDto.Id;
+            entity.VersionId = contentVersionDto.Id;
 
             // persist the member dto
             dto.NodeId = nodeDto.NodeId;
@@ -318,9 +319,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             Database.Insert(dto);
 
             // persist the property data
-            var propertyDataDtos = PropertyFactory.BuildDtos(member.ContentType.Variations, member.VersionId, 0, entity.Properties, LanguageRepository, out _, out _);
-            foreach (var propertyDataDto in propertyDataDtos)
-                Database.Insert(propertyDataDto);
+            InsertPropertyValues(entity, 0, out _, out _);
 
             SetEntityTags(entity, _tagRepository);
 
@@ -332,11 +331,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         }
 
         protected override void PersistUpdatedItem(IMember entity)
-        {
-            var member = (Member) entity;
-
+        {   
             // update
-            member.UpdatingEntity();
+            entity.UpdatingEntity();
 
             // ensure that strings don't contain characters that are invalid in xml
             // TODO: do we really want to keep doing this here?
@@ -382,12 +379,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             if (changedCols.Count > 0)
                 Database.Update(dto, changedCols);
 
-            // replace the property data
-            var deletePropertyDataSql = SqlContext.Sql().Delete<PropertyDataDto>().Where<PropertyDataDto>(x => x.VersionId == member.VersionId);
-            Database.Execute(deletePropertyDataSql);
-            var propertyDataDtos = PropertyFactory.BuildDtos(member.ContentType.Variations, member.VersionId, 0, entity.Properties, LanguageRepository, out _, out _);
-            foreach (var propertyDataDto in propertyDataDtos)
-                Database.Insert(propertyDataDto);
+            ReplacePropertyValues(entity, entity.VersionId, 0, out _, out _);
 
             SetEntityTags(entity, _tagRepository);
 
@@ -505,6 +497,56 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             return Database.ExecuteScalar<int>(fullSql);
         }
 
+        /// <inheritdoc />
+        public void SetLastLogin(string username, DateTime date)
+        {
+            // Important - these queries are designed to execute without an exclusive WriteLock taken in our distributed lock
+            // table. However due to the data that we are updating which relies on version data we cannot update this data
+            // without taking some locks, otherwise we'll end up with strange situations because when a member is updated, that operation
+            // deletes and re-inserts all property data. So if there are concurrent transactions, one deleting and re-inserting and another trying
+            // to update there can be problems. This is only an issue for cmsPropertyData, not umbracoContentVersion because that table just
+            // maintains a single row and it isn't deleted/re-inserted.
+            // So the important part here is the ForUpdate() call on the select to fetch the property data to update.
+
+            // Update the cms property value for the member
+
+            var sqlSelectTemplateProperty = SqlContext.Templates.Get("Umbraco.Core.MemberRepository.SetLastLogin1", s => s
+                .Select<PropertyDataDto>(x => x.Id)
+                .From<PropertyDataDto>()
+                .InnerJoin<PropertyTypeDto>().On<PropertyTypeDto, PropertyDataDto>((l, r) => l.Id == r.PropertyTypeId)
+                .InnerJoin<ContentVersionDto>().On<ContentVersionDto, PropertyDataDto>((l, r) => l.Id == r.VersionId)
+                .InnerJoin<NodeDto>().On<NodeDto, ContentVersionDto>((l, r) => l.NodeId == r.NodeId)
+                .InnerJoin<MemberDto>().On<MemberDto, NodeDto>((l, r) => l.NodeId == r.NodeId)
+                .Where<NodeDto>(x => x.NodeObjectType == SqlTemplate.Arg<Guid>("nodeObjectType"))
+                .Where<PropertyTypeDto>(x => x.Alias == SqlTemplate.Arg<string>("propertyTypeAlias"))
+                .Where<MemberDto>(x => x.LoginName == SqlTemplate.Arg<string>("username"))
+                .ForUpdate());
+            var sqlSelectProperty = sqlSelectTemplateProperty.Sql(Constants.ObjectTypes.Member, Constants.Conventions.Member.LastLoginDate, username);
+
+            var update = Sql()
+                .Update<PropertyDataDto>(u => u
+                    .Set(x => x.DateValue, date))
+                .WhereIn<PropertyDataDto>(x => x.Id, sqlSelectProperty);
+
+            Database.Execute(update);
+
+            // Update the umbracoContentVersion value for the member
+
+            var sqlSelectTemplateVersion = SqlContext.Templates.Get("Umbraco.Core.MemberRepository.SetLastLogin2", s => s
+               .Select<ContentVersionDto>(x => x.Id)
+               .From<ContentVersionDto>()               
+               .InnerJoin<NodeDto>().On<NodeDto, ContentVersionDto>((l, r) => l.NodeId == r.NodeId)
+               .InnerJoin<MemberDto>().On<MemberDto, NodeDto>((l, r) => l.NodeId == r.NodeId)
+               .Where<NodeDto>(x => x.NodeObjectType == SqlTemplate.Arg<Guid>("nodeObjectType"))
+               .Where<MemberDto>(x => x.LoginName == SqlTemplate.Arg<string>("username")));
+            var sqlSelectVersion = sqlSelectTemplateVersion.Sql(Constants.ObjectTypes.Member, username);
+
+            Database.Execute(Sql()
+                .Update<ContentVersionDto>(u => u
+                    .Set(x => x.VersionDate, date))
+                .WhereIn<ContentVersionDto>(x => x.Id, sqlSelectVersion));
+        }
+
         /// <summary>
         /// Gets paged member results.
         /// </summary>
@@ -528,20 +570,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 ordering);
         }
 
-        private string _pagedResultsByQueryWhere;
-
-        private string GetPagedResultsByQueryWhere()
-        {
-            if (_pagedResultsByQueryWhere == null)
-                _pagedResultsByQueryWhere = " AND ("
-                    + $"({SqlSyntax.GetQuotedTableName("umbracoNode")}.{SqlSyntax.GetQuotedColumnName("text")} LIKE @0)"
-                    + " OR "
-                    + $"({SqlSyntax.GetQuotedTableName("cmsMember")}.{SqlSyntax.GetQuotedColumnName("LoginName")} LIKE @0)"
-                    + ")";
-
-            return _pagedResultsByQueryWhere;
-        }
-
         protected override string ApplySystemOrdering(ref Sql<ISqlContext> sql, Ordering ordering)
         {
             if (ordering.OrderBy.InvariantEquals("email"))
@@ -631,5 +659,22 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             member.ResetDirtyProperties(false);
             return member;
         }
+
+        public IMember GetByUsername(string username)
+        {
+            return _memberByUsernameCachePolicy.Get(username, PerformGetByUsername, PerformGetAllByUsername);
+        }
+
+        private IMember PerformGetByUsername(string username)
+        {
+            var query = Query<IMember>().Where(x => x.Username.Equals(username));
+            return PerformGetByQuery(query).FirstOrDefault();
+        }
+
+        private IEnumerable<IMember> PerformGetAllByUsername(params string[] usernames)
+        {
+            var query = Query<IMember>().WhereIn(x => x.Username, usernames);
+            return PerformGetByQuery(query);
+        }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/RedirectUrlRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/RedirectUrlRepository.cs
index acf6bb7df2..24c1e31c20 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/RedirectUrlRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/RedirectUrlRepository.cs
@@ -167,6 +167,23 @@ JOIN umbracoNode ON umbracoRedirectUrl.contentKey=umbracoNode.uniqueID");
             return dto == null ? null : Map(dto);
         }
 
+        public IRedirectUrl GetMostRecentUrl(string url, string culture)
+        {
+            if (string.IsNullOrWhiteSpace(culture)) return GetMostRecentUrl(url);
+            var urlHash = url.GenerateHash<SHA1>();
+            var sql = GetBaseQuery(false)
+                .Where<RedirectUrlDto>(x => x.Url == url && x.UrlHash == urlHash &&
+                    (x.Culture == culture.ToLower() || x.Culture == string.Empty))
+                .OrderByDescending<RedirectUrlDto>(x => x.CreateDateUtc);
+            var dtos = Database.Fetch<RedirectUrlDto>(sql);
+            var dto = dtos.FirstOrDefault(f => f.Culture == culture.ToLower());
+
+            if (dto == null)
+                dto = dtos.FirstOrDefault(f => f.Culture == string.Empty);
+
+            return dto == null ? null : Map(dto);
+        }
+
         public IEnumerable<IRedirectUrl> GetContentUrls(Guid contentKey)
         {
             var sql = GetBaseQuery(false)
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs
index 56a6336f75..592e112be1 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs
@@ -283,20 +283,54 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             return result;
         }
 
-        
+
         public void DeleteByParent(int parentId, params string[] relationTypeAliases)
         {
-            var subQuery = Sql().Select<RelationDto>(x => x.Id)
-                .From<RelationDto>()
-                .InnerJoin<RelationTypeDto>().On<RelationDto, RelationTypeDto>(x => x.RelationType, x => x.Id)
-                .Where<RelationDto>(x => x.ParentId == parentId);
-
-            if (relationTypeAliases.Length > 0)
+            if (Database.DatabaseType.IsSqlCe())
             {
-                subQuery.WhereIn<RelationTypeDto>(x => x.Alias, relationTypeAliases);
-            }
+                var subQuery = Sql().Select<RelationDto>(x => x.Id)
+                    .From<RelationDto>()
+                    .InnerJoin<RelationTypeDto>().On<RelationDto, RelationTypeDto>(x => x.RelationType, x => x.Id)
+                    .Where<RelationDto>(x => x.ParentId == parentId);
 
-            Database.Execute(Sql().Delete<RelationDto>().WhereIn<RelationDto>(x => x.Id, subQuery));
+                if (relationTypeAliases.Length > 0)
+                {
+                    subQuery.WhereIn<RelationTypeDto>(x => x.Alias, relationTypeAliases);
+                }
+
+                Database.Execute(Sql().Delete<RelationDto>().WhereIn<RelationDto>(x => x.Id, subQuery));
+
+            }
+            else
+            {
+                if (relationTypeAliases.Length > 0)
+                {
+                    var template = SqlContext.Templates.Get(
+                        Constants.SqlTemplates.RelationRepository.DeleteByParentIn,
+                        tsql => Sql().Delete<RelationDto>()
+                            .From<RelationDto>()
+                            .InnerJoin<RelationTypeDto>().On<RelationDto, RelationTypeDto>(x => x.RelationType, x => x.Id)
+                            .Where<RelationDto>(x => x.ParentId == SqlTemplate.Arg<int>("parentId"))
+                            .WhereIn<RelationTypeDto>(x => x.Alias, SqlTemplate.ArgIn<string>("relationTypeAliases")));
+
+                    var sql = template.Sql(parentId, relationTypeAliases);
+
+                    Database.Execute(sql);
+                }
+                else
+                {
+                    var template = SqlContext.Templates.Get(
+                        Constants.SqlTemplates.RelationRepository.DeleteByParentAll,
+                        tsql => Sql().Delete<RelationDto>()
+                            .From<RelationDto>()
+                            .InnerJoin<RelationTypeDto>().On<RelationDto, RelationTypeDto>(x => x.RelationType, x => x.Id)
+                            .Where<RelationDto>(x => x.ParentId == SqlTemplate.Arg<int>("parentId")));
+
+                    var sql = template.Sql(parentId);
+
+                    Database.Execute(sql);
+                }
+            }
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/SimpleGetRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/SimpleGetRepository.cs
index f7e59820c3..d327fba67f 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/SimpleGetRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/SimpleGetRepository.cs
@@ -11,6 +11,8 @@ using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement
 {
+    // TODO: Obsolete this, change all implementations of this like in Dictionary to just use custom Cache policies like in the member repository.
+
     /// <summary>
     /// Simple abstract ReadOnly repository used to simply have PerformGet and PeformGetAll with an underlying cache
     /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
index 3be5102b83..c9f85c343c 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
@@ -151,7 +151,7 @@ SELECT '4CountOfLockedOut' AS colName, COUNT(id) AS num FROM umbracoUser WHERE u
 UNION
 SELECT '5CountOfInvited' AS colName, COUNT(id) AS num FROM umbracoUser WHERE lastLoginDate IS NULL AND userDisabled = 1 AND invitedDate IS NOT NULL
 UNION
-SELECT '6CountOfDisabled' AS colName, COUNT(id) AS num FROM umbracoUser WHERE userDisabled = 0 AND userNoConsole = 0 AND lastLoginDate IS NULL 
+SELECT '6CountOfDisabled' AS colName, COUNT(id) AS num FROM umbracoUser WHERE userDisabled = 0 AND userNoConsole = 0 AND lastLoginDate IS NULL
 ORDER BY colName";
 
             var result = Database.Fetch<dynamic>(sql);
@@ -168,10 +168,7 @@ ORDER BY colName";
         }
 
         public Guid CreateLoginSession(int userId, string requestingIpAddress, bool cleanStaleSessions = true)
-        {
-            // TODO: I know this doesn't follow the normal repository conventions which would require us to create a UserSessionRepository
-            //and also business logic models for these objects but that's just so overkill for what we are doing
-            //and now that everything is properly in a transaction (Scope) there doesn't seem to be much reason for using that anymore
+        {            
             var now = DateTime.UtcNow;
             var dto = new UserLoginDto
             {
@@ -201,13 +198,14 @@ ORDER BY colName";
             // that query is going to run a *lot*, make it a template
             var t = SqlContext.Templates.Get("Umbraco.Core.UserRepository.ValidateLoginSession", s => s
                 .Select<UserLoginDto>()
+                .SelectTop(1)
                 .From<UserLoginDto>()
                 .Where<UserLoginDto>(x => x.SessionId == SqlTemplate.Arg<Guid>("sessionId"))
                 .ForUpdate());
 
             var sql = t.Sql(sessionId);
 
-            var found = Database.Query<UserLoginDto>(sql).FirstOrDefault();
+            var found = Database.FirstOrDefault<UserLoginDto>(sql);
             if (found == null || found.UserId != userId || found.LoggedOutUtc.HasValue)
                 return false;
 
@@ -562,9 +560,9 @@ ORDER BY colName";
             {
                 userDto.EmailConfirmedDate = null;
                 userDto.SecurityStampToken = entity.SecurityStamp = Guid.NewGuid().ToString();
-                
+
                 changedCols.Add("emailConfirmedDate");
-                changedCols.Add("securityStampToken");  
+                changedCols.Add("securityStampToken");
             }
 
             //only update the changed cols
@@ -693,7 +691,13 @@ ORDER BY colName";
             else
                 sql.WhereNotIn<UserDto>(x => x.Id, inSql);
 
-            return ConvertFromDtos(Database.Fetch<UserDto>(sql));
+
+            var dtos = Database.Fetch<UserDto>(sql);
+
+            //adds missing bits like content and media start nodes
+            PerformGetReferencedDtos(dtos);
+
+            return ConvertFromDtos(dtos);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Persistence/SqlCeImageMapper.cs b/src/Umbraco.Core/Persistence/SqlCeImageMapper.cs
new file mode 100644
index 0000000000..33303c68f0
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/SqlCeImageMapper.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Data;
+using System.Data.Common;
+using System.Data.SqlServerCe;
+using System.Linq;
+using System.Reflection;
+using NPoco;
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Persistence
+{
+    /// <summary>
+    /// Custom NPoco mapper for SqlCe
+    /// </summary>
+    /// <remarks>
+    /// Work arounds to handle special columns
+    /// </remarks>
+    internal class SqlCeImageMapper : DefaultMapper
+    {
+        public override Func<object, object> GetToDbConverter(Type destType, MemberInfo sourceMemberInfo)
+        {
+            if (sourceMemberInfo.GetMemberInfoType() == typeof(byte[]))
+            {
+                return x =>
+                {
+                    var pd = Current.SqlContext.PocoDataFactory.ForType(sourceMemberInfo.DeclaringType);
+                    if (pd == null) return null;
+                    var col = pd.AllColumns.FirstOrDefault(x => x.MemberInfoData.MemberInfo == sourceMemberInfo);
+                    if (col == null) return null;
+
+                    return new SqlCeParameter
+                    {
+                        SqlDbType = SqlDbType.Image,
+                        Value = x ?? Array.Empty<byte>()
+                    };
+                };
+            }
+            return base.GetToDbConverter(destType, sourceMemberInfo);
+        }
+
+        public override Func<object, object> GetParameterConverter(DbCommand dbCommand, Type sourceType)
+        {
+            if (sourceType == typeof(byte[]))
+            {
+                return x =>
+                {
+                    var param = new SqlCeParameter
+                    {
+                        SqlDbType = SqlDbType.Image,
+                        Value = x
+                    };
+                    return param;
+                };
+
+            }
+            return base.GetParameterConverter(dbCommand, sourceType);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/MicrosoftSqlSyntaxProviderBase.cs b/src/Umbraco.Core/Persistence/SqlSyntax/MicrosoftSqlSyntaxProviderBase.cs
index be7b2cf069..7d0659dba8 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/MicrosoftSqlSyntaxProviderBase.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/MicrosoftSqlSyntaxProviderBase.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             if (tableName.Contains(".") == false)
                 return $"[{tableName}]";
 
-            var tableNameParts = tableName.Split(new[] { '.' }, 2);
+            var tableNameParts = tableName.Split(Constants.CharArrays.Period, 2);
             return $"[{tableNameParts[0]}].[{tableNameParts[1]}]";
         }
 
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
index 2ed0fb878c..9c5edf595b 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Data;
 using System.Data.SqlServerCe;
 using System.Linq;
 using NPoco;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Persistence.DatabaseAnnotations;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
@@ -14,6 +16,14 @@ namespace Umbraco.Core.Persistence.SqlSyntax
     /// </summary>
     public class SqlCeSyntaxProvider : MicrosoftSqlSyntaxProviderBase<SqlCeSyntaxProvider>
     {
+        public SqlCeSyntaxProvider()
+        {
+            BlobColumnDefinition = "IMAGE";
+            // This is silly to have to do this but the way these inherited classes are structured it's the easiest
+            // way without an overhaul in type map initialization
+            DbTypeMap.Set<byte[]>(DbType.Binary, BlobColumnDefinition);
+        }
+
         public override Sql<ISqlContext> SelectTop(Sql<ISqlContext> sql, int top)
         {
             return new Sql<ISqlContext>(sql.SqlContext, sql.SQL.Insert(sql.SQL.IndexOf(' '), " TOP " + top), sql.Arguments);
@@ -83,7 +93,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             string columns = string.IsNullOrEmpty(columnDefinition.PrimaryKeyColumns)
                                  ? GetQuotedColumnName(columnDefinition.Name)
                                  : string.Join(", ", columnDefinition.PrimaryKeyColumns
-                                                                     .Split(new[]{',', ' '}, StringSplitOptions.RemoveEmptyEntries)
+                                                                     .Split(Constants.CharArrays.CommaSpace, StringSplitOptions.RemoveEmptyEntries)
                                                                      .Select(GetQuotedColumnName));
 
             return string.Format(CreateConstraint,
@@ -163,7 +173,8 @@ where table_name=@0 and column_name=@1", tableName, columnName).FirstOrDefault()
             if (db.Transaction.IsolationLevel < IsolationLevel.RepeatableRead)
                 throw new InvalidOperationException("A transaction with minimum RepeatableRead isolation level is required.");
 
-            db.Execute(@"SET LOCK_TIMEOUT 1800;");
+            var timeOut = Current.Configs.Global().SqlWriteLockTimeOut;
+            db.Execute(@"SET LOCK_TIMEOUT " + timeOut  + ";");
             // *not* using a unique 'WHERE IN' query here because the *order* of lockIds is important to avoid deadlocks
             foreach (var lockId in lockIds)
             {
@@ -227,9 +238,36 @@ where table_name=@0 and column_name=@1", tableName, columnName).FirstOrDefault()
             }
         }
 
-
-
         public override string DropIndex { get { return "DROP INDEX {1}.{0}"; } }
+        public override string CreateIndex => "CREATE {0}{1}INDEX {2} ON {3} ({4})";
+        public override string Format(IndexDefinition index)
+        {
+            var name = string.IsNullOrEmpty(index.Name)
+                ? $"IX_{index.TableName}_{index.ColumnName}"
+                : index.Name;
 
+            var columns = index.Columns.Any()
+                ? string.Join(",", index.Columns.Select(x => GetQuotedColumnName(x.Name)))
+                : GetQuotedColumnName(index.ColumnName);
+
+
+            return string.Format(CreateIndex, GetIndexType(index.IndexType), " ", GetQuotedName(name),
+                                 GetQuotedTableName(index.TableName), columns);
+        }
+        
+        public override string GetSpecialDbType(SpecialDbTypes dbTypes)
+        {
+            if (dbTypes == SpecialDbTypes.NVARCHARMAX) // SqlCE does not have nvarchar(max) for now
+                return "NTEXT";
+            return base.GetSpecialDbType(dbTypes);
+        }
+        public override SqlDbType GetSqlDbType(DbType dbType)
+        {
+            if (DbType.Binary == dbType)
+            {
+                return SqlDbType.Image;
+            }
+            return base.GetSqlDbType(dbType);
+        }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
index bb50fa98a1..313b2352a9 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Data;
 using System.Data.Common;
 using System.Data.SqlClient;
 using System.Linq;
 using NPoco;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Scoping;
@@ -30,6 +32,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             V2014 = 6,
             V2016 = 7,
             V2017 = 8,
+            V2019 = 9,
             Other = 99
         }
 
@@ -38,7 +41,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             Unknown = 0,
             Desktop = 1,
             Standard = 2,
-            Enterprise = 3,
+            Enterprise = 3,// Also developer edition
             Express = 4,
             Azure = 5
         }
@@ -74,11 +77,13 @@ namespace Umbraco.Core.Persistence.SqlSyntax
 
         private static VersionName MapProductVersion(string productVersion)
         {
-            var firstPart = string.IsNullOrWhiteSpace(productVersion) ? "??" : productVersion.Split('.')[0];
+            var firstPart = string.IsNullOrWhiteSpace(productVersion) ? "??" : productVersion.Split(Constants.CharArrays.Period)[0];
             switch (firstPart)
             {
                 case "??":
                     return VersionName.Invalid;
+                case "15":
+                    return VersionName.V2019;
                 case "14":
                     return VersionName.V2017;
                 case "13":
@@ -251,7 +256,8 @@ where tbl.[name]=@0 and col.[name]=@1;", tableName, columnName)
 
         public override void WriteLock(IDatabase db, params int[] lockIds)
         {
-            WriteLock(db, TimeSpan.FromMilliseconds(1800), lockIds);
+            var timeOut = Current.Configs.Global().SqlWriteLockTimeOut;
+            WriteLock(db, TimeSpan.FromMilliseconds(timeOut), lockIds);
         }
 
         public void WriteLock(IDatabase db, TimeSpan timeout, params int[] lockIds)
@@ -336,5 +342,24 @@ where tbl.[name]=@0 and col.[name]=@1;", tableName, columnName)
         public override string DropIndex => "DROP INDEX {0} ON {1}";
 
         public override string RenameColumn => "sp_rename '{0}.{1}', '{2}', 'COLUMN'";
+
+        public override string CreateIndex => "CREATE {0}{1}INDEX {2} ON {3} ({4}){5}";
+        public override string Format(IndexDefinition index)
+        {
+            var name = string.IsNullOrEmpty(index.Name)
+                ? $"IX_{index.TableName}_{index.ColumnName}"
+                : index.Name;
+
+            var columns = index.Columns.Any()
+                ? string.Join(",", index.Columns.Select(x => GetQuotedColumnName(x.Name)))
+                : GetQuotedColumnName(index.ColumnName);
+
+            var includeColumns = index.IncludeColumns?.Any() ?? false
+               ? $" INCLUDE ({string.Join(",", index.IncludeColumns.Select(x => GetQuotedColumnName(x.Name)))})"
+               : string.Empty;
+
+            return string.Format(CreateIndex, GetIndexType(index.IndexType), " ", GetQuotedName(name),
+                                 GetQuotedTableName(index.TableName), columns, includeColumns);
+        }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
index b2e03df96e..8570c49f69 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
@@ -196,7 +196,13 @@ namespace Umbraco.Core.Persistence.SqlSyntax
                 return "NCHAR";
             }
             else if (dbTypes == SpecialDbTypes.NTEXT)
+            {
                 return "NTEXT";
+            }
+            else if (dbTypes == SpecialDbTypes.NVARCHARMAX)
+            {
+                return "NVARCHAR(MAX)";
+            }
 
             return "NVARCHAR";
         }
@@ -397,7 +403,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             var columns = string.IsNullOrEmpty(columnDefinition.PrimaryKeyColumns)
                 ? GetQuotedColumnName(columnDefinition.Name)
                 : string.Join(", ", columnDefinition.PrimaryKeyColumns
-                                                    .Split(new[] { ',', ' ' }, StringSplitOptions.RemoveEmptyEntries)
+                                                    .Split(Constants.CharArrays.CommaSpace, StringSplitOptions.RemoveEmptyEntries)
                                                     .Select(GetQuotedColumnName));
 
             var primaryKeyPart = string.Concat("PRIMARY KEY", columnDefinition.IsIndexed ? " CLUSTERED" : " NONCLUSTERED");
diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
index a95d95ea08..ec09db690f 100644
--- a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
+++ b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.Persistence.FaultHandling;
 
 namespace Umbraco.Core.Persistence
 {
+
     /// <summary>
     /// Extends NPoco Database for Umbraco.
     /// </summary>
@@ -38,14 +39,10 @@ namespace Umbraco.Core.Persistence
             : base(connectionString, sqlContext.DatabaseType, provider, sqlContext.SqlSyntax.DefaultIsolationLevel)
         {
             SqlContext = sqlContext;
-
             _logger = logger;
             _connectionRetryPolicy = connectionRetryPolicy;
             _commandRetryPolicy = commandRetryPolicy;
-
-            EnableSqlTrace = EnableSqlTraceDefault;
-
-            NPocoDatabaseExtensions.ConfigureNPocoBulkExtensions();
+            Init();
         }
 
         /// <summary>
@@ -57,10 +54,17 @@ namespace Umbraco.Core.Persistence
         {
             SqlContext = sqlContext;
             _logger = logger;
+            Init();
+        }
 
+        private void Init()
+        {
             EnableSqlTrace = EnableSqlTraceDefault;
-
             NPocoDatabaseExtensions.ConfigureNPocoBulkExtensions();
+            if (SqlContext.DatabaseType == DatabaseType.SQLCe)
+            {
+                Mappers.Add(new SqlCeImageMapper());
+            }
         }
 
         #endregion
@@ -257,5 +261,6 @@ namespace Umbraco.Core.Persistence
         }
 
         #endregion
+
     }
 }
diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabaseExtensions.cs b/src/Umbraco.Core/Persistence/UmbracoDatabaseExtensions.cs
index 249dd3dc73..1fcaca6fa1 100644
--- a/src/Umbraco.Core/Persistence/UmbracoDatabaseExtensions.cs
+++ b/src/Umbraco.Core/Persistence/UmbracoDatabaseExtensions.cs
@@ -1,4 +1,7 @@
 using System;
+using System.Linq;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Migrations.Install;
 
 namespace Umbraco.Core.Persistence
 {
@@ -10,5 +13,63 @@ namespace Umbraco.Core.Persistence
             if (asDatabase == null) throw new Exception("oops: database.");
             return asDatabase;
         }
+
+        /// <summary>
+        /// Returns true if the database contains the specified table
+        /// </summary>
+        /// <param name="database"></param>
+        /// <param name="tableName"></param>
+        /// <returns></returns>
+        public static bool HasTable(this IUmbracoDatabase database, string tableName)
+        {
+            try
+            {
+                return database.SqlContext.SqlSyntax.GetTablesInSchema(database).Any(table => table.InvariantEquals(tableName));
+            }
+            catch (Exception)
+            {
+                return false; // will occur if the database cannot connect
+            }
+        }
+
+        /// <summary>
+        /// Returns true if the database contains no tables
+        /// </summary>
+        /// <param name="database"></param>
+        /// <returns></returns>
+        public static bool IsDatabaseEmpty(this IUmbracoDatabase database)
+            => database.SqlContext.SqlSyntax.GetTablesInSchema(database).Any() == false;
+
+        /// <summary>
+        /// Returns the <see cref="DatabaseSchemaResult"/> for the database
+        /// </summary>
+        /// <param name="database"></param>
+        /// <param name="logger"></param>
+        /// <returns></returns>
+        public static DatabaseSchemaResult ValidateSchema(this IUmbracoDatabase database, ILogger logger)
+        {
+            if (database is null) throw new ArgumentNullException(nameof(database));
+            if (logger is null) throw new ArgumentNullException(nameof(logger));
+
+            var dbSchema = new DatabaseSchemaCreator(database, logger);
+            var databaseSchemaValidationResult = dbSchema.ValidateSchema();            
+            return databaseSchemaValidationResult;
+        }
+
+        /// <summary>
+        /// Returns true if Umbraco database tables are detected to be installed
+        /// </summary>
+        /// <param name="database"></param>
+        /// <param name="logger"></param>
+        /// <returns></returns>
+        public static bool IsUmbracoInstalled(this IUmbracoDatabase database, ILogger logger)
+        {
+            if (database is null) throw new ArgumentNullException(nameof(database));
+            if (logger is null) throw new ArgumentNullException(nameof(logger));
+
+            var databaseSchemaValidationResult = database.ValidateSchema(logger);
+            return databaseSchemaValidationResult.DetermineHasInstalledVersion();
+        }
+
     }
 }
diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs b/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
index c502abc87c..baab8c486e 100644
--- a/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
@@ -156,6 +156,7 @@ namespace Umbraco.Core.Persistence
                 case SqlServerSyntaxProvider.VersionName.V2014:
                 case SqlServerSyntaxProvider.VersionName.V2016:
                 case SqlServerSyntaxProvider.VersionName.V2017:
+                case SqlServerSyntaxProvider.VersionName.V2019:
                     _databaseType = DatabaseType.SqlServer2012;
                     break;
                 // else leave unchanged
diff --git a/src/Umbraco.Core/PropertyEditors/ComplexPropertyEditorContentEventHandler.cs b/src/Umbraco.Core/PropertyEditors/ComplexPropertyEditorContentEventHandler.cs
new file mode 100644
index 0000000000..2b819d4555
--- /dev/null
+++ b/src/Umbraco.Core/PropertyEditors/ComplexPropertyEditorContentEventHandler.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
+
+namespace Umbraco.Core.PropertyEditors
+{
+    /// <summary>
+    /// Utility class for dealing with <see cref="ContentService"/> Copying/Saving events for complex editors
+    /// </summary>
+    internal class ComplexPropertyEditorContentEventHandler : IDisposable
+    {
+        private readonly string _editorAlias;
+        private readonly Func<string, bool, string> _formatPropertyValue;
+        private bool _disposedValue;
+
+        public ComplexPropertyEditorContentEventHandler(string editorAlias,
+            Func<string, bool, string> formatPropertyValue)
+        {
+            _editorAlias = editorAlias;
+            _formatPropertyValue = formatPropertyValue;
+            ContentService.Copying += ContentService_Copying;
+            ContentService.Saving += ContentService_Saving;
+        }
+
+        /// <summary>
+        /// <see cref="ContentService"/> Copying event handler
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ContentService_Copying(IContentService sender, CopyEventArgs<IContent> e)
+        {
+            var props = e.Copy.GetPropertiesByEditor(_editorAlias);
+            UpdatePropertyValues(props, false);
+        }
+
+        /// <summary>
+        /// <see cref="ContentService"/> Saving event handler
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ContentService_Saving(IContentService sender, ContentSavingEventArgs e)
+        {
+            foreach (var entity in e.SavedEntities)
+            {
+                var props = entity.GetPropertiesByEditor(_editorAlias);
+                UpdatePropertyValues(props, true);
+            }
+        }
+
+        private void UpdatePropertyValues(IEnumerable<Property> props, bool onlyMissingKeys)
+        {
+            foreach (var prop in props)
+            {
+                // A Property may have one or more values due to cultures
+                var propVals = prop.Values;
+                foreach (var cultureVal in propVals)
+                {
+                    // Remove keys from published value & any nested properties
+                    var updatedPublishedVal = _formatPropertyValue(cultureVal.PublishedValue?.ToString(), onlyMissingKeys);
+                    cultureVal.PublishedValue = updatedPublishedVal;
+
+                    // Remove keys from edited/draft value & any nested properties
+                    var updatedEditedVal = _formatPropertyValue(cultureVal.EditedValue?.ToString(), onlyMissingKeys);
+                    cultureVal.EditedValue = updatedEditedVal;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Unbinds from events
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if (disposing)
+                {
+                    ContentService.Copying -= ContentService_Copying;
+                    ContentService.Saving -= ContentService_Saving;
+                }
+                _disposedValue = true;
+            }
+        }
+
+        /// <summary>
+        /// Unbinds from events
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/PropertyEditors/DataEditorAttribute.cs b/src/Umbraco.Core/PropertyEditors/DataEditorAttribute.cs
index 7b3be7ea5f..0375509797 100644
--- a/src/Umbraco.Core/PropertyEditors/DataEditorAttribute.cs
+++ b/src/Umbraco.Core/PropertyEditors/DataEditorAttribute.cs
@@ -2,6 +2,7 @@
 
 namespace Umbraco.Core.PropertyEditors
 {
+
     /// <summary>
     /// Marks a class that represents a data editor.
     /// </summary>
diff --git a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
index c4380f032c..eebe5f5722 100644
--- a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
@@ -204,7 +204,7 @@ namespace Umbraco.Core.PropertyEditors
         /// <returns></returns>
         ///  <remarks>
         ///  By default this will attempt to automatically convert the string value to the value type supplied by ValueType.
-        /// 
+        ///
         ///  If overridden then the object returned must match the type supplied in the ValueType, otherwise persisting the
         ///  value to the DB will fail when it tries to validate the value type.
         ///  </remarks>
diff --git a/src/Umbraco.Core/PropertyEditors/IPropertyCacheCompression.cs b/src/Umbraco.Core/PropertyEditors/IPropertyCacheCompression.cs
new file mode 100644
index 0000000000..96a559630b
--- /dev/null
+++ b/src/Umbraco.Core/PropertyEditors/IPropertyCacheCompression.cs
@@ -0,0 +1,15 @@
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.PropertyEditors
+{
+    /// <summary>
+    /// Determines if a property type's value should be compressed in memory
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    public interface IPropertyCacheCompression
+    {        
+        bool IsCompressed(IReadOnlyContentBase content, string propertyTypeAlias);
+    }
+}
diff --git a/src/Umbraco.Core/PropertyEditors/IPropertyCacheCompressionOptions.cs b/src/Umbraco.Core/PropertyEditors/IPropertyCacheCompressionOptions.cs
new file mode 100644
index 0000000000..2fa0153f9e
--- /dev/null
+++ b/src/Umbraco.Core/PropertyEditors/IPropertyCacheCompressionOptions.cs
@@ -0,0 +1,9 @@
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.PropertyEditors
+{
+    public interface IPropertyCacheCompressionOptions
+    {
+        bool IsCompressed(IReadOnlyContentBase content, PropertyType propertyType, IDataEditor dataEditor);
+    }
+}
diff --git a/src/Umbraco.Core/PropertyEditors/NoopPropertyCacheCompressionOptions.cs b/src/Umbraco.Core/PropertyEditors/NoopPropertyCacheCompressionOptions.cs
new file mode 100644
index 0000000000..1f12d45769
--- /dev/null
+++ b/src/Umbraco.Core/PropertyEditors/NoopPropertyCacheCompressionOptions.cs
@@ -0,0 +1,12 @@
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.PropertyEditors
+{
+    /// <summary>
+    /// Default implementation for <see cref="IPropertyCacheCompressionOptions"/> which does not compress any property data
+    /// </summary>
+    internal class NoopPropertyCacheCompressionOptions : IPropertyCacheCompressionOptions
+    {
+        public bool IsCompressed(IReadOnlyContentBase content, PropertyType propertyType, IDataEditor dataEditor) => false;
+    }
+}
diff --git a/src/Umbraco.Core/PropertyEditors/PropertyCacheCompression.cs b/src/Umbraco.Core/PropertyEditors/PropertyCacheCompression.cs
new file mode 100644
index 0000000000..6be21fca7f
--- /dev/null
+++ b/src/Umbraco.Core/PropertyEditors/PropertyCacheCompression.cs
@@ -0,0 +1,49 @@
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.PropertyEditors
+{
+
+    /// <summary>
+    /// Compresses property data based on config
+    /// </summary>
+    internal class PropertyCacheCompression : IPropertyCacheCompression
+    {
+        private readonly IPropertyCacheCompressionOptions _compressionOptions;
+        private readonly IReadOnlyDictionary<int, IContentTypeComposition> _contentTypes;
+        private readonly PropertyEditorCollection _propertyEditors;
+        private readonly ConcurrentDictionary<(int contentTypeId, string propertyAlias), bool> _isCompressedCache;
+
+        public PropertyCacheCompression(
+            IPropertyCacheCompressionOptions compressionOptions,
+            IReadOnlyDictionary<int, IContentTypeComposition> contentTypes,
+            PropertyEditorCollection propertyEditors,
+            ConcurrentDictionary<(int, string), bool> compressedStoragePropertyEditorCache)
+        {
+            _compressionOptions = compressionOptions;
+            _contentTypes = contentTypes ?? throw new System.ArgumentNullException(nameof(contentTypes));
+            _propertyEditors = propertyEditors ?? throw new System.ArgumentNullException(nameof(propertyEditors));
+            _isCompressedCache = compressedStoragePropertyEditorCache;
+        }
+
+        public bool IsCompressed(IReadOnlyContentBase content, string alias)
+        {
+            var compressedStorage = _isCompressedCache.GetOrAdd((content.ContentTypeId, alias), x =>
+            {
+                if (!_contentTypes.TryGetValue(x.contentTypeId, out var ct))
+                    return false;
+
+                var propertyType = ct.CompositionPropertyTypes.FirstOrDefault(x => x.Alias == alias);
+                if (propertyType == null) return false;
+
+                if (!_propertyEditors.TryGet(propertyType.PropertyEditorAlias, out var propertyEditor)) return false;
+
+                return _compressionOptions.IsCompressed(content, propertyType, propertyEditor);
+            });
+
+            return compressedStorage;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/PropertyEditors/PropertyValueConverterBase.cs b/src/Umbraco.Core/PropertyEditors/PropertyValueConverterBase.cs
index 3b6ebc610c..2ec0438328 100644
--- a/src/Umbraco.Core/PropertyEditors/PropertyValueConverterBase.cs
+++ b/src/Umbraco.Core/PropertyEditors/PropertyValueConverterBase.cs
@@ -4,44 +4,57 @@ using Umbraco.Core.Models.PublishedContent;
 namespace Umbraco.Core.PropertyEditors
 {
     /// <summary>
-    /// Provides a default overridable implementation for <see cref="IPropertyValueConverter"/> that does nothing.
+    /// Provides a default implementation for <see cref="IPropertyValueConverter" />.
     /// </summary>
+    /// <seealso cref="Umbraco.Core.PropertyEditors.IPropertyValueConverter" />
     public abstract class PropertyValueConverterBase : IPropertyValueConverter
     {
+        /// <inheritdoc />
         public virtual bool IsConverter(IPublishedPropertyType propertyType)
             => false;
 
+        /// <inheritdoc />
         public virtual bool? IsValue(object value, PropertyValueLevel level)
         {
             switch (level)
             {
                 case PropertyValueLevel.Source:
-                    return value != null && (!(value is string) || string.IsNullOrWhiteSpace((string) value) == false);
+                    // the default implementation uses the old magic null & string comparisons,
+                    // other implementations may be more clever, and/or test the final converted object values
+                    return value != null && (!(value is string stringValue) || !string.IsNullOrWhiteSpace(stringValue));
+                case PropertyValueLevel.Inter:
+                    return null;
+                case PropertyValueLevel.Object:
+                    return null;
                 default:
                     throw new NotSupportedException($"Invalid level: {level}.");
             }
         }
 
+        [Obsolete("This method is not part of the IPropertyValueConverter contract, therefore not used and will be removed in future versions; use IsValue instead.")]
         public virtual bool HasValue(IPublishedProperty property, string culture, string segment)
         {
-            // the default implementation uses the old magic null & string comparisons,
-            // other implementations may be more clever, and/or test the final converted object values
             var value = property.GetSourceValue(culture, segment);
-            return value != null && (!(value is string) || string.IsNullOrWhiteSpace((string) value) == false);
+            return value != null && (!(value is string stringValue) || !string.IsNullOrWhiteSpace(stringValue));
         }
 
+        /// <inheritdoc />
         public virtual Type GetPropertyValueType(IPublishedPropertyType propertyType)
-            => typeof (object);
+            => typeof(object);
 
+        /// <inheritdoc />
         public virtual PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
             => PropertyCacheLevel.Snapshot;
 
+        /// <inheritdoc />
         public virtual object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
             => source;
 
+        /// <inheritdoc />
         public virtual object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
             => inter;
 
+        /// <inheritdoc />
         public virtual object ConvertIntermediateToXPath(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
             => inter?.ToString() ?? string.Empty;
     }
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
index ab217d3870..2c6ec9b8aa 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
@@ -80,13 +80,13 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
         }
 
         /// <summary>
-        /// Gets the value image url for a specified crop.
+        /// Gets the value image URL for a specified crop.
         /// </summary>
         [Obsolete("Use the overload that takes an IImageUrlGenerator")]
         public string GetCropUrl(string alias, bool useCropDimensions = true, bool useFocalPoint = false, string cacheBusterValue = null) => GetCropUrl(alias, Current.ImageUrlGenerator, useCropDimensions, useFocalPoint, cacheBusterValue);
 
         /// <summary>
-        /// Gets the value image url for a specified crop.
+        /// Gets the value image URL for a specified crop.
         /// </summary>
         public string GetCropUrl(string alias, IImageUrlGenerator imageUrlGenerator, bool useCropDimensions = true, bool useFocalPoint = false, string cacheBusterValue = null)
         {
@@ -110,13 +110,13 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
         }
 
         /// <summary>
-        /// Gets the value image url for a specific width and height.
+        /// Gets the value image URL for a specific width and height.
         /// </summary>
         [Obsolete("Use the overload that takes an IImageUrlGenerator")]
         public string GetCropUrl(int width, int height, bool useFocalPoint = false, string cacheBusterValue = null) => GetCropUrl(width, height, Current.ImageUrlGenerator, useFocalPoint, cacheBusterValue);
 
         /// <summary>
-        /// Gets the value image url for a specific width and height.
+        /// Gets the value image URL for a specific width and height.
         /// </summary>
         public string GetCropUrl(int width, int height, IImageUrlGenerator imageUrlGenerator, bool useFocalPoint = false, string cacheBusterValue = null)
         {
@@ -157,12 +157,11 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
             // merge the crop values - the alias + width + height comes from
             // configuration, but each crop can store its own coordinates
 
-            if (Crops == null) return;
-
             var configuredCrops = configuration?.Crops;
             if (configuredCrops == null) return;
 
-            var crops = Crops.ToList();
+            //Use Crops if it's not null, otherwise create a new list
+            var crops = Crops?.ToList() ?? new List<ImageCropperCrop>();
 
             foreach (var configuredCrop in configuredCrops)
             {
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
index 36ffddb863..8926174c03 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
             }
             catch (Exception ex)
             {
-                // cannot deserialize, assume it may be a raw image url
+                // cannot deserialize, assume it may be a raw image URL
                 Current.Logger.Error<ImageCropperValueConverter>(ex, "Could not deserialize string '{JsonString}' into an image cropper value.", sourceString);
                 value = new ImageCropperValue { Src = sourceString };
             }
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs
index 11502687b7..dc2a039bfe 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
 
             if (IsRangeDataType(propertyType.DataType.Id))
             {
-                var rangeRawValues = source.ToString().Split(',');
+                var rangeRawValues = source.ToString().Split(Constants.CharArrays.Comma);
                 var minimumAttempt = rangeRawValues[0].TryConvertTo<decimal>();
                 var maximumAttempt = rangeRawValues[1].TryConvertTo<decimal>();
 
diff --git a/src/Umbraco.Core/PublishedContentExtensions.cs b/src/Umbraco.Core/PublishedContentExtensions.cs
index 921883b822..4aa3b77a7b 100644
--- a/src/Umbraco.Core/PublishedContentExtensions.cs
+++ b/src/Umbraco.Core/PublishedContentExtensions.cs
@@ -61,10 +61,10 @@ namespace Umbraco.Core
 
 
         /// <summary>
-        /// Gets the url segment of the content item.
+        /// Gets the URL segment of the content item.
         /// </summary>
         /// <param name="content">The content item.</param>
-        /// <param name="culture">The specific culture to get the url segment for. If null is used the current culture is used (Default is null).</param>
+        /// <param name="culture">The specific culture to get the URL segment for. If null is used the current culture is used (Default is null).</param>
         public static string UrlSegment(this IPublishedContent content, string culture = null)
         {
             // invariant has invariant value (whatever the requested culture)
@@ -104,7 +104,7 @@ namespace Umbraco.Core
         /// </summary>
         /// <param name="content">The content item.</param>
         /// <param name="culture">
-        /// The specific culture to get the url children for. Default is null which will use the current culture in <see cref="VariationContext"/>        
+        /// The specific culture to get the URL children for. Default is null which will use the current culture in <see cref="VariationContext"/>        
         /// </param>
         /// <remarks>
         /// <para>Gets children that are available for the specified culture.</para>
diff --git a/src/Umbraco.Core/Runtime/CoreRuntime.cs b/src/Umbraco.Core/Runtime/CoreRuntime.cs
index b852aff2ff..26221e5e19 100644
--- a/src/Umbraco.Core/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Core/Runtime/CoreRuntime.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
+using System.Threading;
 using System.Web;
 using System.Web.Hosting;
 using Umbraco.Core.Cache;
@@ -10,6 +12,8 @@ using Umbraco.Core.Exceptions;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
+using Umbraco.Core.Migrations.Install;
+using Umbraco.Core.Migrations.Upgrade;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.Sync;
@@ -149,7 +153,7 @@ namespace Umbraco.Core.Runtime
                 {
                     MainDom = new MainDom(Logger, new MainDomSemaphoreLock(Logger));
                 }
-                
+
 
                 // create the composition
                 composition = new Composition(register, typeLoader, ProfilingLogger, _state, configs);
@@ -158,6 +162,9 @@ namespace Umbraco.Core.Runtime
                 // run handlers
                 RuntimeOptions.DoRuntimeEssentials(composition, appCaches, typeLoader, databaseFactory);
 
+                // determines if unattended install is enabled and performs it if required
+                DoUnattendedInstall(databaseFactory);
+
                 // register runtime-level services
                 // there should be none, really - this is here "just in case"
                 Compose(composition);
@@ -175,7 +182,7 @@ namespace Umbraco.Core.Runtime
                 using (ProfilingLogger.DebugDuration<CoreRuntime>("Scanning enable/disable composer attributes"))
                 {
                     enableDisableAttributes = typeLoader.GetAssemblyAttributes(typeof(EnableComposerAttribute), typeof(DisableComposerAttribute));
-                }   
+                }
 
                 var composers = new Composers(composition, composerTypes, enableDisableAttributes, ProfilingLogger);
                 composers.Compose();
@@ -183,6 +190,16 @@ namespace Umbraco.Core.Runtime
                 // create the factory
                 _factory = Current.Factory = composition.CreateFactory();
 
+                // if level is Run and reason is UpgradeMigrations, that means we need to perform an unattended upgrade
+                if (_state.Reason == RuntimeLevelReason.UpgradeMigrations && _state.Level == RuntimeLevel.Run)
+                {
+                    // do the upgrade
+                    DoUnattendedUpgrade(_factory.GetInstance<DatabaseBuilder>());
+
+                    // upgrade is done, set reason to Run
+                    _state.Reason = RuntimeLevelReason.Run;
+                }
+
                 // create & initialize the components
                 _components = _factory.GetInstance<ComponentCollection>();
                 _components.Initialize();
@@ -210,7 +227,13 @@ namespace Umbraco.Core.Runtime
                     {
                         _factory = Current.Factory = composition?.CreateFactory();
                     }
-                    catch { /* yea */ }
+                    catch
+                    {
+                        // In this case we are basically dead, we do not have a factory but we need
+                        // to report on the state so we need to manually set that, this is the only time
+                        // we ever do this.
+                        Current.RuntimeState = _state;
+                    }
                 }
 
                 Debugger.Break();
@@ -225,6 +248,74 @@ namespace Umbraco.Core.Runtime
             return _factory;
         }
 
+        private void DoUnattendedInstall(IUmbracoDatabaseFactory databaseFactory)
+        {
+            // unattended install is not enabled
+            if (RuntimeOptions.InstallUnattended == false) return;
+
+            var localVersion = UmbracoVersion.LocalVersion; // the local, files, version
+            var codeVersion = _state.SemanticVersion; // the executing code version
+
+            // local version and code version is not equal, an unattended install cannot be performed
+            if (localVersion != codeVersion) return;
+
+            // no connection string set
+            if (databaseFactory.Configured == false) return;
+
+            var tries = 5;
+            var connect = false;
+            for (var i = 0;;)
+            {
+                connect = databaseFactory.CanConnect;
+                if (connect || ++i == tries) break;
+                Logger.Debug<CoreRuntime>("Could not immediately connect to database, trying again.");
+                Thread.Sleep(1000);
+            }
+
+            // could not connect to the database
+            if (connect == false) return;
+
+            using (var database = databaseFactory.CreateDatabase())
+            {
+                var hasUmbracoTables = database.IsUmbracoInstalled(Logger);
+
+                // database has umbraco tables, assume Umbraco is already installed
+                if (hasUmbracoTables) return;
+
+                // all conditions fulfilled, do the install
+                Logger.Info<CoreRuntime>("Starting unattended install.");
+                
+                try
+                {
+                    database.BeginTransaction();
+                    var creator = new DatabaseSchemaCreator(database, Logger);
+                    creator.InitializeDatabaseSchema();
+                    database.CompleteTransaction();
+                    Logger.Info<CoreRuntime>("Unattended install completed.");
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error<CoreRuntime>(ex, "Error during unattended install.");
+                    database.AbortTransaction();
+
+                    throw new UnattendedInstallException(
+                        "The database configuration failed with the following message: " + ex.Message
+                        + "\n Please check log file for additional information (can be found in '/App_Data/Logs/')");
+                }
+            }
+        }
+
+        private void DoUnattendedUpgrade(DatabaseBuilder databaseBuilder)
+        {
+            var plan = new UmbracoPlan();
+            using (ProfilingLogger.TraceDuration<CoreRuntime>("Starting unattended upgrade.", "Unattended upgrade completed."))
+            {
+                var result = databaseBuilder.UpgradeSchemaAndData(plan);
+                if (result.Success == false)
+                    throw new UnattendedInstallException("An error occurred while running the unattended upgrade.\n" + result.Message);
+            }
+        }
+
         protected virtual void ConfigureUnhandledException()
         {
             //take care of unhandled exceptions - there is nothing we can do to
@@ -265,14 +356,14 @@ namespace Umbraco.Core.Runtime
             }
         }
 
-        // internal for tests
-        internal void DetermineRuntimeLevel(IUmbracoDatabaseFactory databaseFactory, IProfilingLogger profilingLogger)
+        // internal/virtual for tests (i.e. hack, do not port to netcore)
+        internal virtual void DetermineRuntimeLevel(IUmbracoDatabaseFactory databaseFactory, IProfilingLogger profilingLogger)
         {
             using (var timer = profilingLogger.DebugDuration<CoreRuntime>("Determining runtime level.", "Determined."))
             {
                 try
                 {
-                    _state.DetermineRuntimeLevel(databaseFactory, profilingLogger);
+                    _state.DetermineRuntimeLevel(databaseFactory);
 
                     profilingLogger.Debug<CoreRuntime>("Runtime level: {RuntimeLevel} - {RuntimeLevelReason}", _state.Level, _state.Reason);
 
diff --git a/src/Umbraco.Core/Runtime/MainDom.cs b/src/Umbraco.Core/Runtime/MainDom.cs
index e6780ec876..71842905dd 100644
--- a/src/Umbraco.Core/Runtime/MainDom.cs
+++ b/src/Umbraco.Core/Runtime/MainDom.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Web.Hosting;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
@@ -38,6 +39,9 @@ namespace Umbraco.Core.Runtime
 
         private const int LockTimeoutMilliseconds = 40000; // 40 seconds
 
+        private Task _listenTask;
+        private Task _listenCompleteTask;
+
         #endregion
 
         #region Ctor
@@ -144,8 +148,16 @@ namespace Umbraco.Core.Runtime
 
             _logger.Info<MainDom>("Acquiring.");
 
-            // Get the lock 
-            var acquired = _mainDomLock.AcquireLockAsync(LockTimeoutMilliseconds).GetAwaiter().GetResult();
+            // Get the lock
+            var acquired = false;
+            try
+            {
+                acquired = _mainDomLock.AcquireLockAsync(LockTimeoutMilliseconds).GetAwaiter().GetResult();
+            }
+            catch (Exception ex)
+            {
+                _logger.Error<MainDom>(ex, "Error while acquiring");
+            }
 
             if (!acquired)
             {
@@ -164,7 +176,13 @@ namespace Umbraco.Core.Runtime
             try
             {
                 // Listen for the signal from another AppDomain coming online to release the lock
-                _mainDomLock.ListenAsync().ContinueWith(_ => OnSignal("signal"));
+                _listenTask = _mainDomLock.ListenAsync();
+                _listenCompleteTask = _listenTask.ContinueWith(t =>
+                {
+                    _logger.Debug<MainDom>("Listening task completed with {TaskStatus}", _listenTask.Status);
+
+                    OnSignal("signal");
+                }, TaskScheduler.Default); // Must explicitly specify this, see https://blog.stephencleary.com/2013/10/continuewith-is-dangerous-too.html
             }
             catch (OperationCanceledException ex)
             {
diff --git a/src/Umbraco.Core/Runtime/SqlMainDomLock.cs b/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
index 5f5d0d607f..f58b279a8d 100644
--- a/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
+++ b/src/Umbraco.Core/Runtime/SqlMainDomLock.cs
@@ -1,4 +1,5 @@
-using System;
+using NPoco;
+using System;
 using System.Data;
 using System.Data.SqlClient;
 using System.Diagnostics;
@@ -6,12 +7,12 @@ using System.Linq;
 using System.Security.Cryptography;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Web;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.Persistence.SqlSyntax;
+using MapperCollection = Umbraco.Core.Persistence.Mappers.MapperCollection;
 
 namespace Umbraco.Core.Runtime
 {
@@ -21,60 +22,71 @@ namespace Umbraco.Core.Runtime
         private const string MainDomKeyPrefix = "Umbraco.Core.Runtime.SqlMainDom";
         private const string UpdatedSuffix = "_updated";
         private readonly ILogger _logger;
-        private IUmbracoDatabase _db;
         private CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
         private SqlServerSyntaxProvider _sqlServerSyntax = new SqlServerSyntaxProvider();
         private bool _mainDomChanging = false;
         private readonly UmbracoDatabaseFactory _dbFactory;
-        private bool _hasError;
+        private bool _errorDuringAcquiring;
         private object _locker = new object();
+        private bool _hasTable = false;
 
         public SqlMainDomLock(ILogger logger)
         {
             // unique id for our appdomain, this is more unique than the appdomain id which is just an INT counter to its safer
             _lockId = Guid.NewGuid().ToString();
             _logger = logger;
-            
+
             _dbFactory = new UmbracoDatabaseFactory(
                Constants.System.UmbracoConnectionName,
                _logger,
-               new Lazy<IMapperCollection>(() => new Persistence.Mappers.MapperCollection(Enumerable.Empty<BaseMapper>())));
+               new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())));
         }
 
         public async Task<bool> AcquireLockAsync(int millisecondsTimeout)
         {
             if (!_dbFactory.Configured)
             {
-                // if we aren't configured, then we're in an install state, in which case we have no choice but to assume we can acquire
+                // if we aren't configured then we're in an install state, in which case we have no choice but to assume we can acquire
                 return true;
             }
 
             if (!(_dbFactory.SqlContext.SqlSyntax is SqlServerSyntaxProvider sqlServerSyntaxProvider))
+            {
                 throw new NotSupportedException("SqlMainDomLock is only supported for Sql Server");
+            }
 
             _sqlServerSyntax = sqlServerSyntaxProvider;
 
             _logger.Debug<SqlMainDomLock>("Acquiring lock...");
 
-            var db = GetDatabase();
-
             var tempId = Guid.NewGuid().ToString();
 
+            IUmbracoDatabase db = null;
+
             try
             {
+                db = _dbFactory.CreateDatabase();
+
+                _hasTable = db.HasTable(Constants.DatabaseSchema.Tables.KeyValue);
+                if (!_hasTable)
+                {
+                    // the Db does not contain the required table, we must be in an install state we have no choice but to assume we can acquire
+                    return true;
+                }
+
                 db.BeginTransaction(IsolationLevel.ReadCommitted);
 
                 try
                 {
                     // wait to get a write lock
-                    _sqlServerSyntax.WriteLock(db, TimeSpan.FromMilliseconds(millisecondsTimeout), Constants.Locks.MainDom);                    
+                    _sqlServerSyntax.WriteLock(db, TimeSpan.FromMilliseconds(millisecondsTimeout), Constants.Locks.MainDom);
                 }
-                catch (Exception ex)
+                catch(SqlException ex)
                 {
                     if (IsLockTimeoutException(ex))
                     {
                         _logger.Error<SqlMainDomLock>(ex, "Sql timeout occurred, could not acquire MainDom.");
-                        _hasError = true;
+                        _errorDuringAcquiring = true;
                         return false;
                     }
 
@@ -82,15 +94,12 @@ namespace Umbraco.Core.Runtime
                     throw;
                 }
 
-                var result = InsertLockRecord(tempId); //we change the row to a random Id to signal other MainDom to shutdown
+                var result = InsertLockRecord(tempId, db); //we change the row to a random Id to signal other MainDom to shutdown
                 if (result == RecordPersistenceType.Insert)
                 {
                     // if we've inserted, then there was no MainDom so we can instantly acquire
 
-                    // TODO: see the other TODO, could we just delete the row and that would indicate that we
-                    // are MainDom? then we don't leave any orphan rows behind.
-
-                    InsertLockRecord(_lockId); // so update with our appdomain id
+                    InsertLockRecord(_lockId, db); // so update with our appdomain id
                     _logger.Debug<SqlMainDomLock>("Acquired with ID {LockId}", _lockId);
                     return true;
                 }
@@ -100,23 +109,24 @@ namespace Umbraco.Core.Runtime
             }
             catch (Exception ex)
             {
-                ResetDatabase();
                 // unexpected
                 _logger.Error<SqlMainDomLock>(ex, "Unexpected error, cannot acquire MainDom");
-                _hasError = true;
+                _errorDuringAcquiring = true;
                 return false;
             }
             finally
             {
                 db?.CompleteTransaction();
+                db?.Dispose();
             }
 
+
             return await WaitForExistingAsync(tempId, millisecondsTimeout);
         }
 
         public Task ListenAsync()
         {
-            if (_hasError)
+            if (_errorDuringAcquiring)
             {
                 _logger.Warn<SqlMainDomLock>("Could not acquire MainDom, listening is canceled.");
                 return Task.CompletedTask;
@@ -124,7 +134,12 @@ namespace Umbraco.Core.Runtime
 
             // Create a long running task (dedicated thread)
             // to poll to check if we are still the MainDom registered in the DB
-            return Task.Factory.StartNew(ListeningLoop, _cancellationTokenSource.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+            return Task.Factory.StartNew(
+                ListeningLoop,
+                _cancellationTokenSource.Token,
+                TaskCreationOptions.LongRunning,
+                // Must explicitly specify this, see https://blog.stephencleary.com/2013/10/continuewith-is-dangerous-too.html
+                TaskScheduler.Default);
 
         }
 
@@ -142,8 +157,9 @@ namespace Umbraco.Core.Runtime
         {
             while (true)
             {
-                // poll every 1 second
-                Thread.Sleep(1000);
+                // poll every couple of seconds
+                // local testing shows the actual query to be executed from client/server is approx 300ms but would change depending on environment/IO
+                Thread.Sleep(2000);
 
                 if (!_dbFactory.Configured)
                 {
@@ -158,22 +174,33 @@ namespace Umbraco.Core.Runtime
                     // the other MainDom is taking to startup. In this case the db row will just be deleted and the
                     // new MainDom will just take over.
                     if (_cancellationTokenSource.IsCancellationRequested)
+                    {
+                        _logger.Debug<SqlMainDomLock>("Task canceled, exiting loop");
                         return;
-
-                    var db = GetDatabase();
+                    }
+                    IUmbracoDatabase db = null;
 
                     try
                     {
-                        db.BeginTransaction(IsolationLevel.ReadCommitted);
+                        db = _dbFactory.CreateDatabase();
 
+                        if (!_hasTable)
+                        {
+                            // re-check if its still false, we don't want to re-query once we know its there since this
+                            // loop needs to use minimal resources
+                            _hasTable = db.HasTable(Constants.DatabaseSchema.Tables.KeyValue);
+                            if (!_hasTable)
+                            {
+                                // the Db does not contain the required table, we just keep looping since we can't query the db
+                                continue;
+                            }
+                        }
+
+                        db.BeginTransaction(IsolationLevel.ReadCommitted);
                         // get a read lock
                         _sqlServerSyntax.ReadLock(db, Constants.Locks.MainDom);
 
-                        // TODO: We could in theory just check if the main dom row doesn't exist, that could indicate that
-                        // we are still the maindom. An empty value might be better because then we won't have any orphan rows
-                        // if the app is terminated. Could that work?
-
-                        if (!IsMainDomValue(_lockId))
+                        if (!IsMainDomValue(_lockId, db))
                         {
                             // we are no longer main dom, another one has come online, exit
                             _mainDomChanging = true;
@@ -183,38 +210,26 @@ namespace Umbraco.Core.Runtime
                     }
                     catch (Exception ex)
                     {
-                        ResetDatabase();
-                        // unexpected
-                        _logger.Error<SqlMainDomLock>(ex, "Unexpected error, listening is canceled.");
-                        _hasError = true;
-                        return;
+                        _logger.Error<SqlMainDomLock>(ex, "Unexpected error during listening.");
+
+                        // We need to keep on listening unless we've been notified by our own AppDomain to shutdown since
+                        // we don't want to shutdown resources controlled by MainDom inadvertently. We'll just keep listening otherwise.
+                        if (_cancellationTokenSource.IsCancellationRequested)
+                        {
+                            _logger.Debug<SqlMainDomLock>("Task canceled, exiting loop");
+                            return;
+                        }
                     }
                     finally
                     {
                         db?.CompleteTransaction();
+                        db?.Dispose();
                     }
                 }
 
             }
         }
 
-        private void ResetDatabase()
-        {
-            if (_db.InTransaction)
-                _db.AbortTransaction();
-            _db.Dispose();
-            _db = null;
-        }
-
-        private IUmbracoDatabase GetDatabase()
-        {
-            if (_db != null)
-                return _db;
-
-            _db = _dbFactory.CreateDatabase();
-            return _db;
-        }
-
         /// <summary>
         /// Wait for any existing MainDom to release so we can continue booting
         /// </summary>
@@ -227,121 +242,151 @@ namespace Umbraco.Core.Runtime
 
             return Task.Run(() =>
             {
-                var db = GetDatabase();
-                var watch = new Stopwatch();
-                watch.Start();
-                while(true)
+                try
                 {
-                    // poll very often, we need to take over as fast as we can
-                    Thread.Sleep(100);
+                    using var db = _dbFactory.CreateDatabase();
 
-                    try
+                    var watch = new Stopwatch();
+                    watch.Start();
+                    while (true)
                     {
-                        db.BeginTransaction(IsolationLevel.ReadCommitted);
+                        // poll very often, we need to take over as fast as we can
+                        // local testing shows the actual query to be executed from client/server is approx 300ms but would change depending on environment/IO
+                        Thread.Sleep(1000);
 
-                        // get a read lock
-                        _sqlServerSyntax.ReadLock(db, Constants.Locks.MainDom);
+                        var acquired = TryAcquire(db, tempId, updatedTempId);
+                        if (acquired.HasValue)
+                            return acquired.Value;
 
-                        // the row 
-                        var mainDomRows = db.Fetch<KeyValueDto>("SELECT * FROM umbracoKeyValue WHERE [key] = @key", new { key = MainDomKey });
-
-                        if (mainDomRows.Count == 0 || mainDomRows[0].Value == updatedTempId)
+                        if (watch.ElapsedMilliseconds >= millisecondsTimeout)
                         {
-                            // the other main dom has updated our record
-                            // Or the other maindom shutdown super fast and just deleted the record
-                            // which indicates that we
-                            // can acquire it and it has shutdown.
-
-                            _sqlServerSyntax.WriteLock(db, Constants.Locks.MainDom);
-
-                            // so now we update the row with our appdomain id
-                            InsertLockRecord(_lockId);
-                            _logger.Debug<SqlMainDomLock>("Acquired with ID {LockId}", _lockId);
-                            return true; 
-                        }
-                        else if (mainDomRows.Count == 1 && !mainDomRows[0].Value.StartsWith(tempId))
-                        {
-                            // in this case, the prefixed ID is different which  means
-                            // another new AppDomain has come online and is wanting to take over. In that case, we will not
-                            // acquire.
-
-                            _logger.Debug<SqlMainDomLock>("Cannot acquire, another booting application detected.");
-
-                            return false;
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        ResetDatabase();
-
-                        if (IsLockTimeoutException(ex))
-                        {
-                            _logger.Error<SqlMainDomLock>(ex, "Sql timeout occurred, waiting for existing MainDom is canceled.");
-                            _hasError = true;
-                            return false;
-                        }
-                        // unexpected
-                        _logger.Error<SqlMainDomLock>(ex, "Unexpected error, waiting for existing MainDom is canceled.");
-                        _hasError = true;
-                        return false;
-                    }
-                    finally
-                    {
-                        db?.CompleteTransaction();
-                    }
-
-                    if (watch.ElapsedMilliseconds >= millisecondsTimeout)
-                    {
-                        // if the timeout has elapsed, it either means that the other main dom is taking too long to shutdown,
-                        // or it could mean that the previous appdomain was terminated and didn't clear out the main dom SQL row
-                        // and it's just been left as an orphan row.
-                        // There's really know way of knowing unless we are constantly updating the row for the current maindom
-                        // which isn't ideal.
-                        // So... we're going to 'just' take over, if the writelock works then we'll assume we're ok
-
-                        _logger.Debug<SqlMainDomLock>("Timeout elapsed, assuming orphan row, acquiring MainDom.");
-
-                        try
-                        {
-                            db.BeginTransaction(IsolationLevel.ReadCommitted);
-
-                            _sqlServerSyntax.WriteLock(db, Constants.Locks.MainDom);
-
-                            // so now we update the row with our appdomain id
-                            InsertLockRecord(_lockId);
-                            _logger.Debug<SqlMainDomLock>("Acquired with ID {LockId}", _lockId);
-                            return true;
-                        }
-                        catch (Exception ex)
-                        {
-                            ResetDatabase();
-
-                            if (IsLockTimeoutException(ex))
-                            {
-                                // something is wrong, we cannot acquire, not much we can do
-                                _logger.Error<SqlMainDomLock>(ex, "Sql timeout occurred, could not forcibly acquire MainDom.");
-                                _hasError = true;
-                                return false;
-                            }
-                            _logger.Error<SqlMainDomLock>(ex, "Unexpected error, could not forcibly acquire MainDom.");
-                            _hasError = true;
-                            return false;
-                        }
-                        finally
-                        {
-                            db?.CompleteTransaction();
+                            return AcquireWhenMaxWaitTimeElapsed(db);
                         }
                     }
                 }
+                catch (Exception ex)
+                {
+                    _logger.Error<SqlMainDomLock>(ex, "An error occurred trying to acquire and waiting for existing SqlMainDomLock to shutdown");
+                    return false;
+                }
+
             }, _cancellationTokenSource.Token);
         }
 
-        /// <summary>
-        /// Inserts or updates the key/value row 
-        /// </summary>
-        private RecordPersistenceType InsertLockRecord(string id)
+        private bool? TryAcquire(IUmbracoDatabase db, string tempId, string updatedTempId)
+        {
+            // Creates a separate transaction to the DB instance so we aren't allocating tons of new DB instances for each transaction
+            // since this is executed in a tight loop
+
+            ITransaction transaction = null;
+
+            try
+            {
+                transaction = db.GetTransaction(IsolationLevel.ReadCommitted);
+                // get a read lock
+                _sqlServerSyntax.ReadLock(db, Constants.Locks.MainDom);
+
+                // the row
+                var mainDomRows = db.Fetch<KeyValueDto>("SELECT * FROM umbracoKeyValue WHERE [key] = @key", new { key = MainDomKey });
+
+                if (mainDomRows.Count == 0 || mainDomRows[0].Value == updatedTempId)
+                {
+                    // the other main dom has updated our record
+                    // Or the other maindom shutdown super fast and just deleted the record
+                    // which indicates that we
+                    // can acquire it and it has shutdown.
+
+                    _sqlServerSyntax.WriteLock(db, Constants.Locks.MainDom);
+
+                    // so now we update the row with our appdomain id
+                    InsertLockRecord(_lockId, db);
+                    _logger.Debug<SqlMainDomLock>("Acquired with ID {LockId}", _lockId);
+                    return true;
+                }
+                else if (mainDomRows.Count == 1 && !mainDomRows[0].Value.StartsWith(tempId))
+                {
+                    // in this case, the prefixed ID is different which  means
+                    // another new AppDomain has come online and is wanting to take over. In that case, we will not
+                    // acquire.
+
+                    _logger.Debug<SqlMainDomLock>("Cannot acquire, another booting application detected.");
+                    return false;
+                }
+            }
+            catch (Exception ex)
+            {
+                if (IsLockTimeoutException(ex as SqlException))
+                {
+                    _logger.Error<SqlMainDomLock>(ex, "Sql timeout occurred, waiting for existing MainDom is canceled.");
+                    _errorDuringAcquiring = true;
+                    return false;
+                }
+                // unexpected
+                _logger.Error<SqlMainDomLock>(ex, "Unexpected error, waiting for existing MainDom is canceled.");
+                _errorDuringAcquiring = true;
+                return false;
+            }
+            finally
+            {
+                transaction?.Complete();
+                transaction?.Dispose();
+            }
+
+            return null; // continue
+        }
+
+        private bool AcquireWhenMaxWaitTimeElapsed(IUmbracoDatabase db)
+        {
+            // Creates a separate transaction to the DB instance so we aren't allocating tons of new DB instances for each transaction
+            // since this is executed in a tight loop
+
+            // if the timeout has elapsed, it either means that the other main dom is taking too long to shutdown,
+            // or it could mean that the previous appdomain was terminated and didn't clear out the main dom SQL row
+            // and it's just been left as an orphan row.
+            // There's really know way of knowing unless we are constantly updating the row for the current maindom
+            // which isn't ideal.
+            // So... we're going to 'just' take over, if the writelock works then we'll assume we're ok
+
+            _logger.Debug<SqlMainDomLock>("Timeout elapsed, assuming orphan row, acquiring MainDom.");
+
+            ITransaction transaction = null;
+
+            try
+            {
+                transaction = db.GetTransaction(IsolationLevel.ReadCommitted);
+
+                _sqlServerSyntax.WriteLock(db, Constants.Locks.MainDom);
+
+                // so now we update the row with our appdomain id
+                InsertLockRecord(_lockId, db);
+                _logger.Debug<SqlMainDomLock>("Acquired with ID {LockId}", _lockId);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                if (IsLockTimeoutException(ex as SqlException))
+                {
+                    // something is wrong, we cannot acquire, not much we can do
+                    _logger.Error<SqlMainDomLock>(ex, "Sql timeout occurred, could not forcibly acquire MainDom.");
+                    _errorDuringAcquiring = true;
+                    return false;
+                }
+                _logger.Error<SqlMainDomLock>(ex, "Unexpected error, could not forcibly acquire MainDom.");
+                _errorDuringAcquiring = true;
+                return false;
+            }
+            finally
+            {
+                transaction?.Complete();
+                transaction?.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Inserts or updates the key/value row
+        /// </summary>
+        private RecordPersistenceType InsertLockRecord(string id, IUmbracoDatabase db)
         {
-            var db = GetDatabase();
             return db.InsertOrUpdate(new KeyValueDto
             {
                 Key = MainDomKey,
@@ -354,9 +399,8 @@ namespace Umbraco.Core.Runtime
         /// Checks if the DB row value is equals the value
         /// </summary>
         /// <returns></returns>
-        private bool IsMainDomValue(string val)
+        private bool IsMainDomValue(string val, IUmbracoDatabase db)
         {
-            var db = GetDatabase();
             return db.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoKeyValue WHERE [key] = @key AND [value] = @val",
                 new { key = MainDomKey, val = val }) == 1;
         }
@@ -366,7 +410,7 @@ namespace Umbraco.Core.Runtime
         /// </summary>
         /// <param name="exception"></param>
         /// <returns></returns>
-        private bool IsLockTimeoutException(Exception exception) => exception is SqlException sqlException && sqlException.Number == 1222;
+        private bool IsLockTimeoutException(SqlException sqlException) => sqlException?.Number == 1222;
 
         #region IDisposable Support
         private bool _disposedValue = false; // To detect redundant calls
@@ -379,15 +423,18 @@ namespace Umbraco.Core.Runtime
                 {
                     lock (_locker)
                     {
+                        _logger.Debug<SqlMainDomLock>($"{nameof(SqlMainDomLock)} Disposing...");
+
                         // immediately cancel all sub-tasks, we don't want them to keep querying
                         _cancellationTokenSource.Cancel();
                         _cancellationTokenSource.Dispose();
 
-                        if (_dbFactory.Configured)
+                        if (_dbFactory.Configured && _hasTable)
                         {
-                            var db = GetDatabase();
+                            IUmbracoDatabase db = null;
                             try
                             {
+                                db = _dbFactory.CreateDatabase();
                                 db.BeginTransaction(IsolationLevel.ReadCommitted);
 
                                 // get a write lock
@@ -402,24 +449,29 @@ namespace Umbraco.Core.Runtime
                                 if (_mainDomChanging)
                                 {
                                     _logger.Debug<SqlMainDomLock>("Releasing MainDom, updating row, new application is booting.");
-                                    db.Execute($"UPDATE umbracoKeyValue SET [value] = [value] + '{UpdatedSuffix}' WHERE [key] = @key", new { key = MainDomKey });
+                                    var count = db.Execute($"UPDATE umbracoKeyValue SET [value] = [value] + '{UpdatedSuffix}' WHERE [key] = @key", new { key = MainDomKey });
                                 }
                                 else
                                 {
                                     _logger.Debug<SqlMainDomLock>("Releasing MainDom, deleting row, application is shutting down.");
-                                    db.Execute("DELETE FROM umbracoKeyValue WHERE [key] = @key", new { key = MainDomKey });
+                                    var count = db.Execute("DELETE FROM umbracoKeyValue WHERE [key] = @key", new { key = MainDomKey });
                                 }
                             }
                             catch (Exception ex)
                             {
-                                ResetDatabase();
                                 _logger.Error<SqlMainDomLock>(ex, "Unexpected error during dipsose.");
-                                _hasError = true;
                             }
                             finally
                             {
-                                db?.CompleteTransaction();
-                                ResetDatabase();
+                                try
+                                {
+                                    db?.CompleteTransaction();
+                                    db?.Dispose();
+                                }
+                                catch (Exception ex)
+                                {
+                                    _logger.Error<SqlMainDomLock>(ex, "Unexpected error during dispose when completing transaction.");
+                                }
                             }
                         }
                     }
diff --git a/src/Umbraco.Core/RuntimeOptions.cs b/src/Umbraco.Core/RuntimeOptions.cs
index c0bae23446..6183f62c1c 100644
--- a/src/Umbraco.Core/RuntimeOptions.cs
+++ b/src/Umbraco.Core/RuntimeOptions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Configuration;
 using System.Runtime.CompilerServices;
 using Umbraco.Core.Cache;
@@ -21,6 +22,8 @@ namespace Umbraco.Core
         private static List<Action<Composition, AppCaches, TypeLoader, IUmbracoDatabaseFactory>> _onEssentials;
         private static bool? _installMissingDatabase;
         private static bool? _installEmptyDatabase;
+        private static bool? _installUnattended;
+        private static bool? _upgradeUnattended;
 
         // reads a boolean appSetting
         private static bool BoolSetting(string key, bool missing) => ConfigurationManager.AppSettings[key]?.InvariantEquals("true") ?? missing;
@@ -37,24 +40,40 @@ namespace Umbraco.Core
         /// </remarks>
         public static bool InstallMissingDatabase
         {
-            get => _installEmptyDatabase ?? BoolSetting("Umbraco.Core.RuntimeState.InstallMissingDatabase", false);
-            set => _installEmptyDatabase = value;
+            get => _installMissingDatabase ?? BoolSetting("Umbraco.Core.RuntimeState.InstallMissingDatabase", false);
+            set => _installMissingDatabase = value;
+        }
+
+        [Obsolete("This setting is no longer used and will be removed in future versions. If a database connection string is configured and the database is empty Umbraco will be installed during the installation sequence.")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static bool InstallEmptyDatabase
+        {
+            get => _installEmptyDatabase ?? BoolSetting("Umbraco.Core.RuntimeState.InstallEmptyDatabase", true);
+            set => _installEmptyDatabase  = value;
         }
 
         /// <summary>
-        /// Gets a value indicating whether the runtime should enter Install level when the database is empty.
+        /// Gets a value indicating whether unattended installs are enabled.
         /// </summary>
         /// <remarks>
         /// <para>By default, when a database connection string is configured and it is possible to connect to
-        /// the database, but the database is empty, the runtime enters the BootFailed level. If this options
-        /// is set to true, it enters the Install level instead.</para>
-        /// <para>It is then up to the implementor, that is setting this value, to take over the installation
-        /// sequence.</para>
+        /// the database, but the database is empty, the runtime enters the <c>Install</c> level.
+        /// If this option is set to <c>true</c> an unattended install will be performed and the runtime enters
+        /// the <c>Run</c> level.</para>
         /// </remarks>
-        public static bool InstallEmptyDatabase
+        public static bool InstallUnattended
         {
-            get => _installMissingDatabase ?? BoolSetting("Umbraco.Core.RuntimeState.InstallEmptyDatabase", false);
-            set => _installMissingDatabase = value;
+            get => _installUnattended ?? BoolSetting("Umbraco.Core.RuntimeState.InstallUnattended", false);
+            set => _installUnattended = value;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether unattended upgrade is enabled.
+        /// </summary>
+        public static bool UpgradeUnattended
+        {
+            get => _upgradeUnattended ?? BoolSetting("Umbraco.Core.RuntimeState.UpgradeUnattended", false);
+            set => _upgradeUnattended = value;
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/RuntimeState.cs b/src/Umbraco.Core/RuntimeState.cs
index 74ec70828b..c7a1a18d44 100644
--- a/src/Umbraco.Core/RuntimeState.cs
+++ b/src/Umbraco.Core/RuntimeState.cs
@@ -1,4 +1,7 @@
 using System;
+using System.Data.Common;
+using System.Data.SqlClient;
+using System.Data.SqlServerCe;
 using System.Threading;
 using System.Web;
 using Semver;
@@ -102,7 +105,7 @@ namespace Umbraco.Core
             // about this is that this is here specifically for the slot swap scenario https://issues.umbraco.org/issue/U4-10626
 
 
-            // see U4-10626 - in some cases we want to reset the application url
+            // see U4-10626 - in some cases we want to reset the application URL
             // (this is a simplified version of what was in 7.x)
             // note: should this be optional? is it expensive?
             var url = request == null ? null : ApplicationUrlHelper.GetApplicationUrlFromCurrentRequest(request, _globalSettings);
@@ -123,16 +126,15 @@ namespace Umbraco.Core
         /// <summary>
         /// Determines the runtime level.
         /// </summary>
-        public void DetermineRuntimeLevel(IUmbracoDatabaseFactory databaseFactory, ILogger logger)
+        public void DetermineRuntimeLevel(IUmbracoDatabaseFactory databaseFactory)
         {
             var localVersion = UmbracoVersion.LocalVersion; // the local, files, version
             var codeVersion = SemanticVersion; // the executing code version
-            var connect = false;
 
             if (localVersion == null)
             {
                 // there is no local version, we are not installed
-                logger.Debug<RuntimeState>("No local version, need to install Umbraco.");
+                _logger.Debug<RuntimeState>("No local version, need to install Umbraco.");
                 Level = RuntimeLevel.Install;
                 Reason = RuntimeLevelReason.InstallNoVersion;
                 return;
@@ -142,13 +144,13 @@ namespace Umbraco.Core
             {
                 // there *is* a local version, but it does not match the code version
                 // need to upgrade
-                logger.Debug<RuntimeState>("Local version '{LocalVersion}' < code version '{CodeVersion}', need to upgrade Umbraco.", localVersion, codeVersion);
+                _logger.Debug<RuntimeState>("Local version '{LocalVersion}' < code version '{CodeVersion}', need to upgrade Umbraco.", localVersion, codeVersion);
                 Level = RuntimeLevel.Upgrade;
                 Reason = RuntimeLevelReason.UpgradeOldVersion;
             }
             else if (localVersion > codeVersion)
             {
-                logger.Warn<RuntimeState>("Local version '{LocalVersion}' > code version '{CodeVersion}', downgrading is not supported.", localVersion, codeVersion);
+                _logger.Warn<RuntimeState>("Local version '{LocalVersion}' > code version '{CodeVersion}', downgrading is not supported.", localVersion, codeVersion);
 
                 // in fact, this is bad enough that we want to throw
                 Reason = RuntimeLevelReason.BootFailedCannotDowngrade;
@@ -158,108 +160,139 @@ namespace Umbraco.Core
             {
                 // local version *does* match code version, but the database is not configured
                 // install - may happen with Deploy/Cloud/etc
-                logger.Debug<RuntimeState>("Database is not configured, need to install Umbraco.");
+                _logger.Debug<RuntimeState>("Database is not configured, need to install Umbraco.");
                 Level = RuntimeLevel.Install;
                 Reason = RuntimeLevelReason.InstallNoDatabase;
                 return;
             }
 
-            // else, keep going,
-            // anything other than install wants a database - see if we can connect
-            // (since this is an already existing database, assume localdb is ready)
-            var tries = RuntimeOptions.InstallMissingDatabase ? 2 : 5;
-            for (var i = 0;;)
+            // Check the database state, whether we can connect or if it's in an upgrade or empty state, etc...
+
+            switch (GetUmbracoDatabaseState(databaseFactory))
             {
-                connect = databaseFactory.CanConnect;
-                if (connect || ++i == tries) break;
-                logger.Debug<RuntimeState>("Could not immediately connect to database, trying again.");
-                Thread.Sleep(1000);
+                case UmbracoDatabaseState.CannotConnect:
+                    {
+                        // cannot connect to configured database, this is bad, fail
+                        _logger.Debug<RuntimeState>("Could not connect to database.");
+
+                        if (RuntimeOptions.InstallMissingDatabase)
+                        {
+                            // ok to install on a configured but missing database
+                            Level = RuntimeLevel.Install;
+                            Reason = RuntimeLevelReason.InstallMissingDatabase;
+                            return;
+                        }
+
+                        // else it is bad enough that we want to throw
+                        Reason = RuntimeLevelReason.BootFailedCannotConnectToDatabase;
+                        throw new BootFailedException("A connection string is configured but Umbraco could not connect to the database.");
+                    }
+                case UmbracoDatabaseState.NotInstalled:
+                    {
+                        // ok to install on an empty database
+                        Level = RuntimeLevel.Install;
+                        Reason = RuntimeLevelReason.InstallEmptyDatabase;
+                        return;
+                    }
+                case UmbracoDatabaseState.NeedsUpgrade:
+                    {
+                        // the db version does not match... but we do have a migration table
+                        // so, at least one valid table, so we quite probably are installed & need to upgrade
+
+                        // although the files version matches the code version, the database version does not
+                        // which means the local files have been upgraded but not the database - need to upgrade
+                        _logger.Debug<RuntimeState>("Has not reached the final upgrade step, need to upgrade Umbraco.");
+                        Level = RuntimeOptions.UpgradeUnattended ? RuntimeLevel.Run : RuntimeLevel.Upgrade;
+                        Reason = RuntimeLevelReason.UpgradeMigrations;
+                    }
+                    break;
+                case UmbracoDatabaseState.Ok:
+                default:
+                    {
+                        // if we already know we want to upgrade, exit here
+                        if (Level == RuntimeLevel.Upgrade)
+                            return;
+
+                        // the database version matches the code & files version, all clear, can run
+                        Level = RuntimeLevel.Run;
+                        Reason = RuntimeLevelReason.Run;
+                    }
+                    break;
             }
+        }
 
-            if (connect == false)
-            {
-                // cannot connect to configured database, this is bad, fail
-                logger.Debug<RuntimeState>("Could not connect to database.");
+        private enum UmbracoDatabaseState
+        {
+            Ok,
+            CannotConnect,
+            NotInstalled,
+            NeedsUpgrade
+        }
 
-                if (RuntimeOptions.InstallMissingDatabase)
-                {
-                    // ok to install on a configured but missing database
-                    Level = RuntimeLevel.Install;
-                    Reason = RuntimeLevelReason.InstallMissingDatabase;
-                    return;
-                }
-
-                // else it is bad enough that we want to throw
-                Reason = RuntimeLevelReason.BootFailedCannotConnectToDatabase;
-                throw new BootFailedException("A connection string is configured but Umbraco could not connect to the database.");
-            }
-
-            // if we already know we want to upgrade,
-            // still run EnsureUmbracoUpgradeState to get the states
-            // (v7 will just get a null state, that's ok)
-
-            // else
-            // look for a matching migration entry - bypassing services entirely - they are not 'up' yet
-            bool noUpgrade;
+        private UmbracoDatabaseState GetUmbracoDatabaseState(IUmbracoDatabaseFactory databaseFactory)
+        {
             try
             {
-                noUpgrade = EnsureUmbracoUpgradeState(databaseFactory, logger);
+                if (!TryDbConnect(databaseFactory))
+                {
+                    return UmbracoDatabaseState.CannotConnect;
+                }
+
+                // no scope, no service - just directly accessing the database
+                using (var database = databaseFactory.CreateDatabase())
+                {
+                    if (!database.IsUmbracoInstalled(_logger))
+                    {
+                        return UmbracoDatabaseState.NotInstalled;
+                    }
+
+                    if (DoesUmbracoRequireUpgrade(database))
+                    {
+                        return UmbracoDatabaseState.NeedsUpgrade;
+                    }
+                }
+
+                return UmbracoDatabaseState.Ok;
             }
             catch (Exception e)
             {
-                // can connect to the database but cannot check the upgrade state... oops
-                logger.Warn<RuntimeState>(e, "Could not check the upgrade state.");
-
-                if (RuntimeOptions.InstallEmptyDatabase)
-                {
-                    // ok to install on an empty database
-                    Level = RuntimeLevel.Install;
-                    Reason = RuntimeLevelReason.InstallEmptyDatabase;
-                    return;
-                }
+                // can connect to the database so cannot check the upgrade state... oops
+                _logger.Warn<RuntimeState>(e, "Could not check the upgrade state.");
 
                 // else it is bad enough that we want to throw
                 Reason = RuntimeLevelReason.BootFailedCannotCheckUpgradeState;
                 throw new BootFailedException("Could not check the upgrade state.", e);
             }
-
-            // if we already know we want to upgrade, exit here
-            if (Level == RuntimeLevel.Upgrade)
-                return;
-
-            if (noUpgrade)
-            {
-                // the database version matches the code & files version, all clear, can run
-                Level = RuntimeLevel.Run;
-                Reason = RuntimeLevelReason.Run;
-                return;
-            }
-
-            // the db version does not match... but we do have a migration table
-            // so, at least one valid table, so we quite probably are installed & need to upgrade
-
-            // although the files version matches the code version, the database version does not
-            // which means the local files have been upgraded but not the database - need to upgrade
-            logger.Debug<RuntimeState>("Has not reached the final upgrade step, need to upgrade Umbraco.");
-            Level = RuntimeLevel.Upgrade;
-            Reason = RuntimeLevelReason.UpgradeMigrations;
         }
 
-        protected virtual bool EnsureUmbracoUpgradeState(IUmbracoDatabaseFactory databaseFactory, ILogger logger)
+        private bool TryDbConnect(IUmbracoDatabaseFactory databaseFactory)
+        {
+            // anything other than install wants a database - see if we can connect
+            // (since this is an already existing database, assume localdb is ready)
+            bool canConnect;
+            var tries = RuntimeOptions.InstallMissingDatabase ? 2 : 5;
+            for (var i = 0; ;)
+            {
+                canConnect = databaseFactory.CanConnect;
+                if (canConnect || ++i == tries) break;
+                _logger.Debug<RuntimeState>("Could not immediately connect to database, trying again.");
+                Thread.Sleep(1000);
+            }
+
+            return canConnect;
+        }
+
+        private bool DoesUmbracoRequireUpgrade(IUmbracoDatabase database)
         {
             var upgrader = new Upgrader(new UmbracoPlan());
             var stateValueKey = upgrader.StateValueKey;
 
-            // no scope, no service - just directly accessing the database
-            using (var database = databaseFactory.CreateDatabase())
-            {
-                CurrentMigrationState = KeyValueService.GetValue(database, stateValueKey);
-                FinalMigrationState = upgrader.Plan.FinalState;
-            }
+            CurrentMigrationState = KeyValueService.GetValue(database, stateValueKey);
+            FinalMigrationState = upgrader.Plan.FinalState;
 
-            logger.Debug<RuntimeState>("Final upgrade state is {FinalMigrationState}, database contains {DatabaseState}", FinalMigrationState, CurrentMigrationState ?? "<null>");
+            _logger.Debug<RuntimeState>("Final upgrade state is {FinalMigrationState}, database contains {DatabaseState}", FinalMigrationState, CurrentMigrationState ?? "<null>");
 
-            return CurrentMigrationState == FinalMigrationState;
+            return CurrentMigrationState != FinalMigrationState;
         }
     }
 }
diff --git a/src/Umbraco.Core/Security/BackOfficeUserStore.cs b/src/Umbraco.Core/Security/BackOfficeUserStore.cs
index dc271452e1..7df328b5b7 100644
--- a/src/Umbraco.Core/Security/BackOfficeUserStore.cs
+++ b/src/Umbraco.Core/Security/BackOfficeUserStore.cs
@@ -96,9 +96,10 @@ namespace Umbraco.Core.Security
                 IsLockedOut = user.IsLockedOut,
             };
 
-            UpdateMemberProperties(userEntity, user);
+            // we have to remember whether Logins property is dirty, since the UpdateMemberProperties will reset it.
+            var isLoginsPropertyDirty = user.IsPropertyDirty(nameof(BackOfficeIdentityUser.Logins));
 
-            // TODO: We should deal with Roles --> User Groups here which we currently are not doing
+            UpdateMemberProperties(userEntity, user);
 
             _userService.Save(userEntity);
 
@@ -107,6 +108,16 @@ namespace Umbraco.Core.Security
             //re-assign id
             user.Id = userEntity.Id;
 
+            if (isLoginsPropertyDirty)
+            {
+                _externalLoginService.Save(
+                    user.Id,
+                    user.Logins.Select(x => new ExternalLogin(
+                        x.LoginProvider,
+                        x.ProviderKey,
+                        (x is IIdentityUserLoginExtended extended) ? extended.UserData : null)));
+            }
+
             return Task.FromResult(0);
         }
 
@@ -115,7 +126,7 @@ namespace Umbraco.Core.Security
         /// </summary>
         /// <param name="user"/>
         /// <returns/>
-        public async Task UpdateAsync(BackOfficeIdentityUser user)
+        public Task UpdateAsync(BackOfficeIdentityUser user)
         {
             ThrowIfDisposed();
             if (user == null) throw new ArgumentNullException(nameof(user));
@@ -126,11 +137,13 @@ namespace Umbraco.Core.Security
                 throw new InvalidOperationException("The user id must be an integer to work with the Umbraco");
             }
 
+            // TODO: Wrap this in a scope!
+
             var found = _userService.GetUserById(asInt.Result);
             if (found != null)
             {
                 // we have to remember whether Logins property is dirty, since the UpdateMemberProperties will reset it.
-                var isLoginsPropertyDirty = user.IsPropertyDirty("Logins");
+                var isLoginsPropertyDirty = user.IsPropertyDirty(nameof(BackOfficeIdentityUser.Logins));
 
                 if (UpdateMemberProperties(found, user))
                 {
@@ -139,10 +152,16 @@ namespace Umbraco.Core.Security
 
                 if (isLoginsPropertyDirty)
                 {
-                    var logins = await GetLoginsAsync(user);
-                    _externalLoginService.SaveUserLogins(found.Id, logins);
+                    _externalLoginService.Save(
+                        found.Id,
+                        user.Logins.Select(x => new ExternalLogin(
+                            x.LoginProvider,
+                            x.ProviderKey,
+                            (x is IIdentityUserLoginExtended extended) ? extended.UserData : null)));                    
                 }
             }
+
+            return Task.CompletedTask;
         }
 
         /// <summary>
@@ -382,7 +401,7 @@ namespace Umbraco.Core.Security
             if (login == null) throw new ArgumentNullException(nameof(login));
 
             //get all logins associated with the login id
-            var result = _externalLoginService.Find(login).ToArray();
+            var result = _externalLoginService.Find(login.LoginProvider, login.ProviderKey).ToArray();
             if (result.Any())
             {
                 //return the first user that matches the result
@@ -633,7 +652,7 @@ namespace Umbraco.Core.Security
 
             //don't assign anything if nothing has changed as this will trigger the track changes of the model
 
-            if (identityUser.IsPropertyDirty("LastLoginDateUtc")
+            if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.LastLoginDateUtc))
                 || (user.LastLoginDate != default(DateTime) && identityUser.LastLoginDateUtc.HasValue == false)
                 || identityUser.LastLoginDateUtc.HasValue && user.LastLoginDate.ToUniversalTime() != identityUser.LastLoginDateUtc.Value)
             {
@@ -642,33 +661,33 @@ namespace Umbraco.Core.Security
                 var dt = identityUser.LastLoginDateUtc == DateTime.MinValue ? DateTime.MinValue : identityUser.LastLoginDateUtc.Value.ToLocalTime();
                 user.LastLoginDate = dt;
             }
-            if (identityUser.IsPropertyDirty("LastPasswordChangeDateUtc")
+            if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.LastPasswordChangeDateUtc))
                 || (user.LastPasswordChangeDate != default(DateTime) && identityUser.LastPasswordChangeDateUtc.HasValue == false)
                 || identityUser.LastPasswordChangeDateUtc.HasValue && user.LastPasswordChangeDate.ToUniversalTime() != identityUser.LastPasswordChangeDateUtc.Value)
             {
                 anythingChanged = true;
                 user.LastPasswordChangeDate = identityUser.LastPasswordChangeDateUtc.Value.ToLocalTime();
             }
-            if (identityUser.IsPropertyDirty("EmailConfirmed")
+            if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.EmailConfirmed))
                 || (user.EmailConfirmedDate.HasValue && user.EmailConfirmedDate.Value != default(DateTime) && identityUser.EmailConfirmed == false)
                 || ((user.EmailConfirmedDate.HasValue == false || user.EmailConfirmedDate.Value == default(DateTime)) && identityUser.EmailConfirmed))
             {
                 anythingChanged = true;
                 user.EmailConfirmedDate = identityUser.EmailConfirmed ? (DateTime?)DateTime.Now : null;
             }
-            if (identityUser.IsPropertyDirty("Name")
+            if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.Name))
                 && user.Name != identityUser.Name && identityUser.Name.IsNullOrWhiteSpace() == false)
             {
                 anythingChanged = true;
                 user.Name = identityUser.Name;
             }
-            if (identityUser.IsPropertyDirty("Email")
+            if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.Email))
                 && user.Email != identityUser.Email && identityUser.Email.IsNullOrWhiteSpace() == false)
             {
                 anythingChanged = true;
                 user.Email = identityUser.Email;
             }
-            if (identityUser.IsPropertyDirty("AccessFailedCount")
+            if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.AccessFailedCount))
                 && user.FailedPasswordAttempts != identityUser.AccessFailedCount)
             {
                 anythingChanged = true;
@@ -686,32 +705,32 @@ namespace Umbraco.Core.Security
                 }
 
             }
-            if (identityUser.IsPropertyDirty("UserName")
+            if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.UserName))
                 && user.Username != identityUser.UserName && identityUser.UserName.IsNullOrWhiteSpace() == false)
             {
                 anythingChanged = true;
                 user.Username = identityUser.UserName;
             }
-            if (identityUser.IsPropertyDirty("PasswordHash")
+            if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.PasswordHash))
                 && user.RawPasswordValue != identityUser.PasswordHash && identityUser.PasswordHash.IsNullOrWhiteSpace() == false)
             {
                 anythingChanged = true;
                 user.RawPasswordValue = identityUser.PasswordHash;
             }
 
-            if (identityUser.IsPropertyDirty("Culture")
+            if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.Culture))
                 && user.Language != identityUser.Culture && identityUser.Culture.IsNullOrWhiteSpace() == false)
             {
                 anythingChanged = true;
                 user.Language = identityUser.Culture;
             }
-            if (identityUser.IsPropertyDirty("StartMediaIds")
+            if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.StartMediaIds))
                 && user.StartMediaIds.UnsortedSequenceEqual(identityUser.StartMediaIds) == false)
             {
                 anythingChanged = true;
                 user.StartMediaIds = identityUser.StartMediaIds;
             }
-            if (identityUser.IsPropertyDirty("StartContentIds")
+            if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.StartContentIds))
                 && user.StartContentIds.UnsortedSequenceEqual(identityUser.StartContentIds) == false)
             {
                 anythingChanged = true;
@@ -724,7 +743,7 @@ namespace Umbraco.Core.Security
             }
 
             // TODO: Fix this for Groups too
-            if (identityUser.IsPropertyDirty("Roles") || identityUser.IsPropertyDirty("Groups"))
+            if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.Roles)) || identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.Groups)))
             {
                 var userGroupAliases = user.Groups.Select(x => x.Alias).ToArray();
 
diff --git a/src/Umbraco.Core/Security/MembershipProviderBase.cs b/src/Umbraco.Core/Security/MembershipProviderBase.cs
index 633e12bcc1..0bc8de492a 100644
--- a/src/Umbraco.Core/Security/MembershipProviderBase.cs
+++ b/src/Umbraco.Core/Security/MembershipProviderBase.cs
@@ -31,7 +31,9 @@ namespace Umbraco.Core.Security
 
         public bool VerifyPassword(string password, string hashedPassword)
         {
-            if (string.IsNullOrWhiteSpace(hashedPassword)) throw new ArgumentException("Value cannot be null or whitespace.", "hashedPassword");
+            if (string.IsNullOrWhiteSpace(hashedPassword))
+                return false;
+
             return CheckPassword(password, hashedPassword);
         }
 
diff --git a/src/Umbraco.Core/Services/ContentServiceExtensions.cs b/src/Umbraco.Core/Services/ContentServiceExtensions.cs
index dfe02ba690..1d980b036b 100644
--- a/src/Umbraco.Core/Services/ContentServiceExtensions.cs
+++ b/src/Umbraco.Core/Services/ContentServiceExtensions.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Core.Services
             var matches = AnchorRegex.Matches(rteContent);
             foreach (Match match in matches)
             {
-                result.Add(match.Value.Split('\"')[1]);
+                result.Add(match.Value.Split(Constants.CharArrays.DoubleQuote)[1]);
             }
             return result;
         }
diff --git a/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs b/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs
index 37f1e5127f..06f1ae0c0e 100644
--- a/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs
+++ b/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs
@@ -37,7 +37,7 @@ namespace Umbraco.Core.Services
         /// This is required because in the case of creating/modifying a content type because new property types being added to it are not yet persisted so cannot
         /// be looked up via the db, they need to be passed in.
         /// </param>
-        /// <param name="isElement">Wether the composite content types should be applicable for an element type</param>
+        /// <param name="isElement">Whether the composite content types should be applicable for an element type</param>
         /// <returns></returns>
         internal static ContentTypeAvailableCompositionsResults GetAvailableCompositeContentTypes(this IContentTypeService ctService,
             IContentTypeComposition source,
diff --git a/src/Umbraco.Core/Services/IExternalLoginService.cs b/src/Umbraco.Core/Services/IExternalLoginService.cs
index a81543cf2d..2749ca7b8b 100644
--- a/src/Umbraco.Core/Services/IExternalLoginService.cs
+++ b/src/Umbraco.Core/Services/IExternalLoginService.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Microsoft.AspNet.Identity;
 using Umbraco.Core.Models.Identity;
 
@@ -16,20 +17,38 @@ namespace Umbraco.Core.Services
         /// <returns></returns>
         IEnumerable<IIdentityUserLogin> GetAll(int userId);
 
+        [Obsolete("Use the overload specifying loginProvider and providerKey instead")]
+        IEnumerable<IIdentityUserLogin> Find(UserLoginInfo login);
+
         /// <summary>
         /// Returns all logins matching the login info - generally there should only be one but in some cases
         /// there might be more than one depending on if an administrator has been editing/removing members
         /// </summary>
-        /// <param name="login"></param>
+        /// <param name="loginProvider"></param>
+        /// <param name="providerKey"></param>
         /// <returns></returns>
-        IEnumerable<IIdentityUserLogin> Find(UserLoginInfo login);
+        IEnumerable<IIdentityUserLogin> Find(string loginProvider, string providerKey);
+
+        [Obsolete("Use the Save method instead")]
+        void SaveUserLogins(int userId, IEnumerable<UserLoginInfo> logins);
 
         /// <summary>
-        /// Save user logins
+        /// Saves the external logins associated with the user
         /// </summary>
-        /// <param name="userId"></param>
+        /// <param name="userId">
+        /// The user associated with the logins
+        /// </param>
         /// <param name="logins"></param>
-        void SaveUserLogins(int userId, IEnumerable<UserLoginInfo> logins);
+        /// <remarks>
+        /// This will replace all external login provider information for the user
+        /// </remarks>
+        void Save(int userId, IEnumerable<IExternalLogin> logins);
+
+        /// <summary>
+        /// Save a single external login record
+        /// </summary>
+        /// <param name="login"></param>
+        void Save(IIdentityUserLoginExtended login);
 
         /// <summary>
         /// Deletes all user logins - normally used when a member is deleted
diff --git a/src/Umbraco.Core/Services/IIconService.cs b/src/Umbraco.Core/Services/IIconService.cs
new file mode 100644
index 0000000000..963edb22a5
--- /dev/null
+++ b/src/Umbraco.Core/Services/IIconService.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Services
+{
+    public interface IIconService
+    {
+        /// <summary>
+        /// Gets an IconModel containing the icon name and SvgString according to an icon name found at the global icons path
+        /// </summary>
+        /// <param name="iconName"></param>
+        /// <returns></returns>
+        IconModel GetIcon(string iconName);
+
+        /// <summary>
+        /// Gets a list of all svg icons found at at the global icons path.
+        /// </summary>
+        /// <returns></returns>
+        IList<IconModel> GetAllIcons();
+    }
+}
diff --git a/src/Umbraco.Core/Services/IMemberGroupService.cs b/src/Umbraco.Core/Services/IMemberGroupService.cs
index 6a554aad31..9261dcfdf6 100644
--- a/src/Umbraco.Core/Services/IMemberGroupService.cs
+++ b/src/Umbraco.Core/Services/IMemberGroupService.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Services
@@ -7,6 +8,7 @@ namespace Umbraco.Core.Services
     {
         IEnumerable<IMemberGroup> GetAll();
         IMemberGroup GetById(int id);
+        IMemberGroup GetById(Guid id);
         IEnumerable<IMemberGroup> GetByIds(IEnumerable<int> ids);
         IMemberGroup GetByName(string name);
         void Save(IMemberGroup memberGroup, bool raiseEvents = true);
diff --git a/src/Umbraco.Core/Services/IMembershipMemberService.cs b/src/Umbraco.Core/Services/IMembershipMemberService.cs
index 448b0c761a..3c6b4f6672 100644
--- a/src/Umbraco.Core/Services/IMembershipMemberService.cs
+++ b/src/Umbraco.Core/Services/IMembershipMemberService.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.Querying;
@@ -107,6 +108,18 @@ namespace Umbraco.Core.Services
         /// <param name="membershipUser"><see cref="IMember"/> or <see cref="IUser"/> to Delete</param>
         void Delete(T membershipUser);
 
+        /// <summary>
+        /// Sets the last login date for the member if they are found by username
+        /// </summary>
+        /// <param name="username"></param>
+        /// <param name="date"></param>
+        /// <remarks>
+        /// This is a specialized method because whenever a member logs in, the membership provider requires us to set the 'online' which requires
+        /// updating their login date. This operation must be fast and cannot use database locks which is fine if we are only executing a single query
+        /// for this data since there won't be any other data contention issues.
+        /// </remarks>
+        void SetLastLogin(string username, DateTime date);
+
         /// <summary>
         /// Saves an <see cref="IMembershipUser"/>
         /// </summary>
diff --git a/src/Umbraco.Core/Services/IRedirectUrlService.cs b/src/Umbraco.Core/Services/IRedirectUrlService.cs
index 3bd9b6f2cf..d54c9994e1 100644
--- a/src/Umbraco.Core/Services/IRedirectUrlService.cs
+++ b/src/Umbraco.Core/Services/IRedirectUrlService.cs
@@ -10,78 +10,86 @@ namespace Umbraco.Core.Services
     public interface IRedirectUrlService : IService
     {
         /// <summary>
-        /// Registers a redirect url.
+        /// Registers a redirect URL.
         /// </summary>
-        /// <param name="url">The Umbraco url route.</param>
+        /// <param name="url">The Umbraco URL route.</param>
         /// <param name="contentKey">The content unique key.</param>
         /// <param name="culture">The culture.</param>
         /// <remarks>Is a proper Umbraco route eg /path/to/foo or 123/path/tofoo.</remarks>
         void Register(string url, Guid contentKey, string culture = null);
 
         /// <summary>
-        /// Deletes all redirect urls for a given content.
+        /// Deletes all redirect URLs for a given content.
         /// </summary>
         /// <param name="contentKey">The content unique key.</param>
         void DeleteContentRedirectUrls(Guid contentKey);
 
         /// <summary>
-        /// Deletes a redirect url.
+        /// Deletes a redirect URL.
         /// </summary>
-        /// <param name="redirectUrl">The redirect url to delete.</param>
+        /// <param name="redirectUrl">The redirect URL to delete.</param>
         void Delete(IRedirectUrl redirectUrl);
 
         /// <summary>
-        /// Deletes a redirect url.
+        /// Deletes a redirect URL.
         /// </summary>
-        /// <param name="id">The redirect url identifier.</param>
+        /// <param name="id">The redirect URL identifier.</param>
         void Delete(Guid id);
 
         /// <summary>
-        /// Deletes all redirect urls.
+        /// Deletes all redirect URLs.
         /// </summary>
         void DeleteAll();
 
         /// <summary>
-        /// Gets the most recent redirect urls corresponding to an Umbraco redirect url route.
+        /// Gets the most recent redirect URLs corresponding to an Umbraco redirect URL route.
         /// </summary>
-        /// <param name="url">The Umbraco redirect url route.</param>
-        /// <returns>The most recent redirect urls corresponding to the route.</returns>
+        /// <param name="url">The Umbraco redirect URL route.</param>
+        /// <returns>The most recent redirect URLs corresponding to the route.</returns>
         IRedirectUrl GetMostRecentRedirectUrl(string url);
 
         /// <summary>
-        /// Gets all redirect urls for a content item.
+        /// Gets the most recent redirect URLs corresponding to an Umbraco redirect URL route.
+        /// </summary>
+        /// <param name="url">The Umbraco redirect URL route.</param>
+        /// <param name="culture">The culture of the request.</param>
+        /// <returns>The most recent redirect URLs corresponding to the route.</returns>
+        IRedirectUrl GetMostRecentRedirectUrl(string url, string culture);
+
+        /// <summary>
+        /// Gets all redirect URLs for a content item.
         /// </summary>
         /// <param name="contentKey">The content unique key.</param>
-        /// <returns>All redirect urls for the content item.</returns>
+        /// <returns>All redirect URLs for the content item.</returns>
         IEnumerable<IRedirectUrl> GetContentRedirectUrls(Guid contentKey);
 
         /// <summary>
-        /// Gets all redirect urls.
+        /// Gets all redirect URLs.
         /// </summary>
         /// <param name="pageIndex">The page index.</param>
         /// <param name="pageSize">The page size.</param>
-        /// <param name="total">The total count of redirect urls.</param>
-        /// <returns>The redirect urls.</returns>
+        /// <param name="total">The total count of redirect URLs.</param>
+        /// <returns>The redirect URLs.</returns>
         IEnumerable<IRedirectUrl> GetAllRedirectUrls(long pageIndex, int pageSize, out long total);
 
         /// <summary>
-        /// Gets all redirect urls below a given content item.
+        /// Gets all redirect URLs below a given content item.
         /// </summary>
         /// <param name="rootContentId">The content unique identifier.</param>
         /// <param name="pageIndex">The page index.</param>
         /// <param name="pageSize">The page size.</param>
-        /// <param name="total">The total count of redirect urls.</param>
-        /// <returns>The redirect urls.</returns>
+        /// <param name="total">The total count of redirect URLs.</param>
+        /// <returns>The redirect URLs.</returns>
         IEnumerable<IRedirectUrl> GetAllRedirectUrls(int rootContentId, long pageIndex, int pageSize, out long total);
 
         /// <summary>
-        /// Searches for all redirect urls that contain a given search term in their URL property.
+        /// Searches for all redirect URLs that contain a given search term in their URL property.
         /// </summary>
         /// <param name="searchTerm">The term to search for.</param>
         /// <param name="pageIndex">The page index.</param>
         /// <param name="pageSize">The page size.</param>
-        /// <param name="total">The total count of redirect urls.</param>
-        /// <returns>The redirect urls.</returns>
+        /// <param name="total">The total count of redirect URLs.</param>
+        /// <returns>The redirect URLs.</returns>
         IEnumerable<IRedirectUrl> SearchRedirectUrls(string searchTerm, long pageIndex, int pageSize, out long total);
     }
 }
diff --git a/src/Umbraco.Core/Services/IServerRegistrationService.cs b/src/Umbraco.Core/Services/IServerRegistrationService.cs
index 47bf3838f2..62bb68eb14 100644
--- a/src/Umbraco.Core/Services/IServerRegistrationService.cs
+++ b/src/Umbraco.Core/Services/IServerRegistrationService.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Touches a server to mark it as active; deactivate stale servers.
         /// </summary>
-        /// <param name="serverAddress">The server url.</param>
+        /// <param name="serverAddress">The server URL.</param>
         /// <param name="serverIdentity">The server unique identity.</param>
         /// <param name="staleTimeout">The time after which a server is considered stale.</param>
         void TouchServer(string serverAddress, string serverIdentity, TimeSpan staleTimeout);
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 068864a558..a809b83f23 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -30,7 +30,7 @@ namespace Umbraco.Core.Services.Implement
         private IQuery<IContent> _queryNotTrashed;
         //TODO: The non-lazy object should be injected
         private readonly Lazy<PropertyValidationService> _propertyValidationService = new Lazy<PropertyValidationService>(() => new PropertyValidationService());
-        
+
 
         #region Constructors
 
@@ -535,7 +535,7 @@ namespace Umbraco.Core.Services.Implement
             if (content.Path.IsNullOrWhiteSpace()) return Enumerable.Empty<IContent>();
 
             var rootId = Constants.System.RootString;
-            var ids = content.Path.Split(',')
+            var ids = content.Path.Split(Constants.CharArrays.Comma)
                 .Where(x => x != rootId && x != content.Id.ToString(CultureInfo.InvariantCulture)).Select(int.Parse).ToArray();
             if (ids.Any() == false)
                 return new List<IContent>();
@@ -879,7 +879,7 @@ namespace Umbraco.Core.Services.Implement
                     throw new NotSupportedException($"Culture \"{culture}\" is not supported by invariant content types.");
             }
 
-            if(content.Name != null && content.Name.Length > 255)
+            if (content.Name != null && content.Name.Length > 255)
             {
                 throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
             }
@@ -1247,7 +1247,7 @@ namespace Umbraco.Core.Services.Implement
                     if (culturesUnpublishing != null)
                     {
                         // This will mean that that we unpublished a mandatory culture or we unpublished the last culture.
-                        
+
                         var langs = string.Join(", ", allLangs
                                     .Where(x => culturesUnpublishing.InvariantContains(x.IsoCode))
                                     .Select(x => x.CultureName));
@@ -1256,7 +1256,7 @@ namespace Umbraco.Core.Services.Implement
                         if (publishResult == null)
                             throw new PanicException("publishResult == null - should not happen");
 
-                        switch(publishResult.Result)
+                        switch (publishResult.Result)
                         {
                             case PublishResultType.FailedPublishMandatoryCultureMissing:
                                 //occurs when a mandatory culture was unpublished (which means we tried publishing the document without a mandatory culture)
@@ -1270,7 +1270,7 @@ namespace Umbraco.Core.Services.Implement
                                 Audit(AuditType.Unpublish, userId, content.Id, "Unpublished (last language unpublished)");
                                 return new PublishResult(PublishResultType.SuccessUnpublishLastCulture, evtMsgs, content);
                         }
-                        
+
                     }
 
                     Audit(AuditType.Unpublish, userId, content.Id);
@@ -1290,7 +1290,7 @@ namespace Umbraco.Core.Services.Implement
                         changeType = TreeChangeTypes.RefreshBranch; // whole branch
                     else if (isNew == false && previouslyPublished)
                         changeType = TreeChangeTypes.RefreshNode; // single node
-                    
+
 
                     // invalidate the node/branch
                     if (!branchOne) // for branches, handled by SaveAndPublishBranch
@@ -1364,24 +1364,90 @@ namespace Umbraco.Core.Services.Implement
 
         /// <inheritdoc />
         public IEnumerable<PublishResult> PerformScheduledPublish(DateTime date)
-            => PerformScheduledPublishInternal(date).ToList();
-
-        // beware! this method yields results, so the returned IEnumerable *must* be
-        // enumerated for anything to happen - dangerous, so private + exposed via
-        // the public method above, which forces ToList().
-        private IEnumerable<PublishResult> PerformScheduledPublishInternal(DateTime date)
         {
+            var allLangs = new Lazy<List<ILanguage>>(() => _languageRepository.GetMany().ToList());
             var evtMsgs = EventMessagesFactory.Get();
+            var results = new List<PublishResult>();
 
-            using (var scope = ScopeProvider.CreateScope())
+            PerformScheduledPublishingRelease(date, results, evtMsgs, allLangs);
+            PerformScheduledPublishingExpiration(date, results, evtMsgs, allLangs);
+
+            return results;
+        }
+
+        private void PerformScheduledPublishingExpiration(DateTime date, List<PublishResult> results, EventMessages evtMsgs, Lazy<List<ILanguage>> allLangs)
+        {
+            using var scope = ScopeProvider.CreateScope();
+
+            // do a fast read without any locks since this executes often to see if we even need to proceed
+            if (_documentRepository.HasContentForExpiration(date))
             {
+                // now take a write lock since we'll be updating
                 scope.WriteLock(Constants.Locks.ContentTree);
 
-                var allLangs = _languageRepository.GetMany().ToList();
+                foreach (var d in _documentRepository.GetContentForExpiration(date))
+                {
+                    if (d.ContentType.VariesByCulture())
+                    {
+                        //find which cultures have pending schedules
+                        var pendingCultures = d.ContentSchedule.GetPending(ContentScheduleAction.Expire, date)
+                            .Select(x => x.Culture)
+                            .Distinct()
+                            .ToList();
+
+                        if (pendingCultures.Count == 0)
+                            continue; //shouldn't happen but no point in processing this document if there's nothing there
+
+                        var saveEventArgs = new ContentSavingEventArgs(d, evtMsgs);
+                        if (scope.Events.DispatchCancelable(Saving, this, saveEventArgs, nameof(Saving)))
+                        {
+                            results.Add(new PublishResult(PublishResultType.FailedPublishCancelledByEvent, evtMsgs, d));
+                            continue;
+                        }
+
+                        foreach (var c in pendingCultures)
+                        {
+                            //Clear this schedule for this culture
+                            d.ContentSchedule.Clear(c, ContentScheduleAction.Expire, date);
+                            //set the culture to be published
+                            d.UnpublishCulture(c);
+                        }
+
+                        var result = CommitDocumentChangesInternal(scope, d, saveEventArgs, allLangs.Value, d.WriterId);
+                        if (result.Success == false)
+                            Logger.Error<ContentService>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
+                        results.Add(result);
+
+                    }
+                    else
+                    {
+                        //Clear this schedule
+                        d.ContentSchedule.Clear(ContentScheduleAction.Expire, date);
+                        var result = Unpublish(d, userId: d.WriterId);
+                        if (result.Success == false)
+                            Logger.Error<ContentService>(null, "Failed to unpublish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
+                        results.Add(result);
+                    }
+                }
+
+                _documentRepository.ClearSchedule(date, ContentScheduleAction.Expire);
+            }
+
+            scope.Complete();
+        }
+
+        private void PerformScheduledPublishingRelease(DateTime date, List<PublishResult> results, EventMessages evtMsgs, Lazy<List<ILanguage>> allLangs)
+        {
+            using var scope = ScopeProvider.CreateScope();
+
+            // do a fast read without any locks since this executes often to see if we even need to proceed
+            if (_documentRepository.HasContentForRelease(date))
+            {
+                // now take a write lock since we'll be updating
+                scope.WriteLock(Constants.Locks.ContentTree);
 
                 foreach (var d in _documentRepository.GetContentForRelease(date))
                 {
-                    PublishResult result;
                     if (d.ContentType.VariesByCulture())
                     {
                         //find which cultures have pending schedules
@@ -1391,11 +1457,14 @@ namespace Umbraco.Core.Services.Implement
                             .ToList();
 
                         if (pendingCultures.Count == 0)
-                            break; //shouldn't happen but no point in continuing if there's nothing there
+                            continue; //shouldn't happen but no point in processing this document if there's nothing there
 
                         var saveEventArgs = new ContentSavingEventArgs(d, evtMsgs);
                         if (scope.Events.DispatchCancelable(Saving, this, saveEventArgs, nameof(Saving)))
-                            yield return new PublishResult(PublishResultType.FailedPublishCancelledByEvent, evtMsgs, d);
+                        {
+                            results.Add(new PublishResult(PublishResultType.FailedPublishCancelledByEvent, evtMsgs, d));
+                            continue; // this document is canceled move next
+                        }
 
                         var publishing = true;
                         foreach (var culture in pendingCultures)
@@ -1407,94 +1476,51 @@ namespace Umbraco.Core.Services.Implement
 
                             //publish the culture values and validate the property values, if validation fails, log the invalid properties so the develeper has an idea of what has failed
                             Property[] invalidProperties = null;
-                            var impact = CultureImpact.Explicit(culture, IsDefaultCulture(allLangs, culture));
+                            var impact = CultureImpact.Explicit(culture, IsDefaultCulture(allLangs.Value, culture));
                             var tryPublish = d.PublishCulture(impact) && _propertyValidationService.Value.IsPropertyDataValid(d, out invalidProperties, impact);
                             if (invalidProperties != null && invalidProperties.Length > 0)
                                 Logger.Warn<ContentService>("Scheduled publishing will fail for document {DocumentId} and culture {Culture} because of invalid properties {InvalidProperties}",
                                     d.Id, culture, string.Join(",", invalidProperties.Select(x => x.Alias)));
 
                             publishing &= tryPublish; //set the culture to be published
-                            if (!publishing) break; // no point continuing
+                            if (!publishing) continue; // move to next document
                         }
 
+                        PublishResult result;
+
                         if (d.Trashed)
                             result = new PublishResult(PublishResultType.FailedPublishIsTrashed, evtMsgs, d);
                         else if (!publishing)
                             result = new PublishResult(PublishResultType.FailedPublishContentInvalid, evtMsgs, d);
                         else
-                            result = CommitDocumentChangesInternal(scope, d, saveEventArgs, allLangs, d.WriterId);
-
+                            result = CommitDocumentChangesInternal(scope, d, saveEventArgs, allLangs.Value, d.WriterId);
 
                         if (result.Success == false)
                             Logger.Error<ContentService>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
 
-                        yield return result;
+                        results.Add(result);
                     }
                     else
                     {
                         //Clear this schedule
                         d.ContentSchedule.Clear(ContentScheduleAction.Release, date);
 
-                        result = d.Trashed
+                        var result = d.Trashed
                             ? new PublishResult(PublishResultType.FailedPublishIsTrashed, evtMsgs, d)
                             : SaveAndPublish(d, userId: d.WriterId);
 
                         if (result.Success == false)
                             Logger.Error<ContentService>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
 
-                        yield return result;
+                        results.Add(result);
                     }
                 }
 
-                foreach (var d in _documentRepository.GetContentForExpiration(date))
-                {
-                    PublishResult result;
-                    if (d.ContentType.VariesByCulture())
-                    {
-                        //find which cultures have pending schedules
-                        var pendingCultures = d.ContentSchedule.GetPending(ContentScheduleAction.Expire, date)
-                            .Select(x => x.Culture)
-                            .Distinct()
-                            .ToList();
+                _documentRepository.ClearSchedule(date, ContentScheduleAction.Release);
 
-                        if (pendingCultures.Count == 0)
-                            break; //shouldn't happen but no point in continuing if there's nothing there
-
-                        var saveEventArgs = new ContentSavingEventArgs(d, evtMsgs);
-                        if (scope.Events.DispatchCancelable(Saving, this, saveEventArgs, nameof(Saving)))
-                            yield return new PublishResult(PublishResultType.FailedPublishCancelledByEvent, evtMsgs, d);
-
-                        foreach (var c in pendingCultures)
-                        {
-                            //Clear this schedule for this culture
-                            d.ContentSchedule.Clear(c, ContentScheduleAction.Expire, date);
-                            //set the culture to be published
-                            d.UnpublishCulture(c);
-                        }
-
-                        result = CommitDocumentChangesInternal(scope, d, saveEventArgs, allLangs, d.WriterId);
-                        if (result.Success == false)
-                            Logger.Error<ContentService>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
-                        yield return result;
-
-                    }
-                    else
-                    {
-                        //Clear this schedule
-                        d.ContentSchedule.Clear(ContentScheduleAction.Expire, date);
-                        result = Unpublish(d, userId: d.WriterId);
-                        if (result.Success == false)
-                            Logger.Error<ContentService>(null, "Failed to unpublish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
-                        yield return result;
-                    }
-
-
-                }
-
-                _documentRepository.ClearSchedule(date);
-
-                scope.Complete();
             }
+
+            scope.Complete();
         }
 
         // utility 'PublishCultures' func used by SaveAndPublishBranch
@@ -2650,7 +2676,7 @@ namespace Umbraco.Core.Services.Implement
                     // there will be nothing to publish/unpublish.
                     return new PublishResult(PublishResultType.FailedPublishNothingToPublish, evtMsgs, content);
                 }
-                
+
 
                 // missing mandatory culture = cannot be published
                 var mandatoryCultures = allLangs.Where(x => x.IsMandatory).Select(x => x.IsoCode);
@@ -2985,6 +3011,8 @@ namespace Umbraco.Core.Services.Implement
 
                 _documentBlueprintRepository.Save(content);
 
+                Audit(AuditType.Save, Constants.Security.SuperUserId, content.Id, $"Saved content template: {content.Name}");
+
                 scope.Events.Dispatch(SavedBlueprint, this, new SaveEventArgs<IContent>(content), "SavedBlueprint");
 
                 scope.Complete();
@@ -3163,6 +3191,6 @@ namespace Umbraco.Core.Services.Implement
         #endregion
 
 
-        
+
     }
 }
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
index 3d4c109bfb..480501212f 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
@@ -879,7 +879,7 @@ namespace Umbraco.Core.Services.Implement
 
         public IEnumerable<EntityContainer> GetContainers(TItem item)
         {
-            var ancestorIds = item.Path.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+            var ancestorIds = item.Path.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries)
                 .Select(x =>
                 {
                     var asInt = x.TryConvertTo<int>();
diff --git a/src/Umbraco.Core/Services/Implement/DataTypeService.cs b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
index 5a93fb91b1..7102d0eeeb 100644
--- a/src/Umbraco.Core/Services/Implement/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
@@ -99,7 +99,7 @@ namespace Umbraco.Core.Services.Implement
 
         public IEnumerable<EntityContainer> GetContainers(IDataType dataType)
         {
-            var ancestorIds = dataType.Path.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+            var ancestorIds = dataType.Path.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries)
                 .Select(x =>
                 {
                     var asInt = x.TryConvertTo<int>();
diff --git a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
index 5189b3422e..4d7694d1b8 100644
--- a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
@@ -177,7 +177,7 @@ namespace Umbraco.Core.Services.Implement
             var folderNames = string.Empty;
             if (dataType.Level != 1)
             {
-                //get url encoded folder names
+                //get URL encoded folder names
                 var folders = _dataTypeService.GetContainers(dataType)
                     .OrderBy(x => x.Level)
                     .Select(x => HttpUtility.UrlEncode(x.Name));
@@ -363,6 +363,7 @@ namespace Umbraco.Core.Services.Implement
                                                    new XElement("MandatoryMessage", propertyType.MandatoryMessage),
                                                    new XElement("Validation", propertyType.ValidationRegExp),
                                                    new XElement("ValidationRegExpMessage", propertyType.ValidationRegExpMessage),
+                                                   new XElement("LabelOnTop", propertyType.LabelOnTop),
                                                    new XElement("Description", new XCData(propertyType.Description)));
                 genericProperties.Add(genericProperty);
             }
@@ -434,6 +435,7 @@ namespace Umbraco.Core.Services.Implement
             var info = new XElement("Info",
                                     new XElement("Name", contentType.Name),
                                     new XElement("Alias", contentType.Alias),
+                                    new XElement("Key", contentType.Key),
                                     new XElement("Icon", contentType.Icon),
                                     new XElement("Thumbnail", contentType.Thumbnail),
                                     new XElement("Description", contentType.Description),
@@ -484,11 +486,13 @@ namespace Umbraco.Core.Services.Implement
                 var genericProperty = new XElement("GenericProperty",
                                                    new XElement("Name", propertyType.Name),
                                                    new XElement("Alias", propertyType.Alias),
+                                                   new XElement("Key", propertyType.Key),
                                                    new XElement("Type", propertyType.PropertyEditorAlias),
-                                                   new XElement("Definition", definition.Key),
+                                                   new XElement("Definition", definition.Key),                                                   
                                                    new XElement("Tab", propertyGroup == null ? "" : propertyGroup.Name),
                                                    new XElement("SortOrder", propertyType.SortOrder),
                                                    new XElement("Mandatory", propertyType.Mandatory.ToString()),
+                                                   new XElement("LabelOnTop", propertyType.LabelOnTop.ToString()),
                                                    propertyType.MandatoryMessage != null ? new XElement("MandatoryMessage", propertyType.MandatoryMessage) : null,
                                                    propertyType.ValidationRegExp != null ? new XElement("Validation", propertyType.ValidationRegExp) : null,
                                                    propertyType.ValidationRegExpMessage != null ? new XElement("ValidationRegExpMessage", propertyType.ValidationRegExpMessage) : null,
@@ -518,7 +522,7 @@ namespace Umbraco.Core.Services.Implement
             //don't add folders if this is a child doc type
             if (contentType.Level != 1 && masterContentType == null)
             {
-                //get url encoded folder names
+                //get URL encoded folder names
                 var folders = _contentTypeService.GetContainers(contentType)
                     .OrderBy(x => x.Level)
                     .Select(x => HttpUtility.UrlEncode(x.Name));
diff --git a/src/Umbraco.Core/Services/Implement/ExternalLoginService.cs b/src/Umbraco.Core/Services/Implement/ExternalLoginService.cs
index aedf3874dd..b0d9a80a65 100644
--- a/src/Umbraco.Core/Services/Implement/ExternalLoginService.cs
+++ b/src/Umbraco.Core/Services/Implement/ExternalLoginService.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.Identity;
 using Umbraco.Core.Events;
@@ -20,53 +21,60 @@ namespace Umbraco.Core.Services.Implement
             _externalLoginRepository = externalLoginRepository;
         }
 
-        /// <summary>
-        /// Returns all user logins assigned
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
+        /// <inheritdoc />
         public IEnumerable<IIdentityUserLogin> GetAll(int userId)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
                 return _externalLoginRepository.Get(Query<IIdentityUserLogin>().Where(x => x.UserId == userId))
-                    .ToList(); // ToList is important here, must evaluate within uow! // ToList is important here, must evaluate within uow!
+                    .ToList();
             }
         }
 
-        /// <summary>
-        /// Returns all logins matching the login info - generally there should only be one but in some cases
-        /// there might be more than one depending on if an administrator has been editing/removing members
-        /// </summary>
-        /// <param name="login"></param>
-        /// <returns></returns>
+        [Obsolete("Use the overload specifying loginProvider and providerKey instead")]
         public IEnumerable<IIdentityUserLogin> Find(UserLoginInfo login)
+        {
+            return Find(login.LoginProvider, login.ProviderKey);
+        }
+
+        /// <inheritdoc />
+        public IEnumerable<IIdentityUserLogin> Find(string loginProvider, string providerKey)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
-                return _externalLoginRepository.Get(Query<IIdentityUserLogin>().Where(x => x.ProviderKey == login.ProviderKey && x.LoginProvider == login.LoginProvider))
-                    .ToList(); // ToList is important here, must evaluate within uow! // ToList is important here, must evaluate within uow!
+                return _externalLoginRepository.Get(Query<IIdentityUserLogin>()
+                    .Where(x => x.ProviderKey == providerKey && x.LoginProvider == loginProvider))
+                    .ToList();
             }
         }
 
-        /// <summary>
-        /// Save user logins
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <param name="logins"></param>
+        [Obsolete("Use the Save method instead")]
         public void SaveUserLogins(int userId, IEnumerable<UserLoginInfo> logins)
+        {
+            Save(userId, logins.Select(x => new ExternalLogin(x.LoginProvider, x.ProviderKey)));
+        }
+
+        /// <inheritdoc />
+        public void Save(int userId, IEnumerable<IExternalLogin> logins)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
-                _externalLoginRepository.SaveUserLogins(userId, logins);
+                _externalLoginRepository.Save(userId, logins);
                 scope.Complete();
             }
         }
 
-        /// <summary>
-        /// Deletes all user logins - normally used when a member is deleted
-        /// </summary>
-        /// <param name="userId"></param>
+        /// <inheritdoc />
+        public void Save(IIdentityUserLoginExtended login)
+        {
+            using (var scope = ScopeProvider.CreateScope())
+            {
+                _externalLoginRepository.Save(login);
+                scope.Complete();
+            }
+        }
+
+        /// <inheritdoc />
         public void DeleteUserLogins(int userId)
         {
             using (var scope = ScopeProvider.CreateScope())
@@ -75,5 +83,7 @@ namespace Umbraco.Core.Services.Implement
                 scope.Complete();
             }
         }
+
+        
     }
 }
diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs
index ecd4cccc8d..ac9c83458d 100644
--- a/src/Umbraco.Core/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaService.cs
@@ -477,7 +477,7 @@ namespace Umbraco.Core.Services.Implement
             if (media.Path.IsNullOrWhiteSpace()) return Enumerable.Empty<IMedia>();
 
             var rootId = Constants.System.RootString;
-            var ids = media.Path.Split(',')
+            var ids = media.Path.Split(Constants.CharArrays.Comma)
                 .Where(x => x != rootId && x != media.Id.ToString(CultureInfo.InvariantCulture))
                 .Select(int.Parse)
                 .ToArray();
diff --git a/src/Umbraco.Core/Services/Implement/MemberGroupService.cs b/src/Umbraco.Core/Services/Implement/MemberGroupService.cs
index c879a00ccb..308080bbf4 100644
--- a/src/Umbraco.Core/Services/Implement/MemberGroupService.cs
+++ b/src/Umbraco.Core/Services/Implement/MemberGroupService.cs
@@ -70,6 +70,14 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
+        public IMemberGroup GetById(Guid id)
+        {
+            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+            {
+                return _memberGroupRepository.Get(id);
+            }
+        }
+
         public IMemberGroup GetByName(string name)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
diff --git a/src/Umbraco.Core/Services/Implement/MemberService.cs b/src/Umbraco.Core/Services/Implement/MemberService.cs
index 9b97c6b161..877bb5c9ce 100644
--- a/src/Umbraco.Core/Services/Implement/MemberService.cs
+++ b/src/Umbraco.Core/Services/Implement/MemberService.cs
@@ -447,15 +447,10 @@ namespace Umbraco.Core.Services.Implement
         /// <returns><see cref="IMember"/></returns>
         public IMember GetByUsername(string username)
         {
-            // TODO: Somewhere in here, whether at this level or the repository level, we need to add
-            // a caching mechanism since this method is used by all the membership providers and could be
-            // called quite a bit when dealing with members.
-
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
-                scope.ReadLock(Constants.Locks.MemberTree);
-                var query = Query<IMember>().Where(x => x.Username.Equals(username));
-                return _memberRepository.Get(query).FirstOrDefault();
+                scope.ReadLock(Constants.Locks.MemberTree);                
+                return _memberRepository.GetByUsername(username);
             }
         }
 
@@ -806,12 +801,17 @@ namespace Umbraco.Core.Services.Implement
 
         #region Save
 
-        /// <summary>
-        /// Saves an <see cref="IMember"/>
-        /// </summary>
-        /// <param name="member"><see cref="IMember"/> to Save</param>
-        /// <param name="raiseEvents">Optional parameter to raise events.
-        /// Default is <c>True</c> otherwise set to <c>False</c> to not raise events</param>
+        /// <inheritdoc />
+        public void SetLastLogin(string username, DateTime date)
+        {
+            using (var scope = ScopeProvider.CreateScope())
+            {   
+                _memberRepository.SetLastLogin(username, date);
+                scope.Complete();
+            }
+        }
+
+        /// <inheritdoc />
         public void Save(IMember member, bool raiseEvents = true)
         {
             //trimming username and email to make sure we have no trailing space
@@ -847,12 +847,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Saves a list of <see cref="IMember"/> objects
-        /// </summary>
-        /// <param name="members"><see cref="IEnumerable{IMember}"/> to save</param>
-        /// <param name="raiseEvents">Optional parameter to raise events.
-        /// Default is <c>True</c> otherwise set to <c>False</c> to not raise events</param>
+        /// <inheritdoc />
         public void Save(IEnumerable<IMember> members, bool raiseEvents = true)
         {
             var membersA = members.ToArray();
diff --git a/src/Umbraco.Core/Services/Implement/NotificationService.cs b/src/Umbraco.Core/Services/Implement/NotificationService.cs
index 2b21945ba8..3c5f91e932 100644
--- a/src/Umbraco.Core/Services/Implement/NotificationService.cs
+++ b/src/Umbraco.Core/Services/Implement/NotificationService.cs
@@ -78,7 +78,7 @@ namespace Umbraco.Core.Services.Implement
             if (entitiesL.Count == 0) return;
 
             //put all entity's paths into a list with the same indices
-            var paths = entitiesL.Select(x => x.Path.Split(',').Select(int.Parse).ToArray()).ToArray();
+            var paths = entitiesL.Select(x => x.Path.Split(Constants.CharArrays.Comma).Select(int.Parse).ToArray()).ToArray();
 
             // lazily get versions
             var prevVersionDictionary = new Dictionary<int, IContentBase>();
@@ -176,7 +176,7 @@ namespace Umbraco.Core.Services.Implement
         /// <returns></returns>
         public IEnumerable<Notification> FilterUserNotificationsByPath(IEnumerable<Notification> userNotifications, string path)
         {
-            var pathParts = path.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries);
+            var pathParts = path.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries);
             return userNotifications.Where(r => pathParts.InvariantContains(r.EntityId.ToString(CultureInfo.InvariantCulture))).ToList();
         }
 
@@ -394,7 +394,7 @@ namespace Umbraco.Core.Services.Implement
                 content.Id.ToString(CultureInfo.InvariantCulture),
                 string.Format("{2}://{0}/{1}",
                     string.Concat(siteUri.Authority),
-                    // TODO: RE-enable this so we can have a nice url
+                    // TODO: RE-enable this so we can have a nice URL
                     /*umbraco.library.NiceUrl(documentObject.Id))*/
                     string.Concat(content.Id, ".aspx"),
                     protocol),
diff --git a/src/Umbraco.Core/Services/Implement/PublicAccessService.cs b/src/Umbraco.Core/Services/Implement/PublicAccessService.cs
index ab9ea64292..4e3cd96012 100644
--- a/src/Umbraco.Core/Services/Implement/PublicAccessService.cs
+++ b/src/Umbraco.Core/Services/Implement/PublicAccessService.cs
@@ -54,7 +54,7 @@ namespace Umbraco.Core.Services.Implement
         {
             //Get all ids in the path for the content item and ensure they all
             // parse to ints that are not -1.
-            var ids = contentPath.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+            var ids = contentPath.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries)
                 .Select(x => int.TryParse(x, out int val) ? val : -1)
                 .Where(x => x != -1)
                 .ToList();
diff --git a/src/Umbraco.Core/Services/Implement/RedirectUrlService.cs b/src/Umbraco.Core/Services/Implement/RedirectUrlService.cs
index 80816961fc..497e9f7730 100644
--- a/src/Umbraco.Core/Services/Implement/RedirectUrlService.cs
+++ b/src/Umbraco.Core/Services/Implement/RedirectUrlService.cs
@@ -108,5 +108,15 @@ namespace Umbraco.Core.Services.Implement
                 return _redirectUrlRepository.SearchUrls(searchTerm, pageIndex, pageSize, out total);
             }
         }
+
+        public IRedirectUrl GetMostRecentRedirectUrl(string url, string culture)
+        {
+            if (string.IsNullOrWhiteSpace(culture)) return GetMostRecentRedirectUrl(url);
+            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+            {
+                return _redirectUrlRepository.GetMostRecentUrl(url, culture);
+            }
+
+        }
     }
 }
diff --git a/src/Umbraco.Core/Services/Implement/RelationService.cs b/src/Umbraco.Core/Services/Implement/RelationService.cs
index 4b53709de9..c629466edf 100644
--- a/src/Umbraco.Core/Services/Implement/RelationService.cs
+++ b/src/Umbraco.Core/Services/Implement/RelationService.cs
@@ -15,13 +15,15 @@ namespace Umbraco.Core.Services.Implement
         private readonly IEntityService _entityService;
         private readonly IRelationRepository _relationRepository;
         private readonly IRelationTypeRepository _relationTypeRepository;
+        private readonly IAuditRepository _auditRepository;
 
         public RelationService(IScopeProvider uowProvider, ILogger logger, IEventMessagesFactory eventMessagesFactory, IEntityService entityService,
-            IRelationRepository relationRepository, IRelationTypeRepository relationTypeRepository)
+            IRelationRepository relationRepository, IRelationTypeRepository relationTypeRepository, IAuditRepository auditRepository)
             : base(uowProvider, logger, eventMessagesFactory)
         {
             _relationRepository = relationRepository;
             _relationTypeRepository = relationTypeRepository;
+            _auditRepository = auditRepository;
             _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
         }
 
@@ -476,6 +478,7 @@ namespace Umbraco.Core.Services.Implement
                 }
 
                 _relationTypeRepository.Save(relationType);
+                Audit(AuditType.Save, Constants.Security.SuperUserId, relationType.Id, $"Saved relation type: {relationType.Name}");
                 scope.Complete();
                 saveEventArgs.CanCancel = false;
                 scope.Events.Dispatch(SavedRelationType, this, saveEventArgs);
@@ -565,6 +568,11 @@ namespace Umbraco.Core.Services.Implement
             }
             return relations;
         }
+
+        private void Audit(AuditType type, int userId, int objectId, string message = null)
+        {
+            _auditRepository.Save(new AuditItem(objectId, type, userId, ObjectTypes.GetName(UmbracoObjectTypes.RelationType), message));
+        }
         #endregion
 
         #region Events Handlers
diff --git a/src/Umbraco.Core/Services/Implement/ServerRegistrationService.cs b/src/Umbraco.Core/Services/Implement/ServerRegistrationService.cs
index d9ce978274..056d4d9fd9 100644
--- a/src/Umbraco.Core/Services/Implement/ServerRegistrationService.cs
+++ b/src/Umbraco.Core/Services/Implement/ServerRegistrationService.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Core.Services.Implement
         /// <summary>
         /// Touches a server to mark it as active; deactivate stale servers.
         /// </summary>
-        /// <param name="serverAddress">The server url.</param>
+        /// <param name="serverAddress">The server URL.</param>
         /// <param name="serverIdentity">The server unique identity.</param>
         /// <param name="staleTimeout">The time after which a server is considered stale.</param>
         public void TouchServer(string serverAddress, string serverIdentity, TimeSpan staleTimeout)
diff --git a/src/Umbraco.Core/Services/Implement/UserService.cs b/src/Umbraco.Core/Services/Implement/UserService.cs
index 6f5cbfca56..ca42d5878a 100644
--- a/src/Umbraco.Core/Services/Implement/UserService.cs
+++ b/src/Umbraco.Core/Services/Implement/UserService.cs
@@ -205,7 +205,7 @@ namespace Umbraco.Core.Services.Implement
                         //NOTE: this will not be cached
                         return _userRepository.GetByUsername(username, includeSecurityData: false);
                     }
-                    
+
                     throw;
                 }
             }
@@ -254,6 +254,13 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
+        // explicit implementation because we don't need it now but due to the way that the members membership provider is put together
+        // this method must exist in this service as an implementation (legacy)
+        void IMembershipMemberService<IUser>.SetLastLogin(string username, DateTime date)
+        {
+            Logger.Warn<UserService>("This method is not implemented. Using membership providers users is not advised, use ASP.NET Identity instead. See issue #9224 for more information.");
+        }
+
         /// <summary>
         /// Saves an <see cref="IUser"/>
         /// </summary>
@@ -710,7 +717,7 @@ namespace Umbraco.Core.Services.Implement
                         //NOTE: this will not be cached
                         return _userRepository.Get(id, includeSecurityData: false);
                     }
-                    
+
                     throw;
                 }
             }
diff --git a/src/Umbraco.Core/Services/PropertyValidationService.cs b/src/Umbraco.Core/Services/PropertyValidationService.cs
index a037a83920..d83628a316 100644
--- a/src/Umbraco.Core/Services/PropertyValidationService.cs
+++ b/src/Umbraco.Core/Services/PropertyValidationService.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Core.Collections;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
@@ -15,19 +13,73 @@ namespace Umbraco.Core.Services
     {
         private readonly PropertyEditorCollection _propertyEditors;
         private readonly IDataTypeService _dataTypeService;
+        private readonly ILocalizedTextService _textService;
 
-        public PropertyValidationService(PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService)
+        public PropertyValidationService(PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, ILocalizedTextService textService)
         {
             _propertyEditors = propertyEditors;
             _dataTypeService = dataTypeService;
+            _textService = textService;
         }
 
         //TODO: Remove this method in favor of the overload specifying all dependencies
         public PropertyValidationService()
-            : this(Current.PropertyEditors, Current.Services.DataTypeService)
+            : this(Current.PropertyEditors, Current.Services.DataTypeService, Current.Services.TextService)
         {
         }
 
+        public IEnumerable<ValidationResult> ValidatePropertyValue(
+           PropertyType propertyType,
+           object postedValue)
+        {
+            if (propertyType is null) throw new ArgumentNullException(nameof(propertyType));
+            var dataType = _dataTypeService.GetDataType(propertyType.DataTypeId);
+            if (dataType == null) throw new InvalidOperationException("No data type found by id " + propertyType.DataTypeId);
+
+            var editor = _propertyEditors[propertyType.PropertyEditorAlias];
+            if (editor == null) throw new InvalidOperationException("No property editor found by alias " + propertyType.PropertyEditorAlias);
+
+            return ValidatePropertyValue(_textService, editor, dataType, postedValue, propertyType.Mandatory, propertyType.ValidationRegExp, propertyType.MandatoryMessage, propertyType.ValidationRegExpMessage);
+        }
+
+        internal static IEnumerable<ValidationResult> ValidatePropertyValue(
+            ILocalizedTextService textService,
+            IDataEditor editor,
+            IDataType dataType,
+            object postedValue,
+            bool isRequired,
+            string validationRegExp,
+            string isRequiredMessage,
+            string validationRegExpMessage)
+        {
+            // Retrieve default messages used for required and regex validatation.  We'll replace these
+            // if set with custom ones if they've been provided for a given property.
+            var requiredDefaultMessages = new[]
+                {
+                    textService.Localize("validation", "invalidNull"),
+                    textService.Localize("validation", "invalidEmpty")
+                };
+            var formatDefaultMessages = new[]
+                {
+                    textService.Localize("validation", "invalidPattern"),
+                };
+
+            var valueEditor = editor.GetValueEditor(dataType.Configuration);
+            foreach (var validationResult in valueEditor.Validate(postedValue, isRequired, validationRegExp))
+            {
+                // If we've got custom error messages, we'll replace the default ones that will have been applied in the call to Validate().
+                if (isRequired && !string.IsNullOrWhiteSpace(isRequiredMessage) && requiredDefaultMessages.Contains(validationResult.ErrorMessage, StringComparer.OrdinalIgnoreCase))
+                {
+                    validationResult.ErrorMessage = isRequiredMessage;
+                }
+                if (!string.IsNullOrWhiteSpace(validationRegExp) && !string.IsNullOrWhiteSpace(validationRegExpMessage) && formatDefaultMessages.Contains(validationResult.ErrorMessage, StringComparer.OrdinalIgnoreCase))
+                {
+                    validationResult.ErrorMessage = validationRegExpMessage;
+                }
+                yield return validationResult;
+            }
+        }
+
         /// <summary>
         /// Validates the content item's properties pass validation rules
         /// </summary>
diff --git a/src/Umbraco.Core/Services/UserServiceExtensions.cs b/src/Umbraco.Core/Services/UserServiceExtensions.cs
index c365f1ccc2..e817d7925a 100644
--- a/src/Umbraco.Core/Services/UserServiceExtensions.cs
+++ b/src/Umbraco.Core/Services/UserServiceExtensions.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Services
     {
         public static EntityPermission GetPermissions(this IUserService userService, IUser user, string path)
         {
-            var ids = path.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+            var ids = path.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries)
                 .Select(x => x.TryConvertTo<int>())
                 .Where(x => x.Success)
                 .Select(x => x.Result)
diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
index c37f8bdf35..80ef81f36d 100644
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Core
         /// <returns></returns>
         internal static int[] GetIdsFromPathReversed(this string path)
         {
-            var nodeIds = path.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+            var nodeIds = path.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries)
                 .Select(x => x.TryConvertTo<int>())
                 .Where(x => x.Success)
                 .Select(x => x.Result)
@@ -106,7 +106,7 @@ namespace Umbraco.Core
         /// </remarks>
         internal static Attempt<string> DetectIsJavaScriptPath(this string input)
         {
-            //validate that this is a url, if it is not, we'll assume that it is a text block and render it as a text
+            //validate that this is a URL, if it is not, we'll assume that it is a text block and render it as a text
             //block instead.
             var isValid = true;
 
@@ -114,7 +114,7 @@ namespace Umbraco.Core
             {
                 //ok it validates, but so does alert('hello'); ! so we need to do more checks
 
-                //here are the valid chars in a url without escaping
+                //here are the valid chars in a URL without escaping
                 if (Regex.IsMatch(input, @"[^a-zA-Z0-9-._~:/?#\[\]@!$&'\(\)*\+,%;=]"))
                     isValid = false;
 
@@ -256,7 +256,7 @@ namespace Umbraco.Core
             //remove any prefixed '&' or '?'
             for (var i = 0; i < queryStrings.Length; i++)
             {
-                queryStrings[i] = queryStrings[i].TrimStart('?', '&').TrimEnd('&');
+                queryStrings[i] = queryStrings[i].TrimStart(Constants.CharArrays.QuestionMarkAmpersand).TrimEnd(Constants.CharArrays.Ampersand);
             }
 
             var nonEmpty = queryStrings.Where(x => !x.IsNullOrWhiteSpace()).ToArray();
@@ -315,7 +315,7 @@ namespace Umbraco.Core
             if (value == null)
                 return null;
 
-            string[] parts = value.Split('\n');
+            string[] parts = value.Split(Constants.CharArrays.LineFeed);
 
             StringBuilder decryptedValue = new StringBuilder();
 
@@ -856,7 +856,7 @@ namespace Umbraco.Core
             var pos = str.IndexOf('=');
             if (pos < 0) pos = str.Length;
 
-            // replace chars that would cause problems in urls
+            // replace chars that would cause problems in URLs
             var chArray = new char[pos];
             for (var i = 0; i < pos; i++)
             {
@@ -1095,13 +1095,13 @@ namespace Umbraco.Core
             return Current.ShortStringHelper.CleanStringForSafeAlias(alias, culture);
         }
 
-        // the new methods to get a url segment
+        // the new methods to get a URL segment
 
         /// <summary>
-        /// Cleans a string to produce a string that can safely be used in an url segment.
+        /// Cleans a string to produce a string that can safely be used in an URL segment.
         /// </summary>
         /// <param name="text">The text to filter.</param>
-        /// <returns>The safe url segment.</returns>
+        /// <returns>The safe URL segment.</returns>
         public static string ToUrlSegment(this string text)
         {
             if (text == null) throw new ArgumentNullException(nameof(text));
@@ -1111,11 +1111,11 @@ namespace Umbraco.Core
         }
 
         /// <summary>
-        /// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an url segment.
+        /// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an URL segment.
         /// </summary>
         /// <param name="text">The text to filter.</param>
         /// <param name="culture">The culture.</param>
-        /// <returns>The safe url segment.</returns>
+        /// <returns>The safe URL segment.</returns>
         public static string ToUrlSegment(this string text, string culture)
         {
             if (text == null) throw new ArgumentNullException(nameof(text));
@@ -1124,7 +1124,7 @@ namespace Umbraco.Core
             return Current.ShortStringHelper.CleanStringForUrlSegment(text, culture);
         }
 
-        // the new methods to clean a string (to alias, url segment...)
+        // the new methods to clean a string (to alias, URL segment...)
 
         /// <summary>
         /// Cleans a string.
@@ -1205,7 +1205,7 @@ namespace Umbraco.Core
 
         /// <summary>
         /// Cleans a string, in the context of the invariant culture, to produce a string that can safely be used as a filename,
-        /// both internally (on disk) and externally (as a url).
+        /// both internally (on disk) and externally (as a URL).
         /// </summary>
         /// <param name="text">The text to filter.</param>
         /// <returns>The safe filename.</returns>
@@ -1216,7 +1216,7 @@ namespace Umbraco.Core
 
         /// <summary>
         /// Cleans a string, in the context of the invariant culture, to produce a string that can safely be used as a filename,
-        /// both internally (on disk) and externally (as a url).
+        /// both internally (on disk) and externally (as a URL).
         /// </summary>
         /// <param name="text">The text to filter.</param>
         /// <param name="culture">The culture.</param>
@@ -1347,7 +1347,7 @@ namespace Umbraco.Core
             {
                 return false;
             }
-            var idCheckList = csv.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+            var idCheckList = csv.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries);
             return idCheckList.Contains(value);
         }
 
@@ -1362,7 +1362,7 @@ namespace Umbraco.Core
             fileName = fileName.StripFileExtension();
 
             // underscores and dashes to spaces
-            fileName = fileName.ReplaceMany(new[] { '_', '-' }, ' ');
+            fileName = fileName.ReplaceMany(Constants.CharArrays.UnderscoreDash, ' ');
 
             // any other conversions ?
 
@@ -1370,7 +1370,7 @@ namespace Umbraco.Core
             fileName = CultureInfo.InvariantCulture.TextInfo.ToTitleCase(fileName);
 
             // Replace multiple consecutive spaces with a single space
-            fileName = string.Join(" ", fileName.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries));
+            fileName = string.Join(" ", fileName.Split(Constants.CharArrays.Space, StringSplitOptions.RemoveEmptyEntries));
 
             return fileName;
         }
diff --git a/src/Umbraco.Core/StringUdi.cs b/src/Umbraco.Core/StringUdi.cs
index 7b32399599..77c55e6692 100644
--- a/src/Umbraco.Core/StringUdi.cs
+++ b/src/Umbraco.Core/StringUdi.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Core
         public StringUdi(Uri uriValue)
             : base(uriValue)
         {
-            Id = Uri.UnescapeDataString(uriValue.AbsolutePath.TrimStart('/'));
+            Id = Uri.UnescapeDataString(uriValue.AbsolutePath.TrimStart(Constants.CharArrays.ForwardSlash));
         }
 
         private static string EscapeUriString(string s)
@@ -46,7 +46,7 @@ namespace Umbraco.Core
 
             // we want to preserve the / and the unreserved
             // so...
-            return string.Join("/", s.Split('/').Select(Uri.EscapeDataString));
+            return string.Join("/", s.Split(Constants.CharArrays.ForwardSlash).Select(Uri.EscapeDataString));
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Strings/ContentBaseExtensions.cs b/src/Umbraco.Core/Strings/ContentBaseExtensions.cs
index 43e3506a84..01560f3b8a 100644
--- a/src/Umbraco.Core/Strings/ContentBaseExtensions.cs
+++ b/src/Umbraco.Core/Strings/ContentBaseExtensions.cs
@@ -6,17 +6,17 @@ using Umbraco.Core.Models;
 namespace Umbraco.Core.Strings
 {
     /// <summary>
-    /// Provides extension methods to IContentBase to get url segments.
+    /// Provides extension methods to IContentBase to get URL segments.
     /// </summary>
     internal static class ContentBaseExtensions
     {
         /// <summary>
-        /// Gets the url segment for a specified content and culture.
+        /// Gets the URL segment for a specified content and culture.
         /// </summary>
         /// <param name="content">The content.</param>
         /// <param name="culture">The culture.</param>
         /// <param name="urlSegmentProviders"></param>
-        /// <returns>The url segment.</returns>
+        /// <returns>The URL segment.</returns>
         public static string GetUrlSegment(this IContentBase content, IEnumerable<IUrlSegmentProvider> urlSegmentProviders, string culture = null)
         {
             if (content == null) throw new ArgumentNullException(nameof(content));
diff --git a/src/Umbraco.Core/Strings/Css/StylesheetRule.cs b/src/Umbraco.Core/Strings/Css/StylesheetRule.cs
index 6f91906250..2c84e9adc5 100644
--- a/src/Umbraco.Core/Strings/Css/StylesheetRule.cs
+++ b/src/Umbraco.Core/Strings/Css/StylesheetRule.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Core.Strings.Css
             {
                 // since we already have a string builder in play here, we'll append to it the "hard" way
                 // instead of using string interpolation (for increased performance)
-                foreach (var style in Styles.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
+                foreach (var style in Styles.Split(Constants.CharArrays.Semicolon, StringSplitOptions.RemoveEmptyEntries))
                 {
                     sb.Append("\t").Append(style.StripNewLines().Trim()).Append(";").Append(Environment.NewLine);
                 }
diff --git a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
index 6361186604..15a87717d2 100644
--- a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
+++ b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
@@ -8,7 +8,7 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 namespace Umbraco.Core.Strings
 {
     /// <summary>
-    /// New default implementation of string functions for short strings such as aliases or url segments.
+    /// New default implementation of string functions for short strings such as aliases or URL segments.
     /// </summary>
     /// <remarks>
     /// <para>Not optimized to work on large bodies of text.</para>
@@ -92,10 +92,10 @@ namespace Umbraco.Core.Strings
         }
 
         /// <summary>
-        /// Cleans a string to produce a string that can safely be used in an url segment.
+        /// Cleans a string to produce a string that can safely be used in an URL segment.
         /// </summary>
         /// <param name="text">The text to filter.</param>
-        /// <returns>The safe url segment.</returns>
+        /// <returns>The safe URL segment.</returns>
         /// <remarks>
         /// <para>The string will be cleaned in the context of the default culture.</para>
         /// <para>Url segments are Ascii only (no accents...).</para>
@@ -106,11 +106,11 @@ namespace Umbraco.Core.Strings
         }
 
         /// <summary>
-        /// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an url segment.
+        /// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an URL segment.
         /// </summary>
         /// <param name="text">The text to filter.</param>
         /// <param name="culture">The culture.</param>
-        /// <returns>The safe url segment.</returns>
+        /// <returns>The safe URL segment.</returns>
         /// <remarks>
         /// <para>Url segments are Ascii only (no accents...).</para>
         /// </remarks>
@@ -121,7 +121,7 @@ namespace Umbraco.Core.Strings
 
         /// <summary>
         /// Cleans a string, in the context of the default culture, to produce a string that can safely be used as a filename,
-        /// both internally (on disk) and externally (as a url).
+        /// both internally (on disk) and externally (as a URL).
         /// </summary>
         /// <param name="text">The text to filter.</param>
         /// <returns>The safe filename.</returns>
@@ -133,7 +133,7 @@ namespace Umbraco.Core.Strings
 
         /// <summary>
         /// Cleans a string to produce a string that can safely be used as a filename,
-        /// both internally (on disk) and externally (as a url).
+        /// both internally (on disk) and externally (as a URL).
         /// </summary>
         /// <param name="text">The text to filter.</param>
         /// <param name="culture">The culture.</param>
diff --git a/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs b/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs
index 9472ff4823..a0f8c73548 100644
--- a/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs
+++ b/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs
@@ -8,11 +8,11 @@ namespace Umbraco.Core.Strings
     public class DefaultUrlSegmentProvider : IUrlSegmentProvider
     {
         /// <summary>
-        /// Gets the url segment for a specified content and culture.
+        /// Gets the URL segment for a specified content and culture.
         /// </summary>
         /// <param name="content">The content.</param>
         /// <param name="culture">The culture.</param>
-        /// <returns>The url segment.</returns>
+        /// <returns>The URL segment.</returns>
         public string GetUrlSegment(IContentBase content, string culture = null)
         {
             return GetUrlSegmentSource(content, culture).ToUrlSegment(culture);
diff --git a/src/Umbraco.Core/Strings/Diff.cs b/src/Umbraco.Core/Strings/Diff.cs
index 6cd4985ead..9aeeb487ef 100644
--- a/src/Umbraco.Core/Strings/Diff.cs
+++ b/src/Umbraco.Core/Strings/Diff.cs
@@ -232,7 +232,7 @@ namespace Umbraco.Core.Strings
 
             // strip off all cr, only use lf as text line separator.
             aText = aText.Replace("\r", "");
-            var lines = aText.Split('\n');
+            var lines = aText.Split(Constants.CharArrays.LineFeed);
 
             var codes = new int[lines.Length];
 
diff --git a/src/Umbraco.Core/Strings/IShortStringHelper.cs b/src/Umbraco.Core/Strings/IShortStringHelper.cs
index fecbeaaee9..37873caded 100644
--- a/src/Umbraco.Core/Strings/IShortStringHelper.cs
+++ b/src/Umbraco.Core/Strings/IShortStringHelper.cs
@@ -1,7 +1,7 @@
 namespace Umbraco.Core.Strings
 {
     /// <summary>
-    /// Provides string functions for short strings such as aliases or url segments.
+    /// Provides string functions for short strings such as aliases or URL segments.
     /// </summary>
     /// <remarks>Not necessarily optimized to work on large bodies of text.</remarks>
     public interface IShortStringHelper
@@ -26,24 +26,24 @@
         string CleanStringForSafeAlias(string text, string culture);
 
         /// <summary>
-        /// Cleans a string to produce a string that can safely be used in an url segment.
+        /// Cleans a string to produce a string that can safely be used in an URL segment.
         /// </summary>
         /// <param name="text">The text to filter.</param>
-        /// <returns>The safe url segment.</returns>
+        /// <returns>The safe URL segment.</returns>
         /// <remarks>The string will be cleaned in the context of the IShortStringHelper default culture.</remarks>
         string CleanStringForUrlSegment(string text);
 
         /// <summary>
-        /// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an url segment.
+        /// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an URL segment.
         /// </summary>
         /// <param name="text">The text to filter.</param>
         /// <param name="culture">The culture.</param>
-        /// <returns>The safe url segment.</returns>
+        /// <returns>The safe URL segment.</returns>
         string CleanStringForUrlSegment(string text, string culture);
 
         /// <summary>
         /// Cleans a string, in the context of the invariant culture, to produce a string that can safely be used as a filename,
-        /// both internally (on disk) and externally (as a url).
+        /// both internally (on disk) and externally (as a URL).
         /// </summary>
         /// <param name="text">The text to filter.</param>
         /// <returns>The safe filename.</returns>
@@ -52,7 +52,7 @@
 
         /// <summary>
         /// Cleans a string, in the context of a specified culture, to produce a string that can safely be used as a filename,
-        /// both internally (on disk) and externally (as a url).
+        /// both internally (on disk) and externally (as a URL).
         /// </summary>
         /// <param name="text">The text to filter.</param>
         /// <param name="culture">The culture.</param>
diff --git a/src/Umbraco.Core/Strings/IUrlSegmentProvider.cs b/src/Umbraco.Core/Strings/IUrlSegmentProvider.cs
index 12d2ef9a17..fddb87e716 100644
--- a/src/Umbraco.Core/Strings/IUrlSegmentProvider.cs
+++ b/src/Umbraco.Core/Strings/IUrlSegmentProvider.cs
@@ -4,20 +4,20 @@ using Umbraco.Core.Models;
 namespace Umbraco.Core.Strings
 {
     /// <summary>
-    /// Provides url segments for content.
+    /// Provides URL segments for content.
     /// </summary>
     /// <remarks>Url segments should comply with IETF RFCs regarding content, encoding, etc.</remarks>
     public interface IUrlSegmentProvider
     {
         /// <summary>
-        /// Gets the url segment for a specified content and culture.
+        /// Gets the URL segment for a specified content and culture.
         /// </summary>
         /// <param name="content">The content.</param>
         /// <param name="culture">The culture.</param>
-        /// <returns>The url segment.</returns>
-        /// <remarks>This is for when Umbraco is capable of managing more than one url
+        /// <returns>The URL segment.</returns>
+        /// <remarks>This is for when Umbraco is capable of managing more than one URL
         /// per content, in 1-to-1 multilingual configurations. Then there would be one
-        /// url per culture.</remarks>
+        /// URL per culture.</remarks>
         string GetUrlSegment(IContentBase content, string culture = null);
 
         // TODO: For the 301 tracking, we need to add another extended interface to this so that
diff --git a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
index 2a558f85aa..52af734f1c 100644
--- a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
+++ b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
@@ -9,7 +9,7 @@ using Umbraco.Core.Logging;
 namespace Umbraco.Core.Sync
 {
     /// <summary>
-    /// A helper used to determine the current server umbraco application url.
+    /// A helper used to determine the current server umbraco application URL.
     /// </summary>
     public static class ApplicationUrlHelper
     {
@@ -17,12 +17,12 @@ namespace Umbraco.Core.Sync
         private static readonly Type TypeOfApplicationUrlHelper = typeof(ApplicationUrlHelper);
 
         /// <summary>
-        /// Gets or sets a custom provider for the umbraco application url.
+        /// Gets or sets a custom provider for the umbraco application URL.
         /// </summary>
         /// <remarks>
         /// <para>Receives the current request as a parameter, and it may be null. Must return a properly
-        /// formatted url with scheme and umbraco dir and no trailing slash eg "http://www.mysite.com/umbraco",
-        /// or <c>null</c>. To be used in auto-load-balancing scenarios where the application url is not
+        /// formatted URL with scheme and umbraco dir and no trailing slash eg "http://www.mysite.com/umbraco",
+        /// or <c>null</c>. To be used in auto-load-balancing scenarios where the application URL is not
         /// in config files but is determined programmatically.</para>
         /// <para>Must be assigned before resolution is frozen.</para>
         /// </remarks>
@@ -38,7 +38,7 @@ namespace Umbraco.Core.Sync
             umbracoApplicationUrl = ApplicationUrlProvider?.Invoke(request);
             if (string.IsNullOrWhiteSpace(umbracoApplicationUrl) == false)
             {
-                umbracoApplicationUrl = umbracoApplicationUrl.TrimEnd('/');
+                umbracoApplicationUrl = umbracoApplicationUrl.TrimEnd(Constants.CharArrays.ForwardSlash);
                 logger.Info(TypeOfApplicationUrlHelper, "ApplicationUrl: {UmbracoAppUrl} (provider)", umbracoApplicationUrl);
                 return umbracoApplicationUrl;
             }
@@ -61,13 +61,13 @@ namespace Umbraco.Core.Sync
             var url = settings.WebRouting.UmbracoApplicationUrl;
             if (url.IsNullOrWhiteSpace() == false)
             {
-                var umbracoApplicationUrl = url.TrimEnd('/');
+                var umbracoApplicationUrl = url.TrimEnd(Constants.CharArrays.ForwardSlash);
                 logger.Info(TypeOfApplicationUrlHelper, "ApplicationUrl: {UmbracoAppUrl} (using web.routing/@umbracoApplicationUrl)", umbracoApplicationUrl);
                 return umbracoApplicationUrl;
             }
 
             // try the server registrar
-            // which is assumed to return a url that:
+            // which is assumed to return a URL that:
             // - end with SystemDirectories.Umbraco
             // - contain a scheme
             // - end or not with a slash, it will be taken care of
@@ -75,7 +75,7 @@ namespace Umbraco.Core.Sync
             url = serverRegistrar.GetCurrentServerUmbracoApplicationUrl();
             if (url.IsNullOrWhiteSpace() == false)
             {
-                var umbracoApplicationUrl = url.TrimEnd('/');
+                var umbracoApplicationUrl = url.TrimEnd(Constants.CharArrays.ForwardSlash);
                 logger.Info(TypeOfApplicationUrlHelper, "ApplicationUrl: {UmbracoAppUrl} (IServerRegistrar)", umbracoApplicationUrl);
                 return umbracoApplicationUrl;
             }
@@ -100,7 +100,7 @@ namespace Umbraco.Core.Sync
             var ssl = globalSettings.UseHttps ? "s" : ""; // force, whatever the first request
             var url = "http" + ssl + "://" + request.ServerVariables["SERVER_NAME"] + port + IOHelper.ResolveUrl(SystemDirectories.Umbraco);
 
-            return url.TrimEnd('/');
+            return url.TrimEnd(Constants.CharArrays.ForwardSlash);
         }
     }
 }
diff --git a/src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs b/src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
index 276ce6097c..a4315c33e9 100644
--- a/src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
+++ b/src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
@@ -46,11 +46,11 @@ namespace Umbraco.Core.Sync
         }
 
         /// <summary>
-        /// Gets the current umbraco application url.
+        /// Gets the current umbraco application URL.
         /// </summary>
         public string GetCurrentServerUmbracoApplicationUrl()
         {
-            // this registrar does not provide the umbraco application url
+            // this registrar does not provide the umbraco application URL
             return null;
         }
 
diff --git a/src/Umbraco.Core/Sync/IServerRegistrar.cs b/src/Umbraco.Core/Sync/IServerRegistrar.cs
index a4edb1d0e9..8bc8021eec 100644
--- a/src/Umbraco.Core/Sync/IServerRegistrar.cs
+++ b/src/Umbraco.Core/Sync/IServerRegistrar.cs
@@ -18,11 +18,11 @@ namespace Umbraco.Core.Sync
         ServerRole GetCurrentServerRole();
 
         /// <summary>
-        /// Gets the current umbraco application url.
+        /// Gets the current umbraco application URL.
         /// </summary>
         /// <remarks>
-        /// <para>If the registrar does not provide the umbraco application url, should return null.</para>
-        /// <para>Must return null, or a url that ends with SystemDirectories.Umbraco, and contains a scheme, eg "http://www.mysite.com/umbraco".</para>
+        /// <para>If the registrar does not provide the umbraco application URL, should return null.</para>
+        /// <para>Must return null, or a URL that ends with SystemDirectories.Umbraco, and contains a scheme, eg "http://www.mysite.com/umbraco".</para>
         /// </remarks>
         string GetCurrentServerUmbracoApplicationUrl();
     }
diff --git a/src/Umbraco.Core/Udi.cs b/src/Umbraco.Core/Udi.cs
index b11ce250ad..4fafbc0aeb 100644
--- a/src/Umbraco.Core/Udi.cs
+++ b/src/Umbraco.Core/Udi.cs
@@ -171,7 +171,7 @@ namespace Umbraco.Core
                 throw new FormatException(string.Format("Unknown entity type \"{0}\".", entityType));
             }
 
-            var path = uri.AbsolutePath.TrimStart('/');
+            var path = uri.AbsolutePath.TrimStart(Constants.CharArrays.ForwardSlash);
 
             if (udiType == UdiType.GuidUdi)
             {
diff --git a/src/Umbraco.Core/UdiGetterExtensions.cs b/src/Umbraco.Core/UdiGetterExtensions.cs
index 5a5ccf5574..4eba1858a6 100644
--- a/src/Umbraco.Core/UdiGetterExtensions.cs
+++ b/src/Umbraco.Core/UdiGetterExtensions.cs
@@ -154,7 +154,7 @@ namespace Umbraco.Core
         public static StringUdi GetUdi(this Stylesheet entity)
         {
             if (entity == null) throw new ArgumentNullException("entity");
-            return new StringUdi(Constants.UdiEntityType.Stylesheet, entity.Path.TrimStart('/')).EnsureClosed();
+            return new StringUdi(Constants.UdiEntityType.Stylesheet, entity.Path.TrimStart(Constants.CharArrays.ForwardSlash)).EnsureClosed();
         }
 
         /// <summary>
@@ -165,7 +165,7 @@ namespace Umbraco.Core
         public static StringUdi GetUdi(this Script entity)
         {
             if (entity == null) throw new ArgumentNullException("entity");
-            return new StringUdi(Constants.UdiEntityType.Script, entity.Path.TrimStart('/')).EnsureClosed();
+            return new StringUdi(Constants.UdiEntityType.Script, entity.Path.TrimStart(Constants.CharArrays.ForwardSlash)).EnsureClosed();
         }
 
         /// <summary>
@@ -204,7 +204,7 @@ namespace Umbraco.Core
                 ? Constants.UdiEntityType.PartialViewMacro
                 : Constants.UdiEntityType.PartialView;
 
-            return new StringUdi(entityType, entity.Path.TrimStart('/')).EnsureClosed();
+            return new StringUdi(entityType, entity.Path.TrimStart(Constants.CharArrays.ForwardSlash)).EnsureClosed();
         }
         
         /// <summary>
diff --git a/src/Umbraco.Core/UdiRange.cs b/src/Umbraco.Core/UdiRange.cs
index b70cf43d18..857e818ce6 100644
--- a/src/Umbraco.Core/UdiRange.cs
+++ b/src/Umbraco.Core/UdiRange.cs
@@ -70,7 +70,7 @@ namespace Umbraco.Core
             }
 
             var udiUri = uri.Query == string.Empty ? uri : new UriBuilder(uri) { Query = string.Empty }.Uri;
-            return new UdiRange(Udi.Create(udiUri), uri.Query.TrimStart('?'));
+            return new UdiRange(Udi.Create(udiUri), uri.Query.TrimStart(Constants.CharArrays.QuestionMark));
         }
 
         public override string ToString()
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index c5a953631a..eb51e20f5d 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -128,21 +128,52 @@
     </Compile>
     -->
     <Compile Include="AssemblyExtensions.cs" />
+    <Compile Include="Constants-CharArrays.cs" />
+    <Compile Include="Collections\EventClearingObservableCollection.cs" />
     <Compile Include="Constants-SqlTemplates.cs" />
+    <Compile Include="Exceptions\UnattendedInstallException.cs" />
+    <Compile Include="Collections\EventClearingObservableCollection.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\ContentTypeDto80.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyDataDto80.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyTypeDto80.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_12_0\AddCmsContentNuByteColumn.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_12_0\UpgradedIncludeIndexes.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_10_0\AddPropertyTypeLabelOnTopColumn.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_9_0\ExternalLoginTableUserData.cs" />
+    <Compile Include="Models\Blocks\BlockEditorDataConverter.cs" />
+    <Compile Include="Models\Blocks\BlockEditorData.cs" />
+    <Compile Include="Models\Blocks\BlockItemData.cs" />
+    <Compile Include="Models\Blocks\BlockListLayoutItem.cs" />
+    <Compile Include="Models\Blocks\BlockListEditorDataConverter.cs" />
+    <Compile Include="Models\Blocks\BlockValue.cs" />
+    <Compile Include="Models\Blocks\ContentAndSettingsReference.cs" />
+    <Compile Include="Models\Blocks\IBlockReference.cs" />
     <Compile Include="Models\ContentDataIntegrityReport.cs" />
     <Compile Include="Models\ContentDataIntegrityReportEntry.cs" />
     <Compile Include="Models\ContentDataIntegrityReportOptions.cs" />
+    <Compile Include="Models\Identity\ExternalLogin.cs" />
+    <Compile Include="Models\Identity\IExternalLogin.cs" />
+    <Compile Include="Models\IconModel.cs" />
     <Compile Include="Models\InstallLog.cs" />
+    <Compile Include="Models\IReadOnlyContentBase.cs" />
+    <Compile Include="Models\PublishedContent\PublishedContentTypeExtensions.cs" />
+    <Compile Include="Models\ReadOnlyContentBaseAdapter.cs" />
     <Compile Include="Models\RelationTypeExtensions.cs" />
     <Compile Include="Persistence\Repositories\IInstallationRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\InstallationRepository.cs" />
+    <Compile Include="Persistence\SqlCeImageMapper.cs" />
+    <Compile Include="PropertyEditors\IPropertyCacheCompressionOptions.cs" />
+    <Compile Include="PropertyEditors\NoopPropertyCacheCompressionOptions.cs" />
+    <Compile Include="PropertyEditors\PropertyCacheCompression.cs" />
+    <Compile Include="PropertyEditors\IPropertyCacheCompression.cs" />
     <Compile Include="Serialization\AutoInterningStringConverter.cs" />
     <Compile Include="Serialization\AutoInterningStringKeyCaseInsensitiveDictionaryConverter.cs" />
+    <Compile Include="PropertyEditors\ComplexPropertyEditorContentEventHandler.cs" />
+    <Compile Include="Services\IIconService.cs" />
     <Compile Include="Services\Implement\InstallationService.cs" />
     <Compile Include="Migrations\Upgrade\V_8_6_0\AddMainDomLock.cs" />
+    <Compile Include="Models\Blocks\BlockListItem.cs" />
+    <Compile Include="Models\Blocks\BlockListModel.cs" />
     <Compile Include="Models\UpgradeResult.cs" />
     <Compile Include="Persistence\Repositories\Implement\UpgradeCheckRepository.cs" />
     <Compile Include="Persistence\Repositories\IUpgradeCheckRepository.cs" />
@@ -237,6 +268,7 @@
     <Compile Include="CompositionExtensions_Essentials.cs" />
     <Compile Include="CompositionExtensions_FileSystems.cs" />
     <Compile Include="CompositionExtensions_Uniques.cs" />
+    <Compile Include="Constants-SvgSanitizer.cs" />
     <Compile Include="Exceptions\PanicException.cs" />
     <Compile Include="FactoryExtensions.cs" />
     <Compile Include="Composing\RegisterFactory.cs" />
diff --git a/src/Umbraco.Core/UriExtensions.cs b/src/Umbraco.Core/UriExtensions.cs
index 1198b26e0f..60d9cd6ead 100644
--- a/src/Umbraco.Core/UriExtensions.cs
+++ b/src/Umbraco.Core/UriExtensions.cs
@@ -43,8 +43,8 @@ namespace Umbraco.Core
         {
             applicationPath = applicationPath ?? string.Empty;
 
-            var fullUrlPath = url.AbsolutePath.TrimStart(new[] {'/'});
-            var appPath = applicationPath.TrimStart(new[] {'/'});
+            var fullUrlPath = url.AbsolutePath.TrimStart(Constants.CharArrays.ForwardSlash);
+            var appPath = applicationPath.TrimStart(Constants.CharArrays.ForwardSlash);
             var urlPath = fullUrlPath.TrimStart(appPath).EnsureStartsWith('/');
 
             //check if this is in the umbraco back office
@@ -93,7 +93,7 @@ namespace Umbraco.Core
             // Umbraco/MYPLUGINAREA/MYCONTROLLERNAME/{action}/{id}
             // so if the path contains at a minimum 3 parts: Umbraco + MYPLUGINAREA + MYCONTROLLERNAME then we will have to assume it is a
             // plugin controller for the front-end.
-            if (urlPath.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries).Length >= 3)
+            if (urlPath.Split(Constants.CharArrays.ForwardSlash, StringSplitOptions.RemoveEmptyEntries).Length >= 3)
             {
                 return false;
             }
diff --git a/src/Umbraco.Core/Xml/XmlHelper.cs b/src/Umbraco.Core/Xml/XmlHelper.cs
index d6461ec8c6..f070e08d4f 100644
--- a/src/Umbraco.Core/Xml/XmlHelper.cs
+++ b/src/Umbraco.Core/Xml/XmlHelper.cs
@@ -53,7 +53,7 @@ namespace Umbraco.Core.Xml
         public static bool IsXmlWhitespace(string s)
         {
             // as per xml 1.1 specs - anything else is significant whitespace
-            s = s.Trim(' ', '\t', '\r', '\n');
+            s = s.Trim(Constants.CharArrays.XmlWhitespaceChars);
             return s.Length == 0;
         }
 
diff --git a/src/Umbraco.Examine/ContentIndexPopulator.cs b/src/Umbraco.Examine/ContentIndexPopulator.cs
index 99ff4d7f87..e10ad012c4 100644
--- a/src/Umbraco.Examine/ContentIndexPopulator.cs
+++ b/src/Umbraco.Examine/ContentIndexPopulator.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Examine;
-using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Core.Persistence;
@@ -15,7 +14,7 @@ namespace Umbraco.Examine
     /// <summary>
     /// Performs the data lookups required to rebuild a content index
     /// </summary>
-    public class ContentIndexPopulator : IndexPopulator<IUmbracoContentIndex>
+    public class ContentIndexPopulator : IndexPopulator<IUmbracoContentIndex2>
     {
         private readonly IContentService _contentService;
         private readonly IValueSetBuilder<IContent> _contentValueSetBuilder;
@@ -58,6 +57,12 @@ namespace Umbraco.Examine
             _parentId = parentId;
         }
 
+        public override bool IsRegistered(IUmbracoContentIndex2 index)
+        {
+            // check if it should populate based on published values
+            return _publishedValuesOnly == index.PublishedValuesOnly;
+        }
+
         protected override void PopulateIndexes(IReadOnlyList<IIndex> indexes)
         {
             if (indexes.Count == 0) return;
@@ -70,31 +75,89 @@ namespace Umbraco.Examine
             {
                 contentParentId = _parentId.Value;
             }
+
+            if (_publishedValuesOnly)
+            {
+                IndexPublishedContent(contentParentId, pageIndex, pageSize, indexes);
+            }
+            else
+            {
+                IndexAllContent(contentParentId, pageIndex, pageSize, indexes);
+            }
+        }
+
+        protected void IndexAllContent(int contentParentId, int pageIndex, int pageSize, IReadOnlyList<IIndex> indexes)
+        {
             IContent[] content;
 
             do
             {
-                if (!_publishedValuesOnly)
-                {
-                    content = _contentService.GetPagedDescendants(contentParentId, pageIndex, pageSize, out _).ToArray();
-                }
-                else
-                {
-                    //add the published filter
-                    //note: We will filter for published variants in the validator
-                    content = _contentService.GetPagedDescendants(contentParentId, pageIndex, pageSize, out _,
-                        _publishedQuery, Ordering.By("Path", Direction.Ascending)).ToArray();
-                }
+                content = _contentService.GetPagedDescendants(contentParentId, pageIndex, pageSize, out _).ToArray();
 
                 if (content.Length > 0)
                 {
+                    var valueSets = _contentValueSetBuilder.GetValueSets(content).ToList();
+
                     // ReSharper disable once PossibleMultipleEnumeration
                     foreach (var index in indexes)
-                        index.IndexItems(_contentValueSetBuilder.GetValueSets(content));
+                    {
+                        index.IndexItems(valueSets);
+                    }
+                }
+
+                pageIndex++;
+            } while (content.Length == pageSize);
+        }
+
+        protected void IndexPublishedContent(int contentParentId, int pageIndex, int pageSize,
+            IReadOnlyList<IIndex> indexes)
+        {
+            IContent[] content;
+
+            var publishedPages = new HashSet<int>();
+
+            do
+            {
+                //add the published filter
+                //note: We will filter for published variants in the validator
+                content = _contentService.GetPagedDescendants(contentParentId, pageIndex, pageSize, out _, _publishedQuery,
+                    Ordering.By("Path", Direction.Ascending)).ToArray();
+
+                
+                if (content.Length > 0)
+                {
+                    var indexableContent = new List<IContent>();
+
+                    foreach (var item in content)
+                    {
+                        if (item.Level == 1)
+                        {
+                            // first level pages are always published so no need to filter them
+                            indexableContent.Add(item);
+                            publishedPages.Add(item.Id);
+                        }
+                        else
+                        {
+                            if (publishedPages.Contains(item.ParentId))
+                            {
+                                // only index when parent is published
+                                publishedPages.Add(item.Id);
+                                indexableContent.Add(item);
+                            }
+                        }
+                    }
+
+                    var valueSets = _contentValueSetBuilder.GetValueSets(indexableContent.ToArray()).ToList();
+
+                    // ReSharper disable once PossibleMultipleEnumeration
+                    foreach (var index in indexes)
+                        index.IndexItems(valueSets);
                 }
 
                 pageIndex++;
             } while (content.Length == pageSize);
         }
     }
+
+
 }
diff --git a/src/Umbraco.Examine/ContentValueSetBuilder.cs b/src/Umbraco.Examine/ContentValueSetBuilder.cs
index b8477a9047..dfd64fcd47 100644
--- a/src/Umbraco.Examine/ContentValueSetBuilder.cs
+++ b/src/Umbraco.Examine/ContentValueSetBuilder.cs
@@ -60,6 +60,11 @@ namespace Umbraco.Examine
                 scope.Complete();
             }
 
+            return GetValueSetsEnumerable(content, creatorIds, writerIds);
+        }
+
+        private IEnumerable<ValueSet> GetValueSetsEnumerable(IContent[] content, Dictionary<int, IProfile> creatorIds, Dictionary<int, IProfile> writerIds)
+        {
             // TODO: There is a lot of boxing going on here and ultimately all values will be boxed by Lucene anyways
             // but I wonder if there's a way to reduce the boxing that we have to do or if it will matter in the end since
             // Lucene will do it no matter what? One idea was to create a `FieldValue` struct which would contain `object`, `object[]`, `ValueType` and `ValueType[]`
diff --git a/src/Umbraco.Examine/IUmbracoContentIndex.cs b/src/Umbraco.Examine/IUmbracoContentIndex.cs
index 3181ff663e..b718ec6bce 100644
--- a/src/Umbraco.Examine/IUmbracoContentIndex.cs
+++ b/src/Umbraco.Examine/IUmbracoContentIndex.cs
@@ -2,6 +2,20 @@ using Examine;
 
 namespace Umbraco.Examine
 {
+    /// <summary>
+    /// Marker interface for indexes of Umbraco content
+    /// </summary>
+    /// <remarks>
+    /// This is a backwards compat change, in next major version remove the need for this and just have a single interface
+    /// </remarks>
+    public interface IUmbracoContentIndex2 : IUmbracoContentIndex
+    {
+        bool PublishedValuesOnly { get; }
+    }
+
+    /// <summary>
+    /// Marker interface for indexes of Umbraco content
+    /// </summary>
     public interface IUmbracoContentIndex : IIndex
     {
 
diff --git a/src/Umbraco.Examine/IndexPopulator.cs b/src/Umbraco.Examine/IndexPopulator.cs
index f9d4d85dc8..bfd757f9be 100644
--- a/src/Umbraco.Examine/IndexPopulator.cs
+++ b/src/Umbraco.Examine/IndexPopulator.cs
@@ -13,9 +13,16 @@ namespace Umbraco.Examine
     {
         public override bool IsRegistered(IIndex index)
         {
-            if (base.IsRegistered(index)) return true;
-            return index is TIndex;
+            if (base.IsRegistered(index))
+                return true;
+
+            if (!(index is TIndex casted))
+                return false;
+
+            return IsRegistered(casted);
         }
+
+        public virtual bool IsRegistered(TIndex index) => true;
     }
 
     public abstract class IndexPopulator : IIndexPopulator
diff --git a/src/Umbraco.Examine/IndexRebuilder.cs b/src/Umbraco.Examine/IndexRebuilder.cs
index 786aecac71..b14ff25c57 100644
--- a/src/Umbraco.Examine/IndexRebuilder.cs
+++ b/src/Umbraco.Examine/IndexRebuilder.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Examine;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Examine
 {   
@@ -12,12 +14,20 @@ namespace Umbraco.Examine
     /// </summary>
     public class IndexRebuilder
     {
+        private readonly IProfilingLogger _logger;
         private readonly IEnumerable<IIndexPopulator> _populators;
         public IExamineManager ExamineManager { get; }
 
+        [Obsolete("Use constructor with all dependencies")]
         public IndexRebuilder(IExamineManager examineManager, IEnumerable<IIndexPopulator> populators)
+            : this(Current.ProfilingLogger, examineManager, populators)
+        {
+        }
+
+        public IndexRebuilder(IProfilingLogger logger, IExamineManager examineManager, IEnumerable<IIndexPopulator> populators)
         {
             _populators = populators;
+            _logger = logger;
             ExamineManager = examineManager;
         }
 
@@ -50,8 +60,18 @@ namespace Umbraco.Examine
                 index.CreateIndex(); // clear the index
             }
 
-            //run the populators in parallel against all indexes
-            Parallel.ForEach(_populators, populator => populator.Populate(indexes));
+            // run each populator over the indexes
+            foreach(var populator in _populators)
+            {
+                try
+                {
+                    populator.Populate(indexes);
+                }
+                catch (Exception e)
+                {
+                    _logger.Error<IndexRebuilder>(e, "Index populating failed for populator {Populator}", populator.GetType());                    
+                }
+            }
         }
 
     }
diff --git a/src/Umbraco.Examine/UmbracoContentIndex.cs b/src/Umbraco.Examine/UmbracoContentIndex.cs
index e266ca789d..88033b1407 100644
--- a/src/Umbraco.Examine/UmbracoContentIndex.cs
+++ b/src/Umbraco.Examine/UmbracoContentIndex.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Examine
     /// <summary>
     /// An indexer for Umbraco content and media
     /// </summary>
-    public class UmbracoContentIndex : UmbracoExamineIndex, IUmbracoContentIndex
+    public class UmbracoContentIndex : UmbracoExamineIndex, IUmbracoContentIndex2
     {
         public const string VariesByCultureFieldName = SpecialFieldPrefix + "VariesByCulture";
         protected ILocalizationService LanguageService { get; }
@@ -62,7 +62,7 @@ namespace Umbraco.Examine
         /// <param name="onComplete"></param>
         protected override void PerformIndexItems(IEnumerable<ValueSet> values, Action<IndexOperationEventArgs> onComplete)
         {
-            //We don't want to re-enumerate this list, but we need to split it into 2x enumerables: invalid and valid items.
+            // We don't want to re-enumerate this list, but we need to split it into 2x enumerables: invalid and valid items.
             // The Invalid items will be deleted, these are items that have invalid paths (i.e. moved to the recycle bin, etc...)
             // Then we'll index the Value group all together.
             // We return 0 or 1 here so we can order the results and do the invalid first and then the valid.
@@ -80,7 +80,7 @@ namespace Umbraco.Examine
                         || !validator.ValidateProtectedContent(path, v.Category))
                     ? 0
                     : 1;
-            });
+            }).ToList();
 
             var hasDeletes = false;
             var hasUpdates = false;
@@ -99,7 +99,7 @@ namespace Umbraco.Examine
                 {
                     hasUpdates = true;
                     //these are the valid ones, so just index them all at once
-                    base.PerformIndexItems(group, onComplete);
+                    base.PerformIndexItems(group.ToList(), onComplete);
                 }
             }
 
diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
index 15ca2cca24..4051bc3bd5 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Umbraco.Core;
@@ -25,6 +26,13 @@ namespace Umbraco.ModelsBuilder.Embedded.BackOffice
             //don't do anything if we're not enabled
             if (!_config.Enable) yield break;
 
+            //list of reserved/disallowed aliases for content/media/member types - more can be added as the need arises
+            var reservedModelAliases = new[] { "system" };
+            if(reservedModelAliases.Contains(model.Alias, StringComparer.OrdinalIgnoreCase))
+            {
+                yield return new ValidationResult($"The model alias {model.Alias} is a reserved term and cannot be used", new[] { "Alias" });
+            }
+
             var properties = model.Groups.SelectMany(x => x.Properties)
                 .Where(x => x.Inherited == false)
                 .ToArray();
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
index 7ef8112d11..e59900bdc4 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
@@ -446,7 +446,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
             {
                 WriteNonGenericClrType(sb, type.Substring(0, p));
                 sb.Append("<");
-                var args = type.Substring(p + 1).TrimEnd('>').Split(','); // fixme will NOT work with nested generic types
+                var args = type.Substring(p + 1).TrimEnd(Umbraco.Core.Constants.CharArrays.GreaterThan).Split(Umbraco.Core.Constants.CharArrays.Comma); // fixme will NOT work with nested generic types
                 for (var i = 0; i < args.Length; i++)
                 {
                     if (i > 0) sb.Append(", ");
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/DisabledModelsBuilderComponent.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/DisabledModelsBuilderComponent.cs
index c599785711..826b392592 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/DisabledModelsBuilderComponent.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/DisabledModelsBuilderComponent.cs
@@ -8,7 +8,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Compose
     /// <summary>
     /// Special component used for when MB is disabled with the legacy MB is detected
     /// </summary>
-    internal class DisabledModelsBuilderComponent : IComponent
+    public sealed class DisabledModelsBuilderComponent : IComponent
     {
         private readonly UmbracoFeatures _features;
 
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
index 0e41c9ac62..a475e4e1c3 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
@@ -50,32 +50,38 @@ namespace Umbraco.ModelsBuilder.Embedded.Compose
         }
 
         public void Terminate()
-        { }
+        {
+            ServerVariablesParser.Parsing -= ServerVariablesParser_Parsing;
+            ContentModelBinder.ModelBindingException -= ContentModelBinder_ModelBindingException;
+            FileService.SavingTemplate -= FileService_SavingTemplate;
+        }
 
         private void InstallServerVars()
         {
-            // register our url - for the backoffice api
-            ServerVariablesParser.Parsing += (sender, serverVars) =>
-            {
-                if (!serverVars.ContainsKey("umbracoUrls"))
-                    throw new ArgumentException("Missing umbracoUrls.");
-                var umbracoUrlsObject = serverVars["umbracoUrls"];
-                if (umbracoUrlsObject == null)
-                    throw new ArgumentException("Null umbracoUrls");
-                if (!(umbracoUrlsObject is Dictionary<string, object> umbracoUrls))
-                    throw new ArgumentException("Invalid umbracoUrls");
+            // register our URL - for the backoffice API
+            ServerVariablesParser.Parsing += ServerVariablesParser_Parsing;
+        }
 
-                if (!serverVars.ContainsKey("umbracoPlugins"))
-                    throw new ArgumentException("Missing umbracoPlugins.");
-                if (!(serverVars["umbracoPlugins"] is Dictionary<string, object> umbracoPlugins))
-                    throw new ArgumentException("Invalid umbracoPlugins");
+        private void ServerVariablesParser_Parsing(object sender, Dictionary<string, object> serverVars)
+        {
+            if (!serverVars.ContainsKey("umbracoUrls"))
+                throw new ArgumentException("Missing umbracoUrls.");
+            var umbracoUrlsObject = serverVars["umbracoUrls"];
+            if (umbracoUrlsObject == null)
+                throw new ArgumentException("Null umbracoUrls");
+            if (!(umbracoUrlsObject is Dictionary<string, object> umbracoUrls))
+                throw new ArgumentException("Invalid umbracoUrls");
 
-                if (HttpContext.Current == null) throw new InvalidOperationException("HttpContext is null");
-                var urlHelper = new UrlHelper(new RequestContext(new HttpContextWrapper(HttpContext.Current), new RouteData()));
+            if (!serverVars.ContainsKey("umbracoPlugins"))
+                throw new ArgumentException("Missing umbracoPlugins.");
+            if (!(serverVars["umbracoPlugins"] is Dictionary<string, object> umbracoPlugins))
+                throw new ArgumentException("Invalid umbracoPlugins");
 
-                umbracoUrls["modelsBuilderBaseUrl"] = urlHelper.GetUmbracoApiServiceBaseUrl<ModelsBuilderDashboardController>(controller => controller.BuildModels());
-                umbracoPlugins["modelsBuilder"] = GetModelsBuilderSettings();
-            };
+            if (HttpContext.Current == null) throw new InvalidOperationException("HttpContext is null");
+            var urlHelper = new UrlHelper(new RequestContext(new HttpContextWrapper(HttpContext.Current), new RouteData()));
+
+            umbracoUrls["modelsBuilderBaseUrl"] = urlHelper.GetUmbracoApiServiceBaseUrl<ModelsBuilderDashboardController>(controller => controller.BuildModels());
+            umbracoPlugins["modelsBuilder"] = GetModelsBuilderSettings();
         }
 
         private Dictionary<string, object> GetModelsBuilderSettings()
diff --git a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
index 0e125759c6..912d0e3363 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
@@ -542,8 +542,10 @@ namespace Umbraco.ModelsBuilder.Embedded
                 if (modelInfos.TryGetValue(typeName, out var modelInfo))
                     throw new InvalidOperationException($"Both types {type.FullName} and {modelInfo.ModelType.FullName} want to be a model type for content type with alias \"{typeName}\".");
 
-                // fixme use Core's ReflectionUtilities.EmitCtor !!
+                // TODO: use Core's ReflectionUtilities.EmitCtor !!
                 // Yes .. DynamicMethod is uber slow
+                // TODO: But perhaps https://docs.microsoft.com/en-us/dotnet/api/system.reflection.emit.constructorbuilder?view=netcore-3.1 is better still?
+                // See CtorInvokeBenchmarks
                 var meth = new DynamicMethod(string.Empty, typeof(IPublishedElement), ctorArgTypes, type.Module, true);
                 var gen = meth.GetILGenerator();
                 gen.Emit(OpCodes.Ldarg_0);
diff --git a/src/Umbraco.TestData/LoadTestController.cs b/src/Umbraco.TestData/LoadTestController.cs
new file mode 100644
index 0000000000..97665dd084
--- /dev/null
+++ b/src/Umbraco.TestData/LoadTestController.cs
@@ -0,0 +1,371 @@
+using System;
+using System.Threading;
+using System.Linq;
+using System.Web.Mvc;
+using Umbraco.Core.Services;
+using Umbraco.Core.Models;
+using System.Web;
+using System.Web.Hosting;
+using System.Web.Routing;
+using System.Diagnostics;
+using Umbraco.Core.Composing;
+using System.Configuration;
+
+// see https://github.com/Shazwazza/UmbracoScripts/tree/master/src/LoadTesting
+
+namespace Umbraco.TestData
+{
+    public class LoadTestController : Controller
+    {
+        public LoadTestController(ServiceContext serviceContext)
+        {
+            _serviceContext = serviceContext;
+        }
+
+        private static readonly Random _random = new Random();
+        private static readonly object _locko = new object();
+
+        private static volatile int _containerId = -1;
+
+        private const string _containerAlias = "LoadTestContainer";
+        private const string _contentAlias = "LoadTestContent";
+        private const int _textboxDefinitionId = -88;
+        private const int _maxCreate = 1000;
+
+        private static readonly string HeadHtml = @"<html>
+<head>
+  <title>LoadTest</title>
+  <style>
+    body { font-family: arial; }
+    a,a:visited { color: blue; }
+    h1 { margin: 0; padding: 0; font-size: 120%; font-weight: bold; }
+    h1 a { text-decoration: none; }
+    div.block { margin: 20px 0; }
+    ul { margin:0; }
+    div.ver { font-size: 80%; }
+    div.head { padding:0 0 10px 0; margin: 0 0 20px 0; border-bottom: 1px solid #cccccc; }
+  </style>
+</head>
+<body>
+  <div class=""head"">
+  <h1><a href=""/LoadTest"">LoadTest</a></h1>
+  <div class=""ver"">" + System.Configuration.ConfigurationManager.AppSettings["umbracoConfigurationStatus"] + @"</div>
+  </div>
+";
+
+        private const string FootHtml = @"</body>
+</html>";
+
+        private static readonly string _containerTemplateText = @"
+@inherits Umbraco.Web.Mvc.UmbracoViewPage
+@{
+    Layout = null;
+    var container = Umbraco.ContentAtRoot().OfTypes(""" + _containerAlias + @""").FirstOrDefault();
+    var contents = container.Children().ToArray();
+    var groups = contents.GroupBy(x => x.Value<string>(""origin""));
+    var id = contents.Length > 0 ? contents[0].Id : -1;
+    var wurl = Request.QueryString[""u""] == ""1"";
+    var missing = contents.Length > 0 && contents[contents.Length - 1].Id - contents[0].Id >= contents.Length;
+}
+" + HeadHtml + @"
+<div class=""block"">
+<span @Html.Raw(missing ? ""style=\""color:red;\"""" : """")>@contents.Length items</span>
+<ul>
+@foreach (var group in groups)
+{
+    <li>@group.Key: @group.Count()</li>
+}
+</ul></div>
+<div class=""block"">
+@foreach (var content in contents)
+{
+	while (content.Id > id)
+	{
+		<div style=""color:red;"">@id :: MISSING</div>
+		id++;
+	}
+    if (wurl)
+    {
+        <div>@content.Id :: @content.Name :: @content.Url</div>
+    }
+    else
+    {
+        <div>@content.Id :: @content.Name</div>
+    }	id++;
+}
+</div>
+" + FootHtml;
+        private readonly ServiceContext _serviceContext;
+
+        private ActionResult ContentHtml(string s)
+        {
+            return Content(HeadHtml + s + FootHtml);
+        }
+
+        public ActionResult Index()
+        {
+            var res = EnsureInitialize();
+            if (res != null) return res;
+
+            var html = @"Welcome. You can:
+<ul>
+    <li><a href=""/LoadTestContainer"">List existing contents</a> (u:url)</li>
+    <li><a href=""/LoadTest/Create?o=browser"">Create a content</a> (o:origin, r:restart, n:number)</li>
+    <li><a href=""/LoadTest/Clear"">Clear all contents</a></li>
+    <li><a href=""/LoadTest/Domains"">List the current domains in w3wp.exe</a></li>
+    <li><a href=""/LoadTest/Restart"">Restart the current AppDomain</a></li>
+    <li><a href=""/LoadTest/Recycle"">Recycle the AppPool</a></li>
+    <li><a href=""/LoadTest/Die"">Cause w3wp.exe to die</a></li>
+</ul>
+";
+
+            return ContentHtml(html);
+        }
+
+        private ActionResult EnsureInitialize()
+        {
+            if (_containerId > 0) return null;
+
+            lock (_locko)
+            {
+                if (_containerId > 0) return null;
+
+                var contentTypeService = _serviceContext.ContentTypeService;
+                var contentType = contentTypeService.Get(_contentAlias);
+                if (contentType == null)
+                    return ContentHtml("Not installed, first you must <a href=\"/LoadTest/Install\">install</a>.");
+
+                var containerType = contentTypeService.Get(_containerAlias);
+                if (containerType == null)
+                    return ContentHtml("Panic! Container type is missing.");
+
+                var contentService = _serviceContext.ContentService;
+                var container = contentService.GetPagedOfType(containerType.Id, 0, 100, out _, null).FirstOrDefault();
+                if (container == null)
+                    return ContentHtml("Panic! Container is missing.");
+
+                _containerId = container.Id;
+                return null;
+            }
+        }
+
+        public ActionResult Install()
+        {
+            var dataTypeService = _serviceContext.DataTypeService;
+
+            //var dataType = dataTypeService.GetAll(Constants.DataTypes.DefaultContentListView);
+
+
+            //if (!dict.ContainsKey("pageSize")) dict["pageSize"] = new PreValue("10");
+            //dict["pageSize"].Value = "200";
+            //dataTypeService.SavePreValues(dataType, dict);
+
+            var contentTypeService = _serviceContext.ContentTypeService;
+
+            var contentType = new ContentType(-1)
+            {
+                Alias = _contentAlias,
+                Name = "LoadTest Content",
+                Description = "Content for LoadTest",
+                Icon = "icon-document"
+            };
+            var def = _serviceContext.DataTypeService.GetDataType(_textboxDefinitionId);
+            contentType.AddPropertyType(new PropertyType(def)
+            {
+                Name = "Origin",
+                Alias = "origin",
+                Description = "The origin of the content.",
+            });
+            contentTypeService.Save(contentType);
+
+            var containerTemplate = ImportTemplate(_serviceContext,
+                 "LoadTestContainer", "LoadTestContainer", _containerTemplateText);
+
+            var containerType = new ContentType(-1)
+            {
+                Alias = _containerAlias,
+                Name = "LoadTest Container",
+                Description = "Container for LoadTest content",
+                Icon = "icon-document",
+                AllowedAsRoot = true,
+                IsContainer = true
+            };
+            containerType.AllowedContentTypes = containerType.AllowedContentTypes.Union(new[]
+            {
+                new ContentTypeSort(new Lazy<int>(() => contentType.Id), 0, contentType.Alias),
+            });
+            containerType.AllowedTemplates = containerType.AllowedTemplates.Union(new[] { containerTemplate });
+            containerType.SetDefaultTemplate(containerTemplate);
+            contentTypeService.Save(containerType);
+
+            var contentService = _serviceContext.ContentService;
+            var content = contentService.Create("LoadTestContainer", -1, _containerAlias);
+            contentService.SaveAndPublish(content);
+
+            return ContentHtml("Installed.");
+        }
+
+        public ActionResult Create(int n = 1, int r = 0, string o = null)
+        {
+            var res = EnsureInitialize();
+            if (res != null) return res;
+
+            if (r < 0) r = 0;
+            if (r > 100) r = 100;
+            var restart = GetRandom(0, 100) > (100 - r);
+
+            var contentService = _serviceContext.ContentService;
+
+            if (n < 1) n = 1;
+            if (n > _maxCreate) n = _maxCreate;
+            for (int i = 0; i < n; i++)
+            {
+                var name = Guid.NewGuid().ToString("N").ToUpper() + "-" + (restart ? "R" : "X") + "-" + o;
+                var content = contentService.Create(name, _containerId, _contentAlias);
+                content.SetValue("origin", o);
+                contentService.SaveAndPublish(content);
+            }
+
+            if (restart)
+                DoRestart();
+
+            return ContentHtml("Created " + n + " content"
+                + (restart ? ", and restarted" : "")
+                + ".");
+        }
+
+        private int GetRandom(int minValue, int maxValue)
+        {
+            lock (_locko)
+            {
+                return _random.Next(minValue, maxValue);
+            }
+        }
+
+        public ActionResult Clear()
+        {
+            var res = EnsureInitialize();
+            if (res != null) return res;
+
+            var contentType = _serviceContext.ContentTypeService.Get(_contentAlias);
+            _serviceContext.ContentService.DeleteOfType(contentType.Id);
+
+            return ContentHtml("Cleared.");
+        }
+
+        private void DoRestart()
+        {
+            HttpContext.User = null;
+            System.Web.HttpContext.Current.User = null;
+            Thread.CurrentPrincipal = null;
+            HttpRuntime.UnloadAppDomain();
+        }
+
+        public ActionResult Restart()
+        {
+            DoRestart();
+
+            return ContentHtml("Restarted.");
+        }
+
+        public ActionResult Die()
+        {
+            var timer = new System.Threading.Timer(_ =>
+            {
+                throw new Exception("die!");
+            });
+            timer.Change(100, 0);
+
+            return ContentHtml("Dying.");
+        }
+
+        public ActionResult Domains()
+        {
+            var currentDomain = AppDomain.CurrentDomain;
+            var currentName = currentDomain.FriendlyName;
+            var pos = currentName.IndexOf('-');
+            if (pos > 0) currentName = currentName.Substring(0, pos);
+
+            var text = new System.Text.StringBuilder();
+            text.Append("<div class=\"block\">Process ID: " + Process.GetCurrentProcess().Id + "</div>");
+            text.Append("<div class=\"block\">");
+            text.Append("<div>IIS Site: " + HostingEnvironment.ApplicationHost.GetSiteName() + "</div>");
+            text.Append("<div>App ID: " + currentName + "</div>");
+            //text.Append("<div>AppPool: " + Zbu.WebManagement.AppPoolHelper.GetCurrentApplicationPoolName() + "</div>");
+            text.Append("</div>");
+
+            text.Append("<div class=\"block\">Domains:<ul>");
+            text.Append("<li>Not implemented.</li>");
+            /*
+            foreach (var domain in Zbu.WebManagement.AppDomainHelper.GetAppDomains().OrderBy(x => x.Id))
+            {
+                var name = domain.FriendlyName;
+                pos = name.IndexOf('-');
+                if (pos > 0) name = name.Substring(0, pos);
+                text.Append("<li style=\""
+                    + (name != currentName ? "color: #cccccc;" : "")
+                    //+ (domain.Id == currentDomain.Id ? "" : "")
+                    + "\">"
+                    +"[" + domain.Id + "] " + name 
+                    + (domain.IsDefaultAppDomain() ? " (default)" : "") 
+                    + (domain.Id == currentDomain.Id ? " (current)" : "")
+                    + "</li>");
+            }
+            */
+            text.Append("</ul></div>");
+
+            return ContentHtml(text.ToString());
+        }
+
+        public ActionResult Recycle()
+        {
+            return ContentHtml("Not implemented&mdash;please use IIS console.");
+        }
+
+        private static Template ImportTemplate(ServiceContext svces, string name, string alias, string text, ITemplate master = null)
+        {
+            var t = new Template(name, alias) { Content = text };
+            if (master != null)
+                t.SetMasterTemplate(master);
+            svces.FileService.SaveTemplate(t);
+            return t;
+        }
+    }
+
+    public class TestComponent : IComponent
+    {
+        public void Initialize()
+        {
+            if (ConfigurationManager.AppSettings["Umbraco.TestData.Enabled"] != "true")
+                return;
+
+            RouteTable.Routes.MapRoute(
+               name: "LoadTest",
+               url: "LoadTest/{action}",
+               defaults: new
+               {
+                   controller = "LoadTest",
+                   action = "Index"
+               },
+               namespaces: new[] { "Umbraco.TestData" }
+           );
+        }
+
+        public void Terminate()
+        {
+        }
+    }
+
+    public class TestComposer : ComponentComposer<TestComponent>, IUserComposer
+    {
+        public override void Compose(Composition composition)
+        {
+            base.Compose(composition);
+
+            if (ConfigurationManager.AppSettings["Umbraco.TestData.Enabled"] != "true")
+                return;
+
+            composition.Register(typeof(LoadTestController), Lifetime.Request);
+        }
+    }
+}
diff --git a/src/Umbraco.TestData/Umbraco.TestData.csproj b/src/Umbraco.TestData/Umbraco.TestData.csproj
index d61321ebb8..a3753cc17b 100644
--- a/src/Umbraco.TestData/Umbraco.TestData.csproj
+++ b/src/Umbraco.TestData/Umbraco.TestData.csproj
@@ -41,6 +41,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="LoadTestController.cs" />
     <Compile Include="SegmentTestController.cs" />
     <Compile Include="UmbracoTestDataController.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/src/Umbraco.TestData/UmbracoTestDataController.cs b/src/Umbraco.TestData/UmbracoTestDataController.cs
index 02949d5345..26f52da478 100644
--- a/src/Umbraco.TestData/UmbracoTestDataController.cs
+++ b/src/Umbraco.TestData/UmbracoTestDataController.cs
@@ -172,7 +172,7 @@ namespace Umbraco.TestData
             {
                 var imageUrl = faker.Image.PicsumUrl();
 
-                // we are appending a &ext=.jpg to the end of this for a reason. The result of this url will be something like:
+                // we are appending a &ext=.jpg to the end of this for a reason. The result of this URL will be something like:
                 // https://picsum.photos/640/480/?image=106
                 // and due to the way that we detect images there must be an extension so we'll change it to
                 // https://picsum.photos/640/480/?image=106&ext=.jpg
@@ -208,7 +208,8 @@ namespace Umbraco.TestData
             var docType = GetOrCreateContentType();
 
             var parent = Services.ContentService.Create(company, -1, docType.Alias);
-            parent.SetValue("review", faker.Rant.Review());
+            // give it some reasonable data (100 reviews)
+            parent.SetValue("review", string.Join(" ", Enumerable.Range(0, 100).Select(x => faker.Rant.Review())));
             parent.SetValue("desc", company);
             parent.SetValue("media", imageIds[random.Next(0, imageIds.Count - 1)]);
             Services.ContentService.Save(parent);
@@ -218,7 +219,8 @@ namespace Umbraco.TestData
             return CreateHierarchy(parent, count, depth, currParent =>
             {
                 var content = Services.ContentService.Create(faker.Commerce.ProductName(), currParent, docType.Alias);
-                content.SetValue("review", faker.Rant.Review());
+                // give it some reasonable data (100 reviews)
+                content.SetValue("review", string.Join(" ", Enumerable.Range(0, 100).Select(x => faker.Rant.Review())));
                 content.SetValue("desc", string.Join(", ", Enumerable.Range(0, 5).Select(x => faker.Commerce.ProductAdjective())));
                 content.SetValue("media", imageIds[random.Next(0, imageIds.Count - 1)]);
 
diff --git a/src/Umbraco.Tests.AcceptanceTest/README.md b/src/Umbraco.Tests.AcceptanceTest/README.md
index e8699b0733..f4edaa92ea 100644
--- a/src/Umbraco.Tests.AcceptanceTest/README.md
+++ b/src/Umbraco.Tests.AcceptanceTest/README.md
@@ -1,35 +1,36 @@
-# Umbraco Acceptance Tests
-
-### Prerequisite
-- NodeJS 12+
-- A running installed Umbraco on url: [https://localhost:44331](https://localhost:44331) (Default development port)
-   - Install using a `SqlServer`/`LocalDb` as the tests execute too fast for `SqlCE` to handle.
-- User information in `cypress.env.json` (See [Getting started](#getting-started))
-
-### Getting started
-The tests is located in the project/folder named `Umbraco.Tests.AcceptanceTests`. Ensur to run `npm install` in that folder, or let your IDE do that.
-
-Next, it is important you create a new file in the root of the project called `cypress.env.json`.
-This file is already added to `.gitignore` and can contain values that is different for each developer machine.
-
-The file need the following content:
-```
-{
-    "username": "<email for superadmin>",
-    "password": "<password for superadmin>"
-}
-```
-Replace the `<email for superadmin>` and `<password for superadmin>` placeholders with correct info.
-
-
-
-### Executing tests
-
-There exists two npm scripts, that can be used to execute the test.
-
-1. `npm run test`
-   - Executes the tests headless.
-1. `npm run ui`
-   - Executes the tests in a browser handled by a cypress application.
-
- In case of errors it is recommended to use the UI to debug.
+# Umbraco Acceptance Tests
+
+### Prerequisites
+- NodeJS 12+
+- A running installed Umbraco on url: [https://localhost:44331](https://localhost:44331) (Default development port)
+   - Install using a `SqlServer`/`LocalDb` as the tests execute too fast for `SqlCE` to handle.
+
+### Getting started
+The tests are located in the project/folder as `Umbraco.Tests.AcceptanceTests`. Make sure you run `npm install` in that folder, or let your IDE do that.
+
+The script will ask you to enter the username and password for a superadmin user of your Umbraco CMS.
+
+### Executing tests
+There are two npm scripts that can be used to execute the test:
+
+1. `npm run test`
+   - Executes the tests headless.
+1. `npm run ui`
+   - Executes the tests in a browser handled by a cypress application.
+
+ In case of errors it is recommended to use the UI to debug.
+
+### Enviroment Configuration
+
+The enviroment configuration is begin setup by the npm installation script.
+This results in the creation of this file: `cypress.env.json`.
+This file is already added to `.gitignore` and can contain values that are different for each developer machine.
+
+The file has the following content:
+```
+{
+    "username": "<email for superadmin>",
+    "password": "<password for superadmin>"
+}
+```
+You can change this if you like or run the config script to reset the values, type "npm run config" in your terminal.
diff --git a/src/Umbraco.Tests.AcceptanceTest/config.js b/src/Umbraco.Tests.AcceptanceTest/config.js
new file mode 100644
index 0000000000..5297cbccbc
--- /dev/null
+++ b/src/Umbraco.Tests.AcceptanceTest/config.js
@@ -0,0 +1,49 @@
+const prompt = require('prompt');
+const fs = require('fs');
+
+const properties = [
+    {
+        description: 'Enter your superadmin username/email',
+        name: 'username',
+        required: true
+    },
+    {
+        description: 'Enter your superadmin password',
+        name: 'password',
+        hidden: true,
+        required: true
+    },
+    {
+        description: 'Enter CMS URL, or leave empty for default(https://localhost:44331)',
+        name: 'baseUrl'
+    }
+];
+
+
+const configPath = './cypress.env.json'
+
+console.log("Configure your test enviroment")
+
+prompt.start();
+
+prompt.get(properties, function (error, result) {
+    if (error) { return onError(error); }
+
+var fileContent = `{
+    "username": "${result.username}",
+    "password": "${result.password}"${
+        result.baseUrl && `,
+    "baseUrl": "${result.baseUrl}"`
+    }
+}`;
+
+    fs.writeFile(configPath, fileContent, function (error) {
+        if (error) return console.error(error);
+        console.log('Configuration saved');
+    });
+});
+
+function onError(error) {
+    console.error(error);
+    return true;
+}
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
new file mode 100644
index 0000000000..22f1f883d0
--- /dev/null
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
@@ -0,0 +1,599 @@
+/// <reference types="Cypress" />
+import { DocumentTypeBuilder, ContentBuilder, AliasHelper } from 'umbraco-cypress-testhelpers';
+context('Content', () => {
+
+    beforeEach(() => {
+        cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'));
+    });
+
+    function refreshContentTree(){
+        // Refresh to update the tree
+        cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
+        cy.umbracoContextMenuAction("action-refreshNode").click();
+        // We have to wait in case the execution is slow, otherwise we'll try and click the item before it appears in the UI
+        cy.get('.umb-tree-item__inner').should('exist', {timeout: 10000});
+    }
+
+    it('Copy content', () => {
+        const rootDocTypeName = "Test document type";
+        const childDocTypeName = "Child test document type";
+        const nodeName = "1) Home";
+        const childNodeName = "1) Child";
+        const anotherNodeName = "2) Home";
+
+        const childDocType = new DocumentTypeBuilder()
+            .withName(childDocTypeName)
+            .build();
+
+        cy.deleteAllContent();
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+        cy.umbracoEnsureDocumentTypeNameNotExists(childDocTypeName);
+
+        cy.saveDocumentType(childDocType).then((generatedChildDocType) => {
+            const rootDocTypeAlias;
+            const createdChildDocType = generatedChildDocType;
+
+            cy.get('li .umb-tree-root:contains("Content")').should("be.visible");
+
+            const rootDocType = new DocumentTypeBuilder()
+                .withName(rootDocTypeName)
+                .withAllowAsRoot(true)
+                .withAllowedContentTypes(createdChildDocType["id"])
+                .build();
+
+            cy.saveDocumentType(rootDocType).then((generatedRootDocType) => {
+                rootDocTypeAlias = generatedRootDocType["alias"];
+
+                const rootContentNode = new ContentBuilder()
+                    .withContentTypeAlias(rootDocTypeAlias)
+                    .withAction("saveNew")
+                    .addVariant()
+                        .withName(nodeName)
+                        .withSave(true)
+                    .done()
+                    .build();
+
+                cy.saveContent(rootContentNode).then((contentNode) => {
+                    // Add an item under root node
+                    const childContentNode = new ContentBuilder()
+                        .withContentTypeAlias(createdChildDocType["alias"])
+                        .withAction("saveNew")
+                        .withParent(contentNode["id"])
+                        .addVariant()
+                            .withName(childNodeName)
+                            .withSave(true)
+                        .done()
+                        .build();
+
+                    cy.saveContent(childContentNode);
+                });
+
+                const anotherRootContentNode = new ContentBuilder()
+                    .withContentTypeAlias(rootDocTypeAlias)
+                    .withAction("saveNew")
+                    .addVariant()
+                        .withName(anotherNodeName)
+                        .withSave(true)
+                    .done()
+                    .build();
+
+                cy.saveContent(anotherRootContentNode);
+            });
+        });
+
+        // Refresh to update the tree
+        refreshContentTree();
+
+        // Copy node
+        cy.umbracoTreeItem("content", [nodeName, childNodeName]).rightclick({ force: true });
+        cy.umbracoContextMenuAction("action-copy").click();
+        cy.get('.umb-pane [data-element="tree-item-' + anotherNodeName + '"]').click();
+        cy.get('.umb-dialog-footer > .btn-primary').click();
+
+        // Assert
+        cy.get('.alert-success').should('exist');
+
+        // Clean up (content is automatically deleted when document types are gone)
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+        cy.umbracoEnsureDocumentTypeNameNotExists(childDocTypeName);
+    });
+
+    it('Move content', () => {
+        const rootDocTypeName = "Test document type";
+        const childDocTypeName = "Child test document type";
+        const nodeName = "1) Home";
+        const childNodeName = "1) Child";
+        const anotherNodeName = "2) Home";
+
+        const childDocType = new DocumentTypeBuilder()
+            .withName(childDocTypeName)
+            .build();
+
+        cy.deleteAllContent();
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+        cy.umbracoEnsureDocumentTypeNameNotExists(childDocTypeName);
+
+        cy.saveDocumentType(childDocType).then((generatedChildDocType) => {
+            const rootDocTypeAlias;
+            const createdChildDocType = generatedChildDocType;
+
+            cy.get('li .umb-tree-root:contains("Content")').should("be.visible");
+
+            const rootDocType = new DocumentTypeBuilder()
+                .withName(rootDocTypeName)
+                .withAllowAsRoot(true)
+                .withAllowedContentTypes(createdChildDocType["id"])
+                .build();
+
+            cy.saveDocumentType(rootDocType).then((generatedRootDocType) => {
+                rootDocTypeAlias = generatedRootDocType["alias"];
+
+                const rootContentNode = new ContentBuilder()
+                    .withContentTypeAlias(rootDocTypeAlias)
+                    .withAction("saveNew")
+                    .addVariant()
+                        .withName(nodeName)
+                        .withSave(true)
+                    .done()
+                    .build();
+
+                cy.saveContent(rootContentNode).then((contentNode) => {
+                    // Add an item under root node
+                    const childContentNode = new ContentBuilder()
+                        .withContentTypeAlias(createdChildDocType["alias"])
+                        .withAction("saveNew")
+                        .withParent(contentNode["id"])
+                        .addVariant()
+                            .withName(childNodeName)
+                            .withSave(true)
+                        .done()
+                        .build();
+
+                    cy.saveContent(childContentNode);
+                });
+
+                const anotherRootContentNode = new ContentBuilder()
+                    .withContentTypeAlias(rootDocTypeAlias)
+                    .withAction("saveNew")
+                    .addVariant()
+                        .withName(anotherNodeName)
+                        .withSave(true)
+                    .done()
+                    .build();
+
+                cy.saveContent(anotherRootContentNode);
+            });
+        });
+
+        // Refresh to update the tree
+        refreshContentTree();
+
+        // Move node
+        cy.umbracoTreeItem("content", [nodeName, childNodeName]).rightclick({ force: true });
+        cy.umbracoContextMenuAction("action-move").click();
+        cy.get('.umb-pane [data-element="tree-item-' + anotherNodeName + '"]').click();
+        cy.get('.umb-dialog-footer > .btn-primary').click();
+
+        // Assert
+        cy.get('.alert-success').should('exist');
+
+        // Clean up (content is automatically deleted when document types are gone)
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+        cy.umbracoEnsureDocumentTypeNameNotExists(childDocTypeName);
+    });
+
+    it('Sort content', () => {
+        const rootDocTypeName = "Test document type";
+        const childDocTypeName = "Child test document type";
+        const nodeName = "1) Home";
+        const firstChildNodeName = "1) Child";
+        const secondChildNodeName = "2) Child";
+
+        const childDocType = new DocumentTypeBuilder()
+            .withName(childDocTypeName)
+            .build();
+
+        cy.deleteAllContent();
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+        cy.umbracoEnsureDocumentTypeNameNotExists(childDocTypeName);
+
+        cy.saveDocumentType(childDocType).then((generatedChildDocType) => {
+            const createdChildDocType = generatedChildDocType;
+
+            cy.get('li .umb-tree-root:contains("Content")').should("be.visible");
+
+            const rootDocType = new DocumentTypeBuilder()
+                .withName(rootDocTypeName)
+                .withAllowAsRoot(true)
+                .withAllowedContentTypes(createdChildDocType["id"])
+                .build();
+
+            cy.saveDocumentType(rootDocType).then((generatedRootDocType) => {
+                const parentId;
+
+                const rootContentNode = new ContentBuilder()
+                    .withContentTypeAlias(generatedRootDocType["alias"])
+                    .withAction("saveNew")
+                    .addVariant()
+                        .withName(nodeName)
+                        .withSave(true)
+                    .done()
+                    .build();
+
+                cy.saveContent(rootContentNode).then((contentNode) => {
+                    parentId = contentNode["id"];
+
+                    // Add an item under root node
+                    const firstChildContentNode = new ContentBuilder()
+                        .withContentTypeAlias(createdChildDocType["alias"])
+                        .withAction("saveNew")
+                        .withParent(parentId)
+                        .addVariant()
+                            .withName(firstChildNodeName)
+                            .withSave(true)
+                        .done()
+                        .build();
+
+                    cy.saveContent(firstChildContentNode);
+
+                    // Add a second item under root node
+                    const secondChildContentNode = new ContentBuilder()
+                        .withContentTypeAlias(createdChildDocType["alias"])
+                        .withAction("saveNew")
+                        .withParent(parentId)
+                        .addVariant()
+                            .withName(secondChildNodeName)
+                            .withSave(true)
+                        .done()
+                        .build();
+
+                    cy.saveContent(secondChildContentNode);
+                });
+            });
+        });
+
+        // Refresh to update the tree
+        refreshContentTree();
+
+        // Sort nodes
+        cy.umbracoTreeItem("content", [nodeName]).rightclick({ force: true });
+        cy.umbracoContextMenuAction("action-sort").click();
+
+        //Drag and drop
+        cy.get('.ui-sortable .ui-sortable-handle :nth-child(2)').eq(0).trigger('mousedown', { which: 1 })
+        cy.get('.ui-sortable .ui-sortable-handle :nth-child(2)').eq(1).trigger("mousemove").trigger("mouseup")
+
+        // Save and close dialog
+        cy.get('.umb-modalcolumn .btn-success').click();
+        cy.get('.umb-modalcolumn .btn-link').click();
+
+        // Assert
+        cy.get('.umb-tree-item [node="child"]').eq(0).should('contain.text', secondChildNodeName);
+        cy.get('.umb-tree-item [node="child"]').eq(1).should('contain.text', firstChildNodeName);
+
+        // Clean up (content is automatically deleted when document types are gone)
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+        cy.umbracoEnsureDocumentTypeNameNotExists(childDocTypeName);
+    });
+
+    it('Rollback content', () => {
+        const rootDocTypeName = "Test document type";
+        const initialNodeName = "Home node";
+        const nodeName = "Home";
+
+        const rootDocType = new DocumentTypeBuilder()
+            .withName(rootDocTypeName)
+            .withAllowAsRoot(true)
+            .build();
+
+        cy.deleteAllContent();
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+
+        cy.saveDocumentType(rootDocType).then((generatedRootDocType) => {
+            const rootContentNode = new ContentBuilder()
+                .withContentTypeAlias(generatedRootDocType["alias"])
+                .addVariant()
+                    .withName(initialNodeName)
+                    .withSave(true)
+                .done()
+                .build();
+
+            cy.saveContent(rootContentNode)
+        });
+
+        // Refresh to update the tree
+        refreshContentTree();
+
+        // Access node
+        cy.umbracoTreeItem("content", [initialNodeName]).click();
+
+        // Edit header
+        cy.get('#headerName').clear();
+        cy.umbracoEditorHeaderName(nodeName);
+
+        // Save and publish
+        cy.get('.btn-success').first().click();
+        cy.umbracoSuccessNotification().should('be.visible');
+
+        // Rollback
+        cy.get('.umb-box-header :button').click();
+
+        cy.get('.umb-box-content > div > .input-block-level')
+            .find('option[label*=' + new Date().getDate() + ']')
+            .then(elements => {
+                const option = elements[elements.length - 1].getAttribute('value');
+                cy.get('.umb-box-content > div > .input-block-level')
+                    .select(option);
+            });
+
+        cy.get('.umb-editor-footer-content__right-side > [button-style="success"] > .umb-button > .btn-success').click();
+
+        cy.reload();
+
+        // Assert
+        cy.get('.history').find('.umb-badge').contains('Save').should('be.visible');
+        cy.get('.history').find('.umb-badge').contains('Rollback').should('be.visible');
+        cy.get('#headerName').should('have.value', initialNodeName);
+
+        // Clean up (content is automatically deleted when document types are gone)
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+    });
+
+    it('View audit trail', () => {
+        const rootDocTypeName = "Test document type";
+        const nodeName = "Home";
+        const labelName = "Name";
+
+        const rootDocType = new DocumentTypeBuilder()
+            .withName(rootDocTypeName)
+            .withAllowAsRoot(true)
+            .addGroup()
+                .addTextBoxProperty()
+                    .withLabel(labelName)
+                .done()
+            .done()
+            .build();
+
+        cy.deleteAllContent();
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+
+        cy.saveDocumentType(rootDocType).then((generatedRootDocType) => {
+            const rootContentNode = new ContentBuilder()
+                .withContentTypeAlias(generatedRootDocType["alias"])
+                .addVariant()
+                    .withName(nodeName)
+                    .withSave(true)
+                .done()
+                .build();
+
+            cy.saveContent(rootContentNode)
+        });
+
+        // Refresh to update the tree
+        refreshContentTree();
+
+        // Access node
+        cy.umbracoTreeItem("content", [nodeName]).click();
+
+        // Navigate to Info app
+        cy.get(':nth-child(2) > [ng-show="navItem.alias !== \'more\'"]').click();
+
+        // Assert
+        cy.get('.history').should('exist');
+
+        // Clean up (content is automatically deleted when document types are gone)
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+    });
+
+    it('Save draft', () => {
+        const rootDocTypeName = "Test document type";
+        const nodeName = "Home";
+
+        const rootDocType = new DocumentTypeBuilder()
+            .withName(rootDocTypeName)
+            .withAllowAsRoot(true)
+            .build();
+
+        cy.deleteAllContent();
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+
+        cy.saveDocumentType(rootDocType).then((generatedRootDocType) => {
+            const rootContentNode = new ContentBuilder()
+                .withContentTypeAlias(generatedRootDocType["alias"])
+                .withAction("saveNew")
+                .addVariant()
+                    .withName(nodeName)
+                    .withSave(true)
+                .done()
+                .build();
+
+            cy.saveContent(rootContentNode)
+        });
+
+        // Refresh to update the tree
+        refreshContentTree();
+
+        // Access node
+        cy.umbracoTreeItem("content", [nodeName]).click();
+
+        // Assert
+        cy.get('[data-element="node-info-status"]').find('.umb-badge').should('contain.text', "Draft");
+
+        // Clean up (content is automatically deleted when document types are gone)
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+    });
+
+    it('Preview draft', () => {
+        const rootDocTypeName = "Test document type";
+        const nodeName = "Home";
+
+        const rootDocType = new DocumentTypeBuilder()
+            .withName(rootDocTypeName)
+            .withAllowAsRoot(true)
+            .build();
+
+        cy.deleteAllContent();
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+
+        cy.saveDocumentType(rootDocType).then((generatedRootDocType) => {
+            const rootContentNode = new ContentBuilder()
+                .withContentTypeAlias(generatedRootDocType["alias"])
+                .withAction("saveNew")
+                .addVariant()
+                    .withName(nodeName)
+                    .withSave(true)
+                .done()
+                .build();
+
+            cy.saveContent(rootContentNode)
+        });
+
+        // Refresh to update the tree
+        refreshContentTree();
+
+        // Access node
+        cy.umbracoTreeItem("content", [nodeName]).click();
+
+        // Preview
+        cy.get('[alias="preview"]').should('be.visible').click();
+
+        // Assert
+        cy.umbracoSuccessNotification({ multiple: true }).should('be.visible');
+
+        // Clean up (content is automatically deleted when document types are gone)
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+    });
+
+    it('Publish draft', () => {
+        const rootDocTypeName = "Test document type";
+        const nodeName = "Home";
+
+        const rootDocType = new DocumentTypeBuilder()
+            .withName(rootDocTypeName)
+            .withAllowAsRoot(true)
+            .build();
+
+        cy.deleteAllContent();
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+
+        cy.saveDocumentType(rootDocType).then((generatedRootDocType) => {
+            const rootContentNode = new ContentBuilder()
+                .withContentTypeAlias(generatedRootDocType["alias"])
+                .addVariant()
+                    .withName(nodeName)
+                    .withSave(true)
+                .done()
+                .build();
+
+            cy.saveContent(rootContentNode)
+        });
+
+        // Refresh to update the tree
+        refreshContentTree();
+
+        // Access node
+        cy.umbracoTreeItem("content", [nodeName]).click();
+
+        // Assert
+        cy.get('[data-element="node-info-status"]').find('.umb-badge').should('contain.text', "Published");
+
+        // Clean up (content is automatically deleted when document types are gone)
+        cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
+    });
+
+    it('Content with contentpicker', () => {
+        const pickerDocTypeName = 'Content picker doc type';
+        const pickerDocTypeAlias = AliasHelper.toAlias(pickerDocTypeName);
+        const pickedDocTypeName = 'Picked content document type';
+
+        cy.deleteAllContent();
+        cy.umbracoEnsureDocumentTypeNameNotExists(pickerDocTypeName);
+        cy.umbracoEnsureTemplateNameNotExists(pickerDocTypeName);
+        cy.umbracoEnsureDocumentTypeNameNotExists(pickedDocTypeName);
+
+        // Create the content type and content we'll be picking from.
+        const pickedDocType = new DocumentTypeBuilder()
+            .withName(pickedDocTypeName)
+            .withAllowAsRoot(true)
+            .addGroup()
+                .addTextBoxProperty()
+                    .withAlias('text')
+                .done()
+            .done()
+            .build();
+
+        cy.saveDocumentType(pickedDocType).then((generatedType) => {
+            const pickedContentNode = new ContentBuilder()
+                .withContentTypeAlias(generatedType["alias"])
+                .withAction("publishNew")
+                .addVariant()
+                .withName('Content to pick')
+                .withSave(true)
+                .withPublish(true)
+                .addProperty()
+                    .withAlias('text')
+                    .withValue('Acceptance test')
+                .done()
+                .withSave(true)
+                .withPublish(true)
+                .done()
+                .build();
+            cy.saveContent(pickedContentNode);
+        });
+
+        // Create the doctype with a the picker
+        const pickerDocType = new DocumentTypeBuilder()
+            .withName(pickerDocTypeName)
+            .withAlias(pickerDocTypeAlias)
+            .withAllowAsRoot(true)
+            .withDefaultTemplate(pickerDocTypeAlias)
+            .addGroup()
+                .withName('ContentPickerGroup')
+                .addContentPickerProperty()
+                    .withAlias('picker')
+                .done()
+            .done()
+            .build();
+
+        cy.saveDocumentType(pickerDocType);
+
+        // Edit it the template to allow us to verify the rendered view.
+        cy.editTemplate(pickerDocTypeName, `@inherits Umbraco.Web.Mvc.UmbracoViewPage<ContentModels.ContentPickerDocType>
+        @using ContentModels = Umbraco.Web.PublishedModels;
+        @{
+            Layout = null;
+        }
+
+        @{
+            IPublishedContent typedContentPicker = Model.Value<IPublishedContent>("picker");
+            if (typedContentPicker != null)
+            {
+                <p>@typedContentPicker.Value("text")</p>
+            }
+        }`);
+
+        // Create content with content picker
+        cy.get('.umb-tree-root-link').rightclick();
+        cy.get('.-opens-dialog > .umb-action-link').click();
+        cy.get('[data-element="action-create-' + pickerDocTypeAlias + '"] > .umb-action-link').click();
+        // Fill out content
+        cy.umbracoEditorHeaderName('ContentPickerContent');
+        cy.get('.umb-node-preview-add').click();
+        // Should really try and find a better way to do this, but umbracoTreeItem tries to click the content pane in the background
+        cy.get('[ng-if="vm.treeReady"] > .umb-tree > [ng-if="!tree.root.containsGroups"] > .umb-animated > .umb-tree-item__inner').click();
+        // We have to wait for the picked content to show up or it wont be added.
+        cy.get('.umb-node-preview__description').should('be.visible');
+        //save and publish
+        cy.umbracoButtonByLabelKey('buttons_saveAndPublish').click();
+        cy.umbracoSuccessNotification().should('be.visible');
+
+        // Assert
+        cy.log('Checking that content is rendered correctly.')
+        const expectedContent = '<p>Acceptance test</p>'
+        cy.umbracoVerifyRenderedViewContent('contentpickercontent', expectedContent, true).should('be.true');
+        // clean
+        cy.umbracoEnsureDocumentTypeNameNotExists(pickerDocTypeName);
+        cy.umbracoEnsureTemplateNameNotExists(pickerDocTypeName);
+        cy.umbracoEnsureDocumentTypeNameNotExists(pickedDocTypeName);
+    });
+});
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js
index aeb4576ccd..4d468a0cf0 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js
@@ -8,7 +8,8 @@ context('Members', () => {
     it('Create member', () => {
         const name = "Alice Bobson";
         const email = "alice-bobson@acceptancetest.umbraco";
-        const password = "$AUlkoF*St0kgPiyyVEk5iU5JWdN*F7&@OSl5Y4pOofnidfifkBj5Ns2ONv%FzsTl36V1E924Gw97zcuSeT7UwK&qb5l&O9h!d!w";
+        const password = "$AUlkoF*St0kgPiyyVEk5iU5JWdN*F7&";
+        const passwordTimeout = 20000
 
         cy.umbracoEnsureMemberEmailNotExists(email);
         cy.umbracoSection('member');
@@ -24,8 +25,8 @@ context('Members', () => {
 
         cy.get('input#_umb_login').clear().type(email);
         cy.get('input#_umb_email').clear().type(email);
-        cy.get('input#password').clear().type(password);
-        cy.get('input#confirmPassword').clear().type(password);
+        cy.get('input#password').clear().type(password, { timeout: passwordTimeout });
+        cy.get('input#confirmPassword').clear().type(password, { timeout: passwordTimeout });
 
         // Save
         cy.get('.btn-success').click();
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/dataTypes.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/dataTypes.ts
index 5803810f54..53fd55a3fc 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/dataTypes.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/dataTypes.ts
@@ -23,7 +23,7 @@ context('Data Types', () => {
     cy.umbracoEditorHeaderName(name);
 
 
-    cy.get('select[name="selectedEditor"]').select('Label');
+    cy.get('select[name="selectedEditor"]', {timeout: 5000}).select('Label');
 
     cy.get('.umb-property-editor select').select('Time');
 
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/documentTypes.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/documentTypes.ts
index 5a5ba0b3e0..1a86e90852 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/documentTypes.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/documentTypes.ts
@@ -10,6 +10,7 @@ context('Document Types', () => {
     const name = "Test document type";
 
     cy.umbracoEnsureDocumentTypeNameNotExists(name);
+    cy.umbracoEnsureTemplateNameNotExists(name);
 
     cy.umbracoSection('settings');
     cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
@@ -31,10 +32,10 @@ context('Document Types', () => {
     cy.get('[data-element="editor-add"]').click();
 
     //Search for textstring
-    cy.get('.umb-search-field').type('Textstring');
+    cy.get('#datatype-search').type('Textstring');
 
     // Choose first item
-    cy.get('ul.umb-card-grid li a[title="Textstring"]').closest("li").click();
+    cy.get('ul.umb-card-grid li [title="Textstring"]').closest("li").click();
 
     // Save property
     cy.get('.btn-success').last().click();
@@ -44,6 +45,7 @@ context('Document Types', () => {
 
     //Assert
     cy.umbracoSuccessNotification().should('be.visible');
+    cy.umbracoEnsureTemplateNameNotExists(name);
 
     //Clean up
     cy.umbracoEnsureDocumentTypeNameNotExists(name);
@@ -68,7 +70,7 @@ context('Document Types', () => {
     cy.umbracoContextMenuAction("action-delete").click();
 
     cy.get('label.checkbox').click();
-    cy.umbracoButtonByLabelKey("general_ok").click();
+    cy.umbracoButtonByLabelKey("delete").click();
 
     cy.contains(name).should('not.exist');
 
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/mediaTypes.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/mediaTypes.ts
index a963da754f..4064c1f41e 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/mediaTypes.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/mediaTypes.ts
@@ -31,10 +31,10 @@ context('Media Types', () => {
     cy.get('[data-element="editor-add"]').click();
 
     //Search for textstring
-    cy.get('.umb-search-field').type('Textstring');
+    cy.get('#datatype-search').type('Textstring');
 
     // Choose first item
-    cy.get('ul.umb-card-grid li a[title="Textstring"]').closest("li").click();
+    cy.get('ul.umb-card-grid li [title="Textstring"]').closest("li").click();
 
     // Save property
     cy.get('.btn-success').last().click();
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/memberTypes.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/memberTypes.ts
index 53823f2a69..e84c29c0d8 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/memberTypes.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/memberTypes.ts
@@ -29,10 +29,10 @@ context('Member Types', () => {
     cy.get('[data-element="editor-add"]').click();
 
     //Search for textstring
-    cy.get('.umb-search-field').type('Textstring');
+    cy.get('#datatype-search').type('Textstring');
 
     // Choose first item
-    cy.get('ul.umb-card-grid li a[title="Textstring"]').closest("li").click();
+    cy.get('ul.umb-card-grid li [title="Textstring"]').closest("li").click();
 
     // Save property
     cy.get('.btn-success').last().click();
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViewMacroFiles.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViewMacroFiles.ts
index f4c976de08..563ff77658 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViewMacroFiles.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViewMacroFiles.ts
@@ -1,23 +1,34 @@
 /// <reference types="Cypress" />
+import { PartialViewMacroBuilder } from "umbraco-cypress-testhelpers";
+
 context('Partial View Macro Files', () => {
 
   beforeEach(() => {
     cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'));
   });
 
-  it('Create new partial view macro', () => {
-    const name = "TestPartialViewMacro";
-    const fileName = name + ".cshtml";
-
-   cy.umbracoEnsurePartialViewMacroFileNameNotExists(fileName);
-   cy.umbracoEnsureMacroNameNotExists(name);
-
+  function openPartialViewMacroCreatePanel() {
     cy.umbracoSection('settings');
     cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
 
     cy.umbracoTreeItem("settings", ["Partial View Macro Files"]).rightclick();
-
     cy.umbracoContextMenuAction("action-create").click();
+  }
+
+  function cleanup(name, extension = ".cshtml") {
+    const fileName = name + extension;
+
+    cy.umbracoEnsureMacroNameNotExists(name);
+    cy.umbracoEnsurePartialViewMacroFileNameNotExists(fileName);
+  }
+
+  it('Create new partial view macro', () => {
+    const name = "TestPartialViewMacro";
+
+    cleanup(name);
+
+    openPartialViewMacroCreatePanel();
+
     cy.get('.menu-label').first().click(); // TODO: Fucked we cant use something like cy.umbracoContextMenuAction("action-label").click();
 
     //Type name
@@ -28,10 +39,117 @@ context('Partial View Macro Files', () => {
 
     //Assert
     cy.umbracoSuccessNotification().should('be.visible');
+    cy.umbracoMacroExists(name).then(exists => { expect(exists).to.be.true; });
 
     //Clean up
-    cy.umbracoEnsurePartialViewMacroFileNameNotExists(fileName);
-    cy.umbracoEnsureMacroNameNotExists(name);
-   });
+    cleanup(name);
+  });
+
+  it('Create new partial view macro without macro', () => {
+    const name = "TestPartialMacrolessMacro";
+
+    cleanup(name);
+
+    openPartialViewMacroCreatePanel();
+
+    cy.get('.menu-label').eq(1).click();
+
+    // Type name
+    cy.umbracoEditorHeaderName(name);
+
+    // Save
+    cy.get('.btn-success').click();
+
+    // Assert
+    cy.umbracoSuccessNotification().should('be.visible');
+    cy.umbracoMacroExists(name).then(exists => { expect(exists).to.be.false; });
+
+    // Clean
+    cleanup(name);
+  });
+
+  it('Create new partial view macro from snippet', () => {
+    const name = "TestPartialFromSnippet";
+
+    cleanup(name);
+
+    openPartialViewMacroCreatePanel();
+
+    cy.get('.menu-label').eq(2).click();
+
+    // Select snippet
+    cy.get('.menu-label').eq(1).click();
+
+    // Type name
+    cy.umbracoEditorHeaderName(name);
+
+    // Save
+    cy.get('.btn-success').click();
+
+    // Assert
+    cy.umbracoSuccessNotification().should('be.visible');
+    cy.umbracoMacroExists(name).then(exists => { expect(exists).to.be.true; });
+
+    // Clean
+    cleanup(name);
+  });
+
+  it('Delete partial view macro', () => {
+    const name = "TestDeletePartialViewMacro";
+    const fullName = name + ".cshtml"
+
+    cleanup(name);
+
+    const partialViewMacro = new PartialViewMacroBuilder()
+      .withName(name)
+      .withContent("@inherits Umbraco.Web.Macros.PartialViewMacroPage")
+      .build();
+
+    cy.savePartialViewMacro(partialViewMacro);
+
+    // Navigate to settings
+    cy.umbracoSection('settings');
+    cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
+
+    // Delete partialViewMacro
+    cy.umbracoTreeItem("settings", ["Partial View Macro Files", fullName]).rightclick();
+    cy.umbracoContextMenuAction("action-delete").click();
+    cy.umbracoButtonByLabelKey("general_ok").click();
+
+    // Assert
+    cy.contains(fullName).should('not.exist');
+
+    // Clean
+    cleanup(name);
+  });
+
+  it('Edit partial view macro', () => {
+    const name = "TestPartialViewMacroEditable";
+    const fullName = name + ".cshtml";
+
+    cleanup(name);
+
+    const partialViewMacro = new PartialViewMacroBuilder()
+      .withName(name)
+      .withContent("@inherits Umbraco.Web.Macros.PartialViewMacroPage")
+      .build();
+
+    cy.savePartialViewMacro(partialViewMacro);
+
+    // Navigate to settings
+    cy.umbracoSection('settings');
+    cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
+    cy.umbracoTreeItem("settings", ["Partial View Macro Files", fullName]).click();
+
+    // Type an edit
+    cy.get('.ace_text-input').type(" // test", {force:true} );
+    // Save
+    cy.get('.btn-success').click();
+
+    // Assert
+    cy.umbracoSuccessNotification().should('be.visible');
+
+    cleanup(name);
+  });
 
 });
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViews.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViews.ts
index b644c6642b..068338f8fa 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViews.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViews.ts
@@ -1,35 +1,145 @@
 /// <reference types="Cypress" />
+import { PartialViewBuilder } from "umbraco-cypress-testhelpers";
+
 context('Partial Views', () => {
 
-  beforeEach(() => {
-    cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'));
-  });
+    beforeEach(() => {
+        cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'));
+    });
 
-  it('Create new empty partial view', () => {
-    const name = "TestPartialView";
-    const fileName = name + ".cshtml";
+    function navigateToSettings() {
+        cy.umbracoSection('settings');
+        cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
+    }
 
-   cy.umbracoEnsurePartialViewNameNotExists(fileName);
+    function openPartialViewsCreatePanel() {
+        navigateToSettings();
+        cy.umbracoTreeItem("settings", ["Partial Views"]).rightclick();
+    }
 
-    cy.umbracoSection('settings');
-    cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
+    it('Create new empty partial view', () => {
+        const name = "TestPartialView";
+        const fileName = name + ".cshtml";
 
-    cy.umbracoTreeItem("settings", ["Partial Views"]).rightclick();
+        cy.umbracoEnsurePartialViewNameNotExists(fileName);
 
-    cy.umbracoContextMenuAction("action-create").click();
-    cy.get('.menu-label').first().click(); // TODO: Fucked we cant use something like cy.umbracoContextMenuAction("action-mediaType").click();
+        openPartialViewsCreatePanel();
 
-    //Type name
-    cy.umbracoEditorHeaderName(name);
+        cy.umbracoContextMenuAction("action-create").click();
+        cy.get('.menu-label').first().click(); // TODO: Fucked we cant use something like cy.umbracoContextMenuAction("action-mediaType").click();
 
-    //Save
-    cy.get('.btn-success').click();
+        //Type name
+        cy.umbracoEditorHeaderName(name);
 
-    //Assert
-    cy.umbracoSuccessNotification().should('be.visible');
+        //Save
+        cy.get('.btn-success').click();
+
+        //Assert
+        cy.umbracoSuccessNotification().should('be.visible');
+        cy.umbracoPartialViewExists(fileName).then(exists => { expect(exists).to.be.true; });
+
+        //Clean up
+        cy.umbracoEnsurePartialViewNameNotExists(fileName);
+    });
+
+    it('Create partial view from snippet', () => {
+        const name = "TestPartialViewFromSnippet";
+        const fileName = name + ".cshtml";
+
+        cy.umbracoEnsurePartialViewNameNotExists(fileName);
+
+        openPartialViewsCreatePanel();
+
+        cy.umbracoContextMenuAction("action-create").click();
+        cy.get('.menu-label').eq(1).click();
+        // Select snippet
+        cy.get('.menu-label').eq(2).click();
+
+        // Type name
+        cy.umbracoEditorHeaderName(name);
+
+        // Save
+        cy.get('.btn-success').click();
+
+        // Assert
+        cy.umbracoSuccessNotification().should('be.visible');
+        cy.umbracoPartialViewExists(fileName).then(exists => { expect(exists).to.be.true; });
+
+        // Clean up
+        cy.umbracoEnsurePartialViewNameNotExists(fileName);
+    });
+
+    it('Partial view with no name', () => {
+        openPartialViewsCreatePanel();
+
+        cy.umbracoContextMenuAction("action-create").click();
+        cy.get('.menu-label').first().click();
+
+        // The test would fail intermittently, most likely because the editor didn't have time to load
+        // This should ensure that the editor is loaded and the test should no longer fail unexpectedly.
+        cy.get('.ace_content', {timeout: 5000}).should('exist');
+
+        // Click save
+        cy.get('.btn-success').click();
+
+        // Asserts
+        cy.umbracoErrorNotification().should('be.visible');
+    });
+
+    it('Delete partial view', () => {
+        const name = "TestDeletePartialView";
+        const fileName = name + ".cshtml";
+
+        cy.umbracoEnsurePartialViewNameNotExists(fileName);
+
+        // Build and save partial view
+        const partialView = new PartialViewBuilder()
+            .withName(name)
+            .withContent("@inherits Umbraco.Web.Mvc.UmbracoViewPage")
+            .build();
+
+        cy.savePartialView(partialView);
+
+        navigateToSettings();
+
+        // Delete partial view
+        cy.umbracoTreeItem("settings", ["Partial Views", fileName]).rightclick();
+        cy.umbracoContextMenuAction("action-delete").click();
+        cy.umbracoButtonByLabelKey("general_ok").click();
+
+        // Assert
+        cy.contains(fileName).should('not.exist');
+        cy.umbracoPartialViewExists(fileName).then(exists => { expect(exists).to.be.false; });
+
+        // Clean
+        cy.umbracoEnsurePartialViewNameNotExists(fileName);
+    });
+
+    it('Edit partial view', () => {
+        const name = 'EditPartialView';
+        const fileName = name + ".cshtml";
+
+        cy.umbracoEnsurePartialViewNameNotExists(fileName);
+
+        const partialView = new PartialViewBuilder()
+            .withName(name)
+            .withContent("@inherits Umbraco.Web.Mvc.UmbracoViewPage\n")
+            .build();
+
+        cy.savePartialView(partialView);
+
+        navigateToSettings();
+        // Open partial view
+        cy.umbracoTreeItem("settings", ["Partial Views", fileName]).click();
+        // Edit
+        cy.get('.ace_text-input').type("var num = 5;", {force:true} );
+        cy.get('.btn-success').click();
+
+        // Assert
+        cy.umbracoSuccessNotification().should('be.visible');
+        // Clean
+        cy.umbracoEnsurePartialViewNameNotExists(fileName);
+    });
 
-    //Clean up
-    cy.umbracoEnsurePartialViewNameNotExists(fileName);
-   });
 
 });
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/scripts.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/scripts.ts
index 8cffd3e59b..430f8aa108 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/scripts.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/scripts.ts
@@ -1,20 +1,26 @@
 /// <reference types="Cypress" />
+import { ScriptBuilder } from "umbraco-cypress-testhelpers";
+
 context('Scripts', () => {
 
   beforeEach(() => {
     cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'));
   });
 
+  function navigateToSettings() {
+    cy.umbracoSection('settings');
+    cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
+  }
+
   it('Create new JavaScript file', () => {
     const name = "TestScript";
     const fileName = name + ".js";
 
-   cy.umbracoEnsureScriptNameNotExists(fileName);
+    cy.umbracoEnsureScriptNameNotExists(fileName);
 
-    cy.umbracoSection('settings');
-    cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
+    navigateToSettings()
 
-    cy.umbracoTreeItem("settings", ["Stylesheets"]).rightclick();
+    cy.umbracoTreeItem("settings", ["Scripts"]).rightclick();
 
     cy.umbracoContextMenuAction("action-create").click();
     cy.get('.menu-label').first().click(); // TODO: Fucked we cant use something like cy.umbracoContextMenuAction("action-mediaType").click();
@@ -27,9 +33,89 @@ context('Scripts', () => {
 
     //Assert
     cy.umbracoSuccessNotification().should('be.visible');
+    cy.umbracoScriptExists(fileName).should('be.true');
+
 
     //Clean up
     cy.umbracoEnsureScriptNameNotExists(fileName);
-   });
+  });
 
+  it('Delete a JavaScript file', () => {
+    const name = "TestDeleteScriptFile";
+    const fileName = name + ".js";
+
+    cy.umbracoEnsureScriptNameNotExists(fileName);
+
+    const script = new ScriptBuilder()
+      .withName(name)
+      .withContent('alert("this is content");')
+      .build();
+
+    cy.saveScript(script);
+
+    navigateToSettings()
+
+    cy.umbracoTreeItem("settings", ["Scripts", fileName]).rightclick();
+    cy.umbracoContextMenuAction("action-delete").click();
+    cy.umbracoButtonByLabelKey("general_ok").click();
+
+    cy.contains(fileName).should('not.exist');
+    cy.umbracoScriptExists(name).should('be.false');
+
+    cy.umbracoEnsureScriptNameNotExists(fileName);
+  });
+
+  it('Update JavaScript file', () => {
+    const name = "TestEditJavaScriptFile";
+    const nameEdit = "Edited";
+    let fileName = name + ".js";
+
+    const originalContent = 'console.log("A script);\n';
+    const edit = 'alert("content");';
+    const expected = originalContent + edit;
+
+    cy.umbracoEnsureScriptNameNotExists(fileName);
+
+    const script = new ScriptBuilder()
+      .withName(name)
+      .withContent(originalContent)
+      .build();
+    cy.saveScript(script);
+
+    navigateToSettings();
+    cy.umbracoTreeItem("settings", ["Scripts", fileName]).click();
+
+    cy.get('.ace_text-input').type(edit, { force: true });
+
+    // Since scripts has no alias it should be safe to not use umbracoEditorHeaderName
+    // umbracoEditorHeaderName does not like {backspace}
+    cy.get('#headerName').type("{backspace}{backspace}{backspace}" + nameEdit).should('have.value', name+nameEdit);
+    fileName = name + nameEdit + ".js";
+    cy.get('.btn-success').click();
+
+    cy.umbracoSuccessNotification().should('be.visible');
+    cy.umbracoVerifyScriptContent(fileName, expected).should('be.true');
+
+    cy.umbracoEnsureScriptNameNotExists(fileName);
+  });
+
+  it('Can Delete folder', () => {
+    const folderName = "TestFolder";
+
+    // The way scripts and folders are fetched and deleted are identical
+    cy.umbracoEnsureScriptNameNotExists(folderName);
+    cy.saveFolder('scripts', folderName);
+
+    navigateToSettings()
+
+    cy.umbracoTreeItem("settings", ["Scripts", folderName]).rightclick();
+    cy.umbracoContextMenuAction("action-delete").click();
+    cy.umbracoButtonByLabelKey("general_ok").click();
+
+    cy.contains(folderName).should('not.exist');
+    cy.umbracoScriptExists(folderName).should('be.false')
+
+    // A script an a folder is the same thing in this case
+    cy.umbracoEnsureScriptNameNotExists(folderName);
+  });
 });
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
index 6871db7ffe..c586384af7 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
@@ -1,57 +1,173 @@
 /// <reference types="Cypress" />
-import {DocumentTypeBuilder, TemplateBuilder} from "umbraco-cypress-testhelpers";
+import { TemplateBuilder } from 'umbraco-cypress-testhelpers';
 
 context('Templates', () => {
 
-  beforeEach(() => {
-    cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'));
-  });
-
-  it('Create template', () => {
-        const name = "Test template";
-
-        cy.umbracoEnsureTemplateNameNotExists(name);
+    beforeEach(() => {
+        cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'));
+    });
 
+    function navigateToSettings() {
         cy.umbracoSection('settings');
         cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
+    }
 
+    function createTemplate() {
+        navigateToSettings();
         cy.umbracoTreeItem("settings", ["Templates"]).rightclick();
-
         cy.umbracoContextMenuAction("action-create").click();
+    }
 
+    it('Create template', () => {
+        const name = "Create template test";
+        cy.umbracoEnsureTemplateNameNotExists(name);
+
+        createTemplate();
         //Type name
         cy.umbracoEditorHeaderName(name);
-
-        //Save
-        cy.get("form[name='contentForm']").submit();
+        // Save
+        // We must drop focus for the auto save event to occur.
+        cy.get('.btn-success').focus();
+        // And then wait for the auto save event to finish by finding the page in the tree view.
+        // This is a bit of a roundabout way to find items in a treev view since we dont use umbracoTreeItem
+        // but we must be able to wait for the save evnent to finish, and we can't do that with umbracoTreeItem
+        cy.get('[data-element="tree-item-templates"] > :nth-child(2) > .umb-animated > .umb-tree-item__inner > .umb-tree-item__label')
+            .contains(name).should('be.visible', { timeout: 10000 });
+        // Now that the auto save event has finished we can save
+        // and there wont be any duplicates or file in use errors.
+        cy.get('.btn-success').click();
 
         //Assert
         cy.umbracoSuccessNotification().should('be.visible');
+        // For some reason cy.umbracoErrorNotification tries to click the element which is not possible
+        // if it doesn't actually exist, making should('not.be.visible') impossible.
+        cy.get('.umb-notifications__notifications > .alert-error').should('not.exist');
 
         //Clean up
         cy.umbracoEnsureTemplateNameNotExists(name);
-   });
+    });
 
-    it('Delete template', () => {
-        const name = "Test template";
+    it('Unsaved changes stay', () => {
+        const name = "Templates Unsaved Changes Stay test";
+        const edit = "var num = 5;";
         cy.umbracoEnsureTemplateNameNotExists(name);
 
         const template = new TemplateBuilder()
             .withName(name)
+            .withContent('@inherits Umbraco.Web.Mvc.UmbracoViewPage\n')
             .build();
 
         cy.saveTemplate(template);
 
-        cy.umbracoSection('settings');
-        cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
+        navigateToSettings();
 
-        cy.umbracoTreeItem("settings", ["Templates", name]).rightclick();
-        cy.umbracoContextMenuAction("action-delete").click();
+        // Open partial view
+        cy.umbracoTreeItem("settings", ["Templates", name]).click();
+        // Edit
+        cy.get('.ace_text-input').type(edit, {force:true} );
 
-        cy.umbracoButtonByLabelKey("general_ok").click();
+        // Navigate away
+        cy.umbracoSection('content');
+        // Click stay button
+        cy.get('umb-button[label="Stay"] button:enabled').click();
 
-        cy.contains(name).should('not.exist');
+        // Assert
+        // That the same document is open
+        cy.get('#headerName').should('have.value', name);
+        cy.get('.ace_content').contains(edit);
 
         cy.umbracoEnsureTemplateNameNotExists(name);
     });
+
+    it('Discard unsaved changes', () => {
+        const name = "Discard changes test";
+        const edit = "var num = 5;";
+
+        cy.umbracoEnsureTemplateNameNotExists(name);
+
+        const template = new TemplateBuilder()
+            .withName(name)
+            .withContent('@inherits Umbraco.Web.Mvc.UmbracoViewPage\n')
+            .build();
+
+        cy.saveTemplate(template);
+
+        navigateToSettings();
+
+        // Open partial view
+        cy.umbracoTreeItem("settings", ["Templates", name]).click();
+        // Edit
+        cy.get('.ace_text-input').type(edit, {force:true} );
+
+        // Navigate away
+        cy.umbracoSection('content');
+        // Click discard
+        cy.get('umb-button[label="Discard changes"] button:enabled').click();
+        // Navigate back
+        cy.umbracoSection('settings');
+
+        // Asserts
+        cy.get('.ace_content').should('not.contain', edit);
+        // cy.umbracoPartialViewExists(fileName).then(exists => { expect(exists).to.be.false; }); TODO: Switch to template
+        cy.umbracoEnsureTemplateNameNotExists(name);
+    });
+
+    it('Insert macro', () => {
+        const name = 'InsertMacroTest';
+
+        cy.umbracoEnsureTemplateNameNotExists(name);
+        cy.umbracoEnsureMacroNameNotExists(name);
+
+        const template = new TemplateBuilder()
+            .withName(name)
+            .withContent('')
+            .build();
+
+        cy.saveTemplate(template);
+
+        cy.saveMacro(name);
+
+        navigateToSettings();
+        cy.umbracoTreeItem("settings", ["Templates", name]).click();
+        // Insert macro
+        cy.umbracoButtonByLabelKey('general_insert').click();
+        cy.get('.umb-insert-code-box__title').contains('Macro').click();
+        cy.get('.umb-card-grid-item').contains(name).click();
+
+        // Assert
+        cy.get('.ace_content').contains('@Umbraco.RenderMacro("' + name + '")').should('exist');
+
+        // Clean
+        cy.umbracoEnsureTemplateNameNotExists(name);
+        cy.umbracoEnsureMacroNameNotExists(name);
+    });
+
+    it('Insert value', () => {
+        const name = 'Insert Value Test';
+
+        cy.umbracoEnsureTemplateNameNotExists(name);
+
+        const partialView = new TemplateBuilder()
+            .withName(name)
+            .withContent('')
+            .build();
+
+        cy.saveTemplate(partialView);
+
+        navigateToSettings();
+        cy.umbracoTreeItem("settings", ["Templates", name]).click();
+
+        // Insert value
+        cy.umbracoButtonByLabelKey('general_insert').click();
+        cy.get('.umb-insert-code-box__title').contains('Value').click();
+        cy.get('select').select('umbracoBytes');
+        cy.umbracoButtonByLabelKey('general_submit').click();
+
+        // assert
+        cy.get('.ace_content').contains('@Model.Value("umbracoBytes")').should('exist');
+
+        // Clean
+        cy.umbracoEnsureTemplateNameNotExists(name);
+    });
+
 });
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
new file mode 100644
index 0000000000..9bc1fff488
--- /dev/null
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
@@ -0,0 +1,103 @@
+/// <reference types="Cypress" />
+
+context('Backoffice Tour', () => {
+    var timeout = 60000;
+    beforeEach(() => {
+        //arrange
+        cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'));
+        resetTourData();
+    });
+
+    it('Backoffice introduction tour should run', () => {
+        //act
+        cy.umbracoGlobalHelp().should("be.visible");
+        cy.umbracoGlobalHelp().click();
+        runBackOfficeIntroTour(0, 'Start');
+
+        //assert
+        cy.get('[data-element="help-tours"]').should("be.visible");
+        cy.get('[data-element="help-tours"]').click();
+        getPercentage(17, timeout);
+    });
+
+    it('Backoffice introduction tour should run then rerun', () => {
+        //act
+        cy.umbracoGlobalHelp().should("be.visible");
+        cy.umbracoGlobalHelp().click();
+        runBackOfficeIntroTour(0, 'Start', timeout);
+        runBackOfficeIntroTour(17, 'Rerun', timeout);
+
+        //assert
+        cy.get('[data-element="help-tours"]').should("be.visible");
+        cy.get('[data-element="help-tours"]').click();
+        cy.umbracoGlobalHelp().should("be.visible");
+        getPercentage(17, timeout);
+    });
+
+    afterEach(() => {
+        //cleanup
+        resetTourData();
+    });
+});
+
+function getPercentage(percentage, timeout) {
+    cy.get('[data-element="help-tours"] .umb-progress-circle', { timeout: timeout }).get('[percentage]').contains(percentage + '%');
+}
+
+function resetTourData() {
+    var tourStatus =
+    {
+        "alias": "umbIntroIntroduction",
+        "completed": false,
+        "disabled": false
+    };
+
+    cy.getCookie('UMB-XSRF-TOKEN', { log: false }).then((token) => {
+        cy.request({
+            method: 'POST',
+            url: '/umbraco/backoffice/UmbracoApi/CurrentUser/PostSetUserTour',
+            followRedirect: false,
+            headers: {
+                ContentType: 'application/json',
+                'X-UMB-XSRF-TOKEN': token.value,
+            },
+            body: tourStatus,
+        }).then((resp) => {
+            return;
+        });
+    })
+}
+
+function runBackOfficeIntroTour(percentageComplete, buttonText, timeout) {
+    cy.get('[data-element="help-tours"]').should("be.visible");
+    cy.get('[data-element="help-tours"]').click();
+    cy.get('[data-element="help-tours"] .umb-progress-circle', { timeout: timeout }).get('[percentage]').contains(percentageComplete + '%', { timeout: timeout });
+    cy.get('[data-element="help-tours"]').click();
+    cy.get('[data-element="tour-umbIntroIntroduction"] .umb-button').should("be.visible");
+    cy.get('[data-element="tour-umbIntroIntroduction"] .umb-button').contains(buttonText);
+    cy.get('[data-element="tour-umbIntroIntroduction"] .umb-button').click();
+    //act
+    cy.get('.umb-tour-step', { timeout: timeout }).should('be.visible');
+    cy.get('.umb-tour-step__footer').should('be.visible');
+    cy.get('.umb-tour-step__counter').should('be.visible');
+
+    for (let i = 1; i < 7; i++) {
+        cy.get('.umb-tour-step__counter').contains(i + '/12');
+        cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click();
+    }
+    cy.umbracoGlobalUser().click()
+    cy.get('.umb-tour-step__counter', { timeout: timeout }).contains('8/12');
+    cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click();
+    cy.get('.umb-tour-step__counter', { timeout: timeout }).contains('9/12');
+    cy.get('.umb-overlay-drawer__align-right .umb-button').should('be.visible').click();
+    cy.get('.umb-tour-step__counter', { timeout: timeout }).contains('10/12');
+    cy.umbracoGlobalHelp().click()
+
+    for (let i = 11; i < 13; i++) {
+        cy.get('.umb-tour-step__counter', { timeout: timeout }).contains(i + '/12');
+        cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click();
+    }
+    cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click();
+
+    cy.umbracoGlobalHelp().should("be.visible");
+}
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress/plugins/index.js b/src/Umbraco.Tests.AcceptanceTest/cypress/plugins/index.js
index aa9918d215..59283feec5 100644
--- a/src/Umbraco.Tests.AcceptanceTest/cypress/plugins/index.js
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress/plugins/index.js
@@ -18,4 +18,11 @@
 module.exports = (on, config) => {
   // `on` is used to hook into various events Cypress emits
   // `config` is the resolved Cypress config
+  const baseUrl = config.env.baseUrl || null;
+
+  if (baseUrl) {
+    config.baseUrl = baseUrl;
+  }
+
+  return config;
 }
diff --git a/src/Umbraco.Tests.AcceptanceTest/package.json b/src/Umbraco.Tests.AcceptanceTest/package.json
index 3b4177ce3f..378fe719fc 100644
--- a/src/Umbraco.Tests.AcceptanceTest/package.json
+++ b/src/Umbraco.Tests.AcceptanceTest/package.json
@@ -1,13 +1,16 @@
 {
   "scripts": {
+    "postinstall": "node postinstall.js",
+    "config": "node config.js",
     "test": "npx cypress run",
     "ui": "npx cypress open"
   },
   "devDependencies": {
     "cross-env": "^7.0.2",
+    "cypress": "^6.0.1",
     "ncp": "^2.0.0",
-    "cypress": "^4.9.0",
-    "umbraco-cypress-testhelpers": "1.0.0-beta-44"
+    "prompt": "^1.0.0",
+    "umbraco-cypress-testhelpers": "^1.0.0-beta-52"
   },
   "dependencies": {
     "typescript": "^3.9.2"
diff --git a/src/Umbraco.Tests.AcceptanceTest/postinstall.js b/src/Umbraco.Tests.AcceptanceTest/postinstall.js
new file mode 100644
index 0000000000..6117ac84f0
--- /dev/null
+++ b/src/Umbraco.Tests.AcceptanceTest/postinstall.js
@@ -0,0 +1,14 @@
+const fs = require('fs');
+
+const configPath = './cypress.env.json';
+
+try {
+  if (fs.existsSync(configPath)) {
+    //file exists
+    console.log("Skips configuration as file already exists, run 'npm run config' to change your configuration.");
+  } else {
+    require('./config.js');
+  }
+} catch(err) {
+  console.error(err)
+}
diff --git a/src/Umbraco.Tests.Benchmarks/CtorInvokeBenchmarks.cs b/src/Umbraco.Tests.Benchmarks/CtorInvokeBenchmarks.cs
index 8d15613791..37fe952851 100644
--- a/src/Umbraco.Tests.Benchmarks/CtorInvokeBenchmarks.cs
+++ b/src/Umbraco.Tests.Benchmarks/CtorInvokeBenchmarks.cs
@@ -16,6 +16,8 @@ namespace Umbraco.Tests.Benchmarks
     // - it's faster to get+invoke the ctor
     // - emitting the ctor is unless if invoked only 1
 
+    // TODO: Check out https://docs.microsoft.com/en-us/dotnet/api/system.reflection.emit.constructorbuilder?view=netcore-3.1 ?
+
     //[Config(typeof(Config))]
     [MemoryDiagnoser]
     public class CtorInvokeBenchmarks
diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
index 48d69cf757..df2af67573 100644
--- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
+++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
@@ -93,4 +93,4 @@
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
index 91047ba6a2..4af04827e3 100644
--- a/src/Umbraco.Tests/App.config
+++ b/src/Umbraco.Tests/App.config
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <configSections>
-  </configSections>
+    <configSections>
+    </configSections>
 
-  <appSettings>
-    <add key="Umbraco.Core.ConfigurationStatus" value="6.0.0"/>
-    <add key="Umbraco.Core.ReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,~/.well-known" />
-    <add key="Umbraco.Core.ReservedPaths" value="~/install/"/>
-    <add key="Umbraco.Core.Path" value="~/umbraco"/>
-    <add key="Umbraco.Core.HideTopLevelNodeFromPath" value="true"/>
-    <add key="Umbraco.Core.TimeOutInMinutes" value="20"/>
-    <add key="Umbraco.Core.DefaultUILanguage" value="en"/>
-    <add key="Umbraco.Core.UseHttps" value="false"/>
-    <add key="dataAnnotations:dataTypeAttribute:disableRegEx" value="false"/>
-  </appSettings>
+    <appSettings>
+        <add key="Umbraco.Core.ConfigurationStatus" value="6.0.0"/>
+        <add key="Umbraco.Core.ReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,~/.well-known" />
+        <add key="Umbraco.Core.ReservedPaths" value="~/install/"/>
+        <add key="Umbraco.Core.Path" value="~/umbraco"/>
+        <add key="Umbraco.Core.HideTopLevelNodeFromPath" value="true"/>
+        <add key="Umbraco.Core.TimeOutInMinutes" value="20"/>
+        <add key="Umbraco.Core.DefaultUILanguage" value="en"/>
+        <add key="Umbraco.Core.UseHttps" value="false"/>
+        <add key="dataAnnotations:dataTypeAttribute:disableRegEx" value="false"/>
+    </appSettings>
 
-  <connectionStrings>
-      <add name="umbracoDbDSN" connectionString="Datasource=|DataDirectory|UmbracoNPocoTests.sdf;Flush Interval=1;" providerName="System.Data.SqlServerCe.4.0"/>
-  </connectionStrings>
+    <connectionStrings>
+        <add name="umbracoDbDSN" connectionString="Datasource=|DataDirectory|UmbracoNPocoTests.sdf;Flush Interval=1;" providerName="System.Data.SqlServerCe.4.0"/>
+    </connectionStrings>
 
-  <system.data>
-    <DbProviderFactories>
-      <remove invariant="System.Data.SqlServerCe.4.0"/>
-      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
-    </DbProviderFactories>
-  </system.data>
+    <system.data>
+        <DbProviderFactories>
+            <remove invariant="System.Data.SqlServerCe.4.0"/>
+            <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
+        </DbProviderFactories>
+    </system.data>
 
-  <system.web>
-    <httpRuntime targetFramework="4.5"/>
-    <compilation defaultLanguage="c#" debug="true" batch="false" targetFramework="4.0"></compilation>
-    <machineKey validationKey="5E7B955FCE36F5F2A867C2A0D85DC61E7FEA9E15F1561E8386F78BFE9EE23FF18B21E6A44AA17300B3B9D5DBEB37AA61A2C73884A5BBEDA6D3B14BA408A7A8CD" decryptionKey="116B853D031219E404E088FCA0986D6CF2DFA77E1957B59FCC9404B8CA3909A1" validation="SHA1" decryption="AES"/>
-    <!--<trust level="Medium" originUrl=".*"/>-->
-    <!-- Sitemap provider-->
-    <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
-      <providers>
-        <clear/>
-        <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true"/>
-      </providers>
-    </siteMap>
-    <!-- Membership Provider -->
-    <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
-        <providers>
-            <clear/>
-            <add name="UmbracoMembershipProvider" type="Umbraco.Web.Security.Providers.MembersMembershipProvider, Umbraco.Web" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="4" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Member" passwordFormat="Hashed"/>
-            <add name="UsersMembershipProvider" type="Umbraco.Web.Security.Providers.UsersMembershipProvider, Umbraco.Web" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="4" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" allowManuallyChangingPassword="false"/>
-        </providers>
-    </membership>
-  </system.web>
+    <system.web>
+        <httpRuntime targetFramework="4.5"/>
+        <compilation defaultLanguage="c#" debug="true" batch="false" targetFramework="4.0"></compilation>
+        <machineKey validationKey="5E7B955FCE36F5F2A867C2A0D85DC61E7FEA9E15F1561E8386F78BFE9EE23FF18B21E6A44AA17300B3B9D5DBEB37AA61A2C73884A5BBEDA6D3B14BA408A7A8CD" decryptionKey="116B853D031219E404E088FCA0986D6CF2DFA77E1957B59FCC9404B8CA3909A1" validation="SHA1" decryption="AES"/>
+        <!--<trust level="Medium" originUrl=".*"/>-->
+        <!-- Sitemap provider-->
+        <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
+            <providers>
+                <clear/>
+                <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true"/>
+            </providers>
+        </siteMap>
+        <!-- Membership Provider -->
+        <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
+            <providers>
+                <clear/>
+                <add name="UmbracoMembershipProvider" type="Umbraco.Web.Security.Providers.MembersMembershipProvider, Umbraco.Web" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="4" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Member" passwordFormat="Hashed"/>
+                <add name="UsersMembershipProvider" type="Umbraco.Web.Security.Providers.UsersMembershipProvider, Umbraco.Web" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="4" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" allowManuallyChangingPassword="false"/>
+            </providers>
+        </membership>
+    </system.web>
 
-  <startup>
-      <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
-  </startup>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+    </startup>
 
-  <runtime>
-      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
@@ -94,7 +94,11 @@
                 <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35"/>
                 <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
             </dependentAssembly>
-      </assemblyBinding>
-  </runtime>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
 
 </configuration>
diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
index f3d9f895ef..2346740ffb 100644
--- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
@@ -42,9 +42,9 @@ namespace Umbraco.Tests.Cache.PublishedCache
         protected override void Initialize()
         {
             base.Initialize();
-            var type = new AutoPublishedContentType(22, "myType", new PublishedPropertyType[] { });
-            var image = new AutoPublishedContentType(23, "Image", new PublishedPropertyType[] { });
-            var testMediaType = new AutoPublishedContentType(24, "TestMediaType", new PublishedPropertyType[] { });
+            var type = new AutoPublishedContentType(Guid.NewGuid(), 22, "myType", new PublishedPropertyType[] { });
+            var image = new AutoPublishedContentType(Guid.NewGuid(), 23, "Image", new PublishedPropertyType[] { });
+            var testMediaType = new AutoPublishedContentType(Guid.NewGuid(), 24, "TestMediaType", new PublishedPropertyType[] { });
             _mediaTypes = new Dictionary<string, PublishedContentType>
             {
                 { type.Alias, type },
diff --git a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
index 7459ae848b..9cd4f39c17 100644
--- a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
@@ -268,7 +268,7 @@ AnotherContentFinder
         public void GetDataEditors()
         {
             var types = _typeLoader.GetDataEditors();
-            Assert.AreEqual(38, types.Count());
+            Assert.AreEqual(39, types.Count());
         }
 
         /// <summary>
diff --git a/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs b/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
index 343994b03a..43a120d154 100644
--- a/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
+++ b/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
@@ -887,12 +887,12 @@ namespace Umbraco.Tests.IO
         }
 
         /// <summary>
-        /// Ensure the url returned contains the path relative to the FS root,
+        /// Ensure the URL returned contains the path relative to the FS root,
         /// but including the rootUrl the FS was initialized with.
         /// </summary>
         /// <remarks>
         /// This file stuff in this test is kinda irrelevant with the current implementation.
-        /// We do tests that the files are written to the correct places and the url is returned correct,
+        /// We do tests that the files are written to the correct places and the URL is returned correct,
         /// but GetUrl is currently really just string manipulation so files are not actually hit by the code.
         /// Leaving the file stuff in here for now in case the method becomes more clever at some point.
         /// </remarks>
diff --git a/src/Umbraco.Tests/Integration/ContentEventsTests.cs b/src/Umbraco.Tests/Integration/ContentEventsTests.cs
index 7f103e13e4..af8ebe626e 100644
--- a/src/Umbraco.Tests/Integration/ContentEventsTests.cs
+++ b/src/Umbraco.Tests/Integration/ContentEventsTests.cs
@@ -2171,7 +2171,7 @@ namespace Umbraco.Tests.Integration
         [Test]
         public void HasInitialContent()
         {
-            Assert.AreEqual(4, ServiceContext.ContentService.Count());
+            Assert.AreEqual(5, ServiceContext.ContentService.Count());
         }
 
         #endregion
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs
index 8ce6b10983..893a170f5a 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs
@@ -14,7 +14,7 @@ using Umbraco.Web.Routing;
 
 namespace Umbraco.Tests.LegacyXmlPublishedCache
 {
-    internal class PublishedContentCache : PublishedCacheBase, IPublishedContentCache
+    internal class PublishedContentCache : PublishedCacheBase, IPublishedContentCache2
     {
         private readonly IAppCache _appCache;
         private readonly IGlobalSettings _globalSettings;
@@ -96,7 +96,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
 
             // so we have a route that maps to a content... say "1234/path/to/content" - however, there could be a
             // domain set on "to" and route "4567/content" would also map to the same content - and due to how
-            // urls computing work (by walking the tree up to the first domain we find) it is that second route
+            // URLs computing work (by walking the tree up to the first domain we find) it is that second route
             // that would be returned - the "deepest" route - and that is the route we want to cache, *not* the
             // longer one - so make sure we don't cache the wrong route
 
@@ -257,7 +257,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
             if (node == null) return null;
 
             // walk up from that node until we hit a node with a domain,
-            // or we reach the content root, collecting urls in the way
+            // or we reach the content root, collecting URLs in the way
             var pathParts = new List<string>();
             var n = node;
             var hasDomains = _domainCache.HasAssigned(n.Id);
@@ -532,15 +532,11 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
 
         #region Content types
 
-        public override IPublishedContentType GetContentType(int id)
-        {
-            return _contentTypeCache.Get(PublishedItemType.Content, id);
-        }
+        public override IPublishedContentType GetContentType(int id) => _contentTypeCache.Get(PublishedItemType.Content, id);
 
-        public override IPublishedContentType GetContentType(string alias)
-        {
-            return _contentTypeCache.Get(PublishedItemType.Content, alias);
-        }
+        public override IPublishedContentType GetContentType(string alias) => _contentTypeCache.Get(PublishedItemType.Content, alias);
+
+        public override IPublishedContentType GetContentType(Guid key) => _contentTypeCache.Get(PublishedItemType.Content, key);
 
         #endregion
     }
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
index 999d7f040d..56033e6b0a 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
     /// <remarks>
     /// NOTE: In the future if we want to properly cache all media this class can be extended or replaced when these classes/interfaces are exposed publicly.
     /// </remarks>
-    internal class PublishedMediaCache : PublishedCacheBase, IPublishedMediaCache
+    internal class PublishedMediaCache : PublishedCacheBase, IPublishedMediaCache2
     {
         private readonly IMediaService _mediaService;
         private readonly IUserService _userService;
@@ -612,15 +612,11 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
 
         #region Content types
 
-        public override IPublishedContentType GetContentType(int id)
-        {
-            return _contentTypeCache.Get(PublishedItemType.Media, id);
-        }
+        public override IPublishedContentType GetContentType(int id) => _contentTypeCache.Get(PublishedItemType.Media, id);
 
-        public override IPublishedContentType GetContentType(string alias)
-        {
-            return _contentTypeCache.Get(PublishedItemType.Media, alias);
-        }
+        public override IPublishedContentType GetContentType(string alias) => _contentTypeCache.Get(PublishedItemType.Media, alias);
+
+        public override IPublishedContentType GetContentType(Guid key) => _contentTypeCache.Get(PublishedItemType.Media, key);
 
         public override IEnumerable<IPublishedContent> GetByContentType(IPublishedContentType contentType)
         {
diff --git a/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs b/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs
index 79878a59a1..163effb676 100644
--- a/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs
+++ b/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs
@@ -77,7 +77,7 @@ namespace Umbraco.Tests.Misc
         [Test]
         public void SetApplicationUrlWhenNoSettings()
         {
-            // no applicable settings, cannot set url
+            // no applicable settings, cannot set URL
 
             var settings = Mock.Of<IUmbracoSettingsSection>(section =>
                 section.WebRouting == Mock.Of<IWebRoutingSection>(wrSection => wrSection.UmbracoApplicationUrl == (string) null));
diff --git a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
index eee7446823..1480253958 100644
--- a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
+++ b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
@@ -215,6 +215,7 @@ namespace Umbraco.Tests.Models.Mapping
                 {
                     Assert.AreEqual(propTypes.ElementAt(j).Id, result.PropertyTypes.ElementAt(j).Id);
                     Assert.AreEqual(propTypes.ElementAt(j).DataTypeId, result.PropertyTypes.ElementAt(j).DataTypeId);
+                    Assert.AreEqual(propTypes.ElementAt(j).LabelOnTop, result.PropertyTypes.ElementAt(j).LabelOnTop);
                 }
             }
 
@@ -449,6 +450,7 @@ namespace Umbraco.Tests.Models.Mapping
                 {
                     Assert.AreEqual(propTypes[j].Id, result.Groups.ElementAt(i).Properties.ElementAt(j).Id);
                     Assert.AreEqual(propTypes[j].DataTypeId, result.Groups.ElementAt(i).Properties.ElementAt(j).DataTypeId);
+                    Assert.AreEqual(propTypes[j].LabelOnTop, result.Groups.ElementAt(i).Properties.ElementAt(j).LabelOnTop);
                 }
             }
 
@@ -639,6 +641,7 @@ namespace Umbraco.Tests.Models.Mapping
             Assert.AreEqual(basic.Validation.MandatoryMessage, result.MandatoryMessage);
             Assert.AreEqual(basic.Validation.Pattern, result.ValidationRegExp);
             Assert.AreEqual(basic.Validation.PatternMessage, result.ValidationRegExpMessage);
+            Assert.AreEqual(basic.LabelOnTop, result.LabelOnTop);
         }
 
         [Test]
@@ -677,6 +680,7 @@ namespace Umbraco.Tests.Models.Mapping
             Assert.AreEqual(basic.Validation.MandatoryMessage, result.MandatoryMessage);
             Assert.AreEqual(basic.Validation.Pattern, result.ValidationRegExp);
             Assert.AreEqual(basic.Validation.PatternMessage, result.ValidationRegExpMessage);
+            Assert.AreEqual(basic.LabelOnTop, result.LabelOnTop);
         }
 
         [Test]
@@ -1074,7 +1078,8 @@ namespace Umbraco.Tests.Models.Mapping
                                     Pattern = string.Empty
                                 },
                                 SortOrder = 0,
-                                DataTypeId = 555
+                                DataTypeId = 555,
+                                LabelOnTop = true
                             }
                         }
                     }
@@ -1120,7 +1125,8 @@ namespace Umbraco.Tests.Models.Mapping
                                     Pattern = string.Empty
                                 },
                                 SortOrder = 0,
-                                DataTypeId = 555
+                                DataTypeId = 555,
+                                LabelOnTop = true
                             }
                         }
                     },
@@ -1144,7 +1150,8 @@ namespace Umbraco.Tests.Models.Mapping
                                     Pattern = string.Empty
                                 },
                                 SortOrder = 0,
-                                DataTypeId = 555
+                                DataTypeId = 555,
+                                LabelOnTop = false
                             }
                         }
 
@@ -1198,7 +1205,8 @@ namespace Umbraco.Tests.Models.Mapping
                                     Pattern = string.Empty
                                 },
                                 SortOrder = 0,
-                                DataTypeId = 555
+                                DataTypeId = 555,
+                                LabelOnTop = true
                             }
                         }
                     },
@@ -1222,7 +1230,8 @@ namespace Umbraco.Tests.Models.Mapping
                                     Pattern = string.Empty
                                 },
                                 SortOrder = 0,
-                                DataTypeId = 555
+                                DataTypeId = 555,
+                                LabelOnTop = false
                             }
                         }
 
diff --git a/src/Umbraco.Tests/Models/RangeTests.cs b/src/Umbraco.Tests/Models/RangeTests.cs
new file mode 100644
index 0000000000..3fb4e8708b
--- /dev/null
+++ b/src/Umbraco.Tests/Models/RangeTests.cs
@@ -0,0 +1,179 @@
+using System.Globalization;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Tests.Models
+{
+    [TestFixture]
+    public class RangeTests
+    {
+        [TestCase(0, 0, "0,0")]
+        [TestCase(0, 1, "0,1")]
+        [TestCase(1, 1, "1,1")]
+        public void RangeInt32_ToString(int minimum, int maximum, string expected)
+        {
+            Assert.AreEqual(expected, new Range<int>()
+            {
+                Minimum = minimum,
+                Maximum = maximum
+            }.ToString());
+        }
+
+        [TestCase(0, 0.5, "0,0.5")]
+        [TestCase(0.5, 0.5, "0.5,0.5")]
+        [TestCase(0.5, 1, "0.5,1")]
+        public void RangeDouble_ToString(double minimum, double maximum, string expected)
+        {
+            Assert.AreEqual(expected, new Range<double>()
+            {
+                Minimum = minimum,
+                Maximum = maximum
+            }.ToString());
+        }
+
+        [TestCase(0, 0, "0")]
+        [TestCase(0, 1, "0,1")]
+        [TestCase(1, 1, "1")]
+        public void RangeInt32_ToStringFormatRange(int minimum, int maximum, string expected)
+        {
+            Assert.AreEqual(expected, new Range<int>()
+            {
+                Minimum = minimum,
+                Maximum = maximum
+            }.ToString("{0}", "{0},{1}", CultureInfo.InvariantCulture));
+        }
+
+        [TestCase(0, 0.5, "0,0.5")]
+        [TestCase(0.5, 0.5, "0.5")]
+        [TestCase(0.5, 1, "0.5,1")]
+        public void RangeDouble_ToStringFormatRange(double minimum, double maximum, string expected)
+        {
+            Assert.AreEqual(expected, new Range<double>()
+            {
+                Minimum = minimum,
+                Maximum = maximum
+            }.ToString("{0}", "{0},{1}", CultureInfo.InvariantCulture));
+        }
+
+        [TestCase(0, 0, "0,0")]
+        [TestCase(0, 1, "0,1")]
+        [TestCase(1, 1, "1,1")]
+        public void RangeInt32_ToStringFormat(int minimum, int maximum, string expected)
+        {
+            Assert.AreEqual(expected, new Range<int>()
+            {
+                Minimum = minimum,
+                Maximum = maximum
+            }.ToString("{0},{1}", CultureInfo.InvariantCulture));
+        }
+
+        [TestCase(0, 0.5, "0,0.5")]
+        [TestCase(0.5, 0.5, "0.5,0.5")]
+        [TestCase(0.5, 1, "0.5,1")]
+        public void RangeDouble_ToStringFormat(double minimum, double maximum, string expected)
+        {
+            Assert.AreEqual(expected, new Range<double>()
+            {
+                Minimum = minimum,
+                Maximum = maximum
+            }.ToString("{0},{1}", CultureInfo.InvariantCulture));
+        }
+
+        [TestCase(0, 0, true)]
+        [TestCase(0, 1, true)]
+        [TestCase(-1, 1, true)]
+        [TestCase(1, 0, false)]
+        [TestCase(0, -1, false)]
+        public void RangeInt32_IsValid(int minimum, int maximum, bool expected)
+        {
+            Assert.AreEqual(expected, new Range<int>()
+            {
+                Minimum = minimum,
+                Maximum = maximum
+            }.IsValid());
+        }
+
+        [TestCase(0, 0, 0, true)]
+        [TestCase(0, 1, 0, true)]
+        [TestCase(0, 1, 1, true)]
+        [TestCase(-1, 1, 0, true)]
+        [TestCase(0, 0, 1, false)]
+        [TestCase(0, 0, -1, false)]
+        public void RangeInt32_ContainsValue(int minimum, int maximum, int value, bool expected)
+        {
+            Assert.AreEqual(expected, new Range<int>()
+            {
+                Minimum = minimum,
+                Maximum = maximum
+            }.ContainsValue(value));
+        }
+
+        [TestCase(0, 0, 0, 0, true)]
+        [TestCase(0, 1, 0, 1, true)]
+        [TestCase(0, 1, 1, 1, false)]
+        [TestCase(-1, 1, 0, 0, false)]
+        [TestCase(0, 0, 1, 1, false)]
+        [TestCase(0, 0, -1, 1, true)]
+        public void RangeInt32_IsInsideRange(int minimum1, int maximum1, int minimum2, int maximum2, bool expected)
+        {
+            Assert.AreEqual(expected, new Range<int>()
+            {
+                Minimum = minimum1,
+                Maximum = maximum1
+            }.IsInsideRange(new Range<int>()
+            {
+                Minimum = minimum2,
+                Maximum = maximum2
+            }));
+        }
+
+        [TestCase(0, 0, 0, 0, true)]
+        [TestCase(0, 1, 0, 1, true)]
+        [TestCase(0, 1, 1, 1, true)]
+        [TestCase(-1, 1, 0, 0, true)]
+        [TestCase(0, 0, 1, 1, false)]
+        [TestCase(0, 0, -1, 1, false)]
+        public void RangeInt32_ContainsRange(int minimum1, int maximum1, int minimum2, int maximum2, bool expected)
+        {
+            Assert.AreEqual(expected, new Range<int>()
+            {
+                Minimum = minimum1,
+                Maximum = maximum1
+            }.ContainsRange(new Range<int>()
+            {
+                Minimum = minimum2,
+                Maximum = maximum2
+            }));
+        }
+
+        [TestCase(0, 0, 0, 0, true)]
+        [TestCase(0, 1, 0, 1, true)]
+        [TestCase(0, 1, 1, 1, false)]
+        [TestCase(0, 0, 1, 1, false)]
+        public void RangeInt32_Equals(int minimum1, int maximum1, int minimum2, int maximum2, bool expected)
+        {
+            Assert.AreEqual(expected, new Range<int>()
+            {
+                Minimum = minimum1,
+                Maximum = maximum1
+            }.Equals(new Range<int>()
+            {
+                Minimum = minimum2,
+                Maximum = maximum2
+            }));
+        }
+
+        [TestCase(0, 0, 0, 0, true)]
+        [TestCase(0, 1, 0, 1, true)]
+        [TestCase(0, 1, 1, 1, false)]
+        [TestCase(0, 0, 1, 1, false)]
+        public void RangeInt32_EqualsValues(int minimum1, int maximum1, int minimum2, int maximum2, bool expected)
+        {
+            Assert.AreEqual(expected, new Range<int>()
+            {
+                Minimum = minimum1,
+                Maximum = maximum1
+            }.Equals(minimum2, maximum2));
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Models/VariationTests.cs b/src/Umbraco.Tests/Models/VariationTests.cs
index ab5f726894..b87ff499b6 100644
--- a/src/Umbraco.Tests/Models/VariationTests.cs
+++ b/src/Umbraco.Tests/Models/VariationTests.cs
@@ -442,7 +442,10 @@ namespace Umbraco.Tests.Models
         [Test]
         public void ContentPublishValuesWithMixedPropertyTypeVariations()
         {
-            var propertyValidationService = new PropertyValidationService(Current.Factory.GetInstance<PropertyEditorCollection>(), Current.Factory.GetInstance<ServiceContext>().DataTypeService);
+            var propertyValidationService = new PropertyValidationService(
+                Current.Factory.GetInstance<PropertyEditorCollection>(),
+                Current.Factory.GetInstance<ServiceContext>().DataTypeService,
+                Current.Factory.GetInstance<ServiceContext>().TextService);
             const string langFr = "fr-FR";
 
             // content type varies by Culture
@@ -574,7 +577,10 @@ namespace Umbraco.Tests.Models
             prop.SetValue("a");
             Assert.AreEqual("a", prop.GetValue());
             Assert.IsNull(prop.GetValue(published: true));
-            var propertyValidationService = new PropertyValidationService(Current.Factory.GetInstance<PropertyEditorCollection>(), Current.Factory.GetInstance<ServiceContext>().DataTypeService);
+            var propertyValidationService = new PropertyValidationService(
+                Current.Factory.GetInstance<PropertyEditorCollection>(),
+                Current.Factory.GetInstance<ServiceContext>().DataTypeService,
+                Current.Factory.GetInstance<ServiceContext>().TextService);
 
             Assert.IsTrue(propertyValidationService.IsPropertyValid(prop));
 
diff --git a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlTests.cs b/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlTests.cs
index a04984eb64..b4210ee31a 100644
--- a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlTests.cs
+++ b/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlTests.cs
@@ -82,9 +82,9 @@ namespace Umbraco.Tests.Persistence.NPocoTests
             var sql = Sql().SelectAll().From<NodeDto>()
                 .Where<NodeDto>(x => x.Trashed == false);
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (NOT ([umbracoNode].[trashed] = @0))", sql.SQL.Replace("\n", " "));
+            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[trashed] = @0)", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual(true, sql.Arguments[0]);
+            Assert.AreEqual(false, sql.Arguments[0]);
         }
 
         [Test]
@@ -92,9 +92,9 @@ namespace Umbraco.Tests.Persistence.NPocoTests
         {
             var sql = Sql().SelectAll().From<NodeDto>().Where<NodeDto>(x => x.Trashed == false);
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (NOT ([umbracoNode].[trashed] = @0))", sql.SQL.Replace("\n", " "));
+            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[trashed] = @0)", sql.SQL.Replace("\n", " "));
             Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual(true, sql.Arguments[0]);
+            Assert.AreEqual(false, sql.Arguments[0]);
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs b/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs
index ca6b4cd5f0..2b43b13a79 100644
--- a/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs
+++ b/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs
@@ -110,7 +110,7 @@ namespace Umbraco.Tests.Persistence.Querying
             Assert.AreEqual("-1,1046,1076,1089%", result.Arguments[0]);
             Assert.AreEqual(1046, result.Arguments[1]);
             Assert.AreEqual(true, result.Arguments[2]);
-            Assert.AreEqual(true, result.Arguments[3]);
+            Assert.AreEqual(false, result.Arguments[3]);
         }
     }
 }
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
index e592c5171a..93a6daecde 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
@@ -14,6 +14,7 @@ using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.Models.ContentEditing;
+using Content = Umbraco.Core.Models.Content;
 
 namespace Umbraco.Tests.Persistence.Repositories
 {
@@ -348,6 +349,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.That(contentType.Path.Contains(","), Is.True);
                 Assert.That(contentType.SortOrder, Is.GreaterThan(0));
 
+
                 Assert.That(contentType.PropertyGroups.ElementAt(0).Name == "testGroup", Is.True);
                 var groupId = contentType.PropertyGroups.ElementAt(0).Id;
 
@@ -355,6 +357,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.AreEqual("gen", propertyTypes[0].Alias); // just to be sure
                 Assert.IsNull(propertyTypes[0].PropertyGroupId);
                 Assert.IsTrue(propertyTypes.Skip(1).All((x => x.PropertyGroupId.Value == groupId)));
+                Assert.That(propertyTypes.Single(x=> x.Alias == "title").LabelOnTop, Is.True);
             }
 
         }
@@ -377,7 +380,8 @@ namespace Umbraco.Tests.Persistence.Repositories
                     Description = "Optional Subtitle",
                     Mandatory = false,
                     SortOrder = 1,
-                    DataTypeId = -88
+                    DataTypeId = -88,
+                    LabelOnTop = true
                 });
                 repository.Save(contentType);
 
@@ -389,6 +393,8 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.That(dirty, Is.False);
                 Assert.That(contentType.Thumbnail, Is.EqualTo("Doc2.png"));
                 Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "subtitle"), Is.True);
+                Assert.That(contentType.PropertyTypes.Single(x => x.Alias == "subtitle").LabelOnTop, Is.True);
+
             }
 
 
@@ -467,7 +473,8 @@ namespace Umbraco.Tests.Persistence.Repositories
                             Pattern = ""
                         },
                         SortOrder = 1,
-                        DataTypeId = -88
+                        DataTypeId = -88,
+                        LabelOnTop = true
                     }
                 });
 
@@ -476,6 +483,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // just making sure
                 Assert.AreEqual(mapped.Thumbnail, "Doc2.png");
                 Assert.IsTrue(mapped.PropertyTypes.Any(x => x.Alias == "subtitle"));
+                Assert.IsTrue(mapped.PropertyTypes.Single(x => x.Alias == "subtitle").LabelOnTop);
 
                 repository.Save(mapped);
 
@@ -490,6 +498,9 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.That(dirty, Is.False);
                 Assert.That(contentType.Thumbnail, Is.EqualTo("Doc2.png"));
                 Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "subtitle"), Is.True);
+
+                Assert.That(contentType.PropertyTypes.Single(x => x.Alias == "subtitle").LabelOnTop, Is.True);
+
                 foreach (var propertyType in contentType.PropertyTypes)
                 {
                     Assert.IsTrue(propertyType.HasIdentity);
@@ -997,6 +1008,88 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
         }
 
+        [Test]
+        public void Can_Update_Variation_Of_Element_Type_Property()
+        {
+            var provider = TestObjects.GetScopeProvider(Logger);
+            using (var scope = provider.CreateScope())
+            {
+                ContentTypeRepository repository;
+                var contentRepository = CreateRepository((IScopeAccessor) provider, out repository);
+
+                // Create elementType
+                var elementType = new ContentType(-1)
+                {
+                    Alias = "elementType",
+                    Name = "Element type",
+                    Description = "Element type to use as compositions",
+                    Icon = ".sprTreeDoc3",
+                    Thumbnail = "doc.png",
+                    SortOrder = 1,
+                    CreatorId = 0,
+                    Trashed = false,
+                    IsElement = true,
+                    Variations = ContentVariation.Nothing
+                };
+
+                var contentCollection = new PropertyTypeCollection(true);
+                contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext)
+                {
+                    Alias = "title",
+                    Name = "Title",
+                    Description = "",
+                    Mandatory = false,
+                    SortOrder = 1,
+                    DataTypeId = Constants.DataTypes.Textbox,
+                    LabelOnTop = true,
+                    Variations = ContentVariation.Nothing
+                });
+                elementType.PropertyGroups.Add(new PropertyGroup(contentCollection) {Name = "Content", SortOrder = 1});
+                elementType.ResetDirtyProperties(false);
+                elementType.SetDefaultTemplate(new Template("ElementType", "elementType"));
+                repository.Save(elementType);
+
+                // Create the basic "home" doc type that uses element type as comp
+                var docType = new ContentType(-1)
+                {
+                    Alias = "home",
+                    Name = "Home",
+                    Description = "Home containing elementType",
+                    Icon = ".sprTreeDoc3",
+                    Thumbnail = "doc.png",
+                    SortOrder = 1,
+                    CreatorId = 0,
+                    Trashed = false,
+                    Variations = ContentVariation.Nothing
+                };
+                var comp = new List<IContentTypeComposition>();
+                comp.Add(elementType);
+                docType.ContentTypeComposition = comp;
+                repository.Save(docType);
+
+                // Create "home" content
+                var content = new Content("Home", -1, docType){Level = 1, SortOrder = 1, CreatorId = 0, WriterId = 0};
+                object obj = new {title = "test title"};
+                content.PropertyValues(obj);
+                content.ResetDirtyProperties(false);
+                contentRepository.Save(content);
+
+                // Update variation on element type
+                elementType.Variations = ContentVariation.Culture;
+                elementType.PropertyTypes.First().Variations = ContentVariation.Culture;
+                repository.Save(elementType);
+
+                // Update variation on doc type
+                docType.Variations = ContentVariation.Culture;
+                repository.Save(docType);
+
+                // Re fetch renewedContent and make sure that the culture has been set.
+                var renewedContent = ServiceContext.ContentService.GetById(content.Id);
+                var hasCulture = renewedContent.Properties["title"].Values.First().Culture != null;
+                Assert.That(hasCulture, Is.True);
+            }
+        }
+
         public void CreateTestData()
         {
             //Create and Save ContentType "umbTextpage" -> (NodeDto.NodeIdSeed)
diff --git a/src/Umbraco.Tests/Persistence/Repositories/RedirectUrlRepositoryTests.cs b/src/Umbraco.Tests/Persistence/Repositories/RedirectUrlRepositoryTests.cs
index 652209b65b..2fb305c97e 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/RedirectUrlRepositoryTests.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/RedirectUrlRepositoryTests.cs
@@ -9,6 +9,7 @@ using Umbraco.Core.Scoping;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
+using Umbraco.Web.JavaScript;
 
 namespace Umbraco.Tests.Persistence.Repositories
 {
@@ -53,6 +54,39 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
         }
 
+        [Test]
+        public void CanSaveAndGetWithCulture()
+        {
+            var provider = TestObjects.GetScopeProvider(Logger);
+            var culture = "en";
+            using (var scope = provider.CreateScope())
+            {
+                var repo = CreateRepository(provider);
+                var rurl = new RedirectUrl
+                {
+                    ContentKey = _textpage.Key,
+                    Url = "blah",
+                    Culture = culture
+                };
+                repo.Save(rurl);
+                scope.Complete();
+
+                Assert.AreNotEqual(0, rurl.Id);
+            }
+
+            using (var scope = provider.CreateScope())
+            {
+                var repo = CreateRepository(provider);
+                var rurl = repo.GetMostRecentUrl("blah");
+                scope.Complete();
+
+                Assert.IsNotNull(rurl);
+                Assert.AreEqual(_textpage.Id, rurl.ContentId);
+                Assert.AreEqual(culture, rurl.Culture);
+            }
+        }
+
+
         [Test]
         public void CanSaveAndGetMostRecent()
         {
@@ -101,6 +135,59 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
         }
 
+        [Test]
+        public void CanSaveAndGetMostRecentForCulture()
+        {
+            var provider = TestObjects.GetScopeProvider(Logger);
+            var cultureA = "en";
+            var cultureB = "de";
+            Assert.AreNotEqual(_textpage.Id, _otherpage.Id);
+
+            using (var scope = provider.CreateScope())
+            {
+                var repo = CreateRepository(provider);
+                var rurl = new RedirectUrl
+                {
+                    ContentKey = _textpage.Key,
+                    Url = "blah",
+                    Culture = cultureA
+                };
+                repo.Save(rurl);
+                scope.Complete();
+
+                Assert.AreNotEqual(0, rurl.Id);
+
+                // FIXME: too fast = same date = key violation?
+                // and... can that happen in real life?
+                // we don't really *care* about the IX, only supposed to make things faster...
+                // BUT in realife we AddOrUpdate in a trx so it should be safe, always
+
+                rurl = new RedirectUrl
+                {
+                    ContentKey = _otherpage.Key,
+                    Url = "blah",
+                    CreateDateUtc = rurl.CreateDateUtc.AddSeconds(1), // ensure time difference
+                    Culture = cultureB
+                };
+                repo.Save(rurl);
+                scope.Complete();
+
+                Assert.AreNotEqual(0, rurl.Id);
+            }
+
+            using (var scope = provider.CreateScope())
+            {
+                var repo = CreateRepository(provider);
+                var rurl = repo.GetMostRecentUrl("blah", cultureA);
+                scope.Complete();
+
+                Assert.IsNotNull(rurl);
+                Assert.AreEqual(_textpage.Id, rurl.ContentId);
+                Assert.AreEqual(cultureA, rurl.Culture);
+            }
+        }
+
+
         [Test]
         public void CanSaveAndGetByContent()
         {
diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
index bbefb79f6b..b2efbd34b8 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
@@ -16,6 +16,7 @@ using Umbraco.Tests.Testing;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.PropertyEditors;
 using System;
+using Umbraco.Core.Persistence.Dtos;
 
 namespace Umbraco.Tests.Persistence.Repositories
 {
@@ -76,12 +77,44 @@ namespace Umbraco.Tests.Persistence.Repositories
             return new UserGroupRepository(accessor, AppCaches.Disabled, Logger);
         }
 
+        [Test]
+        public void Validate_Login_Session()
+        {
+            // Arrange
+            var provider = TestObjects.GetScopeProvider(Logger);
+            var user = MockedUser.CreateUser();
+            using (var scope = provider.CreateScope(autoComplete: true))
+            {
+                var repository = CreateRepository(provider);                
+                repository.Save(user);                
+            }
+
+            using (var scope = provider.CreateScope(autoComplete: true))
+            {
+                var repository = CreateRepository(provider);
+                var sessionId = repository.CreateLoginSession(user.Id, "1.2.3.4");
+
+                // manually update this record to be in the past
+                scope.Database.Execute(SqlContext.Sql()
+                    .Update<UserLoginDto>(u => u.Set(x => x.LoggedOutUtc, DateTime.UtcNow.AddDays(-100)))
+                    .Where<UserLoginDto>(x => x.SessionId == sessionId));
+
+                var isValid = repository.ValidateLoginSession(user.Id, sessionId);
+                Assert.IsFalse(isValid);
+
+                // create a new one
+                sessionId = repository.CreateLoginSession(user.Id, "1.2.3.4");
+                isValid = repository.ValidateLoginSession(user.Id, sessionId);
+                Assert.IsTrue(isValid);
+            }
+        }
+
         [Test]
         public void Can_Perform_Add_On_UserRepository()
         {
             // Arrange
             var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
+            using (var scope = provider.CreateScope(autoComplete: true))
             {
                 var repository = CreateRepository(provider);
 
@@ -101,7 +134,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
+            using (var scope = provider.CreateScope(autoComplete: true))
             {
                 var repository = CreateRepository(provider);
 
@@ -125,7 +158,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
+            using (var scope = provider.CreateScope(autoComplete: true))
             {
                 var repository = CreateRepository(provider);
 
@@ -150,7 +183,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             // Arrange
             var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
+            using (var scope = provider.CreateScope(autoComplete: true))
             {
                 var userRepository = CreateRepository(provider);
                 var contentRepository = CreateContentRepository(provider, out var contentTypeRepo);
@@ -209,7 +242,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
+            using (var scope = provider.CreateScope(autoComplete: true))
             {
                 var repository = CreateRepository(provider);
 
@@ -237,7 +270,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
+            using (var scope = provider.CreateScope(autoComplete: true))
             {
                 var repository = CreateRepository(provider);
                 var userGroupRepository = CreateUserGroupRepository(provider);
@@ -260,7 +293,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
+            using (var scope = provider.CreateScope(autoComplete: true))
             {
                 var repository = CreateRepository(provider);
 
@@ -280,7 +313,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
+            using (var scope = provider.CreateScope(autoComplete: true))
             {
                 var repository = CreateRepository(provider);
 
@@ -301,7 +334,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
+            using (var scope = provider.CreateScope(autoComplete: true))
             {
                 var repository = CreateRepository(provider);
 
@@ -322,7 +355,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
+            using (var scope = provider.CreateScope(autoComplete: true))
             {
                 var repository = CreateRepository(provider);
 
@@ -341,7 +374,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
+            using (var scope = provider.CreateScope(autoComplete: true))
             {
                 var repository = CreateRepository(provider);
 
@@ -360,7 +393,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Get_Paged_Results_By_Query_And_Filter_And_Groups()
         {
             var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
+            using (var scope = provider.CreateScope(autoComplete: true))
             {
                 var repository = CreateRepository(provider);
 
@@ -393,7 +426,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Get_Paged_Results_With_Filter_And_Groups()
         {
             var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
+            using (var scope = provider.CreateScope(autoComplete: true))
             {
                 var repository = CreateRepository(provider);
 
@@ -426,7 +459,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         {
             // Arrange
             var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
+            using (var scope = provider.CreateScope(autoComplete: true))
             {
                 var repository = CreateRepository(provider);
                 var userGroupRepository = CreateUserGroupRepository(provider);
diff --git a/src/Umbraco.Tests/PropertyEditors/BlockEditorComponentTests.cs b/src/Umbraco.Tests/PropertyEditors/BlockEditorComponentTests.cs
new file mode 100644
index 0000000000..bfd8b8c77b
--- /dev/null
+++ b/src/Umbraco.Tests/PropertyEditors/BlockEditorComponentTests.cs
@@ -0,0 +1,261 @@
+using Newtonsoft.Json;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Web.Compose;
+
+namespace Umbraco.Tests.PropertyEditors
+{
+    [TestFixture]
+    public class BlockEditorComponentTests
+    {
+        private readonly JsonSerializerSettings _serializerSettings = new JsonSerializerSettings
+        {
+            Formatting = Formatting.None,
+            NullValueHandling = NullValueHandling.Ignore,
+            
+        };
+
+        private const string _contentGuid1 = "036ce82586a64dfba2d523a99ed80f58";
+        private const string _contentGuid2 = "48288c21a38a40ef82deb3eda90a58f6";
+        private const string _settingsGuid1 = "ffd35c4e2eea4900abfa5611b67b2492";
+        private const string _subContentGuid1 = "4c44ce6b3a5c4f5f8f15e3dc24819a9e";
+        private const string _subContentGuid2 = "a062c06d6b0b44ac892b35d90309c7f8";
+        private const string _subSettingsGuid1 = "4d998d980ffa4eee8afdc23c4abd6d29";
+
+        [Test]
+        public void Cannot_Have_Null_Udi()
+        {
+            var component = new BlockEditorComponent();
+            var json = GetBlockListJson(null, string.Empty);
+            Assert.Throws<FormatException>(() => component.ReplaceBlockListUdis(json));
+        }
+
+        [Test]
+        public void No_Nesting()
+        {
+            var guids = Enumerable.Range(0, 3).Select(x => Guid.NewGuid()).ToList();
+            var guidCounter = 0;
+            Func<Guid> guidFactory = () => guids[guidCounter++];
+
+            var json = GetBlockListJson(null);
+
+            var expected = ReplaceGuids(json, guids, _contentGuid1, _contentGuid2, _settingsGuid1);
+
+            var component = new BlockEditorComponent();
+            var result = component.ReplaceBlockListUdis(json, guidFactory);
+
+            var expectedJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(expected, _serializerSettings), _serializerSettings);
+            var resultJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(result, _serializerSettings), _serializerSettings);
+            Console.WriteLine(expectedJson);
+            Console.WriteLine(resultJson);
+            Assert.AreEqual(expectedJson, resultJson);
+        }
+
+        [Test]
+        public void One_Level_Nesting_Escaped()
+        {
+            var guids = Enumerable.Range(0, 6).Select(x => Guid.NewGuid()).ToList();
+
+            var guidCounter = 0;
+            Func<Guid> guidFactory = () => guids[guidCounter++];
+
+            var innerJson = GetBlockListJson(null, _subContentGuid1, _subContentGuid2, _subSettingsGuid1);
+
+            // we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
+            // and this is how to do that, the result will also include quotes around it.
+            var innerJsonEscaped = JsonConvert.ToString(innerJson);
+
+            // get the json with the subFeatures as escaped
+            var json = GetBlockListJson(innerJsonEscaped);
+
+            var component = new BlockEditorComponent();
+            var result = component.ReplaceBlockListUdis(json, guidFactory);
+
+            // the expected result is that the subFeatures data is no longer escaped
+            var expected = ReplaceGuids(GetBlockListJson(innerJson), guids,
+                _contentGuid1, _contentGuid2, _settingsGuid1,
+                _subContentGuid1, _subContentGuid2, _subSettingsGuid1);
+
+            var expectedJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(expected, _serializerSettings), _serializerSettings);
+            var resultJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(result, _serializerSettings), _serializerSettings);
+            Console.WriteLine(expectedJson);
+            Console.WriteLine(resultJson);
+            Assert.AreEqual(expectedJson, resultJson);
+        }
+
+        [Test]
+        public void One_Level_Nesting_Unescaped()
+        {
+            var guids = Enumerable.Range(0, 6).Select(x => Guid.NewGuid()).ToList();
+            var guidCounter = 0;
+            Func<Guid> guidFactory = () => guids[guidCounter++];
+
+            // nested blocks without property value escaping used in the conversion
+            var innerJson = GetBlockListJson(null, _subContentGuid1, _subContentGuid2, _subSettingsGuid1);
+
+            // get the json with the subFeatures as unescaped
+            var json = GetBlockListJson(innerJson);
+
+            var expected = ReplaceGuids(GetBlockListJson(innerJson), guids,
+                _contentGuid1, _contentGuid2, _settingsGuid1,
+                _subContentGuid1, _subContentGuid2, _subSettingsGuid1);
+
+            var component = new BlockEditorComponent();
+            var result = component.ReplaceBlockListUdis(json, guidFactory);
+
+            var expectedJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(expected, _serializerSettings), _serializerSettings);
+            var resultJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(result, _serializerSettings), _serializerSettings);
+            Console.WriteLine(expectedJson);
+            Console.WriteLine(resultJson);
+            Assert.AreEqual(expectedJson, resultJson);
+        }
+
+        [Test]
+        public void Nested_In_Complex_Editor_Escaped()
+        {
+            var guids = Enumerable.Range(0, 6).Select(x => Guid.NewGuid()).ToList();
+            var guidCounter = 0;
+            Func<Guid> guidFactory = () => guids[guidCounter++];
+
+            var innerJson = GetBlockListJson(null, _subContentGuid1, _subContentGuid2, _subSettingsGuid1);
+
+            // we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
+            // and this is how to do that, the result will also include quotes around it.
+            var innerJsonEscaped = JsonConvert.ToString(innerJson);
+
+            // Complex editor such as the grid
+            var complexEditorJsonEscaped = GetGridJson(innerJsonEscaped);
+
+            var json = GetBlockListJson(complexEditorJsonEscaped);
+
+            var component = new BlockEditorComponent();
+            var result = component.ReplaceBlockListUdis(json, guidFactory);
+
+            // the expected result is that the subFeatures data is no longer escaped
+            var expected = ReplaceGuids(GetBlockListJson(GetGridJson(innerJson)), guids,
+                _contentGuid1, _contentGuid2, _settingsGuid1,
+                _subContentGuid1, _subContentGuid2, _subSettingsGuid1);
+
+            var expectedJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(expected, _serializerSettings), _serializerSettings);
+            var resultJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(result, _serializerSettings), _serializerSettings);
+            Console.WriteLine(expectedJson);
+            Console.WriteLine(resultJson);
+            Assert.AreEqual(expectedJson, resultJson);
+        }
+
+        private string GetBlockListJson(string subFeatures,
+            string contentGuid1 = _contentGuid1,
+            string contentGuid2 = _contentGuid2,
+            string settingsGuid1 = _settingsGuid1)
+        {
+            return @"{
+    ""layout"":
+    {
+        ""Umbraco.BlockList"": [
+            {
+                ""contentUdi"": """ + (contentGuid1.IsNullOrWhiteSpace() ? string.Empty : GuidUdi.Create(Constants.UdiEntityType.Element, Guid.Parse(contentGuid1)).ToString()) + @"""
+            },
+            {
+                ""contentUdi"": ""umb://element/" + contentGuid2 + @""",
+                ""settingsUdi"": ""umb://element/" + settingsGuid1 + @"""
+            }
+        ]
+    },
+    ""contentData"": [
+        {
+            ""contentTypeKey"": ""d6ce4a86-91a2-45b3-a99c-8691fc1fb020"",
+            ""udi"": """ + (contentGuid1.IsNullOrWhiteSpace() ? string.Empty : GuidUdi.Create(Constants.UdiEntityType.Element, Guid.Parse(contentGuid1)).ToString()) + @""",
+            ""featureName"": ""Hello"",
+            ""featureDetails"": ""World""
+        },
+        {
+            ""contentTypeKey"": ""d6ce4a86-91a2-45b3-a99c-8691fc1fb020"",
+            ""udi"": ""umb://element/" + contentGuid2 + @""",
+            ""featureName"": ""Another"",
+            ""featureDetails"": ""Feature""" + (subFeatures == null ? string.Empty : (@", ""subFeatures"": " + subFeatures)) + @"
+        }
+    ],
+    ""settingsData"": [
+        {
+            ""contentTypeKey"": ""d6ce4a86-91a2-45b3-a99c-8691fc1fb020"",
+            ""udi"": ""umb://element/" + settingsGuid1 + @""",
+            ""featureName"": ""Setting 1"",
+            ""featureDetails"": ""Setting 2""
+        },
+    ]
+}";
+        }
+
+        private string GetGridJson(string subBlockList)
+        {
+            return @"{
+  ""name"": ""1 column layout"",
+  ""sections"": [
+    {
+        ""grid"": ""12"",
+        ""rows"": [
+        {
+            ""name"": ""Article"",
+            ""id"": ""b4f6f651-0de3-ef46-e66a-464f4aaa9c57"",
+            ""areas"": [
+            {
+                ""grid"": ""4"",
+                ""controls"": [
+                {
+                    ""value"": ""I am quote"",
+                    ""editor"": {
+                        ""alias"": ""quote"",
+                        ""view"": ""textstring""
+                    },
+                    ""styles"": null,
+                    ""config"": null
+                }],
+                ""styles"": null,
+                ""config"": null
+            },
+            {
+                ""grid"": ""8"",
+                ""controls"": [
+                {
+                    ""value"": ""Header"",
+                    ""editor"": {
+                        ""alias"": ""headline"",
+                        ""view"": ""textstring""
+                    },
+                    ""styles"": null,
+                    ""config"": null
+                },
+                {
+                    ""value"": " + subBlockList + @",
+                    ""editor"": {
+                        ""alias"": ""madeUpNestedContent"",
+                        ""view"": ""madeUpNestedContentInGrid""
+                    },
+                    ""styles"": null,
+                    ""config"": null
+                }],
+                ""styles"": null,
+                ""config"": null
+            }],
+            ""styles"": null,
+            ""config"": null
+        }]
+    }]
+}";
+        }
+
+        private string ReplaceGuids(string json, List<Guid> newGuids, params string[] oldGuids)
+        {
+            for (var i = 0; i < oldGuids.Length; i++)
+            {
+                var old = oldGuids[i];
+                json = json.Replace(old, newGuids[i].ToString("N"));
+            }
+            return json;
+        }
+
+    }
+}
diff --git a/src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs b/src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs
new file mode 100644
index 0000000000..959e059d59
--- /dev/null
+++ b/src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs
@@ -0,0 +1,436 @@
+using Moq;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.Blocks;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+using Umbraco.Web.PropertyEditors.ValueConverters;
+using Umbraco.Web.PublishedCache;
+
+namespace Umbraco.Tests.PropertyEditors
+{
+    [TestFixture]
+    public class BlockListPropertyValueConverterTests
+    {
+        private readonly Guid ContentKey1 = Guid.NewGuid();
+        private readonly Guid ContentKey2 = Guid.NewGuid();
+        private const string ContentAlias1 = "Test1";
+        private const string ContentAlias2 = "Test2";
+        private readonly Guid SettingKey1 = Guid.NewGuid();
+        private readonly Guid SettingKey2 = Guid.NewGuid();
+        private const string SettingAlias1 = "Setting1";
+        private const string SettingAlias2 = "Setting2";
+
+        /// <summary>
+        /// Setup mocks for IPublishedSnapshotAccessor
+        /// </summary>
+        /// <returns></returns>
+        private IPublishedSnapshotAccessor GetPublishedSnapshotAccessor()
+        {
+            var test1ContentType = Mock.Of<IPublishedContentType2>(x =>
+                x.IsElement == true
+                && x.Key == ContentKey1
+                && x.Alias == ContentAlias1);
+            var test2ContentType = Mock.Of<IPublishedContentType2>(x =>
+                x.IsElement == true
+                && x.Key == ContentKey2
+                && x.Alias == ContentAlias2);
+            var test3ContentType = Mock.Of<IPublishedContentType2>(x =>
+                x.IsElement == true
+                && x.Key == SettingKey1
+                && x.Alias == SettingAlias1);
+            var test4ContentType = Mock.Of<IPublishedContentType2>(x =>
+                x.IsElement == true
+                && x.Key == SettingKey2
+                && x.Alias == SettingAlias2);
+            var contentCache = new Mock<IPublishedContentCache2>();
+            contentCache.Setup(x => x.GetContentType(ContentKey1)).Returns(test1ContentType);
+            contentCache.Setup(x => x.GetContentType(ContentKey2)).Returns(test2ContentType);
+            contentCache.Setup(x => x.GetContentType(SettingKey1)).Returns(test3ContentType);
+            contentCache.Setup(x => x.GetContentType(SettingKey2)).Returns(test4ContentType);
+            var publishedSnapshot = Mock.Of<IPublishedSnapshot>(x => x.Content == contentCache.Object);
+            var publishedSnapshotAccessor = Mock.Of<IPublishedSnapshotAccessor>(x => x.PublishedSnapshot == publishedSnapshot);
+            return publishedSnapshotAccessor;
+        }
+
+        private BlockListPropertyValueConverter CreateConverter()
+        {
+            var publishedSnapshotAccessor = GetPublishedSnapshotAccessor();
+            var publishedModelFactory = new NoopPublishedModelFactory();
+            var editor = new BlockListPropertyValueConverter(
+                Mock.Of<IProfilingLogger>(),
+                new BlockEditorConverter(publishedSnapshotAccessor, publishedModelFactory));
+            return editor;
+        }
+
+        private BlockListConfiguration ConfigForMany() => new BlockListConfiguration
+        {
+            Blocks = new[] {
+                    new BlockListConfiguration.BlockConfiguration
+                    {
+                        ContentElementTypeKey = ContentKey1,
+                        SettingsElementTypeKey = SettingKey2
+                    },
+                    new BlockListConfiguration.BlockConfiguration
+                    {
+                        ContentElementTypeKey = ContentKey2,
+                        SettingsElementTypeKey = SettingKey1
+                    }
+                }
+        };
+
+        private BlockListConfiguration ConfigForSingle() => new BlockListConfiguration
+        {
+            Blocks = new[] {
+                    new BlockListConfiguration.BlockConfiguration
+                    {
+                        ContentElementTypeKey = ContentKey1
+                    }
+                }
+        };
+
+        private IPublishedPropertyType GetPropertyType(BlockListConfiguration config)
+        {            
+            var dataType = new PublishedDataType(1, "test", new Lazy<object>(() => config));
+            var propertyType = Mock.Of<IPublishedPropertyType>(x =>
+                x.EditorAlias == Constants.PropertyEditors.Aliases.BlockList
+                && x.DataType == dataType);
+            return propertyType;
+        }
+
+        [Test]
+        public void Is_Converter_For()
+        {
+            var editor = CreateConverter();
+            Assert.IsTrue(editor.IsConverter(Mock.Of<IPublishedPropertyType>(x => x.EditorAlias == Constants.PropertyEditors.Aliases.BlockList)));
+            Assert.IsFalse(editor.IsConverter(Mock.Of<IPublishedPropertyType>(x => x.EditorAlias == Constants.PropertyEditors.Aliases.NestedContent)));
+        }
+
+        [Test]
+        public void Get_Value_Type_Multiple()
+        {
+            var editor = CreateConverter();
+            var config = ConfigForMany();
+
+            var dataType = new PublishedDataType(1, "test", new Lazy<object>(() => config));
+            var propType = Mock.Of<IPublishedPropertyType>(x => x.DataType == dataType);
+
+            var valueType = editor.GetPropertyValueType(propType);
+
+            // the result is always block list model
+            Assert.AreEqual(typeof(BlockListModel), valueType);
+        }
+
+        [Test]
+        public void Get_Value_Type_Single()
+        {
+            var editor = CreateConverter();
+            var config = ConfigForSingle();
+
+            var dataType = new PublishedDataType(1, "test", new Lazy<object>(() => config));
+            var propType = Mock.Of<IPublishedPropertyType>(x => x.DataType == dataType);
+
+            var valueType = editor.GetPropertyValueType(propType);
+
+            // the result is always block list model
+            Assert.AreEqual(typeof(BlockListModel), valueType);
+        }
+
+        [Test]
+        public void Convert_Null_Empty()
+        {
+            var editor = CreateConverter();
+            var config = ConfigForMany();
+            var propertyType = GetPropertyType(config);
+            var publishedElement = Mock.Of<IPublishedElement>();
+
+            string json = null;
+            var converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+
+            Assert.IsNotNull(converted);
+            Assert.AreEqual(0, converted.Count);
+
+            json = string.Empty;
+            converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+
+            Assert.IsNotNull(converted);
+            Assert.AreEqual(0, converted.Count);
+        }
+
+        [Test]
+        public void Convert_Valid_Empty_Json()
+        {
+            var editor = CreateConverter();
+            var config = ConfigForMany();
+            var propertyType = GetPropertyType(config);
+            var publishedElement = Mock.Of<IPublishedElement>();
+
+            var json = "{}"; 
+            var converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+
+            Assert.IsNotNull(converted);
+            Assert.AreEqual(0, converted.Count);
+
+            json = @"{
+layout: {},
+data: []}";
+            converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+
+            Assert.IsNotNull(converted);
+            Assert.AreEqual(0, converted.Count);
+
+            // Even though there is a layout, there is no data, so the conversion will result in zero elements in total
+            json = @"
+{
+    layout: {
+        '" + Constants.PropertyEditors.Aliases.BlockList + @"': [
+            {
+                'contentUdi': 'umb://element/e7dba547615b4e9ab4ab2a7674845bc9'
+            }
+        ]
+    },
+    contentData: []
+}";
+            
+            converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+
+            Assert.IsNotNull(converted);
+            Assert.AreEqual(0, converted.Count);
+
+            // Even though there is a layout and data, the data is invalid (missing required keys) so the conversion will result in zero elements in total
+            json = @"
+{
+    layout: {
+        '" + Constants.PropertyEditors.Aliases.BlockList + @"': [
+            {
+                'contentUdi': 'umb://element/e7dba547615b4e9ab4ab2a7674845bc9'
+            }
+        ]
+    },
+        contentData: [
+        {
+            'udi': 'umb://element/e7dba547615b4e9ab4ab2a7674845bc9'
+        }
+    ]
+}";
+
+            converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+
+            Assert.IsNotNull(converted);
+            Assert.AreEqual(0, converted.Count);
+
+            // Everthing is ok except the udi reference in the layout doesn't match the data so it will be empty
+            json = @"
+{
+    layout: {
+        '" + Constants.PropertyEditors.Aliases.BlockList + @"': [
+            {
+                'contentUdi': 'umb://element/1304E1DDAC87439684FE8A399231CB3D'
+            }
+        ]
+    },
+        contentData: [
+        {
+            'contentTypeKey': '" + ContentKey1 + @"',
+            'key': '1304E1DD-0000-4396-84FE-8A399231CB3D'
+        }
+    ]
+}";
+
+            converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+
+            Assert.IsNotNull(converted);
+            Assert.AreEqual(0, converted.Count);
+        }
+
+        [Test]
+        public void Convert_Valid_Json()
+        {
+            var editor = CreateConverter();
+            var config = ConfigForMany();
+            var propertyType = GetPropertyType(config);
+            var publishedElement = Mock.Of<IPublishedElement>();
+
+            var json = @"
+{
+    layout: {
+        '" + Constants.PropertyEditors.Aliases.BlockList + @"': [
+            {
+                'contentUdi': 'umb://element/1304E1DDAC87439684FE8A399231CB3D'
+            }
+        ]
+    },
+        contentData: [
+        {
+            'contentTypeKey': '" + ContentKey1 + @"',
+            'udi': 'umb://element/1304E1DDAC87439684FE8A399231CB3D'
+        }
+    ]
+}";
+            var converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+
+            Assert.IsNotNull(converted);
+            Assert.AreEqual(1, converted.Count);
+            var item0 = converted[0].Content;
+            Assert.AreEqual(Guid.Parse("1304E1DD-AC87-4396-84FE-8A399231CB3D"), item0.Key);
+            Assert.AreEqual("Test1", item0.ContentType.Alias);
+            Assert.IsNull(converted[0].Settings);
+            Assert.AreEqual(Udi.Parse("umb://element/1304E1DDAC87439684FE8A399231CB3D"), converted[0].ContentUdi);
+        }
+
+        [Test]
+        public void Get_Data_From_Layout_Item()
+        {
+            var editor = CreateConverter();
+            var config = ConfigForMany();
+            var propertyType = GetPropertyType(config);
+            var publishedElement = Mock.Of<IPublishedElement>();
+
+            var json = @"
+{
+    layout: {
+        '" + Constants.PropertyEditors.Aliases.BlockList + @"': [
+            {
+                'contentUdi': 'umb://element/1304E1DDAC87439684FE8A399231CB3D',
+                'settingsUdi': 'umb://element/1F613E26CE274898908A561437AF5100'
+            },
+            {
+                'contentUdi': 'umb://element/0A4A416E547D464FABCC6F345C17809A',
+                'settingsUdi': 'umb://element/63027539B0DB45E7B70459762D4E83DD'
+            }
+        ]
+    },
+    contentData: [
+        {
+            'contentTypeKey': '" + ContentKey1 + @"',
+            'udi': 'umb://element/1304E1DDAC87439684FE8A399231CB3D'
+        },
+        {
+            'contentTypeKey': '" + ContentKey2 + @"',
+            'udi': 'umb://element/E05A034704424AB3A520E048E6197E79'
+        },
+        {
+            'contentTypeKey': '" + ContentKey2 + @"',
+            'udi': 'umb://element/0A4A416E547D464FABCC6F345C17809A'
+        }
+    ],
+    settingsData: [
+        {
+            'contentTypeKey': '" + SettingKey1 + @"',
+            'udi': 'umb://element/63027539B0DB45E7B70459762D4E83DD'
+        },
+        {
+            'contentTypeKey': '" + SettingKey2 + @"',
+            'udi': 'umb://element/1F613E26CE274898908A561437AF5100'
+        },
+        {
+            'contentTypeKey': '" + SettingKey2 + @"',
+            'udi': 'umb://element/BCF4BA3DA40C496C93EC58FAC85F18B9'
+        }
+    ],
+}";
+
+            var converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+
+            Assert.IsNotNull(converted);
+            Assert.AreEqual(2, converted.Count);
+
+            var item0 = converted[0];
+            Assert.AreEqual(Guid.Parse("1304E1DD-AC87-4396-84FE-8A399231CB3D"), item0.Content.Key);
+            Assert.AreEqual("Test1", item0.Content.ContentType.Alias);
+            Assert.AreEqual(Guid.Parse("1F613E26CE274898908A561437AF5100"), item0.Settings.Key);
+            Assert.AreEqual("Setting2", item0.Settings.ContentType.Alias);
+
+            var item1 = converted[1];
+            Assert.AreEqual(Guid.Parse("0A4A416E-547D-464F-ABCC-6F345C17809A"), item1.Content.Key);
+            Assert.AreEqual("Test2", item1.Content.ContentType.Alias);
+            Assert.AreEqual(Guid.Parse("63027539B0DB45E7B70459762D4E83DD"), item1.Settings.Key);
+            Assert.AreEqual("Setting1", item1.Settings.ContentType.Alias);
+
+        }
+
+        [Test]
+        public void Data_Item_Removed_If_Removed_From_Config()
+        {
+            var editor = CreateConverter();
+
+            // The data below expects that ContentKey1 + ContentKey2 + SettingsKey1 + SettingsKey2 exist but only ContentKey2 exists so
+            // the data should all be filtered.
+            var config = new BlockListConfiguration
+            {
+                Blocks = new[] {
+                    new BlockListConfiguration.BlockConfiguration
+                    {
+                        ContentElementTypeKey = ContentKey2,
+                        SettingsElementTypeKey = null
+                    }
+                }
+            };
+
+            var propertyType = GetPropertyType(config);
+            var publishedElement = Mock.Of<IPublishedElement>();
+
+            var json = @"
+{
+    layout: {
+        '" + Constants.PropertyEditors.Aliases.BlockList + @"': [
+            {
+                'contentUdi': 'umb://element/1304E1DDAC87439684FE8A399231CB3D',
+                'settingsUdi': 'umb://element/1F613E26CE274898908A561437AF5100'
+            },
+            {
+                'contentUdi': 'umb://element/0A4A416E547D464FABCC6F345C17809A',
+                'settingsUdi': 'umb://element/63027539B0DB45E7B70459762D4E83DD'
+            }
+        ]
+    },
+    contentData: [
+        {
+            'contentTypeKey': '" + ContentKey1 + @"',
+            'udi': 'umb://element/1304E1DDAC87439684FE8A399231CB3D'
+        },
+        {
+            'contentTypeKey': '" + ContentKey2 + @"',
+            'udi': 'umb://element/E05A034704424AB3A520E048E6197E79'
+        },
+        {
+            'contentTypeKey': '" + ContentKey2 + @"',
+            'udi': 'umb://element/0A4A416E547D464FABCC6F345C17809A'
+        }
+    ],
+    settingsData: [
+        {
+            'contentTypeKey': '" + SettingKey1 + @"',
+            'udi': 'umb://element/63027539B0DB45E7B70459762D4E83DD'
+        },
+        {
+            'contentTypeKey': '" + SettingKey2 + @"',
+            'udi': 'umb://element/1F613E26CE274898908A561437AF5100'
+        },
+        {
+            'contentTypeKey': '" + SettingKey2 + @"',
+            'udi': 'umb://element/BCF4BA3DA40C496C93EC58FAC85F18B9'
+        }
+    ],
+}";
+
+            var converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+
+            Assert.IsNotNull(converted);
+            Assert.AreEqual(1, converted.Count);
+
+            var item0 = converted[0];
+            Assert.AreEqual(Guid.Parse("0A4A416E-547D-464F-ABCC-6F345C17809A"), item0.Content.Key);
+            Assert.AreEqual("Test2", item0.Content.ContentType.Alias);
+            Assert.IsNull(item0.Settings);
+
+        }
+
+    }
+}
diff --git a/src/Umbraco.Tests/PropertyEditors/NestedContentPropertyComponentTests.cs b/src/Umbraco.Tests/PropertyEditors/NestedContentPropertyComponentTests.cs
index 1b83c048d2..5b7e220123 100644
--- a/src/Umbraco.Tests/PropertyEditors/NestedContentPropertyComponentTests.cs
+++ b/src/Umbraco.Tests/PropertyEditors/NestedContentPropertyComponentTests.cs
@@ -9,6 +9,7 @@ using Umbraco.Web.Compose;
 
 namespace Umbraco.Tests.PropertyEditors
 {
+
     [TestFixture]
     public class NestedContentPropertyComponentTests
     {
diff --git a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs
index 43c1a83d33..a9e3e8b9db 100644
--- a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs
+++ b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs
@@ -93,7 +93,7 @@ namespace Umbraco.Tests.PropertyEditors
                     })));
 
             var publishedPropType = new PublishedPropertyType(
-                new PublishedContentType(1234, "test", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing),
+                new PublishedContentType(Guid.NewGuid(), 1234, "test", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing),
                 new PropertyType("test", ValueStorageType.Nvarchar) { DataTypeId = 123 },
                 new PropertyValueConverterCollection(Enumerable.Empty<IPropertyValueConverter>()),
                 Mock.Of<IPublishedModelFactory>(), mockPublishedContentTypeFactory.Object);
diff --git a/src/Umbraco.Tests/Published/ConvertersTests.cs b/src/Umbraco.Tests/Published/ConvertersTests.cs
index 671129848c..3c60f4ddd0 100644
--- a/src/Umbraco.Tests/Published/ConvertersTests.cs
+++ b/src/Umbraco.Tests/Published/ConvertersTests.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Tests.Published
                 yield return contentTypeFactory.CreatePropertyType(contentType, "prop1", 1);
             }
 
-            var elementType1 = contentTypeFactory.CreateContentType(1000, "element1", CreatePropertyTypes);
+            var elementType1 = contentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "element1", CreatePropertyTypes);
 
             var element1 = new PublishedElement(elementType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "1234" } }, false);
 
@@ -74,7 +74,7 @@ namespace Umbraco.Tests.Published
                 => propertyType.EditorAlias.InvariantEquals("Umbraco.Void");
 
             public Type GetPropertyValueType(IPublishedPropertyType propertyType)
-                => typeof (int);
+                => typeof(int);
 
             public PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
                 => PropertyCacheLevel.Element;
@@ -83,10 +83,10 @@ namespace Umbraco.Tests.Published
                 => int.TryParse(source as string, out int i) ? i : 0;
 
             public object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
-                => (int) inter;
+                => (int)inter;
 
             public object ConvertIntermediateToXPath(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
-                => ((int) inter).ToString();
+                => ((int)inter).ToString();
         }
 
         #endregion
@@ -120,11 +120,11 @@ namespace Umbraco.Tests.Published
                 yield return contentTypeFactory.CreatePropertyType(contentType, "prop1", 1);
             }
 
-            var elementType1 = contentTypeFactory.CreateContentType(1000, "element1", CreatePropertyTypes);
+            var elementType1 = contentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "element1", CreatePropertyTypes);
 
             var element1 = new PublishedElement(elementType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "1234" } }, false);
 
-            var cntType1 = contentTypeFactory.CreateContentType(1001, "cnt1", t => Enumerable.Empty<PublishedPropertyType>());
+            var cntType1 = contentTypeFactory.CreateContentType(Guid.NewGuid(), 1001, "cnt1", t => Enumerable.Empty<PublishedPropertyType>());
             var cnt1 = new SolidPublishedContent(cntType1) { Id = 1234 };
             cacheContent[cnt1.Id] = cnt1;
 
@@ -143,7 +143,7 @@ namespace Umbraco.Tests.Published
             }
 
             public bool? IsValue(object value, PropertyValueLevel level)
-                => value != null && (!(value is string) || string.IsNullOrWhiteSpace((string) value) == false);
+                => value != null && (!(value is string) || string.IsNullOrWhiteSpace((string)value) == false);
 
             public bool IsConverter(IPublishedPropertyType propertyType)
                 => propertyType.EditorAlias.InvariantEquals("Umbraco.Void");
@@ -162,10 +162,10 @@ namespace Umbraco.Tests.Published
                 => int.TryParse(source as string, out int i) ? i : -1;
 
             public object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
-                => _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById((int) inter);
+                => _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById((int)inter);
 
             public object ConvertIntermediateToXPath(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
-                => ((int) inter).ToString();
+                => ((int)inter).ToString();
         }
 
         #endregion
@@ -215,10 +215,10 @@ namespace Umbraco.Tests.Published
                 yield return contentTypeFactory.CreatePropertyType(contentType, "prop" + i, i);
             }
 
-            var elementType1 = contentTypeFactory.CreateContentType(1000, "element1", t => CreatePropertyTypes(t, 1));
-            var elementType2 = contentTypeFactory.CreateContentType(1001, "element2", t => CreatePropertyTypes(t, 2));
-            var contentType1 = contentTypeFactory.CreateContentType(1002, "content1", t => CreatePropertyTypes(t, 1));
-            var contentType2 = contentTypeFactory.CreateContentType(1003, "content2", t => CreatePropertyTypes(t, 2));
+            var elementType1 = contentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "element1", t => CreatePropertyTypes(t, 1));
+            var elementType2 = contentTypeFactory.CreateContentType(Guid.NewGuid(), 1001, "element2", t => CreatePropertyTypes(t, 2));
+            var contentType1 = contentTypeFactory.CreateContentType(Guid.NewGuid(), 1002, "content1", t => CreatePropertyTypes(t, 1));
+            var contentType2 = contentTypeFactory.CreateContentType(Guid.NewGuid(), 1003, "content2", t => CreatePropertyTypes(t, 2));
 
             var element1 = new PublishedElement(elementType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "val1" } }, false);
             var element2 = new PublishedElement(elementType2, Guid.NewGuid(), new Dictionary<string, object> { { "prop2", "1003" } }, false);
@@ -239,22 +239,22 @@ namespace Umbraco.Tests.Published
             // can get the actual property Clr type
             // ie ModelType gets properly mapped by IPublishedContentModelFactory
             // must test ModelClrType with special equals 'cos they are not ref-equals
-            Assert.IsTrue(ModelType.Equals(typeof (IEnumerable<>).MakeGenericType(ModelType.For("content1")), contentType2.GetPropertyType("prop2").ModelClrType));
-            Assert.AreEqual(typeof (IEnumerable<PublishedSnapshotTestObjects.TestContentModel1>), contentType2.GetPropertyType("prop2").ClrType);
+            Assert.IsTrue(ModelType.Equals(typeof(IEnumerable<>).MakeGenericType(ModelType.For("content1")), contentType2.GetPropertyType("prop2").ModelClrType));
+            Assert.AreEqual(typeof(IEnumerable<PublishedSnapshotTestObjects.TestContentModel1>), contentType2.GetPropertyType("prop2").ClrType);
 
             // can create a model for an element
             var model1 = factory.CreateModel(element1);
             Assert.IsInstanceOf<PublishedSnapshotTestObjects.TestElementModel1>(model1);
-            Assert.AreEqual("val1", ((PublishedSnapshotTestObjects.TestElementModel1) model1).Prop1);
+            Assert.AreEqual("val1", ((PublishedSnapshotTestObjects.TestElementModel1)model1).Prop1);
 
             // can create a model for a published content
             var model2 = factory.CreateModel(element2);
             Assert.IsInstanceOf<PublishedSnapshotTestObjects.TestElementModel2>(model2);
-            var mmodel2 = (PublishedSnapshotTestObjects.TestElementModel2) model2;
+            var mmodel2 = (PublishedSnapshotTestObjects.TestElementModel2)model2;
 
             // and get direct property
             Assert.IsInstanceOf<PublishedSnapshotTestObjects.TestContentModel1[]>(model2.Value("prop2"));
-            Assert.AreEqual(1, ((PublishedSnapshotTestObjects.TestContentModel1[]) model2.Value("prop2")).Length);
+            Assert.AreEqual(1, ((PublishedSnapshotTestObjects.TestContentModel1[])model2.Value("prop2")).Length);
 
             // and get model property
             Assert.IsInstanceOf<IEnumerable<PublishedSnapshotTestObjects.TestContentModel1>>(mmodel2.Prop2);
@@ -271,7 +271,7 @@ namespace Umbraco.Tests.Published
                 => propertyType.EditorAlias == "Umbraco.Void";
 
             public override Type GetPropertyValueType(IPublishedPropertyType propertyType)
-                => typeof (string);
+                => typeof(string);
 
             public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
                 => PropertyCacheLevel.Element;
@@ -290,7 +290,7 @@ namespace Umbraco.Tests.Published
                 => propertyType.EditorAlias == "Umbraco.Void.2";
 
             public override Type GetPropertyValueType(IPublishedPropertyType propertyType)
-                => typeof (IEnumerable<>).MakeGenericType(ModelType.For("content1"));
+                => typeof(IEnumerable<>).MakeGenericType(ModelType.For("content1"));
 
             public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
                 => PropertyCacheLevel.Elements;
@@ -303,7 +303,7 @@ namespace Umbraco.Tests.Published
 
             public override object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
             {
-                return ((int[]) inter).Select(x => (PublishedSnapshotTestObjects.TestContentModel1) _publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(x)).ToArray();
+                return ((int[])inter).Select(x => (PublishedSnapshotTestObjects.TestContentModel1)_publishedSnapshotAccessor.PublishedSnapshot.Content.GetById(x)).ToArray();
             }
         }
 
diff --git a/src/Umbraco.Tests/Published/NestedContentTests.cs b/src/Umbraco.Tests/Published/NestedContentTests.cs
index adfb9d3b6b..c5cee8843f 100644
--- a/src/Umbraco.Tests/Published/NestedContentTests.cs
+++ b/src/Umbraco.Tests/Published/NestedContentTests.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Tests.Published
             var proflog = new ProfilingLogger(logger, profiler);
 
             PropertyEditorCollection editors = null;
-            var editor = new NestedContentPropertyEditor(logger, new Lazy<PropertyEditorCollection>(() => editors), Mock.Of<IDataTypeService>(), Mock.Of<IContentTypeService>());
+            var editor = new NestedContentPropertyEditor(logger, new Lazy<PropertyEditorCollection>(() => editors), Mock.Of<IDataTypeService>(), Mock.Of<IContentTypeService>(), Mock.Of<ILocalizedTextService>());
             editors = new PropertyEditorCollection(new DataEditorCollection(new DataEditor[] { editor }));
 
             var dataType1 = new DataType(editor)
@@ -100,8 +100,8 @@ namespace Umbraco.Tests.Published
                 .Returns((string alias) =>
                 {
                     return alias == "contentN1"
-                        ? (IList) new List<TestElementModel>()
-                        : (IList) new List<IPublishedElement>();
+                        ? (IList)new List<TestElementModel>()
+                        : (IList)new List<IPublishedElement>();
                 });
 
             var contentCache = new Mock<IPublishedContentCache>();
@@ -142,9 +142,9 @@ namespace Umbraco.Tests.Published
                 yield return factory.CreatePropertyType(contentType, "propertyN1", 3);
             }
 
-            var contentType1 = factory.CreateContentType(1, "content1", CreatePropertyTypes1);
-            var contentType2 = factory.CreateContentType(2, "content2", CreatePropertyTypes2);
-            var contentTypeN1 = factory.CreateContentType(2, "contentN1", CreatePropertyTypesN1, isElement: true);
+            var contentType1 = factory.CreateContentType(Guid.NewGuid(), 1, "content1", CreatePropertyTypes1);
+            var contentType2 = factory.CreateContentType(Guid.NewGuid(), 2, "content2", CreatePropertyTypes2);
+            var contentTypeN1 = factory.CreateContentType(Guid.NewGuid(), 2, "contentN1", CreatePropertyTypesN1, isElement: true);
 
             // mocked content cache returns content types
             contentCache
@@ -164,7 +164,7 @@ namespace Umbraco.Tests.Published
             (var contentType1, _) = CreateContentTypes();
 
             // nested single converter returns the proper value clr type TestModel, and cache level
-            Assert.AreEqual(typeof (TestElementModel), contentType1.GetPropertyType("property1").ClrType);
+            Assert.AreEqual(typeof(TestElementModel), contentType1.GetPropertyType("property1").ClrType);
             Assert.AreEqual(PropertyCacheLevel.Element, contentType1.GetPropertyType("property1").CacheLevel);
 
             var key = Guid.NewGuid();
@@ -172,7 +172,7 @@ namespace Umbraco.Tests.Published
             var content = new SolidPublishedContent(contentType1)
             {
                 Key = key,
-                Properties = new []
+                Properties = new[]
                 {
                     new TestPublishedProperty(contentType1.GetPropertyType("property1"), $@"[
                     {{ ""key"": ""{keyA}"", ""propertyN1"": ""foo"", ""ncContentTypeAlias"": ""contentN1"" }}
@@ -183,7 +183,7 @@ namespace Umbraco.Tests.Published
 
             // nested single converter returns proper TestModel value
             Assert.IsInstanceOf<TestElementModel>(value);
-            var valueM = (TestElementModel) value;
+            var valueM = (TestElementModel)value;
             Assert.AreEqual("foo", valueM.PropValue);
             Assert.AreEqual(keyA, valueM.Key);
         }
@@ -194,7 +194,7 @@ namespace Umbraco.Tests.Published
             (_, var contentType2) = CreateContentTypes();
 
             // nested many converter returns the proper value clr type IEnumerable<TestModel>, and cache level
-            Assert.AreEqual(typeof (IEnumerable<TestElementModel>), contentType2.GetPropertyType("property2").ClrType);
+            Assert.AreEqual(typeof(IEnumerable<TestElementModel>), contentType2.GetPropertyType("property2").ClrType);
             Assert.AreEqual(PropertyCacheLevel.Element, contentType2.GetPropertyType("property2").CacheLevel);
 
             var key = Guid.NewGuid();
@@ -216,7 +216,7 @@ namespace Umbraco.Tests.Published
             // nested many converter returns proper IEnumerable<TestModel> value
             Assert.IsInstanceOf<IEnumerable<IPublishedElement>>(value);
             Assert.IsInstanceOf<IEnumerable<TestElementModel>>(value);
-            var valueM = ((IEnumerable<TestElementModel>) value).ToArray();
+            var valueM = ((IEnumerable<TestElementModel>)value).ToArray();
             Assert.AreEqual("foo", valueM[0].PropValue);
             Assert.AreEqual(keyA, valueM[0].Key);
             Assert.AreEqual("bar", valueM[1].PropValue);
diff --git a/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs b/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
index 9db539d142..a795ca433e 100644
--- a/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
+++ b/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Tests.Published
                 yield return publishedContentTypeFactory.CreatePropertyType(contentType, "prop1", 1);
             }
 
-            var setType1 = publishedContentTypeFactory.CreateContentType(1000, "set1", CreatePropertyTypes);
+            var setType1 = publishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "set1", CreatePropertyTypes);
 
             // PublishedElementPropertyBase.GetCacheLevels:
             //
@@ -122,7 +122,7 @@ namespace Umbraco.Tests.Published
                 yield return publishedContentTypeFactory.CreatePropertyType(contentType, "prop1", 1);
             }
 
-            var setType1 = publishedContentTypeFactory.CreateContentType(1000, "set1", CreatePropertyTypes);
+            var setType1 = publishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "set1", CreatePropertyTypes);
 
             var elementsCache = new FastDictionaryAppCache();
             var snapshotCache = new FastDictionaryAppCache();
@@ -199,7 +199,7 @@ namespace Umbraco.Tests.Published
                 yield return publishedContentTypeFactory.CreatePropertyType(contentType, "prop1", 1);
             }
 
-            var setType1 = publishedContentTypeFactory.CreateContentType(1000, "set1", CreatePropertyTypes);
+            var setType1 = publishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "set1", CreatePropertyTypes);
 
             Assert.Throws<Exception>(() =>
             {
diff --git a/src/Umbraco.Tests/PublishedContent/ContentSerializationTests.cs b/src/Umbraco.Tests/PublishedContent/ContentSerializationTests.cs
index debfddef98..b3543dad1a 100644
--- a/src/Umbraco.Tests/PublishedContent/ContentSerializationTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/ContentSerializationTests.cs
@@ -1,10 +1,9 @@
-using NUnit.Framework;
+using Moq;
+using NUnit.Framework;
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Umbraco.Core.Models;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Web.PublishedCache.NuCache.DataSource;
 
 namespace Umbraco.Tests.PublishedContent
@@ -13,13 +12,13 @@ namespace Umbraco.Tests.PublishedContent
     public class ContentSerializationTests
     {
         [Test]
-        public void Ensure_Same_Results()
+        public void GivenACacheModel_WhenItsSerializedAndDeserializedWithAnySerializer_TheResultsAreTheSame()
         {
             var jsonSerializer = new JsonContentNestedDataSerializer();
-            var msgPackSerializer = new MsgPackContentNestedDataSerializer();
+            var msgPackSerializer = new MsgPackContentNestedDataSerializer(Mock.Of<IPropertyCacheCompression>());
 
             var now = DateTime.Now;
-            var content = new ContentNestedData
+            var cacheModel = new ContentCacheDataModel
             {
                 PropertyData = new Dictionary<string, PropertyData[]>
                 {
@@ -55,14 +54,16 @@ namespace Umbraco.Tests.PublishedContent
                 UrlSegment = "home"
             };
 
-            var json = jsonSerializer.Serialize(content);
-            var msgPack = msgPackSerializer.Serialize(content);
+            var content = Mock.Of<IReadOnlyContentBase>(x => x.ContentTypeId == 1);
+
+            var json = jsonSerializer.Serialize(content, cacheModel).StringData;
+            var msgPack = msgPackSerializer.Serialize(content, cacheModel).ByteData;
 
             Console.WriteLine(json);
             Console.WriteLine(msgPackSerializer.ToJson(msgPack));
 
-            var jsonContent = jsonSerializer.Deserialize(json);
-            var msgPackContent = msgPackSerializer.Deserialize(msgPack);
+            var jsonContent = jsonSerializer.Deserialize(content, json, null);
+            var msgPackContent = msgPackSerializer.Deserialize(content, null, msgPack);
 
 
             CollectionAssert.AreEqual(jsonContent.CultureData.Keys, msgPackContent.CultureData.Keys);
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index fef096498c..afba2dcc4f 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -37,7 +37,7 @@ namespace Umbraco.Tests.PublishedContent
         private ContentType _contentTypeInvariant;
         private ContentType _contentTypeVariant;
         private TestDataSource _source;
-        private IContentNestedDataSerializer _contentNestedDataSerializer;
+        private IContentCacheDataSerializerFactory _contentNestedDataSerializerFactory;
 
         [TearDown]
         public void Teardown()
@@ -135,7 +135,7 @@ namespace Umbraco.Tests.PublishedContent
 
             // create a data source for NuCache
             _source = new TestDataSource(kits());
-            _contentNestedDataSerializer = new JsonContentNestedDataSerializer();
+            _contentNestedDataSerializerFactory = new JsonContentNestedDataSerializerFactory();
 
             // at last, create the complete NuCache snapshot service!
             var options = new PublishedSnapshotServiceOptions { IgnoreLocalDb = true };
@@ -158,7 +158,7 @@ namespace Umbraco.Tests.PublishedContent
                 Mock.Of<IEntityXmlSerializer>(),
                 Mock.Of<IPublishedModelFactory>(),
                 new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }),
-                _contentNestedDataSerializer);
+                _contentNestedDataSerializerFactory);
 
             // invariant is the current default
             _variationAccesor.VariationContext = new VariationContext();
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index 792ccc8529..eee3500495 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Tests.PublishedContent
     {
         private IPublishedSnapshotService _snapshotService;
         private IVariationContextAccessor _variationAccesor;
-        private IContentNestedDataSerializer _contentNestedDataSerializer;
+        private IContentCacheDataSerializerFactory _contentNestedDataSerializerFactory;
         private ContentType _contentType;
         private PropertyType _propertyType;
 
@@ -115,7 +115,7 @@ namespace Umbraco.Tests.PublishedContent
 
             // create a data source for NuCache
             var dataSource = new TestDataSource(kit);
-            _contentNestedDataSerializer = new JsonContentNestedDataSerializer();
+            _contentNestedDataSerializerFactory = new JsonContentNestedDataSerializerFactory();
 
             var runtime = Mock.Of<IRuntimeState>();
             Mock.Get(runtime).Setup(x => x.Level).Returns(RuntimeLevel.Run);
@@ -204,7 +204,7 @@ namespace Umbraco.Tests.PublishedContent
                 Mock.Of<IEntityXmlSerializer>(),
                 Mock.Of<IPublishedModelFactory>(),
                 new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }),
-                _contentNestedDataSerializer);
+                _contentNestedDataSerializerFactory);
 
             // invariant is the current default
             _variationAccesor.VariationContext = new VariationContext();
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs
index cc455b8e5d..7277f75be2 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs
@@ -98,7 +98,7 @@ namespace Umbraco.Tests.PublishedContent
             var doc = GetContent(true, 1);
             //change a doc type alias
             var c = (SolidPublishedContent)doc.Children.ElementAt(0);
-            c.ContentType = new PublishedContentType(22, "DontMatch", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
+            c.ContentType = new PublishedContentType(Guid.NewGuid(), 22, "DontMatch", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
 
             var dt = doc.ChildrenAsTable(Current.Services, "Child");
 
@@ -129,7 +129,7 @@ namespace Umbraco.Tests.PublishedContent
 
             var factory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), new PropertyValueConverterCollection(Array.Empty<IPropertyValueConverter>()), dataTypeService);
             var contentTypeAlias = createChildren ? "Parent" : "Child";
-            var contentType = new PublishedContentType(22, contentTypeAlias, PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
+            var contentType = new PublishedContentType(Guid.NewGuid(), 22, contentTypeAlias, PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
             var d = new SolidPublishedContent(contentType)
                 {
                     CreateDate = DateTime.Now,
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs
index 62447742ff..636f8502ed 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs
@@ -73,14 +73,14 @@ namespace Umbraco.Tests.PublishedContent
                 yield return factory.CreatePropertyType(contentType, "noprop", 1, variations: ContentVariation.Culture);
             }
 
-            var contentType1 = factory.CreateContentType(1, "ContentType1", Enumerable.Empty<string>(), CreatePropertyTypes1);
+            var contentType1 = factory.CreateContentType(Guid.NewGuid(), 1, "ContentType1", Enumerable.Empty<string>(), CreatePropertyTypes1);
 
             IEnumerable<IPublishedPropertyType> CreatePropertyTypes2(IPublishedContentType contentType)
             {
                 yield return factory.CreatePropertyType(contentType, "prop3", 1, variations: ContentVariation.Culture);
             }
 
-            var contentType2 = factory.CreateContentType(2, "contentType2", Enumerable.Empty<string>(), CreatePropertyTypes2);
+            var contentType2 = factory.CreateContentType(Guid.NewGuid(), 2, "contentType2", Enumerable.Empty<string>(), CreatePropertyTypes2);
 
             var prop1 = new SolidPublishedPropertyWithLanguageVariants
             {
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
index 440474ae74..e2a1721d26 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
@@ -7,6 +7,7 @@ using Umbraco.Web;
 using Umbraco.Core;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.Composing;
+using System;
 
 namespace Umbraco.Tests.PublishedContent
 {
@@ -21,9 +22,9 @@ namespace Umbraco.Tests.PublishedContent
                 yield return factory.CreatePropertyType(contentType, "prop1", 1);
             }
 
-            var contentType1 = factory.CreateContentType(1, "ContentType1", Enumerable.Empty<string>(), CreatePropertyTypes);
-            var contentType2 = factory.CreateContentType(2, "ContentType2", Enumerable.Empty<string>(), CreatePropertyTypes);
-            var contentType2Sub = factory.CreateContentType(3, "ContentType2Sub", Enumerable.Empty<string>(), CreatePropertyTypes);
+            var contentType1 = factory.CreateContentType(Guid.NewGuid(), 1, "ContentType1", Enumerable.Empty<string>(), CreatePropertyTypes);
+            var contentType2 = factory.CreateContentType(Guid.NewGuid(), 2, "ContentType2", Enumerable.Empty<string>(), CreatePropertyTypes);
+            var contentType2Sub = factory.CreateContentType(Guid.NewGuid(), 3, "ContentType2Sub", Enumerable.Empty<string>(), CreatePropertyTypes);
 
             var content = new SolidPublishedContent(contentType1)
             {
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
index 59791fc645..7e0d0f332e 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
@@ -13,6 +13,7 @@ using Umbraco.Core.Services;
 using Umbraco.Web;
 using Umbraco.Web.Templates;
 using Umbraco.Web.Models;
+using System;
 
 namespace Umbraco.Tests.PublishedContent
 {
@@ -56,7 +57,7 @@ namespace Umbraco.Tests.PublishedContent
                 yield return publishedContentTypeFactory.CreatePropertyType(contentType, "content", 1);
             }
 
-            var type = new AutoPublishedContentType(0, "anything", CreatePropertyTypes);
+            var type = new AutoPublishedContentType(Guid.NewGuid(), 0, "anything", CreatePropertyTypes);
             ContentTypesCache.GetPublishedContentTypeByAlias = alias => type;
 
             var umbracoContext = GetUmbracoContext("/test");
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
index 998fc92380..cafda161f4 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
@@ -83,8 +83,8 @@ namespace Umbraco.Tests.PublishedContent
             }
 
             var compositionAliases = new[] { "MyCompositionAlias" };
-            var anythingType = new AutoPublishedContentType(0, "anything", compositionAliases, CreatePropertyTypes);
-            var homeType = new AutoPublishedContentType(0, "home", compositionAliases, CreatePropertyTypes);
+            var anythingType = new AutoPublishedContentType(Guid.NewGuid(), 0, "anything", compositionAliases, CreatePropertyTypes);
+            var homeType = new AutoPublishedContentType(Guid.NewGuid(), 0, "home", compositionAliases, CreatePropertyTypes);
             ContentTypesCache.GetPublishedContentTypeByAlias = alias => alias.InvariantEquals("home") ? homeType : anythingType;
         }
 
@@ -398,8 +398,8 @@ namespace Umbraco.Tests.PublishedContent
         [Test]
         public void Children_GroupBy_DocumentTypeAlias()
         {
-            var home = new AutoPublishedContentType(22, "Home", new PublishedPropertyType[] { });
-            var custom = new AutoPublishedContentType(23, "CustomDocument", new PublishedPropertyType[] { });
+            var home = new AutoPublishedContentType(Guid.NewGuid(), 22, "Home", new PublishedPropertyType[] { });
+            var custom = new AutoPublishedContentType(Guid.NewGuid(), 23, "CustomDocument", new PublishedPropertyType[] { });
             var contentTypes = new Dictionary<string, PublishedContentType>
             {
                 { home.Alias, home },
@@ -419,8 +419,8 @@ namespace Umbraco.Tests.PublishedContent
         [Test]
         public void Children_Where_DocumentTypeAlias()
         {
-            var home = new AutoPublishedContentType(22, "Home", new PublishedPropertyType[] { });
-            var custom = new AutoPublishedContentType(23, "CustomDocument", new PublishedPropertyType[] { });
+            var home = new AutoPublishedContentType(Guid.NewGuid(), 22, "Home", new PublishedPropertyType[] { });
+            var custom = new AutoPublishedContentType(Guid.NewGuid(), 23, "CustomDocument", new PublishedPropertyType[] { });
             var contentTypes = new Dictionary<string, PublishedContentType>
             {
                 { home.Alias, home },
@@ -903,7 +903,7 @@ namespace Umbraco.Tests.PublishedContent
                 yield return factory.CreatePropertyType(contentType, "detached", 1003);
             }
 
-            var ct = factory.CreateContentType(0, "alias", CreatePropertyTypes);
+            var ct = factory.CreateContentType(Guid.NewGuid(), 0, "alias", CreatePropertyTypes);
             var pt = ct.GetPropertyType("detached");
             var prop = new PublishedElementPropertyBase(pt, null, false, PropertyCacheLevel.None, 5548);
             Assert.IsInstanceOf<int>(prop.GetValue());
@@ -935,7 +935,7 @@ namespace Umbraco.Tests.PublishedContent
 
             var guid = Guid.NewGuid();
 
-            var ct = factory.CreateContentType(0, "alias", CreatePropertyTypes);
+            var ct = factory.CreateContentType(Guid.NewGuid(), 0, "alias", CreatePropertyTypes);
 
             var c = new ImageWithLegendModel(ct, guid, new Dictionary<string, object>
             {
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs
index d8dbabb569..4a93fadbdf 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs
@@ -66,7 +66,7 @@ namespace Umbraco.Tests.PublishedContent
             pc.Setup(content => content.Path).Returns("-1,1");
             pc.Setup(content => content.Parent).Returns(() => null);
             pc.Setup(content => content.Properties).Returns(new Collection<IPublishedProperty>());
-            pc.Setup(content => content.ContentType).Returns(new PublishedContentType(22, "anything", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing));
+            pc.Setup(content => content.ContentType).Returns(new PublishedContentType(Guid.NewGuid(), 22, "anything", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing));
             return pc;
         }
     }
diff --git a/src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs b/src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
index a7b6d3d18a..4a0af69999 100644
--- a/src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
+++ b/src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Tests.PublishedContent
         { }
     }
 
-    class SolidPublishedContentCache : PublishedCacheBase, IPublishedContentCache, IPublishedMediaCache
+    class SolidPublishedContentCache : PublishedCacheBase, IPublishedContentCache2, IPublishedMediaCache2
     {
         private readonly Dictionary<int, IPublishedContent> _content = new Dictionary<int, IPublishedContent>();
 
@@ -150,6 +150,11 @@ namespace Umbraco.Tests.PublishedContent
             throw new NotImplementedException();
         }
 
+        public override IPublishedContentType GetContentType(Guid key)
+        {
+            throw new NotImplementedException();
+        }
+
         public override IEnumerable<IPublishedContent> GetByContentType(IPublishedContentType contentType)
         {
             throw new NotImplementedException();
@@ -378,7 +383,7 @@ namespace Umbraco.Tests.PublishedContent
         #endregion
     }
 
-    class PublishedContentStrong1 : PublishedContentModel
+    internal class PublishedContentStrong1 : PublishedContentModel
     {
         public PublishedContentStrong1(IPublishedContent content)
             : base(content)
@@ -387,7 +392,7 @@ namespace Umbraco.Tests.PublishedContent
         public int StrongValue => this.Value<int>("strongValue");
     }
 
-    class PublishedContentStrong1Sub : PublishedContentStrong1
+    internal class PublishedContentStrong1Sub : PublishedContentStrong1
     {
         public PublishedContentStrong1Sub(IPublishedContent content)
             : base(content)
@@ -396,7 +401,7 @@ namespace Umbraco.Tests.PublishedContent
         public int AnotherValue => this.Value<int>("anotherValue");
     }
 
-    class PublishedContentStrong2 : PublishedContentModel
+    internal class PublishedContentStrong2 : PublishedContentModel
     {
         public PublishedContentStrong2(IPublishedContent content)
             : base(content)
@@ -405,7 +410,7 @@ namespace Umbraco.Tests.PublishedContent
         public int StrongValue => this.Value<int>("strongValue");
     }
 
-    class AutoPublishedContentType : PublishedContentType
+    internal class AutoPublishedContentType : PublishedContentType
     {
         private static readonly IPublishedPropertyType Default;
 
@@ -418,20 +423,20 @@ namespace Umbraco.Tests.PublishedContent
             Default = factory.CreatePropertyType("*", 666);
         }
 
-        public AutoPublishedContentType(int id, string alias, IEnumerable<PublishedPropertyType> propertyTypes)
-            : base(id, alias, PublishedItemType.Content, Enumerable.Empty<string>(), propertyTypes, ContentVariation.Nothing)
+        public AutoPublishedContentType(Guid key, int id, string alias, IEnumerable<PublishedPropertyType> propertyTypes)
+            : base(key, id, alias, PublishedItemType.Content, Enumerable.Empty<string>(), propertyTypes, ContentVariation.Nothing)
         { }
 
-        public AutoPublishedContentType(int id, string alias, Func<IPublishedContentType, IEnumerable<IPublishedPropertyType>> propertyTypes)
-            : base(id, alias, PublishedItemType.Content, Enumerable.Empty<string>(), propertyTypes, ContentVariation.Nothing)
+        public AutoPublishedContentType(Guid key, int id, string alias, Func<IPublishedContentType, IEnumerable<IPublishedPropertyType>> propertyTypes)
+            : base(key, id, alias, PublishedItemType.Content, Enumerable.Empty<string>(), propertyTypes, ContentVariation.Nothing)
         { }
 
-        public AutoPublishedContentType(int id, string alias, IEnumerable<string> compositionAliases, IEnumerable<PublishedPropertyType> propertyTypes)
-            : base(id, alias, PublishedItemType.Content, compositionAliases, propertyTypes, ContentVariation.Nothing)
+        public AutoPublishedContentType(Guid key, int id, string alias, IEnumerable<string> compositionAliases, IEnumerable<PublishedPropertyType> propertyTypes)
+            : base(key, id, alias, PublishedItemType.Content, compositionAliases, propertyTypes, ContentVariation.Nothing)
         { }
 
-        public AutoPublishedContentType(int id, string alias, IEnumerable<string> compositionAliases, Func<IPublishedContentType, IEnumerable<IPublishedPropertyType>> propertyTypes)
-            : base(id, alias, PublishedItemType.Content, compositionAliases, propertyTypes, ContentVariation.Nothing)
+        public AutoPublishedContentType(Guid key, int id, string alias, IEnumerable<string> compositionAliases, Func<IPublishedContentType, IEnumerable<IPublishedPropertyType>> propertyTypes)
+            : base(key, id, alias, PublishedItemType.Content, compositionAliases, propertyTypes, ContentVariation.Nothing)
         { }
 
         public override IPublishedPropertyType GetPropertyType(string alias)
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs
index 2aa01916fb..25d3eda081 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByAliasTests.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
@@ -27,7 +28,7 @@ namespace Umbraco.Tests.Routing
                     Mock.Of<IPublishedModelFactory>(),
                     Mock.Of<IPublishedContentTypeFactory>()), 
             };
-            _publishedContentType = new PublishedContentType(0, "Doc", PublishedItemType.Content, Enumerable.Empty<string>(), properties, ContentVariation.Nothing);
+            _publishedContentType = new PublishedContentType(Guid.NewGuid(), 0, "Doc", PublishedItemType.Content, Enumerable.Empty<string>(), properties, ContentVariation.Nothing);
         }
 
         protected override PublishedContentType GetPublishedContentTypeByAlias(string alias)
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByAliasWithDomainsTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByAliasWithDomainsTests.cs
index 0c1f89f430..18fe268a9a 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByAliasWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByAliasWithDomainsTests.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
@@ -25,7 +26,7 @@ namespace Umbraco.Tests.Routing
                     Mock.Of<IPublishedModelFactory>(),
                     Mock.Of<IPublishedContentTypeFactory>()), 
             };
-            _publishedContentType = new PublishedContentType(0, "Doc", PublishedItemType.Content, Enumerable.Empty<string>(), properties, ContentVariation.Nothing);
+            _publishedContentType = new PublishedContentType(Guid.NewGuid(), 0, "Doc", PublishedItemType.Content, Enumerable.Empty<string>(), properties, ContentVariation.Nothing);
         }
 
         protected override PublishedContentType GetPublishedContentTypeByAlias(string alias)
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs
index 85168e4490..18bb6bdfb5 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Tests.Routing
         [TestCase("/home/sub1", -1)] // should fail
 
         // these two are special. getNiceUrl(1046) returns "/" but getNiceUrl(1172) cannot also return "/" so
-        // we've made it return "/test-page" => we have to support that url back in the lookup...
+        // we've made it return "/test-page" => we have to support that URL back in the lookup...
         [TestCase("/home", 1046)]
         [TestCase("/test-page", 1172)]
         public void Match_Document_By_Url_Hide_Top_Level(string urlString, int expectedId)
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs
index ac2e62b1ef..18eafe508e 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs
@@ -134,7 +134,7 @@ namespace Umbraco.Tests.Routing
             var publishedRouter = CreatePublishedRouter(Factory);
             var frequest = publishedRouter.CreateRequest(umbracoContext);
 
-            // must lookup domain else lookup by url fails
+            // must lookup domain else lookup by URL fails
             publishedRouter.FindDomain(frequest);
 
             var lookup = new ContentFinderByUrl(Logger);
@@ -176,7 +176,7 @@ namespace Umbraco.Tests.Routing
             var publishedRouter = CreatePublishedRouter(Factory);
             var frequest = publishedRouter.CreateRequest(umbracoContext);
 
-            // must lookup domain else lookup by url fails
+            // must lookup domain else lookup by URL fails
             publishedRouter.FindDomain(frequest);
             Assert.AreEqual(expectedCulture, frequest.Culture.Name);
 
diff --git a/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs b/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
index 2f960d498d..3a1ff36a0a 100644
--- a/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
@@ -139,7 +139,7 @@ namespace Umbraco.Tests.Routing
             property.SetSourceValue("en", enMediaUrl, true);
             property.SetSourceValue("da", daMediaUrl);
 
-            var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), new [] { umbracoFilePropertyType }, ContentVariation.Culture);
+            var contentType = new PublishedContentType(Guid.NewGuid(), 666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), new [] { umbracoFilePropertyType }, ContentVariation.Culture);
             var publishedContent = new SolidPublishedContent(contentType) {Properties = new[] {property}};
 
             var resolvedUrl = umbracoContext.UrlProvider.GetMediaUrl(publishedContent, UrlMode.Auto, "da");
@@ -150,7 +150,7 @@ namespace Umbraco.Tests.Routing
         {
             var umbracoFilePropertyType = CreatePropertyType(propertyEditorAlias, dataTypeConfiguration, ContentVariation.Nothing);
 
-            var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(),
+            var contentType = new PublishedContentType(Guid.NewGuid(), 666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(),
                 new[] {umbracoFilePropertyType}, ContentVariation.Nothing);
 
             return new SolidPublishedContent(contentType)
diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 135172460d..786eebea9f 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -140,7 +140,7 @@ namespace Umbraco.Tests.Routing
             frequest.TemplateModel = template;
 
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var type = new AutoPublishedContentType(22, "CustomDocument", new PublishedPropertyType[] { });
+            var type = new AutoPublishedContentType(Guid.NewGuid(), 22, "CustomDocument", new PublishedPropertyType[] { });
             ContentTypesCache.GetPublishedContentTypeByAlias = alias => type;
 
             var handler = new RenderRouteHandler(umbracoContext, new TestControllerFactory(umbracoContextAccessor, Mock.Of<ILogger>(), context =>
diff --git a/src/Umbraco.Tests/Routing/RouteTestExtensions.cs b/src/Umbraco.Tests/Routing/RouteTestExtensions.cs
index fae8e2a6fa..642488c256 100644
--- a/src/Umbraco.Tests/Routing/RouteTestExtensions.cs
+++ b/src/Umbraco.Tests/Routing/RouteTestExtensions.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Tests.Routing
     {
 
         /// <summary>
-        /// Return the route data for the url based on a mocked context
+        /// Return the route data for the URL based on a mocked context
         /// </summary>
         /// <param name="routes"></param>
         /// <param name="requestUrl"></param>
@@ -21,7 +21,7 @@ namespace Umbraco.Tests.Routing
         }
 
         /// <summary>
-        /// Get the route data based on the url and http context
+        /// Get the route data based on the URL and HTTP context
         /// </summary>
         /// <param name="routes"></param>
         /// <param name="httpContext"></param>
diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index e95fdfc87c..94660d40cf 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -100,7 +100,7 @@ namespace Umbraco.Tests.Routing
         [Test]
         public void Is_Client_Side_Request_InvalidPath_ReturnFalse()
         {
-            //This url is invalid. Default to false when the extension cannot be determined
+            //This URL is invalid. Default to false when the extension cannot be determined
             var uri = new Uri("http://test.com/installing-modules+foobar+\"yipee\"");
             var result = uri.IsClientSideRequest();
             Assert.AreEqual(false, result);
diff --git a/src/Umbraco.Tests/Routing/UrlProviderTests.cs b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
index 02aa95cd2e..d61517b41e 100644
--- a/src/Umbraco.Tests/Routing/UrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
@@ -158,7 +158,7 @@ namespace Umbraco.Tests.Routing
             var umbracoSettings = Current.Configs.Settings();
 
 
-            var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
+            var contentType = new PublishedContentType(Guid.NewGuid(), 666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
             var publishedContent = new SolidPublishedContent(contentType) { Id = 1234 };
 
             var publishedContentCache = new Mock<IPublishedContentCache>();
@@ -184,7 +184,7 @@ namespace Umbraco.Tests.Routing
                 globalSettings: globalSettings.Object,
                 snapshotService: snapshotService.Object);
 
-            //even though we are asking for a specific culture URL, there are no domains assigned so all that can be returned is a normal relative url.
+            //even though we are asking for a specific culture URL, there are no domains assigned so all that can be returned is a normal relative URL.
             var url = umbracoContext.UrlProvider.GetUrl(1234, culture: "fr-FR");
 
             Assert.AreEqual("/home/test-fr/", url);
@@ -203,7 +203,7 @@ namespace Umbraco.Tests.Routing
 
             var umbracoSettings = Current.Configs.Settings();
 
-            var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
+            var contentType = new PublishedContentType(Guid.NewGuid(), 666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
             var publishedContent = new SolidPublishedContent(contentType) { Id = 1234 };
 
             var publishedContentCache = new Mock<IPublishedContentCache>();
@@ -257,7 +257,7 @@ namespace Umbraco.Tests.Routing
 
             var umbracoSettings = Current.Configs.Settings();
 
-            var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
+            var contentType = new PublishedContentType(Guid.NewGuid(), 666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
             var publishedContent = new SolidPublishedContent(contentType) { Id = 1234 };
 
             var publishedContentCache = new Mock<IPublishedContentCache>();
diff --git a/src/Umbraco.Tests/Routing/UrlRoutesTests.cs b/src/Umbraco.Tests/Routing/UrlRoutesTests.cs
index 4b8d708df6..724a263b54 100644
--- a/src/Umbraco.Tests/Routing/UrlRoutesTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlRoutesTests.cs
@@ -12,7 +12,7 @@ using Umbraco.Tests.Testing;
 namespace Umbraco.Tests.Routing
 {
     // purpose: test the values returned by PublishedContentCache.GetRouteById
-    // and .GetByRoute (no caching at all, just routing nice urls) including all
+    // and .GetByRoute (no caching at all, just routing nice URLs) including all
     // the quirks due to hideTopLevelFromPath and backward compatibility.
 
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
@@ -146,7 +146,7 @@ DetermineRouteById(id):
 
     node = node(id)
 
-    walk up from node to domain or root, assemble parts = url segments
+    walk up from node to domain or root, assemble parts = URL segments
 
     if !domain and global.hide:
         if id.parent:
diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
index 6587b2e4f6..363f87395d 100644
--- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
+++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Tests.Routing
     [TestFixture]
     public class UrlsWithNestedDomains : UrlRoutingTestBase
     {
-        // in the case of nested domains more than 1 url may resolve to a document
+        // in the case of nested domains more than 1 URL may resolve to a document
         // but only one route can be cached - the 'canonical' route ie the route
         // using the closest domain to the node - here we test that if we request
         // a non-canonical route, it is not cached / the cache is not polluted
@@ -40,7 +40,7 @@ namespace Umbraco.Tests.Routing
 
             const string url = "http://domain1.com/1001-1/1001-1-1";
 
-            // get the nice url for 100111
+            // get the nice URL for 100111
             var umbracoContext = GetUmbracoContext(url, 9999, umbracoSettings: settings, urlProviders: new []
             {
                 new DefaultUrlProvider(settings.RequestHandler, Logger, globalSettings.Object, new SiteDomainHelper())
@@ -53,7 +53,7 @@ namespace Umbraco.Tests.Routing
             var cachedRoutes = cache.RoutesCache.GetCachedRoutes();
             Assert.AreEqual("10011/1001-1-1", cachedRoutes[100111]);
 
-            // route a rogue url
+            // route a rogue URL
             var publishedRouter = CreatePublishedRouter();
             var frequest = publishedRouter.CreateRequest(umbracoContext);
 
@@ -71,7 +71,7 @@ namespace Umbraco.Tests.Routing
             Assert.AreEqual("10011/1001-1-1", cachedRoutes[100111]); // no
             //Assert.AreEqual("1001/1001-1/1001-1-1", cachedRoutes[100111]); // yes
 
-            // what's the nice url now?
+            // what's the nice URL now?
             Assert.AreEqual("http://domain2.com/1001-1-1/", umbracoContext.UrlProvider.GetUrl(100111)); // good
             //Assert.AreEqual("http://domain1.com/1001-1/1001-1-1", routingContext.NiceUrlProvider.GetNiceUrl(100111, true)); // bad
         }
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index 5850153100..3a99fbb0de 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -82,14 +82,18 @@ namespace Umbraco.Tests.Runtimes
 
             protected override IRuntime GetRuntime()
             {
-                return Runtime = new TestRuntime();
+                var logger = new DebugDiagnosticsLogger();
+                return Runtime = new TestRuntime(logger, new MainDom(logger, new MainDomSemaphoreLock(logger)));
             }
         }
 
         // test runtime
         public class TestRuntime : CoreRuntime
         {
-            protected override ILogger GetLogger() => new DebugDiagnosticsLogger();
+            public TestRuntime(ILogger logger, IMainDom mainDom) : base(logger, mainDom)
+            {
+            }
+
             protected override IProfiler GetProfiler() => new TestProfiler();
 
             // must override the database factory
@@ -102,6 +106,13 @@ namespace Umbraco.Tests.Runtimes
                 return mock.Object;
             }
 
+            internal override void DetermineRuntimeLevel(IUmbracoDatabaseFactory databaseFactory, IProfilingLogger profilingLogger)
+            {
+                // mega hack to make it boot up without DB access.
+                var state = (RuntimeState)State;
+                state.Level = RuntimeLevel.Boot;
+            }
+
             protected override Configs GetConfigs()
             {
                 var configs = new Configs();
@@ -142,6 +153,8 @@ namespace Umbraco.Tests.Runtimes
 
             private IMainDom _mainDom;
 
+            
+
             public override IFactory Boot(IRegister container)
             {
                 var factory = base.Boot(container);
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index 9157a76773..b2ceabf905 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -75,7 +75,7 @@ namespace Umbraco.Tests.Runtimes
             coreRuntime.Compose(composition);
 
             // determine actual runtime level
-            runtimeState.DetermineRuntimeLevel(databaseFactory, logger);
+            runtimeState.DetermineRuntimeLevel(databaseFactory);
             Console.WriteLine(runtimeState.Level);
             // going to be Install BUT we want to force components to be there (nucache etc)
             runtimeState.Level = RuntimeLevel.Run;
@@ -201,7 +201,7 @@ namespace Umbraco.Tests.Runtimes
             Assert.AreEqual("test", pcontent.Name());
             Assert.IsTrue(pcontent.IsDraft());
 
-            // no published url
+            // no published URL
             Assert.AreEqual("#", pcontent.Url());
 
             // now publish the document + make some unpublished changes
@@ -215,7 +215,7 @@ namespace Umbraco.Tests.Runtimes
             Assert.AreEqual("test", pcontent.Name());
             Assert.IsFalse(pcontent.IsDraft());
 
-            // but the url is the published one - no draft url
+            // but the URL is the published one - no draft URL
             Assert.AreEqual("/test/", pcontent.Url());
 
             // and also an updated draft document
@@ -224,7 +224,7 @@ namespace Umbraco.Tests.Runtimes
             Assert.AreEqual("testx", pcontent.Name());
             Assert.IsTrue(pcontent.IsDraft());
 
-            // and the published document has a url
+            // and the published document has a URL
             Assert.AreEqual("/test/", pcontent.Url());
 
             umbracoContextReference.Dispose();
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index 5f72947382..be10db3a9d 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -82,7 +82,7 @@ namespace Umbraco.Tests.Scoping
             var mediaRepository = Mock.Of<IMediaRepository>();
             var memberRepository = Mock.Of<IMemberRepository>();
 
-            var nestedContentDataSerializer = new JsonContentNestedDataSerializer();
+            var nestedContentDataSerializerFactory = new JsonContentNestedDataSerializerFactory();
             return new PublishedSnapshotService(
                 options,
                 null,
@@ -96,12 +96,12 @@ namespace Umbraco.Tests.Scoping
                 ScopeProvider,
                 documentRepository, mediaRepository, memberRepository,
                 DefaultCultureAccessor,
-                new DatabaseDataSource(nestedContentDataSerializer),
+                new DatabaseDataSource(nestedContentDataSerializerFactory),
                 Factory.GetInstance<IGlobalSettings>(),
                 Factory.GetInstance<IEntityXmlSerializer>(),
                 Mock.Of<IPublishedModelFactory>(),
                 new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }),
-                nestedContentDataSerializer);
+                nestedContentDataSerializerFactory);
         }
 
         protected UmbracoContext GetUmbracoContextNu(string url, int templateId = 1234, RouteData routeData = null, bool setSingleton = false, IUmbracoSettingsSection umbracoSettings = null, IEnumerable<IUrlProvider> urlProviders = null)
diff --git a/src/Umbraco.Tests/Serialization/AutoInterningStringConverterTests.cs b/src/Umbraco.Tests/Serialization/AutoInterningStringConverterTests.cs
index bf99b68077..f83ea940c9 100644
--- a/src/Umbraco.Tests/Serialization/AutoInterningStringConverterTests.cs
+++ b/src/Umbraco.Tests/Serialization/AutoInterningStringConverterTests.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Tests.Serialization
             var str1 = "Hello";
             var obj = new Test
             {
-                Name = str1 + " " + "there"
+                Name = str1 + Guid.NewGuid()
             };
 
             // ensure the raw value is not interned
@@ -39,8 +39,8 @@ namespace Umbraco.Tests.Serialization
             {
                 Values = new Dictionary<string, int>
                 {
-                    [str1 + "1"] = 0,
-                    [str1 + "2"] = 1
+                    [str1 + Guid.NewGuid()] = 0,
+                    [str1 + Guid.NewGuid()] = 1
                 }
             };
 
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 553d1b97ba..008c24fcbf 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -343,7 +343,7 @@ namespace Umbraco.Tests.Services
             }
 
             // Assert
-            Assert.AreEqual(24, contentService.Count());
+            Assert.AreEqual(25, contentService.Count());
         }
 
         [Test]
@@ -1197,7 +1197,7 @@ namespace Umbraco.Tests.Services
             Assert.IsFalse(content.HasIdentity);
 
             // content cannot publish values because they are invalid
-            var propertyValidationService = new PropertyValidationService(Factory.GetInstance<PropertyEditorCollection>(), ServiceContext.DataTypeService);
+            var propertyValidationService = new PropertyValidationService(Factory.GetInstance<PropertyEditorCollection>(), ServiceContext.DataTypeService, ServiceContext.TextService);
             var isValid = propertyValidationService.IsPropertyDataValid(content, out var invalidProperties, CultureImpact.Invariant);
             Assert.IsFalse(isValid);
             Assert.IsNotEmpty(invalidProperties);
@@ -1415,7 +1415,7 @@ namespace Umbraco.Tests.Services
         {
             // Arrange
             var contentService = ServiceContext.ContentService;
-            var content = contentService.GetById(NodeDto.NodeIdSeed + 5);
+            var content = contentService.GetById(NodeDto.NodeIdSeed + 6);
 
             // Act
             var published = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
@@ -1537,6 +1537,53 @@ namespace Umbraco.Tests.Services
             Assert.That(content.HasIdentity, Is.True);
         }
 
+        [Test]
+        public void Can_Update_Content_Property_Values()
+        {
+            IContentType contentType = MockedContentTypes.CreateSimpleContentType();
+            ServiceContext.ContentTypeService.Save(contentType);
+            IContent content = MockedContent.CreateSimpleContent(contentType, "hello");
+            content.SetValue("title", "title of mine");
+            content.SetValue("bodyText", "hello world");
+            ServiceContext.ContentService.SaveAndPublish(content);
+
+            // re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+            content.SetValue("title", "another title of mine");          // Change a value
+            content.SetValue("bodyText", null);                          // Clear a value
+            content.SetValue("author", "new author");                    // Add a value
+            ServiceContext.ContentService.SaveAndPublish(content);
+
+            // re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+            Assert.AreEqual("another title of mine", content.GetValue("title"));
+            Assert.IsNull(content.GetValue("bodyText"));
+            Assert.AreEqual("new author", content.GetValue("author"));
+
+            content.SetValue("title", "new title");
+            content.SetValue("bodyText", "new body text");
+            content.SetValue("author", "new author text");
+            ServiceContext.ContentService.Save(content);                // new non-published version
+
+            // re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+            content.SetValue("title", null);                            // Clear a value
+            content.SetValue("bodyText", null);                         // Clear a value
+            ServiceContext.ContentService.Save(content);                // saving non-published version
+
+            // re-get
+            content = ServiceContext.ContentService.GetById(content.Id);
+            Assert.IsNull(content.GetValue("title"));                   // Test clearing the value worked with the non-published version
+            Assert.IsNull(content.GetValue("bodyText"));
+            Assert.AreEqual("new author text", content.GetValue("author"));
+
+            // make sure that the published version remained the same
+            var publishedContent = ServiceContext.ContentService.GetVersion(content.PublishedVersionId);
+            Assert.AreEqual("another title of mine", publishedContent.GetValue("title"));
+            Assert.IsNull(publishedContent.GetValue("bodyText"));
+            Assert.AreEqual("new author", publishedContent.GetValue("author"));
+        }
+
         [Test]
         public void Can_Bulk_Save_Content()
         {
@@ -1640,7 +1687,7 @@ namespace Umbraco.Tests.Services
 
             Assert.AreNotEqual(-20, content.ParentId);
             Assert.IsFalse(content.Trashed);
-            Assert.AreEqual(3, descendants.Count);
+            Assert.AreEqual(4, descendants.Count);
             Assert.IsFalse(descendants.Any(x => x.Path.StartsWith("-1,-20,")));
             Assert.IsFalse(descendants.Any(x => x.Trashed));
 
@@ -1653,7 +1700,7 @@ namespace Umbraco.Tests.Services
 
             Assert.AreEqual(-20, content.ParentId);
             Assert.IsTrue(content.Trashed);
-            Assert.AreEqual(3, descendants.Count);
+            Assert.AreEqual(4, descendants.Count);
             Assert.IsTrue(descendants.All(x => x.Path.StartsWith("-1,-20,")));
             Assert.True(descendants.All(x => x.Trashed));
 
@@ -1940,7 +1987,7 @@ namespace Umbraco.Tests.Services
             var contentService = ServiceContext.ContentService;
             var temp = contentService.GetById(NodeDto.NodeIdSeed + 2);
             Assert.AreEqual("Home", temp.Name);
-            Assert.AreEqual(2, contentService.CountChildren(temp.Id));
+            Assert.AreEqual(3, contentService.CountChildren(temp.Id));
 
             // Act
             var copy = contentService.Copy(temp, temp.ParentId, false, true, Constants.Security.SuperUserId);
@@ -1950,7 +1997,7 @@ namespace Umbraco.Tests.Services
             Assert.That(copy, Is.Not.Null);
             Assert.That(copy.Id, Is.Not.EqualTo(content.Id));
             Assert.AreNotSame(content, copy);
-            Assert.AreEqual(2, contentService.CountChildren(copy.Id));
+            Assert.AreEqual(3, contentService.CountChildren(copy.Id));
 
             var child = contentService.GetById(NodeDto.NodeIdSeed + 3);
             var childCopy = contentService.GetPagedChildren(copy.Id, 0, 500, out var total).First();
@@ -1966,7 +2013,7 @@ namespace Umbraco.Tests.Services
             var contentService = ServiceContext.ContentService;
             var temp = contentService.GetById(NodeDto.NodeIdSeed + 2);
             Assert.AreEqual("Home", temp.Name);
-            Assert.AreEqual(2, contentService.CountChildren(temp.Id));
+            Assert.AreEqual(3, contentService.CountChildren(temp.Id));
 
             // Act
             var copy = contentService.Copy(temp, temp.ParentId, false, false, Constants.Security.SuperUserId);
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 938b14c3a9..aaad60f7e9 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -53,7 +53,7 @@ namespace Umbraco.Tests.Services
             var mediaRepository = Mock.Of<IMediaRepository>();
             var memberRepository = Mock.Of<IMemberRepository>();
 
-            var nestedContentDataSerializer = new JsonContentNestedDataSerializer();
+            var nestedContentDataSerializerFactory = new JsonContentNestedDataSerializerFactory();
 
             return new PublishedSnapshotService(
                 options,
@@ -68,12 +68,12 @@ namespace Umbraco.Tests.Services
                 ScopeProvider,
                 documentRepository, mediaRepository, memberRepository,
                 DefaultCultureAccessor,
-                new DatabaseDataSource(nestedContentDataSerializer),
+                new DatabaseDataSource(nestedContentDataSerializerFactory),
                 Factory.GetInstance<IGlobalSettings>(),
                 Factory.GetInstance<IEntityXmlSerializer>(),
                 Mock.Of<IPublishedModelFactory>(),
                 new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }),
-                nestedContentDataSerializer);
+                nestedContentDataSerializerFactory);
         }
 
         public class LocalServerMessenger : ServerMessengerBase
diff --git a/src/Umbraco.Tests/Services/EntityServiceTests.cs b/src/Umbraco.Tests/Services/EntityServiceTests.cs
index 0598b8cea2..4b83407e63 100644
--- a/src/Umbraco.Tests/Services/EntityServiceTests.cs
+++ b/src/Umbraco.Tests/Services/EntityServiceTests.cs
@@ -8,12 +8,12 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Services;
-using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
 
 namespace Umbraco.Tests.Services
 {
+
     /// <summary>
     /// Tests covering the EntityService
     /// </summary>
@@ -477,7 +477,7 @@ namespace Umbraco.Tests.Services
             var entities = service.GetAll(UmbracoObjectTypes.Document).ToArray();
 
             Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Length, Is.EqualTo(4));
+            Assert.That(entities.Length, Is.EqualTo(5));
             Assert.That(entities.Any(x => x.Trashed), Is.True);
         }
 
@@ -490,7 +490,7 @@ namespace Umbraco.Tests.Services
             var entities = service.GetAll(objectTypeId).ToArray();
 
             Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Length, Is.EqualTo(4));
+            Assert.That(entities.Length, Is.EqualTo(5));
             Assert.That(entities.Any(x => x.Trashed), Is.True);
         }
 
@@ -502,7 +502,7 @@ namespace Umbraco.Tests.Services
             var entities = service.GetAll<IContent>().ToArray();
 
             Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Length, Is.EqualTo(4));
+            Assert.That(entities.Length, Is.EqualTo(5));
             Assert.That(entities.Any(x => x.Trashed), Is.True);
         }
 
diff --git a/src/Umbraco.Tests/Services/ExternalLoginServiceTests.cs b/src/Umbraco.Tests/Services/ExternalLoginServiceTests.cs
new file mode 100644
index 0000000000..8a31518ca0
--- /dev/null
+++ b/src/Umbraco.Tests/Services/ExternalLoginServiceTests.cs
@@ -0,0 +1,249 @@
+using System;
+using System.Linq;
+using System.Threading;
+using Microsoft.AspNet.Identity;
+using NUnit.Framework;
+using Umbraco.Core.Models.Identity;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Persistence.Dtos;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.Testing;
+
+namespace Umbraco.Tests.Services
+{
+    [TestFixture]
+    [Apartment(ApartmentState.STA)]
+    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
+    public class ExternalLoginServiceTests : TestWithDatabaseBase
+    {
+        [Test]
+        public void Removes_Existing_Duplicates_On_Save()
+        {
+            var user = new User("Test", "test@test.com", "test", "helloworldtest");
+            ServiceContext.UserService.Save(user);
+
+            var providerKey = Guid.NewGuid().ToString("N");
+            var latest = DateTime.Now.AddDays(-1);
+            var oldest = DateTime.Now.AddDays(-10);
+
+            using (var scope = ScopeProvider.CreateScope())
+            {
+                // insert duplicates manuall
+                scope.Database.Insert(new ExternalLoginDto
+                {
+                    UserId = user.Id,
+                    LoginProvider = "test1",
+                    ProviderKey = providerKey,
+                    CreateDate = latest
+                });
+                scope.Database.Insert(new ExternalLoginDto
+                {
+                    UserId = user.Id,
+                    LoginProvider = "test1",
+                    ProviderKey = providerKey,
+                    CreateDate = oldest
+                });
+            }
+
+            // try to save 2 other duplicates
+            var externalLogins = new[]
+            {
+                new ExternalLogin("test2", providerKey),
+                new ExternalLogin("test2", providerKey),
+                new ExternalLogin("test1", providerKey)
+            };
+
+            ServiceContext.ExternalLoginService.Save(user.Id, externalLogins);
+
+            var logins = ServiceContext.ExternalLoginService.GetAll(user.Id).ToList();
+
+            // duplicates will be removed, keeping the latest entries
+            Assert.AreEqual(2, logins.Count);
+
+            var test1 = logins.Single(x => x.LoginProvider == "test1");
+            Assert.Greater(test1.CreateDate, latest);
+        }
+
+        [Test]
+        public void Does_Not_Persist_Duplicates()
+        {
+            var user = new User("Test", "test@test.com", "test", "helloworldtest");
+            ServiceContext.UserService.Save(user);
+
+            var providerKey = Guid.NewGuid().ToString("N");
+            var externalLogins = new[]
+            {
+                new ExternalLogin("test1", providerKey),
+                new ExternalLogin("test1", providerKey)
+            };
+
+            ServiceContext.ExternalLoginService.Save(user.Id, externalLogins);
+
+            var logins = ServiceContext.ExternalLoginService.GetAll(user.Id).ToList();
+            Assert.AreEqual(1, logins.Count);
+        }
+
+        [Test]
+        public void Single_Create()
+        {
+            var user = new User("Test", "test@test.com", "test", "helloworldtest");
+            ServiceContext.UserService.Save(user);
+
+            var extLogin = new IdentityUserLogin("test1", Guid.NewGuid().ToString("N"), user.Id)
+            {
+                UserData = "hello"
+            };
+            ServiceContext.ExternalLoginService.Save(extLogin);
+
+            var found = ServiceContext.ExternalLoginService.GetAll(user.Id);
+
+            Assert.AreEqual(1, found.Count());
+            Assert.IsTrue(extLogin.HasIdentity);
+            Assert.IsTrue(extLogin.Id > 0);
+        }
+
+        [Test]
+        public void Single_Update()
+        {
+            var user = new User("Test", "test@test.com", "test", "helloworldtest");
+            ServiceContext.UserService.Save(user);
+
+            var extLogin = new IdentityUserLogin("test1", Guid.NewGuid().ToString("N"), user.Id)
+            {
+                UserData = "hello"
+            };
+            ServiceContext.ExternalLoginService.Save(extLogin);
+
+            extLogin.UserData = "world";
+            ServiceContext.ExternalLoginService.Save(extLogin);
+
+            var found = ServiceContext.ExternalLoginService.GetAll(user.Id).Cast<IIdentityUserLoginExtended>().ToList();
+            Assert.AreEqual(1, found.Count);
+            Assert.AreEqual("world", found[0].UserData);
+        }
+
+        [Test]
+        public void Multiple_Update()
+        {
+            var user = new User("Test", "test@test.com", "test", "helloworldtest");
+            ServiceContext.UserService.Save(user);
+
+            var providerKey1 = Guid.NewGuid().ToString("N");
+            var providerKey2 = Guid.NewGuid().ToString("N");
+            var extLogins = new[]
+            {
+                new ExternalLogin("test1", providerKey1, "hello"),
+                new ExternalLogin("test2", providerKey2, "world")
+            };
+            ServiceContext.ExternalLoginService.Save(user.Id, extLogins);
+
+            extLogins = new[]
+            {
+                new ExternalLogin("test1", providerKey1, "123456"),
+                new ExternalLogin("test2", providerKey2, "987654")
+            };
+            ServiceContext.ExternalLoginService.Save(user.Id, extLogins);
+
+            var found = ServiceContext.ExternalLoginService.GetAll(user.Id).Cast<IIdentityUserLoginExtended>().OrderBy(x => x.LoginProvider).ToList();
+            Assert.AreEqual(2, found.Count);
+            Assert.AreEqual("123456", found[0].UserData);
+            Assert.AreEqual("987654", found[1].UserData);
+        }
+
+        [Test]
+        public void Can_Find_As_Extended_Type()
+        {
+            var user = new User("Test", "test@test.com", "test", "helloworldtest");
+            ServiceContext.UserService.Save(user);
+
+            var providerKey1 = Guid.NewGuid().ToString("N");
+            var providerKey2 = Guid.NewGuid().ToString("N");
+            var extLogins = new[]
+            {
+                new ExternalLogin("test1", providerKey1, "hello"),
+                new ExternalLogin("test2", providerKey2, "world")
+            };
+            ServiceContext.ExternalLoginService.Save(user.Id, extLogins);
+
+            var found = ServiceContext.ExternalLoginService.Find("test2", providerKey2).ToList();
+            Assert.AreEqual(1, found.Count);
+            var asExtended = found.Cast<IIdentityUserLoginExtended>().ToList();
+            Assert.AreEqual(1, found.Count);
+
+        }
+
+        [Test]
+        public void Add_Logins()
+        {
+            var user = new User("Test", "test@test.com", "test", "helloworldtest");
+            ServiceContext.UserService.Save(user);
+
+            var externalLogins = new[]
+            {
+                new ExternalLogin("test1", Guid.NewGuid().ToString("N")),
+                new ExternalLogin("test2", Guid.NewGuid().ToString("N"))
+            };
+
+            ServiceContext.ExternalLoginService.Save(user.Id, externalLogins);
+
+            var logins = ServiceContext.ExternalLoginService.GetAll(user.Id).OrderBy(x => x.LoginProvider).ToList();
+            Assert.AreEqual(2, logins.Count);
+            for (int i = 0; i < logins.Count; i++)
+            {
+                Assert.AreEqual(logins[i].ProviderKey, externalLogins[i].ProviderKey);
+                Assert.AreEqual(logins[i].LoginProvider, externalLogins[i].LoginProvider);
+            }
+        }
+
+        [Test]
+        public void Add_Update_Delete_Logins()
+        {
+            var user = new User("Test", "test@test.com", "test", "helloworldtest");
+            ServiceContext.UserService.Save(user);
+
+            var externalLogins = new[]
+            {
+                new ExternalLogin("test1", Guid.NewGuid().ToString("N")),
+                new ExternalLogin("test2", Guid.NewGuid().ToString("N")),
+                new ExternalLogin("test3", Guid.NewGuid().ToString("N")),
+                new ExternalLogin("test4", Guid.NewGuid().ToString("N"))
+            };
+
+            ServiceContext.ExternalLoginService.Save(user.Id, externalLogins);
+
+            var logins = ServiceContext.ExternalLoginService.GetAll(user.Id).OrderBy(x => x.LoginProvider).ToList();
+
+            logins.RemoveAt(0); // remove the first one
+            logins.Add(new IdentityUserLogin("test5", Guid.NewGuid().ToString("N"), user.Id)); // add a new one
+
+            // save new list
+            ServiceContext.ExternalLoginService.Save(user.Id, logins.Select(x => new ExternalLogin(x.LoginProvider, x.ProviderKey)));
+
+            var updatedLogins = ServiceContext.ExternalLoginService.GetAll(user.Id).OrderBy(x => x.LoginProvider).ToList();
+            Assert.AreEqual(4, updatedLogins.Count);
+            for (int i = 0; i < updatedLogins.Count; i++)
+            {                
+                Assert.AreEqual(logins[i].LoginProvider, updatedLogins[i].LoginProvider);
+            }
+        }
+
+        [Test]
+        public void Add_Retrieve_User_Data()
+        {
+            var user = new User("Test", "test@test.com", "test", "helloworldtest");
+            ServiceContext.UserService.Save(user);
+
+            var externalLogins = new[]
+            {
+                new ExternalLogin("test1", Guid.NewGuid().ToString("N"), "hello world")
+            };
+
+            ServiceContext.ExternalLoginService.Save(user.Id, externalLogins);
+
+            var logins = ServiceContext.ExternalLoginService.GetAll(user.Id).Cast<IIdentityUserLoginExtended>().ToList();
+
+            Assert.AreEqual("hello world", logins[0].UserData);
+
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Services/MediaServiceTests.cs b/src/Umbraco.Tests/Services/MediaServiceTests.cs
index b3dc274c5e..52f26ecb4d 100644
--- a/src/Umbraco.Tests/Services/MediaServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MediaServiceTests.cs
@@ -26,6 +26,30 @@ namespace Umbraco.Tests.Services
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
     public class MediaServiceTests : TestWithSomeContentBase
     {
+        [Test]
+        public void Can_Update_Media_Property_Values()
+        {
+            IMediaType mediaType = MockedContentTypes.CreateSimpleMediaType("test", "Test");
+            ServiceContext.MediaTypeService.Save(mediaType);
+            IMedia media = MockedMedia.CreateSimpleMedia(mediaType, "hello", -1);
+            media.SetValue("title", "title of mine");
+            media.SetValue("bodyText", "hello world");
+            ServiceContext.MediaService.Save(media);
+
+            // re-get
+            media = ServiceContext.MediaService.GetById(media.Id);
+            media.SetValue("title", "another title of mine");          // Change a value
+            media.SetValue("bodyText", null);                          // Clear a value
+            media.SetValue("author", "new author");                    // Add a value
+            ServiceContext.MediaService.Save(media);
+
+            // re-get
+            media = ServiceContext.MediaService.GetById(media.Id);
+            Assert.AreEqual("another title of mine", media.GetValue("title"));
+            Assert.IsNull(media.GetValue("bodyText"));
+            Assert.AreEqual("new author", media.GetValue("author"));
+        }
+
         /// <summary>
         /// Used to list out all ambiguous events that will require dispatching with a name
         /// </summary>
diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs
index 1385bbe0b3..61bc3cf1c1 100644
--- a/src/Umbraco.Tests/Services/MemberServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs
@@ -48,6 +48,65 @@ namespace Umbraco.Tests.Services
             ((MemberService)ServiceContext.MemberService).MembershipProvider = provider;
         }
 
+        [Test]
+        public void Can_Update_Member_Property_Values()
+        {
+            IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
+            ServiceContext.MemberTypeService.Save(memberType);
+            IMember member = MockedMember.CreateSimpleMember(memberType, "hello", "helloworld@test123.com", "hello", "hello");
+            member.SetValue("title", "title of mine");
+            member.SetValue("bodyText", "hello world");
+            ServiceContext.MemberService.Save(member);
+
+            // re-get
+            member = ServiceContext.MemberService.GetById(member.Id);
+            member.SetValue("title", "another title of mine");          // Change a value
+            member.SetValue("bodyText", null);                          // Clear a value
+            member.SetValue("author", "new author");                    // Add a value
+            ServiceContext.MemberService.Save(member);
+
+            // re-get
+            member = ServiceContext.MemberService.GetById(member.Id);
+            Assert.AreEqual("another title of mine", member.GetValue("title"));
+            Assert.IsNull(member.GetValue("bodyText"));
+            Assert.AreEqual("new author", member.GetValue("author"));
+        }
+
+        [Test]
+        public void Can_Get_By_Username()
+        {
+            var memberType = ServiceContext.MemberTypeService.Get("member");
+            IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true);
+            ServiceContext.MemberService.Save(member);
+
+            var member2 = ServiceContext.MemberService.GetByUsername(member.Username);
+
+            Assert.IsNotNull(member2);
+            Assert.AreEqual(member.Email, member2.Email);
+        }
+
+        [Test]
+        public void Can_Set_Last_Login_Date()
+        {
+            var now = DateTime.Now;
+            var memberType = ServiceContext.MemberTypeService.Get("member");
+            IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true)
+            {
+                LastLoginDate = now,
+                UpdateDate = now
+            };
+            ServiceContext.MemberService.Save(member);
+
+            var newDate = now.AddDays(10);
+            ServiceContext.MemberService.SetLastLogin(member.Username, newDate);
+
+            //re-get
+            member = ServiceContext.MemberService.GetById(member.Id);
+
+            Assert.That(member.LastLoginDate, Is.EqualTo(newDate).Within(1).Seconds);
+            Assert.That(member.UpdateDate, Is.EqualTo(newDate).Within(1).Seconds);
+        }
+
         [Test]
         public void Can_Create_Member_With_Properties()
         {
diff --git a/src/Umbraco.Tests/Services/PropertyValidationServiceTests.cs b/src/Umbraco.Tests/Services/PropertyValidationServiceTests.cs
index e1e19918ce..28bdf59373 100644
--- a/src/Umbraco.Tests/Services/PropertyValidationServiceTests.cs
+++ b/src/Umbraco.Tests/Services/PropertyValidationServiceTests.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Tests.Services
 
             var propEditors = new PropertyEditorCollection(new DataEditorCollection(new[] { dataEditor }));
 
-            validationService = new PropertyValidationService(propEditors, dataTypeService.Object);
+            validationService = new PropertyValidationService(propEditors, dataTypeService.Object, Mock.Of<ILocalizedTextService>());
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Services/RedirectUrlServiceTests.cs b/src/Umbraco.Tests/Services/RedirectUrlServiceTests.cs
new file mode 100644
index 0000000000..437de3ac5b
--- /dev/null
+++ b/src/Umbraco.Tests/Services/RedirectUrlServiceTests.cs
@@ -0,0 +1,102 @@
+using Moq;
+using NUnit.Framework;
+using System.Linq;
+using System.Threading;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Repositories.Implement;
+using Umbraco.Core.Scoping;
+using Umbraco.Tests.Testing;
+
+namespace Umbraco.Tests.Services
+{
+    [TestFixture]
+    [Apartment(ApartmentState.STA)]
+    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+    public class RedirectUrlServiceTests : TestWithSomeContentBase
+    {
+        private IContent _firstSubPage;
+        private IContent _secondSubPage;
+        private IContent _thirdSubPage;
+        private readonly string _url = "blah";
+        private readonly string _urlAlt = "alternativeUrl";
+        private readonly string _cultureEnglish = "en";
+        private readonly string _cultureGerman = "de";
+        private readonly string _unusedCulture = "es";
+        public override void CreateTestData()
+        {
+            base.CreateTestData();
+
+            var provider = TestObjects.GetScopeProvider(Logger);
+            using (var scope = provider.CreateScope())
+            {
+                var repository = new RedirectUrlRepository((IScopeAccessor)provider, AppCaches.Disabled, Mock.Of<ILogger>());
+                var rootContent = ServiceContext.ContentService.GetRootContent().FirstOrDefault();
+                var subPages = ServiceContext.ContentService.GetPagedChildren(rootContent.Id, 0, 3, out _).ToList();
+                _firstSubPage = subPages[0];
+                _secondSubPage = subPages[1];
+                _thirdSubPage = subPages[2];
+
+
+
+                repository.Save(new RedirectUrl
+                {
+                    ContentKey = _firstSubPage.Key,
+                    Url = _url,
+                    Culture = _cultureEnglish
+                });
+                Thread.Sleep(1000); //Added delay to ensure timestamp difference as sometimes they seem to have the same timestamp
+                repository.Save(new RedirectUrl
+                {
+                    ContentKey = _secondSubPage.Key,
+                    Url = _url,
+                    Culture = _cultureGerman
+                });
+                Thread.Sleep(1000);
+                repository.Save(new RedirectUrl
+                {
+                    ContentKey = _thirdSubPage.Key,
+                    Url = _urlAlt,
+                    Culture = string.Empty
+                });
+
+                scope.Complete();
+            }
+        }
+
+        [TearDown]
+        public override void TearDown()
+        {
+            base.TearDown();
+        }
+
+        [Test]
+        public void Can_Get_Most_Recent_RedirectUrl()
+        {
+            var redirectUrlService = ServiceContext.RedirectUrlService;
+            var redirect = redirectUrlService.GetMostRecentRedirectUrl(_url);
+            Assert.AreEqual(redirect.ContentId, _secondSubPage.Id);
+
+        }
+
+        [Test]
+        public void Can_Get_Most_Recent_RedirectUrl_With_Culture()
+        {
+            var redirectUrlService = ServiceContext.RedirectUrlService;
+            var redirect = redirectUrlService.GetMostRecentRedirectUrl(_url, _cultureEnglish);
+            Assert.AreEqual(redirect.ContentId, _firstSubPage.Id);
+
+        }
+
+        [Test]
+        public void Can_Get_Most_Recent_RedirectUrl_With_Culture_When_No_CultureVariant_Exists()
+        {
+            var redirectUrlService = ServiceContext.RedirectUrlService;
+            var redirect = redirectUrlService.GetMostRecentRedirectUrl(_urlAlt, _unusedCulture);
+            Assert.AreEqual(redirect.ContentId, _thirdSubPage.Id);
+
+        }
+
+    }
+}
diff --git a/src/Umbraco.Tests/Services/TestWithSomeContentBase.cs b/src/Umbraco.Tests/Services/TestWithSomeContentBase.cs
index 2b313afc5c..6daa16470b 100644
--- a/src/Umbraco.Tests/Services/TestWithSomeContentBase.cs
+++ b/src/Umbraco.Tests/Services/TestWithSomeContentBase.cs
@@ -41,6 +41,9 @@ namespace Umbraco.Tests.Services
             Content subpage2 = MockedContent.CreateSimpleContent(contentType, "Text Page 2", textpage.Id);
             ServiceContext.ContentService.Save(subpage2, 0);
 
+            Content subpage3 = MockedContent.CreateSimpleContent(contentType, "Text Page 3", textpage.Id);
+            ServiceContext.ContentService.Save(subpage3, 0);
+
             //Create and Save Content "Text Page Deleted" based on "umbTextpage" -> 1064
             Content trashed = MockedContent.CreateSimpleContent(contentType, "Text Page Deleted", -20);
             trashed.Trashed = true;
diff --git a/src/Umbraco.Tests/Services/UserServiceTests.cs b/src/Umbraco.Tests/Services/UserServiceTests.cs
index 016085c352..0bac25b297 100644
--- a/src/Umbraco.Tests/Services/UserServiceTests.cs
+++ b/src/Umbraco.Tests/Services/UserServiceTests.cs
@@ -7,6 +7,7 @@ using System.Threading;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Exceptions;
+using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Tests.TestHelpers.Entities;
@@ -968,16 +969,72 @@ namespace Umbraco.Tests.Services
             Assert.That(updatedItem.AllowedSections.Count(), Is.EqualTo(originalUser.AllowedSections.Count()));
         }
 
+        [Test]
+        public void Can_Get_Assigned_StartNodes_For_User()
+        {
+            var startContentItems = BuildContentItems(3);
+
+            var testUserGroup = CreateTestUserGroup();
+
+            var userGroupId = testUserGroup.Id;
+
+            CreateTestUsers(startContentItems.Select(x => x.Id).ToArray(), testUserGroup, 3);
+
+            var usersInGroup = ServiceContext.UserService.GetAllInGroup(userGroupId);
+
+            foreach (var user in usersInGroup)
+                Assert.AreEqual(user.StartContentIds.Length, startContentItems.Length);
+        }
+
+        private Content[] BuildContentItems(int numberToCreate)
+        {
+            var contentType = MockedContentTypes.CreateSimpleContentType();
+
+            ServiceContext.ContentTypeService.Save(contentType);
+
+            var startContentItems = new List<Content>();
+
+            for (var i = 0; i < numberToCreate; i++)
+                startContentItems.Add(MockedContent.CreateSimpleContent(contentType));
+
+            ServiceContext.ContentService.Save(startContentItems);
+
+            return startContentItems.ToArray();
+        }
+
         private IUser CreateTestUser(out IUserGroup userGroup)
         {
             userGroup = CreateTestUserGroup();
 
             var user = ServiceContext.UserService.CreateUserWithIdentity("test1", "test1@test.com");
+
             user.AddGroup(userGroup.ToReadOnlyGroup());
+
             ServiceContext.UserService.Save(user);
+
             return user;
         }
 
+        private List<IUser> CreateTestUsers(int[] startContentIds, IUserGroup userGroup, int numberToCreate)
+        {
+            var users = new List<IUser>();
+
+            for (var i = 0; i < numberToCreate; i++)
+            {
+                var user = ServiceContext.UserService.CreateUserWithIdentity($"test{i}", $"test{i}@test.com");
+                user.AddGroup(userGroup.ToReadOnlyGroup());
+
+                var updateable = (User)user;
+                updateable.StartContentIds = startContentIds;
+
+                ServiceContext.UserService.Save(user);
+
+                users.Add(user);
+            }
+
+            return users;
+        }
+
         private UserGroup CreateTestUserGroup(string alias = "testGroup", string name = "Test Group")
         {
             var userGroup = new UserGroup
diff --git a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs
index 5fd5710a79..b93d79dcf0 100644
--- a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs
+++ b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs
@@ -338,7 +338,7 @@ namespace Umbraco.Tests.Strings
             Assert.AreEqual("house*2", helper.CleanString("house (2)", CleanStringType.Alias));
 
             // FIXME: but for a filename we want to keep them!
-            // FIXME: and what about a url?
+            // FIXME: and what about a URL?
         }
 
         [Test]
@@ -424,7 +424,7 @@ namespace Umbraco.Tests.Strings
             // lower-cased, utf8 filename, removing illegal filename chars, using dash-separator
             Assert.AreEqual("0123-中文测试-中文测试-léger-zôrg-2-a-x", filename, "filename");
 
-            // lower-cased, utf8 url segment, only letters and digits, using dash-separator
+            // lower-cased, utf8 URL segment, only letters and digits, using dash-separator
             Assert.AreEqual("0123-中文测试-中文测试-léger-zôrg-2-a-x", segment, "segment");
         }
 
diff --git a/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs b/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs
index bce9bd4155..59968024d1 100644
--- a/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs
+++ b/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs
@@ -63,9 +63,9 @@ namespace Umbraco.Tests.Templates
         [Test]
         public void Ensure_Image_Sources()
         {
-            //setup a mock url provider which we'll use for testing
+            //setup a mock URL provider which we'll use for testing
 
-            var mediaType = new PublishedContentType(777, "image", PublishedItemType.Media, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
+            var mediaType = new PublishedContentType(Guid.NewGuid(), 777, "image", PublishedItemType.Media, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
             var media = new Mock<IPublishedContent>();
             media.Setup(x => x.ContentType).Returns(mediaType);
             var mediaUrlProvider = new Mock<IMediaUrlProvider>();
diff --git a/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs b/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs
index 7cd96a32ed..f9f82fd31b 100644
--- a/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs
+++ b/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs
@@ -49,17 +49,17 @@ namespace Umbraco.Tests.Templates
         [TestCase("hello href=\"{localLink:umb://document-type/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ", "hello href=\"#\" world ")]
         public void ParseLocalLinks(string input, string result)
         {
-            //setup a mock url provider which we'll use for testing
+            //setup a mock URL provider which we'll use for testing
             var contentUrlProvider = new Mock<IUrlProvider>();
             contentUrlProvider
                 .Setup(x => x.GetUrl(It.IsAny<UmbracoContext>(), It.IsAny<IPublishedContent>(), It.IsAny<UrlMode>(), It.IsAny<string>(), It.IsAny<Uri>()))
                 .Returns(UrlInfo.Url("/my-test-url"));
-            var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
+            var contentType = new PublishedContentType(Guid.NewGuid(), 666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
             var publishedContent = new Mock<IPublishedContent>();
             publishedContent.Setup(x => x.Id).Returns(1234);
             publishedContent.Setup(x => x.ContentType).Returns(contentType);
 
-            var mediaType = new PublishedContentType(777, "image", PublishedItemType.Media, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
+            var mediaType = new PublishedContentType(Guid.NewGuid(), 777, "image", PublishedItemType.Media, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
             var media = new Mock<IPublishedContent>();
             media.Setup(x => x.ContentType).Returns(mediaType);
             var mediaUrlProvider = new Mock<IMediaUrlProvider>();
diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
index f7e3744600..7d8cedc9c6 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Tests.TestHelpers
                 new DataType(new VoidEditor(Mock.Of<ILogger>())) { Id = 1 });
 
             var factory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), new PropertyValueConverterCollection(Array.Empty<IPropertyValueConverter>()), dataTypeService);
-            var type = new AutoPublishedContentType(0, "anything", new PublishedPropertyType[] { });
+            var type = new AutoPublishedContentType(Guid.NewGuid(), 0, "anything", new PublishedPropertyType[] { });
             ContentTypesCache.GetPublishedContentTypeByAlias = alias => GetPublishedContentTypeByAlias(alias) ?? type;
         }
 
diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs b/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
index c55467431d..e3bb012dae 100644
--- a/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
+++ b/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
@@ -41,12 +41,12 @@ namespace Umbraco.Tests.TestHelpers.Entities
                                   };
 
             var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext) { Alias = "title", Name = "Title", Description = "",  Mandatory = false, SortOrder = 1, DataTypeId = -88 });
-            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext) { Alias = "bodyText", Name = "Body Text", Description = "",  Mandatory = false, SortOrder = 2, DataTypeId = -87 });
+            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext) { Alias = "title", Name = "Title", Description = "",  Mandatory = false, SortOrder = 1, DataTypeId = Constants.DataTypes.Textbox, LabelOnTop = true });
+            contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext) { Alias = "bodyText", Name = "Body Text", Description = "",  Mandatory = false, SortOrder = 2, DataTypeId = Constants.DataTypes.RichtextEditor, LabelOnTop = false });
 
             var metaCollection = new PropertyTypeCollection(true);
-            metaCollection.Add(new PropertyType("test", ValueStorageType.Ntext) { Alias = "keywords", Name = "Meta Keywords", Description = "",  Mandatory = false, SortOrder = 1, DataTypeId = -88 });
-            metaCollection.Add(new PropertyType("test", ValueStorageType.Ntext) { Alias = "description", Name = "Meta Description", Description = "",  Mandatory = false, SortOrder = 2, DataTypeId = -89 });
+            metaCollection.Add(new PropertyType("test", ValueStorageType.Ntext) { Alias = "keywords", Name = "Meta Keywords", Description = "",  Mandatory = false, SortOrder = 1, DataTypeId = Constants.DataTypes.Textbox });
+            metaCollection.Add(new PropertyType("test", ValueStorageType.Ntext) { Alias = "description", Name = "Meta Description", Description = "",  Mandatory = false, SortOrder = 2, DataTypeId = Constants.DataTypes.Textarea });
 
             contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
             contentType.PropertyGroups.Add(new PropertyGroup(metaCollection) { Name = "Meta", SortOrder = 2 });
@@ -213,7 +213,7 @@ namespace Umbraco.Tests.TestHelpers.Entities
             contentType.Trashed = false;
 
             var contentCollection = new PropertyTypeCollection(true);
-            contentCollection.Add(new PropertyType(Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext) { Alias = RandomAlias("title", randomizeAliases), Name = "Title", Description = "",  Mandatory = false, SortOrder = 1, DataTypeId = -88 });
+            contentCollection.Add(new PropertyType(Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext) { Alias = RandomAlias("title", randomizeAliases), Name = "Title", Description = "",  Mandatory = false, SortOrder = 1, DataTypeId = -88, LabelOnTop = true });
             contentCollection.Add(new PropertyType(Constants.PropertyEditors.Aliases.TinyMce, ValueStorageType.Ntext) { Alias = RandomAlias("bodyText", randomizeAliases), Name = "Body Text", Description = "",  Mandatory = false, SortOrder = 2, DataTypeId = -87 });
             contentCollection.Add(new PropertyType(Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext) { Alias = RandomAlias("author", randomizeAliases) , Name = "Author", Description = "Name of the author",  Mandatory = false, SortOrder = 3, DataTypeId = -88 });
 
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index 572d572ab7..1121a48823 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -23,7 +23,8 @@ namespace Umbraco.Tests.TestHelpers
                     settings.LocalTempStorageLocation == LocalTempStorage.Default &&
                     settings.LocalTempPath == IOHelper.MapPath("~/App_Data/TEMP") &&
                     settings.ReservedPaths == (GlobalSettings.StaticReservedPaths + "~/umbraco") &&
-                    settings.ReservedUrls == GlobalSettings.StaticReservedUrls);
+                    settings.ReservedUrls == GlobalSettings.StaticReservedUrls &&
+                    settings.SqlWriteLockTimeOut == 1800);
             return config;
         }
 
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index 56ad22d414..cc1cfa6a1d 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -81,7 +81,7 @@ namespace Umbraco.Tests.TestHelpers
         /// <param name="globalSettings"></param>
         /// <param name="umbracoSettings"></param>
         /// <param name="eventMessagesFactory">An event messages factory.</param>
-        /// <param name="urlSegmentProviders">Some url segment providers.</param>
+        /// <param name="urlSegmentProviders">Some URL segment providers.</param>
         /// <param name="typeLoader"></param>
         /// <param name="factory">A container.</param>
         /// <param name="scopeProvider"></param>
@@ -183,7 +183,7 @@ namespace Umbraco.Tests.TestHelpers
                         compiledPackageXmlParser, Mock.Of<IPackageActionRunner>(),
                         new DirectoryInfo(IOHelper.GetRootDirectorySafe())));
             });
-            var relationService = GetLazyService<IRelationService>(factory, c => new RelationService(scopeProvider, logger, eventMessagesFactory, entityService.Value, GetRepo<IRelationRepository>(c), GetRepo<IRelationTypeRepository>(c)));
+            var relationService = GetLazyService<IRelationService>(factory, c => new RelationService(scopeProvider, logger, eventMessagesFactory, entityService.Value, GetRepo<IRelationRepository>(c), GetRepo<IRelationTypeRepository>(c), GetRepo<IAuditRepository>(c)));
             var tagService = GetLazyService<ITagService>(factory, c => new TagService(scopeProvider, logger, eventMessagesFactory, GetRepo<ITagRepository>(c)));
             var redirectUrlService = GetLazyService<IRedirectUrlService>(factory, c => new RedirectUrlService(scopeProvider, logger, eventMessagesFactory, GetRepo<IRedirectUrlRepository>(c)));
             var consentService = GetLazyService<IConsentService>(factory, c => new ConsentService(scopeProvider, logger, eventMessagesFactory, GetRepo<IConsentRepository>(c)));
diff --git a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
index ee91427a63..f53b0bfff0 100644
--- a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
+++ b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
@@ -86,7 +86,7 @@ namespace Umbraco.Tests.Testing.TestingTests
 
             var theUrlProvider = new UrlProvider(umbracoContext, new [] { urlProvider }, Enumerable.Empty<IMediaUrlProvider>(), umbracoContext.VariationContextAccessor);
 
-            var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
+            var contentType = new PublishedContentType(Guid.NewGuid(), 666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
             var publishedContent = Mock.Of<IPublishedContent>();
             Mock.Get(publishedContent).Setup(x => x.ContentType).Returns(contentType);
 
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 5518fb5678..0ec48730ac 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -78,7 +78,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Castle.Core" Version="4.3.1" />
+    <PackageReference Include="Castle.Core" Version="4.4.1" />
     <PackageReference Include="Examine" Version="1.0.2" />
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.14</Version>
@@ -100,7 +100,10 @@
     <PackageReference Include="Microsoft.Owin.Testing" Version="4.0.1" />
     <PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
     <PackageReference Include="MiniProfiler" Version="4.0.138" />
-    <PackageReference Include="Moq" Version="4.14.5" />
+    <PackageReference Include="Moq">
+      <Version>4.14.5</Version>
+    </PackageReference>
+    <PackageReference Include="Moq" Version="4.10.1" />
     <PackageReference Include="NPoco" Version="3.9.4" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
@@ -109,7 +112,6 @@
     <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
     <PackageReference Include="Semver" Version="2.0.4" />
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Cache\DistributedCacheBinderTests.cs" />
@@ -143,10 +145,13 @@
     <Compile Include="Models\ImageProcessorImageUrlGeneratorTest.cs" />
     <Compile Include="Models\PathValidationTests.cs" />
     <Compile Include="Models\PropertyTests.cs" />
+    <Compile Include="Models\RangeTests.cs" />
     <Compile Include="Models\VariationTests.cs" />
     <Compile Include="Persistence\Mappers\MapperTestBase.cs" />
     <Compile Include="Persistence\Repositories\DocumentRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\EntityRepositoryTest.cs" />
+    <Compile Include="PropertyEditors\BlockEditorComponentTests.cs" />
+    <Compile Include="PropertyEditors\BlockListPropertyValueConverterTests.cs" />
     <Compile Include="PropertyEditors\DataValueReferenceFactoryCollectionTests.cs" />
     <Compile Include="PropertyEditors\NestedContentPropertyComponentTests.cs" />
     <Compile Include="PublishedContent\ContentSerializationTests.cs" />
@@ -167,9 +172,11 @@
     <Compile Include="Services\ContentTypeServiceVariantsTests.cs" />
     <Compile Include="Services\EntityXmlSerializerTests.cs" />
     <Compile Include="Packaging\CreatedPackagesRepositoryTests.cs" />
+    <Compile Include="Services\ExternalLoginServiceTests.cs" />
     <Compile Include="Services\MemberGroupServiceTests.cs" />
     <Compile Include="Services\MediaTypeServiceTests.cs" />
     <Compile Include="Services\PropertyValidationServiceTests.cs" />
+    <Compile Include="Services\RedirectUrlServiceTests.cs" />
     <Compile Include="Templates\HtmlLocalLinkParserTests.cs" />
     <Compile Include="TestHelpers\RandomIdRamDirectory.cs" />
     <Compile Include="Testing\Objects\TestDataSource.cs" />
@@ -268,7 +275,7 @@
     <Compile Include="Web\HttpCookieExtensionsTests.cs" />
     <Compile Include="Templates\HtmlImageSourceParserTests.cs" />
     <Compile Include="Web\Mvc\HtmlStringUtilitiesTests.cs" />
-    <Compile Include="Web\ModelStateExtensionsTests.cs" />
+    <Compile Include="Web\Validation\ModelStateExtensionsTests.cs" />
     <Compile Include="Web\Mvc\RenderIndexActionSelectorAttributeTests.cs" />
     <Compile Include="Persistence\NPocoTests\PetaPocoCachesTest.cs" />
     <Compile Include="Persistence\Repositories\AuditRepositoryTest.cs" />
@@ -515,6 +522,7 @@
     <Compile Include="CoreThings\VersionExtensionTests.cs" />
     <Compile Include="Web\TemplateUtilitiesTests.cs" />
     <Compile Include="Web\UrlHelperExtensionTests.cs" />
+    <Compile Include="Web\Validation\ContentModelValidatorTests.cs" />
     <Compile Include="Web\WebExtensionMethodTests.cs" />
     <Compile Include="CoreThings\XmlExtensionsTests.cs" />
     <Compile Include="Misc\XmlHelperTests.cs" />
@@ -639,4 +647,4 @@
     <Message Text="NuGetPackageFolders:   $(NuGetPackageFolders)" Importance="high" />
     <Message Text="NuGetPackages:         $(NuGetPackages)" Importance="high" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
index e9f18d8947..1a288b423c 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
@@ -45,7 +45,7 @@ namespace Umbraco.Tests.UmbracoExamine
         public static ContentIndexPopulator GetContentIndexRebuilder(PropertyEditorCollection propertyEditors, IContentService contentService, IScopeProvider scopeProvider, bool publishedValuesOnly)
         {
             var contentValueSetBuilder = GetContentValueSetBuilder(propertyEditors, scopeProvider, publishedValuesOnly);
-            var contentIndexDataSource = new ContentIndexPopulator(true, null, contentService, scopeProvider.SqlContext, contentValueSetBuilder);
+            var contentIndexDataSource = new ContentIndexPopulator(publishedValuesOnly, null, contentService, scopeProvider.SqlContext, contentValueSetBuilder);
             return contentIndexDataSource;
         }
 
diff --git a/src/Umbraco.Tests/Web/Validation/ContentModelValidatorTests.cs b/src/Umbraco.Tests/Web/Validation/ContentModelValidatorTests.cs
new file mode 100644
index 0000000000..fbb2ce9c80
--- /dev/null
+++ b/src/Umbraco.Tests/Web/Validation/ContentModelValidatorTests.cs
@@ -0,0 +1,369 @@
+using Moq;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.Services;
+using Umbraco.Core.Logging;
+using Umbraco.Web;
+using Umbraco.Web.Editors.Filters;
+using Umbraco.Tests.TestHelpers.Entities;
+using Umbraco.Core.Models;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Editors.Binders;
+using Umbraco.Core;
+using Umbraco.Tests.Testing;
+using Umbraco.Core.Mapping;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Composing;
+using System.Web.Http.ModelBinding;
+using Umbraco.Web.PropertyEditors;
+using System.ComponentModel.DataAnnotations;
+using Umbraco.Tests.TestHelpers;
+using System.Globalization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Web.PropertyEditors.Validation;
+
+namespace Umbraco.Tests.Web.Validation
+{
+    [UmbracoTest(Mapper = true, WithApplication = true, Logger = UmbracoTestOptions.Logger.Console)]
+    [TestFixture]
+    public class ContentModelValidatorTests : UmbracoTestBase
+    {
+        private const int ComplexDataTypeId = 9999;
+        private const string ContentTypeAlias = "textPage";
+        private ContentType _contentType;
+
+        public override void SetUp()
+        {
+            base.SetUp();
+
+            _contentType = MockedContentTypes.CreateTextPageContentType(ContentTypeAlias);
+            // add complex editor
+            _contentType.AddPropertyType(
+                new PropertyType("complexTest", ValueStorageType.Ntext) { Alias = "complex", Name = "Complex", Description = "", Mandatory = false, SortOrder = 1, DataTypeId = ComplexDataTypeId },
+                "Content");
+
+            // make them all validate with a regex rule that will not pass
+            foreach (var prop in _contentType.PropertyTypes)
+            {
+                prop.ValidationRegExp = "^donotmatch$";
+                prop.ValidationRegExpMessage = "Does not match!";
+            }
+        }
+
+        protected override void Compose()
+        {
+            base.Compose();
+
+            var complexEditorConfig = new NestedContentConfiguration
+            {
+                ContentTypes = new[]
+                {
+                    new NestedContentConfiguration.ContentType { Alias = "feature" }
+                }
+            };
+            var dataTypeService = new Mock<IDataTypeService>();
+            dataTypeService.Setup(x => x.GetDataType(It.IsAny<int>()))
+                .Returns((int id) => id == ComplexDataTypeId
+                        ? Mock.Of<IDataType>(x => x.Configuration == complexEditorConfig)
+                        : Mock.Of<IDataType>());
+
+            var contentTypeService = new Mock<IContentTypeService>();
+            contentTypeService.Setup(x => x.GetAll(It.IsAny<int[]>()))
+                .Returns(() => new List<IContentType>
+                {
+                    _contentType
+                });
+
+            var textService = new Mock<ILocalizedTextService>();
+            textService.Setup(x => x.Localize("validation/invalidPattern", It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>())).Returns(() => "invalidPattern");
+            textService.Setup(x => x.Localize("validation/invalidNull", It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>())).Returns("invalidNull");
+            textService.Setup(x => x.Localize("validation/invalidEmpty", It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>())).Returns("invalidEmpty");
+
+            Composition.RegisterUnique(x => Mock.Of<IDataTypeService>(x => x.GetDataType(It.IsAny<int>()) == Mock.Of<IDataType>()));
+            Composition.RegisterUnique(x => dataTypeService.Object);
+            Composition.RegisterUnique(x => contentTypeService.Object);
+            Composition.RegisterUnique(x => textService.Object);
+
+            Composition.WithCollectionBuilder<DataEditorCollectionBuilder>()
+                .Add<TestEditor>()
+                .Add<ComplexTestEditor>();
+        }
+
+        [Test]
+        public void Test_Serializer()
+        {
+            var nestedLevel2 = new ComplexEditorValidationResult();
+            var id1 = Guid.NewGuid();
+            var addressInfoElementTypeResult = new ComplexEditorElementTypeValidationResult("addressInfo", id1);
+            var cityPropertyTypeResult = new ComplexEditorPropertyTypeValidationResult("city");
+            cityPropertyTypeResult.AddValidationResult(new ValidationResult("City is invalid"));
+            cityPropertyTypeResult.AddValidationResult(new ValidationResult("City cannot be empty"));
+            cityPropertyTypeResult.AddValidationResult(new ValidationResult("City is not in Australia", new[] { "country" }));
+            cityPropertyTypeResult.AddValidationResult(new ValidationResult("Not a capital city", new[] { "capital" }));
+            addressInfoElementTypeResult.ValidationResults.Add(cityPropertyTypeResult);
+            nestedLevel2.ValidationResults.Add(addressInfoElementTypeResult);
+
+            var nestedLevel1 = new ComplexEditorValidationResult();
+            var id2 = Guid.NewGuid();
+            var addressBookElementTypeResult = new ComplexEditorElementTypeValidationResult("addressBook", id2);
+            var addressesPropertyTypeResult = new ComplexEditorPropertyTypeValidationResult("addresses");
+            addressesPropertyTypeResult.AddValidationResult(new ValidationResult("Must have at least 3 addresses", new[] { "counter" }));
+            addressesPropertyTypeResult.AddValidationResult(nestedLevel2); // This is a nested result within the level 1
+            addressBookElementTypeResult.ValidationResults.Add(addressesPropertyTypeResult);
+            var bookNamePropertyTypeResult = new ComplexEditorPropertyTypeValidationResult("bookName");
+            bookNamePropertyTypeResult.AddValidationResult(new ValidationResult("Invalid address book name", new[] { "book" }));
+            addressBookElementTypeResult.ValidationResults.Add(bookNamePropertyTypeResult);
+            nestedLevel1.ValidationResults.Add(addressBookElementTypeResult);
+
+            var id3 = Guid.NewGuid();
+            var addressBookElementTypeResult2 = new ComplexEditorElementTypeValidationResult("addressBook", id3);
+            var addressesPropertyTypeResult2 = new ComplexEditorPropertyTypeValidationResult("addresses");
+            addressesPropertyTypeResult2.AddValidationResult(new ValidationResult("Must have at least 2 addresses", new[] { "counter" }));
+            addressBookElementTypeResult2.ValidationResults.Add(addressesPropertyTypeResult);
+            var bookNamePropertyTypeResult2 = new ComplexEditorPropertyTypeValidationResult("bookName");
+            bookNamePropertyTypeResult2.AddValidationResult(new ValidationResult("Name is too long"));
+            addressBookElementTypeResult2.ValidationResults.Add(bookNamePropertyTypeResult2);
+            nestedLevel1.ValidationResults.Add(addressBookElementTypeResult2);
+
+            // books is the outer most validation result and doesn't have it's own direct ValidationResult errors
+            var outerError = new ComplexEditorValidationResult();
+            var id4 = Guid.NewGuid();
+            var addressBookCollectionElementTypeResult = new ComplexEditorElementTypeValidationResult("addressBookCollection", id4);
+            var booksPropertyTypeResult= new ComplexEditorPropertyTypeValidationResult("books");
+            booksPropertyTypeResult.AddValidationResult(nestedLevel1); // books is the outer most validation result
+            addressBookCollectionElementTypeResult.ValidationResults.Add(booksPropertyTypeResult);
+            outerError.ValidationResults.Add(addressBookCollectionElementTypeResult);
+
+            var serialized = JsonConvert.SerializeObject(outerError, Formatting.Indented, new ValidationResultConverter());
+            Console.WriteLine(serialized);
+
+            var jsonError = JsonConvert.DeserializeObject<JArray>(serialized);
+
+            Assert.IsNotNull(jsonError.SelectToken("$[0]"));
+            Assert.AreEqual(id4.ToString(), jsonError.SelectToken("$[0].$id").Value<string>());
+            Assert.AreEqual("addressBookCollection", jsonError.SelectToken("$[0].$elementTypeAlias").Value<string>());
+            Assert.AreEqual(string.Empty, jsonError.SelectToken("$[0].ModelState['_Properties.books.invariant.null'][0]").Value<string>());
+
+            var error0 = jsonError.SelectToken("$[0].books") as JArray;
+            Assert.IsNotNull(error0);
+            Assert.AreEqual(id2.ToString(), error0.SelectToken("$[0].$id").Value<string>());
+            Assert.AreEqual("addressBook", error0.SelectToken("$[0].$elementTypeAlias").Value<string>());
+            Assert.IsNotNull(error0.SelectToken("$[0].ModelState"));
+            Assert.AreEqual(string.Empty, error0.SelectToken("$[0].ModelState['_Properties.addresses.invariant.null'][0]").Value<string>());
+            var error1 = error0.SelectToken("$[0].ModelState['_Properties.addresses.invariant.null.counter']") as JArray;
+            Assert.IsNotNull(error1);
+            Assert.AreEqual(1, error1.Count);
+            var error2 = error0.SelectToken("$[0].ModelState['_Properties.bookName.invariant.null.book']") as JArray;
+            Assert.IsNotNull(error2);
+            Assert.AreEqual(1, error2.Count);
+
+            Assert.AreEqual(id3.ToString(), error0.SelectToken("$[1].$id").Value<string>());
+            Assert.AreEqual("addressBook", error0.SelectToken("$[1].$elementTypeAlias").Value<string>());
+            Assert.IsNotNull(error0.SelectToken("$[1].ModelState"));
+            Assert.AreEqual(string.Empty, error0.SelectToken("$[1].ModelState['_Properties.addresses.invariant.null'][0]").Value<string>());
+            var error6 = error0.SelectToken("$[1].ModelState['_Properties.addresses.invariant.null.counter']") as JArray;
+            Assert.IsNotNull(error6);
+            Assert.AreEqual(1, error6.Count);
+            var error7 = error0.SelectToken("$[1].ModelState['_Properties.bookName.invariant.null']") as JArray;
+            Assert.IsNotNull(error7);
+            Assert.AreEqual(1, error7.Count);
+
+            Assert.IsNotNull(error0.SelectToken("$[0].addresses"));
+            Assert.AreEqual(id1.ToString(), error0.SelectToken("$[0].addresses[0].$id").Value<string>());
+            Assert.AreEqual("addressInfo", error0.SelectToken("$[0].addresses[0].$elementTypeAlias").Value<string>());
+            Assert.IsNotNull(error0.SelectToken("$[0].addresses[0].ModelState"));
+            var error3 = error0.SelectToken("$[0].addresses[0].ModelState['_Properties.city.invariant.null.country']") as JArray;
+            Assert.IsNotNull(error3);
+            Assert.AreEqual(1, error3.Count);
+            var error4 = error0.SelectToken("$[0].addresses[0].ModelState['_Properties.city.invariant.null.capital']") as JArray;
+            Assert.IsNotNull(error4);
+            Assert.AreEqual(1, error4.Count);
+            var error5 = error0.SelectToken("$[0].addresses[0].ModelState['_Properties.city.invariant.null']") as JArray;
+            Assert.IsNotNull(error5);
+            Assert.AreEqual(2, error5.Count);
+        }
+
+        [Test]
+        public void Validating_ContentItemSave()
+        {
+            var validator = new ContentSaveModelValidator(
+                Factory.GetInstance<ILogger>(),
+                Mock.Of<IUmbracoContextAccessor>(),
+                Factory.GetInstance<ILocalizedTextService>());
+
+            var content = MockedContent.CreateTextpageContent(_contentType, "test", -1);
+
+            var id1 = new Guid("c8df5136-d606-41f0-9134-dea6ae0c2fd9");
+            var id2 = new Guid("f916104a-4082-48b2-a515-5c4bf2230f38");
+            var id3 = new Guid("77E15DE9-1C79-47B2-BC60-4913BC4D4C6A");
+
+            // TODO: Ok now test with a 4th level complex nested editor
+
+            var complexValue = @"[{
+            		""key"": """ + id1.ToString() + @""",
+            		""name"": ""Hello world"",
+            		""ncContentTypeAlias"": """ + ContentTypeAlias + @""",
+            		""title"": ""Hello world"",
+                    ""bodyText"": ""The world is round""
+            	}, {
+            		""key"": """ + id2.ToString() + @""",
+            		""name"": ""Super nested"",
+            		""ncContentTypeAlias"": """ + ContentTypeAlias + @""",
+            		""title"": ""Hi there!"",
+                    ""bodyText"": ""Well hello there"",
+                    ""complex"" : [{
+            		    ""key"": """ + id3.ToString() + @""",
+            		    ""name"": ""I am a sub nested content"",
+            		    ""ncContentTypeAlias"": """ + ContentTypeAlias + @""",
+            		    ""title"": ""Hello up there :)"",
+                        ""bodyText"": ""Hello way up there on a different level""
+            	    }]
+            	}
+            ]";
+            content.SetValue("complex", complexValue);
+
+            // map the persisted properties to a model representing properties to save
+            //var saveProperties = content.Properties.Select(x => Mapper.Map<ContentPropertyBasic>(x)).ToList();
+            var saveProperties = content.Properties.Select(x =>
+            {
+                return new ContentPropertyBasic
+                {
+                    Alias = x.Alias,
+                    Id = x.Id,
+                    Value = x.GetValue()
+                };
+            }).ToList();
+
+            var saveVariants = new List<ContentVariantSave>
+            {
+                new ContentVariantSave
+                    {
+                        Culture = string.Empty,
+                        Segment = string.Empty,
+                        Name = content.Name,
+                        Save = true,
+                        Properties = saveProperties
+                    }
+            };
+
+            var save = new ContentItemSave
+            {
+                Id = content.Id,
+                Action = ContentSaveAction.Save,
+                ContentTypeAlias = _contentType.Alias,
+                ParentId = -1,
+                PersistedContent = content,
+                TemplateAlias = null,
+                Variants = saveVariants
+            };
+
+            // This will map the ContentItemSave.Variants.PropertyCollectionDto and then map the values in the saved model
+            // back onto the persisted IContent model.
+            ContentItemBinder.BindModel(save, content);
+
+            var modelState = new ModelStateDictionary();
+            var isValid = validator.ValidatePropertiesData(save, saveVariants[0], saveVariants[0].PropertyCollectionDto, modelState);
+
+            // list results for debugging
+            foreach (var state in modelState)
+            {
+                Console.WriteLine(state.Key);
+                foreach (var error in state.Value.Errors)
+                {
+                    Console.WriteLine("\t" + error.ErrorMessage);
+                }
+            }
+
+            // assert
+
+            Assert.IsFalse(isValid);
+            Assert.AreEqual(11, modelState.Keys.Count);
+            const string complexPropertyKey = "_Properties.complex.invariant.null";
+            Assert.IsTrue(modelState.Keys.Contains(complexPropertyKey));
+            foreach (var state in modelState.Where(x => x.Key != complexPropertyKey))
+            {
+                foreach (var error in state.Value.Errors)
+                {
+                    Assert.IsFalse(error.ErrorMessage.DetectIsJson()); // non complex is just an error message                    
+                }
+            }
+            var complexEditorErrors = modelState.Single(x => x.Key == complexPropertyKey).Value.Errors;
+            Assert.AreEqual(1, complexEditorErrors.Count);
+            var nestedError = complexEditorErrors[0];
+            var jsonError = JsonConvert.DeserializeObject<JArray>(nestedError.ErrorMessage);
+
+            var modelStateKeys = new[] { "_Properties.title.invariant.null.innerFieldId", "_Properties.title.invariant.null.value", "_Properties.bodyText.invariant.null.innerFieldId", "_Properties.bodyText.invariant.null.value" };
+            AssertNestedValidation(jsonError, 0, id1, modelStateKeys);
+            AssertNestedValidation(jsonError, 1, id2, modelStateKeys.Concat(new[] { "_Properties.complex.invariant.null.innerFieldId", "_Properties.complex.invariant.null.value" }).ToArray());
+            var nestedJsonError = jsonError.SelectToken("$[1].complex") as JArray;
+            Assert.IsNotNull(nestedJsonError);
+            AssertNestedValidation(nestedJsonError, 0, id3, modelStateKeys);
+        }
+
+        private void AssertNestedValidation(JArray jsonError, int index, Guid id, string[] modelStateKeys)
+        {
+            Assert.IsNotNull(jsonError.SelectToken("$[" + index + "]"));
+            Assert.AreEqual(id.ToString(), jsonError.SelectToken("$[" + index + "].$id").Value<string>());
+            Assert.AreEqual("textPage", jsonError.SelectToken("$[" + index + "].$elementTypeAlias").Value<string>());
+            Assert.IsNotNull(jsonError.SelectToken("$[" + index + "].ModelState"));            
+            foreach (var key in modelStateKeys)
+            {
+                var error = jsonError.SelectToken("$[" + index + "].ModelState['" + key + "']") as JArray;
+                Assert.IsNotNull(error);
+                Assert.AreEqual(1, error.Count);
+            }
+        }
+
+        [HideFromTypeFinder]
+        [DataEditor("complexTest", "test", "test")]
+        public class ComplexTestEditor : NestedContentPropertyEditor
+        {
+            public ComplexTestEditor(ILogger logger, Lazy<PropertyEditorCollection> propertyEditors, IDataTypeService dataTypeService, IContentTypeService contentTypeService) : base(logger, propertyEditors, dataTypeService, contentTypeService)
+            {
+            }
+
+            protected override IDataValueEditor CreateValueEditor()
+            {
+                var editor = base.CreateValueEditor();
+                editor.Validators.Add(new NeverValidateValidator());
+                return editor;
+            }
+        }
+
+        [HideFromTypeFinder]
+        [DataEditor("test", "test", "test")] // This alias aligns with the prop editor alias for all properties created from MockedContentTypes.CreateTextPageContentType
+        public class TestEditor : DataEditor
+        {
+            public TestEditor(ILogger logger)
+                : base(logger)
+            {
+            }
+
+            protected override IDataValueEditor CreateValueEditor() => new TestValueEditor(Attribute);
+
+            private class TestValueEditor : DataValueEditor
+            {
+                public TestValueEditor(DataEditorAttribute attribute)
+                    : base(attribute)
+                {
+                    Validators.Add(new NeverValidateValidator());
+                }
+
+            }
+        }
+
+        public class NeverValidateValidator : IValueValidator
+        {
+            public IEnumerable<ValidationResult> Validate(object value, string valueType, object dataTypeConfiguration)
+            {
+                yield return new ValidationResult("WRONG!", new[] { "innerFieldId" });
+            }
+        }
+
+    }
+}
diff --git a/src/Umbraco.Tests/Web/ModelStateExtensionsTests.cs b/src/Umbraco.Tests/Web/Validation/ModelStateExtensionsTests.cs
similarity index 99%
rename from src/Umbraco.Tests/Web/ModelStateExtensionsTests.cs
rename to src/Umbraco.Tests/Web/Validation/ModelStateExtensionsTests.cs
index 7b25e60b5a..0355705378 100644
--- a/src/Umbraco.Tests/Web/ModelStateExtensionsTests.cs
+++ b/src/Umbraco.Tests/Web/Validation/ModelStateExtensionsTests.cs
@@ -6,7 +6,7 @@ using NUnit.Framework;
 using Umbraco.Core.Services;
 using Umbraco.Web;
 
-namespace Umbraco.Tests.Web
+namespace Umbraco.Tests.Web.Validation
 {
     [TestFixture]
     public class ModelStateExtensionsTests
diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js
index 3c32832ba0..9eb335a62c 100755
--- a/src/Umbraco.Web.UI.Client/gulp/config.js
+++ b/src/Umbraco.Web.UI.Client/gulp/config.js
@@ -30,6 +30,7 @@ module.exports = {
         // js files for backoffice
         // processed in the js task
         js: {
+            websitepreview: { files: "./src/websitepreview/**/*.js", out: "umbraco.websitepreview.js" },
             preview: { files: "./src/preview/**/*.js", out: "umbraco.preview.js" },
             installer: { files: "./src/installer/**/*.js", out: "umbraco.installer.js" },
             filters: { files: "./src/common/filters/**/*.js", out: "umbraco.filters.js" },
@@ -56,7 +57,7 @@ module.exports = {
                 ],
                 out: "umbraco.directives.js"
             }
-            
+
         },
 
         //selectors for copying all views into the build
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js b/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js
index def956ac9f..b5339b60c9 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js
@@ -28,12 +28,18 @@ function dependencies() {
                 "./node_modules/ace-builds/src-min-noconflict/snippets/text.js",
                 "./node_modules/ace-builds/src-min-noconflict/snippets/javascript.js",
                 "./node_modules/ace-builds/src-min-noconflict/snippets/css.js",
+                "./node_modules/ace-builds/src-min-noconflict/snippets/json.js",
+                "./node_modules/ace-builds/src-min-noconflict/snippets/xml.js",
                 "./node_modules/ace-builds/src-min-noconflict/theme-chrome.js",
                 "./node_modules/ace-builds/src-min-noconflict/mode-razor.js",
                 "./node_modules/ace-builds/src-min-noconflict/mode-javascript.js",
                 "./node_modules/ace-builds/src-min-noconflict/mode-css.js",
+                "./node_modules/ace-builds/src-min-noconflict/mode-json.js",
+                "./node_modules/ace-builds/src-min-noconflict/mode-xml.js",
                 "./node_modules/ace-builds/src-min-noconflict/worker-javascript.js",
-                "./node_modules/ace-builds/src-min-noconflict/worker-css.js"
+                "./node_modules/ace-builds/src-min-noconflict/worker-css.js",
+                "./node_modules/ace-builds/src-min-noconflict/worker-json.js",
+                "./node_modules/ace-builds/src-min-noconflict/worker-xml.js"
             ],
             "base": "./node_modules/ace-builds"
         },
@@ -44,7 +50,8 @@ function dependencies() {
         },
         {
             "name": "angular-aria",
-            "src":  ["./node_modules/angular-aria/angular-aria.min.js"],
+            "src":  ["./node_modules/angular-aria/angular-aria.min.js",
+                    "./node_modules/angular-aria/angular-aria.min.js.map"],
             "base": "./node_modules/angular-aria"
         },
         {
@@ -213,10 +220,10 @@ function dependencies() {
         {
             "name": "spectrum",
             "src":  [
-                "./node_modules/spectrum-colorpicker/spectrum.js",
-                "./node_modules/spectrum-colorpicker/spectrum.css"
+                "./node_modules/spectrum-colorpicker2/dist/spectrum.js",
+                "./node_modules/spectrum-colorpicker2/dist/spectrum.css"
             ],
-            "base": "./node_modules/spectrum-colorpicker"
+            "base": "./node_modules/spectrum-colorpicker2/dist"
         },
         {
             "name": "tinymce",
@@ -237,6 +244,14 @@ function dependencies() {
             "name": "underscore",
             "src":  ["node_modules/underscore/underscore-min.js"],
             "base": "./node_modules/underscore"
+        },
+        {
+            "name": "wicg-inert",
+            "src": [
+                "./node_modules/wicg-inert/dist/inert.min.js",
+                "./node_modules/wicg-inert/dist/inert.min.js.map"
+            ],
+            "base": "./node_modules/wicg-inert"
         }
     ];
 
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/test.js b/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
index 255fe17435..b5239d35e7 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
@@ -23,7 +23,6 @@ function runUnitTestServer() {
         autoWatch: true,
         port: 9999,
         singleRun: false,
-        browsers: ['ChromeDebugging'],
         keepalive: true
     })
     .start();
diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index d272c77397..547b77cc7b 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -6,11 +6,11 @@
     * ===========
     * This is now using Gulp 4, each child task is now a child function in its own corresponding file.
     *
-    * To add a new task, simply add a new task file to gulp/tasks folder, add a require statement below to include the one or more methods 
+    * To add a new task, simply add a new task file to gulp/tasks folder, add a require statement below to include the one or more methods
     * and then add the exports command to add the new item into the task menu.
     */
 
-const { src, dest, series, parallel, lastRun } = require('gulp');
+const { series, parallel } = require('gulp');
 
 const config = require('./gulp/config');
 const { setDevelopmentMode, setTestMode } = require('./gulp/modes');
@@ -28,9 +28,9 @@ config.compile.current = config.compile.build;
 // These Exports are the new way of defining Tasks in Gulp 4.x
 // ***********************************************************
 exports.build = series(parallel(dependencies, js, less, views), testUnit);
-exports.dev = series(setDevelopmentMode, parallel(dependencies, js, less, views), watchTask);
+exports.dev = series(setDevelopmentMode, parallel(dependencies, js, less, views), runUnitTestServer, watchTask);
 exports.watch = series(watchTask);
-// 
+//
 exports.runTests = series(setTestMode, series(js, testUnit));
 exports.runUnit = series(setTestMode, series(js, runUnitTestServer), watchTask);
 exports.testE2e = series(setTestMode, parallel(testE2e));
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/pager.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/pager.less
index 1476188297..718ade757e 100644
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/pager.less
+++ b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/pager.less
@@ -13,6 +13,7 @@
   display: inline;
 }
 .pager li > a,
+.pager li > button,
 .pager li > span {
   display: inline-block;
   padding: 5px 14px;
@@ -21,23 +22,30 @@
   .border-radius(15px);
 }
 .pager li > a:hover,
-.pager li > a:focus {
-  text-decoration: none;
-  background-color: #f5f5f5;
+.pager li > a:focus,
+.pager li > button:hover,
+.pager li > button:focus {
+    text-decoration: none;
+    background-color: #f5f5f5;
 }
 .pager .next > a,
+.pager .next > button,
 .pager .next > span {
   float: right;
 }
 .pager .previous > a,
+.pager .previous > button,
 .pager .previous > span {
-  float: left;
+    float: left;
 }
 .pager .disabled > a,
 .pager .disabled > a:hover,
 .pager .disabled > a:focus,
+.pager .disabled > button,
+.pager .disabled > button:hover,
+.pager .disabled > button:focus
 .pager .disabled > span {
-  color: @grayLight;
-  background-color: #fff;
-  cursor: default;
-}
\ No newline at end of file
+    color: @grayLight;
+    background-color: #fff;
+    cursor: default;
+}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/pagination.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/pagination.less
index 6f6e6ac7de..ae10700eb3 100644
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/pagination.less
+++ b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/pagination.less
@@ -21,6 +21,7 @@
   display: inline; // Remove list-style and block-level defaults
 }
 .pagination ul > li > a,
+.pagination ul > li > button,
 .pagination ul > li > span {
   float: left; // Collapse white-space
   padding: 4px 12px;
@@ -32,29 +33,38 @@
 }
 .pagination ul > li > a:hover,
 .pagination ul > li > a:focus,
+.pagination ul > li > button:hover,
+.pagination ul > li > button:focus,
 .pagination ul > .active > a,
+.pagination ul > .active > button,
 .pagination ul > .active > span {
-  background-color: @paginationActiveBackground;
+    background-color: @paginationActiveBackground;
 }
 .pagination ul > .active > a,
+.pagination ul > .active > button,
 .pagination ul > .active > span {
-  color: @grayLight;
-  cursor: default;
+    color: @grayLight;
+    cursor: default;
 }
 .pagination ul > .disabled > span,
 .pagination ul > .disabled > a,
 .pagination ul > .disabled > a:hover,
-.pagination ul > .disabled > a:focus {
-  color: @grayLight;
-  background-color: transparent;
-  cursor: default;
+.pagination ul > .disabled > a:focus,
+.pagination ul > .disabled > button,
+.pagination ul > .disabled > button:hover,
+.pagination ul > .disabled > button:focus {
+    color: @grayLight;
+    background-color: transparent;
+    cursor: default;
 }
 .pagination ul > li:first-child > a,
+.pagination ul > li:first-child > button,
 .pagination ul > li:first-child > span {
   border-left-width: 1px;
   .border-left-radius(@baseBorderRadius);
 }
 .pagination ul > li:last-child > a,
+.pagination ul > li:last-child > button,
 .pagination ul > li:last-child > span {
   .border-right-radius(@baseBorderRadius);
 }
@@ -77,15 +87,18 @@
 // Large
 .pagination-large {
   ul > li > a,
+  ul > li > button,
   ul > li > span {
     padding: @paddingLarge;
     font-size: @fontSizeLarge;
   }
   ul > li:first-child > a,
+  ul > li:first-child > button,
   ul > li:first-child > span {
     .border-left-radius(@borderRadiusLarge);
   }
   ul > li:last-child > a,
+  ul > li:last-child > button,
   ul > li:last-child > span {
     .border-right-radius(@borderRadiusLarge);
   }
@@ -95,10 +108,12 @@
 .pagination-mini,
 .pagination-small {
   ul > li:first-child > a,
+  ul > li:first-child > button,
   ul > li:first-child > span {
     .border-left-radius(@borderRadiusSmall);
   }
   ul > li:last-child > a,
+  ul > li:last-child > button,
   ul > li:last-child > span {
     .border-right-radius(@borderRadiusSmall);
   }
@@ -107,6 +122,7 @@
 // Small
 .pagination-small {
   ul > li > a,
+  ul > li > button,
   ul > li > span {
     padding: @paddingSmall;
     font-size: @fontSizeSmall;
@@ -115,6 +131,7 @@
 // Mini
 .pagination-mini {
   ul > li > a,
+  ul > li > button,
   ul > li > span {
     padding: @paddingMini;
     font-size: @fontSizeMini;
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cy.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cy.js
index d2fdd077f5..2863840abb 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cy.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cy.js
@@ -121,7 +121,7 @@ tinymce.addI18n('cy',{
 "Date\/time": "Dyddiad\/amser",
 "Insert date\/time": "Mewnosod dyddiad\/amser",
 "Remove link": "Tynnu dolen",
-"Url": "Url",
+"Url": "URL",
 "Text to display": "Testun i'w ddangos",
 "Anchors": "Angorau",
 "Insert link": "Mewnosod dolen",
@@ -227,4 +227,4 @@ tinymce.addI18n('cy',{
 "View": "Dangos",
 "Table": "Tabl",
 "Format": "Fformat"
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/da.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/da.js
index 90e4009d92..a50f2f10ec 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/da.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/da.js
@@ -150,7 +150,7 @@ tinymce.addI18n('da',{
 "Insert link": "Inds\u00e6t link",
 "Insert\/edit link": "Inds\u00e6t\/ret link",
 "Text to display": "Vis tekst",
-"Url": "Url",
+"Url": "URL",
 "Target": "Target",
 "None": "Ingen",
 "New window": "Nyt vindue",
@@ -258,4 +258,4 @@ tinymce.addI18n('da',{
 "Tools": "V\u00e6rkt\u00f8j",
 "Powered by {0}": "Drevet af {0}",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text omr\u00e5de. Tryk ALT-F9 for menu. Tryk ALT-F10 for toolbar. Tryk ALT-0 for hj\u00e6lp"
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/de_AT.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/de_AT.js
index 2af071f5ce..0073810c1a 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/de_AT.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/de_AT.js
@@ -150,7 +150,7 @@ tinymce.addI18n('de_AT',{
 "Insert link": "Link einf\u00fcgen",
 "Insert\/edit link": "Link einf\u00fcgen\/bearbeiten",
 "Text to display": "Angezeigter Text",
-"Url": "Url",
+"Url": "URL",
 "Target": "Ziel",
 "None": "Keine",
 "New window": "Neues Fenster",
@@ -258,4 +258,4 @@ tinymce.addI18n('de_AT',{
 "Tools": "Extras",
 "Powered by {0}": "Betrieben von {0}",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Dr\u00fccken Sie ALT-F9 f\u00fcr das Men\u00fc. Dr\u00fccken Sie ALT-F10 f\u00fcr die Werkzeugleiste. Dr\u00fccken Sie ALT-0 f\u00fcr Hilfe"
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_CA.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_CA.js
index f32de01724..cc07ffd23e 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_CA.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_CA.js
@@ -150,7 +150,7 @@ tinymce.addI18n('en_CA',{
 "Insert link": "Insert link",
 "Insert\/edit link": "Insert\/edit link",
 "Text to display": "Text to display",
-"Url": "Url",
+"Url": "URL",
 "Target": "Target",
 "None": "None",
 "New window": "New window",
@@ -258,4 +258,4 @@ tinymce.addI18n('en_CA',{
 "Tools": "Tools",
 "Powered by {0}": "Powered by {0}",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_US.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_US.js
index 90eae85800..0b50212fd9 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_US.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_US.js
@@ -150,7 +150,7 @@ tinymce.addI18n('en_US',{
 "Insert link": "Insert link",
 "Insert\/edit link": "Insert\/edit link",
 "Text to display": "Text to display",
-"Url": "Url",
+"Url": "URL",
 "Target": "Target",
 "None": "None",
 "New window": "New window",
@@ -258,4 +258,4 @@ tinymce.addI18n('en_US',{
 "Tools": "Tools",
 "Powered by {0}": "Powered by {0}",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/es_MX.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/es_MX.js
index b0f2019ffe..688f14ba51 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/es_MX.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/es_MX.js
@@ -150,7 +150,7 @@ tinymce.addI18n('es_MX',{
 "Insert link": "Insertar enlace",
 "Insert\/edit link": "Inserta\/editar enlace",
 "Text to display": "Texto a mostrar",
-"Url": "Url",
+"Url": "URL",
 "Target": "Objetivo",
 "None": "Ninguno",
 "New window": "Nueva ventana",
@@ -258,4 +258,4 @@ tinymce.addI18n('es_MX',{
 "Tools": "Herramientas",
 "Powered by {0}": "Creado con {0}",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Presione dentro del \u00e1rea de texto ALT-F9 para invocar el men\u00fa, ALT-F10 para la barra de herramientas y ALT-0 para la ayuda."
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/et.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/et.js
index c6beeeb510..96b763506c 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/et.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/et.js
@@ -150,7 +150,7 @@ tinymce.addI18n('et',{
 "Insert link": "Lisa link",
 "Insert\/edit link": "Lisa\/muuda link",
 "Text to display": "Kuvatav tekst",
-"Url": "Viide (url)",
+"Url": "Viide (URL)",
 "Target": "Sihtm\u00e4rk",
 "None": "Puudub",
 "New window": "Uus aken",
@@ -258,4 +258,4 @@ tinymce.addI18n('et',{
 "Tools": "T\u00f6\u00f6riistad",
 "Powered by {0}": "Kasutatud tarkvara {0}",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rikastatud teksti ala. Men\u00fc\u00fc jaoks vajuta ALT-F9. T\u00f6\u00f6riistariba jaoks vajuta ALT-F10. Abi saamiseks vajuta ALT-0."
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/eu.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/eu.js
index c4374394d4..44e62db3f8 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/eu.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/eu.js
@@ -150,7 +150,7 @@ tinymce.addI18n('eu',{
 "Insert link": "Esteka txertatu",
 "Insert\/edit link": "Esteka txertatu\/editatu",
 "Text to display": "Bistaratzeko testua",
-"Url": "Url",
+"Url": "URL",
 "Target": "Target",
 "None": "Bat ere ez",
 "New window": "Lehio berria",
@@ -258,4 +258,4 @@ tinymce.addI18n('eu',{
 "Tools": "Tresnak",
 "Powered by {0}": "{0}rekin egina",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Testu aberastuko area. Sakatu ALT-F9 menurako. Sakatu ALT-F10 tresna-barrarako. Sakatu ALT-0 laguntzarako"
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr.js
index 2d074f8c6e..d61015efa0 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr.js
@@ -150,7 +150,7 @@ tinymce.addI18n('fr_FR',{
 "Insert\/Edit Link": "Ins\u00e9rer\/Modifier lien",
 "Insert\/edit link": "Ins\u00e9rer\/modifier un lien",
 "Text to display": "Texte \u00e0 afficher",
-"Url": "Url",
+"Url": "URL",
 "Open link in...": "Ouvrir le lien dans...",
 "Current window": "Fen\u00eatre active",
 "None": "n\/a",
@@ -386,4 +386,4 @@ tinymce.addI18n('fr_FR',{
 "Spellcheck": "V\u00e9rification orthographique",
 "Caption": "Titre",
 "Insert template": "Ajouter un th\u00e8me"
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr_FR.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr_FR.js
index 5c37164b2c..5ed177c9fc 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr_FR.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr_FR.js
@@ -150,7 +150,7 @@ tinymce.addI18n('fr_FR',{
 "Insert link": "Ins\u00e9rer un lien",
 "Insert\/edit link": "Ins\u00e9rer\/modifier un lien",
 "Text to display": "Texte \u00e0 afficher",
-"Url": "Url",
+"Url": "URL",
 "Target": "Cible",
 "None": "n\/a",
 "New window": "Nouvelle fen\u00eatre",
@@ -258,4 +258,4 @@ tinymce.addI18n('fr_FR',{
 "Tools": "Outils",
 "Powered by {0}": "Propuls\u00e9 par {0}",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zone Texte Riche. Appuyer sur ALT-F9 pour le menu. Appuyer sur ALT-F10 pour la barre d'outils. Appuyer sur ALT-0 pour de l'aide."
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hr.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hr.js
index d52f861ce9..617e1f4823 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hr.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hr.js
@@ -144,7 +144,7 @@ tinymce.addI18n('hr',{
 "Insert link": "Umetni poveznicu",
 "Insert\/edit link": "Umetni\/izmijeni poveznicu",
 "Text to display": "Tekst za prikaz",
-"Url": "Url",
+"Url": "URL",
 "Target": "Meta",
 "None": "Ni\u0161ta",
 "New window": "Novi prozor",
@@ -250,4 +250,4 @@ tinymce.addI18n('hr',{
 "Table": "Tablica",
 "Tools": "Alati",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Pritisni ALT-F9 za izbornik. Pritisni ALT-F10 za alatnu traku. Pritisni ALT-0 za pomo\u0107"
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hu_HU.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hu_HU.js
index 3972dc2b3c..13bb4984a9 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hu_HU.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hu_HU.js
@@ -150,7 +150,7 @@ tinymce.addI18n('hu_HU',{
 "Insert link": "Hivatkoz\u00e1s beilleszt\u00e9se",
 "Insert\/edit link": "Hivatkoz\u00e1s beilleszt\u00e9se\/szerkeszt\u00e9se",
 "Text to display": "Megjelen\u0151 sz\u00f6veg",
-"Url": "Url",
+"Url": "URL",
 "Target": "C\u00e9l",
 "None": "Nincs",
 "New window": "\u00daj ablak",
@@ -258,4 +258,4 @@ tinymce.addI18n('hu_HU',{
 "Tools": "Eszk\u00f6z\u00f6k",
 "Powered by {0}": "\u00dczemelteti: {0}",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text ter\u00fclet. Nyomj ALT-F9-et a men\u00fch\u00f6z. Nyomj ALT-F10-et az eszk\u00f6zt\u00e1rhoz. Nyomj ALT-0-t a s\u00fag\u00f3hoz"
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/it.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/it.js
index 5ffc0c0f80..a97118da21 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/it.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/it.js
@@ -150,7 +150,7 @@ tinymce.addI18n('it',{
 "Insert link": "Inserisci il Link",
 "Insert\/edit link": "Inserisci\/Modifica Link",
 "Text to display": "Testo da Visualizzare",
-"Url": "Url",
+"Url": "URL",
 "Target": "Target",
 "None": "No",
 "New window": "Nuova Finestra",
@@ -258,4 +258,4 @@ tinymce.addI18n('it',{
 "Tools": "Strumenti",
 "Powered by {0}": "Fornito da {0}",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Premi ALT-F9 per il men\u00f9. Premi ALT-F10 per la barra degli strumenti. Premi ALT-0 per l'aiuto."
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ka_GE.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ka_GE.js
index 9bffb8040d..805a966489 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ka_GE.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ka_GE.js
@@ -121,7 +121,7 @@ tinymce.addI18n('ka_GE',{
 "Date\/time": "\u10d7\u10d0\u10e0\u10d8\u10e6\u10d8\/\u10d3\u10e0\u10dd",
 "Insert date\/time": "\u10d7\u10d0\u10e0\u10d8\u10e6\u10d8\/\u10d3\u10e0\u10dd\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
 "Remove link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
-"Url": "Url",
+"Url": "URL",
 "Text to display": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8",
 "Anchors": "\u10e6\u10e3\u10d6\u10d0",
 "Insert link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
@@ -227,4 +227,4 @@ tinymce.addI18n('ka_GE',{
 "View": "\u10dc\u10d0\u10ee\u10d5\u10d0",
 "Table": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8",
 "Format": "\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d8"
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/kab.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/kab.js
index b9f9bccf40..48f7d3bf55 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/kab.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/kab.js
@@ -150,7 +150,7 @@ tinymce.addI18n('kab',{
 "Insert link": "Ger azday",
 "Insert\/edit link": "Ger\/\u1e93reg azday",
 "Text to display": "A\u1e0dris ara yettwabeqq\u1e0den",
-"Url": "Url",
+"Url": "URL",
 "Target": "Target",
 "None": "Ulac",
 "New window": "Asfaylu amaynut",
@@ -258,4 +258,4 @@ tinymce.addI18n('kab',{
 "Tools": "Ifecka",
 "Powered by {0}": "Iteddu s {0} ",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/km_KH.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/km_KH.js
index 5c4b055126..381d4c4a46 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/km_KH.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/km_KH.js
@@ -144,7 +144,7 @@ tinymce.addI18n('km_KH',{
 "Insert link": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u178f\u17c6\u178e",
 "Insert\/edit link": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2 \u178f\u17c6\u178e",
 "Text to display": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17d2\u179a\u17bc\u179c\u200b\u1794\u1784\u17d2\u17a0\u17b6\u1789",
-"Url": "Url",
+"Url": "URL",
 "Target": "\u1791\u17b7\u179f\u178a\u17c5",
 "None": "\u1798\u17b7\u1793\u200b\u1798\u17b6\u1793",
 "New window": "\u1795\u17d2\u1791\u17b6\u17c6\u1784\u200b\u179c\u17b8\u1793\u178a\u17bc\u200b\u1790\u17d2\u1798\u17b8",
@@ -250,4 +250,4 @@ tinymce.addI18n('km_KH',{
 "Table": "\u178f\u17b6\u179a\u17b6\u1784",
 "Tools": "\u17a7\u1794\u1780\u179a\u178e\u17cd",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u1791\u17b8\u178f\u17b6\u17c6\u1784\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u179f\u17c6\u1794\u17bc\u179a\u1794\u17c2\u1794\u17d4 \u1785\u17bb\u1785 ALT-F9 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u1798\u17c9\u17ba\u1793\u17bb\u1799\u17d4 \u1785\u17bb\u1785 ALT-F10 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u179a\u1794\u17b6\u179a\u200b\u17a7\u1794\u1780\u179a\u178e\u17cd\u17d4 \u1785\u17bb\u1785 ALT-0 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u1787\u17c6\u1793\u17bd\u1799\u17d4"
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nb_NO.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nb_NO.js
index 59233450b0..e6f1df8971 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nb_NO.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nb_NO.js
@@ -150,7 +150,7 @@ tinymce.addI18n('nb_NO',{
 "Insert link": "Sett inn lenke",
 "Insert\/edit link": "Sett inn\/endre lenke",
 "Text to display": "Tekst som skal vises",
-"Url": "Url",
+"Url": "URL",
 "Target": "M\u00e5l",
 "None": "Ingen",
 "New window": "Nytt vindu",
@@ -258,4 +258,4 @@ tinymce.addI18n('nb_NO',{
 "Tools": "Verkt\u00f8y",
 "Powered by {0}": "Redigert med {0}",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Tekstredigering. Tast ALT-F9 for meny. Tast ALT-F10 for verkt\u00f8ys-rader. Tast ALT-0 for hjelp."
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nl.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nl.js
index c80590b297..d8631c9ab6 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nl.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nl.js
@@ -150,7 +150,7 @@ tinymce.addI18n('nl',{
 "Insert link": "Hyperlink invoegen",
 "Insert\/edit link": "Hyperlink invoegen\/bewerken",
 "Text to display": "Linktekst",
-"Url": "Url",
+"Url": "URL",
 "Target": "Doel",
 "None": "Geen",
 "New window": "Nieuw venster",
@@ -258,4 +258,4 @@ tinymce.addI18n('nl',{
 "Tools": "Gereedschap",
 "Powered by {0}": "Gemaakt door {0}",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Druk ALT-F9 voor het menu. Druk ALT-F10 voor de toolbar. Druk ALT-0 voor help."
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pt_BR.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pt_BR.js
index 497043a9d4..2beccd413b 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pt_BR.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pt_BR.js
@@ -150,7 +150,7 @@ tinymce.addI18n('pt_BR',{
 "Insert link": "Inserir link",
 "Insert\/edit link": "Inserir\/editar link",
 "Text to display": "Texto para mostrar",
-"Url": "Url",
+"Url": "URL",
 "Target": "Alvo",
 "None": "Nenhum",
 "New window": "Nova janela",
@@ -258,4 +258,4 @@ tinymce.addI18n('pt_BR',{
 "Tools": "Ferramentas",
 "Powered by {0}": "Distribu\u00eddo por  {0}",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c1rea de texto formatado. Pressione ALT-F9 para exibir o menu, ALT-F10 para exibir a barra de ferramentas ou ALT-0 para exibir a ajuda"
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ro.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ro.js
index 0a6a2eadf0..a2f3caec80 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ro.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ro.js
@@ -121,7 +121,7 @@ tinymce.addI18n('ro',{
 "Date\/time": "Data\/ora",
 "Insert date\/time": "Insereaz\u0103 data\/ora",
 "Remove link": "\u0218terge link-ul",
-"Url": "Url",
+"Url": "URL",
 "Text to display": "Text de afi\u0219at",
 "Anchors": "Ancor\u0103",
 "Insert link": "Inserare link",
@@ -227,4 +227,4 @@ tinymce.addI18n('ro',{
 "View": "Vezi",
 "Table": "Tabel\u0103",
 "Format": "Formateaz\u0103"
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sk.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sk.js
index 2362a6dbc6..5cc085abdc 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sk.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sk.js
@@ -144,7 +144,7 @@ tinymce.addI18n('sk',{
 "Insert link": "Vlo\u017ei\u0165 odkaz",
 "Insert\/edit link": "Vlo\u017ei\u0165\/upravi\u0165 odkaz",
 "Text to display": "Zobrazen\u00fd text",
-"Url": "Url",
+"Url": "URL",
 "Target": "Cie\u013e",
 "None": "\u017diadne",
 "New window": "Nov\u00e9 okno",
@@ -250,4 +250,4 @@ tinymce.addI18n('sk',{
 "Table": "Tabu\u013eka",
 "Tools": "N\u00e1stroje",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Textov\u00e9 pole. Stla\u010dte ALT-F9 pre zobrazenie menu, ALT-F10 pre zobrazenie panela n\u00e1strojov, ALT-0 pre n\u00e1povedu."
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sr.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sr.js
index 9150c2ed82..01bfad7303 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sr.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sr.js
@@ -150,7 +150,7 @@ tinymce.addI18n('sr',{
 "Insert link": "Ubaci vezu",
 "Insert\/edit link": "Ubaci\/promeni vezu",
 "Text to display": "Tekst za prikaz",
-"Url": "Url",
+"Url": "URL",
 "Target": "Meta",
 "None": "Ni\u0161ta",
 "New window": "Novi prozor",
@@ -258,4 +258,4 @@ tinymce.addI18n('sr',{
 "Tools": "Alatke",
 "Powered by {0}": "Pokre\u0107e ga {0}",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Oboga\u0107en tekst. Pritisni te ALT-F9 za meni.Pritisnite ALT-F10 za traku sa alatkama.Pritisnite ALT-0 za pomo\u0107"
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sv_SE.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sv_SE.js
index 83aaaef59d..b97ea68a18 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sv_SE.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sv_SE.js
@@ -150,7 +150,7 @@ tinymce.addI18n('sv_SE',{
 "Insert link": "Infoga l\u00e4nk",
 "Insert\/edit link": "Infoga\/redigera l\u00e4nk",
 "Text to display": "Text att visa",
-"Url": "Url",
+"Url": "URL",
 "Target": "M\u00e5l",
 "None": "Ingen",
 "New window": "Nytt f\u00f6nster",
@@ -158,8 +158,8 @@ tinymce.addI18n('sv_SE',{
 "Anchors": "Bokm\u00e4rken",
 "Link": "L\u00e4nk",
 "Paste or type a link": "Klistra in eller skriv en l\u00e4nk",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Urlen du angav verkar vara en epost adress. Vill du l\u00e4gga till ett mailto: prefix?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Urlen du angav verkar vara en extern l\u00e4nk. Vill du l\u00e4gga till http:\/\/ prefixet?",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URLen du angav verkar vara en epost adress. Vill du l\u00e4gga till ett mailto: prefix?",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URLen du angav verkar vara en extern l\u00e4nk. Vill du l\u00e4gga till http:\/\/ prefixet?",
 "Link list": "L\u00e4nklista",
 "Insert video": "Infoga video",
 "Insert\/edit video": "Infoga\/redigera video",
@@ -258,4 +258,4 @@ tinymce.addI18n('sv_SE',{
 "Tools": "Verktyg",
 "Powered by {0}": "Powered by {0}",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Textredigerare. Tryck ALT-F9 f\u00f6r menyn. Tryck ALT-F10 f\u00f6r verktygsrader. Tryck ALT-0 f\u00f6r hj\u00e4lp."
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr.js
index 7b69596402..3dd22ca25f 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr.js
@@ -150,7 +150,7 @@ tinymce.addI18n('tr',{
 "Insert link": "Ba\u011flant\u0131 ekle",
 "Insert\/edit link": "Ba\u011flant\u0131 ekle\/d\u00fczenle",
 "Text to display": "Yaz\u0131y\u0131 g\u00f6r\u00fcnt\u00fcle",
-"Url": "Url",
+"Url": "URL",
 "Target": "Hedef",
 "None": "Hi\u00e7biri",
 "New window": "Yeni pencere",
@@ -258,4 +258,4 @@ tinymce.addI18n('tr',{
 "Tools": "Ara\u00e7lar",
 "Powered by {0}": "Powered by {0}",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zengin Metin Alan\u0131. Men\u00fc i\u00e7in ALT-F9 tu\u015funa bas\u0131n\u0131z. Ara\u00e7 \u00e7ubu\u011fu i\u00e7in ALT-F10 tu\u015funa bas\u0131n\u0131z. Yard\u0131m i\u00e7in ALT-0 tu\u015funa bas\u0131n\u0131z."
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr_TR.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr_TR.js
index ea89bc44c3..496fe3dc21 100644
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr_TR.js
+++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr_TR.js
@@ -150,7 +150,7 @@ tinymce.addI18n('tr_TR',{
 "Insert link": "Ba\u011flant\u0131 ekle",
 "Insert\/edit link": "Ba\u011flant\u0131 ekle\/d\u00fczenle",
 "Text to display": "G\u00f6r\u00fcnen yaz\u0131",
-"Url": "Url",
+"Url": "URL",
 "Target": "Hedef",
 "None": "Hi\u00e7biri",
 "New window": "Yeni pencere",
@@ -258,4 +258,4 @@ tinymce.addI18n('tr_TR',{
 "Tools": "Ara\u00e7lar",
 "Powered by {0}": "{0} taraf\u0131ndan yap\u0131lm\u0131\u015ft\u0131r ",
 "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zengin Metin Alan\u0131. Men\u00fc i\u00e7in ALT-F9 k\u0131sayolunu kullan\u0131n. Ara\u00e7 \u00e7ubu\u011fu i\u00e7in ALT-F10 k\u0131sayolunu kullan\u0131n. Yard\u0131m i\u00e7in ALT-0 k\u0131sayolunu kullan\u0131n."
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js b/src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js
index 823d3d526d..54fda13a0d 100644
--- a/src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js
+++ b/src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js
@@ -69,6 +69,18 @@
         };
     }
 
+    if (!String.prototype.trimStartSpecial) {
+        /** trimSpecial extension method for string */
+        // Removes all non printable chars from beginning of a string
+        String.prototype.trimStartSpecial = function () {            
+            var index = 0;
+            while (this.charCodeAt(index) <= 46) {
+                index++;
+            }            
+            return this.substr(index);
+        };
+    }
+
     if (!String.prototype.startsWith) {
         /** startsWith extension method for string */
         String.prototype.startsWith = function (str) {            
diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
new file mode 100644
index 0000000000..1b28cfb029
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -0,0 +1,16456 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.0.0"
+      }
+    },
+    "@babel/core": {
+      "version": "7.6.4",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.6.4.tgz",
+      "integrity": "sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.6.4",
+        "@babel/helpers": "^7.6.2",
+        "@babel/parser": "^7.6.4",
+        "@babel/template": "^7.6.0",
+        "@babel/traverse": "^7.6.3",
+        "@babel/types": "^7.6.3",
+        "convert-source-map": "^1.1.0",
+        "debug": "^4.1.0",
+        "json5": "^2.1.0",
+        "lodash": "^4.17.13",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "@babel/generator": {
+          "version": "7.6.4",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.6.4.tgz",
+          "integrity": "sha512-jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.6.3",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.13",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.6.4",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.4.tgz",
+          "integrity": "sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.6.3",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.3.tgz",
+          "integrity": "sha512-unn7P4LGsijIxaAJo/wpoU11zN+2IaClkQAxcJWBNCMS6cmVh802IyLHNkAjQ0iYnRS3nnxk5O3fuXW28IMxTw==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.5.5",
+            "@babel/generator": "^7.6.3",
+            "@babel/helper-function-name": "^7.1.0",
+            "@babel/helper-split-export-declaration": "^7.4.4",
+            "@babel/parser": "^7.6.3",
+            "@babel/types": "^7.6.3",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.13"
+          }
+        },
+        "@babel/types": {
+          "version": "7.6.3",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.3.tgz",
+          "integrity": "sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.6.2.tgz",
+      "integrity": "sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.6.0",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz",
+      "integrity": "sha1-Mj053QtQ4Qx8Bsp9djjmhk2MXDI=",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz",
+      "integrity": "sha1-a2lijf5Ah3mODE7Zjj1Kay+9L18=",
+      "dev": true,
+      "requires": {
+        "@babel/helper-explode-assignable-expression": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-call-delegate": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz",
+      "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/traverse": "^7.4.4",
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/helper-define-map": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz",
+      "integrity": "sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/types": "^7.5.5",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz",
+      "integrity": "sha1-U3+hP28WdN90WwwA7I/k6ZaByPY=",
+      "dev": true,
+      "requires": {
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
+      "integrity": "sha1-oM6wFoX3M1XUNgwSR/WCv6/I/1M=",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
+      "integrity": "sha1-g1ctQyDipGVyY3NBE8QoaLZOScM=",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz",
+      "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz",
+      "integrity": "sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.5.5"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz",
+      "integrity": "sha1-lggbcRHkhtpNLNlxrRpP4hbMLj0=",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz",
+      "integrity": "sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/template": "^7.4.4",
+        "@babel/types": "^7.5.5",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz",
+      "integrity": "sha1-opIMVwKwc8Fd5REGIAqoytIEl9U=",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
+      "integrity": "sha1-u7P77phmHFaQNCN8wDlnupm08lA=",
+      "dev": true
+    },
+    "@babel/helper-regex": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.5.5.tgz",
+      "integrity": "sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz",
+      "integrity": "sha1-Nh2AghtvONp1vT8HheziCojF/n8=",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-wrap-function": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-replace-supers": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz",
+      "integrity": "sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.5.5",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz",
+      "integrity": "sha1-Ze65VMjCRb6qToWdphiPOdceWFw=",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
+      "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/helper-wrap-function": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz",
+      "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.2.0"
+      }
+    },
+    "@babel/helpers": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz",
+      "integrity": "sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.6.0",
+        "@babel/traverse": "^7.6.2",
+        "@babel/types": "^7.6.0"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
+      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@babel/parser": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.2.tgz",
+      "integrity": "sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==",
+      "dev": true
+    },
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz",
+      "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0",
+        "@babel/plugin-syntax-async-generators": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-dynamic-import": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz",
+      "integrity": "sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-json-strings": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
+      "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-json-strings": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz",
+      "integrity": "sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz",
+      "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz",
+      "integrity": "sha512-NxHETdmpeSCtiatMRYWVJo7266rrvAC3DTeG5exQBIH/fMIUK7ejDNznBbn3HQl/o9peymRRg7Yqkx6PdUXmMw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.6.0"
+      }
+    },
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz",
+      "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-syntax-dynamic-import": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz",
+      "integrity": "sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz",
+      "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz",
+      "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz",
+      "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz",
+      "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz",
+      "integrity": "sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0"
+      }
+    },
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz",
+      "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz",
+      "integrity": "sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/plugin-transform-classes": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz",
+      "integrity": "sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-define-map": "^7.5.5",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.5.5",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz",
+      "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz",
+      "integrity": "sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz",
+      "integrity": "sha512-KGKT9aqKV+9YMZSkowzYoYEiHqgaDhGmPNZlZxX6UeHC4z30nC1J9IrZuGqbYFB1jaIGdv91ujpze0exiVK8bA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.6.0"
+      }
+    },
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz",
+      "integrity": "sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz",
+      "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-for-of": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz",
+      "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-function-name": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz",
+      "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz",
+      "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz",
+      "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz",
+      "integrity": "sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
+      }
+    },
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz",
+      "integrity": "sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
+      }
+    },
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz",
+      "integrity": "sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
+      }
+    },
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz",
+      "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.3.tgz",
+      "integrity": "sha512-jTkk7/uE6H2s5w6VlMHeWuH+Pcy2lmdwFoeWCVnvIrDUnB5gQqTVI8WfmEAhF2CDEarGrknZcmSFg1+bkfCoSw==",
+      "dev": true,
+      "requires": {
+        "regexpu-core": "^4.6.0"
+      }
+    },
+    "@babel/plugin-transform-new-target": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz",
+      "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-object-super": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz",
+      "integrity": "sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.5.5"
+      }
+    },
+    "@babel/plugin-transform-parameters": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz",
+      "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-call-delegate": "^7.4.4",
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz",
+      "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz",
+      "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "^0.14.0"
+      }
+    },
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz",
+      "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz",
+      "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-spread": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz",
+      "integrity": "sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz",
+      "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz",
+      "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz",
+      "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz",
+      "integrity": "sha512-orZI6cWlR3nk2YmYdb0gImrgCUwb5cBUwjf6Ks6dvNVvXERkwtJWOQaEOjPiu0Gu1Tq6Yq/hruCZZOOi9F34Dw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.6.0"
+      }
+    },
+    "@babel/preset-env": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.6.3.tgz",
+      "integrity": "sha512-CWQkn7EVnwzlOdR5NOm2+pfgSNEZmvGjOhlCHBDq0J8/EStr+G+FvPEiz9B56dR6MoiUFjXhfE4hjLoAKKJtIQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
+        "@babel/plugin-proposal-dynamic-import": "^7.5.0",
+        "@babel/plugin-proposal-json-strings": "^7.2.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.6.2",
+        "@babel/plugin-syntax-async-generators": "^7.2.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+        "@babel/plugin-syntax-json-strings": "^7.2.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-transform-arrow-functions": "^7.2.0",
+        "@babel/plugin-transform-async-to-generator": "^7.5.0",
+        "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
+        "@babel/plugin-transform-block-scoping": "^7.6.3",
+        "@babel/plugin-transform-classes": "^7.5.5",
+        "@babel/plugin-transform-computed-properties": "^7.2.0",
+        "@babel/plugin-transform-destructuring": "^7.6.0",
+        "@babel/plugin-transform-dotall-regex": "^7.6.2",
+        "@babel/plugin-transform-duplicate-keys": "^7.5.0",
+        "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
+        "@babel/plugin-transform-for-of": "^7.4.4",
+        "@babel/plugin-transform-function-name": "^7.4.4",
+        "@babel/plugin-transform-literals": "^7.2.0",
+        "@babel/plugin-transform-member-expression-literals": "^7.2.0",
+        "@babel/plugin-transform-modules-amd": "^7.5.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.6.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.5.0",
+        "@babel/plugin-transform-modules-umd": "^7.2.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.6.3",
+        "@babel/plugin-transform-new-target": "^7.4.4",
+        "@babel/plugin-transform-object-super": "^7.5.5",
+        "@babel/plugin-transform-parameters": "^7.4.4",
+        "@babel/plugin-transform-property-literals": "^7.2.0",
+        "@babel/plugin-transform-regenerator": "^7.4.5",
+        "@babel/plugin-transform-reserved-words": "^7.2.0",
+        "@babel/plugin-transform-shorthand-properties": "^7.2.0",
+        "@babel/plugin-transform-spread": "^7.6.2",
+        "@babel/plugin-transform-sticky-regex": "^7.2.0",
+        "@babel/plugin-transform-template-literals": "^7.4.4",
+        "@babel/plugin-transform-typeof-symbol": "^7.2.0",
+        "@babel/plugin-transform-unicode-regex": "^7.6.2",
+        "@babel/types": "^7.6.3",
+        "browserslist": "^4.6.0",
+        "core-js-compat": "^3.1.1",
+        "invariant": "^2.2.2",
+        "js-levenshtein": "^1.1.3",
+        "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "@babel/types": {
+          "version": "7.6.3",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.3.tgz",
+          "integrity": "sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/template": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz",
+      "integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.6.0",
+        "@babel/types": "^7.6.0"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.2.tgz",
+      "integrity": "sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.6.2",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/parser": "^7.6.2",
+        "@babel/types": "^7.6.0",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.13"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/types": {
+      "version": "7.6.1",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz",
+      "integrity": "sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.13",
+        "to-fast-properties": "^2.0.0"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
+      }
+    },
+    "@gulp-sourcemaps/identity-map": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz",
+      "integrity": "sha512-ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ==",
+      "dev": true,
+      "requires": {
+        "acorn": "^5.0.3",
+        "css": "^2.2.1",
+        "normalize-path": "^2.1.1",
+        "source-map": "^0.6.0",
+        "through2": "^2.0.3"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.7.4",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "@gulp-sourcemaps/map-sources": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
+      "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
+      "dev": true,
+      "requires": {
+        "normalize-path": "^2.0.1",
+        "through2": "^2.0.3"
+      }
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
+      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.3",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.3",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@sindresorhus/is": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
+      "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==",
+      "dev": true,
+      "optional": true
+    },
+    "@types/angular": {
+      "version": "1.6.56",
+      "resolved": "https://registry.npmjs.org/@types/angular/-/angular-1.6.56.tgz",
+      "integrity": "sha512-HxtqilvklZ7i6XOaiP7uIJIrFXEVEhfbSY45nfv2DeBRngncI58Y4ZOUMiUkcT8sqgLL1ablmbfylChUg7A3GA=="
+    },
+    "@types/events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
+      "dev": true
+    },
+    "@types/glob": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
+      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+      "dev": true,
+      "requires": {
+        "@types/events": "*",
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "12.11.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.11.2.tgz",
+      "integrity": "sha512-dsfE4BHJkLQW+reOS6b17xhZ/6FB1rB8eRRvO08nn5o+voxf3i74tuyFWNH6djdfgX7Sm5s6LD8t6mJug4dpDw==",
+      "dev": true
+    },
+    "@types/q": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
+      "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==",
+      "dev": true
+    },
+    "abab": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+      "dev": true
+    },
+    "accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "dev": true,
+      "requires": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      }
+    },
+    "accord": {
+      "version": "0.29.0",
+      "resolved": "https://registry.npmjs.org/accord/-/accord-0.29.0.tgz",
+      "integrity": "sha1-t0HBdtAENcWSnUZt/oz2vukzseQ=",
+      "dev": true,
+      "requires": {
+        "convert-source-map": "^1.5.0",
+        "glob": "^7.0.5",
+        "indx": "^0.2.3",
+        "lodash.clone": "^4.3.2",
+        "lodash.defaults": "^4.0.1",
+        "lodash.flatten": "^4.2.0",
+        "lodash.merge": "^4.4.0",
+        "lodash.partialright": "^4.1.4",
+        "lodash.pick": "^4.2.1",
+        "lodash.uniq": "^4.3.0",
+        "resolve": "^1.5.0",
+        "semver": "^5.3.0",
+        "uglify-js": "^2.8.22",
+        "when": "^3.7.8"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+          "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        }
+      }
+    },
+    "ace-builds": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.2.tgz",
+      "integrity": "sha1-avwuQ6e17/3ETYQHQ2EShSVo6A0="
+    },
+    "acorn": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
+      "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
+      "dev": true
+    },
+    "acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dev": true,
+      "requires": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "dev": true
+        }
+      }
+    },
+    "acorn-jsx": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz",
+      "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==",
+      "dev": true
+    },
+    "acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true
+    },
+    "after": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
+      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
+      "dev": true
+    },
+    "ajv": {
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2",
+        "longest": "^1.0.1",
+        "repeat-string": "^1.5.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "alphanum-sort": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
+      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
+      "dev": true
+    },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
+    "angular": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/angular/-/angular-1.8.0.tgz",
+      "integrity": "sha512-VdaMx+Qk0Skla7B5gw77a8hzlcOakwF8mjlW13DpIWIDlfqwAbSSLfd8N/qZnzEmQF4jC4iofInd3gE7vL8ZZg=="
+    },
+    "angular-animate": {
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.7.5.tgz",
+      "integrity": "sha1-H/xsKpze4ieiunnMbNj3HsRNtdw="
+    },
+    "angular-aria": {
+      "version": "1.7.9",
+      "resolved": "https://registry.npmjs.org/angular-aria/-/angular-aria-1.7.9.tgz",
+      "integrity": "sha512-luI3Jemd1AbOQW0krdzfEG3fM0IFtLY0bSSqIDEx3POE0XjKIC1MkrO8Csyq9PPgueLphyAPofzUwZ8YeZ88SA=="
+    },
+    "angular-chart.js": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/angular-chart.js/-/angular-chart.js-1.1.1.tgz",
+      "integrity": "sha1-SfDhjQgXYrbUyXkeSHr/L7sw9a4=",
+      "requires": {
+        "angular": "1.x",
+        "chart.js": "2.3.x"
+      },
+      "dependencies": {
+        "chart.js": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.3.0.tgz",
+          "integrity": "sha1-QEYOSOLEF8BfwzJc2E97AA3H19Y=",
+          "requires": {
+            "chartjs-color": "^2.0.0",
+            "moment": "^2.10.6"
+          }
+        }
+      }
+    },
+    "angular-cookies": {
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.7.5.tgz",
+      "integrity": "sha1-HFqzwFzcQ/F3e+lQbmRYfLNUNjQ="
+    },
+    "angular-dynamic-locale": {
+      "version": "0.1.37",
+      "resolved": "https://registry.npmjs.org/angular-dynamic-locale/-/angular-dynamic-locale-0.1.37.tgz",
+      "integrity": "sha1-fon70uxFvdaryJ82zaiJODjkk1Q=",
+      "requires": {
+        "@types/angular": "^1.6.25"
+      }
+    },
+    "angular-i18n": {
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/angular-i18n/-/angular-i18n-1.7.5.tgz",
+      "integrity": "sha1-Lie2Thl3qMa2sFHFHQF1xtTcglI="
+    },
+    "angular-local-storage": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/angular-local-storage/-/angular-local-storage-0.7.1.tgz",
+      "integrity": "sha1-+9JzB2PCn6mvVyXgGGx4BiHozdI="
+    },
+    "angular-messages": {
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/angular-messages/-/angular-messages-1.7.5.tgz",
+      "integrity": "sha1-fC/XgTFaQ6GYOLEX2gFCqYhFThQ="
+    },
+    "angular-mocks": {
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.7.5.tgz",
+      "integrity": "sha1-yLq6WgbtYLk0aXAmtJIWliavOEs="
+    },
+    "angular-route": {
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/angular-route/-/angular-route-1.7.5.tgz",
+      "integrity": "sha1-NKNkjEB6FKAw0HXPSFMY4zuiPw4="
+    },
+    "angular-sanitize": {
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.7.5.tgz",
+      "integrity": "sha1-ddSeFQccqccFgedtIJQPJjcuJNI="
+    },
+    "angular-touch": {
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/angular-touch/-/angular-touch-1.7.5.tgz",
+      "integrity": "sha1-7SYyKmhfApmyPLauqYNMEZQk2kY="
+    },
+    "angular-ui-sortable": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/angular-ui-sortable/-/angular-ui-sortable-0.19.0.tgz",
+      "integrity": "sha1-SsQ5H8TU3lcRDbS10xp8GY0xT9A=",
+      "requires": {
+        "angular": ">=1.2.x",
+        "jquery": ">=3.1.x",
+        "jquery-ui-dist": ">=1.12.x"
+      }
+    },
+    "animejs": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/animejs/-/animejs-2.2.0.tgz",
+      "integrity": "sha1-Ne79/FNbgZScnLBvCz5gwC5v3IA="
+    },
+    "ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha1-Y3S03V1HGP884npnGjscrQdxMqk=",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "^0.1.0"
+      }
+    },
+    "ansi-cyan": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
+      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "0.1.0"
+      }
+    },
+    "ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+      "dev": true
+    },
+    "ansi-gray": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "0.1.0"
+      }
+    },
+    "ansi-red": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
+      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "0.1.0"
+      }
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      },
+      "dependencies": {
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        }
+      }
+    },
+    "ansi-wrap": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
+      "dev": true
+    },
+    "anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=",
+      "dev": true,
+      "requires": {
+        "micromatch": "^2.1.5",
+        "normalize-path": "^2.0.0"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.0.1"
+          }
+        },
+        "array-unique": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+          "dev": true
+        },
+        "braces": {
+          "version": "1.8.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+          "dev": true,
+          "requires": {
+            "expand-range": "^1.8.1",
+            "preserve": "^0.2.0",
+            "repeat-element": "^1.1.2"
+          }
+        },
+        "expand-brackets": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+          "dev": true,
+          "requires": {
+            "is-posix-bracket": "^0.1.0"
+          }
+        },
+        "extglob": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        },
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        },
+        "micromatch": {
+          "version": "2.3.11",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^2.0.0",
+            "array-unique": "^0.2.1",
+            "braces": "^1.8.2",
+            "expand-brackets": "^0.1.4",
+            "extglob": "^0.3.1",
+            "filename-regex": "^2.0.0",
+            "is-extglob": "^1.0.0",
+            "is-glob": "^2.0.1",
+            "kind-of": "^3.0.2",
+            "normalize-path": "^2.0.1",
+            "object.omit": "^2.0.0",
+            "parse-glob": "^3.0.4",
+            "regex-cache": "^0.4.2"
+          }
+        }
+      }
+    },
+    "append-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
+      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
+      "dev": true,
+      "requires": {
+        "buffer-equal": "^1.0.0"
+      }
+    },
+    "arch": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz",
+      "integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==",
+      "dev": true,
+      "optional": true
+    },
+    "archive-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-4.0.0.tgz",
+      "integrity": "sha1-+S5yIzBW38aWlHJ0nCZ72wRrHXA=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-type": "^4.2.0"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
+          "integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+      "dev": true
+    },
+    "argh": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/argh/-/argh-0.1.4.tgz",
+      "integrity": "sha1-PrTWEpc/xrbcbvM49W91nyrFw6Y=",
+      "dev": true
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
+    },
+    "arr-filter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
+      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
+      "dev": true,
+      "requires": {
+        "make-iterator": "^1.0.0"
+      }
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
+      "dev": true
+    },
+    "arr-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
+      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
+      "dev": true,
+      "requires": {
+        "make-iterator": "^1.0.0"
+      }
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-differ": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
+      "dev": true
+    },
+    "array-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+      "dev": true
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true,
+      "optional": true
+    },
+    "array-initial": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
+      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
+      "dev": true,
+      "requires": {
+        "array-slice": "^1.0.0",
+        "is-number": "^4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        }
+      }
+    },
+    "array-last": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
+      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+      "dev": true,
+      "requires": {
+        "is-number": "^4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        }
+      }
+    },
+    "array-slice": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+      "integrity": "sha1-42jqFfibxwaff/uJrsOmx9SsItQ=",
+      "dev": true
+    },
+    "array-sort": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
+      "integrity": "sha1-5MBTVkU/VvU1EqfR1hI/LFTAqIo=",
+      "dev": true,
+      "requires": {
+        "default-compare": "^1.0.0",
+        "get-value": "^2.0.6",
+        "kind-of": "^5.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
+          "dev": true
+        }
+      }
+    },
+    "array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "arraybuffer.slice": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
+      "integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU=",
+      "dev": true
+    },
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
+      "dev": true,
+      "optional": true
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
+    "astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha1-bIw/uCfdQ+45GPJ7gngqt2WKb9k=",
+      "dev": true
+    },
+    "async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.14"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
+      }
+    },
+    "async-done": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
+      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.2",
+        "process-nextick-args": "^2.0.0",
+        "stream-exhaust": "^1.0.1"
+      }
+    },
+    "async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "dev": true
+    },
+    "async-limiter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
+      "dev": true
+    },
+    "async-settle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
+      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
+      "dev": true,
+      "requires": {
+        "async-done": "^1.2.2"
+      }
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k=",
+      "dev": true
+    },
+    "autoprefixer": {
+      "version": "9.6.5",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.5.tgz",
+      "integrity": "sha512-rGd50YV8LgwFQ2WQp4XzOTG69u1qQsXn0amww7tjqV5jJuNazgFKYEVItEBngyyvVITKOg20zr2V+9VsrXJQ2g==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.7.0",
+        "caniuse-lite": "^1.0.30000999",
+        "chalk": "^2.4.2",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.18",
+        "postcss-value-parser": "^4.0.2"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
+          "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==",
+          "dev": true
+        }
+      }
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha1-8OAD2cqef1nHpQiUXXsu+aBKVC8=",
+      "dev": true
+    },
+    "babel-plugin-dynamic-import-node": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
+      "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
+      "dev": true,
+      "requires": {
+        "object.assign": "^4.1.0"
+      }
+    },
+    "bach": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
+      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
+      "dev": true,
+      "requires": {
+        "arr-filter": "^1.1.1",
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "array-each": "^1.0.0",
+        "array-initial": "^1.0.0",
+        "array-last": "^1.1.1",
+        "async-done": "^1.2.2",
+        "async-settle": "^1.0.0",
+        "now-and-later": "^2.0.0"
+      }
+    },
+    "backo2": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
+      "dev": true,
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "base64-arraybuffer": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
+      "dev": true
+    },
+    "base64-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+      "dev": true,
+      "optional": true
+    },
+    "base64id": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
+      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "beeper": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
+      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
+      "dev": true
+    },
+    "better-assert": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
+      "dev": true,
+      "requires": {
+        "callsite": "1.0.0"
+      }
+    },
+    "bin-build": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bin-build/-/bin-build-3.0.0.tgz",
+      "integrity": "sha512-jcUOof71/TNAI2uM5uoUaDq2ePcVBQ3R/qhxAz1rX7UfvduAL/RXD3jXzvn8cVcDJdGVkiR1shal3OH0ImpuhA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "decompress": "^4.0.0",
+        "download": "^6.2.2",
+        "execa": "^0.7.0",
+        "p-map-series": "^1.0.0",
+        "tempfile": "^2.0.0"
+      }
+    },
+    "bin-check": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz",
+      "integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "execa": "^0.7.0",
+        "executable": "^4.1.0"
+      }
+    },
+    "bin-version": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-3.1.0.tgz",
+      "integrity": "sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "execa": "^1.0.0",
+        "find-versions": "^3.0.0"
+      },
+      "dependencies": {
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "bin-version-check": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-4.0.0.tgz",
+      "integrity": "sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "bin-version": "^3.0.0",
+        "semver": "^5.6.0",
+        "semver-truncate": "^1.1.2"
+      }
+    },
+    "bin-wrapper": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-4.1.0.tgz",
+      "integrity": "sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "bin-check": "^4.1.0",
+        "bin-version-check": "^4.0.0",
+        "download": "^7.1.0",
+        "import-lazy": "^3.1.0",
+        "os-filter-obj": "^2.0.0",
+        "pify": "^4.0.1"
+      },
+      "dependencies": {
+        "download": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/download/-/download-7.1.0.tgz",
+          "integrity": "sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "archive-type": "^4.0.0",
+            "caw": "^2.0.1",
+            "content-disposition": "^0.5.2",
+            "decompress": "^4.2.0",
+            "ext-name": "^5.0.0",
+            "file-type": "^8.1.0",
+            "filenamify": "^2.0.0",
+            "get-stream": "^3.0.0",
+            "got": "^8.3.1",
+            "make-dir": "^1.2.0",
+            "p-event": "^2.1.0",
+            "pify": "^3.0.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+              "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "file-type": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz",
+          "integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==",
+          "dev": true,
+          "optional": true
+        },
+        "got": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz",
+          "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "@sindresorhus/is": "^0.7.0",
+            "cacheable-request": "^2.1.1",
+            "decompress-response": "^3.3.0",
+            "duplexer3": "^0.1.4",
+            "get-stream": "^3.0.0",
+            "into-stream": "^3.1.0",
+            "is-retry-allowed": "^1.1.0",
+            "isurl": "^1.0.0-alpha5",
+            "lowercase-keys": "^1.0.0",
+            "mimic-response": "^1.0.0",
+            "p-cancelable": "^0.4.0",
+            "p-timeout": "^2.0.1",
+            "pify": "^3.0.0",
+            "safe-buffer": "^5.1.1",
+            "timed-out": "^4.0.1",
+            "url-parse-lax": "^3.0.0",
+            "url-to-options": "^1.0.1"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+              "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "make-dir": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "pify": "^3.0.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+              "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "p-cancelable": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
+          "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
+          "dev": true,
+          "optional": true
+        },
+        "p-event": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz",
+          "integrity": "sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "p-timeout": "^2.0.1"
+          }
+        },
+        "p-timeout": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
+          "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "p-finally": "^1.0.0"
+          }
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true,
+          "optional": true
+        },
+        "prepend-http": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+          "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+          "dev": true,
+          "optional": true
+        },
+        "url-parse-lax": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+          "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "prepend-http": "^2.0.0"
+          }
+        }
+      }
+    },
+    "binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true
+    },
+    "bl": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+      "integrity": "sha1-oWCRFxcQPAdBDO9j71Gzl8Alr5w=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "readable-stream": "^2.3.5",
+        "safe-buffer": "^5.1.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true,
+          "optional": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "blob": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
+      "integrity": "sha1-1oDu7yX4zZGtUz9bAe7UjmTK9oM=",
+      "dev": true
+    },
+    "bluebird": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz",
+      "integrity": "sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==",
+      "dev": true
+    },
+    "body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.1.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+          "dev": true
+        }
+      }
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
+    "bootstrap": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
+      "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="
+    },
+    "bootstrap-social": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/bootstrap-social/-/bootstrap-social-5.1.1.tgz",
+      "integrity": "sha1-dTDGeK31bPj60/qCwp1NPl0CdQE=",
+      "requires": {
+        "bootstrap": "~3",
+        "font-awesome": "~4.7"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true
+    },
+    "browserslist": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.0.tgz",
+      "integrity": "sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30000989",
+        "electron-to-chromium": "^1.3.247",
+        "node-releases": "^1.1.29"
+      }
+    },
+    "buffer": {
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz",
+      "integrity": "sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4"
+      }
+    },
+    "buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha1-iQ3ZDZI6hz4I4Q5f1RpX5bfM4Ow=",
+      "dev": true,
+      "requires": {
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
+      }
+    },
+    "buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha1-vX3CauKXLQ7aJTvgYdupkjScGfA=",
+      "dev": true
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true,
+      "optional": true
+    },
+    "buffer-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+      "dev": true
+    },
+    "buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
+      "dev": true
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=",
+      "dev": true
+    },
+    "bufferstreams": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.0.1.tgz",
+      "integrity": "sha1-z7GtlWjTujz+k1upq92VLeiKqyo=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^1.0.33"
+      }
+    },
+    "bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "dev": true
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
+      "dev": true,
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "cacheable-request": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
+      "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "clone-response": "1.0.2",
+        "get-stream": "3.0.0",
+        "http-cache-semantics": "3.8.1",
+        "keyv": "3.0.0",
+        "lowercase-keys": "1.0.0",
+        "normalize-url": "2.0.1",
+        "responselike": "1.0.2"
+      },
+      "dependencies": {
+        "lowercase-keys": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
+          "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
+          "dev": true,
+          "optional": true
+        },
+        "normalize-url": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
+          "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "prepend-http": "^2.0.0",
+            "query-string": "^5.0.1",
+            "sort-keys": "^2.0.0"
+          }
+        },
+        "prepend-http": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+          "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+          "dev": true,
+          "optional": true
+        },
+        "sort-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
+          "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "is-plain-obj": "^1.0.0"
+          }
+        }
+      }
+    },
+    "caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "dev": true,
+      "requires": {
+        "callsites": "^2.0.0"
+      }
+    },
+    "caller-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "dev": true,
+      "requires": {
+        "caller-callsite": "^2.0.0"
+      }
+    },
+    "callsite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
+      "dev": true
+    },
+    "callsites": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+      "dev": true
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha1-Xk2Q4idJYdRikZl99Znj7QCO5MA=",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001168",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001168.tgz",
+      "integrity": "sha512-P2zmX7swIXKu+GMMR01TWa4csIKELTNnZKc+f1CjebmZJQtTAEXmpQSoKVJVVcvPGAA0TEYTOUp3VehavZSFPQ==",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "caw": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz",
+      "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "get-proxy": "^2.0.0",
+        "isurl": "^1.0.0-alpha5",
+        "tunnel-agent": "^0.6.0",
+        "url-to-options": "^1.0.1"
+      }
+    },
+    "center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+      "dev": true,
+      "requires": {
+        "align-text": "^0.1.3",
+        "lazy-cache": "^1.0.3"
+      }
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha1-kAlISfCTfy7twkJdDSip5fDLrZ4=",
+      "dev": true
+    },
+    "chart.js": {
+      "version": "2.9.4",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz",
+      "integrity": "sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==",
+      "requires": {
+        "chartjs-color": "^2.1.0",
+        "moment": "^2.10.2"
+      }
+    },
+    "chartjs-color": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.3.0.tgz",
+      "integrity": "sha512-hEvVheqczsoHD+fZ+tfPUE+1+RbV6b+eksp2LwAhwRTVXEjCSEavvk+Hg3H6SZfGlPh/UfmWKGIvZbtobOEm3g==",
+      "requires": {
+        "chartjs-color-string": "^0.6.0",
+        "color-convert": "^0.5.3"
+      }
+    },
+    "chartjs-color-string": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz",
+      "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==",
+      "requires": {
+        "color-name": "^1.0.0"
+      }
+    },
+    "chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "dev": true,
+      "requires": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha1-vLJLTzeTTZqnrBe0ra+J58du8us=",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        }
+      }
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "clean-css": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
+      "integrity": "sha1-LUEe92uFabbQyEBo2r6FsKpeXBc=",
+      "dev": true,
+      "requires": {
+        "source-map": "~0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "dev": true
+        }
+      }
+    },
+    "cli-color": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-1.4.0.tgz",
+      "integrity": "sha1-fRBzj0hSaCT4/n2lGFfLD1cv4B8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.1.1",
+        "d": "1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
+        "memoizee": "^0.4.14",
+        "timers-ext": "^0.1.5"
+      }
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "^2.0.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
+    "clipboard": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz",
+      "integrity": "sha1-g22v1mzw/qXXHOXVsL9ulYAJES0=",
+      "requires": {
+        "good-listener": "^1.2.2",
+        "select": "^1.1.2",
+        "tiny-emitter": "^2.0.0"
+      }
+    },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      }
+    },
+    "clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+      "dev": true
+    },
+    "clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
+      "dev": true
+    },
+    "clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "clone-stats": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
+      "dev": true
+    },
+    "cloneable-readable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "coa": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+      "dev": true,
+      "requires": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
+        "q": "^1.1.2"
+      }
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
+    },
+    "collection-map": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
+      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
+      "dev": true,
+      "requires": {
+        "arr-map": "^2.0.2",
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      }
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
+      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.1",
+        "color-string": "^1.5.2"
+      },
+      "dependencies": {
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        }
+      }
+    },
+    "color-convert": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
+      "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0="
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "color-string": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
+      "integrity": "sha1-ybvF8BtYtUkvPWhXRZy2WQziBMw=",
+      "dev": true,
+      "requires": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha1-k4NDeaHMmgxh+C9S8NBDIiUb1aI=",
+      "dev": true
+    },
+    "colornames": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz",
+      "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true
+    },
+    "colorspace": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz",
+      "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==",
+      "dev": true,
+      "requires": {
+        "color": "3.0.x",
+        "text-hex": "1.0.x"
+      },
+      "dependencies": {
+        "color": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
+          "integrity": "sha1-2SC0Mo1TSjrIKV1o971LpsQnvpo=",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.1",
+            "color-string": "^1.5.2"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        }
+      }
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+      "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "graceful-readlink": ">= 1.0.0"
+      }
+    },
+    "component-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "component-inherit": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "concat-with-sourcemaps": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
+      "integrity": "sha1-1OqT8FriV5CVG5nns7CeOQikCC4=",
+      "dev": true,
+      "requires": {
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "dev": true
+        }
+      }
+    },
+    "config-chain": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
+      "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "ini": "^1.3.4",
+        "proto-list": "~1.2.1"
+      }
+    },
+    "connect": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "finalhandler": "1.1.2",
+        "parseurl": "~1.3.3",
+        "utils-merge": "1.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "console-stream": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/console-stream/-/console-stream-0.1.1.tgz",
+      "integrity": "sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ=",
+      "dev": true,
+      "optional": true
+    },
+    "consolidate": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
+      "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.1.1"
+      }
+    },
+    "content-disposition": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+      "integrity": "sha1-UbU3qMQ+DwTewZk7/83VBOdYrCA=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+      "dev": true
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "copy-props": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
+      "integrity": "sha1-k7scrfr9MdpbuKnUtB9HHsOnLf4=",
+      "dev": true,
+      "requires": {
+        "each-props": "^1.3.0",
+        "is-plain-object": "^2.0.1"
+      }
+    },
+    "core-js-compat": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.3.3.tgz",
+      "integrity": "sha512-GNZkENsx5pMnS7Inwv7ZO/s3B68a9WU5kIjxqrD/tkNR8mtfXJRk8fAKRlbvWZSGPc59/TkiOBDYl5Cb65pTVA==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.7.1",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "browserslist": {
+          "version": "4.7.1",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.1.tgz",
+          "integrity": "sha512-QtULFqKIAtiyNx7NhZ/p4rB8m3xDozVo/pi5VgTlADLF2tNigz/QH+v0m5qhn7XfHT7u+607NcCNOnC0HZAlMg==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "^1.0.30000999",
+            "electron-to-chromium": "^1.3.284",
+            "node-releases": "^1.1.36"
+          }
+        },
+        "electron-to-chromium": {
+          "version": "1.3.292",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.292.tgz",
+          "integrity": "sha512-hqkem5ANpt6mxVXmhAmlbdG8iicuyM/jEYgmP1tiHPeOLyZoTyGUzrDmJS/xyrrZy9frkW1uQcubicu7f6DS5g==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.37",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.37.tgz",
+          "integrity": "sha512-0EOsAEdn6S2vQdDGBWBpmClm5BCkXVkVOURdnhfg7//rxI2XbleRdKig87WuBrk+0PHZ4OhO58fRm9mzWW4jNw==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.3.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cosmiconfig": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+      "dev": true,
+      "requires": {
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
+      }
+    },
+    "cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
+      "dev": true,
+      "requires": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "css": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.5.2",
+        "urix": "^0.1.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "css-color-names": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+      "dev": true
+    },
+    "css-declaration-sorter": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
+      "integrity": "sha1-wZiUD2OnbX42wecQGLABchBUyyI=",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.1",
+        "timsort": "^0.3.0"
+      }
+    },
+    "css-select": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
+      "integrity": "sha1-q0OGzsnh9miFVWSxfDcztDsqXt4=",
+      "dev": true,
+      "requires": {
+        "boolbase": "^1.0.0",
+        "css-what": "^2.1.2",
+        "domutils": "^1.7.0",
+        "nth-check": "^1.0.2"
+      }
+    },
+    "css-select-base-adapter": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+      "integrity": "sha1-Oy/0lyzDYquIVhUHqVQIoUMhNdc=",
+      "dev": true
+    },
+    "css-tree": {
+      "version": "1.0.0-alpha.33",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.33.tgz",
+      "integrity": "sha512-SPt57bh5nQnpsTBsx/IXbO14sRc9xXu5MtMAVuo0BaQQmyf0NupNPPSoMaqiAF5tDFafYsTkfeH4Q/HCKXkg4w==",
+      "dev": true,
+      "requires": {
+        "mdn-data": "2.0.4",
+        "source-map": "^0.5.3"
+      }
+    },
+    "css-unit-converter": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz",
+      "integrity": "sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=",
+      "dev": true
+    },
+    "css-what": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+      "dev": true
+    },
+    "cssesc": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+      "integrity": "sha1-OxO9G7HLNuG8taTc0n9UxdyzVwM=",
+      "dev": true
+    },
+    "cssnano": {
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
+      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^5.0.0",
+        "cssnano-preset-default": "^4.0.7",
+        "is-resolvable": "^1.0.0",
+        "postcss": "^7.0.0"
+      }
+    },
+    "cssnano-preset-default": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
+      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
+      "dev": true,
+      "requires": {
+        "css-declaration-sorter": "^4.0.1",
+        "cssnano-util-raw-cache": "^4.0.1",
+        "postcss": "^7.0.0",
+        "postcss-calc": "^7.0.1",
+        "postcss-colormin": "^4.0.3",
+        "postcss-convert-values": "^4.0.1",
+        "postcss-discard-comments": "^4.0.2",
+        "postcss-discard-duplicates": "^4.0.2",
+        "postcss-discard-empty": "^4.0.1",
+        "postcss-discard-overridden": "^4.0.1",
+        "postcss-merge-longhand": "^4.0.11",
+        "postcss-merge-rules": "^4.0.3",
+        "postcss-minify-font-values": "^4.0.2",
+        "postcss-minify-gradients": "^4.0.2",
+        "postcss-minify-params": "^4.0.2",
+        "postcss-minify-selectors": "^4.0.2",
+        "postcss-normalize-charset": "^4.0.1",
+        "postcss-normalize-display-values": "^4.0.2",
+        "postcss-normalize-positions": "^4.0.2",
+        "postcss-normalize-repeat-style": "^4.0.2",
+        "postcss-normalize-string": "^4.0.2",
+        "postcss-normalize-timing-functions": "^4.0.2",
+        "postcss-normalize-unicode": "^4.0.1",
+        "postcss-normalize-url": "^4.0.1",
+        "postcss-normalize-whitespace": "^4.0.2",
+        "postcss-ordered-values": "^4.1.2",
+        "postcss-reduce-initial": "^4.0.3",
+        "postcss-reduce-transforms": "^4.0.2",
+        "postcss-svgo": "^4.0.2",
+        "postcss-unique-selectors": "^4.0.1"
+      }
+    },
+    "cssnano-util-get-arguments": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
+      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
+      "dev": true
+    },
+    "cssnano-util-get-match": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
+      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
+      "dev": true
+    },
+    "cssnano-util-raw-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
+      "integrity": "sha1-sm1f1fcqEd/np4RvtMZyYPlr8oI=",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "cssnano-util-same-parent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
+      "integrity": "sha1-V0CC+yhZ0ttDOFWDXZqEVuoYu/M=",
+      "dev": true
+    },
+    "csso": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
+      "integrity": "sha1-e564vmFiiXPBsmHhadLwJACOdYs=",
+      "dev": true,
+      "requires": {
+        "css-tree": "1.0.0-alpha.29"
+      },
+      "dependencies": {
+        "css-tree": {
+          "version": "1.0.0-alpha.29",
+          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz",
+          "integrity": "sha1-P6nU7zFCy9HDAedmTB81K9gvWjk=",
+          "dev": true,
+          "requires": {
+            "mdn-data": "~1.1.0",
+            "source-map": "^0.5.3"
+          }
+        },
+        "mdn-data": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz",
+          "integrity": "sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==",
+          "dev": true
+        }
+      }
+    },
+    "cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+      "dev": true
+    },
+    "cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "requires": {
+        "cssom": "~0.3.6"
+      },
+      "dependencies": {
+        "cssom": {
+          "version": "0.3.8",
+          "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+          "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+          "dev": true
+        }
+      }
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "array-find-index": "^1.0.1"
+      }
+    },
+    "custom-event": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
+      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
+      "dev": true
+    },
+    "d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "dev": true,
+      "requires": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "dev": true,
+      "requires": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      }
+    },
+    "date-format": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
+      "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==",
+      "dev": true
+    },
+    "dateformat": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
+      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
+      "dev": true
+    },
+    "debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "dev": true,
+      "requires": {
+        "ms": "^2.1.1"
+      }
+    },
+    "debug-fabulous": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
+      "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
+      "dev": true,
+      "requires": {
+        "debug": "3.X",
+        "memoizee": "0.4.X",
+        "object-assign": "4.X"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+          "dev": true
+        }
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "decimal.js": {
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
+      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "dev": true
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
+    "decompress": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz",
+      "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "decompress-tar": "^4.0.0",
+        "decompress-tarbz2": "^4.0.0",
+        "decompress-targz": "^4.0.0",
+        "decompress-unzip": "^4.0.1",
+        "graceful-fs": "^4.1.10",
+        "make-dir": "^1.0.0",
+        "pify": "^2.3.0",
+        "strip-dirs": "^2.0.0"
+      },
+      "dependencies": {
+        "make-dir": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "pify": "^3.0.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+              "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+              "dev": true,
+              "optional": true
+            }
+          }
+        }
+      }
+    },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "decompress-tar": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
+      "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-type": "^5.2.0",
+        "is-stream": "^1.1.0",
+        "tar-stream": "^1.5.2"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
+          "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "decompress-tarbz2": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
+      "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "decompress-tar": "^4.1.0",
+        "file-type": "^6.1.0",
+        "is-stream": "^1.1.0",
+        "seek-bzip": "^1.0.5",
+        "unbzip2-stream": "^1.0.9"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
+          "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "decompress-targz": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
+      "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "decompress-tar": "^4.1.1",
+        "file-type": "^5.2.0",
+        "is-stream": "^1.1.0"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
+          "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "decompress-unzip": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
+      "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-type": "^3.8.0",
+        "get-stream": "^2.2.0",
+        "pify": "^2.3.0",
+        "yauzl": "^2.4.2"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+          "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
+          "dev": true,
+          "optional": true
+        },
+        "get-stream": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
+          "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "object-assign": "^4.0.1",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "default-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
+      "integrity": "sha1-y2ETGESthNhHiPto/QFoHKd4Gi8=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^5.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
+          "dev": true
+        }
+      }
+    },
+    "default-resolution": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
+      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
+      "dev": true
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=",
+      "dev": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "delegate": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+      "integrity": "sha1-tmtxwxWFIuirV0T3INjKDCr1kWY="
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true
+    },
+    "detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+      "dev": true
+    },
+    "detect-newline": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
+      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
+      "dev": true
+    },
+    "di": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
+      "dev": true
+    },
+    "diagnostics": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz",
+      "integrity": "sha1-yrasM99wydmnJ0kK5DrJladpsio=",
+      "dev": true,
+      "requires": {
+        "colorspace": "1.1.x",
+        "enabled": "1.0.x",
+        "kuler": "1.0.x"
+      }
+    },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha1-gAwN0eCov7yVg1wgKtIg/jF+WhI="
+    },
+    "dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "requires": {
+        "path-type": "^4.0.0"
+      },
+      "dependencies": {
+        "path-type": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+          "dev": true
+        }
+      }
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "dom-serialize": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
+      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
+      "dev": true,
+      "requires": {
+        "custom-event": "~1.0.0",
+        "ent": "~2.2.0",
+        "extend": "^3.0.0",
+        "void-elements": "^2.0.0"
+      }
+    },
+    "dom-serializer": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz",
+      "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+          "dev": true
+        }
+      }
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
+    },
+    "domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "dev": true,
+      "requires": {
+        "webidl-conversions": "^5.0.0"
+      },
+      "dependencies": {
+        "webidl-conversions": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+          "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+          "dev": true
+        }
+      }
+    },
+    "domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha1-iAUJfpM9ZehVRvcm1g9euItE+AM=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1"
+      }
+    },
+    "domutils": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha1-Vuo0HoNOBuZ0ivehyyXaZ+qfjCo=",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "dot-prop": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+      "integrity": "sha1-HxngwuGqDjJ5fEl5nyg3rGr2nFc=",
+      "dev": true,
+      "requires": {
+        "is-obj": "^1.0.0"
+      }
+    },
+    "download": {
+      "version": "6.2.5",
+      "resolved": "https://registry.npmjs.org/download/-/download-6.2.5.tgz",
+      "integrity": "sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "caw": "^2.0.0",
+        "content-disposition": "^0.5.2",
+        "decompress": "^4.0.0",
+        "ext-name": "^5.0.0",
+        "file-type": "5.2.0",
+        "filenamify": "^2.0.0",
+        "get-stream": "^3.0.0",
+        "got": "^7.0.0",
+        "make-dir": "^1.0.0",
+        "p-event": "^1.0.0",
+        "pify": "^3.0.0"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
+          "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
+          "dev": true,
+          "optional": true
+        },
+        "make-dir": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "~1.1.9"
+      }
+    },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true,
+      "optional": true
+    },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "each-props": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
+      "integrity": "sha1-6kWkFNFt1c+kGbGoFyDVygaJIzM=",
+      "dev": true,
+      "requires": {
+        "is-plain-object": "^2.0.1",
+        "object.defaults": "^1.1.0"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true
+    },
+    "electron-to-chromium": {
+      "version": "1.3.266",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.266.tgz",
+      "integrity": "sha512-UTuTZ4v8T0gLPHI7U75PXLQePWI65MTS3mckRrnLCkNljHvsutbYs+hn2Ua/RFul3Jt/L3Ht2rLP+dU/AlBfrQ==",
+      "dev": true
+    },
+    "emits": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emits/-/emits-3.0.0.tgz",
+      "integrity": "sha1-MnUrupXhcHshlWI4Srm7ix/WL3A=",
+      "dev": true
+    },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "enabled": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz",
+      "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=",
+      "dev": true,
+      "requires": {
+        "env-variable": "0.0.x"
+      }
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      },
+      "dependencies": {
+        "once": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+          "dev": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        }
+      }
+    },
+    "engine.io": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
+      "integrity": "sha1-tgKBw1SEpw7gNR6g6/+D7IyVIqI=",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.4",
+        "base64id": "1.0.0",
+        "cookie": "0.3.1",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.0",
+        "ws": "~3.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "engine.io-client": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+      "integrity": "sha1-b1TAR13khxWKGnx30QF4cItq3TY=",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "component-inherit": "0.0.3",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.1",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "ws": "~3.3.1",
+        "xmlhttprequest-ssl": "~1.5.4",
+        "yeast": "0.1.2"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
+      "integrity": "sha1-dXq5cPvy37Mse3SwMyFtVznveaY=",
+      "dev": true,
+      "requires": {
+        "after": "0.8.2",
+        "arraybuffer.slice": "~0.0.7",
+        "base64-arraybuffer": "0.1.5",
+        "blob": "0.0.5",
+        "has-binary2": "~1.0.2"
+      }
+    },
+    "ent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+      "dev": true
+    },
+    "entities": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+      "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+      "dev": true
+    },
+    "env-variable": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.5.tgz",
+      "integrity": "sha1-kT3YML7xHpagOcA41BMGBOujf4g=",
+      "dev": true
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha1-tKxAZIEH/c3PriQvQovqihTU8b8=",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.15.0.tgz",
+      "integrity": "sha512-bhkEqWJ2t2lMeaJDuk7okMkJWI/yqgH/EoGwpcvv0XW9RWQsRspI4wt6xuyuvMvvQE3gg/D9HXppgk21w78GyQ==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "^1.2.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.0",
+        "is-callable": "^1.1.4",
+        "is-regex": "^1.0.4",
+        "object-inspect": "^1.6.0",
+        "object-keys": "^1.1.1",
+        "string.prototype.trimleft": "^2.1.0",
+        "string.prototype.trimright": "^2.1.0"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+      "integrity": "sha1-7fckeAM0VujdqO8J4ArZZQcH83c=",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "es5-ext": {
+      "version": "0.10.51",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz",
+      "integrity": "sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.1",
+        "next-tick": "^1.0.0"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "dev": true
+    },
+    "es6-symbol": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz",
+      "integrity": "sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==",
+      "dev": true,
+      "requires": {
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.51"
+      }
+    },
+    "es6-weak-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "escodegen": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
+      "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
+      "dev": true,
+      "requires": {
+        "esprima": "^3.1.3",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "eslint": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.5.1.tgz",
+      "integrity": "sha512-32h99BoLYStT1iq1v2P9uwpyznQ4M2jRiFB6acitKz52Gqn+vPaMDUTB1bYi1WN4Nquj2w+t+bimYUG83DC55A==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.10.0",
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^1.4.2",
+        "eslint-visitor-keys": "^1.1.0",
+        "espree": "^6.1.1",
+        "esquery": "^1.0.1",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^5.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.0.0",
+        "globals": "^11.7.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^6.4.1",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.14",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "progress": "^2.0.0",
+        "regexpp": "^2.0.1",
+        "semver": "^6.1.2",
+        "strip-ansi": "^5.2.0",
+        "strip-json-comments": "^3.0.1",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "glob-parent": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
+          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "import-fresh": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",
+          "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==",
+          "dev": true,
+          "requires": {
+            "parent-module": "^1.0.0",
+            "resolve-from": "^4.0.0"
+          }
+        },
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "resolve-from": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "eslint-scope": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
+      "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-utils": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^1.1.0"
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
+      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
+      "dev": true
+    },
+    "espree": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz",
+      "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==",
+      "dev": true,
+      "requires": {
+        "acorn": "^7.1.0",
+        "acorn-jsx": "^5.1.0",
+        "eslint-visitor-keys": "^1.1.0"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estemplate": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/estemplate/-/estemplate-0.5.1.tgz",
+      "integrity": "sha1-FxSp1GGQc4rJWLyv1J4CnNpWo54=",
+      "dev": true,
+      "requires": {
+        "esprima": "^2.7.2",
+        "estraverse": "^4.1.1"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+          "dev": true
+        }
+      }
+    },
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
+    "event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
+    "eventemitter3": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
+      "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==",
+      "dev": true
+    },
+    "exec-buffer": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz",
+      "integrity": "sha1-sWhtvZBMfPmC5lLB9aebHlVzCCs=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "execa": "^0.7.0",
+        "p-finally": "^1.0.0",
+        "pify": "^3.0.0",
+        "rimraf": "^2.5.4",
+        "tempfile": "^2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "cross-spawn": "^5.0.1",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        }
+      }
+    },
+    "executable": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
+      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "pify": "^2.2.0"
+      }
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "expand-range": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+      "dev": true,
+      "requires": {
+        "fill-range": "^2.1.0"
+      },
+      "dependencies": {
+        "fill-range": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+          "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=",
+          "dev": true,
+          "requires": {
+            "is-number": "^2.1.0",
+            "isobject": "^2.0.0",
+            "randomatic": "^3.0.0",
+            "repeat-element": "^1.1.2",
+            "repeat-string": "^1.5.2"
+          }
+        },
+        "is-number": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+          "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "isobject": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+          "dev": true,
+          "requires": {
+            "isarray": "1.0.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "ext-list": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
+      "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "mime-db": "^1.28.0"
+      }
+    },
+    "ext-name": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
+      "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "ext-list": "^2.0.0",
+        "sort-keys-length": "^1.0.0"
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=",
+      "dev": true
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "dev": true,
+      "requires": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
+    "fancy-log": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+      "integrity": "sha1-28GRVPVYaQFQojlToK29A1vkX8c=",
+      "dev": true,
+      "requires": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      }
+    },
+    "fast-deep-equal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "dev": true
+    },
+    "fast-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.0.tgz",
+      "integrity": "sha512-TrUz3THiq2Vy3bjfQUB2wNyPdGBeGmdjbzzBLhfHN4YFurYptCKwGq/TfiRavbGywFRzY6U2CdmQ1zmsY5yYaw==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.0",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.2"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "glob-parent": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
+          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "fastq": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz",
+      "integrity": "sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==",
+      "dev": true,
+      "requires": {
+        "reusify": "^1.0.0"
+      }
+    },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^2.0.1"
+      }
+    },
+    "file-type": {
+      "version": "12.3.1",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.3.1.tgz",
+      "integrity": "sha512-FXxY5h6vSYMjrRal4YqbtfuoKD/oE0AMjJ7E5Hm+BdaQECcFVD03B41RAWYJ7wyuLr/wRnCtFo7y37l+nh+TAA==",
+      "dev": true
+    },
+    "filename-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+      "dev": true
+    },
+    "filename-reserved-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
+      "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
+      "dev": true,
+      "optional": true
+    },
+    "filenamify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz",
+      "integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "filename-reserved-regex": "^2.0.0",
+        "strip-outer": "^1.0.0",
+        "trim-repeated": "^1.0.0"
+      }
+    },
+    "fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "dev": true,
+      "requires": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "find-versions": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.1.0.tgz",
+      "integrity": "sha512-NCTfNiVzeE/xL+roNDffGuRbrWI6atI18lTJ22vKp7rs2OhYzMK3W1dIdO2TUndH/QMcacM4d1uWwgcZcHK69Q==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "array-uniq": "^2.1.0",
+        "semver-regex": "^2.0.0"
+      },
+      "dependencies": {
+        "array-uniq": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-2.1.0.tgz",
+          "integrity": "sha512-bdHxtev7FN6+MXI1YFW0Q8mQ8dTJc2S8AMfju+ZR77pbg2yAdVyDlwkaUI7Har0LyOMRFPHrJ9lYdyjZZswdlQ==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "findup-sync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+      "dev": true,
+      "requires": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        }
+      }
+    },
+    "fined": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "is-plain-object": "^2.0.3",
+        "object.defaults": "^1.1.0",
+        "object.pick": "^1.2.0",
+        "parse-filepath": "^1.0.1"
+      }
+    },
+    "first-chunk-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
+      "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.2"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "flagged-respawn": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+      "dev": true
+    },
+    "flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "dev": true,
+      "requires": {
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      }
+    },
+    "flatpickr": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.5.2.tgz",
+      "integrity": "sha1-R8itRyoJbl+350uAmwcDU1OD8g0="
+    },
+    "flatted": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
+      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
+      "dev": true
+    },
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "follow-redirects": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz",
+      "integrity": "sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "font-awesome": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
+      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.1"
+      }
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=",
+      "dev": true,
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true,
+          "optional": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "fs": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.2.tgz",
+      "integrity": "sha1-4fJE7zkzwbKmS9R5kTYGDQ9ZFPg=",
+      "dev": true
+    },
+    "fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0=",
+      "dev": true,
+      "optional": true
+    },
+    "fs-mkdirp-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
+      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "through2": "^2.0.3"
+      }
+    },
+    "fs-readfile-promise": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-readfile-promise/-/fs-readfile-promise-3.0.1.tgz",
+      "integrity": "sha512-LsSxMeaJdYH27XrW7Dmq0Gx63mioULCRel63B5VeELYLavi1wF5s0XfsIdKDFdCL9hsfQ2qBvXJszQtQJ9h17A==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.12.0"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "deep-extend": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "^3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minipass": {
+          "version": "2.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "^4.1.0",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.1",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.2.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "^0.6.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.7.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "^1.0.2 || 2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
+      "dev": true
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha1-+Xj6TJDR3+f/LWvtoqUV5xO9z0o=",
+      "dev": true
+    },
+    "get-proxy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz",
+      "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "npm-conf": "^1.1.0"
+      }
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true,
+      "optional": true
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true,
+      "optional": true
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "gifsicle": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/gifsicle/-/gifsicle-4.0.1.tgz",
+      "integrity": "sha512-A/kiCLfDdV+ERV/UB+2O41mifd+RxH8jlRG8DMxZO84Bma/Fw0htqZ+hY2iaalLRNyUu7tYZQslqUBJxBggxbg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "bin-build": "^3.0.0",
+        "bin-wrapper": "^4.0.0",
+        "execa": "^1.0.0",
+        "logalot": "^2.0.0"
+      },
+      "dependencies": {
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "glob": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "dev": true,
+      "requires": {
+        "glob-parent": "^2.0.0",
+        "is-glob": "^2.0.0"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+          "dev": true,
+          "requires": {
+            "is-glob": "^2.0.0"
+          }
+        },
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        }
+      }
+    },
+    "glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "requires": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "glob-stream": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
+      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
+      "dev": true,
+      "requires": {
+        "extend": "^3.0.0",
+        "glob": "^7.1.1",
+        "glob-parent": "^3.1.0",
+        "is-negated-glob": "^1.0.0",
+        "ordered-read-streams": "^1.0.0",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.1.5",
+        "remove-trailing-separator": "^1.0.1",
+        "to-absolute-glob": "^2.0.0",
+        "unique-stream": "^2.0.2"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "glob-watcher": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
+      "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
+      "dev": true,
+      "requires": {
+        "anymatch": "^2.0.0",
+        "async-done": "^1.2.0",
+        "chokidar": "^2.0.0",
+        "is-negated-glob": "^1.0.0",
+        "just-debounce": "^1.0.0",
+        "object.defaults": "^1.1.0"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          }
+        }
+      }
+    },
+    "global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
+      "dev": true,
+      "requires": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      }
+    },
+    "global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true
+    },
+    "globby": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
+      "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
+      "dev": true,
+      "requires": {
+        "@types/glob": "^7.1.1",
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.0.3",
+        "glob": "^7.1.3",
+        "ignore": "^5.1.1",
+        "merge2": "^1.2.3",
+        "slash": "^3.0.0"
+      },
+      "dependencies": {
+        "ignore": {
+          "version": "5.1.4",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
+          "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==",
+          "dev": true
+        },
+        "slash": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+          "dev": true
+        }
+      }
+    },
+    "glogg": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+      "dev": true,
+      "requires": {
+        "sparkles": "^1.0.0"
+      }
+    },
+    "good-listener": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+      "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
+      "requires": {
+        "delegate": "^3.1.2"
+      }
+    },
+    "got": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
+      "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "decompress-response": "^3.2.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^3.0.0",
+        "is-plain-obj": "^1.1.0",
+        "is-retry-allowed": "^1.0.0",
+        "is-stream": "^1.0.0",
+        "isurl": "^1.0.0-alpha5",
+        "lowercase-keys": "^1.0.0",
+        "p-cancelable": "^0.3.0",
+        "p-timeout": "^1.1.1",
+        "safe-buffer": "^5.0.1",
+        "timed-out": "^4.0.0",
+        "url-parse-lax": "^1.0.0",
+        "url-to-options": "^1.0.1"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+      "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+      "dev": true
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+      "dev": true,
+      "optional": true
+    },
+    "growly": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
+      "dev": true
+    },
+    "gulp": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
+      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+      "dev": true,
+      "requires": {
+        "glob-watcher": "^5.0.3",
+        "gulp-cli": "^2.2.0",
+        "undertaker": "^1.2.1",
+        "vinyl-fs": "^3.0.0"
+      }
+    },
+    "gulp-angular-embed-templates": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/gulp-angular-embed-templates/-/gulp-angular-embed-templates-2.3.0.tgz",
+      "integrity": "sha1-wBDv3VlN7pRRMoNFN9eSOt6EDXk=",
+      "dev": true,
+      "requires": {
+        "gulp-util": "^3.0.6",
+        "htmlparser2": "~3.9.1",
+        "minimize": "^2.0.0",
+        "object-assign": "4.1.0",
+        "through2": "^2.0.1"
+      },
+      "dependencies": {
+        "object-assign": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
+          "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=",
+          "dev": true
+        }
+      }
+    },
+    "gulp-babel": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-babel/-/gulp-babel-8.0.0.tgz",
+      "integrity": "sha1-4NqW9PLsSojdOjAw9HbjirISbYc=",
+      "dev": true,
+      "requires": {
+        "plugin-error": "^1.0.1",
+        "replace-ext": "^1.0.0",
+        "through2": "^2.0.0",
+        "vinyl-sourcemaps-apply": "^0.2.0"
+      },
+      "dependencies": {
+        "replace-ext": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+          "dev": true
+        }
+      }
+    },
+    "gulp-clean-css": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.2.0.tgz",
+      "integrity": "sha512-r4zQsSOAK2UYUL/ipkAVCTRg/2CLZ2A+oPVORopBximRksJ6qy3EX1KGrIWT4ZrHxz3Hlobb1yyJtqiut7DNjA==",
+      "dev": true,
+      "requires": {
+        "clean-css": "4.2.1",
+        "plugin-error": "1.0.1",
+        "through2": "3.0.1",
+        "vinyl-sourcemaps-apply": "0.2.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.2.0"
+          }
+        },
+        "through2": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2 || 3"
+          }
+        }
+      }
+    },
+    "gulp-cli": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
+      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^1.0.1",
+        "archy": "^1.0.0",
+        "array-sort": "^1.0.0",
+        "color-support": "^1.1.3",
+        "concat-stream": "^1.6.0",
+        "copy-props": "^2.0.1",
+        "fancy-log": "^1.3.2",
+        "gulplog": "^1.0.0",
+        "interpret": "^1.4.0",
+        "isobject": "^3.0.1",
+        "liftoff": "^3.1.0",
+        "matchdep": "^2.0.0",
+        "mute-stdout": "^1.0.0",
+        "pretty-hrtime": "^1.0.0",
+        "replace-homedir": "^1.0.0",
+        "semver-greatest-satisfied-range": "^1.1.0",
+        "v8flags": "^3.2.0",
+        "yargs": "^7.1.0"
+      }
+    },
+    "gulp-concat": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
+      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
+      "dev": true,
+      "requires": {
+        "concat-with-sourcemaps": "^1.0.0",
+        "through2": "^2.0.0",
+        "vinyl": "^2.0.0"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+          "dev": true
+        },
+        "clone-stats": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+          "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+          "dev": true
+        },
+        "replace-ext": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+          "dev": true
+        },
+        "vinyl": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
+          "integrity": "sha1-2FsH2pbkWNJbL/4Z/s6fLKoT7YY=",
+          "dev": true,
+          "requires": {
+            "clone": "^2.1.1",
+            "clone-buffer": "^1.0.0",
+            "clone-stats": "^1.0.0",
+            "cloneable-readable": "^1.0.0",
+            "remove-trailing-separator": "^1.0.1",
+            "replace-ext": "^1.0.0"
+          }
+        }
+      }
+    },
+    "gulp-eslint": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-6.0.0.tgz",
+      "integrity": "sha512-dCVPSh1sA+UVhn7JSQt7KEb4An2sQNbOdB3PA8UCfxsoPlAKjJHxYHGXdXC7eb+V1FAnilSFFqslPrq037l1ig==",
+      "dev": true,
+      "requires": {
+        "eslint": "^6.0.0",
+        "fancy-log": "^1.3.2",
+        "plugin-error": "^1.0.1"
+      }
+    },
+    "gulp-imagemin": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/gulp-imagemin/-/gulp-imagemin-6.1.1.tgz",
+      "integrity": "sha512-fqaSR8bMc5lhqa6HzRPuJaDY6lY7rcCipe6WtqQ5+hNYTCSPYjXic+1gvFG1+8X879gjVJmIxwmqIbfjuMqTpQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "fancy-log": "^1.3.2",
+        "imagemin": "^7.0.0",
+        "imagemin-gifsicle": "^6.0.1",
+        "imagemin-jpegtran": "^6.0.0",
+        "imagemin-optipng": "^7.0.0",
+        "imagemin-svgo": "^7.0.0",
+        "plugin-error": "^1.0.1",
+        "plur": "^3.0.1",
+        "pretty-bytes": "^5.3.0",
+        "through2-concurrent": "^2.0.0"
+      }
+    },
+    "gulp-less": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/gulp-less/-/gulp-less-4.0.1.tgz",
+      "integrity": "sha1-NIwzpd3nogfFdxsdgmHRrBAhzu0=",
+      "dev": true,
+      "requires": {
+        "accord": "^0.29.0",
+        "less": "2.6.x || ^3.7.1",
+        "object-assign": "^4.0.1",
+        "plugin-error": "^0.1.2",
+        "replace-ext": "^1.0.0",
+        "through2": "^2.0.0",
+        "vinyl-sourcemaps-apply": "^0.2.0"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.0.1",
+            "array-slice": "^0.2.3"
+          }
+        },
+        "arr-union": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
+          "dev": true
+        },
+        "array-slice": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+          "dev": true
+        },
+        "extend-shallow": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+          "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^1.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
+          "dev": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+          "dev": true
+        },
+        "plugin-error": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+          "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
+          "dev": true,
+          "requires": {
+            "ansi-cyan": "^0.1.1",
+            "ansi-red": "^0.1.1",
+            "arr-diff": "^1.0.1",
+            "arr-union": "^2.0.1",
+            "extend-shallow": "^1.1.2"
+          }
+        },
+        "replace-ext": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+          "dev": true
+        }
+      }
+    },
+    "gulp-notify": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/gulp-notify/-/gulp-notify-3.2.0.tgz",
+      "integrity": "sha1-KugiUAnfiB7vWb5d1aLxM3OHdk4=",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^1.0.1",
+        "fancy-log": "^1.3.2",
+        "lodash.template": "^4.4.0",
+        "node-notifier": "^5.2.1",
+        "node.extend": "^2.0.0",
+        "plugin-error": "^0.1.2",
+        "through2": "^2.0.3"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.0.1",
+            "array-slice": "^0.2.3"
+          }
+        },
+        "arr-union": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
+          "dev": true
+        },
+        "array-slice": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+          "dev": true
+        },
+        "extend-shallow": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+          "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^1.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
+          "dev": true
+        },
+        "lodash.template": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
+          "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
+          "dev": true,
+          "requires": {
+            "lodash._reinterpolate": "^3.0.0",
+            "lodash.templatesettings": "^4.0.0"
+          }
+        },
+        "lodash.templatesettings": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
+          "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
+          "dev": true,
+          "requires": {
+            "lodash._reinterpolate": "^3.0.0"
+          }
+        },
+        "plugin-error": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+          "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
+          "dev": true,
+          "requires": {
+            "ansi-cyan": "^0.1.1",
+            "ansi-red": "^0.1.1",
+            "arr-diff": "^1.0.1",
+            "arr-union": "^2.0.1",
+            "extend-shallow": "^1.1.2"
+          }
+        }
+      }
+    },
+    "gulp-postcss": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-8.0.0.tgz",
+      "integrity": "sha1-jTdyzU0nvKVeyMtMjlduO95NxVA=",
+      "dev": true,
+      "requires": {
+        "fancy-log": "^1.3.2",
+        "plugin-error": "^1.0.1",
+        "postcss": "^7.0.2",
+        "postcss-load-config": "^2.0.0",
+        "vinyl-sourcemaps-apply": "^0.2.1"
+      }
+    },
+    "gulp-rename": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.4.0.tgz",
+      "integrity": "sha1-3hxxjnxAla6GH3KW708ySGSCQL0=",
+      "dev": true
+    },
+    "gulp-sort": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-sort/-/gulp-sort-2.0.0.tgz",
+      "integrity": "sha1-xnYqLx8N4KP8WVohWZ0/rI26Gso=",
+      "dev": true,
+      "requires": {
+        "through2": "^2.0.1"
+      }
+    },
+    "gulp-sourcemaps": {
+      "version": "2.6.5",
+      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz",
+      "integrity": "sha512-SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg==",
+      "dev": true,
+      "requires": {
+        "@gulp-sourcemaps/identity-map": "1.X",
+        "@gulp-sourcemaps/map-sources": "1.X",
+        "acorn": "5.X",
+        "convert-source-map": "1.X",
+        "css": "2.X",
+        "debug-fabulous": "1.X",
+        "detect-newline": "2.X",
+        "graceful-fs": "4.X",
+        "source-map": "~0.6.0",
+        "strip-bom-string": "1.X",
+        "through2": "2.X"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.7.4",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "gulp-util": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
+      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
+      "dev": true,
+      "requires": {
+        "array-differ": "^1.0.0",
+        "array-uniq": "^1.0.2",
+        "beeper": "^1.0.0",
+        "chalk": "^1.0.0",
+        "dateformat": "^2.0.0",
+        "fancy-log": "^1.1.0",
+        "gulplog": "^1.0.0",
+        "has-gulplog": "^0.1.0",
+        "lodash._reescape": "^3.0.0",
+        "lodash._reevaluate": "^3.0.0",
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.template": "^3.0.0",
+        "minimist": "^1.1.0",
+        "multipipe": "^0.1.2",
+        "object-assign": "^3.0.0",
+        "replace-ext": "0.0.1",
+        "through2": "^2.0.0",
+        "vinyl": "^0.5.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "gulp-watch": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/gulp-watch/-/gulp-watch-5.0.1.tgz",
+      "integrity": "sha1-g9N4dS9b+0baAj5zwX7R2nBmIV0=",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "1.1.0",
+        "anymatch": "^1.3.0",
+        "chokidar": "^2.0.0",
+        "fancy-log": "1.3.2",
+        "glob-parent": "^3.0.1",
+        "object-assign": "^4.1.0",
+        "path-is-absolute": "^1.0.1",
+        "plugin-error": "1.0.1",
+        "readable-stream": "^2.2.2",
+        "slash": "^1.0.0",
+        "vinyl": "^2.1.0",
+        "vinyl-file": "^2.0.0"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+          "dev": true
+        },
+        "clone-stats": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+          "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+          "dev": true
+        },
+        "fancy-log": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz",
+          "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=",
+          "dev": true,
+          "requires": {
+            "ansi-gray": "^0.1.1",
+            "color-support": "^1.1.3",
+            "time-stamp": "^1.0.0"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "replace-ext": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "vinyl": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
+          "integrity": "sha1-2FsH2pbkWNJbL/4Z/s6fLKoT7YY=",
+          "dev": true,
+          "requires": {
+            "clone": "^2.1.1",
+            "clone-buffer": "^1.0.0",
+            "clone-stats": "^1.0.0",
+            "cloneable-readable": "^1.0.0",
+            "remove-trailing-separator": "^1.0.1",
+            "replace-ext": "^1.0.0"
+          }
+        }
+      }
+    },
+    "gulp-wrap": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/gulp-wrap/-/gulp-wrap-0.15.0.tgz",
+      "integrity": "sha512-f17zkGObA+hE/FThlg55gfA0nsXbdmHK1WqzjjB2Ytq1TuhLR7JiCBJ3K4AlMzCyoFaCjfowos+VkToUNE0WTQ==",
+      "dev": true,
+      "requires": {
+        "consolidate": "^0.15.1",
+        "es6-promise": "^4.2.6",
+        "fs-readfile-promise": "^3.0.1",
+        "js-yaml": "^3.13.0",
+        "lodash": "^4.17.11",
+        "node.extend": "2.0.2",
+        "plugin-error": "^1.0.1",
+        "through2": "^3.0.1",
+        "tryit": "^1.0.1",
+        "vinyl-bufferstream": "^1.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.2.0"
+          }
+        },
+        "through2": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2 || 3"
+          }
+        }
+      }
+    },
+    "gulp-wrap-js": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/gulp-wrap-js/-/gulp-wrap-js-0.4.1.tgz",
+      "integrity": "sha1-3uYqpISqupVHqT0f9c0MPQvtwDE=",
+      "dev": true,
+      "requires": {
+        "escodegen": "^1.6.1",
+        "esprima": "^2.3.0",
+        "estemplate": "*",
+        "gulp-util": "~3.0.5",
+        "through2": "*",
+        "vinyl-sourcemaps-apply": "^0.1.4"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        },
+        "vinyl-sourcemaps-apply": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.1.4.tgz",
+          "integrity": "sha1-xfy9Q+LyOEI8LcmL3db3m3K8NFs=",
+          "dev": true,
+          "requires": {
+            "source-map": "^0.1.39"
+          }
+        }
+      }
+    },
+    "gulplog": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
+      "dev": true,
+      "requires": {
+        "glogg": "^1.0.0"
+      }
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha1-HvievT5JllV2de7ZiTEQ3DUPoIA=",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "has-binary2": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+      "integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=",
+      "dev": true,
+      "requires": {
+        "isarray": "2.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+          "dev": true
+        }
+      }
+    },
+    "has-cors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-gulplog": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
+      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
+      "dev": true,
+      "requires": {
+        "sparkles": "^1.0.0"
+      }
+    },
+    "has-symbol-support-x": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
+      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
+      "dev": true,
+      "optional": true
+    },
+    "has-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+      "dev": true
+    },
+    "has-to-string-tag-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "has-symbol-support-x": "^1.4.1"
+      }
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hex-color-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
+      "integrity": "sha1-TAb8y0YC/iYCs8k9+C1+fb8aio4=",
+      "dev": true
+    },
+    "homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "requires": {
+        "parse-passwd": "^1.0.0"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
+      "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==",
+      "dev": true
+    },
+    "hsl-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
+      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
+      "dev": true
+    },
+    "hsla-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
+      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
+      "dev": true
+    },
+    "html-comment-regex": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
+      "integrity": "sha1-l9RoiutcgYhqNk+qDK0d2hTUM6c=",
+      "dev": true
+    },
+    "html-encoding-sniffer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "dev": true,
+      "requires": {
+        "whatwg-encoding": "^1.0.5"
+      }
+    },
+    "htmlparser2": {
+      "version": "3.9.2",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
+      "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^1.3.0",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.2"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+          "dev": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "http-cache-semantics": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
+      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+      "dev": true,
+      "optional": true
+    },
+    "http-errors": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "dev": true,
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
+      }
+    },
+    "http-proxy": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
+      "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
+      "dev": true,
+      "requires": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "dev": true,
+      "optional": true
+    },
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=",
+      "dev": true
+    },
+    "image-size": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
+      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
+      "dev": true,
+      "optional": true
+    },
+    "imagemin": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-7.0.0.tgz",
+      "integrity": "sha512-TXvCSSIYl4KQUASur9S0+E4olVECzvxvZABU9rNqsza7vzIrUQMRTjyczGf8OmtcgvZ9jOYyinXW3epOpd/04A==",
+      "dev": true,
+      "requires": {
+        "file-type": "^12.0.0",
+        "globby": "^10.0.0",
+        "junk": "^3.1.0",
+        "make-dir": "^3.0.0",
+        "p-pipe": "^3.0.0",
+        "replace-ext": "^1.0.0"
+      },
+      "dependencies": {
+        "replace-ext": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+          "dev": true
+        }
+      }
+    },
+    "imagemin-gifsicle": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/imagemin-gifsicle/-/imagemin-gifsicle-6.0.1.tgz",
+      "integrity": "sha512-kuu47c6iKDQ6R9J10xCwL0lgs0+sMz3LRHqRcJ2CRBWdcNmo3T5hUaM8hSZfksptZXJLGKk8heSAvwtSdB1Fng==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "exec-buffer": "^3.0.0",
+        "gifsicle": "^4.0.0",
+        "is-gif": "^3.0.0"
+      }
+    },
+    "imagemin-jpegtran": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/imagemin-jpegtran/-/imagemin-jpegtran-6.0.0.tgz",
+      "integrity": "sha512-Ih+NgThzqYfEWv9t58EItncaaXIHR0u9RuhKa8CtVBlMBvY0dCIxgQJQCfwImA4AV1PMfmUKlkyIHJjb7V4z1g==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "exec-buffer": "^3.0.0",
+        "is-jpg": "^2.0.0",
+        "jpegtran-bin": "^4.0.0"
+      }
+    },
+    "imagemin-optipng": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/imagemin-optipng/-/imagemin-optipng-7.1.0.tgz",
+      "integrity": "sha512-JNORTZ6j6untH7e5gF4aWdhDCxe3ODsSLKs/f7Grewy3ebZpl1ZsU+VUTPY4rzeHgaFA8GSWOoA8V2M3OixWZQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "exec-buffer": "^3.0.0",
+        "is-png": "^2.0.0",
+        "optipng-bin": "^6.0.0"
+      }
+    },
+    "imagemin-svgo": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/imagemin-svgo/-/imagemin-svgo-7.0.0.tgz",
+      "integrity": "sha512-+iGJFaPIMx8TjFW6zN+EkOhlqcemdL7F3N3Y0wODvV2kCUBuUtZK7DRZc1+Zfu4U2W/lTMUyx2G8YMOrZntIWg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-svg": "^3.0.0",
+        "svgo": "^1.0.5"
+      }
+    },
+    "import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "dev": true,
+      "requires": {
+        "import-from": "^2.1.0"
+      }
+    },
+    "import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+      "dev": true,
+      "requires": {
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-lazy": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-3.1.0.tgz",
+      "integrity": "sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==",
+      "dev": true,
+      "optional": true
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
+    "indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
+    "indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+      "dev": true
+    },
+    "indx": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/indx/-/indx-0.2.3.tgz",
+      "integrity": "sha1-Fdz1bunPZcAjTFE8J/vVgOcPvFA=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc=",
+      "dev": true
+    },
+    "inquirer": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
+      "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^2.0.0",
+        "lodash": "^4.17.12",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rxjs": "^6.4.0",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^5.1.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+              "dev": true
+            }
+          }
+        }
+      }
+    },
+    "interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true
+    },
+    "into-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
+      "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "from2": "^2.1.1",
+        "p-is-promise": "^1.1.0"
+      }
+    },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true
+    },
+    "ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "dev": true
+    },
+    "irregular-plurals": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-2.0.0.tgz",
+      "integrity": "sha512-Y75zBYLkh0lJ9qxeHlMjQ7bSbyiSqNW/UOPWDmzC7cXskL1hekSITh1Oc6JV0XCWWZ9DE8VYSB71xocLk3gmGw==",
+      "dev": true
+    },
+    "is": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz",
+      "integrity": "sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==",
+      "dev": true
+    },
+    "is-absolute": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+      "integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
+      "dev": true,
+      "requires": {
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
+      }
+    },
+    "is-absolute-url": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
+      "dev": true
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=",
+      "dev": true
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha1-HhrfIZ4e62hNaR+dagX/DTCiTXU=",
+      "dev": true
+    },
+    "is-color-stop": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
+      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
+      "dev": true,
+      "requires": {
+        "css-color-names": "^0.0.4",
+        "hex-color-regex": "^1.1.0",
+        "hsl-regex": "^1.0.0",
+        "hsla-regex": "^1.0.0",
+        "rgb-regex": "^1.0.1",
+        "rgba-regex": "^1.0.0"
+      }
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
+          "dev": true
+        }
+      }
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "dev": true
+    },
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+      "dev": true
+    },
+    "is-equal-shallow": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+      "dev": true,
+      "requires": {
+        "is-primitive": "^2.0.0"
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
+    },
+    "is-gif": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-gif/-/is-gif-3.0.0.tgz",
+      "integrity": "sha512-IqJ/jlbw5WJSNfwQ/lHEDXF8rxhRgF6ythk2oiEvhpG29F704eX9NO6TvPfMiq9DrbwgcEDnETYNcZDPewQoVw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-type": "^10.4.0"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "10.11.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz",
+          "integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.0"
+      }
+    },
+    "is-jpg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-jpg/-/is-jpg-2.0.0.tgz",
+      "integrity": "sha1-LhmX+m6RZuqsAkLarkQ0A+TvHZc=",
+      "dev": true,
+      "optional": true
+    },
+    "is-natural-number": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
+      "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
+      "dev": true,
+      "optional": true
+    },
+    "is-negated-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
+      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
+      "dev": true
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+      "dev": true
+    },
+    "is-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
+      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
+      "dev": true,
+      "optional": true
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true,
+      "optional": true
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-png": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-png/-/is-png-2.0.0.tgz",
+      "integrity": "sha512-4KPGizaVGj2LK7xwJIz8o5B2ubu1D/vcQsgOGFEDlpcvgZHto4gBnyd0ig7Ws+67ixmwKoNmu0hYnpo6AaKb5g==",
+      "dev": true,
+      "optional": true
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+      "dev": true
+    },
+    "is-potential-custom-element-name": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
+      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
+      "dev": true
+    },
+    "is-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+      "dev": true
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
+    "is-relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+      "integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
+      "dev": true,
+      "requires": {
+        "is-unc-path": "^1.0.0"
+      }
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
+      "dev": true
+    },
+    "is-retry-allowed": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+      "dev": true,
+      "optional": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true,
+      "optional": true
+    },
+    "is-svg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
+      "integrity": "sha1-kyHb0pwhLlypnE+peUxxS8r6L3U=",
+      "dev": true,
+      "requires": {
+        "html-comment-regex": "^1.1.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+      "integrity": "sha1-oFX2rlcZLK7jKeeoYBGLSXqVDzg=",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.0"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-unc-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+      "integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
+      "dev": true,
+      "requires": {
+        "unc-path-regex": "^0.1.2"
+      }
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "is-valid-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
+      "dev": true
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0=",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "isbinaryfile": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+      "integrity": "sha1-XW3vPt6/boyoyunDAYOoBLX4voA=",
+      "dev": true,
+      "requires": {
+        "buffer-alloc": "^1.2.0"
+      }
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "isurl": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
+      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "has-to-string-tag-x": "^1.2.0",
+        "is-object": "^1.0.1"
+      }
+    },
+    "jasmine-core": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.5.0.tgz",
+      "integrity": "sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==",
+      "dev": true
+    },
+    "jpegtran-bin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jpegtran-bin/-/jpegtran-bin-4.0.0.tgz",
+      "integrity": "sha512-2cRl1ism+wJUoYAYFt6O/rLBfpXNWG2dUWbgcEkTt5WGMnqI46eEro8T4C5zGROxKRqyKpCBSdHPvt5UYCtxaQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "bin-build": "^3.0.0",
+        "bin-wrapper": "^4.0.0",
+        "logalot": "^2.0.0"
+      }
+    },
+    "jquery": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
+      "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
+    },
+    "jquery-ui-dist": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.12.1.tgz",
+      "integrity": "sha1-XAgV08xvkP9fqvWyaKbiO0ypBPo="
+    },
+    "jquery-ui-touch-punch": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/jquery-ui-touch-punch/-/jquery-ui-touch-punch-0.2.3.tgz",
+      "integrity": "sha1-7tgiQnM7okP0az6HwYQbMIGR2mg="
+    },
+    "js-levenshtein": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
+      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha1-GSA/tZmR35jjoocFDUZHzerzJJk=",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
+    },
+    "jsdom": {
+      "version": "16.4.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz",
+      "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==",
+      "dev": true,
+      "requires": {
+        "abab": "^2.0.3",
+        "acorn": "^7.1.1",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.2.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.0",
+        "domexception": "^2.0.1",
+        "escodegen": "^1.14.1",
+        "html-encoding-sniffer": "^2.0.1",
+        "is-potential-custom-element-name": "^1.0.0",
+        "nwsapi": "^2.2.0",
+        "parse5": "5.1.1",
+        "request": "^2.88.2",
+        "request-promise-native": "^1.0.8",
+        "saxes": "^5.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^3.0.1",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0",
+        "ws": "^7.2.3",
+        "xml-name-validator": "^3.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "dev": true
+        },
+        "escodegen": {
+          "version": "1.14.3",
+          "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+          "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+          "dev": true,
+          "requires": {
+            "esprima": "^4.0.1",
+            "estraverse": "^4.2.0",
+            "esutils": "^2.0.2",
+            "optionator": "^0.8.1",
+            "source-map": "~0.6.1"
+          }
+        },
+        "request": {
+          "version": "2.88.2",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+          "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.8.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.6",
+            "extend": "~3.0.2",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.2",
+            "har-validator": "~5.1.3",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.19",
+            "oauth-sign": "~0.9.0",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.2",
+            "safe-buffer": "^5.1.2",
+            "tough-cookie": "~2.5.0",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.3.2"
+          },
+          "dependencies": {
+            "tough-cookie": {
+              "version": "2.5.0",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+              "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+              "dev": true,
+              "requires": {
+                "psl": "^1.1.28",
+                "punycode": "^2.1.1"
+              }
+            }
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "optional": true
+        },
+        "tough-cookie": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
+          "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+          "dev": true,
+          "requires": {
+            "ip-regex": "^2.1.0",
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        },
+        "ws": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz",
+          "integrity": "sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==",
+          "dev": true
+        }
+      }
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha1-gFZNLkg9rPbo7yCWUKZ98/DCg6Q=",
+      "dev": true
+    },
+    "json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+      "dev": true,
+      "optional": true
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk=",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "json5": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
+      "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.0"
+      }
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "junk": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz",
+      "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==",
+      "dev": true
+    },
+    "just-debounce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
+      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
+      "dev": true
+    },
+    "karma": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-4.4.1.tgz",
+      "integrity": "sha512-L5SIaXEYqzrh6b1wqYC42tNsFMx2PWuxky84pK9coK09MvmL7mxii3G3bZBh/0rvD27lqDd0le9jyhzvwif73A==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.3.0",
+        "body-parser": "^1.16.1",
+        "braces": "^3.0.2",
+        "chokidar": "^3.0.0",
+        "colors": "^1.1.0",
+        "connect": "^3.6.0",
+        "di": "^0.0.1",
+        "dom-serialize": "^2.2.0",
+        "flatted": "^2.0.0",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.1.2",
+        "http-proxy": "^1.13.0",
+        "isbinaryfile": "^3.0.0",
+        "lodash": "^4.17.14",
+        "log4js": "^4.0.0",
+        "mime": "^2.3.1",
+        "minimatch": "^3.0.2",
+        "optimist": "^0.6.1",
+        "qjobs": "^1.1.4",
+        "range-parser": "^1.2.0",
+        "rimraf": "^2.6.0",
+        "safe-buffer": "^5.0.1",
+        "socket.io": "2.1.1",
+        "source-map": "^0.6.1",
+        "tmp": "0.0.33",
+        "useragent": "2.3.0"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "binary-extensions": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
+          "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
+          "dev": true
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chokidar": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.2.2.tgz",
+          "integrity": "sha512-bw3pm7kZ2Wa6+jQWYP/c7bAZy3i4GwiIiMO2EeRjrE48l8vBqC/WvFhSF0xyM8fQiPEGvwMY/5bqDG7sSEOuhg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "~3.1.1",
+            "braces": "~3.0.2",
+            "fsevents": "~2.1.1",
+            "glob-parent": "~5.1.0",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.2.0"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "fsevents": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.1.tgz",
+          "integrity": "sha512-4FRPXWETxtigtJW/gxzEDsX1LVbPAM93VleB83kZB+ellqbHMkyt2aJfuzNLRvFPnGi6bcE5SvfxgbXPeKteJw==",
+          "dev": true,
+          "optional": true
+        },
+        "glob-parent": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
+          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "is-binary-path": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+          "dev": true,
+          "requires": {
+            "binary-extensions": "^2.0.0"
+          }
+        },
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "mime": {
+          "version": "2.4.4",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+          "dev": true
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
+        "readdirp": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
+          "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
+          "dev": true,
+          "requires": {
+            "picomatch": "^2.0.4"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "dev": true
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "karma-jasmine": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-2.0.1.tgz",
+      "integrity": "sha1-JuPjHy+vJy3YDrsOGJiRTMOhl2M=",
+      "dev": true,
+      "requires": {
+        "jasmine-core": "^3.3"
+      }
+    },
+    "karma-jsdom-launcher": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/karma-jsdom-launcher/-/karma-jsdom-launcher-8.0.2.tgz",
+      "integrity": "sha512-jxO+Nf9U/XNSnHXrNpxBbbMyeYuvJH1V++bRdZv20vJ9pvaLuQ6LFNIgn4hA1WAVmzMsvW9j0P2Q2hTLMWcSvw==",
+      "dev": true
+    },
+    "karma-junit-reporter": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-2.0.1.tgz",
+      "integrity": "sha512-VtcGfE0JE4OE1wn0LK8xxDKaTP7slN8DO3I+4xg6gAi1IoAHAXOJ1V9G/y45Xg6sxdxPOR3THCFtDlAfBo9Afw==",
+      "dev": true,
+      "requires": {
+        "path-is-absolute": "^1.0.0",
+        "xmlbuilder": "12.0.0"
+      }
+    },
+    "karma-spec-reporter": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.32.tgz",
+      "integrity": "sha1-LpxyB+pyZ3EmAln4K+y1QyCeRAo=",
+      "dev": true,
+      "requires": {
+        "colors": "^1.1.2"
+      }
+    },
+    "keyv": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
+      "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "json-buffer": "3.0.0"
+      }
+    },
+    "kind-of": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+      "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=",
+      "dev": true
+    },
+    "kuler": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz",
+      "integrity": "sha1-73x4TzbJ+24W3TFQ0VJneysCKKY=",
+      "dev": true,
+      "requires": {
+        "colornames": "^1.1.1"
+      }
+    },
+    "last-run": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
+      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
+      "dev": true,
+      "requires": {
+        "default-resolution": "^2.0.0",
+        "es6-weak-map": "^2.0.1"
+      }
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+      "dev": true
+    },
+    "lazyload-js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lazyload-js/-/lazyload-js-1.0.0.tgz",
+      "integrity": "sha1-jBA5sbaRec1J/cMkICOvSM4IOSU="
+    },
+    "lazystream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.5"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "requires": {
+        "invert-kv": "^1.0.0"
+      }
+    },
+    "lead": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
+      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
+      "dev": true,
+      "requires": {
+        "flush-write-stream": "^1.0.2"
+      }
+    },
+    "less": {
+      "version": "3.10.3",
+      "resolved": "https://registry.npmjs.org/less/-/less-3.10.3.tgz",
+      "integrity": "sha512-vz32vqfgmoxF1h3K4J+yKCtajH0PWmjkIFgbs5d78E/c/e+UQTnI+lWK+1eQRE95PXM2mC3rJlLSSP9VQHnaow==",
+      "dev": true,
+      "requires": {
+        "clone": "^2.1.2",
+        "errno": "^0.1.1",
+        "graceful-fs": "^4.1.2",
+        "image-size": "~0.5.0",
+        "mime": "^1.4.1",
+        "mkdirp": "^0.5.0",
+        "promise": "^7.1.1",
+        "request": "^2.83.0",
+        "source-map": "~0.6.0"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "liftoff": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
+      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
+      "dev": true,
+      "requires": {
+        "extend": "^3.0.0",
+        "findup-sync": "^3.0.0",
+        "fined": "^1.0.1",
+        "flagged-respawn": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "object.map": "^1.0.0",
+        "rechoir": "^0.6.2",
+        "resolve": "^1.1.7"
+      }
+    },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+          "dev": true
+        },
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.2.0"
+          }
+        },
+        "strip-bom": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+          "dev": true,
+          "requires": {
+            "is-utf8": "^0.2.0"
+          }
+        }
+      }
+    },
+    "lodash": {
+      "version": "4.17.19",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+      "dev": true
+    },
+    "lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+      "dev": true
+    },
+    "lodash._basetostring": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
+      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
+      "dev": true
+    },
+    "lodash._basevalues": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
+      "dev": true
+    },
+    "lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "dev": true
+    },
+    "lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+      "dev": true
+    },
+    "lodash._reescape": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
+      "dev": true
+    },
+    "lodash._reevaluate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
+      "dev": true
+    },
+    "lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+      "dev": true
+    },
+    "lodash._root": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
+      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
+      "dev": true
+    },
+    "lodash.clone": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
+      "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=",
+      "dev": true
+    },
+    "lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
+      "dev": true
+    },
+    "lodash.escape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
+      "dev": true,
+      "requires": {
+        "lodash._root": "^3.0.0"
+      }
+    },
+    "lodash.flatten": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
+      "dev": true
+    },
+    "lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "dev": true
+    },
+    "lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "dev": true
+    },
+    "lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "dev": true,
+      "requires": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+      "dev": true
+    },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "lodash.partialright": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/lodash.partialright/-/lodash.partialright-4.2.1.tgz",
+      "integrity": "sha1-ATDYDoM2MmTUAHTzKbij56ihzEs=",
+      "dev": true
+    },
+    "lodash.pick": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
+      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
+      "dev": true
+    },
+    "lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
+      "dev": true
+    },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+      "dev": true
+    },
+    "lodash.template": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+      "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
+      "dev": true,
+      "requires": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash._basetostring": "^3.0.0",
+        "lodash._basevalues": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0",
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.escape": "^3.0.0",
+        "lodash.keys": "^3.0.0",
+        "lodash.restparam": "^3.0.0",
+        "lodash.templatesettings": "^3.0.0"
+      }
+    },
+    "lodash.templatesettings": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
+      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+      "dev": true,
+      "requires": {
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.escape": "^3.0.0"
+      }
+    },
+    "lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+      "dev": true
+    },
+    "log4js": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.5.1.tgz",
+      "integrity": "sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==",
+      "dev": true,
+      "requires": {
+        "date-format": "^2.0.0",
+        "debug": "^4.1.1",
+        "flatted": "^2.0.0",
+        "rfdc": "^1.1.4",
+        "streamroller": "^1.0.6"
+      }
+    },
+    "logalot": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz",
+      "integrity": "sha1-X46MkNME7fElMJUaVVSruMXj9VI=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "figures": "^1.3.5",
+        "squeak": "^1.0.0"
+      },
+      "dependencies": {
+        "figures": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+          "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "escape-string-regexp": "^1.0.5",
+            "object-assign": "^4.1.0"
+          }
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8=",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
+      }
+    },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=",
+      "dev": true,
+      "optional": true
+    },
+    "lpad-align": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/lpad-align/-/lpad-align-1.1.2.tgz",
+      "integrity": "sha1-IfYArBwwlcPG5JfuZyce4ISB/p4=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "get-stdin": "^4.0.1",
+        "indent-string": "^2.1.0",
+        "longest": "^1.0.0",
+        "meow": "^3.3.0"
+      }
+    },
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "dev": true,
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "lru-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "~0.10.2"
+      }
+    },
+    "make-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz",
+      "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==",
+      "dev": true,
+      "requires": {
+        "semver": "^6.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "make-iterator": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+      "integrity": "sha1-KbM/MSqo9UfEpeSQ9Wr87JkTOtY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^6.0.2"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true,
+      "optional": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "marked": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
+      "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==",
+      "dev": true
+    },
+    "matchdep": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
+      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
+      "dev": true,
+      "requires": {
+        "findup-sync": "^2.0.0",
+        "micromatch": "^3.0.4",
+        "resolve": "^1.4.0",
+        "stack-trace": "0.0.10"
+      },
+      "dependencies": {
+        "findup-sync": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+          "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+          "dev": true,
+          "requires": {
+            "detect-file": "^1.0.0",
+            "is-glob": "^3.1.0",
+            "micromatch": "^3.0.4",
+            "resolve-dir": "^1.0.1"
+          }
+        }
+      }
+    },
+    "math-random": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
+      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
+      "dev": true
+    },
+    "mdn-data": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
+      "dev": true
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true
+    },
+    "memoizee": {
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
+      "integrity": "sha1-B6APIEaZ+alcLZ53IYJxx81hDVc=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.45",
+        "es6-weak-map": "^2.0.2",
+        "event-emitter": "^0.3.5",
+        "is-promise": "^2.1",
+        "lru-queue": "0.1",
+        "next-tick": "1",
+        "timers-ext": "^0.1.5"
+      }
+    },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "camelcase-keys": "^2.0.0",
+        "decamelize": "^1.1.2",
+        "loud-rejection": "^1.0.0",
+        "map-obj": "^1.0.1",
+        "minimist": "^1.1.3",
+        "normalize-package-data": "^2.3.4",
+        "object-assign": "^4.0.1",
+        "read-pkg-up": "^1.0.1",
+        "redent": "^1.0.0",
+        "trim-newlines": "^1.0.0"
+      },
+      "dependencies": {
+        "object-assign": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "merge2": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
+      "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      }
+    },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "optional": true
+    },
+    "mime-db": {
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.40.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
+      "dev": true
+    },
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true,
+      "optional": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "dev": true
+    },
+    "minimize": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/minimize/-/minimize-2.2.0.tgz",
+      "integrity": "sha1-ixZ28wBR2FmNdDZGvRJpCwdNpMM=",
+      "dev": true,
+      "requires": {
+        "argh": "^0.1.4",
+        "async": "^2.1.5",
+        "cli-color": "^1.2.0",
+        "diagnostics": "^1.1.0",
+        "emits": "^3.0.0",
+        "htmlparser2": "^3.9.2",
+        "uuid": "^3.0.0"
+      }
+    },
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        }
+      }
+    },
+    "moment": {
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
+      "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "multipipe": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
+      "dev": true,
+      "requires": {
+        "duplexer2": "0.0.2"
+      }
+    },
+    "mute-stdout": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
+      "integrity": "sha1-rLAwDrTeI6fd7sAU4+lgRLNHIzE=",
+      "dev": true
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+      "dev": true,
+      "optional": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha1-uHqKpPwN6P5r6IiVs4mD/yZb0Rk=",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "dev": true
+    },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "dev": true
+    },
+    "ng-file-upload": {
+      "version": "12.2.13",
+      "resolved": "https://registry.npmjs.org/ng-file-upload/-/ng-file-upload-12.2.13.tgz",
+      "integrity": "sha1-AYAPOHLlJvlTEPhHfpnk8S0NjRQ="
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y=",
+      "dev": true
+    },
+    "node-notifier": {
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
+      "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
+      "dev": true,
+      "requires": {
+        "growly": "^1.3.0",
+        "is-wsl": "^1.1.0",
+        "semver": "^5.5.0",
+        "shellwords": "^0.1.1",
+        "which": "^1.3.0"
+      }
+    },
+    "node-releases": {
+      "version": "1.1.32",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.32.tgz",
+      "integrity": "sha512-VhVknkitq8dqtWoluagsGPn3dxTvN9fwgR59fV3D7sLBHe0JfDramsMI8n8mY//ccq/Kkrf8ZRHRpsyVZ3qw1A==",
+      "dev": true,
+      "requires": {
+        "semver": "^5.3.0"
+      }
+    },
+    "node.extend": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-2.0.2.tgz",
+      "integrity": "sha512-pDT4Dchl94/+kkgdwyS2PauDFjZG0Hk0IcHIB+LkW27HLDtdoeMxHTxZh39DYbPP8UflWXWj9JcdDozF+YDOpQ==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3",
+        "is": "^3.2.1"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "requires": {
+        "remove-trailing-separator": "^1.0.1"
+      }
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true
+    },
+    "normalize-url": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
+      "integrity": "sha1-suHE3E98bVd0PfczpPWXjRhlBVk=",
+      "dev": true
+    },
+    "nouislider": {
+      "version": "14.6.2",
+      "resolved": "https://registry.npmjs.org/nouislider/-/nouislider-14.6.2.tgz",
+      "integrity": "sha512-/lJeqJBghNAZS3P2VYrHzm1RM6YJPvvC/1wNpGaHBRX+05wpzUDafrW/ohAYp4kjKhRH8+BJ0vkorCHiMmgTMQ=="
+    },
+    "now-and-later": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
+      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.2"
+      }
+    },
+    "npm": {
+      "version": "6.14.9",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-6.14.9.tgz",
+      "integrity": "sha512-yHi1+i9LyAZF1gAmgyYtVk+HdABlLy94PMIDoK1TRKWvmFQAt5z3bodqVwKvzY0s6dLqQPVsRLiwhJfNtiHeCg==",
+      "requires": {
+        "JSONStream": "^1.3.5",
+        "abbrev": "~1.1.1",
+        "ansicolors": "~0.3.2",
+        "ansistyles": "~0.1.3",
+        "aproba": "^2.0.0",
+        "archy": "~1.0.0",
+        "bin-links": "^1.1.8",
+        "bluebird": "^3.5.5",
+        "byte-size": "^5.0.1",
+        "cacache": "^12.0.3",
+        "call-limit": "^1.1.1",
+        "chownr": "^1.1.4",
+        "ci-info": "^2.0.0",
+        "cli-columns": "^3.1.2",
+        "cli-table3": "^0.5.1",
+        "cmd-shim": "^3.0.3",
+        "columnify": "~1.5.4",
+        "config-chain": "^1.1.12",
+        "debuglog": "*",
+        "detect-indent": "~5.0.0",
+        "detect-newline": "^2.1.0",
+        "dezalgo": "~1.0.3",
+        "editor": "~1.0.0",
+        "figgy-pudding": "^3.5.1",
+        "find-npm-prefix": "^1.0.2",
+        "fs-vacuum": "~1.2.10",
+        "fs-write-stream-atomic": "~1.0.10",
+        "gentle-fs": "^2.3.1",
+        "glob": "^7.1.6",
+        "graceful-fs": "^4.2.4",
+        "has-unicode": "~2.0.1",
+        "hosted-git-info": "^2.8.8",
+        "iferr": "^1.0.2",
+        "imurmurhash": "*",
+        "infer-owner": "^1.0.4",
+        "inflight": "~1.0.6",
+        "inherits": "^2.0.4",
+        "ini": "^1.3.5",
+        "init-package-json": "^1.10.3",
+        "is-cidr": "^3.0.0",
+        "json-parse-better-errors": "^1.0.2",
+        "lazy-property": "~1.0.0",
+        "libcipm": "^4.0.8",
+        "libnpm": "^3.0.1",
+        "libnpmaccess": "^3.0.2",
+        "libnpmhook": "^5.0.3",
+        "libnpmorg": "^1.0.1",
+        "libnpmsearch": "^2.0.2",
+        "libnpmteam": "^1.0.2",
+        "libnpx": "^10.2.4",
+        "lock-verify": "^2.1.0",
+        "lockfile": "^1.0.4",
+        "lodash._baseindexof": "*",
+        "lodash._baseuniq": "~4.6.0",
+        "lodash._bindcallback": "*",
+        "lodash._cacheindexof": "*",
+        "lodash._createcache": "*",
+        "lodash._getnative": "*",
+        "lodash.clonedeep": "~4.5.0",
+        "lodash.restparam": "*",
+        "lodash.union": "~4.6.0",
+        "lodash.uniq": "~4.5.0",
+        "lodash.without": "~4.4.0",
+        "lru-cache": "^5.1.1",
+        "meant": "^1.0.2",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.5",
+        "move-concurrently": "^1.0.1",
+        "node-gyp": "^5.1.0",
+        "nopt": "^4.0.3",
+        "normalize-package-data": "^2.5.0",
+        "npm-audit-report": "^1.3.3",
+        "npm-cache-filename": "~1.0.2",
+        "npm-install-checks": "^3.0.2",
+        "npm-lifecycle": "^3.1.5",
+        "npm-package-arg": "^6.1.1",
+        "npm-packlist": "^1.4.8",
+        "npm-pick-manifest": "^3.0.2",
+        "npm-profile": "^4.0.4",
+        "npm-registry-fetch": "^4.0.7",
+        "npm-user-validate": "^1.0.1",
+        "npmlog": "~4.1.2",
+        "once": "~1.4.0",
+        "opener": "^1.5.1",
+        "osenv": "^0.1.5",
+        "pacote": "^9.5.12",
+        "path-is-inside": "~1.0.2",
+        "promise-inflight": "~1.0.1",
+        "qrcode-terminal": "^0.12.0",
+        "query-string": "^6.8.2",
+        "qw": "~1.0.1",
+        "read": "~1.0.7",
+        "read-cmd-shim": "^1.0.5",
+        "read-installed": "~4.0.3",
+        "read-package-json": "^2.1.1",
+        "read-package-tree": "^5.3.1",
+        "readable-stream": "^3.6.0",
+        "readdir-scoped-modules": "^1.1.0",
+        "request": "^2.88.0",
+        "retry": "^0.12.0",
+        "rimraf": "^2.7.1",
+        "safe-buffer": "^5.1.2",
+        "semver": "^5.7.1",
+        "sha": "^3.0.0",
+        "slide": "~1.1.6",
+        "sorted-object": "~2.0.1",
+        "sorted-union-stream": "~2.1.3",
+        "ssri": "^6.0.1",
+        "stringify-package": "^1.0.1",
+        "tar": "^4.4.13",
+        "text-table": "~0.2.0",
+        "tiny-relative-date": "^1.3.0",
+        "uid-number": "0.0.6",
+        "umask": "~1.1.0",
+        "unique-filename": "^1.1.1",
+        "unpipe": "~1.0.0",
+        "update-notifier": "^2.5.0",
+        "uuid": "^3.3.3",
+        "validate-npm-package-license": "^3.0.4",
+        "validate-npm-package-name": "~3.0.0",
+        "which": "^1.3.1",
+        "worker-farm": "^1.7.0",
+        "write-file-atomic": "^2.4.3"
+      },
+      "dependencies": {
+        "JSONStream": {
+          "version": "1.3.5",
+          "bundled": true,
+          "requires": {
+            "jsonparse": "^1.2.0",
+            "through": ">=2.2.7 <3"
+          }
+        },
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "agent-base": {
+          "version": "4.3.0",
+          "bundled": true,
+          "requires": {
+            "es6-promisify": "^5.0.0"
+          }
+        },
+        "agentkeepalive": {
+          "version": "3.5.2",
+          "bundled": true,
+          "requires": {
+            "humanize-ms": "^1.2.1"
+          }
+        },
+        "ansi-align": {
+          "version": "2.0.0",
+          "bundled": true,
+          "requires": {
+            "string-width": "^2.0.0"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "bundled": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "ansicolors": {
+          "version": "0.3.2",
+          "bundled": true
+        },
+        "ansistyles": {
+          "version": "0.1.3",
+          "bundled": true
+        },
+        "aproba": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "archy": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "asap": {
+          "version": "2.0.6",
+          "bundled": true
+        },
+        "asn1": {
+          "version": "0.2.4",
+          "bundled": true,
+          "requires": {
+            "safer-buffer": "~2.1.0"
+          }
+        },
+        "assert-plus": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true
+        },
+        "aws-sign2": {
+          "version": "0.7.0",
+          "bundled": true
+        },
+        "aws4": {
+          "version": "1.8.0",
+          "bundled": true
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "^0.14.3"
+          }
+        },
+        "bin-links": {
+          "version": "1.1.8",
+          "bundled": true,
+          "requires": {
+            "bluebird": "^3.5.3",
+            "cmd-shim": "^3.0.0",
+            "gentle-fs": "^2.3.0",
+            "graceful-fs": "^4.1.15",
+            "npm-normalize-package-bin": "^1.0.0",
+            "write-file-atomic": "^2.3.0"
+          }
+        },
+        "bluebird": {
+          "version": "3.5.5",
+          "bundled": true
+        },
+        "boxen": {
+          "version": "1.3.0",
+          "bundled": true,
+          "requires": {
+            "ansi-align": "^2.0.0",
+            "camelcase": "^4.0.0",
+            "chalk": "^2.0.1",
+            "cli-boxes": "^1.0.0",
+            "string-width": "^2.0.0",
+            "term-size": "^1.2.0",
+            "widest-line": "^2.0.0"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-from": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "builtins": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "byline": {
+          "version": "5.0.0",
+          "bundled": true
+        },
+        "byte-size": {
+          "version": "5.0.1",
+          "bundled": true
+        },
+        "cacache": {
+          "version": "12.0.3",
+          "bundled": true,
+          "requires": {
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "infer-owner": "^1.0.3",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          }
+        },
+        "call-limit": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "bundled": true
+        },
+        "capture-stack-trace": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "bundled": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "chownr": {
+          "version": "1.1.4",
+          "bundled": true
+        },
+        "ci-info": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "cidr-regex": {
+          "version": "2.0.10",
+          "bundled": true,
+          "requires": {
+            "ip-regex": "^2.1.0"
+          }
+        },
+        "cli-boxes": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "cli-columns": {
+          "version": "3.1.2",
+          "bundled": true,
+          "requires": {
+            "string-width": "^2.0.0",
+            "strip-ansi": "^3.0.1"
+          }
+        },
+        "cli-table3": {
+          "version": "0.5.1",
+          "bundled": true,
+          "requires": {
+            "colors": "^1.1.2",
+            "object-assign": "^4.1.0",
+            "string-width": "^2.1.1"
+          }
+        },
+        "cliui": {
+          "version": "5.0.0",
+          "bundled": true,
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "bundled": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "2.0.0",
+              "bundled": true
+            },
+            "string-width": {
+              "version": "3.1.0",
+              "bundled": true,
+              "requires": {
+                "emoji-regex": "^7.0.1",
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "bundled": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
+          }
+        },
+        "clone": {
+          "version": "1.0.4",
+          "bundled": true
+        },
+        "cmd-shim": {
+          "version": "3.0.3",
+          "bundled": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "mkdirp": "~0.5.0"
+          }
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "color-convert": {
+          "version": "1.9.1",
+          "bundled": true,
+          "requires": {
+            "color-name": "^1.1.1"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "bundled": true
+        },
+        "colors": {
+          "version": "1.3.3",
+          "bundled": true,
+          "optional": true
+        },
+        "columnify": {
+          "version": "1.5.4",
+          "bundled": true,
+          "requires": {
+            "strip-ansi": "^3.0.0",
+            "wcwidth": "^1.0.0"
+          }
+        },
+        "combined-stream": {
+          "version": "1.0.6",
+          "bundled": true,
+          "requires": {
+            "delayed-stream": "~1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true
+        },
+        "concat-stream": {
+          "version": "1.6.2",
+          "bundled": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "inherits": "^2.0.3",
+            "readable-stream": "^2.2.2",
+            "typedarray": "^0.0.6"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "config-chain": {
+          "version": "1.1.12",
+          "bundled": true,
+          "requires": {
+            "ini": "^1.3.4",
+            "proto-list": "~1.2.1"
+          }
+        },
+        "configstore": {
+          "version": "3.1.5",
+          "bundled": true,
+          "requires": {
+            "dot-prop": "^4.2.1",
+            "graceful-fs": "^4.1.2",
+            "make-dir": "^1.0.0",
+            "unique-string": "^1.0.0",
+            "write-file-atomic": "^2.0.0",
+            "xdg-basedir": "^3.0.0"
+          }
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "copy-concurrently": {
+          "version": "1.0.5",
+          "bundled": true,
+          "requires": {
+            "aproba": "^1.1.1",
+            "fs-write-stream-atomic": "^1.0.8",
+            "iferr": "^0.1.5",
+            "mkdirp": "^0.5.1",
+            "rimraf": "^2.5.4",
+            "run-queue": "^1.0.0"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true
+            },
+            "iferr": {
+              "version": "0.1.5",
+              "bundled": true
+            }
+          }
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "create-error-class": {
+          "version": "3.0.2",
+          "bundled": true,
+          "requires": {
+            "capture-stack-trace": "^1.0.0"
+          }
+        },
+        "cross-spawn": {
+          "version": "5.1.0",
+          "bundled": true,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          },
+          "dependencies": {
+            "lru-cache": {
+              "version": "4.1.5",
+              "bundled": true,
+              "requires": {
+                "pseudomap": "^1.0.2",
+                "yallist": "^2.1.2"
+              }
+            },
+            "yallist": {
+              "version": "2.1.2",
+              "bundled": true
+            }
+          }
+        },
+        "crypto-random-string": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "cyclist": {
+          "version": "0.2.2",
+          "bundled": true
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "requires": {
+            "assert-plus": "^1.0.0"
+          }
+        },
+        "debug": {
+          "version": "3.1.0",
+          "bundled": true,
+          "requires": {
+            "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "bundled": true
+            }
+          }
+        },
+        "debuglog": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "decamelize": {
+          "version": "1.2.0",
+          "bundled": true
+        },
+        "decode-uri-component": {
+          "version": "0.2.0",
+          "bundled": true
+        },
+        "deep-extend": {
+          "version": "0.6.0",
+          "bundled": true
+        },
+        "defaults": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "clone": "^1.0.2"
+          }
+        },
+        "define-properties": {
+          "version": "1.1.3",
+          "bundled": true,
+          "requires": {
+            "object-keys": "^1.0.12"
+          }
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "detect-indent": {
+          "version": "5.0.0",
+          "bundled": true
+        },
+        "detect-newline": {
+          "version": "2.1.0",
+          "bundled": true
+        },
+        "dezalgo": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "asap": "^2.0.0",
+            "wrappy": "1"
+          }
+        },
+        "dot-prop": {
+          "version": "4.2.1",
+          "bundled": true,
+          "requires": {
+            "is-obj": "^1.0.0"
+          }
+        },
+        "dotenv": {
+          "version": "5.0.1",
+          "bundled": true
+        },
+        "duplexer3": {
+          "version": "0.1.4",
+          "bundled": true
+        },
+        "duplexify": {
+          "version": "3.6.0",
+          "bundled": true,
+          "requires": {
+            "end-of-stream": "^1.0.0",
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.0.0",
+            "stream-shift": "^1.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "ecc-jsbn": {
+          "version": "0.1.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "~0.1.0",
+            "safer-buffer": "^2.1.0"
+          }
+        },
+        "editor": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "bundled": true
+        },
+        "encoding": {
+          "version": "0.1.12",
+          "bundled": true,
+          "requires": {
+            "iconv-lite": "~0.4.13"
+          }
+        },
+        "end-of-stream": {
+          "version": "1.4.1",
+          "bundled": true,
+          "requires": {
+            "once": "^1.4.0"
+          }
+        },
+        "env-paths": {
+          "version": "2.2.0",
+          "bundled": true
+        },
+        "err-code": {
+          "version": "1.1.2",
+          "bundled": true
+        },
+        "errno": {
+          "version": "0.1.7",
+          "bundled": true,
+          "requires": {
+            "prr": "~1.0.1"
+          }
+        },
+        "es-abstract": {
+          "version": "1.12.0",
+          "bundled": true,
+          "requires": {
+            "es-to-primitive": "^1.1.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.1",
+            "is-callable": "^1.1.3",
+            "is-regex": "^1.0.4"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "es6-promise": {
+          "version": "4.2.8",
+          "bundled": true
+        },
+        "es6-promisify": {
+          "version": "5.0.0",
+          "bundled": true,
+          "requires": {
+            "es6-promise": "^4.0.3"
+          }
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "bundled": true
+        },
+        "execa": {
+          "version": "0.7.0",
+          "bundled": true,
+          "requires": {
+            "cross-spawn": "^5.0.1",
+            "get-stream": "^3.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          },
+          "dependencies": {
+            "get-stream": {
+              "version": "3.0.0",
+              "bundled": true
+            }
+          }
+        },
+        "extend": {
+          "version": "3.0.2",
+          "bundled": true
+        },
+        "extsprintf": {
+          "version": "1.3.0",
+          "bundled": true
+        },
+        "fast-json-stable-stringify": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "figgy-pudding": {
+          "version": "3.5.1",
+          "bundled": true
+        },
+        "find-npm-prefix": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "flush-write-stream": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.0.4"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true
+        },
+        "form-data": {
+          "version": "2.3.2",
+          "bundled": true,
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "from2": {
+          "version": "2.3.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "fs-minipass": {
+          "version": "1.2.7",
+          "bundled": true,
+          "requires": {
+            "minipass": "^2.6.0"
+          },
+          "dependencies": {
+            "minipass": {
+              "version": "2.9.0",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            }
+          }
+        },
+        "fs-vacuum": {
+          "version": "1.2.10",
+          "bundled": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "path-is-inside": "^1.0.1",
+            "rimraf": "^2.5.2"
+          }
+        },
+        "fs-write-stream-atomic": {
+          "version": "1.0.10",
+          "bundled": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "iferr": "^0.1.5",
+            "imurmurhash": "^0.1.4",
+            "readable-stream": "1 || 2"
+          },
+          "dependencies": {
+            "iferr": {
+              "version": "0.1.5",
+              "bundled": true
+            },
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "function-bind": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "requires": {
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            }
+          }
+        },
+        "genfun": {
+          "version": "5.0.0",
+          "bundled": true
+        },
+        "gentle-fs": {
+          "version": "2.3.1",
+          "bundled": true,
+          "requires": {
+            "aproba": "^1.1.2",
+            "chownr": "^1.1.2",
+            "cmd-shim": "^3.0.3",
+            "fs-vacuum": "^1.2.10",
+            "graceful-fs": "^4.1.11",
+            "iferr": "^0.1.5",
+            "infer-owner": "^1.0.4",
+            "mkdirp": "^0.5.1",
+            "path-is-inside": "^1.0.2",
+            "read-cmd-shim": "^1.0.1",
+            "slide": "^1.1.6"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true
+            },
+            "iferr": {
+              "version": "0.1.5",
+              "bundled": true
+            }
+          }
+        },
+        "get-caller-file": {
+          "version": "2.0.5",
+          "bundled": true
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "bundled": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "requires": {
+            "assert-plus": "^1.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.6",
+          "bundled": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "global-dirs": {
+          "version": "0.1.1",
+          "bundled": true,
+          "requires": {
+            "ini": "^1.3.4"
+          }
+        },
+        "got": {
+          "version": "6.7.1",
+          "bundled": true,
+          "requires": {
+            "create-error-class": "^3.0.0",
+            "duplexer3": "^0.1.4",
+            "get-stream": "^3.0.0",
+            "is-redirect": "^1.0.0",
+            "is-retry-allowed": "^1.0.0",
+            "is-stream": "^1.0.0",
+            "lowercase-keys": "^1.0.0",
+            "safe-buffer": "^5.0.1",
+            "timed-out": "^4.0.0",
+            "unzip-response": "^2.0.1",
+            "url-parse-lax": "^1.0.0"
+          },
+          "dependencies": {
+            "get-stream": {
+              "version": "3.0.0",
+              "bundled": true
+            }
+          }
+        },
+        "graceful-fs": {
+          "version": "4.2.4",
+          "bundled": true
+        },
+        "har-schema": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "har-validator": {
+          "version": "5.1.5",
+          "bundled": true,
+          "requires": {
+            "ajv": "^6.12.3",
+            "har-schema": "^2.0.0"
+          },
+          "dependencies": {
+            "ajv": {
+              "version": "6.12.6",
+              "bundled": true,
+              "requires": {
+                "fast-deep-equal": "^3.1.1",
+                "fast-json-stable-stringify": "^2.0.0",
+                "json-schema-traverse": "^0.4.1",
+                "uri-js": "^4.2.2"
+              }
+            },
+            "fast-deep-equal": {
+              "version": "3.1.3",
+              "bundled": true
+            },
+            "json-schema-traverse": {
+              "version": "0.4.1",
+              "bundled": true
+            }
+          }
+        },
+        "has": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.1"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "bundled": true
+        },
+        "has-symbols": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "hosted-git-info": {
+          "version": "2.8.8",
+          "bundled": true
+        },
+        "http-cache-semantics": {
+          "version": "3.8.1",
+          "bundled": true
+        },
+        "http-proxy-agent": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "agent-base": "4",
+            "debug": "3.1.0"
+          }
+        },
+        "http-signature": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "assert-plus": "^1.0.0",
+            "jsprim": "^1.2.2",
+            "sshpk": "^1.7.0"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "2.2.4",
+          "bundled": true,
+          "requires": {
+            "agent-base": "^4.3.0",
+            "debug": "^3.1.0"
+          }
+        },
+        "humanize-ms": {
+          "version": "1.2.1",
+          "bundled": true,
+          "requires": {
+            "ms": "^2.0.0"
+          }
+        },
+        "iconv-lite": {
+          "version": "0.4.23",
+          "bundled": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "iferr": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "ignore-walk": {
+          "version": "3.0.3",
+          "bundled": true,
+          "requires": {
+            "minimatch": "^3.0.4"
+          }
+        },
+        "import-lazy": {
+          "version": "2.1.0",
+          "bundled": true
+        },
+        "imurmurhash": {
+          "version": "0.1.4",
+          "bundled": true
+        },
+        "infer-owner": {
+          "version": "1.0.4",
+          "bundled": true
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "bundled": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true
+        },
+        "init-package-json": {
+          "version": "1.10.3",
+          "bundled": true,
+          "requires": {
+            "glob": "^7.1.1",
+            "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
+            "promzard": "^0.3.0",
+            "read": "~1.0.1",
+            "read-package-json": "1 || 2",
+            "semver": "2.x || 3.x || 4 || 5",
+            "validate-npm-package-license": "^3.0.1",
+            "validate-npm-package-name": "^3.0.0"
+          }
+        },
+        "ip": {
+          "version": "1.1.5",
+          "bundled": true
+        },
+        "ip-regex": {
+          "version": "2.1.0",
+          "bundled": true
+        },
+        "is-callable": {
+          "version": "1.1.4",
+          "bundled": true
+        },
+        "is-ci": {
+          "version": "1.2.1",
+          "bundled": true,
+          "requires": {
+            "ci-info": "^1.5.0"
+          },
+          "dependencies": {
+            "ci-info": {
+              "version": "1.6.0",
+              "bundled": true
+            }
+          }
+        },
+        "is-cidr": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "cidr-regex": "^2.0.10"
+          }
+        },
+        "is-date-object": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "is-installed-globally": {
+          "version": "0.1.0",
+          "bundled": true,
+          "requires": {
+            "global-dirs": "^0.1.0",
+            "is-path-inside": "^1.0.0"
+          }
+        },
+        "is-npm": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "is-obj": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "is-path-inside": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "path-is-inside": "^1.0.1"
+          }
+        },
+        "is-redirect": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "is-regex": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "has": "^1.0.1"
+          }
+        },
+        "is-retry-allowed": {
+          "version": "1.2.0",
+          "bundled": true
+        },
+        "is-stream": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "is-symbol": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "has-symbols": "^1.0.0"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "isexe": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "json-parse-better-errors": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true
+        },
+        "jsonparse": {
+          "version": "1.3.1",
+          "bundled": true
+        },
+        "jsprim": {
+          "version": "1.4.1",
+          "bundled": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.3.0",
+            "json-schema": "0.2.3",
+            "verror": "1.10.0"
+          }
+        },
+        "latest-version": {
+          "version": "3.1.0",
+          "bundled": true,
+          "requires": {
+            "package-json": "^4.0.0"
+          }
+        },
+        "lazy-property": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "libcipm": {
+          "version": "4.0.8",
+          "bundled": true,
+          "requires": {
+            "bin-links": "^1.1.2",
+            "bluebird": "^3.5.1",
+            "figgy-pudding": "^3.5.1",
+            "find-npm-prefix": "^1.0.2",
+            "graceful-fs": "^4.1.11",
+            "ini": "^1.3.5",
+            "lock-verify": "^2.1.0",
+            "mkdirp": "^0.5.1",
+            "npm-lifecycle": "^3.0.0",
+            "npm-logical-tree": "^1.2.1",
+            "npm-package-arg": "^6.1.0",
+            "pacote": "^9.1.0",
+            "read-package-json": "^2.0.13",
+            "rimraf": "^2.6.2",
+            "worker-farm": "^1.6.0"
+          }
+        },
+        "libnpm": {
+          "version": "3.0.1",
+          "bundled": true,
+          "requires": {
+            "bin-links": "^1.1.2",
+            "bluebird": "^3.5.3",
+            "find-npm-prefix": "^1.0.2",
+            "libnpmaccess": "^3.0.2",
+            "libnpmconfig": "^1.2.1",
+            "libnpmhook": "^5.0.3",
+            "libnpmorg": "^1.0.1",
+            "libnpmpublish": "^1.1.2",
+            "libnpmsearch": "^2.0.2",
+            "libnpmteam": "^1.0.2",
+            "lock-verify": "^2.0.2",
+            "npm-lifecycle": "^3.0.0",
+            "npm-logical-tree": "^1.2.1",
+            "npm-package-arg": "^6.1.0",
+            "npm-profile": "^4.0.2",
+            "npm-registry-fetch": "^4.0.0",
+            "npmlog": "^4.1.2",
+            "pacote": "^9.5.3",
+            "read-package-json": "^2.0.13",
+            "stringify-package": "^1.0.0"
+          }
+        },
+        "libnpmaccess": {
+          "version": "3.0.2",
+          "bundled": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "get-stream": "^4.0.0",
+            "npm-package-arg": "^6.1.0",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "libnpmconfig": {
+          "version": "1.2.1",
+          "bundled": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "find-up": "^3.0.0",
+            "ini": "^1.3.5"
+          },
+          "dependencies": {
+            "find-up": {
+              "version": "3.0.0",
+              "bundled": true,
+              "requires": {
+                "locate-path": "^3.0.0"
+              }
+            },
+            "locate-path": {
+              "version": "3.0.0",
+              "bundled": true,
+              "requires": {
+                "p-locate": "^3.0.0",
+                "path-exists": "^3.0.0"
+              }
+            },
+            "p-limit": {
+              "version": "2.2.0",
+              "bundled": true,
+              "requires": {
+                "p-try": "^2.0.0"
+              }
+            },
+            "p-locate": {
+              "version": "3.0.0",
+              "bundled": true,
+              "requires": {
+                "p-limit": "^2.0.0"
+              }
+            },
+            "p-try": {
+              "version": "2.2.0",
+              "bundled": true
+            }
+          }
+        },
+        "libnpmhook": {
+          "version": "5.0.3",
+          "bundled": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.4.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "libnpmorg": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.4.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "libnpmpublish": {
+          "version": "1.1.2",
+          "bundled": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.5.1",
+            "get-stream": "^4.0.0",
+            "lodash.clonedeep": "^4.5.0",
+            "normalize-package-data": "^2.4.0",
+            "npm-package-arg": "^6.1.0",
+            "npm-registry-fetch": "^4.0.0",
+            "semver": "^5.5.1",
+            "ssri": "^6.0.1"
+          }
+        },
+        "libnpmsearch": {
+          "version": "2.0.2",
+          "bundled": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "libnpmteam": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.4.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "libnpx": {
+          "version": "10.2.4",
+          "bundled": true,
+          "requires": {
+            "dotenv": "^5.0.1",
+            "npm-package-arg": "^6.0.0",
+            "rimraf": "^2.6.2",
+            "safe-buffer": "^5.1.0",
+            "update-notifier": "^2.3.0",
+            "which": "^1.3.0",
+            "y18n": "^4.0.0",
+            "yargs": "^14.2.3"
+          }
+        },
+        "lock-verify": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "npm-package-arg": "^6.1.0",
+            "semver": "^5.4.1"
+          }
+        },
+        "lockfile": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "lodash._baseindexof": {
+          "version": "3.1.0",
+          "bundled": true
+        },
+        "lodash._baseuniq": {
+          "version": "4.6.0",
+          "bundled": true,
+          "requires": {
+            "lodash._createset": "~4.0.0",
+            "lodash._root": "~3.0.0"
+          }
+        },
+        "lodash._bindcallback": {
+          "version": "3.0.1",
+          "bundled": true
+        },
+        "lodash._cacheindexof": {
+          "version": "3.0.2",
+          "bundled": true
+        },
+        "lodash._createcache": {
+          "version": "3.1.2",
+          "bundled": true,
+          "requires": {
+            "lodash._getnative": "^3.0.0"
+          }
+        },
+        "lodash._createset": {
+          "version": "4.0.3",
+          "bundled": true
+        },
+        "lodash._getnative": {
+          "version": "3.9.1",
+          "bundled": true
+        },
+        "lodash._root": {
+          "version": "3.0.1",
+          "bundled": true
+        },
+        "lodash.clonedeep": {
+          "version": "4.5.0",
+          "bundled": true
+        },
+        "lodash.restparam": {
+          "version": "3.6.1",
+          "bundled": true
+        },
+        "lodash.union": {
+          "version": "4.6.0",
+          "bundled": true
+        },
+        "lodash.uniq": {
+          "version": "4.5.0",
+          "bundled": true
+        },
+        "lodash.without": {
+          "version": "4.4.0",
+          "bundled": true
+        },
+        "lowercase-keys": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "bundled": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "make-dir": {
+          "version": "1.3.0",
+          "bundled": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "make-fetch-happen": {
+          "version": "5.0.2",
+          "bundled": true,
+          "requires": {
+            "agentkeepalive": "^3.4.1",
+            "cacache": "^12.0.0",
+            "http-cache-semantics": "^3.8.1",
+            "http-proxy-agent": "^2.1.0",
+            "https-proxy-agent": "^2.2.3",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "node-fetch-npm": "^2.0.2",
+            "promise-retry": "^1.1.1",
+            "socks-proxy-agent": "^4.0.0",
+            "ssri": "^6.0.0"
+          }
+        },
+        "meant": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "mime-db": {
+          "version": "1.35.0",
+          "bundled": true
+        },
+        "mime-types": {
+          "version": "2.1.19",
+          "bundled": true,
+          "requires": {
+            "mime-db": "~1.35.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "bundled": true
+        },
+        "minizlib": {
+          "version": "1.3.3",
+          "bundled": true,
+          "requires": {
+            "minipass": "^2.9.0"
+          },
+          "dependencies": {
+            "minipass": {
+              "version": "2.9.0",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            }
+          }
+        },
+        "mississippi": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "concat-stream": "^1.5.0",
+            "duplexify": "^3.4.2",
+            "end-of-stream": "^1.1.0",
+            "flush-write-stream": "^1.0.0",
+            "from2": "^2.1.0",
+            "parallel-transform": "^1.1.0",
+            "pump": "^3.0.0",
+            "pumpify": "^1.3.3",
+            "stream-each": "^1.1.0",
+            "through2": "^2.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.5",
+          "bundled": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.5",
+              "bundled": true
+            }
+          }
+        },
+        "move-concurrently": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "aproba": "^1.1.1",
+            "copy-concurrently": "^1.0.0",
+            "fs-write-stream-atomic": "^1.0.8",
+            "mkdirp": "^0.5.1",
+            "rimraf": "^2.5.4",
+            "run-queue": "^1.0.3"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true
+            }
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "bundled": true
+        },
+        "mute-stream": {
+          "version": "0.0.7",
+          "bundled": true
+        },
+        "node-fetch-npm": {
+          "version": "2.0.2",
+          "bundled": true,
+          "requires": {
+            "encoding": "^0.1.11",
+            "json-parse-better-errors": "^1.0.0",
+            "safe-buffer": "^5.1.1"
+          }
+        },
+        "node-gyp": {
+          "version": "5.1.0",
+          "bundled": true,
+          "requires": {
+            "env-paths": "^2.2.0",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.2.2",
+            "mkdirp": "^0.5.1",
+            "nopt": "^4.0.1",
+            "npmlog": "^4.1.2",
+            "request": "^2.88.0",
+            "rimraf": "^2.6.3",
+            "semver": "^5.7.1",
+            "tar": "^4.4.12",
+            "which": "^1.3.1"
+          }
+        },
+        "nopt": {
+          "version": "4.0.3",
+          "bundled": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "normalize-package-data": {
+          "version": "2.5.0",
+          "bundled": true,
+          "requires": {
+            "hosted-git-info": "^2.1.4",
+            "resolve": "^1.10.0",
+            "semver": "2 || 3 || 4 || 5",
+            "validate-npm-package-license": "^3.0.1"
+          },
+          "dependencies": {
+            "resolve": {
+              "version": "1.10.0",
+              "bundled": true,
+              "requires": {
+                "path-parse": "^1.0.6"
+              }
+            }
+          }
+        },
+        "npm-audit-report": {
+          "version": "1.3.3",
+          "bundled": true,
+          "requires": {
+            "cli-table3": "^0.5.0",
+            "console-control-strings": "^1.1.0"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "npm-normalize-package-bin": "^1.0.1"
+          }
+        },
+        "npm-cache-filename": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "npm-install-checks": {
+          "version": "3.0.2",
+          "bundled": true,
+          "requires": {
+            "semver": "^2.3.0 || 3.x || 4 || 5"
+          }
+        },
+        "npm-lifecycle": {
+          "version": "3.1.5",
+          "bundled": true,
+          "requires": {
+            "byline": "^5.0.0",
+            "graceful-fs": "^4.1.15",
+            "node-gyp": "^5.0.2",
+            "resolve-from": "^4.0.0",
+            "slide": "^1.1.6",
+            "uid-number": "0.0.6",
+            "umask": "^1.1.0",
+            "which": "^1.3.1"
+          }
+        },
+        "npm-logical-tree": {
+          "version": "1.2.1",
+          "bundled": true
+        },
+        "npm-normalize-package-bin": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "npm-package-arg": {
+          "version": "6.1.1",
+          "bundled": true,
+          "requires": {
+            "hosted-git-info": "^2.7.1",
+            "osenv": "^0.1.5",
+            "semver": "^5.6.0",
+            "validate-npm-package-name": "^3.0.0"
+          }
+        },
+        "npm-packlist": {
+          "version": "1.4.8",
+          "bundled": true,
+          "requires": {
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1",
+            "npm-normalize-package-bin": "^1.0.1"
+          }
+        },
+        "npm-pick-manifest": {
+          "version": "3.0.2",
+          "bundled": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "npm-package-arg": "^6.0.0",
+            "semver": "^5.4.1"
+          }
+        },
+        "npm-profile": {
+          "version": "4.0.4",
+          "bundled": true,
+          "requires": {
+            "aproba": "^1.1.2 || 2",
+            "figgy-pudding": "^3.4.1",
+            "npm-registry-fetch": "^4.0.0"
+          }
+        },
+        "npm-registry-fetch": {
+          "version": "4.0.7",
+          "bundled": true,
+          "requires": {
+            "JSONStream": "^1.3.4",
+            "bluebird": "^3.5.1",
+            "figgy-pudding": "^3.4.1",
+            "lru-cache": "^5.1.1",
+            "make-fetch-happen": "^5.0.0",
+            "npm-package-arg": "^6.1.0",
+            "safe-buffer": "^5.2.0"
+          },
+          "dependencies": {
+            "safe-buffer": {
+              "version": "5.2.1",
+              "bundled": true
+            }
+          }
+        },
+        "npm-run-path": {
+          "version": "2.0.2",
+          "bundled": true,
+          "requires": {
+            "path-key": "^2.0.0"
+          }
+        },
+        "npm-user-validate": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "requires": {
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "oauth-sign": {
+          "version": "0.9.0",
+          "bundled": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true
+        },
+        "object-keys": {
+          "version": "1.0.12",
+          "bundled": true
+        },
+        "object.getownpropertydescriptors": {
+          "version": "2.0.3",
+          "bundled": true,
+          "requires": {
+            "define-properties": "^1.1.2",
+            "es-abstract": "^1.5.1"
+          }
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "opener": {
+          "version": "1.5.1",
+          "bundled": true
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "requires": {
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
+          }
+        },
+        "p-finally": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "package-json": {
+          "version": "4.0.1",
+          "bundled": true,
+          "requires": {
+            "got": "^6.7.1",
+            "registry-auth-token": "^3.0.1",
+            "registry-url": "^3.0.3",
+            "semver": "^5.1.0"
+          }
+        },
+        "pacote": {
+          "version": "9.5.12",
+          "bundled": true,
+          "requires": {
+            "bluebird": "^3.5.3",
+            "cacache": "^12.0.2",
+            "chownr": "^1.1.2",
+            "figgy-pudding": "^3.5.1",
+            "get-stream": "^4.1.0",
+            "glob": "^7.1.3",
+            "infer-owner": "^1.0.4",
+            "lru-cache": "^5.1.1",
+            "make-fetch-happen": "^5.0.0",
+            "minimatch": "^3.0.4",
+            "minipass": "^2.3.5",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "normalize-package-data": "^2.4.0",
+            "npm-normalize-package-bin": "^1.0.0",
+            "npm-package-arg": "^6.1.0",
+            "npm-packlist": "^1.1.12",
+            "npm-pick-manifest": "^3.0.0",
+            "npm-registry-fetch": "^4.0.0",
+            "osenv": "^0.1.5",
+            "promise-inflight": "^1.0.1",
+            "promise-retry": "^1.1.1",
+            "protoduck": "^5.0.1",
+            "rimraf": "^2.6.2",
+            "safe-buffer": "^5.1.2",
+            "semver": "^5.6.0",
+            "ssri": "^6.0.1",
+            "tar": "^4.4.10",
+            "unique-filename": "^1.1.1",
+            "which": "^1.3.1"
+          },
+          "dependencies": {
+            "minipass": {
+              "version": "2.9.0",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            }
+          }
+        },
+        "parallel-transform": {
+          "version": "1.1.0",
+          "bundled": true,
+          "requires": {
+            "cyclist": "~0.2.2",
+            "inherits": "^2.0.3",
+            "readable-stream": "^2.1.5"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "bundled": true
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "path-is-inside": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "path-key": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "path-parse": {
+          "version": "1.0.6",
+          "bundled": true
+        },
+        "performance-now": {
+          "version": "2.1.0",
+          "bundled": true
+        },
+        "pify": {
+          "version": "3.0.0",
+          "bundled": true
+        },
+        "prepend-http": {
+          "version": "1.0.4",
+          "bundled": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "promise-inflight": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "promise-retry": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "err-code": "^1.0.0",
+            "retry": "^0.10.0"
+          },
+          "dependencies": {
+            "retry": {
+              "version": "0.10.1",
+              "bundled": true
+            }
+          }
+        },
+        "promzard": {
+          "version": "0.3.0",
+          "bundled": true,
+          "requires": {
+            "read": "1"
+          }
+        },
+        "proto-list": {
+          "version": "1.2.4",
+          "bundled": true
+        },
+        "protoduck": {
+          "version": "5.0.1",
+          "bundled": true,
+          "requires": {
+            "genfun": "^5.0.0"
+          }
+        },
+        "prr": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "pseudomap": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "psl": {
+          "version": "1.1.29",
+          "bundled": true
+        },
+        "pump": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        },
+        "pumpify": {
+          "version": "1.5.1",
+          "bundled": true,
+          "requires": {
+            "duplexify": "^3.6.0",
+            "inherits": "^2.0.3",
+            "pump": "^2.0.0"
+          },
+          "dependencies": {
+            "pump": {
+              "version": "2.0.1",
+              "bundled": true,
+              "requires": {
+                "end-of-stream": "^1.1.0",
+                "once": "^1.3.1"
+              }
+            }
+          }
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true
+        },
+        "qrcode-terminal": {
+          "version": "0.12.0",
+          "bundled": true
+        },
+        "qs": {
+          "version": "6.5.2",
+          "bundled": true
+        },
+        "query-string": {
+          "version": "6.8.2",
+          "bundled": true,
+          "requires": {
+            "decode-uri-component": "^0.2.0",
+            "split-on-first": "^1.0.0",
+            "strict-uri-encode": "^2.0.0"
+          }
+        },
+        "qw": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "rc": {
+          "version": "1.2.8",
+          "bundled": true,
+          "requires": {
+            "deep-extend": "^0.6.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
+          }
+        },
+        "read": {
+          "version": "1.0.7",
+          "bundled": true,
+          "requires": {
+            "mute-stream": "~0.0.4"
+          }
+        },
+        "read-cmd-shim": {
+          "version": "1.0.5",
+          "bundled": true,
+          "requires": {
+            "graceful-fs": "^4.1.2"
+          }
+        },
+        "read-installed": {
+          "version": "4.0.3",
+          "bundled": true,
+          "requires": {
+            "debuglog": "^1.0.1",
+            "graceful-fs": "^4.1.2",
+            "read-package-json": "^2.0.0",
+            "readdir-scoped-modules": "^1.0.0",
+            "semver": "2 || 3 || 4 || 5",
+            "slide": "~1.1.3",
+            "util-extend": "^1.0.1"
+          }
+        },
+        "read-package-json": {
+          "version": "2.1.1",
+          "bundled": true,
+          "requires": {
+            "glob": "^7.1.1",
+            "graceful-fs": "^4.1.2",
+            "json-parse-better-errors": "^1.0.1",
+            "normalize-package-data": "^2.0.0",
+            "npm-normalize-package-bin": "^1.0.0"
+          }
+        },
+        "read-package-tree": {
+          "version": "5.3.1",
+          "bundled": true,
+          "requires": {
+            "read-package-json": "^2.0.0",
+            "readdir-scoped-modules": "^1.0.0",
+            "util-promisify": "^2.1.0"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "readdir-scoped-modules": {
+          "version": "1.1.0",
+          "bundled": true,
+          "requires": {
+            "debuglog": "^1.0.1",
+            "dezalgo": "^1.0.0",
+            "graceful-fs": "^4.1.2",
+            "once": "^1.3.0"
+          }
+        },
+        "registry-auth-token": {
+          "version": "3.4.0",
+          "bundled": true,
+          "requires": {
+            "rc": "^1.1.6",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "registry-url": {
+          "version": "3.1.0",
+          "bundled": true,
+          "requires": {
+            "rc": "^1.0.1"
+          }
+        },
+        "request": {
+          "version": "2.88.0",
+          "bundled": true,
+          "requires": {
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.8.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.6",
+            "extend": "~3.0.2",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.2",
+            "har-validator": "~5.1.0",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.19",
+            "oauth-sign": "~0.9.0",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.2",
+            "safe-buffer": "^5.1.2",
+            "tough-cookie": "~2.4.3",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.3.2"
+          }
+        },
+        "require-directory": {
+          "version": "2.1.1",
+          "bundled": true
+        },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "resolve-from": {
+          "version": "4.0.0",
+          "bundled": true
+        },
+        "retry": {
+          "version": "0.12.0",
+          "bundled": true
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "bundled": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "run-queue": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "aproba": "^1.1.1"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true
+            }
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "bundled": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "bundled": true
+        },
+        "semver-diff": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "semver": "^5.0.3"
+          }
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "sha": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "graceful-fs": "^4.1.2"
+          }
+        },
+        "shebang-command": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "shebang-regex": "^1.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true
+        },
+        "slide": {
+          "version": "1.1.6",
+          "bundled": true
+        },
+        "smart-buffer": {
+          "version": "4.1.0",
+          "bundled": true
+        },
+        "socks": {
+          "version": "2.3.3",
+          "bundled": true,
+          "requires": {
+            "ip": "1.1.5",
+            "smart-buffer": "^4.1.0"
+          }
+        },
+        "socks-proxy-agent": {
+          "version": "4.0.2",
+          "bundled": true,
+          "requires": {
+            "agent-base": "~4.2.1",
+            "socks": "~2.3.2"
+          },
+          "dependencies": {
+            "agent-base": {
+              "version": "4.2.1",
+              "bundled": true,
+              "requires": {
+                "es6-promisify": "^5.0.0"
+              }
+            }
+          }
+        },
+        "sorted-object": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "sorted-union-stream": {
+          "version": "2.1.3",
+          "bundled": true,
+          "requires": {
+            "from2": "^1.3.0",
+            "stream-iterate": "^1.1.0"
+          },
+          "dependencies": {
+            "from2": {
+              "version": "1.3.0",
+              "bundled": true,
+              "requires": {
+                "inherits": "~2.0.1",
+                "readable-stream": "~1.1.10"
+              }
+            },
+            "isarray": {
+              "version": "0.0.1",
+              "bundled": true
+            },
+            "readable-stream": {
+              "version": "1.1.14",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.1",
+                "isarray": "0.0.1",
+                "string_decoder": "~0.10.x"
+              }
+            },
+            "string_decoder": {
+              "version": "0.10.31",
+              "bundled": true
+            }
+          }
+        },
+        "spdx-correct": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "spdx-expression-parse": "^3.0.0",
+            "spdx-license-ids": "^3.0.0"
+          }
+        },
+        "spdx-exceptions": {
+          "version": "2.1.0",
+          "bundled": true
+        },
+        "spdx-expression-parse": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "spdx-exceptions": "^2.1.0",
+            "spdx-license-ids": "^3.0.0"
+          }
+        },
+        "spdx-license-ids": {
+          "version": "3.0.5",
+          "bundled": true
+        },
+        "split-on-first": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "sshpk": {
+          "version": "1.14.2",
+          "bundled": true,
+          "requires": {
+            "asn1": "~0.2.3",
+            "assert-plus": "^1.0.0",
+            "bcrypt-pbkdf": "^1.0.0",
+            "dashdash": "^1.12.0",
+            "ecc-jsbn": "~0.1.1",
+            "getpass": "^0.1.1",
+            "jsbn": "~0.1.0",
+            "safer-buffer": "^2.0.2",
+            "tweetnacl": "~0.14.0"
+          }
+        },
+        "ssri": {
+          "version": "6.0.1",
+          "bundled": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1"
+          }
+        },
+        "stream-each": {
+          "version": "1.2.2",
+          "bundled": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "stream-shift": "^1.0.0"
+          }
+        },
+        "stream-iterate": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "readable-stream": "^2.1.5",
+            "stream-shift": "^1.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "stream-shift": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "strict-uri-encode": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "bundled": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "3.0.0",
+              "bundled": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "2.0.0",
+              "bundled": true
+            },
+            "strip-ansi": {
+              "version": "4.0.0",
+              "bundled": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "~5.2.0"
+          },
+          "dependencies": {
+            "safe-buffer": {
+              "version": "5.2.0",
+              "bundled": true
+            }
+          }
+        },
+        "stringify-package": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-eof": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "bundled": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "tar": {
+          "version": "4.4.13",
+          "bundled": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.8.6",
+            "minizlib": "^1.2.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.3"
+          },
+          "dependencies": {
+            "minipass": {
+              "version": "2.9.0",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            }
+          }
+        },
+        "term-size": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "execa": "^0.7.0"
+          }
+        },
+        "text-table": {
+          "version": "0.2.0",
+          "bundled": true
+        },
+        "through": {
+          "version": "2.3.8",
+          "bundled": true
+        },
+        "through2": {
+          "version": "2.0.3",
+          "bundled": true,
+          "requires": {
+            "readable-stream": "^2.1.5",
+            "xtend": "~4.0.1"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "timed-out": {
+          "version": "4.0.1",
+          "bundled": true
+        },
+        "tiny-relative-date": {
+          "version": "1.3.0",
+          "bundled": true
+        },
+        "tough-cookie": {
+          "version": "2.4.3",
+          "bundled": true,
+          "requires": {
+            "psl": "^1.1.24",
+            "punycode": "^1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "optional": true
+        },
+        "typedarray": {
+          "version": "0.0.6",
+          "bundled": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true
+        },
+        "umask": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "unique-filename": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "unique-slug": "^2.0.0"
+          }
+        },
+        "unique-slug": {
+          "version": "2.0.0",
+          "bundled": true,
+          "requires": {
+            "imurmurhash": "^0.1.4"
+          }
+        },
+        "unique-string": {
+          "version": "1.0.0",
+          "bundled": true,
+          "requires": {
+            "crypto-random-string": "^1.0.0"
+          }
+        },
+        "unpipe": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "unzip-response": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "update-notifier": {
+          "version": "2.5.0",
+          "bundled": true,
+          "requires": {
+            "boxen": "^1.2.1",
+            "chalk": "^2.0.1",
+            "configstore": "^3.0.0",
+            "import-lazy": "^2.1.0",
+            "is-ci": "^1.0.10",
+            "is-installed-globally": "^0.1.0",
+            "is-npm": "^1.0.0",
+            "latest-version": "^3.0.0",
+            "semver-diff": "^2.0.0",
+            "xdg-basedir": "^3.0.0"
+          }
+        },
+        "uri-js": {
+          "version": "4.4.0",
+          "bundled": true,
+          "requires": {
+            "punycode": "^2.1.0"
+          },
+          "dependencies": {
+            "punycode": {
+              "version": "2.1.1",
+              "bundled": true
+            }
+          }
+        },
+        "url-parse-lax": {
+          "version": "1.0.0",
+          "bundled": true,
+          "requires": {
+            "prepend-http": "^1.0.1"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "util-extend": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "util-promisify": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "object.getownpropertydescriptors": "^2.0.3"
+          }
+        },
+        "uuid": {
+          "version": "3.3.3",
+          "bundled": true
+        },
+        "validate-npm-package-license": {
+          "version": "3.0.4",
+          "bundled": true,
+          "requires": {
+            "spdx-correct": "^3.0.0",
+            "spdx-expression-parse": "^3.0.0"
+          }
+        },
+        "validate-npm-package-name": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "builtins": "^1.0.3"
+          }
+        },
+        "verror": {
+          "version": "1.10.0",
+          "bundled": true,
+          "requires": {
+            "assert-plus": "^1.0.0",
+            "core-util-is": "1.0.2",
+            "extsprintf": "^1.2.0"
+          }
+        },
+        "wcwidth": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "defaults": "^1.0.3"
+          }
+        },
+        "which": {
+          "version": "1.3.1",
+          "bundled": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "bundled": true
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "requires": {
+            "string-width": "^1.0.2"
+          },
+          "dependencies": {
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            }
+          }
+        },
+        "widest-line": {
+          "version": "2.0.1",
+          "bundled": true,
+          "requires": {
+            "string-width": "^2.1.1"
+          }
+        },
+        "worker-farm": {
+          "version": "1.7.0",
+          "bundled": true,
+          "requires": {
+            "errno": "~0.1.7"
+          }
+        },
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "bundled": true,
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "bundled": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "2.0.0",
+              "bundled": true
+            },
+            "string-width": {
+              "version": "3.1.0",
+              "bundled": true,
+              "requires": {
+                "emoji-regex": "^7.0.1",
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "bundled": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "write-file-atomic": {
+          "version": "2.4.3",
+          "bundled": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "imurmurhash": "^0.1.4",
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "xdg-basedir": {
+          "version": "3.0.0",
+          "bundled": true
+        },
+        "xtend": {
+          "version": "4.0.1",
+          "bundled": true
+        },
+        "y18n": {
+          "version": "4.0.0",
+          "bundled": true
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "bundled": true
+        },
+        "yargs": {
+          "version": "14.2.3",
+          "bundled": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^15.0.1"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "bundled": true
+            },
+            "find-up": {
+              "version": "3.0.0",
+              "bundled": true,
+              "requires": {
+                "locate-path": "^3.0.0"
+              }
+            },
+            "is-fullwidth-code-point": {
+              "version": "2.0.0",
+              "bundled": true
+            },
+            "locate-path": {
+              "version": "3.0.0",
+              "bundled": true,
+              "requires": {
+                "p-locate": "^3.0.0",
+                "path-exists": "^3.0.0"
+              }
+            },
+            "p-limit": {
+              "version": "2.3.0",
+              "bundled": true,
+              "requires": {
+                "p-try": "^2.0.0"
+              }
+            },
+            "p-locate": {
+              "version": "3.0.0",
+              "bundled": true,
+              "requires": {
+                "p-limit": "^2.0.0"
+              }
+            },
+            "p-try": {
+              "version": "2.2.0",
+              "bundled": true
+            },
+            "string-width": {
+              "version": "3.1.0",
+              "bundled": true,
+              "requires": {
+                "emoji-regex": "^7.0.1",
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "bundled": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
+          }
+        },
+        "yargs-parser": {
+          "version": "15.0.1",
+          "bundled": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          },
+          "dependencies": {
+            "camelcase": {
+              "version": "5.3.1",
+              "bundled": true
+            }
+          }
+        }
+      }
+    },
+    "npm-conf": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
+      "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "config-chain": "^1.1.11",
+        "pify": "^3.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha1-sr0pXDfj3VijvwcAN2Zjuk2c8Fw=",
+      "dev": true,
+      "requires": {
+        "boolbase": "~1.0.0"
+      }
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
+    },
+    "nwsapi": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+      "dev": true
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+      "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
+      "dev": true
+    },
+    "object-component": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
+      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
+      "dev": true
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-inspect": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
+      "dev": true
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
+    "object.defaults": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
+      "dev": true,
+      "requires": {
+        "array-each": "^1.0.1",
+        "array-slice": "^1.0.0",
+        "for-own": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.5.1"
+      }
+    },
+    "object.map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
+      "dev": true,
+      "requires": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      }
+    },
+    "object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "dev": true,
+      "requires": {
+        "for-own": "^0.1.4",
+        "is-extendable": "^0.1.1"
+      },
+      "dependencies": {
+        "for-own": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+          "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+          "dev": true,
+          "requires": {
+            "for-in": "^1.0.1"
+          }
+        }
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "object.reduce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
+      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
+      "dev": true,
+      "requires": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      }
+    },
+    "object.values": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
+      "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.12.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      }
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "once": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+      "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "dev": true,
+      "requires": {
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
+          "dev": true
+        },
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+          "dev": true
+        }
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "dev": true,
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
+      }
+    },
+    "optipng-bin": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/optipng-bin/-/optipng-bin-6.0.0.tgz",
+      "integrity": "sha512-95bB4y8IaTsa/8x6QH4bLUuyvyOoGBCLDA7wOgDL8UFqJpSUh1Hob8JRJhit+wC1ZLN3tQ7mFt7KuBj0x8F2Wg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "bin-build": "^3.0.0",
+        "bin-wrapper": "^4.0.0",
+        "logalot": "^2.0.0"
+      }
+    },
+    "ordered-read-streams": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
+      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "os-filter-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz",
+      "integrity": "sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "arch": "^2.1.0"
+      }
+    },
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "dev": true,
+      "requires": {
+        "lcid": "^1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "p-cancelable": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz",
+      "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==",
+      "dev": true,
+      "optional": true
+    },
+    "p-event": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-event/-/p-event-1.3.0.tgz",
+      "integrity": "sha1-jmtPT2XHK8W2/ii3XtqHT5akoIU=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "p-timeout": "^1.1.1"
+      }
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true,
+      "optional": true
+    },
+    "p-is-promise": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
+      "dev": true,
+      "optional": true
+    },
+    "p-map-series": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-map-series/-/p-map-series-1.0.0.tgz",
+      "integrity": "sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "p-reduce": "^1.0.0"
+      }
+    },
+    "p-pipe": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-3.0.0.tgz",
+      "integrity": "sha512-gwwdRFmaxsT3IU+Tl3vYKVRdjfhg8Bbdjw7B+E0y6F7Yz6l+eaQLn0BRmGMXIhcPDONPtOkMoNwx1etZh4zPJA==",
+      "dev": true
+    },
+    "p-reduce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
+      "integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=",
+      "dev": true,
+      "optional": true
+    },
+    "p-timeout": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz",
+      "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "p-finally": "^1.0.0"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+          "dev": true
+        }
+      }
+    },
+    "parse-filepath": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
+      "dev": true,
+      "requires": {
+        "is-absolute": "^1.0.0",
+        "map-cache": "^0.2.0",
+        "path-root": "^0.1.1"
+      }
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "dev": true,
+      "requires": {
+        "glob-base": "^0.3.0",
+        "is-dotfile": "^1.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.0"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        }
+      }
+    },
+    "parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+      "dev": true,
+      "requires": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      }
+    },
+    "parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+      "dev": true
+    },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true
+    },
+    "parse5": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+      "dev": true
+    },
+    "parseqs": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
+      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
+      "dev": true,
+      "requires": {
+        "better-assert": "~1.0.0"
+      }
+    },
+    "parseuri": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
+      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
+      "dev": true,
+      "requires": {
+        "better-assert": "~1.0.0"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "dev": true,
+      "requires": {
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha1-1i27VnlAXXLEc37FhgDp3c8G0kw=",
+      "dev": true
+    },
+    "path-root": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
+      "dev": true,
+      "requires": {
+        "path-root-regex": "^0.1.0"
+      }
+    },
+    "path-root-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
+      "dev": true
+    },
+    "path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+          "dev": true
+        }
+      }
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true,
+      "optional": true
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "picomatch": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz",
+      "integrity": "sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==",
+      "dev": true
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "plugin-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha1-dwFr2JGdCsN3/c3QMiMolTyleBw=",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      }
+    },
+    "plur": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/plur/-/plur-3.1.1.tgz",
+      "integrity": "sha512-t1Ax8KUvV3FFII8ltczPn2tJdjqbd1sIzu6t4JL7nQ3EyeL/lTrj5PWKb06ic5/6XYDr65rQ4uzQEGN70/6X5w==",
+      "dev": true,
+      "requires": {
+        "irregular-plurals": "^2.0.0"
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
+    },
+    "postcss": {
+      "version": "7.0.18",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.18.tgz",
+      "integrity": "sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "postcss-calc": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.1.tgz",
+      "integrity": "sha1-Ntd7qwI7Dsu5eJ2E3LI8SUEUVDY=",
+      "dev": true,
+      "requires": {
+        "css-unit-converter": "^1.1.1",
+        "postcss": "^7.0.5",
+        "postcss-selector-parser": "^5.0.0-rc.4",
+        "postcss-value-parser": "^3.3.1"
+      }
+    },
+    "postcss-colormin": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "color": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-convert-values": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
+      "integrity": "sha1-yjgT7U2g+BL51DcDWE5Enr4Ymn8=",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-discard-comments": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
+      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-duplicates": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
+      "integrity": "sha1-P+EzzTyCKC5VD8myORdqkge3hOs=",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-empty": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
+      "integrity": "sha1-yMlR6fc+2UKAGUWERKAq2Qu592U=",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-overridden": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
+      "integrity": "sha1-ZSrvipZybwKfXj4AFG7npOdV/1c=",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-load-config": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
+      "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^5.0.0",
+        "import-cwd": "^2.0.0"
+      }
+    },
+    "postcss-merge-longhand": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
+      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+      "dev": true,
+      "requires": {
+        "css-color-names": "0.0.4",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "stylehacks": "^4.0.0"
+      }
+    },
+    "postcss-merge-rules": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
+      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "cssnano-util-same-parent": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0",
+        "vendors": "^1.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
+          "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^4.1.1",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-minify-font-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
+      "integrity": "sha1-zUw0TM5HQ0P6xdgiBqssvLiv1aY=",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-minify-gradients": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
+      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "is-color-stop": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-minify-params": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
+      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "browserslist": "^4.0.0",
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "uniqs": "^2.0.0"
+      }
+    },
+    "postcss-minify-selectors": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
+      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
+          "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^4.1.1",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-normalize-charset": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
+      "integrity": "sha1-izWt067oOhNrBHHg1ZvlilAoXdQ=",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-normalize-display-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
+      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-normalize-positions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
+      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-normalize-repeat-style": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
+      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-normalize-string": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
+      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-normalize-timing-functions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
+      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-normalize-unicode": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
+      "integrity": "sha1-hBvUj9zzAZrUuqdJOj02O1KuHPs=",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-normalize-url": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
+      "integrity": "sha1-EOQ3+GvHx+WPe5ZS7YeNqqlfquE=",
+      "dev": true,
+      "requires": {
+        "is-absolute-url": "^2.0.0",
+        "normalize-url": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-normalize-whitespace": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
+      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-ordered-values": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
+      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-reduce-initial": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-reduce-transforms": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
+      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^2.0.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
+    "postcss-svgo": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
+      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
+      "dev": true,
+      "requires": {
+        "is-svg": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "svgo": "^1.0.0"
+      }
+    },
+    "postcss-unique-selectors": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
+      "integrity": "sha1-lEaRHzKJv9ZMbWgPBzwDsfnuS6w=",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "postcss": "^7.0.0",
+        "uniqs": "^2.0.0"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "dev": true,
+      "optional": true
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+      "dev": true
+    },
+    "pretty-bytes": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz",
+      "integrity": "sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==",
+      "dev": true
+    },
+    "pretty-hrtime": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
+      "dev": true
+    },
+    "private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha1-I4Hts2ifelPWUxkAYPz4ItLzaP8=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
+    },
+    "promise": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+      "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "asap": "~2.0.3"
+      }
+    },
+    "proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
+      "dev": true,
+      "optional": true
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true,
+      "optional": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "psl": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
+      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
+      "dev": true
+    },
+    "pump": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=",
+      "dev": true
+    },
+    "q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "dev": true
+    },
+    "qjobs": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
+      "integrity": "sha1-xF6cYYAL0IfviNfiVkI73Unl0HE=",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true
+    },
+    "query-string": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "decode-uri-component": "^0.2.0",
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      },
+      "dependencies": {
+        "object-assign": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "randomatic": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
+      "integrity": "sha1-t3bvxZN1mE42xTey9RofCv8Noe0=",
+      "dev": true,
+      "requires": {
+        "is-number": "^4.0.0",
+        "kind-of": "^6.0.0",
+        "math-random": "^1.0.1"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8=",
+          "dev": true
+        }
+      }
+    },
+    "range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true
+    },
+    "raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      }
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "requires": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      }
+    },
+    "readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "dev": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha1-DodiKjMlqjPokihcr4tOhGUppSU=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+          "dev": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dev": true,
+      "requires": {
+        "resolve": "^1.1.6"
+      }
+    },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
+      }
+    },
+    "regenerate": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+      "integrity": "sha1-SoVuxLVuQHfFV1icroXnpMiGmhE=",
+      "dev": true
+    },
+    "regenerate-unicode-properties": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
+      "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.4.0"
+      }
+    },
+    "regenerator-transform": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz",
+      "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==",
+      "dev": true,
+      "requires": {
+        "private": "^0.1.6"
+      }
+    },
+    "regex-cache": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
+      "dev": true,
+      "requires": {
+        "is-equal-shallow": "^0.1.3"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "regexpp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+      "integrity": "sha1-jRnTHPYySCtYkEn4KB+T28uk0H8=",
+      "dev": true
+    },
+    "regexpu-core": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
+      "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^8.1.0",
+        "regjsgen": "^0.5.0",
+        "regjsparser": "^0.6.0",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.1.0"
+      }
+    },
+    "regjsgen": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz",
+      "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
+      "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
+      "dev": true,
+      "requires": {
+        "jsesc": "~0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        }
+      }
+    },
+    "remove-bom-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
+      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+      "dev": true,
+      "requires": {
+        "is-buffer": "^1.1.5",
+        "is-utf8": "^0.2.1"
+      }
+    },
+    "remove-bom-stream": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
+      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
+      "dev": true,
+      "requires": {
+        "remove-bom-buffer": "^3.0.0",
+        "safe-buffer": "^5.1.0",
+        "through2": "^2.0.3"
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha1-eC4NglwMWjuzlzH4Tv7mt0Lmsc4=",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-finite": "^1.0.0"
+      }
+    },
+    "replace-ext": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
+      "dev": true
+    },
+    "replace-homedir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
+      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "^1.0.1",
+        "is-absolute": "^1.0.0",
+        "remove-trailing-separator": "^1.1.0"
+      }
+    },
+    "request": {
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha1-nC/KT301tZLv5Xx/ClXoEFIST+8=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "^5.0.1"
+          }
+        }
+      }
+    },
+    "request-promise-core": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.19"
+      }
+    },
+    "request-promise-native": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
+      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
+      "dev": true,
+      "requires": {
+        "request-promise-core": "1.1.4",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+      "dev": true,
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true
+    },
+    "resolve-options": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
+      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
+      "dev": true,
+      "requires": {
+        "value-or-function": "^3.0.0"
+      }
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dev": true,
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=",
+      "dev": true
+    },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
+    "rfdc": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
+      "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==",
+      "dev": true
+    },
+    "rgb-regex": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
+      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
+      "dev": true
+    },
+    "rgba-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
+      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
+      "dev": true
+    },
+    "right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+      "dev": true,
+      "requires": {
+        "align-text": "^0.1.1"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "run-parallel": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
+      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
+      "dev": true
+    },
+    "run-sequence": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-2.2.1.tgz",
+      "integrity": "sha1-HOZD2jb9jH6n4akynaM/wriJhJU=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.3",
+        "fancy-log": "^1.3.2",
+        "plugin-error": "^0.1.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "arr-diff": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.0.1",
+            "array-slice": "^0.2.3"
+          }
+        },
+        "arr-union": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
+          "dev": true
+        },
+        "array-slice": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+          "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^1.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
+          "dev": true
+        },
+        "plugin-error": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+          "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
+          "dev": true,
+          "requires": {
+            "ansi-cyan": "^0.1.1",
+            "ansi-red": "^0.1.1",
+            "arr-diff": "^1.0.1",
+            "arr-union": "^2.0.1",
+            "extend-shallow": "^1.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "rxjs": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
+      "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
+      "dev": true
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
+      "dev": true
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
+      "dev": true
+    },
+    "saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dev": true,
+      "requires": {
+        "xmlchars": "^2.2.0"
+      }
+    },
+    "seek-bzip": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
+      "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "commander": "~2.8.1"
+      }
+    },
+    "select": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+      "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
+    },
+    "semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true
+    },
+    "semver-greatest-satisfied-range": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
+      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
+      "dev": true,
+      "requires": {
+        "sver-compat": "^1.5.0"
+      }
+    },
+    "semver-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz",
+      "integrity": "sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==",
+      "dev": true,
+      "optional": true
+    },
+    "semver-truncate": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz",
+      "integrity": "sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "semver": "^5.3.0"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "dev": true
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "shellwords": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+      "integrity": "sha1-1rkYHBpI05cyTISHHvvPxz/AZUs=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "signalr": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/signalr/-/signalr-2.4.0.tgz",
+      "integrity": "sha1-kq8AjmtSetSzbpT7s0DhNQh6YNI=",
+      "requires": {
+        "jquery": ">=1.6.4"
+      }
+    },
+    "simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.3.1"
+      },
+      "dependencies": {
+        "is-arrayish": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+          "integrity": "sha1-RXSirlb3qyBolvtDHq7tBm/fjwM=",
+          "dev": true
+        }
+      }
+    },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        }
+      }
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=",
+      "dev": true,
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "socket.io": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
+      "integrity": "sha1-oGnF/qvuPmshSnW0DOBlLhz7mYA=",
+      "dev": true,
+      "requires": {
+        "debug": "~3.1.0",
+        "engine.io": "~3.2.0",
+        "has-binary2": "~1.0.2",
+        "socket.io-adapter": "~1.1.0",
+        "socket.io-client": "2.1.1",
+        "socket.io-parser": "~3.2.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "socket.io-adapter": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
+      "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=",
+      "dev": true
+    },
+    "socket.io-client": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
+      "integrity": "sha1-3LOBA0NqtFeN2wJmOK4vIbYjZx8=",
+      "dev": true,
+      "requires": {
+        "backo2": "1.0.2",
+        "base64-arraybuffer": "0.1.5",
+        "component-bind": "1.0.0",
+        "component-emitter": "1.2.1",
+        "debug": "~3.1.0",
+        "engine.io-client": "~3.2.0",
+        "has-binary2": "~1.0.2",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "object-component": "0.0.3",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "socket.io-parser": "~3.2.0",
+        "to-array": "0.1.4"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "socket.io-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
+      "integrity": "sha1-58Yii2qh+BTmFIrqMltRqpSZ4Hc=",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "debug": "~3.1.0",
+        "isarray": "2.0.1"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "isarray": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-plain-obj": "^1.0.0"
+      }
+    },
+    "sort-keys-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
+      "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "sort-keys": "^1.0.0"
+      }
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true
+    },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha1-cuLMNAlVQ+Q7LGKyxMENSpBU8lk=",
+      "dev": true,
+      "requires": {
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "dev": true
+    },
+    "sparkles": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+      "integrity": "sha1-AI22XtzmxQ7sDF4ijhlFBh3QQ3w=",
+      "dev": true
+    },
+    "spdx-correct": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha1-LqRQrudPKom/uUUZwH/Nb0EyKXc=",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "dev": true
+    },
+    "spectrum-colorpicker2": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/spectrum-colorpicker2/-/spectrum-colorpicker2-2.0.3.tgz",
+      "integrity": "sha512-uEmzdiPqSHgJ1sJvEiwsuYAt7ep/GltjWZ7yloMDFMPcr4qQmmwX4UqlFz7C2HxmmqA51jx51FfgiF65s7R3Pg=="
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "squeak": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/squeak/-/squeak-1.3.0.tgz",
+      "integrity": "sha1-MwRQN7ZDiLVnZ0uEMiplIQc5FsM=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^1.0.0",
+        "console-stream": "^0.1.1",
+        "lpad-align": "^1.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true,
+          "optional": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "dev": true,
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha1-g26zyDgv4pNv6vVEYxAXzn1Ho88=",
+      "dev": true
+    },
+    "stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "dev": true
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "dev": true
+    },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+      "dev": true
+    },
+    "stream-exhaust": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
+      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+      "dev": true
+    },
+    "stream-shift": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+      "dev": true
+    },
+    "streamroller": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz",
+      "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==",
+      "dev": true,
+      "requires": {
+        "async": "^2.6.2",
+        "date-format": "^2.0.0",
+        "debug": "^3.2.6",
+        "fs-extra": "^7.0.1",
+        "lodash": "^4.17.14"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "fs-extra": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        }
+      }
+    },
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+      "dev": true,
+      "optional": true
+    },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dev": true,
+      "requires": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      }
+    },
+    "string.prototype.trimleft": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
+      "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string.prototype.trimright": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
+      "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "requires": {
+        "is-utf8": "^0.2.0"
+      }
+    },
+    "strip-bom-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz",
+      "integrity": "sha1-+H217yYT9paKpUWr/h7HKLaoKco=",
+      "dev": true,
+      "requires": {
+        "first-chunk-stream": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      }
+    },
+    "strip-bom-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
+      "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
+      "dev": true
+    },
+    "strip-dirs": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
+      "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-natural-number": "^4.0.1"
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true,
+      "optional": true
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "get-stdin": "^4.0.1"
+      }
+    },
+    "strip-json-comments": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
+      "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
+      "dev": true
+    },
+    "strip-outer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
+      "integrity": "sha1-sv0qv2YEudHmATBXGV34Nrip1jE=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.2"
+      }
+    },
+    "stylehacks": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
+      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
+          "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^4.1.1",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "sver-compat": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
+      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "^2.0.1",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "svgo": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.0.tgz",
+      "integrity": "sha512-MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "coa": "^2.0.2",
+        "css-select": "^2.0.0",
+        "css-select-base-adapter": "^0.1.1",
+        "css-tree": "1.0.0-alpha.33",
+        "csso": "^3.5.1",
+        "js-yaml": "^3.13.1",
+        "mkdirp": "~0.5.1",
+        "object.values": "^1.1.0",
+        "sax": "~1.2.4",
+        "stable": "^0.1.8",
+        "unquote": "~1.1.1",
+        "util.promisify": "~1.0.0"
+      }
+    },
+    "symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
+    },
+    "table": {
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.10.2",
+        "lodash": "^4.17.14",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "tar-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
+      "integrity": "sha1-jqVdqzeXIlPZqa+Q/c1VmuQ1xVU=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "bl": "^1.0.0",
+        "buffer-alloc": "^1.2.0",
+        "end-of-stream": "^1.0.0",
+        "fs-constants": "^1.0.0",
+        "readable-stream": "^2.3.0",
+        "to-buffer": "^1.1.1",
+        "xtend": "^4.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true,
+          "optional": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "temp-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
+      "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=",
+      "dev": true,
+      "optional": true
+    },
+    "tempfile": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz",
+      "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "temp-dir": "^1.0.0",
+        "uuid": "^3.0.1"
+      }
+    },
+    "text-hex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
+      "integrity": "sha1-adycGxdEbueakr9biEu0uRJ1BvU=",
+      "dev": true
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha1-AcHjnrMdB8t9A6lqcIIyYLIxMs0=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "through2-concurrent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/through2-concurrent/-/through2-concurrent-2.0.0.tgz",
+      "integrity": "sha512-R5/jLkfMvdmDD+seLwN7vB+mhbqzWop5fAjx5IX8/yQq7VhBhzDmhXgaHAOnhnWkCpRMM7gToYHycB0CS/pd+A==",
+      "dev": true,
+      "requires": {
+        "through2": "^2.0.0"
+      }
+    },
+    "through2-filter": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
+      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
+      "dev": true,
+      "requires": {
+        "through2": "~2.0.0",
+        "xtend": "~4.0.0"
+      }
+    },
+    "time-stamp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+      "dev": true
+    },
+    "timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
+      "dev": true,
+      "optional": true
+    },
+    "timers-ext": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
+      "integrity": "sha1-b1ethXjgej+5+R2Th9ZWR1VeJcY=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "~0.10.46",
+        "next-tick": "1"
+      }
+    },
+    "timsort": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
+      "dev": true
+    },
+    "tiny-emitter": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+    },
+    "tinymce": {
+      "version": "4.9.11",
+      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.9.11.tgz",
+      "integrity": "sha512-nkSLsax+VY5DBRjMFnHFqPwTnlLEGHCco82FwJF2JNH6W+5/ClvNC1P4uhD5lXPDNiDykSHR0XJdEh7w/ICHzA=="
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "to-absolute-glob": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
+      "dev": true,
+      "requires": {
+        "is-absolute": "^1.0.0",
+        "is-negated-glob": "^1.0.0"
+      }
+    },
+    "to-array": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
+      "dev": true
+    },
+    "to-buffer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
+      "integrity": "sha1-STvUj2LXxD/N7TE6A9ytsuEhOoA=",
+      "dev": true,
+      "optional": true
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=",
+      "dev": true,
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "to-through": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
+      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
+      "dev": true,
+      "requires": {
+        "through2": "^2.0.3"
+      }
+    },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true
+    },
+    "tough-cookie": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+      "integrity": "sha1-U/Nto/R3g7CSWvoG/587FlKA94E=",
+      "dev": true,
+      "requires": {
+        "psl": "^1.1.24",
+        "punycode": "^1.4.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "tr46": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
+      "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.1"
+      }
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "dev": true,
+      "optional": true
+    },
+    "trim-repeated": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
+      "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.2"
+      }
+    },
+    "tryit": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
+      "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
+      "dev": true
+    },
+    "tslib": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
+    "type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "dev": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dev": true,
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      }
+    },
+    "typeahead.js": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/typeahead.js/-/typeahead.js-0.11.1.tgz",
+      "integrity": "sha1-TmTmcbIjEKhgb0rsgFkkuoSwFbg=",
+      "requires": {
+        "jquery": ">=1.7"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "2.8.29",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+      "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+      "dev": true,
+      "requires": {
+        "source-map": "~0.5.1",
+        "uglify-to-browserify": "~1.0.0",
+        "yargs": "~3.10.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "dev": true,
+          "requires": {
+            "center-align": "^0.1.1",
+            "right-align": "^0.1.1",
+            "wordwrap": "0.0.2"
+          }
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^1.0.2",
+            "cliui": "^2.1.0",
+            "decamelize": "^1.0.0",
+            "window-size": "0.1.0"
+          }
+        }
+      }
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+      "dev": true,
+      "optional": true
+    },
+    "ultron": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+      "integrity": "sha1-n+FTahCmZKZSZqHjzPhf02MCvJw=",
+      "dev": true
+    },
+    "unbzip2-stream": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz",
+      "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
+      }
+    },
+    "unc-path-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+      "dev": true
+    },
+    "underscore": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+      "integrity": "sha1-BtzjSg5op7q8KbNluOdLiSUgOWE="
+    },
+    "undertaker": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz",
+      "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "bach": "^1.0.0",
+        "collection-map": "^1.0.0",
+        "es6-weak-map": "^2.0.1",
+        "last-run": "^1.1.0",
+        "object.defaults": "^1.0.0",
+        "object.reduce": "^1.0.0",
+        "undertaker-registry": "^1.0.0"
+      }
+    },
+    "undertaker-registry": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
+      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
+      "dev": true
+    },
+    "unicode-canonical-property-names-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+      "integrity": "sha1-JhmADEyCWADv3YNDr33Zkzy+KBg=",
+      "dev": true
+    },
+    "unicode-match-property-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+      "integrity": "sha1-jtKjJWmWG86SJ9Cc0/+7j+1fAgw=",
+      "dev": true,
+      "requires": {
+        "unicode-canonical-property-names-ecmascript": "^1.0.4",
+        "unicode-property-aliases-ecmascript": "^1.0.4"
+      }
+    },
+    "unicode-match-property-value-ecmascript": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==",
+      "dev": true
+    },
+    "unicode-property-aliases-ecmascript": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
+      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==",
+      "dev": true
+    },
+    "union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      }
+    },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
+    "uniqs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
+      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
+      "dev": true
+    },
+    "unique-stream": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
+      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+      "dev": true,
+      "requires": {
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "through2-filter": "^3.0.0"
+      }
+    },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true
+    },
+    "unquote": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
+      "dev": true
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        }
+      }
+    },
+    "upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "dev": true
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "prepend-http": "^1.0.1"
+      }
+    },
+    "url-to-options": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
+      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
+      "dev": true,
+      "optional": true
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha1-1QyMrHmhn7wg8pEfVuuXP04QBw8=",
+      "dev": true
+    },
+    "useragent": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
+      "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "4.1.x",
+        "tmp": "0.0.x"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "util.promisify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+      "integrity": "sha1-RA9xZaRZyaFtwUXrjnLzVocJcDA=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
+      "dev": true
+    },
+    "v8-compile-cache": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
+      "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
+      "dev": true
+    },
+    "v8flags": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
+      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha1-/JH2uce6FchX9MssXe/uw51PQQo=",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "value-or-function": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
+      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
+      "dev": true
+    },
+    "vendors": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz",
+      "integrity": "sha512-fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw==",
+      "dev": true
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "vinyl": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+      "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
+      "dev": true,
+      "requires": {
+        "clone": "^1.0.0",
+        "clone-stats": "^0.0.1",
+        "replace-ext": "0.0.1"
+      }
+    },
+    "vinyl-bufferstream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/vinyl-bufferstream/-/vinyl-bufferstream-1.0.1.tgz",
+      "integrity": "sha1-BTeGn1gO/6TKRay0dXnkuf5jCBo=",
+      "dev": true,
+      "requires": {
+        "bufferstreams": "1.0.1"
+      }
+    },
+    "vinyl-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz",
+      "integrity": "sha1-p+v1/779obfRjRQPyweyI++2dRo=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.3.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0",
+        "strip-bom-stream": "^2.0.0",
+        "vinyl": "^1.1.0"
+      },
+      "dependencies": {
+        "vinyl": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
+          "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
+          "dev": true,
+          "requires": {
+            "clone": "^1.0.0",
+            "clone-stats": "^0.0.1",
+            "replace-ext": "0.0.1"
+          }
+        }
+      }
+    },
+    "vinyl-fs": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
+      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
+      "dev": true,
+      "requires": {
+        "fs-mkdirp-stream": "^1.0.0",
+        "glob-stream": "^6.1.0",
+        "graceful-fs": "^4.0.0",
+        "is-valid-glob": "^1.0.0",
+        "lazystream": "^1.0.0",
+        "lead": "^1.0.0",
+        "object.assign": "^4.0.4",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.3.3",
+        "remove-bom-buffer": "^3.0.0",
+        "remove-bom-stream": "^1.2.0",
+        "resolve-options": "^1.1.0",
+        "through2": "^2.0.0",
+        "to-through": "^2.0.0",
+        "value-or-function": "^3.0.0",
+        "vinyl": "^2.0.0",
+        "vinyl-sourcemap": "^1.1.0"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+          "dev": true
+        },
+        "clone-stats": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+          "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+          "dev": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "replace-ext": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "vinyl": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
+          "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
+          "dev": true,
+          "requires": {
+            "clone": "^2.1.1",
+            "clone-buffer": "^1.0.0",
+            "clone-stats": "^1.0.0",
+            "cloneable-readable": "^1.0.0",
+            "remove-trailing-separator": "^1.0.1",
+            "replace-ext": "^1.0.0"
+          }
+        }
+      }
+    },
+    "vinyl-sourcemap": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
+      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
+      "dev": true,
+      "requires": {
+        "append-buffer": "^1.0.2",
+        "convert-source-map": "^1.5.0",
+        "graceful-fs": "^4.1.6",
+        "normalize-path": "^2.1.1",
+        "now-and-later": "^2.0.0",
+        "remove-bom-buffer": "^3.0.0",
+        "vinyl": "^2.0.0"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+          "dev": true
+        },
+        "clone-stats": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+          "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+          "dev": true
+        },
+        "replace-ext": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+          "dev": true
+        },
+        "vinyl": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
+          "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
+          "dev": true,
+          "requires": {
+            "clone": "^2.1.1",
+            "clone-buffer": "^1.0.0",
+            "clone-stats": "^1.0.0",
+            "cloneable-readable": "^1.0.0",
+            "remove-trailing-separator": "^1.0.1",
+            "replace-ext": "^1.0.0"
+          }
+        }
+      }
+    },
+    "vinyl-sourcemaps-apply": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
+      "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
+      "dev": true,
+      "requires": {
+        "source-map": "^0.5.1"
+      }
+    },
+    "void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+      "dev": true
+    },
+    "w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "dev": true,
+      "requires": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "w3c-xmlserializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "dev": true,
+      "requires": {
+        "xml-name-validator": "^3.0.0"
+      }
+    },
+    "webidl-conversions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "dev": true
+    },
+    "whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dev": true,
+      "requires": {
+        "iconv-lite": "0.4.24"
+      }
+    },
+    "whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+      "dev": true
+    },
+    "whatwg-url": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz",
+      "integrity": "sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==",
+      "dev": true,
+      "requires": {
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^2.0.2",
+        "webidl-conversions": "^6.1.0"
+      }
+    },
+    "when": {
+      "version": "3.7.8",
+      "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
+      "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I=",
+      "dev": true
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true
+    },
+    "wicg-inert": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/wicg-inert/-/wicg-inert-3.1.0.tgz",
+      "integrity": "sha512-P0ZiWaN9SxOkJbYtF/PIwmIRO8UTqTJtyl33QTQlHfAb6h15T0Dp5m7WTJ8N6UWIoj+KU5M0a8EtfRZLlHiP0Q=="
+    },
+    "window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
+      "dev": true
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "dev": true
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "write": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "ws": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+      "integrity": "sha1-8c+E/i1ekB686U767OeF8YeiKPI=",
+      "dev": true,
+      "requires": {
+        "async-limiter": "~1.0.0",
+        "safe-buffer": "~5.1.0",
+        "ultron": "~1.1.0"
+      }
+    },
+    "xml-name-validator": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+      "dev": true
+    },
+    "xmlbuilder": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-12.0.0.tgz",
+      "integrity": "sha512-lMo8DJ8u6JRWp0/Y4XLa/atVDr75H9litKlb2E5j3V3MesoL50EBgZDWoLT3F/LztVnG67GjPXLZpqcky/UMnQ==",
+      "dev": true
+    },
+    "xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
+    },
+    "xmlhttprequest-ssl": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
+      "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
+      "dev": true
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true
+    },
+    "y18n": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "dev": true
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
+    },
+    "yargs": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz",
+      "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^3.0.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.2",
+        "which-module": "^1.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "5.0.0-security.0"
+      }
+    },
+    "yargs-parser": {
+      "version": "5.0.0-security.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz",
+      "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^3.0.0",
+        "object.assign": "^4.1.0"
+      }
+    },
+    "yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
+    "yeast": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
+      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
+      "dev": true
+    }
+  }
+}
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 0d6db9118f..4d0c15204e 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -9,6 +9,9 @@
     "fastdev": "gulp fastdev",
     "watch": "gulp watch"
   },
+  "engines": {
+    "node": ">=10.00.0"
+  },
   "dependencies": {
     "ace-builds": "1.4.2",
     "angular": "1.8.0",
@@ -27,7 +30,7 @@
     "angular-ui-sortable": "0.19.0",
     "animejs": "2.2.0",
     "bootstrap-social": "5.1.1",
-    "chart.js": "^2.8.0",
+    "chart.js": "^2.9.3",
     "clipboard": "2.0.4",
     "diff": "3.5.0",
     "flatpickr": "4.5.2",
@@ -38,13 +41,14 @@
     "lazyload-js": "1.0.0",
     "moment": "2.22.2",
     "ng-file-upload": "12.2.13",
-    "nouislider": "14.4.0",
-    "npm": "^6.14.0",
+    "nouislider": "14.6.2",
+    "npm": "^6.14.7",
     "signalr": "2.4.0",
-    "spectrum-colorpicker": "1.8.0",
-    "tinymce": "4.9.10",
+    "spectrum-colorpicker2": "2.0.3",
+    "tinymce": "4.9.11",
     "typeahead.js": "0.11.1",
-    "underscore": "1.9.1"
+    "underscore": "1.9.1",
+    "wicg-inert": "^3.0.2"
   },
   "devDependencies": {
     "@babel/core": "7.6.4",
@@ -57,7 +61,7 @@
     "gulp-angular-embed-templates": "^2.3.0",
     "gulp-babel": "8.0.0",
     "gulp-clean-css": "4.2.0",
-    "gulp-cli": "^2.2.0",
+    "gulp-cli": "^2.3.0",
     "gulp-concat": "2.6.1",
     "gulp-eslint": "6.0.0",
     "gulp-imagemin": "6.1.1",
@@ -71,15 +75,14 @@
     "gulp-wrap": "0.15.0",
     "gulp-wrap-js": "0.4.1",
     "jasmine-core": "3.5.0",
-    "jasmine-promise-matchers": "^2.6.0",
+    "jsdom": "16.4.0",
     "karma": "4.4.1",
-    "karma-chrome-launcher": "^3.1.0",
+    "karma-jsdom-launcher": "^8.0.2",
     "karma-jasmine": "2.0.1",
     "karma-junit-reporter": "2.0.1",
-    "karma-phantomjs-launcher": "1.0.4",
     "karma-spec-reporter": "0.0.32",
     "less": "3.10.3",
-    "lodash": "4.17.15",
+    "lodash": "4.17.19",
     "marked": "^0.7.0",
     "merge-stream": "2.0.0",
     "run-sequence": "2.2.1"
diff --git a/src/Umbraco.Web.UI.Client/src/app.js b/src/Umbraco.Web.UI.Client/src/app.js
index 74a7008901..645296f0e0 100644
--- a/src/Umbraco.Web.UI.Client/src/app.js
+++ b/src/Umbraco.Web.UI.Client/src/app.js
@@ -91,6 +91,6 @@ angular.module("umbraco.viewcache", [])
 // be able to configure angular values in the Default.cshtml
 // view which is much easier to do that configuring values by injecting them in  the back office controller
 // to follow through to the js initialization stuff
-if (angular.isFunction(document.angularReady)) {
+if (_.isFunction(document.angularReady)) {
     document.angularReady.apply(this, [app]);
 }
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Black.woff b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Black.woff
deleted file mode 100644
index d1e2579bf8..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Black.woff and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BlackItalic.woff b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BlackItalic.woff
deleted file mode 100644
index 142c1c9c48..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BlackItalic.woff and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Bold.woff b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Bold.woff
deleted file mode 100644
index cdfcbe0fbc..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Bold.woff and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BoldItalic.woff b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BoldItalic.woff
deleted file mode 100644
index 3e683fea7c..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BoldItalic.woff and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Italic.woff b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Italic.woff
deleted file mode 100644
index d8cf84c8b9..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Italic.woff and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Light.woff b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Light.woff
deleted file mode 100644
index e7d4278cce..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Light.woff and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-LightItalic.woff b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-LightItalic.woff
deleted file mode 100644
index bb72fd2200..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-LightItalic.woff and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Regular.woff b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Regular.woff
deleted file mode 100644
index bf73a6d9f9..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Regular.woff and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-activity.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-activity.svg
new file mode 100644
index 0000000000..84c1202f04
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-activity.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M354.562 428.621l-33.96-81.838-33.961 81.838h-71.34l-39.618-147.569-39.668 147.569H39.35v-51.163h57.457l78.876-293.596 78.043 290.623 66.876-161.105 68.134 164.078h84.924v51.163H354.562z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-add.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-add.svg
new file mode 100644
index 0000000000..9abe4f9085
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-add.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M420.592 214.291H296.104V89.804h-83.102v124.487H88.518v83.104h124.484v124.488h83.102V297.395h124.488z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-addressbook.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-addressbook.svg
new file mode 100644
index 0000000000..1c6676a711
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-addressbook.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M40.901 70.44v371.828c0 13.829 11.212 25.04 25.04 25.04H96.87V45.403H65.941c-13.827 0-25.04 11.207-25.04 25.037zm86.015-25.037v421.905h283.415V45.403H126.916zm250.171 311.446H160.119c-.183-9.291.483-26.043.483-33.134 3.603-10.439 15.527-11.938 25.488-16.141 10.935-4.609 23.067-9.966 33.98-14.438 3.116-.849 6.23-1.7 9.342-2.553 3.72-2.556 7.361-11.06 9.349-15.288l4.419-1.07c-1-5.588-4.456-6.025-5.897-9.971-.565-5.946-1.13-11.896-1.701-17.839.027.278-4.066-.749-4.6-1.086-5.772-3.612-5.886-18.297-6.443-24.402-.252-2.79 3.628-5.079 2.549-10.193-6.324-29.966 2.734-43.986 17.055-48.634 9.938-4.03 28.496-11.499 45.805-.851l4.297 3.979 6.95 1.2c3.489 2.011 5.715 8.688 5.715 8.688 1.831 7.376 2.014 7.989 1.843 15.563-.068 2.915-1.744 16.408-1.289 20.545.374 3.416 1.225 3.686 2.574 6.496 2.345 4.899 1.558 11.647.662 16.586-.495 2.7-1.533 6.544-3.116 8.746-1.74 2.428-5.227 2.449-6.771 5.286-2.222 4.078-.968 9.808-2.37 14.218-1.589 4.998-5.641 5.35-5.946 11.889l5.946.85c1.99 4.229 5.63 12.732 9.349 15.288 3.112.853 6.23 1.704 9.345 2.553 10.911 4.473 23.041 9.829 33.981 14.438 9.958 4.202 21.884 5.701 25.483 16.141.001 7.091.669 23.843.486 33.134zm52.912-311.446h38.298v96.654h-38.298zm0 122.063h38.298v96.655h-38.298zm0 122.062h38.298v96.654h-38.298z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alarm-clock.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alarm-clock.svg
new file mode 100644
index 0000000000..4aa9ce1485
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alarm-clock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M275.241 267.728V175.87c0-8.991-7.323-16.317-16.319-16.317-8.99 0-16.314 7.326-16.314 16.317v105.059l50.557 52.192c3.238 3.3 7.455 4.953 11.74 4.953 4.088 0 8.176-1.505 11.312-4.579 6.475-6.247 6.638-16.584.394-23.072l-41.37-42.695zM438.523 89.786c-41.467-41.517-108.209-42.319-150.758-2.57-9.416-1.439-19.029-2.159-28.844-2.159-11.738 0-23.217 1.13-34.365 3.157-42.482-40.747-109.943-40.274-151.804 1.572-42.218 42.202-42.35 110.548-.425 152.974-1.73 10.289-2.681 20.82-2.681 31.561 0 104.548 84.73 189.291 189.275 189.291 104.514 0 189.279-84.743 189.279-189.291 0-12.871-1.309-25.428-3.727-37.576 36.3-42.628 34.338-106.687-5.95-146.959zm-179.601 316.37c-72.693 0-131.82-59.127-131.82-131.836 0-72.679 59.127-131.804 131.82-131.804 72.699 0 131.822 59.125 131.822 131.804 0 72.709-59.123 131.836-131.822 131.836z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alert-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alert-alt.svg
new file mode 100644
index 0000000000..dbb78a2188
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alert-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M253.668 67.246L34.652 445.205h438.033L253.668 67.246zm0 49.942l175.57 302.978H78.1l175.568-302.978zM233.05 399.234h41.237v-39.855H233.05v39.855zm-.966-202.588v51.527l11.447 94.795h20.547l11.172-94.795v-51.527h-43.166z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alert.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alert.svg
new file mode 100644
index 0000000000..3a75464feb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alert.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.399 66.934L36.38 444.893h438.036L255.399 66.934zm22.094 331.988h-46.29v-44.743h46.29v44.743zm-11.458-63.166h-23.068l-12.849-106.419v-57.846h48.458v57.846l-12.541 106.419z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alt.svg
new file mode 100644
index 0000000000..1d4c0eb3e6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M238.956 201.578v-51.366h199.55v51.366h-199.55zm-6.171 167.688l-123.94-174.018H69.943v-51.363h65.377l123.939 174.013h179.245v51.368H232.785z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-anchor.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-anchor.svg
new file mode 100644
index 0000000000..033467b283
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-anchor.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M445.039 300.557l-4.51-4.116-46.061-42.054-1.598-1.46-1.6 1.46-46.061 42.054-4.508 4.116h26.023c-1.654 54.142-42.203 79.389-84.684 86.409V182.593c19.469-9.63 32.893-29.695 32.893-52.847 0-32.498-26.439-58.937-58.938-58.937-32.494 0-58.936 26.438-58.936 58.937 0 23.149 13.422 43.215 32.889 52.847v204.373c-42.479-7.021-83.025-32.268-84.686-86.409h26.027l-4.508-4.116-46.064-42.054-1.596-1.46-1.594 1.46-46.06 42.053-4.508 4.116h26.206c1.789 82.976 68.213 140.634 162.832 140.634 94.621 0 161.047-57.658 162.836-140.634H445.039zM255.998 99.669c16.584 0 30.078 13.492 30.078 30.077 0 16.584-13.494 30.075-30.078 30.075-16.582 0-30.076-13.491-30.076-30.075 0-16.585 13.494-30.077 30.076-30.077z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-app.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-app.svg
new file mode 100644
index 0000000000..02b19fe989
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-app.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M376.869 246.184c12.932 31.318 21.738 53.584 21.887 53.967l.084.21.08.21 12.471 33.662h51.086v-88.049h-85.608zm52.328 149.537c-3.709-18.309-15.205-25.447-27.418-26.105l-22.844-61.638S275.099 45.016 251.931 45.016a2.67 2.67 0 0 0-.93.159c-20.156 7.284 85.135 279.228 85.135 279.228l26.965 68.869c-4.744 11.749-3.174 25.656 5.203 36.383 22.709 29.089 49.438 35.416 68.383 35.416 14.576 0 24.543-3.742 24.543-3.742s-24.978-17.816-32.033-65.608zm-59.687-22.212l-7.83-19.487 17.711-7.119 7.832 19.484-17.713 7.122zm-85.317-127.325H231.01l-49.086 88.049h135.174l-.838-2.137c-.19-.488-14.85-38.409-32.067-85.912zm-164.373 0H49.523v88.049h21.209zm91.554-120.483l47.593 26.533-22.674 40.672-47.593-26.532zm-34.81 62.462L63.512 390.956l-10.939 76.029 58.754-49.882.004-.002 112.834-202.405-47.601-26.533zm-74.046 213.038l-25.469 21.622 4.836-33.124 10.562-18.945 6.123 13.465 14.506-1.965-10.558 18.947z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-error.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-error.svg
new file mode 100644
index 0000000000..cd57ff336f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-error.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M49.525 422.919h412.116v-238.2H49.525v238.2zM184.041 261.09l26.732-26.852 42.262 42.446 42.262-42.446 26.734 26.852-42.262 42.445 42.262 42.447-26.734 26.851-42.262-42.446-42.262 42.446-26.732-26.851 42.26-42.447-42.26-42.445zM444.766 88.308H66.403c-9.321 0-16.878 7.59-16.878 16.951v55.727h412.116v-55.727c.001-9.361-7.553-16.951-16.875-16.951zM93.322 143.445c-7.342 0-13.291-5.976-13.291-13.347 0-7.369 5.949-13.346 13.291-13.346 7.34 0 13.291 5.977 13.291 13.346 0 7.371-5.951 13.347-13.291 13.347zm47.559 0c-7.338 0-13.285-5.976-13.285-13.347 0-7.369 5.947-13.346 13.285-13.346 7.344 0 13.291 5.977 13.291 13.346 0 7.371-5.947 13.347-13.291 13.347zm47.564 0c-7.34 0-13.291-5.976-13.291-13.347 0-7.369 5.951-13.346 13.291-13.346s13.288 5.977 13.288 13.346c0 7.371-5.948 13.347-13.288 13.347z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-window-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-window-alt.svg
new file mode 100644
index 0000000000..e87dae6ec8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-window-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M445.564 89.08H66.438c-9.342 0-16.912 7.572-16.912 16.913V422.92h412.949V105.993c0-9.341-7.569-16.913-16.911-16.913zm-256.837 28.378c7.355 0 13.312 5.964 13.312 13.315 0 7.354-5.957 13.317-13.312 13.317s-13.316-5.964-13.316-13.317c-.001-7.351 5.96-13.315 13.316-13.315zm-47.661 0c7.357 0 13.316 5.964 13.316 13.315 0 7.354-5.959 13.317-13.316 13.317-7.355 0-13.314-5.964-13.314-13.317 0-7.351 5.959-13.315 13.314-13.315zm-47.654 0c7.354 0 13.316 5.964 13.316 13.315 0 7.354-5.963 13.317-13.316 13.317-7.355 0-13.318-5.964-13.318-13.317 0-7.351 5.963-13.315 13.318-13.315zm339.957 276.356H78.631V169.06h354.738v224.754z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-window.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-window.svg
new file mode 100644
index 0000000000..f99af0f195
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-window.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M445.563 89.082H66.437c-9.34 0-16.912 7.571-16.912 16.911V422.92h412.951V105.993c0-9.34-7.571-16.911-16.913-16.911zM93.41 117.458c7.355 0 13.317 5.964 13.317 13.315 0 7.354-5.962 13.316-13.317 13.316-7.354 0-13.317-5.963-13.317-13.316 0-7.351 5.963-13.315 13.317-13.315zm53.296 276.355H78.63V169.06h68.076v224.753zm-5.64-249.723c-7.354 0-13.314-5.963-13.314-13.316 0-7.352 5.96-13.315 13.314-13.315 7.357 0 13.317 5.964 13.317 13.315.001 7.353-5.959 13.316-13.317 13.316zm47.659-26.632c7.356 0 13.315 5.964 13.315 13.315 0 7.354-5.959 13.316-13.315 13.316-7.354 0-13.315-5.963-13.315-13.316-.001-7.351 5.961-13.315 13.315-13.315zM433.37 393.813H175.812V169.06H433.37v224.753z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrivals.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrivals.svg
new file mode 100644
index 0000000000..bfbe503d6b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrivals.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M293.219 401.592v65.893h199.514v-65.893H293.219zm61.412-74.302l10.891-31.131c6.017-17.169-3.039-35.938-20.241-41.958l-119.688-41.889-42.84-135.025c-3.401-17.888-11.413-34.012-29.302-30.547-17.854 3.439-20.929 16.553-17.496 34.438l12.493 104.09-45.848-16.059-22.53-56.642-61.219 24.399 28.091 70.602a32.925 32.925 0 0 0 19.752 18.869l256.838 89.965 31.099 10.888z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-down.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-down.svg
new file mode 100644
index 0000000000..fcdf4548ec
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M190.574 54.423v180.754H71.039l183.224 221.998 183.224-221.998H317.949V54.423z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-left.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-left.svg
new file mode 100644
index 0000000000..2cf42ff7d6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M455.641 192.112H274.887V72.576L52.889 255.8l221.998 183.224V319.486h180.754z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-right.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-right.svg
new file mode 100644
index 0000000000..d1349b3b23
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M52.889 319.489h180.754v119.535L455.641 255.8 233.643 72.576v119.538H52.889z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-up.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-up.svg
new file mode 100644
index 0000000000..f7ca5f8249
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M317.953 457.176V276.422h119.535L254.264 54.423 71.04 276.422h119.538v180.754z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-art-easel.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-art-easel.svg
new file mode 100644
index 0000000000..c4df06598b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-art-easel.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M371.482 115.717H140.518v149.762h230.965V115.717zM270.553 49.373h-29.105v54.502h29.105V49.373zm128.449 232.268H112.998v37.012h56.242l-38.639 143.975h30.137l38.639-143.975h113.246l38.639 143.975h30.135l-38.639-143.975h56.244v-37.012zM241.447 431.604h29.105v-96.793h-29.105v96.793z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-article.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-article.svg
new file mode 100644
index 0000000000..28b2e35c71
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-article.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M87.887 74.772v361.521h336.958V74.772H87.887zm306.318 330.879H118.544V105.399h275.661v300.252zM262.693 137.497H149.04v130.742h113.653V137.497zm104.942.521h-79.221v24.951h79.221v-24.951zm0 107.328h-79.221v24.92h79.221v-24.92zm0-53.661h-79.221v24.948h79.221v-24.948zm-1.816 107.327H147.57v24.917h218.249v-24.917zm0 53.662H147.57v24.887h218.249v-24.887z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-attachment.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-attachment.svg
new file mode 100644
index 0000000000..a3c4f466c3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-attachment.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M127.286 449.816c-21.564.006-43.317-8.494-59.885-25.062-16.578-16.575-25.083-38.336-25.079-59.897-.029-20.296 7.623-40.755 23.034-56.14l3.539-3.539 212.559-212.57c20.227-20.255 47.082-30.304 73.852-30.267 28.454-.012 57.219 11.208 79.179 33.159 21.937 21.949 33.153 50.698 33.147 79.151.028 26.779-10.016 53.627-30.268 73.865l-178.45 178.453-13.28 13.277-26.56-26.559 191.738-191.733c12.842-12.871 19.229-29.708 19.259-47.303-.004-18.645-7.323-37.759-22.152-52.592-14.834-14.838-33.958-22.152-52.613-22.165-17.588.034-34.423 6.418-47.284 19.266L95.447 331.734l-3.536 3.537c-8.011 8.031-11.994 18.482-12.029 29.585.014 11.761 4.614 23.877 14.079 33.345 9.455 9.446 21.562 14.043 33.326 14.056 11.102-.034 21.551-4.014 29.587-12.026l150.412-150.404 12.596-12.595c3.018-3.04 4.521-6.906 4.549-11.331 0-4.666-1.817-9.57-5.722-13.476-3.914-3.916-8.819-5.726-13.48-5.739-4.425.038-8.283 1.542-11.328 4.564L155.27 349.882l-26.561-26.56L267.33 184.703c10.408-10.44 24.289-15.604 37.897-15.57 14.468-.012 29.01 5.704 40.049 16.739 11.007 11.025 16.72 25.554 16.72 40.029.029 13.599-5.129 27.479-15.559 37.89l-12.601 12.595-150.41 150.41c-15.365 15.377-35.768 23.025-56.022 23.021l-.118-.001z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-auction-hammer.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-auction-hammer.svg
new file mode 100644
index 0000000000..50f8b8ef26
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-auction-hammer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M194.166 390.957H78.85v38.906H49.789v32.613H226.42v-32.613h-32.254zm258.881-50.733l-91.314-91.314c-8.502-8.501-20.674-11.069-31.412-7.743l-53.164-53.161 32.635-32.633-59.498-59.5-85.842 85.842 59.498 59.497 32.627-32.626 53.164 53.161c-3.33 10.738-.762 22.913 7.742 31.414l91.314 91.315c6.109 6.107 14.117 9.163 22.125 9.163s16.016-3.056 22.125-9.163c12.219-12.221 12.219-32.032 0-44.252zM141.285 191.2l73.173 73.172-23.188 23.188-73.173-73.173zM282.968 49.52l73.172 73.172-23.187 23.187-73.172-73.173z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-autofill.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-autofill.svg
new file mode 100644
index 0000000000..15cbe9fc35
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-autofill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M142.212 397.267l106.052-48.024L398.479 199.03l-26.405-26.442-90.519 90.517-15.843-15.891 90.484-90.486-16.204-16.217-150.246 150.243-47.534 106.513zm74.904-100.739l23.285-23.283 3.353 22.221 22.008 3.124-23.283 23.313-46.176 20.991 20.813-46.366zm257.6-173.71L416.188 64.3l-49.755 49.785 58.504 58.503 49.779-49.77zM357.357 300.227h82.826v116.445H68.929V300.227h88.719v-30.648H38.288v177.733h432.537V269.578H357.357v30.649z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-award.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-award.svg
new file mode 100644
index 0000000000..18a82455f8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-award.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M298.953 291.403c.789 0 1.557.047 2.285.153l25.752 3.641a11.05 11.05 0 0 0 1.543.108c5.371 0 10.227-3.938 11.176-9.347l4.492-25.616c1.039-5.925 6.234-13.076 11.549-15.897l22.977-12.189c5.311-2.821 7.498-9.548 4.855-14.952L372.16 193.94c-2.643-5.405-2.643-14.246 0-19.651l11.422-23.363c2.643-5.405.455-12.13-4.855-14.953l-22.977-12.188c-5.314-2.82-10.51-9.973-11.549-15.897l-4.492-25.615c-.949-5.409-5.807-9.348-11.18-9.348-.508 0-1.021.034-1.539.108l-25.752 3.646c-.729.101-1.492.151-2.281.151-5.668 0-12.611-2.555-16.406-6.225L263.86 52.52c-2.16-2.093-5.01-3.135-7.859-3.135-2.848 0-5.697 1.042-7.859 3.135l-18.695 18.085c-3.795 3.67-10.738 6.225-16.406 6.225-.789 0-1.553-.051-2.281-.151l-25.754-3.646a10.823 10.823 0 0 0-1.539-.108c-5.373 0-10.229 3.938-11.178 9.348l-4.492 25.615c-1.039 5.925-6.236 13.079-11.549 15.897l-22.971 12.188c-5.314 2.818-7.5 9.548-4.857 14.953l11.42 23.363c2.643 5.405 2.643 14.246 0 19.651l-11.42 23.364c-2.643 5.404-.457 12.135 4.857 14.952l22.971 12.189c5.312 2.819 10.51 9.973 11.549 15.897l4.492 25.616c.949 5.412 5.803 9.347 11.174 9.347.51 0 1.025-.035 1.543-.108l25.754-3.641a15.96 15.96 0 0 1 2.287-.153c5.666 0 12.607 2.552 16.4 6.223l18.695 18.085c2.162 2.091 5.012 3.135 7.859 3.135 2.85 0 5.699-1.044 7.859-3.135l18.691-18.085c3.793-3.671 10.732-6.223 16.402-6.223zM256 239.999c-30.812 0-55.791-24.978-55.791-55.789 0-30.814 24.979-55.792 55.791-55.792s55.791 24.978 55.791 55.792c0 30.811-24.979 55.789-55.791 55.789zm-21.031 89.326l-18.502-17.899c-.746-.485-2.426-1.031-3.316-1.077l-25.488 3.605a30.134 30.134 0 0 1-4.201.296c-.303 0-.6-.031-.9-.041l-24.676 148.409 84.637-33.199v-94.783a30.07 30.07 0 0 1-7.554-5.311zm93.564-15.075c-1.4 0-2.814-.1-4.195-.296l-25.494-3.605c-.889.044-2.57.592-3.316 1.077l-18.498 17.902a30.09 30.09 0 0 1-6.441 4.725v95.41l84.635 32.75-25.783-148.004c-.304.007-.603.041-.908.041z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation-2.svg
new file mode 100644
index 0000000000..d8ef136b72
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation-2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M314.439 321.301c-.186.035-.383.063-.572.101l-48.846-40.456-.078 45.663c-3.168.091-6.352.155-9.566.153-47.775.073-90.82-10.348-119.785-25.578-14.496-7.545-25.336-16.229-31.842-24.324-6.559-8.225-8.87-15.079-8.914-21.718.034-7.984 3.546-16.798 13.858-27.144 10.181-10.146 26.818-20.4 48.036-28.213 1.189-.44 2.406-.867 3.621-1.293l-44.539-36.889c-16.619 8.232-31.257 18.09-43.229 29.865-17.119 16.768-29.14 38.85-29.106 63.673-.046 20.229 8.065 38.979 20.353 54.034 18.569 22.71 46.073 39.182 78.877 50.871 32.865 11.58 71.375 18.061 112.67 18.078 3.18 0 6.334-.053 9.479-.131l-.088 50.725 89.646-73.732-39.975-33.109v-.576zm-68.482-238.19l-89.646 73.73 89.396 74.04.078-47.212c3.18-.092 6.368-.154 9.591-.152 47.769-.062 90.814 10.352 119.773 25.583 14.5 7.544 25.336 16.229 31.84 24.326 6.555 8.226 8.867 15.079 8.915 21.715-.024 4.641-1.142 9.16-3.951 14.378-4.159 7.764-12.634 16.785-25.487 25.085-9.574 6.226-21.463 12.005-35.111 16.857l44.471 36.833c13.242-6.638 25.173-14.355 35.52-23.203 10.465-9.006 19.322-19.266 25.735-31.03 6.397-11.718 10.208-25.077 10.19-38.92v-.168c0-20.162-8.104-38.849-20.361-53.859-18.572-22.716-46.064-39.181-78.877-50.872-32.856-11.582-71.361-18.062-112.656-18.08-3.193 0-6.343.1-9.502.177l.082-49.228z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation-3.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation-3.svg
new file mode 100644
index 0000000000..77a56e9984
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation-3.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M190.071 318.519c-.035-.189-.064-.387-.102-.575l40.457-48.848-45.662-.078a325.44 325.44 0 0 1-.153-9.566c-.072-47.771 10.348-90.818 25.58-119.785 7.543-14.494 16.227-25.336 24.323-31.838 8.224-6.562 15.078-8.871 21.716-8.918 7.986.035 16.798 3.545 27.148 13.859 10.144 10.182 20.397 26.819 28.208 48.035.439 1.189.866 2.408 1.293 3.621l36.89-44.537c-8.234-16.621-18.093-31.258-29.868-43.23-16.765-17.115-38.849-29.141-63.671-29.104-20.229-.047-38.979 8.065-54.033 20.353-22.712 18.569-39.184 46.071-50.871 78.876-11.58 32.864-18.061 71.377-18.08 112.668 0 3.18.056 6.336.132 9.479l-50.725-.084 73.73 89.646 33.111-39.974h.577zm238.193-68.486l-73.735-89.644-74.039 89.394 47.216.078c.089 3.18.151 6.366.151 9.59.061 47.768-10.354 90.816-25.586 119.775-7.544 14.498-16.229 25.332-24.325 31.836-8.224 6.561-15.08 8.87-21.715 8.916-4.641-.021-9.16-1.14-14.378-3.949-7.76-4.158-16.786-12.632-25.084-25.487-6.225-9.573-12.009-21.462-16.858-35.11l-36.834 44.471c6.64 13.242 14.357 25.176 23.206 35.52 9.006 10.463 19.268 19.326 31.029 25.735 11.718 6.399 25.078 10.21 38.919 10.189h.168c20.164 0 38.849-8.104 53.86-20.358 22.715-18.574 39.18-46.066 50.873-78.881 11.58-32.855 18.06-71.36 18.08-112.656-.002-3.191-.103-6.34-.177-9.5l49.229.081z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation.svg
new file mode 100644
index 0000000000..5f56a648d1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M374.236 112.896l.002-.004c-34.665-28.842-76.951-42.994-118.78-42.969-48.281-.027-96.382 18.878-132.321 55.332l-36.11-30.122-.608 116.069 114.082-21.411-37.78-31.516c25.665-24.441 59.003-36.957 92.737-36.984 30.38.027 60.723 10.141 85.939 31.095 32.061 26.661 48.504 64.85 48.546 103.566a136.332 136.332 0 0 1-1.053 16.753l52.271-9.994c.081-2.255.14-4.508.14-6.759.038-53.253-22.882-106.332-67.065-143.056zm-25.501 239.875c-25.753 24.888-59.396 37.631-93.449 37.658-30.388-.018-60.733-10.15-85.939-31.084-32.057-26.664-48.517-64.861-48.552-103.569.006-6.409.486-12.812 1.397-19.17l-52.507 9.854c-.153 3.104-.255 6.21-.255 9.315-.031 53.254 22.898 106.347 67.08 143.068 34.652 28.817 76.939 42.97 118.775 42.952h.136c48.598 0 97.016-19.191 133.003-56.146l34.503 28.586.214-116.073-114.007 21.804 39.601 32.805z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-baby-stroller.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-baby-stroller.svg
new file mode 100644
index 0000000000..d8edc730c1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-baby-stroller.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M174.229 281.794h1.243l118.312-118.312h-64.293V59.815h-55.263c-61.315 0-110.989 49.675-110.989 110.976.001 61.297 49.675 111.003 110.99 111.003zM413.64 88.691L151.338 351.024l22.923 22.925 49.578-49.611 49.608 49.611 22.923-22.943-49.61-49.573 19.654-19.639h78.061c20.764 0 37.574-16.827 37.574-37.573v-78.092l45.031-44.996h21.222V88.691H413.64zm-84.863 283.457c-22.01 0-39.832 17.854-39.832 39.836 0 22.006 17.822 39.828 39.832 39.828s39.832-17.822 39.832-39.828c0-21.981-17.822-39.836-39.832-39.836zm-211.744 0c-22.008 0-39.83 17.854-39.83 39.836 0 22.006 17.822 39.828 39.83 39.828 22.01 0 39.832-17.822 39.832-39.828 0-21.981-17.822-39.836-39.832-39.836z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-backspace.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-backspace.svg
new file mode 100644
index 0000000000..6c84aa5cbc
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-backspace.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M440.632 90.389H172.871L42.391 255.963l130.48 165.566h267.761c15.632 0 28.286-12.639 28.286-28.252V118.66c0-15.595-12.654-28.271-28.286-28.271zm-57.851 240.015l-21.156 21.16-74.465-74.43-74.459 74.43-21.125-21.16 74.426-74.441-74.426-74.447 21.125-21.155 74.459 74.458 74.465-74.458 21.156 21.155-74.428 74.447 74.428 74.441z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-add.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-add.svg
new file mode 100644
index 0000000000..0c6be8a34b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-add.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.205 176.479c-43.354 0-78.501 35.146-78.501 78.505 0 43.357 35.147 78.502 78.501 78.502 43.358 0 78.506-35.145 78.506-78.502 0-43.359-35.149-78.505-78.506-78.505zm14.113 92.621v42.299h-28.233V269.1h-42.297v-28.24h42.297v-42.296h28.233v42.296h42.307v28.24h-42.307z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-count.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-count.svg
new file mode 100644
index 0000000000..e309c884f9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-count.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.251 176.839c-43.353 0-78.501 35.146-78.501 78.503 0 43.354 35.148 78.504 78.501 78.504 43.358 0 78.505-35.15 78.505-78.504 0-43.357-35.147-78.503-78.505-78.503zM267.77 307.96h-20.948v-71.745h-24.466v-13.917c6.44-.292 10.95-.72 13.525-1.293 4.104-.907 7.444-2.724 10.021-5.453 1.766-1.866 3.102-4.35 4.008-7.46.525-1.863.786-3.252.786-4.16h17.075V307.96z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-remove.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-remove.svg
new file mode 100644
index 0000000000..a6317092b8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-remove.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.87 176.479c-43.354 0-78.501 35.146-78.501 78.505 0 43.357 35.148 78.502 78.501 78.502 43.357 0 78.505-35.145 78.505-78.502 0-43.359-35.147-78.505-78.505-78.505zM198.454 269.1v-28.24H311.29v28.24H198.454z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-restricted.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-restricted.svg
new file mode 100644
index 0000000000..c7ad647e22
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-restricted.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.519 216.717c-7.42 0-14.329 2.186-20.17 5.903l51.974 51.966c3.717-5.84 5.901-12.744 5.901-20.168 0-20.787-16.915-37.701-37.705-37.701zm-37.704 37.701c0 20.795 16.914 37.708 37.704 37.708 7.422 0 14.329-2.182 20.168-5.903l-51.971-51.971c-3.715 5.84-5.901 12.746-5.901 20.166zm37.556-77.292c-43.353 0-78.503 35.146-78.503 78.505 0 43.357 35.15 78.501 78.503 78.501 43.358 0 78.504-35.144 78.504-78.501 0-43.36-35.146-78.505-78.504-78.505zm.148 131.45c-29.906 0-54.153-24.245-54.153-54.158 0-29.906 24.247-54.15 54.153-54.15 29.909 0 54.157 24.244 54.157 54.15 0 29.913-24.248 54.158-54.157 54.158z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ball.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ball.svg
new file mode 100644
index 0000000000..5416815534
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ball.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M182.683 192.699c20.618-20.639 30.852-47.911 30.87-76.491 0-6.671-.59-13.41-1.733-20.079-59.485 16.646-105.464 65.633-117.661 126.852 4.022.422 8.011.619 12 .619 28.566-.034 55.855-10.268 76.524-30.901zM319.325 329.39c-20.634 20.636-30.853 47.908-30.853 76.459-.033 4.019.162 8.009.571 12.066 61.233-12.229 110.254-58.207 126.899-117.694-6.721-1.146-13.456-1.732-20.144-1.732-28.549.032-55.821 10.236-76.473 30.901zM256.521 89.949c-6.898 0-13.604.488-20.243 1.291 1.439 8.321 2.208 16.66 2.208 24.968.018 34.532-12.575 68.54-38.179 94.146-25.572 25.575-59.565 38.166-94.033 38.166h-.115c-5.002 0-10.006-.297-15.025-.786-.116 2.581-.198 5.17-.198 7.814 0 91.469 74.118 165.571 165.585 165.571 2.6 0 5.201-.098 7.782-.201a145.534 145.534 0 0 1-.784-15.069c-.032-34.504 12.558-68.511 38.162-94.122 25.609-25.6 59.634-38.223 94.118-38.16 8.339 0 16.71.759 25.015 2.193.783-6.607 1.261-13.377 1.261-20.212 0-91.47-74.118-165.599-165.554-165.599z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-band-aid.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-band-aid.svg
new file mode 100644
index 0000000000..8232ea9b23
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-band-aid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M454.212 145.442l-87.051-87.068c-9.419-9.421-24.723-9.421-34.173.031l-73.154 73.186 121.193 121.194 73.185-73.183c9.453-9.423 9.453-24.728 0-34.16zM149.63 241.731L270.888 362.96l92.514-92.531-121.192-121.21-92.58 92.512zm73.219 20.868c-4.872 4.868-12.822 4.868-17.724 0-4.94-4.907-4.94-12.855 0-17.777 4.902-4.907 12.853-4.907 17.724 0 4.905 4.921 4.905 12.869 0 17.777zm67.333-13.019c4.904-4.907 12.852-4.907 17.757 0 4.904 4.906 4.904 12.854 0 17.754-4.905 4.906-12.853 4.906-17.757 0-4.872-4.9-4.872-12.848 0-17.754zm-22.403 57.909c-4.871 4.908-12.852 4.908-17.756 0-4.904-4.883-4.904-12.846 0-17.754 4.904-4.905 12.885-4.905 17.756 0 4.907 4.909 4.907 12.871 0 17.754zm-4.773-102.825a12.523 12.523 0 0 1 .035 17.755c-4.908 4.89-12.886 4.89-17.759 0-4.906-4.907-4.906-12.85 0-17.755 4.873-4.905 12.851-4.905 17.724 0zM58.816 332.561c-9.419 9.431-9.419 24.734.034 34.157l87.02 87.07c9.45 9.415 24.754 9.415 34.204 0l73.188-73.208-121.226-121.226-73.22 73.207z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bar-chart.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bar-chart.svg
new file mode 100644
index 0000000000..c2fc1a2e2f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bar-chart.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M349.178 315.46v129.468h83.102V315.46h-83.102zM213.967 444.928h83.103V65.072h-83.103v379.856zm-135.214-.004h83.106V190.267H78.753v254.657z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-barcode.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-barcode.svg
new file mode 100644
index 0000000000..7b7e4e151e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-barcode.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M39.435 420.59H83.37V91.58H39.435v329.01zm122.532 0h42.298V91.58h-42.298v329.01zm55.79 0h50.001V91.58h-50.001v329.01zm127.437 0h37.396V91.58h-37.396v329.01zm-38.391 0h15.957V91.58h-15.957v329.01zm-180.398 0h15.972V91.58h-15.972v329.01zM405.628 91.58v329.01h66.141V91.58h-66.141z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bars.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bars.svg
new file mode 100644
index 0000000000..2199f4fb11
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bars.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M272.812 437.155V193.203h83.1v243.952h-83.1zm118.865 0V74.335h83.106v362.82h-83.106zm-237.736.002V312.07h83.103v125.087h-83.103zm-118.865-.002V409.67h83.102v27.485H35.076z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-battery-full.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-battery-full.svg
new file mode 100644
index 0000000000..5aff9d10df
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-battery-full.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M430.566 323.867c23.447 0 42.457-19.012 42.457-42.455V232.31c0-23.446-19.01-42.456-42.457-42.456v134.013zM38.171 132.417v247.886h357.537V132.417H38.171zm328.264 217.69H67.441V162.612h298.994v187.495zm-25.039-162.456H92.479v137.418h248.917V187.651z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-battery-low.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-battery-low.svg
new file mode 100644
index 0000000000..72909d1d84
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-battery-low.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M430.593 323.867c23.448 0 42.458-19.012 42.458-42.455V232.31c0-23.446-19.01-42.456-42.458-42.456v134.013zM38.198 132.417v247.886h357.537V132.417H38.198zm328.264 217.69H67.467V162.612h298.995v187.495zM128.27 187.651H92.507v137.418h35.763V187.651z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-beer-glass.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-beer-glass.svg
new file mode 100644
index 0000000000..dc9e44cff7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-beer-glass.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M396.615 143.603h-44.342v-49.24h-.394c.23-.757.394-1.501.394-2.267 0-17.866-63.867-32.378-142.645-32.378-78.814 0-142.645 14.512-142.645 32.378 0 .766.131 1.51.359 2.267h-.359V420.81c.097 17.852 63.896 32.321 142.645 32.321 78.744 0 142.545-14.47 142.645-32.321v-49.24h44.342c27.244-.089 49.119-21.99 49.219-49.212v-129.55c-.1-27.226-21.975-49.116-49.219-49.205zM146.711 371.09c0 8.485-6.869 15.346-15.305 15.346-8.504 0-15.371-6.86-15.371-15.346V144.083c0-8.475 6.867-15.347 15.371-15.347 8.436 0 15.305 6.872 15.305 15.347V371.09zm78.253 0c0 8.471-6.867 15.346-15.335 15.346-8.471 0-15.338-6.875-15.338-15.346V144.083c0-8.475 6.867-15.347 15.338-15.347 8.468 0 15.335 6.872 15.335 15.347V371.09zm78.224.026c0 8.459-6.867 15.319-15.338 15.319-8.469 0-15.336-6.86-15.336-15.319V144.083c0-8.475 6.867-15.347 15.336-15.347 8.471 0 15.338 6.872 15.338 15.347v227.033zm96.406-48.759c0 .805-.296 1.456-.885 2.083-.656.62-1.307.909-2.094.909h-44.342V189.823h44.342c.787.026 1.438.305 2.094.906.589.629.885 1.263.885 2.078v129.55z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bell-off.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bell-off.svg
new file mode 100644
index 0000000000..d7c9422857
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bell-off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M63.774 42.231L42.008 63.996l404.999 404.999 21.767-21.765-405-404.999zm378.655 343.248c.514-2.089.827-4.281.821-6.595.025-8.525-4.035-15.696-8.371-20.336-7.801-8.226-17.102-12.633-28.434-16.957-.626-.231-1.305-.442-1.941-.667-45.437-39.312-24.12-70.818-24.12-111.01 0-39.834-39.7-100.547-93.215-117.836.19-1.411.321-2.838.321-4.302 0-17.729-14.367-32.099-32.095-32.099s-32.101 14.369-32.101 32.099c0 1.979.205 3.909.548 5.788-12.216 4.496-23.641 11.217-33.969 19.354l252.556 252.561zm-187.033 12.367c-45.501.018-86.747-4.188-115.399-10.622-11.53-2.547-21.039-5.562-27.473-8.348a62.242 62.242 0 0 1 4.503-1.778c12.607-4.725 32.442-9.211 56.328-12.271 15.937-2.059 33.758-3.534 52.738-4.295 2.938 13.486 14.934 23.591 29.303 23.591 14.368 0 26.364-10.106 29.298-23.601 6.656.269 13.16.626 19.494 1.07L141.385 198.781c-4.015 10.877-6.206 21.518-6.206 31.133 0 39.855 18.94 71.3-22.197 108.786-8.275 2.544-15.655 5.412-22.135 8.803-5.515 2.96-10.509 6.253-14.94 11.045-4.341 4.64-8.396 11.811-8.376 20.336-.019 8.538 4.036 15.708 8.376 20.347 7.797 8.218 17.107 12.631 28.434 16.954 16.95 6.212 38.791 10.863 64.52 14.194 25.694 3.309 55.153 5.166 86.535 5.166 42.972-.013 82.218-3.46 113.335-9.417l-32.98-32.977c-23.558 2.968-51.037 4.699-80.355 4.695z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bell.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bell.svg
new file mode 100644
index 0000000000..6843f8dbc7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bell.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M434.135 359.126c-7.798-8.222-17.102-12.629-28.434-16.952-.626-.228-1.301-.441-1.939-.666-45.436-39.315-24.12-70.818-24.12-111.011 0-39.834-39.698-100.547-93.214-117.835.188-1.413.32-2.84.32-4.302 0-17.728-14.367-32.1-32.095-32.1-17.728 0-32.099 14.372-32.099 32.1 0 1.977.206 3.909.549 5.788-51.197 18.839-88.666 76.425-88.666 116.349 0 39.858 18.944 71.3-22.197 108.788-8.272 2.543-15.655 5.41-22.133 8.803-5.518 2.955-10.51 6.252-14.942 11.038-4.339 4.645-8.394 11.813-8.377 20.345-.016 8.534 4.038 15.703 8.377 20.343 7.798 8.222 17.106 12.63 28.433 16.952 16.952 6.213 38.792 10.867 64.519 14.197 25.696 3.303 55.153 5.167 86.536 5.167 47.843-.019 91.098-4.276 123.619-11.526 16.316-3.686 29.893-7.969 40.918-13.753 5.521-2.954 10.513-6.245 14.945-11.037 4.342-4.64 8.4-11.809 8.376-20.343.024-8.532-4.034-15.7-8.376-20.345zm-41.121 22.138c-12.606 4.721-32.439 9.204-56.32 12.271-23.922 3.096-52.033 4.896-82.041 4.895-45.5.021-86.746-4.187-115.397-10.62-11.531-2.553-21.04-5.562-27.474-8.347a61.283 61.283 0 0 1 4.503-1.782c12.607-4.719 32.441-9.209 56.327-12.271 15.938-2.059 33.759-3.527 52.739-4.295 2.939 13.488 14.934 23.592 29.302 23.592 14.371 0 26.367-10.107 29.3-23.602 33.715 1.363 63.744 5.016 86.092 10.031 11.523 2.549 21.039 5.562 27.472 8.346a65.993 65.993 0 0 1-4.503 1.782z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-dollar.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-dollar.svg
new file mode 100644
index 0000000000..7ed749b1c8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-dollar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M236.493 295.837c-3.531-3.76-5.233-8.83-5.103-15.305h-23.97c1.144 13.378 5.263 23.511 12.396 30.416 7.162 6.935 17.036 10.825 29.758 11.738v14.455h10.007v-14.455c8.503-.555 15.466-2.293 20.927-5.102 5.396-2.847 9.747-6.081 12.982-9.712 3.24-3.599 5.464-7.295 6.707-11.121 1.238-3.796 1.863-6.931 1.863-9.416 0-2.81-.197-6.052-.588-9.683-.393-3.657-1.67-7.258-3.826-10.888-2.127-3.629-5.496-7.098-10.007-10.431-4.548-3.371-10.989-6.185-19.392-8.407-1.604-.486-3.108-.85-4.482-1.21-1.439-.358-2.812-.653-4.185-1.011v-30.088c3.859 0 7.13 1.573 9.843 4.775 2.748 3.172 4.151 7 4.284 11.545h24.101c-.327-5.887-1.568-10.987-3.729-15.27-2.158-4.354-4.938-7.916-8.306-10.828-3.433-2.877-7.358-5.133-11.839-6.801-4.479-1.636-9.254-2.714-14.354-3.303V182.69h-10.007v13.045c-5.101.324-10.041 1.307-14.815 3.006-4.742 1.605-8.927 3.924-12.589 6.936-3.598 3.01-6.51 6.702-8.698 11.117-2.226 4.414-3.335 9.546-3.335 15.305 0 5.66.98 10.398 2.911 14.196 1.895 3.79 4.477 6.965 7.717 9.516 3.204 2.549 6.868 4.61 10.956 6.077a123.877 123.877 0 0 0 12.391 4.053c1.146.234 2.193.462 3.175.76.948.258 1.701.522 2.288.748v35.516c-5.233-1.014-9.616-3.367-13.081-7.128zm23.088-25.507c6.672 1.834 11.415 3.863 14.191 6.053 2.779 2.191 4.153 5.523 4.153 9.938 0 2.714-.555 5.07-1.701 7.031-1.144 1.995-2.55 3.664-4.314 5.006-1.768 1.373-3.762 2.418-5.953 3.175-2.191.716-4.351 1.208-6.376 1.435V270.33zm-21.748-31.951c-2.353-2.027-3.563-4.904-3.563-8.667 0-2.356.424-4.414 1.275-6.179.852-1.762 1.992-3.236 3.467-4.443a14.905 14.905 0 0 1 4.973-2.622c1.795-.586 3.662-.849 5.59-.849v27.699c-5.464-1.242-9.354-2.879-11.742-4.939zm186.073 112.889V160.812H306.443c19.716 21.971 32.471 56.443 32.471 95.229 0 38.783-12.755 73.252-32.471 95.227h117.463zM38.354 110.779v289.508H473.19V110.779H38.354zm410.47 265.407H62.715V135.863h386.109v240.323zM172.627 256.041c0-38.785 12.719-73.258 32.473-95.229H87.635v190.455H205.1c-19.754-21.974-32.473-56.443-32.473-95.226z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-euro.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-euro.svg
new file mode 100644
index 0000000000..c526f106a0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-euro.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M212.925 255.197c-.101.229-.164 1.144-.164 2.746v4.385h-6.802l-5.267 12.229h13.08c2.389 14.846 7.522 26.423 15.466 34.662 8.734 9.193 20.244 13.766 34.502 13.766 9.843 0 18.575-2.187 26.159-6.6l.199-25.639c-8.959 7.125-17.69 10.661-26.193 10.661-13.146 0-21.518-8.929-25.15-26.851h29.597l5.23-12.229h-36.168l.165-7.131h38.066l5.262-12.229h-41.466c3.956-15.535 11.904-23.287 23.807-23.287 6.901 0 14.324 2.551 22.236 7.652l10.37-21.256c-11.12-5.656-21.389-8.501-30.904-8.501-13.506 0-24.724 4.351-33.649 12.914-8.502 7.948-14.128 18.769-16.809 32.478h-8.701l-5.264 12.229h12.398zm211.513 96.405V161.178H306.972c19.753 21.913 32.474 56.413 32.474 95.195 0 38.786-12.721 73.25-32.474 95.229h117.466zm-251.28-95.229c0-38.782 12.721-73.282 32.474-95.195H88.167v190.424h117.465c-19.754-21.979-32.474-56.443-32.474-95.229zM38.885 111.113v289.506h434.834V111.113H38.885zm410.504 265.405H63.215V136.193h386.174v240.325z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-pound.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-pound.svg
new file mode 100644
index 0000000000..339006dc08
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-pound.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M230.083 265.43c.637 1.898.93 3.763.93 5.687 0 3.077-.556 5.985-1.702 8.737a35.825 35.825 0 0 1-4.314 7.746 38.11 38.11 0 0 1-6.131 6.545 59.53 59.53 0 0 1-7.048 5.166l10.531 15.631c3.301-2.454 6.605-4.155 9.94-5.009 3.337-.847 6.559-1.239 9.617-1.239 3.744 0 6.849.297 9.319.981a90.441 90.441 0 0 1 7.489 2.391c2.387.817 5.002 1.474 7.831 2.025 2.829.584 6.392.851 10.71.851 4.301 0 8.763-.818 13.426-2.355 4.626-1.6 9.008-4.382 13.062-8.338l-10.186-17.169c-3.059 3.308-5.757 5.329-8.078 6.114-2.339.788-4.594 1.18-6.883 1.18-2.259 0-4.465-.166-6.607-.59-2.156-.426-4.381-.886-6.638-1.437-2.255-.426-4.497-.886-6.704-1.275a38.019 38.019 0 0 0-6.72-.589c-1.601 0-3.222.263-4.939.652-1.681.494-3.908 1.571-6.622 3.238l-.325-.295a53.027 53.027 0 0 0 9.744-10.137c2.797-3.797 4.186-8.338 4.186-13.672a56.91 56.91 0 0 0-.262-5.459 22.629 22.629 0 0 0-1.112-5.102h17.856v-14.426h-22.594c-1.702-3.07-3.043-5.654-3.991-7.814-.982-2.154-1.669-4.021-2.062-5.689-.391-1.635-.652-3.104-.751-4.312a38.558 38.558 0 0 1-.18-3.96c0-4.746 1.504-8.534 4.496-11.345 3.01-2.845 7.062-4.253 12.166-4.253 4.301 0 7.686.882 10.104 2.647 2.422 1.732 4.252 3.799 5.445 6.182a23.497 23.497 0 0 1 2.291 7.391c.342 2.549.572 4.672.67 6.374h22.957c0-13.831-3.631-24.36-10.891-31.587-7.227-7.262-17.398-10.893-30.414-10.893-7.129 0-13.424.887-18.85 2.719-5.445 1.795-9.993 4.283-13.604 7.387-3.631 3.145-6.377 6.707-8.241 10.795-1.88 4.086-2.813 8.372-2.813 12.918 0 5.102.867 9.744 2.567 13.924 1.701 4.191 3.4 7.364 5.102 9.518h-10.89v14.426h16.825c.898 1.961 1.681 3.858 2.288 5.72zm193.806 85.58V160.557H306.424c19.734 22.011 32.457 56.443 32.457 95.225 0 38.787-12.723 73.288-32.457 95.229h117.465zm-251.281-95.229c0-38.781 12.722-73.214 32.457-95.225H87.616V351.01h117.449c-19.735-21.941-32.457-56.442-32.457-95.229zM38.32 110.588v289.443h434.852V110.588H38.32zm410.504 265.377H62.698V135.64h386.126v240.325z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-yen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-yen.svg
new file mode 100644
index 0000000000..76b9a1d318
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-yen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M216.269 251.881v16.153h24.299l2.353 4.939v7.8H216.27v16.154h26.651v23.448h25.838v-23.448h26.844v-16.154h-26.844v-7.8l2.549-4.939h24.295v-16.153H279.48l26.326-52.825H278.27l-21.911 52.825-22.431-52.825h-27.535l25.996 52.825h-16.12zm207.952 99.807v-190.44H306.789c19.751 21.962 32.437 56.428 32.437 95.212 0 38.783-12.686 73.253-32.437 95.229h117.432zM38.668 111.214v289.492h434.865V111.214H38.668zm410.5 265.41H63.031V136.299h386.137v240.325zM172.971 256.46c0-38.784 12.69-73.25 32.475-95.212H87.947v190.441h117.498c-19.784-21.976-32.474-56.446-32.474-95.229z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill.svg
new file mode 100644
index 0000000000..ad75b69591
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M424.361 352.143V161.7h-117.5c19.752 21.968 32.475 56.434 32.475 95.218 0 38.783-12.723 73.244-32.475 95.224h117.5zM38.773 111.672v289.502h434.836V111.672H38.773zm410.506 265.4H63.138V136.758H449.28v240.314zm-276.23-120.154c0-38.785 12.752-73.25 32.471-95.218H88.058v190.442H205.52c-19.719-21.98-32.471-56.441-32.471-95.224zm78.318 64.603h24.103V202.577h-19.196c-.652 4.531-2.094 8.316-4.25 11.379-2.127 3.067-4.775 5.53-7.881 7.384-3.141 1.874-6.639 3.173-10.531 3.917-3.923.744-7.98 1.051-12.162.924v18.199h29.918v77.141z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-billboard.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-billboard.svg
new file mode 100644
index 0000000000..468e0dc8bd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-billboard.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M153.537 329.843v62.41h23.68v-62.41h159.498v62.41h23.68v-62.41h89.076V61.513H60.359v268.33h93.178zM88.773 89.928h332.283v211.501H88.773V89.928zm28.416 28.415H392.64v154.671H117.189zM49.523 421.381h412.953v29.106H49.523z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-dollar.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-dollar.svg
new file mode 100644
index 0000000000..dcd3a8f227
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-dollar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M188.488 338.922c-2.812-3.045-4.184-7.132-4.121-12.295h-19.194c.881 10.727 4.218 18.836 9.939 24.43 5.724 5.524 13.704 8.629 23.873 9.385v11.607h8.044v-11.607c6.802-.492 12.396-1.832 16.776-4.088 4.35-2.291 7.849-4.875 10.434-7.783 2.583-2.912 4.379-5.89 5.396-8.926.979-3.01 1.504-5.594 1.504-7.591 0-2.253-.165-4.872-.524-7.783-.294-2.878-1.306-5.755-3.041-8.667-1.732-2.908-4.413-5.719-8.044-8.402-3.632-2.68-8.828-4.938-15.531-6.77a52.339 52.339 0 0 0-3.631-.951 79.541 79.541 0 0 1-3.338-.849v-24.097c3.074 0 5.722 1.272 7.915 3.822 2.192 2.521 3.302 5.661 3.402 9.258h19.358c-.263-4.74-1.275-8.828-3.008-12.263-1.7-3.47-3.926-6.348-6.672-8.702-2.716-2.257-5.888-4.087-9.482-5.394-3.565-1.341-7.426-2.223-11.514-2.651v-10.562h-8.044v10.562c-4.088.265-8.074 1.047-11.869 2.389-3.794 1.276-7.196 3.141-10.072 5.562-2.942 2.417-5.264 5.396-7.031 8.96-1.767 3.527-2.65 7.613-2.65 12.262 0 4.51.754 8.303 2.288 11.345 1.571 3.04 3.633 5.624 6.215 7.653 2.586 2.059 5.527 3.666 8.795 4.906 3.273 1.244 6.608 2.29 9.943 3.204.915.166 1.768.429 2.55.624.753.229 1.374.422 1.832.619v28.484c-4.187-.816-7.685-2.713-10.498-5.691zm18.541-20.471c5.364 1.435 9.158 3.074 11.383 4.838 2.223 1.768 3.335 4.451 3.335 7.979 0 2.159-.458 4.058-1.343 5.663a14.175 14.175 0 0 1-3.499 4.016 16.05 16.05 0 0 1-4.773 2.521 25.466 25.466 0 0 1-5.103 1.146v-26.163zm-17.463-25.639c-1.896-1.669-2.843-3.956-2.843-6.963 0-1.931.326-3.567 1.013-4.971.688-1.407 1.604-2.616 2.812-3.535a11.624 11.624 0 0 1 3.956-2.122 14.675 14.675 0 0 1 4.48-.686v22.236c-4.38-.982-7.487-2.353-9.418-3.959zm-45.714-184.046v25.898h303.11v160.112h28.482v-186.01H143.852zM36.752 402.3h331.597V216.258H36.752V402.3zm165.799-167.923c32.015 0 57.945 33.059 57.945 73.871 0 40.781-25.931 73.838-57.945 73.838s-57.947-33.057-57.947-73.838c0-40.812 25.932-73.871 57.947-73.871zM90.154 188.364h303.113v160.104h28.483V162.464H90.154v25.9z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-euro.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-euro.svg
new file mode 100644
index 0000000000..3f2fbc38ef
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-euro.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M167.359 312.063h-5.444l-4.233 9.843h10.496c1.912 11.905 6.048 21.195 12.411 27.795 7.012 7.395 16.219 11.055 27.681 11.055 7.913 0 14.913-1.764 20.995-5.3l.147-20.599c-7.195 5.724-14.177 8.604-21.011 8.604-10.529 0-17.266-7.197-20.177-21.555h23.727l4.231-9.843h-29.038l.132-5.718h30.543l4.217-9.813h-33.257c3.173-12.458 9.532-18.671 19.082-18.671 5.544 0 11.496 2.057 17.873 6.109l8.304-17c-8.927-4.582-17.167-6.867-24.818-6.867-10.812 0-19.819 3.463-27.013 10.365-6.803 6.376-11.315 15.072-13.491 26.063h-6.947l-4.22 9.813h9.942c-.097.193-.131.912-.131 2.223v3.496zm-23.201-202.944v25.864h303.129v160.144h28.449V109.119H144.158zm-53.714 79.595h303.112V348.85h28.484V162.783H90.444v25.931zM37.043 402.619h331.596V216.61H37.043v186.009zm165.799-167.928c31.999 0 57.963 33.066 57.963 73.877 0 40.775-25.964 73.869-57.963 73.869-32.016 0-57.949-33.094-57.949-73.869 0-40.81 25.933-73.877 57.949-73.877z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-pound.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-pound.svg
new file mode 100644
index 0000000000..32a30de1c6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-pound.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M176.794 336.548c-1.389 1.917-3.042 3.666-4.888 5.249a49.323 49.323 0 0 1-5.66 4.171l8.438 12.538c2.633-2.006 5.298-3.332 7.979-4.019 2.684-.688 5.25-1.03 7.702-1.03 2.993 0 5.513.274 7.506.82 1.992.539 3.99 1.192 6.002 1.894 1.912.655 4.005 1.193 6.276 1.647 2.272.461 5.136.688 8.584.688 3.467 0 7.063-.648 10.776-1.912 3.729-1.289 7.245-3.494 10.496-6.686l-8.189-13.768c-2.439 2.632-4.595 4.266-6.476 4.907a16.814 16.814 0 0 1-5.51.943c-1.814 0-3.581-.146-5.314-.452a98.452 98.452 0 0 1-5.331-1.178c-1.813-.36-3.595-.703-5.377-1.015a29.864 29.864 0 0 0-5.378-.492c-1.296 0-2.586.18-3.959.538-1.373.376-3.14 1.245-5.331 2.599l-.262-.257a42.004 42.004 0 0 0 7.851-8.129c2.223-3.042 3.335-6.687 3.335-10.969 0-1.541-.064-2.994-.199-4.367-.145-1.371-.456-2.729-.881-4.086h14.307v-11.593h-18.133c-1.374-2.454-2.452-4.547-3.205-6.263-.785-1.731-1.34-3.254-1.634-4.579a24.511 24.511 0 0 1-.622-3.486 31.726 31.726 0 0 1-.132-3.104c0-3.84 1.193-6.883 3.6-9.156 2.419-2.272 5.656-3.401 9.759-3.401 3.452 0 6.167.686 8.096 2.097 1.962 1.419 3.433 3.072 4.382 4.982.948 1.913 1.57 3.895 1.831 5.938.279 2.043.457 3.744.555 5.118H236.2c0-11.086-2.913-19.557-8.732-25.359-5.819-5.838-13.948-8.731-24.413-8.731-5.72 0-10.775.719-15.14 2.17-4.364 1.459-7.995 3.44-10.905 5.938-2.913 2.501-5.101 5.381-6.622 8.649a24.764 24.764 0 0 0-2.242 10.366c0 4.091.69 7.833 2.045 11.187 1.356 3.368 2.731 5.899 4.09 7.637h-8.717v11.593h13.506a42.861 42.861 0 0 1 1.83 4.562c.49 1.501.752 3.022.752 4.555 0 2.475-.457 4.814-1.373 7.039a27.739 27.739 0 0 1-3.485 6.207zm-32.915-227.213v25.889H446.99v160.121h28.468v-186.01H143.879zm-53.696 79.581h303.113v160.142h28.448V163.034H90.183v25.882zm-53.416 213.92h331.576V216.811H36.767v186.025zm165.78-167.921c32.013 0 57.965 33.074 57.965 73.871 0 40.796-25.952 73.869-57.965 73.869-31.981 0-57.947-33.073-57.947-73.869 0-40.797 25.965-73.871 57.947-73.871z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-yen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-yen.svg
new file mode 100644
index 0000000000..ea352b33d5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-yen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M169.763 308.701v12.949h19.523l1.93 3.961v6.273h-21.453v12.956h21.453v18.815h20.734V344.84h21.516v-12.956H211.95v-6.273l2.027-3.961h19.489v-12.949h-12.952l21.127-42.412h-22.106l-17.562 42.412-18.017-42.412H161.88l20.863 42.412h-12.98zm-25.638-199.513v25.883h303.146v160.126h28.483V109.188H144.125zM90.43 188.785h303.111V348.89h28.484V162.887H90.43v25.898zm-53.402 213.92h331.595V216.679H37.028v186.026zm165.795-167.922c32.018 0 57.95 33.057 57.95 73.87 0 40.796-25.933 73.856-57.95 73.856-31.981 0-57.915-33.061-57.915-73.856 0-40.813 25.934-73.87 57.915-73.87z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills.svg
new file mode 100644
index 0000000000..a6d9b7a76e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M90.374 188.71h303.112v160.137h28.482V162.829H90.374v25.881zm53.695-79.581v25.883h303.113v160.126h28.482v-186.01H144.069zM36.94 402.625h331.594V216.621H36.94v186.004zm165.83-167.906c31.981 0 57.948 33.064 57.948 73.861 0 40.807-25.967 73.871-57.948 73.871s-57.98-33.064-57.98-73.871c0-40.797 25.999-73.861 57.98-73.861zm-3.894 124.547h19.328v-95.46h-15.37c-.556 3.649-1.702 6.692-3.433 9.143a20.852 20.852 0 0 1-6.312 5.935c-2.519 1.49-5.331 2.536-8.469 3.123-3.14.59-6.378.85-9.744.754v14.603h24v61.902z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-binarycode.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-binarycode.svg
new file mode 100644
index 0000000000..5a7e9ee9d2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-binarycode.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M300.945 162.143c-4.615 0-7.465 2.15-8.965 6.768-1.684 5.166-2.539 13.337-2.539 24.298 0 10.458.859 18.522 2.547 23.972 1.508 4.882 4.355 7.158 8.957 7.158 4.588 0 7.402-2.269 8.854-7.139 1.629-5.461 2.457-13.533 2.457-23.991 0-10.961-.824-19.142-2.449-24.317-1.442-4.604-4.26-6.749-8.862-6.749zm0 125.714c-4.615 0-7.465 2.147-8.965 6.764-1.684 5.166-2.539 13.342-2.539 24.299 0 10.458.859 18.521 2.547 23.973 1.508 4.885 4.355 7.157 8.957 7.157 4.59 0 7.402-2.267 8.854-7.137 1.629-5.462 2.457-13.533 2.457-23.993 0-10.961-.824-19.143-2.449-24.317-1.442-4.602-4.26-6.746-8.862-6.746zm-89.888 0c-4.615 0-7.465 2.147-8.967 6.766-1.684 5.172-2.537 13.345-2.537 24.297 0 10.45.857 18.517 2.547 23.973 1.512 4.885 4.359 7.157 8.957 7.157 4.59 0 7.4-2.267 8.852-7.137 1.631-5.466 2.457-13.535 2.457-23.993 0-10.955-.824-19.137-2.447-24.317-1.444-4.602-4.259-6.746-8.862-6.746zm-89.889-125.714c-4.617 0-7.465 2.15-8.967 6.768-1.684 5.162-2.535 13.337-2.535 24.298 0 10.458.855 18.522 2.543 23.972 1.512 4.882 4.359 7.158 8.959 7.158 4.588 0 7.4-2.269 8.852-7.139 1.631-5.461 2.455-13.533 2.455-23.991 0-10.961-.824-19.142-2.447-24.317-1.444-4.604-4.258-6.749-8.86-6.749zm269.668 0c-4.617 0-7.469 2.15-8.967 6.768-1.684 5.166-2.539 13.337-2.539 24.298 0 10.458.857 18.522 2.547 23.972 1.51 4.882 4.357 7.158 8.959 7.158 4.588 0 7.4-2.269 8.852-7.139 1.627-5.461 2.455-13.533 2.455-23.991 0-10.961-.824-19.142-2.449-24.317-1.442-4.604-4.258-6.749-8.858-6.749zm32.305-60.331H88.859c-19 0-34.41 15.404-34.41 34.412v239.551c0 19.003 15.41 34.412 34.41 34.412H423.14c19 0 34.41-15.409 34.41-34.412v-239.55c.001-19.008-15.409-34.413-34.409-34.413zm-224.459 43.979h24.746v94.706h-24.746v-94.706zm-65.141 220.415h-24.748v-94.699h24.748v94.699zm14.197-136.577c-5.113 8.89-14.053 13.398-26.57 13.398-12.52 0-21.459-4.509-26.57-13.398-4.914-8.546-7.404-20.801-7.404-36.421 0-15.619 2.49-27.891 7.402-36.48 5.109-8.935 14.049-13.464 26.572-13.464 12.52 0 21.461 4.529 26.572 13.464 4.91 8.594 7.4 20.868 7.4 36.48.001 15.614-2.49 27.869-7.402 36.421zm89.887 125.711c-5.111 8.89-14.051 13.399-26.568 13.399-12.525 0-21.465-4.51-26.57-13.399-4.914-8.55-7.406-20.803-7.406-36.42 0-15.613 2.492-27.888 7.402-36.479 5.111-8.938 14.051-13.47 26.574-13.47 12.518 0 21.457 4.532 26.572 13.468 4.91 8.593 7.4 20.867 7.4 36.48 0 15.618-2.49 27.871-7.404 36.421zm89.887 0c-5.109 8.89-14.045 13.399-26.566 13.399-12.523 0-21.461-4.51-26.568-13.399-4.914-8.55-7.406-20.803-7.406-36.42 0-15.613 2.492-27.888 7.402-36.479 5.109-8.938 14.049-13.47 26.572-13.47 12.521 0 21.461 4.532 26.568 13.47 4.916 8.591 7.404 20.861 7.404 36.479s-2.49 27.874-7.406 36.42zm0-125.711c-5.109 8.89-14.049 13.398-26.566 13.398-12.521 0-21.461-4.509-26.568-13.398-4.914-8.552-7.406-20.805-7.406-36.421 0-15.615 2.492-27.887 7.402-36.48 5.109-8.935 14.049-13.464 26.572-13.464 12.521 0 21.461 4.529 26.568 13.464 4.916 8.59 7.404 20.863 7.404 36.48 0 15.618-2.488 27.871-7.406 36.421zm89.89 125.711c-5.109 8.89-14.049 13.399-26.566 13.399-12.523 0-21.463-4.51-26.57-13.399-4.914-8.546-7.406-20.801-7.406-36.42s2.492-27.89 7.404-36.479c5.107-8.938 14.047-13.47 26.572-13.47 12.518 0 21.457 4.532 26.57 13.47 4.912 8.591 7.4 20.865 7.4 36.479.001 15.617-2.49 27.874-7.404 36.42zm0-125.711c-5.111 8.891-14.051 13.398-26.566 13.398-12.52 0-21.461-4.508-26.574-13.398-4.912-8.552-7.402-20.803-7.402-36.421 0-15.615 2.49-27.889 7.398-36.48 5.113-8.935 14.055-13.464 26.578-13.464 12.518 0 21.457 4.529 26.568 13.464 4.914 8.592 7.402 20.863 7.402 36.48.001 15.618-2.49 27.871-7.404 36.421zm-26.566 58.228c-4.619 0-7.469 2.147-8.967 6.764-1.682 5.162-2.537 13.338-2.537 24.299 0 10.462.857 18.527 2.545 23.973 1.51 4.885 4.357 7.157 8.959 7.157 4.588 0 7.4-2.267 8.852-7.137 1.629-5.466 2.459-13.541 2.459-23.993 0-10.955-.828-19.137-2.453-24.317-1.442-4.602-4.256-6.746-8.858-6.746z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-binoculars.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-binoculars.svg
new file mode 100644
index 0000000000..407a88c58d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-binoculars.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M439.554 348.795a60.168 60.168 0 0 0-1.768-9.686h.002l-32.572-125.843c-3.986-33.326-31.947-58.288-65.629-58.288-2.18 0-4.387.109-6.566.324-17.592 1.735-33.457 10.219-44.672 23.887-1.514 1.849-2.881 3.784-4.178 5.756h-56.906c-1.135-1.668-2.322-3.31-3.617-4.889-11.213-13.667-27.078-22.15-44.672-23.886a67.058 67.058 0 0 0-6.562-.323c-33.684 0-61.645 24.961-65.631 58.287L74.21 339.978h.002a60.266 60.266 0 0 0-1.768 9.685c-1.848 18.721 4.994 37.035 19.271 51.566 13.703 13.95 32.75 22.768 53.627 24.826 3.07.303 6.179.457 9.24.457h.002c40.561-.001 73.736-26.281 77.178-61.13.02-.203.023-.404.043-.606h.002l.006-.125c.131-1.488.195-2.973.213-4.455l1.072-22.303h45.842l1.029 21.435c.019 1.482.084 2.967.213 4.455l.008.124h.002c.02.203.023.404.043.607 3.439 34.85 36.619 61.129 77.178 61.13h.002c3.061 0 6.17-.154 9.24-.457 20.881-2.06 39.926-10.876 53.627-24.825 14.278-14.534 21.12-32.848 19.272-51.567zm-231.877 14.356c-2.299 22.344-25.086 39.177-53.094 39.179a70.32 70.32 0 0 1-6.865-.34c-15.252-1.505-29.012-7.793-38.75-17.708-9.166-9.33-13.588-20.781-12.459-32.245 2.211-22.415 25.045-39.318 53.109-39.318 2.273 0 4.586.113 6.873.34 15.248 1.504 29.008 7.791 38.748 17.705 8.725 8.881 13.092 19.687 12.524 30.593l-.086 1.794zm195.354 20.263c-9.738 9.914-23.5 16.203-38.748 17.707-2.287.226-4.596.34-6.867.34-28.008-.001-50.793-16.834-53.092-39.178l-.086-1.796c-.57-10.906 3.797-21.712 12.521-30.593 9.74-9.913 23.498-16.2 38.75-17.705a70.426 70.426 0 0 1 6.871-.34c28.066 0 50.898 16.904 53.109 39.319 1.132 11.465-3.292 22.916-12.458 32.246zM292.517 146.706c10.822-10.956 24.988-17.742 40.504-19.273a67.09 67.09 0 0 1 6.562-.324c12.385 0 23.986 3.386 33.916 9.308l-3.914-16.414c-.15-1.245-1.238-6.238-1.238-6.238a38.984 38.984 0 0 0-37.596-28.275c-1.287 0-2.594.064-3.883.191-19.061 1.88-33.584 17.207-35.16 35.644 0 0-.115 5.005-.025 6.209l.834 19.172zm-113.541-18.405c15.518 1.532 29.686 8.318 40.508 19.273l.832-19.174c.092-1.204-.025-6.209-.025-6.209-1.576-18.436-16.1-33.764-35.162-35.644a39.7 39.7 0 0 0-3.881-.191 38.991 38.991 0 0 0-37.598 28.275s-1.086 4.992-1.234 6.238l-3.918 16.414c9.93-5.922 21.533-9.308 33.918-9.308 2.177.002 4.384.11 6.56.326z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bird.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bird.svg
new file mode 100644
index 0000000000..182a02be79
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bird.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M263.41 386.509c17.477-2.091 40.142-6.242 62.914-12.162-30.231-4.022-59.352-9.399-81.375-14.323-14.129-3.204-25.182-6.129-32.441-8.78-34.009-12.411-54.3-45.603-54.219-80.923 0-10.789 1.863-21.889 5.803-32.7 5.938-16.382 16.336-28.894 29.073-36.739 2.518-1.553 5.135-2.895 7.785-4.104-5.103-4.088-9.812-8.244-13.949-12.364 0 0-17.789-28.629-26.161-92.382-5.348-40.678-55.904-49.182-76.113-28.939-33.241 33.259-30.102 46.959-30.102 46.959s26.748-6.312 33.911-2.161c12.443 7.162 9.55 57.966-3.957 126.851-9.826 50.299-.065 97.88 101.654 123.942 2.256 3.106 4.757 5.983 7.439 8.666 7.604 11.133 22.041 30.968 34.992 41.039l-6.427 25.804-58.715 11.148 4.203 22.042 63.064-11.967 45.896 13.963 6.542-21.473-38.377-11.654 6.427-25.835c5.428-5.461 9.204-15.272 12.133-23.908zm192.235-51.57c-3.76-5.101-9.809-11.248-17.428-17.723-15.323-12.98-36.89-27.256-59.633-40.632-45.391-26.766-96.274-50.407-112.82-56.376-10.155-3.713-20.601-5.678-30.299-5.678-11.119 0-21.11 2.521-29.138 7.526-8.027 5.032-14.486 12.457-18.804 24.129-2.927 8.048-4.315 16.223-4.315 24.134.082 26.1 14.683 49.12 37.852 57.527 5.166 1.896 15.842 4.806 29.365 7.847 13.539 3.043 30.136 6.312 48.038 9.253 35.776 5.969 76.917 10.796 109.42 10.757 12.134 0 23.041-.686 31.771-2.075 8.766-1.357 15.273-3.645 18.28-5.671 1.995-1.342 2.323-2.097 2.422-2.292.031-.196.064-.359.097-.719.098-1.013-.949-4.888-4.808-10.007z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-birthday-cake.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-birthday-cake.svg
new file mode 100644
index 0000000000..205a06715a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-birthday-cake.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M75.638 399.307h360.725v40.707H75.638zm58.086-101.487c18.557 0 33.654-15.1 33.654-33.654h14.209c0 18.555 15.096 33.654 33.652 33.654 18.561 0 33.656-15.1 33.656-33.654h14.207c0 18.555 15.098 33.654 33.656 33.654 18.557 0 33.654-15.1 33.654-33.654h14.207c0 18.555 15.098 33.654 33.654 33.654 16.338 0 29.98-11.705 33.014-27.164V258.52c0-22.602-17.488-41.08-39.664-42.744v-68.934c-4.98 2.539-10.596 4.002-16.559 4.002-5.955 0-11.57-1.461-16.547-3.994v68.764H272.55v-68.77c-4.979 2.539-10.592 4-16.553 4-5.959 0-11.574-1.461-16.551-4v68.77h-65.965v-68.77c-4.979 2.539-10.592 4-16.553 4s-11.574-1.461-16.553-4v68.932c-22.18 1.66-39.668 20.143-39.668 42.744v12.129c3.034 15.46 16.677 27.171 33.017 27.171zm277.564.91c-8.596 8.215-20.213 13.297-33.014 13.297-17.238 0-32.33-9.191-40.758-22.898-8.428 13.707-23.521 22.898-40.758 22.898-17.238 0-32.332-9.191-40.76-22.898-8.428 13.707-23.52 22.898-40.76 22.898-17.238 0-32.33-9.191-40.756-22.898-8.43 13.707-23.523 22.898-40.76 22.898-12.803 0-24.418-5.082-33.014-13.297v73.787h310.578V298.73zM255.999 134.291c11.078 0 20.059-8.984 20.059-20.061 0-11.078-20.059-42.244-20.059-42.244s-20.061 31.166-20.061 42.244c0 11.077 8.983 20.061 20.061 20.061zm99.066 0c11.08 0 20.061-8.984 20.061-20.061 0-11.078-20.061-42.244-20.061-42.244s-20.057 31.166-20.057 42.244c.001 11.077 8.981 20.061 20.057 20.061zm-198.134 0c11.08 0 20.061-8.984 20.061-20.061 0-11.078-20.061-42.244-20.061-42.244s-20.059 31.166-20.059 42.244c0 11.077 8.982 20.061 20.059 20.061z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-block.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-block.svg
new file mode 100644
index 0000000000..ed19756dd9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-block.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.501 38.16c-120.308 0-217.838 97.53-217.838 217.838 0 120.31 97.53 217.838 217.838 217.838 120.31 0 217.838-97.528 217.838-217.838 0-120.308-97.528-217.838-217.838-217.838zm151.667 217.838c0 29.861-8.711 57.708-23.671 81.209L173.293 128.002c23.499-14.961 51.345-23.67 81.208-23.67 83.629.001 151.667 68.037 151.667 151.666zm-303.332 0c0-29.859 8.71-57.707 23.67-81.204l209.201 209.201c-23.498 14.96-51.346 23.671-81.206 23.671-83.632 0-151.665-68.04-151.665-151.668z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-blueprint.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-blueprint.svg
new file mode 100644
index 0000000000..4382644745
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-blueprint.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M334.622 326.082h-23.67v23.678h23.67v13.785h21.311v-49.528h-21.311zM156.138 183.827h12.922v23.68h23.678v-23.68h12.924v-21.311h-49.524zm12.922 47.359h23.679v23.679H169.06zm0 47.357h23.679v23.68H169.06zm0 71.217h23.678v-23.858H169.06zm94.535-23.678h23.68v23.678h-23.68zm-47.359 0h23.68v23.678h-23.68zm173.77-180.749L310.575 65.9l-6.937-6.936H115.06v394.07h281.88V152.268l-6.934-6.935zm-16.744 284.026l-234.524-.002V82.644h133.921c35.181 0 18.229 83.393 18.229 83.393s81.329-19.766 82.374 17.526v245.796zM232.367 286.082h123.566L232.367 162.516z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bluetooth.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bluetooth.svg
new file mode 100644
index 0000000000..2c73fb77a7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bluetooth.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M367.078 172.074L239.685 44.686v167.938l-70.067-70.07-25.483 25.485 87.934 88.163-87.934 88.169 25.483 25.483 70.067-70.077v167.945l127.394-127.391-84.128-84.13 84.127-84.127zm-50.909.169l-40.645 40.648-.033-81.322 40.678 40.674zm0 167.79l-40.678 40.675.033-81.321 40.645 40.646z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-boat-shipping.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-boat-shipping.svg
new file mode 100644
index 0000000000..15a8d6f9ff
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-boat-shipping.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M443.984 262.604v-72.72H411.96v-42.682h-29.106v42.682h-37.54v19.739l19.912 19.909v33.072H169.923l-15.664-21.353H49.196l82.254 123.547h331.354V262.604zm-258.895-54.682h51.894v39.598h-51.894zm83.752 0h51.89v39.598h-51.89z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bomb.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bomb.svg
new file mode 100644
index 0000000000..b39d18938c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bomb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M288 111.709a11.635 11.635 0 0 0-16.448.001l-17.182 17.186c-54.131-19.107-116.814-7.023-160.113 36.271-60.082 60.082-60.082 157.501 0 217.582 60.082 60.08 157.496 60.08 217.578-.003 43.301-43.298 55.385-105.981 36.275-160.112l17.182-17.184c4.543-4.541 4.543-11.903 0-16.445L288 111.709zm108.459-27.063c-27.244 3.242-46.768 23.429-55.844 34.934l19.766 19.767c5.002-6.903 19.822-24.942 39.471-27.213 13.863-1.604 28.449 5.151 43.369 20.069l19.582-19.584c-21.27-21.27-43.602-30.682-66.344-27.973z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bones.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bones.svg
new file mode 100644
index 0000000000..f956d77bf3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bones.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M79.498 221.885c14.242 2.536 25.9 4.627 25.9 4.61 0 0 10.972 4.563 24.331 10.102l23.788 9.896 80.055-33.21-80.625-33.487c-13.378-5.57-32.181-18.965-41.812-29.791l-12.179-13.714c-9.63-10.825-20.244-8.16-23.579 5.936l-1.603 6.685c-3.354 14.096-14.781 33.699-25.394 43.558l-2.271 2.124c-10.612 9.875-7.634 20.015 6.621 22.548l26.768 4.743zm379.986 72.71l-26.751-4.741c-14.266-2.531-25.939-4.61-25.939-4.61l-24.299-10.089-23.35-9.694-80.068 33.192 80.166 33.321c13.393 5.562 32.212 18.953 41.842 29.776l12.183 13.703c9.614 10.858 20.218 8.178 23.586-5.92l1.604-6.707c3.334-14.074 14.747-33.683 25.344-43.537l2.319-2.143c10.598-9.861 7.621-20-6.637-22.551zm-26.129-66.398l18.312 1.046c14.452.835 20.077-8.55 12.459-20.882l-3.629-5.85c-7.588-12.333-13.409-34.253-12.918-48.73l.097-3.154c.523-14.469-8.765-19.507-20.625-11.2l-22.27 15.602c-11.839 8.307-21.549 15.108-21.549 15.108s-10.956 4.526-24.314 10.071l-229.616 95.213c-13.358 5.522-36.15 9.397-50.606 8.563l-18.33-1.061c-14.438-.818-20.047 8.58-12.441 20.896l3.629 5.866c7.586 12.312 13.407 34.239 12.9 48.709l-.114 3.175c-.49 14.452 8.796 19.492 20.652 11.184l22.252-15.584 21.583-15.124s10.94-4.526 24.331-10.072l229.583-95.196c13.374-5.553 36.151-9.4 50.614-8.58z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book-alt-2.svg
new file mode 100644
index 0000000000..2003b3d233
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book-alt-2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M475.646 151.494c-.583-.969-10.253-17.847-29.679-35.168-19.301-17.234-49.217-35.208-88.636-35.208-39.42-.012-69.042 18.03-87.956 35.339a162.553 162.553 0 0 0-14.817 15.455 168.771 168.771 0 0 0-15.326-15.586c-19.3-17.234-49.216-35.208-88.635-35.208-39.419-.012-69.048 18.03-87.957 35.339-19.042 17.393-28.303 34.318-28.874 35.324l-1.99 7.797v254.555l30.498 7.786.052.032c.428-.815 8.618-14.93 23.666-28.164 15.168-13.297 36.331-25.534 64.604-25.555 29.174 0 51.356 13.12 66.994 26.967 7.757 6.903 13.685 13.877 17.581 19.039a104.804 104.804 0 0 1 4.309 6.107c.393.598.668 1.039.872 1.367 2.713 5.213 8.152 8.777 14.432 8.777 6.397 0 11.916-3.699 14.576-9.062 1.596-2.721 9.607-15.531 23.375-27.641 15.161-13.297 36.323-25.534 64.597-25.555 29.173 0 51.354 13.12 67.003 26.967 7.748 6.903 13.678 13.877 17.572 19.039a103.182 103.182 0 0 1 4.316 6.107c.455.701.785 1.24.984 1.562.1.163.162.267.193.326l.043-.023 30.357-8.077V159.578l-2.154-8.084zM238.512 370.267c-19.32-17.049-48.97-34.59-87.915-34.59h-.046c-38.249 0-67.271 16.998-86.226 33.819v-205.35c3.309-5.068 10.651-15.227 21.667-24.916 15.168-13.309 36.331-25.544 64.604-25.556 29.174 0 51.356 13.112 66.994 26.968a133.5 133.5 0 0 1 17.581 19.036 113.364 113.364 0 0 1 3.34 4.653v205.936zm206.732-.02c-19.319-17.042-48.98-34.57-87.913-34.57-38.285-.012-67.3 17.008-86.267 33.844V164.148c3.307-5.062 10.637-15.213 21.67-24.918 15.161-13.309 36.323-25.544 64.597-25.556 29.173 0 51.354 13.112 67.003 26.968a133.773 133.773 0 0 1 17.572 19.036 107.973 107.973 0 0 1 3.338 4.64v205.929zM83.806 179.755l13.358 17.522 1.741 2.447c.829-.554 18.427-12.986 53.962-13.008 18.98 0 33.073 3.563 42.304 6.975 4.616 1.705 8.006 3.385 10.144 4.559a47.36 47.36 0 0 1 2.279 1.344c.211.131.349.227.418.272.005.008.011.01.017.014l.025.02 4.009-5.694 10.631-14.622c-1.48-1.102-25.478-17.917-69.827-17.909-44.348-.025-67.525 16.854-69.061 18.08zm15.101 74.112c.823-.553 18.425-12.984 53.958-13.006 18.98.01 33.079 3.569 42.307 6.98 4.61 1.698 8 3.383 10.142 4.562a39.468 39.468 0 0 1 2.276 1.331c.22.143.363.24.426.285.02.014.032.021.035.021l3.926-5.572 10.713-14.732v-.01c-1.483-1.106-25.476-17.917-69.826-17.901-44.349-.031-67.52 16.854-69.059 18.072l15.177 19.914-1.837-2.403 1.762 2.459zM83.805 288.04l13.848 18.179-.497-.645 1.749 2.439.078-.049c1.509-1.021 19.11-12.932 53.886-12.953 18.98 0 33.073 3.559 42.303 6.977 4.612 1.705 8.001 3.375 10.147 4.559a42.462 42.462 0 0 1 2.274 1.334c.212.137.351.234.42.278.005.006.011.008.017.01l.025.023 4.05-5.749 10.59-14.567c-1.487-1.109-25.477-17.921-69.826-17.907-44.356-.022-67.522 16.848-69.064 18.071zm332.361-88.141l4.148-5.884-4.23 5.818-.002.004.084.062zm-110.897-2.628l1.755 2.449.001.004c.821-.554 18.427-12.986 53.963-13.008 18.978 0 33.073 3.563 42.302 6.975 4.61 1.705 8 3.385 10.145 4.559a45.406 45.406 0 0 1 2.273 1.344c.175.102.299.189.377.24l14.723-20.251c-1.48-1.102-25.471-17.917-69.819-17.909-44.356-.023-67.526 16.855-69.069 18.081l15.178 19.911-1.829-2.395zm1.752 56.596c.828-.553 18.426-12.984 53.966-13.006 18.978.01 33.073 3.569 42.299 6.98 4.618 1.698 8.009 3.383 10.15 4.562a42.971 42.971 0 0 1 2.27 1.331c.19.119.32.211.396.26.035.027.059.047.064.047l3.984-5.646 10.656-14.659v-.01c-1.477-1.106-25.471-17.917-69.819-17.901-44.356-.031-67.527 16.854-69.066 18.072l15.177 19.914-1.829-2.394 1.752 2.45zm-15.1 34.173l13.383 17.569 1.718 2.404c.016-.013.043-.028.074-.049 1.513-1.021 19.111-12.932 53.889-12.953 18.98 0 33.071 3.559 42.302 6.977 4.612 1.705 8.002 3.375 10.147 4.559a42.6 42.6 0 0 1 2.275 1.334c.21.137.351.234.416.278a.047.047 0 0 0 .018.01l.027.023 4.049-5.749 10.589-14.567c-1.478-1.109-25.475-17.921-69.823-17.907-44.357-.022-67.522 16.848-69.064 18.071z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book-alt.svg
new file mode 100644
index 0000000000..c959cdea3a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M475.88 151.615c-.583-.961-10.257-17.833-29.675-35.154-19.305-17.239-49.226-35.216-88.641-35.21-39.424-.02-69.047 18.022-87.958 35.329a162.852 162.852 0 0 0-14.814 15.459 167.873 167.873 0 0 0-15.325-15.578c-19.302-17.239-49.225-35.216-88.635-35.21-39.428-.02-69.049 18.022-87.962 35.329-19.041 17.4-28.3 34.322-28.873 35.328l-1.991 7.796v254.56l30.49 7.78.066.039c.423-.818 8.621-14.927 23.664-28.167 15.169-13.298 36.324-25.537 64.605-25.557 29.166.006 51.354 13.121 66.996 26.975a134.425 134.425 0 0 1 17.578 19.031 110.554 110.554 0 0 1 4.313 6.109 52.672 52.672 0 0 1 1.176 1.876l.008.006.006-.002c2.808 4.888 8.066 8.192 14.113 8.192 6.155 0 11.507-3.421 14.271-8.464h.002l.025-.049.008-.014c.617-1.129 8.778-15.029 23.632-28.104 15.169-13.298 36.327-25.537 64.603-25.557 29.178.006 51.36 13.121 67.002 26.975 7.752 6.894 13.677 13.88 17.576 19.031a110.974 110.974 0 0 1 4.312 6.109c.463.707.792 1.241.984 1.562.092.155.163.263.192.314l.004.006.029-.012 30.37-8.081v-254.56l-2.151-8.087zM150.832 335.806h-.062c-38.245 0-67.258 16.996-86.213 33.819V164.279c3.311-5.068 10.654-15.229 21.67-24.919 15.169-13.31 36.324-25.539 64.605-25.559 29.166 0 51.354 13.122 66.996 26.974a134.046 134.046 0 0 1 17.578 19.03 108.111 108.111 0 0 1 3.338 4.655v205.933c-19.321-17.044-48.976-34.587-87.912-34.587zm294.652 34.57c-19.324-17.04-48.99-34.57-87.92-34.57-38.292-.018-67.307 17.006-86.275 33.849V164.289c3.305-5.058 10.639-15.217 21.673-24.929 15.169-13.31 36.327-25.539 64.603-25.559 29.178 0 51.36 13.122 67.002 26.974 7.752 6.891 13.677 13.875 17.576 19.03a110.27 110.27 0 0 1 3.342 4.651v205.92z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book.svg
new file mode 100644
index 0000000000..2516a55f83
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M131.408 46.941c-13.312.072-25.541 3.347-35.395 9.519-4.941 3.13-9.325 7.05-12.638 11.991-3.315 4.905-5.475 11.001-5.459 17.444v328.703c-.016 6.447 2.144 12.545 5.459 17.448 5.006 7.398 12.26 12.545 20.489 16.09 8.101 3.446 17.312 5.331 27.122 5.414l252.696 19.647v-47.736l49.976-2.327V38.513l-302.25 8.428zm149.497 248.431l-104.428-8.117 2.384-30.685 104.428 8.122-2.384 30.68zm46.476-73.339l-180.943-14.494 2.453-30.679 180.944 14.491-2.454 30.682zm78.957 175.029l-22.654 1.053V117.101L132.196 97.538h-.574c-8.726.036-16.434-2.348-21.026-5.3-2.303-1.442-3.794-2.979-4.526-4.091-.739-1.148-.82-1.712-.838-2.252.018-.539.099-1.099.838-2.249 1.067-1.676 3.977-4.256 8.523-6.171 4.516-1.935 10.486-3.227 17.029-3.221h.126l274.59-7.661v330.469z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bookmark.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bookmark.svg
new file mode 100644
index 0000000000..a3268596ac
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bookmark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M345.04 435.097l-90.66-90.661-90.662 90.661V77.014H345.04z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-books.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-books.svg
new file mode 100644
index 0000000000..ddb9162770
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-books.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M127.147 412.812h79.794V136.224h-79.794v276.588zm11.12-244.347h57.554v33.26h-57.554v-33.26zm-94.41 243.56h61.952V99.953H43.857v312.072zm11.3-277.035h35.007v21.146H55.157V134.99zm0 220.824h35.007v21.157H55.157v-21.157zm175.46 54.87h61.951V112.465h-61.951v298.219zm48.971-33.712h-34.974v-21.157h34.974v21.157zm-35.5-193.89h34.993v33.19h-34.993v-33.19zm113.703-84.829l-58.011 21.729L409.33 412.19l58.016-21.778L357.791 98.253zm-27.696 70.406l-7.425-19.814 32.771-12.293 7.422 19.782-32.768 12.325zM407.63 375.4l-7.423-19.783 32.75-12.267 7.441 19.787L407.63 375.4z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box-alt.svg
new file mode 100644
index 0000000000..0189daab6d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M63.31 107.155v82.714h384.963v-82.714H63.31zm26.913 297.632H421.36V213.613H90.223v191.174zm136.135-145.93h58.863c11.677 0 21.159 9.499 21.159 21.203 0 11.691-9.482 21.161-21.159 21.161h-58.863c-11.705 0-21.188-9.47-21.188-21.161 0-11.704 9.483-21.203 21.188-21.203z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box-open.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box-open.svg
new file mode 100644
index 0000000000..b2ec5d8bd3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box-open.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M94.878 295.884v66.927l146.044 84.303V255.742l-78.138 82.084-67.906-41.942zm131.805-51.538l-121.568-70.175-65.962 65.955 120.638 74.495 66.892-70.275zm59.958.233l66.679 70.042 120.636-74.495-65.73-65.742-121.585 70.195zm-15.061 10.508v192.026l146.047-84.303v-66.55l-67.316 41.566-78.731-82.739zm204.957-124.966L357.408 65.06l-81.576 22.565 131.871 74.674 68.834-32.178zM237.163 87.625L155.588 65.06 36.471 130.121l68.804 32.178 131.888-74.674z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box.svg
new file mode 100644
index 0000000000..84fa9ca794
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M161.08 106.29l-70.073 40.452 165.498 95.545 70.076-40.453L161.08 106.29zm259.851 41.077L255.435 51.815l-63.578 36.709 165.499 95.542 63.575-36.699zm-150.11 122.19V459.43l164.966-95.238V174.32l-164.966 95.237zM75.082 364.191l164.959 95.234V268.32L75.082 173.09v191.101z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brackets.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brackets.svg
new file mode 100644
index 0000000000..142eb9f746
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brackets.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M114.799 69.493c-13.651 18.396-20.571 43.054-20.571 73.284v35.185c0 17.099-2.961 25.993-5.457 30.471-6.357 11.45-19.459 18.202-40.051 20.643l-13.271 1.572v51.721l13.429 1.45c20.292 2.192 33.312 9.107 39.804 21.144 3.679 6.82 5.546 16.926 5.546 30.027v44.514c0 33.411 10.512 58.159 31.249 73.556 18.917 14.044 42.837 22.612 71.094 25.469l16.552 1.674v-55.29l-13.275-1.569c-10.512-1.244-20.014-5.533-29.038-13.114-7.625-6.406-11.489-18.501-11.489-35.948v-32.65c0-22.942-3.043-40.929-9.324-55.043-4.47-9.927-11.896-21.096-24.196-29.903 10.425-7.204 18.493-16.933 24.135-29.134 6.314-13.659 9.385-31.972 9.385-55.985v-24.188c0-15.659 1.816-27.705 5.394-35.77 3.739-8.396 11.402-19.785 34.67-21.808l13.738-1.19v-54.8l-16.31 1.385c-40.617 3.433-67.444 14.655-82.014 34.297zm322.528 159.564c-20.487-2.192-33.589-8.987-40.061-20.771-3.592-6.539-5.49-17.021-5.49-30.311v-35.179c0-29.231-5.083-50.976-15.468-66.372-15.87-23.958-45.122-37.833-86.951-41.237l-16.262-1.322v54.748l13.748 1.186c23.558 2.035 31.106 12.761 34.716 20.612 2.437 5.337 5.342 16.078 5.342 36.916v24.172c0 24.158 3.068 42.547 9.396 56.233 4.441 9.561 11.853 20.345 24.191 28.875-10.477 7.475-18.653 17.544-24.266 30.03-6.273 13.932-9.321 31.938-9.321 55.051v32.628c0 15.813-3.694 27.555-10.975 34.889-7.89 7.94-17.621 12.573-29.746 14.16l-13.086 1.715v55.227l16.646-1.786c28.008-3.007 51.77-11.423 70.616-25.013 20.849-15.033 31.419-39.932 31.419-74.004V334.99c0-12.857 1.882-22.917 5.551-29.824 6.614-12.285 19.676-19.266 39.929-21.337l13.512-1.382v-51.952l-13.44-1.438z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brick.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brick.svg
new file mode 100644
index 0000000000..e06862f8aa
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brick.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M75.907 338.368l164.261 94.81V294.264L75.907 199.419v138.949zm307.381-185.91v14.597c0 10.812-20.701 19.574-46.274 19.574-25.541 0-46.256-8.763-46.256-19.574v-24.149h.148c1.552 10.202 21.566 18.284 46.107 18.284 25.573 0 46.274-8.77 46.274-19.544 0-10.825-20.701-19.569-46.274-19.569-2.027 0-4.037.062-5.999.179l-29.776-17.186v18.362c0 10.812-20.684 19.573-46.239 19.573-16.057 0-30.199-3.465-38.507-8.729-1.177-1.208-2.632-2.387-4.382-3.486-2.174-2.269-3.382-4.742-3.382-7.357v-17.77l-28.779 16.61c-2.077-.097-4.168-.196-6.311-.196-25.541 0-46.257 8.744-46.257 19.569 0 10.774 20.716 19.544 46.257 19.544 24.542 0 44.573-8.082 46.125-18.284h.13v24.149c0 10.812-20.684 19.574-46.255 19.574-25.541 0-46.257-8.763-46.257-19.574v-14.401l-35.629 20.538 164.817 95.126 163.736-94.508-37.017-21.352zm-81.674 60.492c0 10.812-20.716 19.559-46.256 19.559-25.557 0-46.273-8.746-46.273-19.559v-24.149h.147c1.554 10.204 21.568 18.299 46.126 18.299 24.543 0 44.556-8.095 46.125-18.299h.131v24.149zm-30.803 82.546V433.21l164.283-94.842v-137.71l-164.283 94.838zm-15.812-177.934c25.556 0 46.239-8.747 46.239-19.553 0-10.795-20.684-19.555-46.239-19.555-25.558 0-46.272 8.76-46.272 19.555 0 10.806 20.714 19.553 46.272 19.553z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-briefcase.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-briefcase.svg
new file mode 100644
index 0000000000..e6e0705ecf
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-briefcase.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M339.22 135.024c0-24.836-20.111-44.945-44.962-44.962h-84.142c-24.824.017-44.965 20.126-44.965 44.962v15.907H129.57v271.493h256.937V150.932H339.22v-15.908zm-30.641 15.908H195.824v-15.907c0-7.9 6.377-14.304 14.292-14.304h84.142c7.912 0 14.321 6.403 14.321 14.304v15.907zm-271 24.172v223.154c0 13.341 10.824 24.166 24.168 24.166h42.872V150.932H61.747c-13.344 0-24.168 10.811-24.168 24.172zm411.944-24.172h-38.098v271.493h38.098c13.343 0 24.167-10.825 24.167-24.166V175.104c0-13.361-10.824-24.172-24.167-24.172z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-browser-window.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-browser-window.svg
new file mode 100644
index 0000000000..8279fb9198
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-browser-window.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M445.564 89.081H66.437c-9.34 0-16.913 7.572-16.913 16.911v316.927h412.951V105.992c.001-9.339-7.57-16.911-16.911-16.911zM143.066 120.65h289.6v31.982h-289.6V120.65zm-45.847-2.823c10.391 0 18.814 8.427 18.814 18.815 0 10.39-8.423 18.814-18.814 18.814-10.395 0-18.816-8.424-18.816-18.814 0-10.388 8.422-18.815 18.816-18.815zM433.37 393.814h-42.053v-51.838H232.138v51.838h-41.742v-53.202h-69.349v53.202H78.631V196.107H433.37v197.707zm-312.323-160.86h270.27v66.74h-270.27z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush-alt-2.svg
new file mode 100644
index 0000000000..3599902e1f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush-alt-2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M446.223 65.853c-12.852-12.917-33.717-12.917-46.567 0L264.858 200.619l-65.732-65.731-46.599 46.583 178.062 178.078 46.567-46.568-65.731-65.761 134.798-134.783c12.885-12.847 12.885-33.727 0-46.584zM52.328 248.789l210.959 210.975 50.065-81.788-177.468-177.469-83.556 48.282z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush-alt.svg
new file mode 100644
index 0000000000..65849ec18e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M62.115 305.511c-28.855 28.858 11.318 75.654 40.193 104.517 28.859 28.84 75.639 69.051 104.498 40.189l55.902-84.863-115.743-115.729-84.85 55.886zM478.641 80.277l-46.6-46.616L317.436 148.28c-41.775 31.75-76.637-.864-87.997 10.495l-69.052 69.035 124.135 124.12 67.332-67.349c11.383-11.38-16.871-50.654 12.819-90.354l113.968-113.95z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush.svg
new file mode 100644
index 0000000000..a5b889c60d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M461.555 66.536l-34.481-21.84-35.714-22.632-164.249 262.515c-22.888-2.958-46.657 6.347-59.807 39.046-29.445 86.248-119.374 83.588-119.374 83.588s128.559 81.945 220.726.224c19.216-17.036 26.892-42.307 22.111-65.723L461.555 66.536zm-206.33 217.035l21.2-33.465 30.423 19.275-21.2 33.469-30.423-19.279z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bug.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bug.svg
new file mode 100644
index 0000000000..9b5b667387
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bug.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M85.065 420.232c-6.507 6.509-6.507 17.054 0 23.56 6.504 6.514 17.056 6.514 23.559.002l33.049-33.042c-5.737-10.21-10.526-21.23-14.25-32.877l-42.358 42.357zm339.124-198.011c6.51-6.501 6.51-17.053 0-23.562-6.502-6.504-17.055-6.504-23.562 0l-29.451 29.452c5.74 10.208 10.526 21.231 14.251 32.879l38.762-38.769zm-305.782 97.213c0-5.818.263-11.562.759-17.226l-46.137-.002c-9.204.002-16.662 7.458-16.662 16.66 0 9.203 7.458 16.664 16.662 16.664h46.046a197.503 197.503 0 0 1-.668-16.096zm8.151-55.715a177.918 177.918 0 0 1 13.86-33.274l-31.786-31.786c-6.51-6.504-17.061-6.504-23.565 0-6.509 6.51-6.509 17.062 0 23.562l41.491 41.498zm257.974 116.854c-3.882 11.521-8.813 22.389-14.676 32.448l30.776 30.772c6.505 6.512 17.056 6.512 23.56-.002 6.507-6.506 6.507-17.051 0-23.56l-39.66-39.658zm51.697-78.367l-42.545.002c.497 5.663.758 11.407.758 17.226 0 5.432-.234 10.8-.666 16.097h42.453c9.203 0 16.662-7.461 16.662-16.664 0-9.203-7.459-16.659-16.662-16.661zM162.407 70.389c27.314.198 39.683 10.33 46.938 21.625 5.964 9.492 7.656 20.515 8.036 27.072-15.226 10.442-26.149 26.689-29.561 45.572h138.623c-3.413-18.886-14.338-35.135-29.564-45.577.376-6.559 2.071-17.583 8.04-27.068 7.246-11.295 19.614-21.425 46.942-21.625a7.233 7.233 0 0 0 0-14.466c-31.162-.202-49.95 13.171-59.234 28.45-5.947 9.627-8.48 19.591-9.55 27.353a70.4 70.4 0 0 0-25.938-4.981 70.43 70.43 0 0 0-25.96 4.986c-1.069-7.761-3.602-17.725-9.549-27.358-9.287-15.281-28.068-28.652-59.223-28.45-4.006 0-7.238 3.238-7.238 7.233s3.232 7.234 7.238 7.234zm-18.253 248.188c0 71.594 44.03 130.722 100.454 138.429V193.879h-37.77c-37.118 22.856-62.684 70.152-62.684 124.698zm14.814 4.98c0-10.557 12.448-19.117 27.805-19.117 15.354 0 27.802 8.561 27.802 19.117s-12.447 19.112-27.802 19.112c-15.357 0-27.805-8.556-27.805-19.112zm54.263 82.629c-7.163 0-12.966-8.796-12.966-19.645 0-10.85 5.803-19.648 12.966-19.648 7.158 0 12.964 8.799 12.964 19.648.001 10.849-5.806 19.645-12.964 19.645zm9.525-132.331c-7.467 7.463-22.32 4.714-33.177-6.146-10.857-10.854-13.61-25.714-6.144-33.176 7.465-7.464 22.318-4.717 33.176 6.141 10.857 10.859 13.611 25.715 6.145 33.181zm84.664-79.976h-37.77v263.127c56.423-7.707 100.459-66.835 100.459-138.429 0-54.546-25.566-101.842-62.689-124.698zm-10.414 46.795c10.859-10.857 25.711-13.604 33.176-6.141 7.469 7.462 4.716 22.322-6.141 33.176-10.861 10.86-25.713 13.609-33.18 6.146-7.465-7.466-4.713-22.322 6.145-33.181zm3.382 165.512c-7.159 0-12.964-8.796-12.964-19.645 0-10.85 5.805-19.648 12.964-19.648 7.16 0 12.964 8.799 12.964 19.648s-5.804 19.645-12.964 19.645zm26.46-63.517c-15.357 0-27.807-8.556-27.807-19.112s12.449-19.117 27.807-19.117c15.355 0 27.804 8.561 27.804 19.117s-12.449 19.112-27.804 19.112z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bulleted-list.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bulleted-list.svg
new file mode 100644
index 0000000000..72bdf63388
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bulleted-list.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M190.111 166.793V83.688h268.258v83.105H190.111zm0 130.998v-83.098H458.37v83.098H190.111zm0 131.005v-83.1h268.261v83.1H190.111zm-51.364-302.849c0 24.033-19.48 43.508-43.509 43.508-24.028 0-43.508-19.476-43.508-43.508 0-24.029 19.48-43.504 43.508-43.504 24.028 0 43.509 19.475 43.509 43.504zM51.73 251.066a43.508 43.508 0 1 1 87.016 0 43.508 43.508 0 1 1-87.016 0zm0 133.898a43.508 43.508 0 1 1 87.016 0 43.508 43.508 0 1 1-87.016 0z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-burn.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-burn.svg
new file mode 100644
index 0000000000..4f6ebe6865
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-burn.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.536 46.393c-115.383.007-208.902 93.535-208.917 208.92.015 115.39 93.534 208.908 208.917 208.922 115.39-.014 208.912-93.532 208.925-208.922-.014-115.385-93.535-208.914-208.925-208.92zm124.712 333.628c-9.127 9.122-19.263 17.203-30.182 24.152l-92.489-147.381-92.056 150.18a177.407 177.407 0 0 1-34.69-26.951c-31.632-31.65-51.235-75.108-51.62-123.305h178.254L171.991 99.955c24.858-13.398 53.282-21.008 83.544-21.012 31.783.004 61.515 8.424 87.238 23.104l-85.114 154.67h174.208c-.384 48.196-19.986 91.654-51.619 123.304z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bus.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bus.svg
new file mode 100644
index 0000000000..95e728138e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M445.692 271.445c0-12.643-.933-33.277-2.044-45.868L432.397 89.521c-1.109-12.575-12.261-24.242-24.787-25.944 0 0-37.313-12.854-151.23-12.854-113.915 0-151.228 12.854-151.228 12.854-12.524 1.702-23.675 13.369-24.802 25.944l-11.2 136.056c-1.146 12.591-2.06 33.226-2.06 45.868V396.12h29.379v31.257c0 18.2 14.766 32.949 32.95 32.949 18.18 0 32.962-14.749 32.962-32.949V396.12H350.4v31.257c0 18.185 14.765 32.949 32.947 32.949 18.215 0 32.963-14.765 32.963-32.949V396.12h29.383V271.445zM208.752 69h95.292c10.301 0 18.69 8.393 18.69 18.706 0 10.333-8.39 18.706-18.69 18.706h-95.292c-10.334 0-18.723-8.373-18.723-18.706 0-10.313 8.389-18.706 18.723-18.706zm-79.333 300.286c-15.077 0-27.309-12.229-27.309-27.308 0-15.088 12.231-27.287 27.309-27.287 15.073 0 27.307 12.199 27.307 27.287 0 15.08-12.234 27.308-27.307 27.308zM108 276.546v-10.42c0-9.908.717-26.094 1.603-35.937l8.795-83.898c.866-9.857 9.71-17.937 19.621-17.937h236.759c9.894 0 18.723 8.079 19.605 17.937l8.813 83.898c.882 9.843 1.585 26.028 1.585 35.937v10.42H108zm275.347 92.74c-15.075 0-27.305-12.229-27.305-27.308 0-15.088 12.229-27.287 27.305-27.287 15.106 0 27.306 12.199 27.306 27.287-.001 15.08-12.2 27.308-27.306 27.308z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calculator.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calculator.svg
new file mode 100644
index 0000000000..3dcce7ec35
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calculator.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M361.403 74.259H151.361c-11.706 0-21.191 9.484-21.191 21.187v321.278c0 11.693 9.485 21.192 21.191 21.192h210.042c11.675 0 21.16-9.499 21.16-20.7V95.921c0-12.178-9.485-21.662-21.16-21.662zM211.436 406.654h-46.112V360.56h46.112v46.094zm0-67.793h-46.112V292.75h46.112v46.111zm69.327 67.793h-46.11V360.56h46.11v46.094zm0-67.793h-46.11V292.75h46.11v46.111zm68.38 67.793h-46.109V360.56h46.109v46.094zm0-67.793h-46.109V292.75h46.109v46.111zm-137.707-69.26h-46.112v-46.11h46.112v46.11zm69.327 0h-46.11v-46.11h46.11v46.11zm68.38 0h-46.109v-46.11h46.109v46.11zm0-86.204H165.324v-75.229h183.819v75.229z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calendar-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calendar-alt.svg
new file mode 100644
index 0000000000..fb485f5a83
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calendar-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M342.391 352.428h-44.879v44.865h44.879v-44.865zm-63.234-120.071h-44.849v44.853h44.849v-44.853zm63.234 60.034h-44.879v44.859h44.879v-44.859zm63.174-60.034h-44.854v44.853h44.854v-44.853zm-126.408 60.034h-44.849v44.859h44.849v-44.859zm63.234-60.034h-44.879v44.853h44.879v-44.853zm63.174 60.034h-44.854v44.859h44.854v-44.859zm-252.803 60.037h-44.856v44.865h44.856v-44.865zm0-60.037h-44.856v44.859h44.856v-44.859zM394.024 74.208v19.691c7.737 6.847 12.642 16.825 12.642 27.969 0 20.634-16.732 37.367-37.369 37.367-20.642 0-37.367-16.733-37.367-37.367 0-11.147 4.903-21.124 12.643-27.969V74.208H169.97v19.691c7.739 6.847 12.643 16.825 12.643 27.969 0 20.634-16.732 37.367-37.369 37.367-20.64 0-37.367-16.733-37.367-37.367 0-11.147 4.904-21.124 12.642-27.969V74.208h-83.27v397.644h436.668V74.208h-79.893zm40.011 357.759H77.131V183.544h356.904v248.423zm-218.047-199.61h-44.881v44.853h44.881v-44.853zm0 120.071h-44.881v44.865h44.881v-44.865zm63.169 0h-44.849v44.865h44.849v-44.865zm-63.169-60.037h-44.881v44.859h44.881v-44.859zM145.245 143.64c10.273 0 18.603-8.326 18.603-18.599V58.035c0-10.267-8.329-18.6-18.603-18.6-10.274 0-18.602 8.333-18.602 18.6v67.006c0 10.272 8.328 18.599 18.602 18.599zm224.054 0c10.272 0 18.601-8.326 18.601-18.599V58.035c0-10.267-8.328-18.6-18.601-18.6-10.274 0-18.604 8.333-18.604 18.6v67.006c0 10.272 8.329 18.599 18.604 18.599z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calendar.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calendar.svg
new file mode 100644
index 0000000000..b405db5525
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calendar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M162.199 402.396h35.836V224.442h-29.206c0 1.554-.45 3.927-1.347 7.119-1.549 5.322-3.839 9.573-6.854 12.763-4.408 4.663-10.124 7.775-17.142 9.328-4.407.984-12.118 1.719-23.138 2.21v23.808h41.85v122.726zm157.586 0h34.241v-38.289h20.127v-27.371h-20.127V225.548h-39.274l-65.414 108v30.56h70.447v38.288zm-44.419-65.66l44.419-76.647v76.647h-44.419zM144.432 143.458c10.271 0 18.603-8.328 18.603-18.602V57.855c0-10.271-8.331-18.602-18.603-18.602-10.275 0-18.602 8.331-18.602 18.602v67.001c0 10.274 8.326 18.602 18.602 18.602zm224.054 0c10.271 0 18.602-8.328 18.602-18.602V57.855c0-10.271-8.33-18.602-18.602-18.602-10.275 0-18.6 8.331-18.6 18.602v67.001c.001 10.274 8.325 18.602 18.6 18.602zm24.724-69.433v19.693c7.742 6.844 12.646 16.823 12.646 27.964 0 20.642-16.734 37.372-37.371 37.372-20.639 0-37.367-16.729-37.367-37.372 0-11.142 4.905-21.12 12.642-27.964V74.025H169.158v19.693c7.738 6.844 12.643 16.823 12.643 27.964 0 20.642-16.731 37.372-37.371 37.372-20.638 0-37.365-16.729-37.365-37.372 0-11.142 4.903-21.12 12.639-27.964V74.025H36.437V471.67h436.669V74.025H393.21zm40.013 357.762H76.315V183.363h356.907v248.424z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-camcorder.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-camcorder.svg
new file mode 100644
index 0000000000..de0b071abb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-camcorder.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M418.877 188.084v-11.695c0-14.844-12.031-26.877-26.875-26.877H164.285c-14.844 0-26.877 12.033-26.877 26.877v159.369c0 14.842 12.033 26.874 26.877 26.874h227.717c14.844 0 26.875-12.032 26.875-26.874V224.621l52.98 34.211V153.87l-52.98 34.214zM35.934 152.476V314.48h36.571l39.869-25.741v-110.52l-39.869-25.743H35.934z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-camera-roll.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-camera-roll.svg
new file mode 100644
index 0000000000..172e0d92b0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-camera-roll.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M39.439 383.234h246.538V155.498H39.439v227.736zm0 53.271c0 13.377 10.826 24.166 24.166 24.166h198.206c13.342 0 24.166-10.789 24.166-24.166v-22.6H39.439v22.6zM261.811 76.689h-50.066V50.395h-98.073V76.69H63.605c-13.34 0-24.166 10.787-24.166 24.165v24.02h246.538v-24.02c0-13.378-10.825-24.166-24.166-24.166zm52.255 52.747v283.95H473.34v-283.95H314.066zm60.94 263.898h-34.009v-33.971h34.009v33.971zm0-209.841h-34.009v-34.047h34.009v34.047zm69.64 209.841h-34.01v-33.971h34.01v33.971zm0-209.841h-34.01v-34.047h34.01v34.047z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-candy.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-candy.svg
new file mode 100644
index 0000000000..1da869963f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-candy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M429.279 129.662c-6.606-3.19-6.379-31.803-11.872-37.311-6.377-6.379-31.623.209-35.155-7.34-10.529-22.646.164-50.117-45.88-4.074-24.952 24.969-22.628 53.481-12.101 74.083-13.997-7.801-30.02-11.673-46.762-11.673-31.885 0-66.222 13.996-93.265 41.025-41.205 41.203-52.029 99.331-29.303 140.027-20.6-10.562-49.151-12.887-74.133 12.084-46.044 46.062-18.574 35.366 4.087 45.882 7.556 3.516.947 28.775 7.358 35.154 5.493 5.509 34.107 5.281 37.281 11.867 11.64 24.004-4.416 47.715 43.755-.453 24.395-24.416 22.726-52.225 12.752-72.716 14.389 8.456 31.033 12.591 48.399 12.591 31.916 0 66.222-13.979 93.264-41.008 41.728-41.756 52.354-100.885 28.386-141.648 20.503 9.976 48.331 11.661 72.728-12.77 48.17-48.168 24.464-32.113.461-43.72zm-132.05 60.858c-37.508 10.969-62.363 35.237-78.584 58.519-16.154 23.22-23.184 45.178-24.428 49.461-.161.556-.161.718-.161.718a12.523 12.523 0 0 1-12.067 9.274c-1.079 0-2.125-.13-3.205-.428-6.641-1.764-10.596-8.58-8.864-15.24.23-.812 6.64-24.916 24.724-52.748 17.988-27.761 48.201-59.628 95.619-73.48 6.607-1.943 13.541 1.865 15.435 8.472 1.963 6.605-1.83 13.523-8.469 15.452z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-caps-lock.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-caps-lock.svg
new file mode 100644
index 0000000000..1a466182c9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-caps-lock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.834 53.049l183.224 196.96H355.25v79.194H154.412v-79.194H71.611l183.223-196.96m0 36.763L129.101 224.969H179.45v79.197h150.763v-79.197H380.568L254.834 89.812zm100.417 275.831v92.211H154.412v-92.211h200.839m-25.038 25.039H179.452v42.133h150.761v-42.133z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-car.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-car.svg
new file mode 100644
index 0000000000..9c72758d41
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-car.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M444.912 251.134c0-13.344-10.824-24.17-24.167-24.17h-11.251l-31.559-100.262-.326-.786c-4.822-11.345-13.031-20.01-22.562-26.421-9.583-6.312-20.715-10.562-33.062-10.663H185.553c-12.329.101-23.479 4.352-33.061 10.663-9.514 6.411-17.724 15.076-22.547 26.421l-.344.803-31.524 100.245h-7.621c-13.341 0-24.167 10.826-24.167 24.17v108.484h22.924v31.085c0 18.214 14.749 32.949 32.948 32.949 18.198 0 32.944-14.735 32.944-32.949v-31.085h199.841v31.085c0 18.183 14.747 32.949 32.948 32.949 18.196 0 32.946-14.767 32.946-32.949v-31.085h24.07V251.134zm-57.016 11.608c15.093 0 27.323 12.215 27.323 27.303 0 15.078-12.23 27.309-27.323 27.309-15.092 0-27.292-12.23-27.292-27.309 0-15.088 12.2-27.303 27.292-27.303zM164.757 139.65c1.275-2.681 4.447-6.411 8.483-9.025 4.333-2.972 9.435-4.46 12.313-4.381h136.432c2.894-.079 8.014 1.41 12.327 4.381 4.058 2.615 7.214 6.345 8.503 9.025l27.455 87.313H137.268l27.489-87.313zm-42.594 177.704c-15.093 0-27.325-12.23-27.325-27.309 0-15.088 12.231-27.303 27.325-27.303 15.076 0 27.29 12.215 27.29 27.303-.001 15.078-12.215 27.309-27.29 27.309z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cash-register.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cash-register.svg
new file mode 100644
index 0000000000..f4f1779b86
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cash-register.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M127.863 107.129h83.079v58.82h-83.079zm286.584 128.655l-38.717-54.88V84.843H234.543v104.709H134.06l-32.617 46.232v75.178h313.005v-75.178zM264.56 115.525h80.488v34.724H264.56v-34.724zm-108.847 168.97c-9.163 0-16.592-7.427-16.592-16.595 0-9.165 7.429-16.592 16.592-16.592 9.167 0 16.597 7.427 16.597 16.592 0 9.168-7.43 16.595-16.597 16.595zm35.141-40.845c-9.163 0-16.592-7.429-16.592-16.594 0-9.164 7.429-16.593 16.592-16.593 9.166 0 16.594 7.429 16.594 16.593 0 9.166-7.427 16.594-16.594 16.594zm31.235 40.845c-9.163 0-16.59-7.427-16.59-16.595 0-9.165 7.427-16.592 16.59-16.592 9.166 0 16.595 7.427 16.595 16.592 0 9.168-7.429 16.595-16.595 16.595zm35.144-40.845c-9.168 0-16.597-7.429-16.597-16.594 0-9.164 7.429-16.593 16.597-16.593 9.163 0 16.592 7.429 16.592 16.593 0 9.166-7.429 16.594-16.592 16.594zm31.235 40.845c-9.166 0-16.596-7.427-16.596-16.595 0-9.165 7.43-16.592 16.596-16.592 9.163 0 16.592 7.427 16.592 16.592 0 9.168-7.429 16.595-16.592 16.595zm35.139-40.845c-9.161 0-16.595-7.429-16.595-16.594 0-9.164 7.434-16.593 16.595-16.593 9.163 0 16.596 7.429 16.596 16.593 0 9.166-7.432 16.594-16.596 16.594zm31.235 40.845c-9.163 0-16.595-7.427-16.595-16.595 0-9.165 7.432-16.592 16.595-16.592 9.165 0 16.595 7.427 16.595 16.592 0 9.168-7.43 16.595-16.595 16.595zM74.21 340.251h363.578v78.5H74.21z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-categories.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-categories.svg
new file mode 100644
index 0000000000..2bd633a8f1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-categories.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M424.213 254.91a12.017 12.017 0 0 0-.209-2.057c-.025-.129-.059-.256-.09-.385-.059-.25-.102-.5-.174-.746L373.297 82.35a11.833 11.833 0 0 0-11.346-8.457H150.047a11.836 11.836 0 0 0-11.346 8.457L88.26 251.723c-.074.246-.117.496-.176.746-.031.129-.064.256-.09.385a11.82 11.82 0 0 0-.209 2.057c0 .064-.018.125-.018.191V426.27c0 6.535 5.299 11.838 11.838 11.838h312.787c6.539 0 11.838-5.303 11.838-11.838V255.102c.001-.067-.017-.127-.017-.192zM158.875 97.57h194.248l43.389 145.689H115.487L158.875 97.57zm14.405 50.961h165.439v29.455H173.28zm12.029-39.119H326.69v18.939H185.309zm-27.373 88.492h196.127v33.816H157.936z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-certificate.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-certificate.svg
new file mode 100644
index 0000000000..e3e16b5054
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-certificate.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M136.612 143.224h248.926v29.107H136.612zm45.09 52.62H340.45v29.106H181.702zm-74.515 70.659h174.85v86.89h-174.85zm214.647 43.446a45.704 45.704 0 1 1 91.408 0 45.704 45.704 0 1 1-91.408 0zM49.522 82.987v342.25h270.127v-23.679H73.202V106.666h365.596v294.892h-23.369v23.679h47.049V82.987zm293.805 289.999v61.074l24.211-11.566 24.211 11.566v-61.074c-7.521 2.898-15.68 4.505-24.211 4.505s-16.691-1.607-24.211-4.505z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chart-curve.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chart-curve.svg
new file mode 100644
index 0000000000..219d05a1f8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chart-curve.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M157.117 441.285h51.141V259.654l-51.141 51.176v130.455zm-70.311-60.136v60.136h51.146V329.99l-35.319 35.33-15.827 15.829zm140.616 60.103h51.146V300.854l-51.146-51.146v191.544zm70.312-134.43v134.463h51.143V255.661l-40.093 40.123-11.05 11.038zm70.34 134.463h51.111V185.353L368.074 236.5v204.785zM347.73 81.363l33.915 33.941.197.198-90.683 90.714-68.35-68.33L48.807 311.91l36.17 36.143 137.834-137.846 68.35 68.33L418.008 151.67l33.75 33.748 11.018-115.043L347.73 81.363z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chart.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chart.svg
new file mode 100644
index 0000000000..72c6534c38
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chart.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M176.104 193.544c7.332 0 14.13-2.278 19.737-6.149l56.162 33.617c-.075.933-.14 1.865-.14 2.818 0 19.226 15.588 34.812 34.814 34.812s34.812-15.586 34.812-34.812c0-4.352-.837-8.494-2.289-12.336l65.131-69.887 38.255 33.073 23.125-123.154-118.525 40.68 33.846 29.259-64.329 69.032a34.766 34.766 0 0 0-10.025-1.48c-6.961 0-13.431 2.065-18.872 5.584l-56.976-34.104c.029-.59.088-1.168.088-1.765 0-19.226-15.585-34.812-34.814-34.812-19.225 0-34.811 15.585-34.811 34.812 0 3.328.496 6.535 1.366 9.582l-46.381 42.625v41.801l67.073-61.637a34.69 34.69 0 0 0 12.753 2.441zm0 124.946c9.608 0 18.305-3.894 24.605-10.186l100.027 37.271c1.762 17.577 16.597 31.301 34.633 31.301 19.229 0 34.814-15.591 34.814-34.817 0-4.702-.943-9.183-2.634-13.273l58.639-66.622 22.638 17.463 10.931-83.692-78.181 31.809 20.195 15.584-57.349 65.15c-2.893-.778-5.915-1.23-9.054-1.23-9.242 0-17.619 3.625-23.852 9.502l-100.929-37.605c-2.225-17.083-16.794-30.282-34.485-30.282-19.225 0-34.811 15.585-34.811 34.812 0 .961.063 1.907.144 2.847L96.277 314.31v36.145l60.987-37.528c5.436 3.505 11.892 5.563 18.84 5.563zM72.282 438.257v-.39h-1.044V42.352h-29.73V469.03h426.675v-30.773H72.282z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chat-active.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chat-active.svg
new file mode 100644
index 0000000000..b899dfc3fe
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chat-active.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M258.809 69.162C138.25 66.784 39.013 141.076 37.163 235.09c-.645 32.685 10.575 63.449 30.542 89.779h-.006c34.338 44.114-3.139 119.951-3.139 119.951l110.65-47.653c23.839 7.533 49.743 11.921 76.89 12.456 120.557 2.375 219.793-71.911 221.644-165.929 1.854-94.015-94.377-172.155-214.935-174.532zm-96.684 197.266c-14.852 0-26.891-12.041-26.891-26.891 0-14.851 12.039-26.893 26.891-26.893s26.893 12.042 26.893 26.893c0 14.85-12.041 26.891-26.893 26.891zm89.638 0c-14.853 0-26.891-12.041-26.891-26.891 0-14.851 12.039-26.893 26.891-26.893s26.892 12.042 26.892 26.893c-.001 14.85-12.04 26.891-26.892 26.891zm89.637 0c-14.854 0-26.893-12.041-26.893-26.891 0-14.851 12.039-26.893 26.893-26.893 14.852 0 26.891 12.042 26.891 26.893 0 14.85-12.039 26.891-26.891 26.891z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chat.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chat.svg
new file mode 100644
index 0000000000..21abb255ef
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M257.047 69.154c-120.559-2.372-219.795 71.915-221.646 165.93-.644 32.686 10.574 63.443 30.541 89.777h-.004c34.338 44.117-3.14 119.956-3.14 119.956l110.649-47.655c23.838 7.533 49.743 11.921 76.888 12.456 120.56 2.376 219.795-71.915 221.647-165.929 1.853-94.017-94.377-172.158-214.935-174.535z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-check.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-check.svg
new file mode 100644
index 0000000000..5bd7161118
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M461.884 68.14c-132.601 81.297-228.817 183.87-272.048 235.345l-105.874-82.95-46.751 37.691 182.941 186.049c31.485-80.646 131.198-238.264 252.956-350.252L461.884 68.14z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-dotted-active.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-dotted-active.svg
new file mode 100644
index 0000000000..f717f8063b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-dotted-active.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M458.696 56.234c-117.413 71.99-202.609 162.818-240.893 208.393l-93.746-73.448-41.401 33.374 161.993 164.745c27.878-71.409 116.176-210.979 223.989-310.144l-9.942-22.92zM66.423 390.715H41.388c.007 35.213 28.536 63.739 63.746 63.755v-25.045c-21.37-.034-38.674-17.338-38.711-38.71zm-.001-137.23H41.384v51.229h25.039v-51.229zm-25.038-86.1h25.045c.034-21.383 17.334-38.686 38.708-38.72v-25.034c-35.215.004-63.747 28.534-63.753 63.754zm25.038 154.408H41.387v51.232h25.036v-51.232zm.007-135.201H41.384v51.234h25.045v-51.234zm327.318 22.633a1251.325 1251.325 0 0 0-22.208 28.602h22.208v-28.602zm-83.682-84.221v-21.375h-51.227v25.036h46.974a1437.7 1437.7 0 0 1 4.253-3.661zM123.644 455.279h51.236v-25.041h-51.236v25.041zm245.072-82.254h25.033v-51.232h-25.033v51.232zm-39.427 56.396v25.049c35.217-.012 63.738-28.542 63.744-63.755h-25.034c-.044 21.382-17.334 38.67-38.71 38.706zm39.423-175.936v51.229h25.037v-51.229h-25.037zm-245.067-124.82h51.235v-25.036h-51.235v25.036zm68.3 0h51.233v-25.036h-51.233v25.036zm.003 326.614h51.226v-25.041h-51.226v25.041zm66.885 0h51.237v-25.041h-51.237v25.041z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-dotted.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-dotted.svg
new file mode 100644
index 0000000000..cf650c0085
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-dotted.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M78.958 143.113c.006-35.215 28.54-63.748 63.751-63.754V104.4c-21.378.035-38.674 17.332-38.714 38.713h.007-25.044zm0 70.448v-51.232h25.036v51.232H78.958zm-.002 66.888v-51.232h25.039v51.232H78.956zm.003 68.307v-51.231h25.035v51.231H78.959zm327.325-135.195v-51.232h25.04v51.232h-25.04zm0 66.888v-51.232h25.038v51.232h-25.038zm.003 68.307v-51.231h25.033v51.231h-25.033zm-109.882 82.262v-25.045h51.233v25.045h-51.233zm-66.888 0v-25.045h51.233v25.045h-51.233zm-68.299 0v-25.045h51.233v25.045h-51.233zm135.187-326.623V79.357h51.237v25.038h-51.237zm-66.888 0V79.357h51.23v25.038h-51.23zm-68.304 0V79.357h51.235v25.038h-51.235zM78.956 366.45h25.042c.036 21.369 17.337 38.669 38.71 38.705v25.039c-35.214-.004-63.745-28.534-63.752-63.744zm287.905 38.707c21.373-.034 38.668-17.33 38.71-38.705h25.035c-.008 35.208-28.53 63.738-63.745 63.746v-25.041zm38.708-262.044c-.04-21.371-17.339-38.678-38.708-38.713V79.359c35.214.006 63.737 28.539 63.745 63.754h-25.037z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-empty.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-empty.svg
new file mode 100644
index 0000000000..9a3edf8a28
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-empty.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M372.426 82.107c27.657 0 50.078 22.42 50.078 50.076v246.175c0 27.653-22.421 50.075-50.078 50.075H138.66c-27.655 0-50.076-22.422-50.076-50.075V132.184c0-27.656 22.421-50.076 50.076-50.076h233.766m0 25.038H138.66c-13.806 0-25.039 11.231-25.039 25.038v246.175c0 13.803 11.233 25.038 25.039 25.038h233.766c13.806 0 25.04-11.235 25.04-25.038V132.184c0-13.807-11.235-25.038-25.04-25.038z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox.svg
new file mode 100644
index 0000000000..748b269cd2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M458.229 58.295c-117.414 71.987-202.611 162.818-240.894 208.393l-93.748-73.448-41.397 33.372 161.993 164.745c27.879-71.411 116.173-210.977 223.986-310.143l-9.94-22.919zm-106.51 208.016v137.147c0 13.808-11.232 25.04-25.039 25.04H92.917c-13.807 0-25.04-11.232-25.04-25.04V157.287c0-13.805 11.233-25.039 25.04-25.039h210.66a1211.365 1211.365 0 0 1 29.306-24.617c-2.035-.25-4.097-.421-6.203-.421H92.917c-27.66 0-50.08 22.419-50.08 50.077v246.171c0 27.659 22.42 50.081 50.08 50.081H326.68c27.658 0 50.08-22.422 50.08-50.081V232.399a1248.858 1248.858 0 0 0-25.041 33.912z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chess.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chess.svg
new file mode 100644
index 0000000000..8cb5685672
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chess.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M357.312 428.658V384.22H170.144v44.438H143.56v46.436h240.325v-46.436h-26.573zM127.749 157.904c-.133.216.047.18.472-.063-.114-.311-.262-.311-.472.063zm51.143 50.328c13.23-11.429 13.458-12.23 25.916-18.377 4.743-2.324 18.935 3.845 18.935 3.845s21.42 4.463 31.477 4.463c4.365 0 8.223-1.897 11.199-4.041-15.532 15.241-55.494 56.379-68.231 87.902-12.118 30.002-10.659 61.414-9.272 74.758h156.282c-1.816-12.067-2.73-40.896 15.697-88.166 25.163-64.586 23.479-125.801-17.612-179.481-20.256-26.46-47.842-33.746-70.616-34.354-16.223-16.451-48.777-17.957-48.777-17.957l7.227 27.834.605 11.052-28.501 11.738s-10.071 2.521-10.071 11.757c0 8.604-58.846 55.282-64.93 58.636.767 2.34-1.324 22.022-1.324 29.415 0 8.404 8.207 13.115 8.207 13.115l10.091 5.835c0-.001 21.109 12.899 33.698 2.026z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chip-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chip-alt.svg
new file mode 100644
index 0000000000..5d459f13b1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chip-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M352.328 160.154H160.451v191.861h191.877V160.154zm83.863-120.877H76.586c-20.437 0-37.016 16.562-37.016 37.014v359.586c0 20.439 16.579 37.021 37.016 37.021h359.605c20.455 0 37.02-16.582 37.02-37.021V76.292c0-20.453-16.565-37.015-37.02-37.015zM329.158 70.831h32.424v42.824h-32.424V70.831zm-59.303 0h32.406v42.839h-32.406V70.831zm-59.337 0h32.407v42.824h-32.407V70.831zm-59.339 0h32.442v42.824h-32.442V70.831zm-37.213 290.44H71.16v-32.406h42.806v32.406zm0-59.321H71.16v-32.409h42.806v32.409zm0-59.32H71.16v-32.421h42.806v32.421zm0-59.323H71.16v-32.42h42.806v32.42zm69.655 258.018h-32.442V398.52h32.442v42.805zm59.304 0h-32.407V398.52h32.407v42.805zm59.337 0h-32.406V398.52h32.406v42.805zm59.32 0h-32.424V398.52h32.424v42.805zm19.065-60.97H132.115V131.838h248.532v248.517zm60.989-19.065H398.83v-32.425h42.806v32.425zm0-59.34H398.83v-32.409h42.806v32.409zm0-59.32H398.83v-32.406h42.806v32.406zm0-59.323H398.83v-32.42h42.806v32.42z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chip.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chip.svg
new file mode 100644
index 0000000000..0d622b2506
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chip.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M38.744 361.163h49.97v-32.422h-49.97v32.422zm0-118.64h49.97v-32.442h-49.97v32.442zm0 59.323h49.97v-32.411h-49.97v32.411zm0-118.676h49.97v-32.397h-49.97v32.397zm435.289 145.571h-69.112v-26.896h69.112v-32.411h-69.112v-26.943h69.112v-32.41h-69.112v-26.897h69.098v-60.289h-32.391l-.017 27.863h-36.69v-18.457c0-14.062-11.38-25.459-25.442-25.459H132.14c-14.062 0-25.458 11.396-25.458 25.459v247.34c0 14.062 11.396 25.442 25.458 25.442h247.339c14.062 0 25.442-11.38 25.442-25.442v-18.479h36.69v24.266h32.422v-56.687zm-104.447 40.991H142.034V142.178h227.552v227.554zM344.668 167.13H166.967v177.649h177.701V167.13z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cinema.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cinema.svg
new file mode 100644
index 0000000000..f3bc729bf1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cinema.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M37.992 63.644v383.329h436.402V63.644H37.992zM79.65 244.209c146.979-16.055 157.588-132.643 157.588-132.643v-21.22h37.937v21.221s10.319 113.693 152.114 132c-59.682 13.412-62.119 135.697-61.236 176.709h-227.57c.88-40.458-1.504-159.912-58.833-176.067z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circle-dotted-active.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circle-dotted-active.svg
new file mode 100644
index 0000000000..f9c60410cb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circle-dotted-active.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M345.851 111.718a185.398 185.398 0 0 0-45.732-26.639l-8.881 21.952a161.694 161.694 0 0 1 39.896 23.238l14.717-18.551zm-216.747 19.774l-14.965-18.351a184.22 184.22 0 0 0-35.789 39.006l19.562 13.341a160.683 160.683 0 0 1 31.192-33.996zm-44.259 56.992L63.372 178.5a185.043 185.043 0 0 0-15.236 50.696l23.42 3.498a161.33 161.33 0 0 1 13.289-44.21zm94.518-84.714a164.283 164.283 0 0 1 14.497-4.16l-5.479-23.037a188.208 188.208 0 0 0-16.596 4.763 186.74 186.74 0 0 0-32.633 14.643l11.736 20.567a162.505 162.505 0 0 1 28.475-12.776zM69.821 259.063l-23.676.406c.303 17.68 3.168 35.262 8.516 52.258l22.586-7.105c-4.662-14.827-7.162-30.155-7.426-45.559zM265.997 99.148l5.182-23.105a184.193 184.193 0 0 0-52.809-4.034l1.621 23.623a160.727 160.727 0 0 1 46.006 3.516zm69.326 279.882l15.355 18.022a184.426 184.426 0 0 0 34.947-39.76l-19.841-12.926a160.8 160.8 0 0 1-30.461 34.664zm-52.892 29.912a166.045 166.045 0 0 1-11.164 3.336l5.961 22.915a188.63 188.63 0 0 0 12.779-3.815 185.84 185.84 0 0 0 36.031-16.631l-12.174-20.309a161.899 161.899 0 0 1-31.433 14.504zm-216.368-69.14a183.557 183.557 0 0 0 30.424 43.345l17.216-16.257A159.987 159.987 0 0 1 87.2 329.134l-21.137 10.668zm331.955-139.889a1012.11 1012.11 0 0 0-11.622 14.552c3.168 11.715 5.021 23.699 5.488 35.756l23.66-.915c-.68-17.655-3.918-35.169-9.623-52.062l-7.903 2.669zm-19.652 121.191l21.678 9.526a184.84 184.84 0 0 0 14.157-51.011l-23.488-2.996a161.26 161.26 0 0 1-12.347 44.481zm-259.318 82.299a185.601 185.601 0 0 0 46.285 25.668l8.415-22.135a161.946 161.946 0 0 1-40.38-22.392l-14.32 18.859zm80.101 10.878l-4.689 23.211a184.408 184.408 0 0 0 36.416 3.645c5.477 0 11.019-.249 16.473-.74l-2.128-23.584a160.829 160.829 0 0 1-46.072-2.532zM456.454 70.863c-111.037 68.079-191.607 153.974-227.811 197.074l-88.654-69.46-39.152 31.562 153.193 155.8c26.365-67.535 109.865-199.522 211.824-293.302l-9.4-21.674z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circle-dotted.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circle-dotted.svg
new file mode 100644
index 0000000000..9cd9fd9252
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circle-dotted.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.981 440.734c-4.422 0-8.895-.159-13.293-.471l1.682-23.62c15.395 1.095 31.076-.014 46.053-3.277l5.039 23.137a185.943 185.943 0 0 1-39.481 4.231zm-43.253-5.094a183.61 183.61 0 0 1-49.174-19.657l11.864-20.49a159.927 159.927 0 0 0 42.833 17.123l-5.523 23.024zm111.734-8.02l-8.781-21.991a160.553 160.553 0 0 0 39.949-23.097l14.666 18.593a184.376 184.376 0 0 1-45.834 26.495zm-185.815-28.926a185.575 185.575 0 0 1-35.652-39.114l19.596-13.293a161.956 161.956 0 0 0 31.105 34.125l-15.049 18.282zm253.834-18.216l-17.492-15.96a161.321 161.321 0 0 0 25.924-38.192l21.297 10.353a184.986 184.986 0 0 1-29.729 43.799zM88.097 333.183a183.381 183.381 0 0 1-14.977-50.791l23.438-3.355a159.869 159.869 0 0 0 13.047 44.243l-21.508 9.903zm345.082-24.798l-22.711-6.705c4.355-14.761 6.566-30.131 6.566-45.679h23.678c0 17.818-2.533 35.444-7.533 52.384zM94.96 252.634l-23.672-.483c.365-17.809 3.266-35.378 8.625-52.224l22.566 7.181c-4.671 14.677-7.203 29.996-7.519 45.526zm320.881-16.346a159.854 159.854 0 0 0-12.115-44.503l21.713-9.45a183.696 183.696 0 0 1 13.908 51.088l-23.506 2.865zM112.546 182.67l-21.072-10.798a184.915 184.915 0 0 1 30.633-43.168l17.154 16.319a161.599 161.599 0 0 0-26.715 37.647zm278.68-14.155a161.801 161.801 0 0 0-30.389-34.763l15.426-17.966a185.512 185.512 0 0 1 34.832 39.846l-19.869 12.883zm-232.239-41.101l-14.273-18.894a184.318 184.318 0 0 1 46.375-25.533l8.322 22.169a160.705 160.705 0 0 0-40.424 22.258zm180.444-9.19a160.053 160.053 0 0 0-42.466-18.02l6.009-22.903a183.633 183.633 0 0 1 48.748 20.684l-12.291 20.239zM224.825 97.956l-4.553-23.239a186.147 186.147 0 0 1 35.705-3.45h.004c5.711 0 11.473.266 17.129.786l-2.174 23.58c-15.306-1.414-31.072-.624-46.111 2.323z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circuits.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circuits.svg
new file mode 100644
index 0000000000..4feb78fa69
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circuits.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M228.807 384.157c0-9.911-8.061-17.972-17.971-17.972s-17.971 8.061-17.971 17.972c0 9.906 8.061 17.971 17.971 17.971s17.971-8.065 17.971-17.971zm165.75 0c0-9.911-8.062-17.972-17.971-17.972-9.91 0-17.971 8.061-17.971 17.972 0 9.906 8.061 17.971 17.971 17.971 9.908 0 17.971-8.065 17.971-17.971zm-60.371-202.066c0 9.906 8.062 17.97 17.973 17.97 9.908 0 17.971-8.063 17.971-17.97 0-9.911-8.062-17.972-17.971-17.972-9.911 0-17.973 8.061-17.973 17.972zm-24.131-57.829l30.404 30.406a29.68 29.68 0 0 1 11.699-2.389c13.062 0 24.139 8.418 28.166 20.113h77.225V88.859c0-19.003-15.41-34.408-34.408-34.408H310.055v69.811zM195.01 243.861c0-9.908-8.061-17.973-17.971-17.973-9.908 0-17.971 8.064-17.971 17.973 0 9.91 8.062 17.971 17.971 17.971 9.91 0 17.971-8.061 17.971-17.971zm102.685 0c0-9.908-8.062-17.973-17.971-17.973s-17.971 8.064-17.971 17.973c0 9.91 8.062 17.971 17.971 17.971s17.971-8.061 17.971-17.971zm-20.83 89.167c0 9.907 8.062 17.968 17.971 17.968 9.91 0 17.973-8.061 17.973-17.968 0-9.91-8.062-17.971-17.973-17.971-9.908.001-17.971 8.061-17.971 17.971zm66.184-27.63l-19.543 19.541a29.685 29.685 0 0 1 1.141 8.089c0 16.464-13.346 29.809-29.811 29.809-16.463 0-29.809-13.345-29.809-29.809s13.346-29.81 29.809-29.81c2.809 0 5.516.414 8.09 1.141l28.064-28.066h126.559v-74.791h-82.797c-5.465 6.355-13.551 10.397-22.594 10.397-16.465 0-29.811-13.345-29.811-29.809 0-1.382.127-2.733.309-4.066l-41.707-41.706V54.451h-56.422v104.653l54.959 54.958c.08 0 .158-.012.238-.012 16.465 0 29.811 13.347 29.811 29.811 0 16.466-13.346 29.811-29.811 29.811-.666 0-1.316-.056-1.973-.101l-61.637 61.638h-65.469c-5.104 9.1-14.826 15.257-26.002 15.257-16.465 0-29.811-13.347-29.811-29.811 0-16.466 13.346-29.811 29.811-29.811 11.176 0 20.898 6.157 26.002 15.259h53.412l48.992-48.992a29.622 29.622 0 0 1-3.137-13.25c0-5.25 1.369-10.175 3.75-14.459l-58.242-58.241V54.451h-49.047v141.115l20.354 20.355c3.217-1.19 6.682-1.871 10.311-1.871 16.465 0 29.812 13.347 29.812 29.811 0 16.466-13.348 29.811-29.812 29.811-16.463 0-29.811-13.345-29.811-29.811 0-1.957.201-3.863.562-5.718l-30.523-30.521V54.451H88.859c-19 0-34.41 15.405-34.41 34.408v334.276c0 19.004 15.41 34.413 34.41 34.413h107.422v-47.39c-9.1-5.101-15.256-14.828-15.256-26.002 0-16.463 13.348-29.81 29.811-29.81 16.465 0 29.811 13.347 29.811 29.81 0 11.174-6.158 20.901-15.258 26.004v47.388h136.646V410.16c-9.1-5.103-15.26-14.83-15.26-26.004 0-16.463 13.348-29.81 29.811-29.81 16.465 0 29.811 13.347 29.811 29.81 0 11.174-6.158 20.901-15.256 26.004v47.388h32c18.998 0 34.408-15.409 34.408-34.413V305.398h-114.5zm-236.377 15.257c0 9.91 8.062 17.973 17.973 17.973 9.908 0 17.969-8.062 17.969-17.973 0-9.908-8.061-17.971-17.969-17.971-9.911.001-17.973 8.063-17.973 17.971z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circus.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circus.svg
new file mode 100644
index 0000000000..ff712b18ed
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M478.285 233.765L255.523 38.441 32.776 233.765h-.016v.038c.016 20.602 16.709 37.278 37.31 37.278 20.62 0 37.299-16.677 37.33-37.278 0 20.602 16.711 37.278 37.312 37.278 17.513 0 32.179-12.067 36.168-28.354 4.023 16.286 18.673 28.354 36.201 28.354 20.602 0 37.314-16.677 37.314-37.278.015 20.602 16.708 37.278 37.309 37.278 20.621 0 37.314-16.677 37.314-37.278.017 20.602 16.742 37.278 37.314 37.278 20.616 0 37.312-16.677 37.312-37.278.033 20.602 16.743 37.278 37.331 37.278 20.617 0 37.326-16.677 37.326-37.278v-.038h-.016zm-74.639 49.806c-10.399 7.815-23.317 12.463-37.312 12.463-13.982 0-26.915-4.647-37.314-12.463-10.398 7.815-23.315 12.463-37.314 12.463-13.977 0-26.908-4.647-37.309-12.463-10.401 7.815-23.319 12.463-37.314 12.463a62.252 62.252 0 0 1-36.201-11.581 62.111 62.111 0 0 1-36.168 11.581c-13.996 0-26.911-4.647-37.312-12.463-10.415 7.815-23.348 12.463-37.33 12.463a58.51 58.51 0 0 1-7.258-.46V441.18c0 15.742 60.662 28.986 142.972 32.863 38.391-25.096 49.739-162.546 49.739-162.546s11.365 137.45 49.738 162.546c82.328-3.877 142.988-17.121 142.988-32.863V295.574c-2.387.297-4.805.46-7.273.46-13.983 0-26.901-4.647-37.332-12.463z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-client.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-client.svg
new file mode 100644
index 0000000000..23e23117e9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-client.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M471.908 396.417c-7.228-20.956-31.161-23.962-51.154-32.396-21.954-9.257-46.297-20.002-68.201-28.99-6.25-1.701-12.505-3.407-18.754-5.115-7.463-5.136-14.77-22.2-18.759-30.686-3.978-.567-7.952-1.138-11.938-1.703.616-13.129 8.742-13.834 11.938-23.866 2.812-8.849.292-20.349 4.752-28.538 3.096-5.687 10.096-5.729 13.59-10.604 3.175-4.426 5.263-12.141 6.251-17.561 1.805-9.903 3.379-23.461-1.325-33.283-2.704-5.646-4.411-6.186-5.164-13.04-.914-8.304 2.449-35.386 2.587-41.243.344-15.193-.024-16.424-3.701-31.223 0 0-4.466-13.41-11.465-17.447l-13.951-2.402-8.621-7.99c-34.745-21.378-71.992-6.381-91.941 1.703-28.745 9.327-46.923 37.477-34.231 97.611 2.166 10.271-5.624 14.861-5.118 20.465 1.116 12.259 1.351 41.721 12.933 48.98 1.076.672 9.291 2.729 9.237 2.168 1.139 11.934 2.274 23.877 3.409 35.809 2.892 7.932 9.829 8.803 11.844 20.006l-8.876 2.158c-3.99 8.485-11.298 25.55-18.76 30.686a20223.93 20223.93 0 0 1-18.752 5.115c-21.906 8.988-46.25 19.733-68.204 28.99-19.991 8.434-43.924 11.439-51.152 32.396 0 14.231-1.341 47.849-.973 66.497h191.138l14.034-95.841-11.665-24.621 26.93-12.913 22.684 12.646-12.505 25.35 22.112 95.379h182.749c.362-18.648-.978-52.266-.978-66.497z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-clothes-hanger.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-clothes-hanger.svg
new file mode 100644
index 0000000000..f17c449cb0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-clothes-hanger.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M456.41 348.808L283.254 237.822c-.653-.428-1.343-.817-2.027-1.209v-9.911c32.178-10.71 55.363-41.041 55.363-76.85 0-44.716-36.201-80.934-80.938-80.949-44.734.016-80.967 36.233-80.967 80.949h51.145c.033-16.446 13.344-29.776 29.822-29.823 16.449.047 29.762 13.377 29.825 29.823-.063 16.45-13.376 29.795-29.825 29.826-6.736 0-13.339 2.73-18.081 7.489-4.776 4.758-7.491 11.348-7.491 18.082v31.364c-.686.392-1.371.782-2.028 1.209L54.898 348.808c-19.131 12.233-27.863 35.648-21.484 57.429 6.408 21.778 26.391 36.787 49.084 36.787h346.314c22.691 0 42.674-15.009 49.051-36.787 6.408-21.781-2.357-45.196-21.453-57.429zM82.498 391.844l173.154-110.971 173.16 110.971H82.498z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud-drive.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud-drive.svg
new file mode 100644
index 0000000000..df5fcf03d7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud-drive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M73.304 302.953H49.622v128.312H462.378V302.953H73.304zM438.7 407.584H73.304v-80.952H438.7v80.952zm-46.465-21.703c10.307 0 18.664-8.356 18.664-18.661 0-10.304-8.357-18.66-18.664-18.66-10.303 0-18.658 8.356-18.658 18.66s8.356 18.661 18.658 18.661zM214.55 352.596h23.676v31.968H214.55zm-115.811-.005h23.682v31.973H98.739zm57.899.005h23.688v31.962h-23.688zm-16.336-247.571h7.709v-24.29H123.72l-4.617 11.817-3.797 9.236 22.627 8.847zm307.16 129.85l-22.199 8.676-8.677-22.201 22.199-8.675zm-74.266-124.539l22.198-8.677-8.176-20.924h-23.836v23.837h7.56zm56.913 80.118l-22.201 8.676-8.677-22.204 22.201-8.676zm-39.555-35.717l22.199-8.682-4.963-12.693c-.002-.006-.006-.01-.008-.019l-.004-.01a.157.157 0 0 0-.01-.027l-.002-.005c-.002-.004-.006-.014-.01-.019l-.004-.02a2.658 2.658 0 0 1-.047-.114l-.006-.009c-.016-.043-.029-.084-.047-.126h-.002c-.006-.019-.016-.041-.021-.064h-.002l-.021-.057-.004-.013c-1.869-4.776-3.527-9.022-3.527-9.022l-22.201 8.675 8.68 22.205zm71.806 118.396l-.002-.006c-.006-.009-.01-.027-.016-.04l-.006-.015v-.004c-.004-.009-.008-.024-.014-.037-.002-.006-.004-.006-.008-.01 0-.006-.002-.009-.004-.009l-.002-.006v-.004l-.012-.032h-.002l-.625-1.6-5.525-14.314-22.623 8.847 4.48 11.631.088.228v2.956h24.287v-7.538c.002 0-.006-.019-.016-.047zM73.218 212.652l22.201 8.674-8.674 22.2-22.201-8.674zm17.342-44.399l22.2 8.682-8.682 22.201-22.201-8.682zm39.566-35.72l-22.199-8.675-3.529 9.022-.004.013-.021.057c-.01.023-.016.046-.025.064-.018.042-.033.083-.049.126l-.004.009c-.014.041-.029.078-.043.114l-.008.02a.365.365 0 0 1-.008.019l-.002.005c-.006.004-.006.019-.012.027l-.004.01-.008.019-4.963 12.693 22.203 8.682 8.676-22.205zM73.911 277.762l.088-.228 4.48-11.631-22.625-8.847-5.527 14.314-.623 1.6-.014.032v.004l-.002.006c-.002 0-.002.003-.006.009l-.004.01a.367.367 0 0 1-.014.037v.004c-.002.006-.006.006-.006.015h-.002c-.004.013-.012.031-.016.04l-.002.006c-.012.028-.018.047-.018.047v7.538h24.289v-2.956zM315.54 80.735h23.836v23.837H315.54zm-47.844 0h23.838v23.837h-23.838zm-47.84 0h23.838v23.837h-23.838zm-47.841 0h23.836v23.837h-23.836z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud-upload.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud-upload.svg
new file mode 100644
index 0000000000..41e015fa89
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud-upload.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M414.463 235.98a103.586 103.586 0 0 0 3.355-26.203c0-57.107-46.295-103.4-103.402-103.4-42.938 0-79.759 26.176-95.389 63.438-13.426-15.776-33.414-25.797-55.753-25.797-40.424 0-73.195 32.768-73.195 73.193 0 6.951.99 13.667 2.802 20.035-33.012 12.104-56.539 43.797-56.539 81.025 0 47.611 38.579 86.268 86.244 86.268h112.549v-72.691h-46.469l71.231-86.309 71.23 86.309h-46.472v72.691h103.829c47.689 0 86.269-38.656 86.269-86.268 0-38.613-25.32-71.276-60.29-82.291z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud.svg
new file mode 100644
index 0000000000..10a95d9562
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M413.692 236.421a103.48 103.48 0 0 0 3.359-26.2c0-57.111-46.296-103.405-103.403-103.405-42.939 0-79.759 26.176-95.39 63.438-13.423-15.778-33.413-25.799-55.753-25.799-40.423 0-73.194 32.77-73.194 73.194 0 6.952.989 13.667 2.8 20.039-33.008 12.104-56.537 43.798-56.537 81.021 0 47.615 38.58 86.271 86.245 86.271h265.897c47.688 0 86.269-38.656 86.269-86.271-.001-38.613-25.323-71.271-60.293-82.288z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloudy.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloudy.svg
new file mode 100644
index 0000000000..75aad3d4d2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloudy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M316.896 332.236c1.636-6.241 2.484-12.784 2.484-19.538 0-42.576-34.501-77.078-77.045-77.078-32.015 0-59.452 19.507-71.127 47.288-10.007-11.756-24.919-19.229-41.562-19.229-30.12 0-54.549 24.43-54.549 54.563 0 5.165.724 10.188 2.096 14.931-24.624 9.041-42.153 32.651-42.153 60.397 0 35.5 28.778 64.309 64.291 64.309h198.206c35.545 0 64.292-28.809 64.292-64.309-.001-28.774-18.87-53.121-44.933-61.334zM434.39 151.594a54.815 54.815 0 0 0 2.095-14.946c0-30.134-24.461-54.542-54.581-54.542-16.642 0-31.555 7.449-41.561 19.229-11.643-27.785-39.08-47.288-71.096-47.288-42.575 0-77.077 34.501-77.077 77.077 0 6.733.884 13.293 2.486 19.524-26.064 8.207-44.934 32.552-44.934 61.33 0 11.723 3.142 22.697 8.635 32.161a71.882 71.882 0 0 1 6.08 2.635c19.034-22.55 47.289-36.084 77.897-36.084 43.43 0 80.544 27.288 95.261 65.612h74.658c35.514 0 64.291-28.825 64.291-64.323.001-27.732-17.56-51.362-42.154-60.385z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-clubs.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-clubs.svg
new file mode 100644
index 0000000000..68617041d5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-clubs.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M345.097 201.637c-1.966 0-3.911.085-5.846.211a89.487 89.487 0 0 0 6.481-33.496c0-49.606-40.219-89.814-89.813-89.814-49.618 0-89.833 40.208-89.833 89.814a89.546 89.546 0 0 0 6.479 33.494 90.514 90.514 0 0 0-5.824-.209c-49.621 0-89.83 40.206-89.83 89.812 0 49.611 40.209 89.814 89.83 89.814 36.611 0 68.075-21.923 82.054-53.356-9.839 37.655-28.101 104.613-33.517 104.613h81.262c-5.411 0-23.659-66.909-33.501-104.57 13.986 31.408 45.441 53.313 82.056 53.313 49.593 0 89.812-40.203 89.812-89.814.001-49.606-40.218-89.812-89.81-89.812z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cocktail.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cocktail.svg
new file mode 100644
index 0000000000..cc13e78a6f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cocktail.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M269.961 374.771V235.246L415.514 89.709H95.791l145.557 145.536v139.526c-52.389 1.594-92.774 11.77-92.774 24.076 0 13.414 47.938 24.298 107.064 24.298 59.19 0 107.13-10.884 107.13-24.298 0-12.306-40.454-22.482-92.807-24.076z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-code.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-code.svg
new file mode 100644
index 0000000000..2615644cea
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-code.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M38.299 255.395l137.255-137.248 46.782 46.789-90.458 90.459 90.458 90.46-46.782 46.792L38.299 255.395zm248.467 90.46l90.466-90.46-72.028-72.026-18.431-18.433 46.788-46.791 18.436 18.438L470.81 255.395 333.561 392.647l-46.795-46.792z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coffee.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coffee.svg
new file mode 100644
index 0000000000..d9e23e1259
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coffee.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M78.895 367.853c0 13.338 10.791 24.168 24.134 24.168h263.575c13.342 0 24.166-10.83 24.166-24.168V338.68H78.895v29.173zm294.478-247.946H96.62v86.104c0 56.083 24.395 90.423 63.571 107.771h151.605c29.562-13.442 50.034-37.037 57.782-73.044 1.244.065 2.521.116 3.795.116 33.422 0 60.467-27.093 60.467-60.483s-27.045-60.464-60.467-60.464zm0 95.993c-.198 0-.393-.015-.588-.015.163-3.239.262-6.491.262-9.875v-61.155c.128 0 .229-.019.326-.019 19.588 0 35.514 15.942 35.514 35.533 0 19.624-15.926 35.531-35.514 35.531z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-dollar.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-dollar.svg
new file mode 100644
index 0000000000..6f3e0659da
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-dollar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M285.812 281.548c-4.381-3.501-11.838-6.671-22.401-9.55v51.507a46.589 46.589 0 0 0 10.073-2.292c3.501-1.14 6.607-2.778 9.384-4.971 2.78-2.091 5.068-4.738 6.837-7.915 1.795-3.106 2.682-6.795 2.682-11.116-.001-6.997-2.194-12.199-6.575-15.663zm-54.841-90.425c-2.321 1.904-4.153 4.223-5.495 7.004-1.339 2.779-1.995 6.018-1.995 9.745 0 5.919 1.834 10.498 5.595 13.735 3.76 3.168 9.94 5.787 18.509 7.779v-43.754c-3.042 0-5.986.459-8.83 1.344-2.879.91-5.427 2.284-7.784 4.147zm24.785-156.85c-122.172 0-221.225 99.038-221.225 221.244 0 122.201 99.053 221.261 221.225 221.261 122.209 0 221.297-99.06 221.297-221.261 0-122.205-99.088-221.244-221.297-221.244zm0 410.782c-104.479 0-189.504-85.059-189.504-189.537 0-104.514 85.024-189.538 189.504-189.538 104.518 0 189.543 85.024 189.543 189.538 0 104.478-85.026 189.537-189.543 189.537zm.035-344.659c-85.678 0-155.104 69.473-155.104 155.121 0 85.646 69.426 155.104 155.104 155.104 85.647 0 155.07-69.457 155.07-155.104 0-85.648-69.423-155.121-155.07-155.121zm71.749 213.331c-1.962 5.98-5.494 11.838-10.597 17.558-5.102 5.728-11.936 10.827-20.536 15.302-8.568 4.454-19.588 7.131-32.997 8.02v22.825h-15.826v-22.825c-20.015-1.411-35.646-7.589-46.927-18.51-11.251-10.893-17.789-26.92-19.587-47.972h37.834c-.195 10.163 2.484 18.212 8.043 24.134 5.529 5.914 12.427 9.642 20.637 11.247v-56.02c-.883-.391-2.092-.812-3.596-1.21-1.506-.493-3.174-.85-4.973-1.243-6.606-1.763-13.146-3.891-19.588-6.309-6.41-2.421-12.197-5.657-17.3-9.647-5.1-4.027-9.157-9.058-12.229-15.01-3.011-6.021-4.513-13.441-4.513-22.404 0-9.119 1.731-17.168 5.199-24.168 3.498-6.963 8.11-12.785 13.832-17.523 5.724-4.744 12.327-8.439 19.85-11.021 7.521-2.586 15.272-4.152 23.316-4.707v-20.638h15.826v20.638c8.047.944 15.599 2.646 22.662 5.228 7.065 2.621 13.279 6.187 18.675 10.762 5.329 4.543 9.744 10.235 13.114 17.006 3.397 6.804 5.361 14.878 5.918 24.169h-38.098c-.165-7.164-2.388-13.247-6.704-18.284-4.283-4.972-9.484-7.489-15.567-7.489v47.482c2.159.521 4.352 1.046 6.574 1.605a196.91 196.91 0 0 1 7.13 1.896c13.211 3.565 23.414 8.009 30.575 13.276 7.127 5.267 12.426 10.76 15.795 16.484 3.402 5.754 5.429 11.441 6.048 17.167.624 5.755.918 10.822.918 15.272.002 3.953-.947 8.922-2.908 14.909z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-euro.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-euro.svg
new file mode 100644
index 0000000000..20527e3526
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-euro.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.104 34.594c-122.207 0-221.261 99.115-221.261 221.289 0 122.206 99.054 221.262 221.261 221.262 122.206 0 221.276-99.056 221.276-221.262.001-122.174-99.069-221.289-221.276-221.289zm0 410.826c-104.516 0-189.524-85.055-189.524-189.537 0-104.516 85.009-189.536 189.524-189.536S445.64 151.368 445.64 255.883c.001 104.482-85.021 189.537-189.536 189.537zm0-344.639c-85.646 0-155.106 69.455-155.106 155.102 0 85.684 69.46 155.107 155.106 155.107 85.661 0 155.104-69.424 155.104-155.107 0-85.647-69.442-155.102-155.104-155.102zm37.623 127.24l-8.469 19.657h-61.171l-.293 11.473h58.177l-8.456 19.658h-47.528c5.836 28.775 19.292 43.131 40.418 43.131 13.652 0 27.666-5.719 42.054-17.2l-.261 41.271c-12.197 7.092-26.227 10.657-42.054 10.657-22.941 0-41.433-7.359-55.431-22.139-12.752-13.279-21.042-31.85-24.851-55.721h-21.045l8.486-19.658h10.925v-7.096c0-2.551.078-4.018.262-4.377h-19.935l8.456-19.657h13.929c4.382-22.04 13.393-39.407 27.044-52.161 14.373-13.831 32.391-20.767 54.056-20.767 15.305 0 31.869 4.579 49.708 13.677l-16.645 34.104c-12.754-8.144-24.693-12.264-35.778-12.264-19.114 0-31.883 12.496-38.245 37.411h66.647z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-pound.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-pound.svg
new file mode 100644
index 0000000000..9ba0de073b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-pound.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.098 100.762c-85.644 0-155.07 69.457-155.07 155.105 0 85.68 69.427 155.104 155.07 155.104 85.68 0 155.104-69.425 155.104-155.104 0-85.648-69.425-155.105-155.104-155.105zm53.535 253.277c-7.456 2.549-14.652 3.788-21.586 3.788-6.9 0-12.621-.42-17.199-1.339-4.545-.914-8.729-1.991-12.557-3.269-3.988-1.439-8.014-2.747-12.002-3.823-4.022-1.117-9.027-1.637-15.013-1.637-4.937 0-10.101.684-15.435 2.057-5.395 1.344-10.693 4.025-15.989 8.011l-16.94-25.077c3.827-2.391 7.619-5.171 11.349-8.338a66.585 66.585 0 0 0 9.843-10.531 58.745 58.745 0 0 0 6.964-12.426c1.8-4.445 2.716-9.125 2.716-14.033 0-3.137-.492-6.146-1.506-9.152-.979-3.01-2.223-6.054-3.695-9.156h-27.01v-23.222h17.462c-2.714-3.464-5.459-8.53-8.207-15.304-2.716-6.703-4.088-14.223-4.088-22.364 0-7.265 1.504-14.229 4.512-20.765 3.01-6.545 7.426-12.332 13.244-17.363 5.821-5.008 13.114-8.904 21.845-11.876 8.73-2.877 18.838-4.351 30.317-4.351 20.927 0 37.245 5.82 48.888 17.467 11.643 11.669 17.461 28.611 17.461 50.782h-36.854c-.197-2.718-.556-6.116-1.08-10.204-.554-4.086-1.798-8.076-3.695-11.904-1.929-3.791-4.84-7.123-8.729-9.938-3.958-2.847-9.354-4.252-16.253-4.252-8.175 0-14.717 2.285-19.557 6.834-4.807 4.547-7.193 10.662-7.193 18.314 0 2.158.062 4.251.26 6.278.166 1.991.59 4.313 1.212 6.966.653 2.646 1.732 5.656 3.3 9.123 1.506 3.467 3.666 7.65 6.378 12.556h36.335v23.222H248.48c.883 2.743 1.471 5.43 1.765 8.173.263 2.747.426 5.657.426 8.733 0 8.603-2.257 15.893-6.737 22.004a82.78 82.78 0 0 1-15.697 16.256l.59.521c4.352-2.743 7.88-4.479 10.629-5.164 2.713-.725 5.365-1.115 7.912-1.115 3.629 0 7.26.328 10.793.984 3.564.621 7.127 1.307 10.789 2.025 3.633.914 7.196 1.732 10.663 2.324 3.434.619 6.998.945 10.628.945 3.662 0 7.323-.652 11.053-1.893 3.76-1.28 8.078-4.578 13.016-9.816l16.351 27.568c-6.542 6.383-13.574 10.83-21.028 13.381zM256.098 34.605c-122.172 0-221.257 99.055-221.257 221.262 0 122.202 99.085 221.26 221.257 221.26 122.207 0 221.261-99.058 221.261-221.26-.001-122.207-99.054-221.262-221.261-221.262zm0 410.801c-104.479 0-189.506-85.027-189.506-189.539 0-104.516 85.027-189.505 189.506-189.505 104.517 0 189.541 84.989 189.541 189.505 0 104.512-85.025 189.539-189.541 189.539z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-yen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-yen.svg
new file mode 100644
index 0000000000..2d7f31caf1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-yen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.176 34.714c-122.174 0-221.229 99.051-221.229 221.255 0 122.177 99.055 221.245 221.229 221.245 122.205 0 221.261-99.068 221.261-221.245 0-122.204-99.056-221.255-221.261-221.255zm0 410.76c-104.482 0-189.506-85.021-189.506-189.505 0-104.513 85.023-189.538 189.506-189.538 104.518 0 189.537 85.025 189.537 189.538 0 104.484-85.02 189.505-189.537 189.505zm.033-344.611c-85.68 0-155.104 69.43-155.104 155.105 0 85.647 69.425 155.089 155.104 155.089 85.641 0 155.07-69.441 155.07-155.089 0-85.675-69.429-155.105-155.07-155.105zm63.473 147.685v25.945h-39.044l-4.09 7.933v12.559h43.134v25.929h-43.134v37.708h-41.497v-37.708h-42.906v-25.929h42.906v-12.559l-3.859-7.933h-39.047v-25.945h25.934l-41.762-84.93h44.247l36.036 84.93 35.221-84.93h44.244l-42.314 84.93h25.931z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin.svg
new file mode 100644
index 0000000000..ec3b147525
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.392 100.759c-85.65 0-155.105 69.456-155.105 155.119 0 85.645 69.455 155.105 155.105 155.105 85.644 0 155.103-69.46 155.103-155.105-.001-85.663-69.46-155.119-155.103-155.119zm30.901 252.619H248.51V229.391h-48.041v-29.204c6.736.163 13.211-.328 19.524-1.522 6.278-1.193 11.903-3.268 16.939-6.277 5.003-3.006 9.22-6.967 12.687-11.883 3.433-4.908 5.757-10.991 6.833-18.3h30.839v191.173zM256.392 34.619c-122.175 0-221.26 99.051-221.26 221.26 0 122.19 99.085 221.26 221.26 221.26 122.204 0 221.257-99.07 221.257-221.26-.001-122.209-99.053-221.26-221.257-221.26zm0 410.781c-104.516 0-189.541-85.025-189.541-189.522 0-104.517 85.025-189.525 189.541-189.525 104.514 0 189.538 85.008 189.538 189.525 0 104.497-85.025 189.522-189.538 189.522z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-alt.svg
new file mode 100644
index 0000000000..a2349aaa12
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M302.271 134.014c-67.299 0-121.845 54.548-121.845 121.865 0 67.298 54.546 121.846 121.845 121.846 67.302 0 121.849-54.548 121.849-121.846-.001-67.317-54.548-121.865-121.849-121.865zm26.227 202.374h-30.444v-97.402h-37.771v-22.957c5.266.149 10.398-.244 15.336-1.173 4.939-.934 9.354-2.588 13.309-4.942 3.926-2.35 7.26-5.46 9.977-9.315 2.715-3.862 4.512-8.667 5.362-14.392h24.231v150.181zm-26.227-254.35c-44.702 0-85.417 16.888-116.221 44.588-26.422.602-51.145 3.253-72.564 7.44-24.56 4.792-44.835 11.704-58.047 19.145-8.861 4.889-14.256 10.069-16.153 13.455-1.079 1.801-1.341 2.895-1.374 3.876.032.997.294 2.107 1.374 3.924 1.144 1.911 3.302 4.445 6.67 7.145 6.736 5.477 18.151 11.414 32.866 16.403 15.37 5.261 34.369 9.549 55.624 12.476a173.745 173.745 0 0 0-5.297 30.163c-7.39-1.012-14.651-2.191-21.549-3.532-26.784-5.28-49.642-12.717-67.17-22.482-.85-.507-1.668-1.012-2.518-1.504v27.193c0 1.044.23 2.206 1.374 4.157 1.144 1.894 3.302 4.429 6.67 7.127 6.736 5.49 18.151 11.428 32.866 16.414 14.356 4.89 31.785 8.944 51.307 11.858 1.539 11.002 4.057 21.677 7.557 31.91-10.432-1.241-20.536-2.793-30.085-4.658-26.784-5.281-49.642-12.723-67.17-22.497a177.834 177.834 0 0 1-3.533-2.112v23.564c0 1.24.295 2.584 1.506 4.658 1.21 2.044 3.466 4.646 6.899 7.408 6.9 5.594 18.377 11.562 33.193 16.576 20.538 7.021 47.288 12.316 77.438 14.914 7.031 10.938 15.174 21.014 24.428 30.072-26.128-.834-50.653-3.564-72.564-7.848-26.751-5.234-49.479-12.674-66.843-22.355a68.741 68.741 0 0 1-3.041-1.811v26.24c0 1.046.23 2.191 1.374 4.121 1.144 1.927 3.302 4.446 6.67 7.16 6.736 5.477 18.151 11.413 32.866 16.404 29.496 10.085 71.978 16.691 118.871 16.661a482.26 482.26 0 0 0 38.653-1.575 173.05 173.05 0 0 0 65.926 13.004c95.979 0 173.843-77.852 173.843-173.844-.004-96.013-77.867-173.838-173.846-173.838zm0 322.732c-82.114 0-148.922-66.779-148.922-148.891 0-82.099 66.808-148.91 148.922-148.91 82.114 0 148.892 66.811 148.892 148.91-.001 82.111-66.778 148.891-148.892 148.891z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-dollar-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-dollar-alt.svg
new file mode 100644
index 0000000000..8f283ea006
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-dollar-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M282.564 205.876c-1.862 1.504-3.337 3.367-4.414 5.624-1.079 2.192-1.602 4.807-1.602 7.816 0 4.709 1.469 8.369 4.511 10.92 2.976 2.587 7.915 4.646 14.783 6.248v-34.99c-2.422 0-4.81.355-7.064 1.081-2.322.687-4.382 1.863-6.214 3.301zm43.855 72.332c-3.502-2.778-9.484-5.297-17.924-7.612v41.2a37.818 37.818 0 0 0 8.046-1.832c2.812-.945 5.297-2.256 7.521-3.987 2.225-1.702 4.025-3.826 5.495-6.312 1.406-2.516 2.126-5.496 2.126-8.895.001-5.594-1.767-9.779-5.264-12.562zM302.021 81.675c-44.671 0-85.417 16.905-116.221 44.637-26.425.573-51.112 3.221-72.565 7.426-24.56 4.801-44.865 11.705-58.076 19.126-8.83 4.945-14.192 10.076-16.123 13.478-1.077 1.764-1.31 2.941-1.373 3.856.063 1.012.296 2.127 1.373 3.96 1.113 1.896 3.302 4.414 6.639 7.13 6.768 5.461 18.182 11.412 32.898 16.383 15.37 5.295 34.369 9.58 55.657 12.456a174.81 174.81 0 0 0-5.364 30.219c-7.391-1.047-14.619-2.192-21.516-3.533-26.816-5.298-49.674-12.723-67.171-22.496-.849-.491-1.665-1.016-2.517-1.476v27.179c0 1.013.228 2.188 1.373 4.117 1.113 1.929 3.302 4.446 6.639 7.163 6.768 5.457 18.182 11.41 32.898 16.385 14.355 4.937 31.785 8.959 51.31 11.834 1.503 11.055 4.087 21.716 7.553 31.986-10.464-1.273-20.537-2.85-30.085-4.678-26.816-5.294-49.674-12.721-67.171-22.502-1.209-.715-2.354-1.375-3.53-2.09v23.542c0 1.216.294 2.589 1.507 4.614 1.207 2.062 3.462 4.707 6.896 7.454 6.866 5.559 18.376 11.545 33.16 16.55 20.536 7.029 47.319 12.326 77.472 14.947a173.955 173.955 0 0 0 24.395 30.079c-26.096-.852-50.654-3.56-72.531-7.879-26.718-5.267-49.479-12.652-66.844-22.366a65.315 65.315 0 0 1-3.041-1.8v26.227c0 1.081.228 2.191 1.373 4.157 1.113 1.894 3.302 4.415 6.639 7.158 6.768 5.494 18.182 11.413 32.898 16.414 29.463 10.041 71.977 16.646 118.901 16.613a472.4 472.4 0 0 0 38.589-1.567c20.342 8.37 42.609 13.012 65.958 13.012 96.013 0 173.845-77.827 173.845-173.842-.001-95.978-77.833-173.873-173.845-173.873zm0 322.766c-82.112 0-148.888-66.777-148.888-148.894 0-82.114 66.775-148.889 148.888-148.889 82.116 0 148.893 66.774 148.893 148.889-.001 82.117-66.777 148.894-148.893 148.894zm0-270.767c-67.3 0-121.845 54.54-121.845 121.874 0 67.272 54.545 121.883 121.845 121.883 67.302 0 121.88-54.61 121.88-121.883-.001-67.334-54.579-121.874-121.88-121.874zm57.753 170.273c-1.569 4.777-4.384 9.48-8.472 14.062-4.053 4.546-9.549 8.634-16.416 12.229-6.867 3.565-15.664 5.728-26.392 6.444v18.214h-12.652v-18.214c-16.024-1.179-28.55-6.116-37.543-14.782-9.025-8.761-14.227-21.547-15.664-38.423h30.249c-.13 8.14 1.995 14.554 6.439 19.295 4.452 4.706 9.942 7.716 16.519 9.024v-44.868c-.689-.255-1.7-.585-2.911-.943a44.164 44.164 0 0 0-3.957-.984 179.573 179.573 0 0 1-15.664-5.035c-5.135-1.929-9.747-4.481-13.834-7.718-4.055-3.237-7.326-7.228-9.776-12.034-2.419-4.772-3.633-10.726-3.633-17.919 0-7.258 1.409-13.735 4.22-19.297 2.747-5.556 6.445-10.267 11.022-14.06 4.576-3.729 9.874-6.705 15.86-8.764a73.205 73.205 0 0 1 18.673-3.793v-16.514h12.652v16.514c6.444.719 12.494 2.121 18.117 4.183 5.692 2.097 10.628 4.973 14.913 8.635 4.316 3.628 7.816 8.144 10.532 13.572 2.712 5.46 4.281 11.903 4.707 19.33h-30.445c-.163-5.729-1.931-10.601-5.364-14.589-3.432-4.023-7.586-6.018-12.46-6.018v38c1.735.389 3.469.851 5.266 1.243 1.768.456 3.663.948 5.659 1.504 10.596 2.911 18.771 6.439 24.492 10.624 5.691 4.25 9.941 8.635 12.655 13.247 2.718 4.545 4.316 9.124 4.808 13.702.49 4.579.783 8.668.783 12.231.001 3.14-.814 7.094-2.383 11.902z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-dollar.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-dollar.svg
new file mode 100644
index 0000000000..0b2b7a2ea6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-dollar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M249.555 145.609c-2.06 0-4.057.325-6.016.912-1.966.592-3.698 1.538-5.27 2.814-1.6 1.274-2.843 2.879-3.76 4.745-.916 1.894-1.373 4.084-1.373 6.668 0 3.987 1.309 7.13 3.826 9.282 2.58 2.192 6.77 3.924 12.592 5.266v-29.687zm23.966 88.753a17.85 17.85 0 0 0 4.646-5.367c1.208-2.122 1.832-4.642 1.832-7.589 0-4.736-1.507-8.304-4.482-10.655-2.977-2.355-8.045-4.516-15.205-6.476v35.022c2.189-.263 4.48-.786 6.834-1.536 2.358-.788 4.516-1.932 6.375-3.399zm-17.33 57.818c54.873 0 99.381-44.509 99.381-99.387 0-54.854-44.508-99.348-99.381-99.348s-99.35 44.493-99.35 99.348c.001 54.878 44.477 99.387 99.35 99.387zm-9.091-91.8c-1.046-.324-2.158-.589-3.367-.848-4.512-1.177-8.93-2.618-13.309-4.253-4.383-1.666-8.309-3.828-11.775-6.571-3.465-2.716-6.211-6.116-8.271-10.206-2.094-4.053-3.107-9.157-3.107-15.233 0-6.186 1.178-11.646 3.563-16.388 2.356-4.721 5.464-8.713 9.388-11.938 3.89-3.203 8.371-5.722 13.472-7.486a59.973 59.973 0 0 1 15.862-3.174v-14.042h10.758v14.042c5.462.607 10.594 1.801 15.402 3.562 4.807 1.738 9.024 4.189 12.654 7.263 3.664 3.108 6.641 6.968 8.928 11.575 2.321 4.645 3.662 10.108 4.021 16.422H275.42c-.096-4.877-1.633-8.996-4.514-12.396-2.942-3.403-6.473-5.101-10.594-5.101v32.276c1.439.358 2.943.718 4.48 1.075 1.502.391 3.107.789 4.805 1.272 8.996 2.427 15.928 5.431 20.801 9.026 4.84 3.601 8.438 7.332 10.726 11.219 2.323 3.892 3.661 7.752 4.118 11.674.426 3.861.624 7.325.624 10.368 0 2.648-.654 6.054-1.995 10.104-1.342 4.089-3.729 8.079-7.194 11.972-3.466 3.894-8.11 7.327-13.935 10.367-5.85 3.041-13.309 4.838-22.43 5.461v15.497h-10.758v-15.497c-13.639-.951-24.265-5.171-31.918-12.561-7.619-7.386-12.066-18.275-13.278-32.637h25.702c-.128 6.935 1.704 12.395 5.463 16.42 3.76 3.988 8.441 6.539 14.031 7.651v-38.097c-.622-.23-1.406-.52-2.454-.818zm9.091 177.309c-55.525-.129-103.891-9.644-133.389-26.032a78.94 78.94 0 0 1-2.977-1.731v19.883c0 .951.227 2.029 1.24 3.76 1.014 1.671 2.912 3.896 5.789 6.25 5.82 4.674 15.535 9.74 28.092 13.994 25.18 8.603 61.35 14.225 101.244 14.157 52.291.165 98.434-9.845 121.192-22.793 7.587-4.183 12.262-8.63 13.966-11.608 1.014-1.73 1.24-2.809 1.24-3.76v-19.883c-7.751 4.709-16.809 8.697-27.077 12.232-28.741 9.743-67.003 15.5-109.32 15.531zm0 55.266c-55.525-.131-103.891-9.711-133.389-25.998-1.016-.585-1.997-1.178-2.977-1.765v22.565c0 1.017.227 2.091 1.24 3.825 1.014 1.701 2.912 3.86 5.789 6.216 5.82 4.705 15.535 9.773 28.092 14.026 25.18 8.633 61.35 14.229 101.244 14.193 52.291.097 98.434-9.911 121.192-22.79 7.587-4.221 12.262-8.667 13.997-11.678.982-1.702 1.209-2.776 1.209-3.793V405.16c-7.751 4.707-16.841 8.729-27.176 12.264-28.709 9.743-66.969 15.502-109.221 15.531zM134.999 299.501c-7.555 4.185-12.231 8.628-13.933 11.578-.944 1.601-1.207 2.678-1.24 3.597.033.982.296 1.994 1.24 3.627 1.014 1.671 2.912 3.895 5.789 6.248 5.82 4.71 15.535 9.742 28.092 13.994 25.18 8.603 61.35 14.229 101.244 14.157 52.357.167 98.496-9.837 121.227-22.753 7.588-4.221 12.228-8.637 13.963-11.646.916-1.633 1.178-2.645 1.209-3.627-.031-.919-.293-1.996-1.209-3.597-1.047-1.702-2.941-3.892-5.854-6.217-4.645-3.79-11.936-7.814-21.16-11.475 24.528-26.356 39.57-61.709 39.57-100.595 0-81.607-66.154-147.741-147.746-147.741-81.559 0-147.746 66.134-147.746 147.741 0 38.854 15.043 74.238 39.604 100.595-4.908 1.96-9.322 3.955-13.05 6.114zm121.192 41.075c-.325 0-.653-.035-.948-.035.295 0 .623.035.948.035.361 0 .654-.035 1.014-.035-.359 0-.652.035-1.014.035zM129.275 192.793c0-69.979 56.967-126.928 126.916-126.928 69.982 0 126.918 56.949 126.918 126.928 0 69.984-56.936 126.914-126.918 126.914-69.949 0-126.916-56.93-126.916-126.914z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-euro-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-euro-alt.svg
new file mode 100644
index 0000000000..c8bbff6628
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-euro-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M301.384 134.017c-67.3 0-121.849 54.546-121.849 121.817 0 67.331 54.549 121.91 121.849 121.91 67.297 0 121.846-54.579 121.846-121.91-.001-67.272-54.549-121.817-121.846-121.817zm32.866 99.419l-6.672 15.465h-48.057l-.211 8.996h45.683l-6.638 15.467h-37.344c4.576 22.6 15.172 33.879 31.766 33.879 10.713 0 21.733-4.516 33.029-13.51l-.211 32.379c-9.582 5.592-20.603 8.372-33.047 8.372-18.016 0-32.536-5.79-43.541-17.364-10.005-10.467-16.514-25.047-19.521-43.756h-16.514l6.637-15.467h8.584v-5.594c0-1.962.083-3.104.213-3.402h-15.664l6.653-15.465h10.94c3.449-17.27 10.531-30.971 21.256-40.944 11.282-10.862 25.443-16.352 42.479-16.352 12.02 0 25.017 3.595 39.046 10.757l-13.079 26.817c-10.023-6.442-19.393-9.679-28.125-9.679-15.011 0-25.015 9.781-30.019 29.4h52.357zM301.384 82.025c-44.705 0-85.417 16.906-116.222 44.605-26.424.623-51.147 3.238-72.567 7.455-24.557 4.742-44.865 11.673-58.078 19.129-8.828 4.875-14.226 10.075-16.137 13.44-1.063 1.803-1.325 2.877-1.357 3.894.032.98.294 2.127 1.357 3.889 1.128 1.928 3.301 4.48 6.67 7.191 6.735 5.436 18.133 11.385 32.883 16.391 15.402 5.264 34.369 9.516 55.642 12.46a172.758 172.758 0 0 0-5.333 30.179c-7.39-1.045-14.632-2.187-21.565-3.523-26.783-5.308-49.608-12.725-67.137-22.508-.85-.49-1.685-.979-2.517-1.5v27.203c0 1.049.226 2.162 1.357 4.127 1.128 1.926 3.301 4.476 6.67 7.127 6.735 5.492 18.133 11.444 32.883 16.413 14.321 4.877 31.784 8.964 51.308 11.875a171.457 171.457 0 0 0 7.554 31.917 399.213 399.213 0 0 1-30.118-4.677c-26.783-5.27-49.608-12.726-67.137-22.47-1.193-.685-2.387-1.434-3.566-2.09v23.545c.052 1.24.297 2.549 1.537 4.643 1.213 2.025 3.468 4.646 6.904 7.424 6.881 5.592 18.377 11.544 33.191 16.582 20.503 7 47.304 12.295 77.436 14.877a176.792 176.792 0 0 0 24.396 30.117c-26.096-.881-50.652-3.565-72.532-7.846-26.732-5.27-49.494-12.693-66.859-22.406a151.669 151.669 0 0 1-3.023-1.762v26.227c0 1.045.226 2.191 1.357 4.116 1.128 1.936 3.301 4.45 6.67 7.163 6.735 5.461 18.133 11.414 32.883 16.389 29.497 10.067 71.96 16.68 118.886 16.645 13.324 0 26.242-.527 38.637-1.535 20.323 8.338 42.579 12.98 65.927 12.98 96.01 0 173.841-77.832 173.841-173.877 0-95.983-77.831-173.809-173.841-173.809zm0 322.735c-82.113 0-148.925-66.777-148.925-148.926 0-82.082 66.812-148.859 148.925-148.859 82.097 0 148.905 66.777 148.905 148.859 0 82.148-66.809 148.926-148.905 148.926z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-euro.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-euro.svg
new file mode 100644
index 0000000000..e1b77f5941
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-euro.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.258 377.992c-55.562-.099-103.895-9.68-133.391-25.966a94.619 94.619 0 0 1-2.977-1.794v19.846c.033 1.011.195 2.096 1.242 3.827 1.012 1.698 2.877 3.854 5.787 6.208 5.823 4.713 15.564 9.783 28.092 14.066 25.148 8.531 61.317 14.188 101.246 14.157 52.288.134 98.462-9.874 121.225-22.854 7.554-4.188 12.195-8.637 13.93-11.608 1.014-1.7 1.242-2.785 1.242-3.796v-19.846c-7.749 4.703-16.809 8.727-27.109 12.258-28.742 9.744-67.004 15.472-109.287 15.502zm129.334-72.826c-4.68-3.759-11.938-7.784-21.158-11.447 24.559-26.39 39.569-61.705 39.569-100.592 0-81.59-66.157-147.746-147.745-147.746-81.592 0-147.748 66.156-147.748 147.746 0 38.887 15.043 74.202 39.57 100.592-4.875 1.928-9.29 3.963-13.017 6.051-7.586 4.22-12.229 8.666-13.931 11.638-.949 1.639-1.209 2.651-1.209 3.636 0 .945.26 1.991 1.209 3.627 1.012 1.669 2.877 3.829 5.787 6.178 5.823 4.713 15.564 9.783 28.092 14.066 25.148 8.531 61.317 14.188 101.246 14.158 52.354.131 98.496-9.875 121.225-22.825 7.584-4.188 12.195-8.667 13.93-11.577.948-1.636 1.178-2.682 1.242-3.627-.064-.984-.294-1.997-1.242-3.636-1.015-1.664-2.879-3.89-5.82-6.242zm-129.334 14.908c-69.984 0-126.918-56.929-126.918-126.947 0-69.945 56.934-126.914 126.918-126.914 69.979 0 126.912 56.969 126.912 126.914 0 70.019-56.934 126.947-126.912 126.947zm0 113.154c-55.562-.101-103.895-9.649-133.391-25.966a217.248 217.248 0 0 1-2.977-1.773v22.599c.033.983.195 2.13 1.242 3.8 1.012 1.701 2.877 3.922 5.787 6.24 5.823 4.713 15.564 9.812 28.092 14.031 25.148 8.566 61.317 14.223 101.246 14.191 52.288.135 98.462-9.873 121.225-22.822 7.554-4.189 12.195-8.639 13.93-11.641 1.014-1.738 1.242-2.816 1.242-3.8V405.46c-7.749 4.741-16.843 8.767-27.176 12.263-28.709 9.779-66.972 15.505-109.22 15.505zm0-339.445c-54.875 0-99.352 44.473-99.352 99.344 0 54.877 44.477 99.381 99.352 99.381 54.87 0 99.378-44.504 99.378-99.381 0-54.871-44.508-99.344-99.378-99.344zm22.138 78.647l-5.658 13.111h-40.81l-.197 7.652h38.851l-5.691 13.148h-31.687c3.891 19.162 12.883 28.776 26.978 28.776 9.092 0 18.444-3.861 28.059-11.479l-.197 27.499c-8.143 4.775-17.461 7.133-28.06 7.133-15.303 0-27.633-4.907-36.983-14.752-8.537-8.891-14.06-21.254-16.58-37.178h-14.062l5.657-13.148h7.293v-4.742c0-1.701.063-2.65.193-2.91h-13.309l5.657-13.111h9.289c2.909-14.686 8.926-26.33 18.051-34.83 9.581-9.254 21.615-13.864 36.068-13.864 10.204 0 21.258 3.042 33.193 9.157l-11.12 22.793c-8.532-5.492-16.481-8.241-23.904-8.241-12.719 0-21.286 8.308-25.505 24.985h44.474z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-pound-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-pound-alt.svg
new file mode 100644
index 0000000000..e91acce12c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-pound-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M302.066 133.43c-67.267 0-121.844 54.615-121.844 121.916 0 67.263 54.578 121.812 121.844 121.812 67.303 0 121.88-54.549 121.88-121.812 0-67.301-54.577-121.916-121.88-121.916zm43.269 195.001c-5.857 1.995-11.513 3.041-16.943 3.041-5.428 0-9.94-.392-13.538-1.11-3.564-.724-6.867-1.533-9.846-2.586-3.137-1.109-6.307-2.155-9.448-3.007-3.139-.85-7.095-1.245-11.804-1.245-3.86 0-7.914.524-12.102 1.573-4.216 1.11-8.404 3.169-12.557 6.375l-13.309-19.753c3.009-1.863 5.983-4.056 8.893-6.537 2.91-2.551 5.527-5.264 7.718-8.271a44.675 44.675 0 0 0 5.492-9.785 29.332 29.332 0 0 0 2.128-11.013c0-2.456-.392-4.845-1.177-7.169a65.03 65.03 0 0 0-2.878-7.225H244.71v-18.211h13.733c-2.158-2.751-4.286-6.775-6.441-12.039-2.16-5.297-3.205-11.148-3.205-17.592 0-5.725 1.175-11.15 3.531-16.317 2.354-5.134 5.855-9.682 10.431-13.606 4.548-3.922 10.269-7.064 17.136-9.349 6.867-2.258 14.815-3.405 23.839-3.405 16.415 0 29.236 4.551 38.392 13.701 9.158 9.158 13.734 22.466 13.734 39.931h-28.97c-.132-2.16-.427-4.874-.852-8.044-.426-3.236-1.405-6.344-2.911-9.352-1.503-3.01-3.794-5.625-6.866-7.845-3.075-2.194-7.294-3.309-12.752-3.309-6.446 0-11.546 1.798-15.372 5.333-3.762 3.595-5.657 8.402-5.657 14.414 0 1.705.065 3.342.229 4.909.129 1.605.425 3.403.947 5.464.491 2.093 1.341 4.482 2.584 7.195 1.178 2.746 2.879 6.016 5.035 9.91h28.552v18.211h-22.531c.683 2.162 1.174 4.253 1.372 6.41.228 2.191.327 4.451.327 6.865 0 6.742-1.735 12.531-5.233 17.272a65.574 65.574 0 0 1-12.361 12.784l.424.42c3.436-2.121 6.215-3.465 8.374-4.084 2.158-.557 4.217-.854 6.211-.854 2.882 0 5.69.266 8.47.755 2.813.495 5.659 1.048 8.504 1.602 2.844.751 5.623 1.342 8.338 1.834 2.747.489 5.528.747 8.371.747 2.879 0 5.756-.49 8.701-1.465 2.94-1.053 6.344-3.602 10.202-7.754l12.853 21.647c-5.136 5.041-10.664 8.576-16.514 10.534zM302.066 81.465c-44.666 0-85.416 16.871-116.222 44.574-26.39.624-51.079 3.236-72.532 7.455-24.591 4.775-44.865 11.71-58.077 19.165-8.83 4.872-14.226 10.042-16.123 13.438-1.078 1.801-1.34 2.945-1.373 3.895.033.978.295 2.092 1.373 3.928 1.112 1.893 3.271 4.408 6.638 7.127 6.737 5.492 18.15 11.412 32.866 16.413 15.402 5.229 34.401 9.548 55.657 12.458-2.648 9.747-4.413 19.853-5.329 30.186-7.392-1.016-14.652-2.191-21.549-3.531-26.785-5.267-49.644-12.756-67.138-22.498-.884-.492-1.701-1.016-2.552-1.538v27.239c.033 1.047.23 2.193 1.406 4.15 1.112 1.904 3.271 4.414 6.638 7.133 6.737 5.427 18.15 11.412 32.866 16.385 14.357 4.9 31.786 8.994 51.308 11.868 1.539 10.987 4.089 21.685 7.588 31.916-10.465-1.239-20.568-2.776-30.116-4.644-26.785-5.296-49.644-12.752-67.138-22.528a120.3 120.3 0 0 1-3.566-2.095v23.543c.034 1.248.294 2.589 1.537 4.678 1.211 2.031 3.467 4.643 6.902 7.428 6.867 5.586 18.377 11.51 33.16 16.545 20.536 7.062 47.318 12.322 77.469 14.944 7 10.92 15.173 20.991 24.397 30.048-26.098-.848-50.654-3.561-72.535-7.811-26.749-5.299-49.509-12.689-66.874-22.398-1.015-.592-2.028-1.178-3.042-1.771v26.23c.033 1.016.23 2.154 1.406 4.121 1.112 1.893 3.271 4.447 6.638 7.13 6.737 5.493 18.15 11.445 32.866 16.413 29.497 10.108 71.978 16.678 118.935 16.645 13.31 0 26.195-.551 38.589-1.535a173.384 173.384 0 0 0 65.926 12.978c96.014 0 173.844-77.854 173.844-173.802.001-96.047-77.829-173.882-173.843-173.882zm0 322.736c-82.112 0-148.889-66.811-148.889-148.855 0-82.115 66.776-148.926 148.889-148.926 82.115 0 148.927 66.811 148.927 148.926 0 82.045-66.811 148.855-148.927 148.855z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-pound.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-pound.svg
new file mode 100644
index 0000000000..6d1443a6c9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-pound.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.531 291.949c54.873 0 99.348-44.506 99.348-99.381 0-54.899-44.475-99.348-99.348-99.348s-99.363 44.448-99.363 99.348c0 54.875 44.49 99.381 99.363 99.381zm-48.038-111.482h11.673c-1.83-2.283-3.663-5.684-5.461-10.199-1.83-4.479-2.745-9.48-2.745-14.945 0-4.841 1.013-9.449 3.007-13.862 1.996-4.351 4.938-8.21 8.83-11.545 3.892-3.337 8.748-5.983 14.586-7.948 5.853-1.93 12.589-2.909 20.243-2.909 13.962 0 24.837 3.892 32.618 11.705 7.784 7.757 11.658 19.032 11.658 33.878H277.31c-.129-1.824-.395-4.116-.736-6.863a25.345 25.345 0 0 0-2.47-7.915c-1.258-2.552-3.202-4.775-5.819-6.642-2.617-1.895-6.229-2.839-10.84-2.839-5.478 0-9.827 1.536-13.033 4.577-3.238 3.039-4.839 7.094-4.839 12.194 0 1.476.065 2.878.163 4.188.133 1.34.425 2.881.851 4.644.424 1.767 1.146 3.791 2.191 6.114 1.014 2.325 2.452 5.102 4.25 8.367h24.264v15.503h-19.146c.604 1.835 1.029 3.631 1.192 5.467.163 1.828.263 3.791.263 5.851 0 5.688-1.487 10.624-4.463 14.65-2.992 4.087-6.46 7.714-10.479 10.859l.374.389c2.91-1.865 5.281-3.003 7.114-3.465a18.875 18.875 0 0 1 5.266-.754c2.451 0 4.837.232 7.208.654 2.371.396 4.761.882 7.196 1.342 2.438.59 4.79 1.113 7.113 1.568 2.287.428 4.676.654 7.11.654 2.423 0 4.892-.453 7.377-1.303 2.5-.854 5.377-3.041 8.665-6.578l10.922 18.412c-4.366 4.285-9.06 7.26-14.029 8.961-4.969 1.67-9.777 2.521-14.389 2.521-4.626 0-8.452-.265-11.479-.891-3.043-.615-5.837-1.333-8.404-2.183-2.665-.953-5.328-1.834-8.012-2.549-2.681-.759-6.018-1.117-10.039-1.117-3.27 0-6.705.459-10.269 1.375-3.596.918-7.163 2.711-10.676 5.364l-11.299-16.778a57.016 57.016 0 0 0 7.555-5.523 42.841 42.841 0 0 0 6.571-7.003 38.372 38.372 0 0 0 4.646-8.304 24.781 24.781 0 0 0 1.83-9.422c0-2.059-.344-4.084-1.014-6.084a61.908 61.908 0 0 0-2.454-6.114h-18.049v-15.502zm48.038 252.229c-55.559-.132-103.925-9.678-133.408-25.997-1.013-.553-2.009-1.176-2.991-1.761v22.597c.035 1.012.229 2.09 1.244 3.859 1.013 1.633 2.894 3.824 5.803 6.178 5.805 4.711 15.551 9.779 28.109 14.027 25.146 8.605 61.315 14.229 101.243 14.195 52.274.131 98.43-9.906 121.192-22.859 7.556-4.183 12.231-8.633 13.948-11.576.998-1.734 1.225-2.842 1.225-3.824v-22.632c-7.731 4.744-16.807 8.763-27.142 12.293-28.744 9.749-67.007 15.47-109.223 15.5zm0-55.224c-55.559-.135-103.925-9.718-133.408-26.038a209.416 209.416 0 0 1-2.991-1.762v19.85c.035 1.047.229 2.088 1.244 3.822 1.013 1.668 2.894 3.893 5.803 6.219 5.805 4.707 15.551 9.805 28.109 14.025 25.146 8.602 61.315 14.195 101.243 14.164 52.274.162 98.43-9.844 121.192-22.795 7.556-4.187 12.231-8.633 13.931-11.643 1.016-1.705 1.242-2.746 1.242-3.793v-19.85c-7.715 4.708-16.807 8.766-27.076 12.295-28.744 9.745-67.006 15.466-109.289 15.506zm-121.207-78.226c-7.57 4.183-12.231 8.633-13.948 11.642-.948 1.567-1.178 2.651-1.244 3.562.066.952.296 2.028 1.244 3.631 1.013 1.696 2.894 3.888 5.803 6.246 5.805 4.68 15.551 9.778 28.109 14.03 25.146 8.596 61.315 14.188 101.243 14.16 52.356.129 98.465-9.908 121.192-22.796 7.571-4.216 12.231-8.663 13.948-11.641.932-1.603 1.191-2.679 1.225-3.631-.033-.911-.293-1.995-1.225-3.562-.999-1.733-2.895-3.927-5.805-6.278-4.676-3.763-11.971-7.789-21.158-11.416 24.524-26.42 39.568-61.74 39.568-100.625 0-81.588-66.173-147.742-147.746-147.742-81.609 0-147.746 66.154-147.746 147.742 0 38.885 15.043 74.205 39.568 100.625-4.904 1.897-9.32 3.926-13.028 6.053zm121.207 41.102c-.344 0-.67-.028-.999-.028.329-.001.656.028.999.028.328 0 .654-.028.982-.028-.327-.001-.654.028-.982.028zm-126.914-147.78c0-69.98 56.933-126.943 126.915-126.943 69.967 0 126.9 56.963 126.9 126.943 0 69.986-56.934 126.919-126.9 126.919-69.983 0-126.915-56.932-126.915-126.919z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-yen-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-yen-alt.svg
new file mode 100644
index 0000000000..d477b86158
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-yen-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M302.174 134.097c-67.297 0-121.879 54.581-121.879 121.883 0 67.302 54.582 121.843 121.879 121.843 67.303 0 121.846-54.541 121.846-121.843 0-67.303-54.543-121.883-121.846-121.883zm49.019 120.572v20.405H320.52l-3.203 6.218v9.875h33.877v20.374h-33.877v29.594h-32.64v-29.594h-33.648v-20.374h33.648v-9.875l-2.974-6.218h-30.675v-20.405h20.374l-32.834-66.711h34.764l28.318 66.711 27.666-66.711h34.762l-33.256 66.711h20.371zM302.174 82.137c-44.703 0-85.449 16.873-116.221 44.572-26.426.623-51.148 3.269-72.565 7.456-24.561 4.775-44.866 11.709-58.077 19.145-8.83 4.89-14.228 10.076-16.158 13.44-1.043 1.817-1.304 2.909-1.34 3.909.036.981.297 2.095 1.34 3.892 1.145 1.932 3.309 4.446 6.706 7.161 6.704 5.46 18.118 11.411 32.863 16.419 15.372 5.233 34.37 9.531 55.63 12.456-2.652 9.745-4.418 19.838-5.332 30.183-7.391-1.03-14.619-2.185-21.553-3.53-26.781-5.294-49.641-12.735-67.137-22.517-.881-.47-1.697-.998-2.518-1.484v27.209c0 1.03.197 2.171 1.34 4.12 1.145 1.911 3.309 4.446 6.706 7.144 6.704 5.479 18.118 11.428 32.863 16.398 14.324 4.906 31.788 8.962 51.312 11.872a169.815 169.815 0 0 0 7.555 31.917c-10.465-1.245-20.539-2.782-30.121-4.661-26.781-5.281-49.641-12.738-67.137-22.513a97.17 97.17 0 0 1-3.564-2.093v23.561c.032 1.225.297 2.565 1.506 4.661 1.242 2.023 3.5 4.643 6.934 7.42 6.867 5.593 18.375 11.546 33.195 16.584 20.502 6.995 47.28 12.294 77.437 14.892 6.995 10.943 15.2 21.015 24.394 30.071-26.098-.851-50.656-3.533-72.533-7.816-26.75-5.266-49.512-12.689-66.875-22.402a137.206 137.206 0 0 1-3.01-1.78v26.226c0 1.03.197 2.191 1.34 4.135 1.145 1.902 3.309 4.454 6.706 7.146 6.704 5.481 18.118 11.396 32.863 16.404 29.497 10.085 71.946 16.676 118.871 16.645 13.343 0 26.228-.56 38.622-1.538 20.34 8.34 42.609 12.95 65.959 12.95 95.98 0 173.842-77.801 173.842-173.81-.001-96.017-77.863-173.844-173.843-173.844zm0 322.73c-82.115 0-148.922-66.772-148.922-148.888s66.807-148.91 148.922-148.91c82.082 0 148.891 66.794 148.891 148.91-.001 82.116-66.809 148.888-148.891 148.888z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-yen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-yen.svg
new file mode 100644
index 0000000000..63aa1da6b2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-yen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.393 292.155c54.906 0 99.381-44.471 99.381-99.347 0-54.888-44.475-99.363-99.381-99.363-54.877 0-99.381 44.476-99.381 99.363 0 54.877 44.504 99.347 99.381 99.347zm-23.775-159.807l24.034 56.701 23.514-56.701h29.529l-28.223 56.701h17.299v17.3H272.71l-2.743 5.298v8.388h28.805v17.315h-28.805v25.148h-27.703V237.35h-28.615v-17.315h28.615v-8.388l-2.548-5.298h-26.067v-17.3h17.336l-27.898-56.701h29.531zm23.775 245.324c-55.56-.131-103.895-9.678-133.393-25.996-1.011-.588-1.995-1.158-2.975-1.765v19.852c0 1.015.229 2.091 1.245 3.792 1.011 1.697 2.876 3.891 5.786 6.246 5.789 4.691 15.533 9.778 28.094 14.012 25.178 8.588 61.312 14.213 101.242 14.197 52.287.125 98.428-9.885 121.191-22.833 7.554-4.183 12.229-8.65 13.965-11.622 1.016-1.701 1.209-2.777 1.241-3.792v-19.852c-7.717 4.71-16.81 8.729-27.108 12.247-28.745 9.76-67.008 15.486-109.288 15.514zm0 55.266c-55.56-.132-103.895-9.678-133.393-25.997-1.011-.587-1.995-1.178-2.975-1.763v22.596c0 1 .229 2.092 1.245 3.791 1.011 1.702 2.876 3.894 5.786 6.233 5.789 4.719 15.533 9.773 28.094 14.04 25.178 8.589 61.312 14.215 101.242 14.18 52.287.128 98.428-9.874 121.191-22.845 7.554-4.166 12.229-8.627 13.965-11.608 1.016-1.729 1.209-2.814 1.241-3.791v-22.632c-7.752 4.708-16.874 8.733-27.175 12.266-28.708 9.774-66.973 15.499-109.221 15.53zM135.166 299.467c-7.553 4.201-12.197 8.65-13.896 11.631-.95 1.598-1.211 2.642-1.245 3.61.034.929.295 1.979 1.245 3.595 1.011 1.686 2.876 3.895 5.786 6.235 5.789 4.702 15.533 9.774 28.094 14.024 25.178 8.571 61.312 14.193 101.242 14.193 52.39.129 98.497-9.891 121.225-22.846 7.553-4.166 12.195-8.628 13.932-11.607.914-1.615 1.176-2.666 1.241-3.595-.065-.969-.327-2.013-1.241-3.61-.98-1.704-2.91-3.896-5.791-6.235-4.674-3.808-11.969-7.831-21.187-11.458 24.524-26.39 39.567-61.741 39.567-100.596 0-81.602-66.156-147.757-147.746-147.757-81.589 0-147.747 66.155-147.747 147.757 0 38.854 15.044 74.206 39.567 100.596-4.902 1.912-9.286 3.938-13.046 6.063zm121.227 41.092c-.326 0-.622-.032-.982-.032.36-.001.655.032.982.032.324 0 .686-.032.98-.032-.295-.001-.656.032-.98.032zm-126.916-147.75c0-69.979 56.934-126.93 126.916-126.93 69.98 0 126.913 56.95 126.913 126.93 0 69.986-56.933 126.915-126.913 126.915-69.983 0-126.916-56.929-126.916-126.915z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins.svg
new file mode 100644
index 0000000000..6af11e0945
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.77 292.604c54.876 0 99.381-44.472 99.381-99.362 0-54.877-44.505-99.365-99.381-99.365-54.871 0-99.346 44.488-99.346 99.365 0 54.889 44.474 99.362 99.346 99.362zm-37.18-135.27c4.514.116 8.828-.211 13.014-.999 4.219-.786 7.979-2.19 11.314-4.203 3.336-1.99 6.18-4.643 8.472-7.911 2.322-3.286 3.857-7.357 4.579-12.216h20.601v127.602h-25.9v-82.766h-32.08v-19.507zm-84.011 142.578c-7.587 4.203-12.23 8.65-13.964 11.629-.95 1.6-1.178 2.646-1.211 3.596.033.945.261 1.991 1.211 3.612 1.014 1.685 2.91 3.894 5.819 6.231 5.789 4.707 15.535 9.776 28.125 14.026 25.115 8.565 61.282 14.189 101.21 14.175 52.355.146 98.5-9.891 121.192-22.808 7.588-4.184 12.264-8.667 13.968-11.625.946-1.621 1.205-2.667 1.24-3.612-.035-.95-.294-1.996-1.24-3.596-1.018-1.7-2.914-3.907-5.824-6.232-4.675-3.808-11.936-7.831-21.156-11.481 24.525-26.372 39.569-61.718 39.569-100.586 0-81.61-66.156-147.767-147.749-147.767-81.59 0-147.745 66.156-147.745 147.767 0 38.868 15.042 74.214 39.571 100.586-4.907 1.934-9.321 3.962-13.016 6.085zm121.191 41.092c-.325 0-.651-.032-.981-.032.329 0 .655.032.981.032.329 0 .656-.032.981-.032-.325 0-.652.032-.981.032zM128.854 193.241c0-69.964 56.935-126.916 126.916-126.916 69.982 0 126.916 56.952 126.916 126.916 0 69.978-56.934 126.929-126.916 126.929s-126.916-56.951-126.916-126.929zM255.77 378.119c-55.561-.133-103.925-9.681-133.391-25.998-1.014-.587-1.994-1.179-2.975-1.764v19.847c0 1.013.23 2.079 1.211 3.795 1.014 1.701 2.91 3.893 5.819 6.244 5.789 4.709 15.535 9.78 28.125 14.029 25.115 8.567 61.282 14.19 101.21 14.176 52.292.148 98.434-9.892 121.192-22.81 7.588-4.197 12.264-8.665 13.933-11.64 1.014-1.73 1.275-2.782 1.275-3.795v-19.847c-7.752 4.704-16.84 8.729-27.109 12.263-28.744 9.744-67.005 15.468-109.29 15.5zm0 55.268c-55.561-.134-103.925-9.682-133.391-26a127.499 127.499 0 0 1-2.975-1.764v22.598c0 .993.23 2.092 1.211 3.791 1.014 1.7 2.91 3.892 5.819 6.248 5.789 4.705 15.535 9.745 28.125 13.994 25.115 8.6 61.282 14.223 101.21 14.191 52.292.133 98.434-9.877 121.192-22.825 7.588-4.188 12.264-8.634 13.968-11.608.979-1.731 1.24-2.814 1.24-3.791v-22.634c-7.785 4.71-16.84 8.735-27.142 12.268-28.776 9.774-67.006 15.499-109.257 15.532z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-color-bucket.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-color-bucket.svg
new file mode 100644
index 0000000000..08fcb021d9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-color-bucket.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M263.608 443.932l97.171-97.179h.006l.008-.01 40.993-40.992c-12.618 39.775-30.882 99.987-30.882 115.401 0 23.549 19.085 42.636 42.634 42.636 23.553 0 42.638-19.087 42.638-42.636 0-19.162-28.23-107.58-38.746-139.858.097-1.079.164-2.147.155-3.188-.062-8.075-2.366-16.081-5.998-24.826-11.003-25.951-35.305-58.996-67.98-91.781-21.784-21.779-43.88-39.849-63.736-52.719-9.939-6.442-19.321-11.587-28.039-15.255-3.646-1.51-7.161-2.777-10.608-3.763-5.957-5.534-11.766-10.71-17.44-15.348-9.193-7.5-18.103-13.755-27.222-18.315-9.096-4.533-18.565-7.404-28.409-7.41-14.507-.103-28.52 6.647-40.352 18.664-11.294 11.103-17.338 24.931-17.22 38.914.033 12.827 4.488 25.109 11.233 37.139 4.189 7.422 9.314 14.825 15.159 22.32l-75.786 75.783c-5.417 5.398-7.216 12.666-7.167 19.019.054 8.066 2.363 16.071 5.988 24.823 10.999 25.953 35.305 58.994 67.971 91.768 21.797 21.787 43.891 39.854 63.745 52.731 9.945 6.443 19.32 11.586 28.037 15.254 8.752 3.625 16.757 5.935 24.822 5.987.089.003.181.003.274.003 6.302 0 13.42-1.83 18.745-7.157M143.643 131.121c-5.51-9.749-8.05-18.114-8.022-24.856.129-7.312 2.366-13.508 9.885-21.207 8.933-8.764 15.613-11.239 22.646-11.329 4.88-.009 10.525 1.431 17.24 4.777 6.91 3.36 14.62 8.785 23.087 15.769-.137.127-.28.234-.411.368-.021.018-.049.034-.07.055l-53.165 53.165c-4.45-5.877-8.244-11.486-11.19-16.742zm198.184 195.97c-.263.065-.804.157-1.655.151-2.729.059-8.286-1.119-15.129-4.032-20.825-8.646-52.862-31.589-83.767-62.607-20.669-20.663-37.754-41.638-49.412-59.646-5.829-8.983-10.294-17.233-13.174-24.109-2.921-6.846-4.095-12.405-4.041-15.134 0-.819.086-1.356.146-1.623l28.408-28.407a113.163 113.163 0 0 0 2.018 5.228c11 25.951 35.301 58.986 67.981 91.771 21.795 21.784 43.883 39.855 63.745 52.733 9.942 6.435 19.32 11.589 28.033 15.254a118.34 118.34 0 0 0 5.238 2.021l-28.391 28.4zm-18.42-86.363c-10.121-8.331-20.571-17.768-30.905-28.136-20.678-20.666-37.754-41.644-49.415-59.647-5.829-8.992-10.297-17.24-13.179-24.11-2.913-6.846-4.093-12.4-4.033-15.124a8.629 8.629 0 0 1 .055-1.078 8.763 8.763 0 0 1 1.077-.059c2.735-.055 8.286 1.116 15.136 4.039 20.826 8.64 52.867 31.587 83.762 62.588 20.679 20.673 37.764 41.651 49.416 59.663.409.627.793 1.242 1.191 1.864h-53.105z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-colorpicker.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-colorpicker.svg
new file mode 100644
index 0000000000..69d0362805
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-colorpicker.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M460.5 78.244l-26.472-26.473c-16.867-16.868-44.216-16.865-61.083.003l-61.466 61.468-29.702-29.699-58.764 58.763 24.501 24.499L79.748 334.573C68.761 345.557 62.6 359.972 61.767 374.81l-9.766 9.764c-20.867 20.881-20.863 54.838.002 75.704 10.106 10.108 23.548 15.679 37.85 15.679 14.297 0 27.733-5.568 37.847-15.67l9.758-9.765c15.211-.821 29.394-7.139 40.248-17.99l167.771-167.767 24.493 24.495 58.765-58.764-29.698-29.699 61.465-61.466c16.87-16.869 16.87-44.218-.002-61.087zM150.574 405.398a23.298 23.298 0 0 1-16.532 6.846c-3.501 0-7.007-.782-10.231-2.343v.007l-23.242 23.236a15.092 15.092 0 0 1-10.716 4.439 15.1 15.1 0 0 1-10.715-4.439c-5.919-5.922-5.919-15.516-.002-21.436l23.233-23.238.008-.004c-4.226-8.725-2.741-19.518 4.503-26.761l167.769-167.768 43.695 43.693-167.77 167.768z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-columns.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-columns.svg
new file mode 100644
index 0000000000..913a681162
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-columns.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M335.058 98.618h78.586v314.764h-78.586zm-118.35 0h78.586v314.764h-78.586zm-118.352 0h78.59v314.764h-78.59z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-comb.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-comb.svg
new file mode 100644
index 0000000000..d15c099fbe
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-comb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M115.348 379.3l12.361-12.329 46.73 46.698 23.742-23.743-46.73-46.733 12.327-12.324 46.731 46.732 23.743-23.776-46.7-46.73 12.328-12.328 46.733 46.728 23.774-23.77-46.732-46.734 12.329-12.314 46.729 46.716 23.743-23.76-46.732-46.709 12.362-12.316 46.731 46.7 23.74-23.759-46.73-46.726 12.329-12.33 46.73 46.696 23.739-23.743-46.73-46.715 12.363-12.325 46.73 46.717 23.742-23.76-46.701-46.718 12.33-12.326 46.732 46.728 20.665-20.698-67.002-67.005c-9.452-9.422-24.757-9.422-34.175 0L119.664 300.243l-45.947 45.928c-9.448 9.448-9.448 24.722 0 34.175l67.042 67.006 21.32-21.34-46.731-46.712z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-combination-lock-open.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-combination-lock-open.svg
new file mode 100644
index 0000000000..3cdba5cf20
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-combination-lock-open.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M321.582 195.249c-19.521 0-38.129 4.008-55.038 11.247V149.63c0-30.774-11.673-58.979-30.968-79.579-19.213-20.62-46.567-33.863-76.751-33.832-30.183-.031-57.569 13.212-76.784 33.832-19.26 20.6-30.967 48.805-30.967 79.579v126.032h51.146v-28.09l-26.291-26.31h26.291V149.63c0-17.771 6.734-33.47 17.167-44.651 10.528-11.169 24.231-17.597 39.438-17.612 15.175.015 28.874 6.442 39.409 17.612 10.461 11.181 17.166 26.88 17.166 44.651v94.378c-21.158 24.525-33.945 56.458-33.945 91.4 0 77.387 62.738 140.125 140.127 140.125 77.406 0 140.143-62.738 140.143-140.125 0-77.405-62.737-140.159-140.143-140.159zm-68.217 152.622H221.68v-24.938h31.686v24.938zm55.742-112.382h24.936v31.702h-24.936v-31.702zm24.936 199.825h-24.936v-31.707h24.936v31.707zm-12.461-49.968c-27.565-.017-49.92-22.371-49.936-49.955.016-27.581 22.37-49.916 49.936-49.916 27.603 0 49.936 22.335 49.936 49.916 0 27.584-22.333 49.938-49.936 49.955zm68.216-37.475v-24.938h31.704v24.938h-31.704zm-68.216-41.779c-16.168.034-29.27 13.129-29.299 29.299.029 16.188 13.131 29.283 29.299 29.321 16.188-.038 29.268-13.134 29.303-29.321-.035-16.17-13.115-29.265-29.303-29.299z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-combination-lock.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-combination-lock.svg
new file mode 100644
index 0000000000..10332f449f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-combination-lock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.79 306.092c-16.19.034-29.288 13.129-29.337 29.316.049 16.17 13.146 29.266 29.337 29.304 16.151-.038 29.247-13.134 29.298-29.304-.051-16.187-13.147-29.282-29.298-29.316zm107.717-60.303V149.63c0-30.757-11.677-58.963-30.97-79.579-19.211-20.62-46.582-33.863-76.747-33.832-30.188-.031-57.575 13.212-76.787 33.832-19.294 20.616-30.968 48.822-30.968 79.579v96.159c-20.227 24.296-32.39 55.529-32.39 89.619 0 77.387 62.721 140.125 140.145 140.125 77.368 0 140.106-62.738 140.106-140.125 0-34.09-12.164-65.323-32.389-89.619zM187.555 347.871h-31.688v-24.938h31.688v24.938zm80.674 87.443h-24.933v-31.707h24.933v31.707zm-12.439-49.968c-27.604-.017-49.938-22.371-49.938-49.938 0-27.599 22.334-49.934 49.938-49.934 27.564 0 49.9 22.335 49.9 49.934 0 27.567-22.336 49.921-49.9 49.938zm-12.494-118.155v-31.702h24.933v31.702h-24.933zm69.066-59.986a139.553 139.553 0 0 0-56.572-11.957 139.467 139.467 0 0 0-56.595 11.957V149.63c0-17.738 6.704-33.47 17.153-44.635 10.528-11.186 24.233-17.613 39.441-17.628 15.17.015 28.874 6.442 39.401 17.628 10.448 11.165 17.171 26.897 17.171 44.635v57.575zm43.315 140.666h-31.706v-24.938h31.706v24.938z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-command.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-command.svg
new file mode 100644
index 0000000000..7a4b9094f9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-command.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M470.611 129.513c-.115-11.964-2.458-23.38-7.008-34.089-4.629-10.899-10.932-20.563-18.865-28.88-7.969-8.355-17.434-14.96-28.26-19.741-10.871-4.81-22.553-7.225-34.85-7.238-.042 0-.082-.002-.119 0h-.017c-12.331-.008-24.071 2.415-35.067 7.211-10.941 4.774-20.531 11.357-28.618 19.705-8.06 8.307-14.497 17.955-19.254 28.854-4.822 11.009-7.229 22.775-7.229 35.106l-.011 37.219-74.083-.018.012-38.406-.012-.025c-.144-11.893-2.552-23.249-7.203-33.899-4.751-10.898-11.176-20.557-19.237-28.871-8.088-8.345-17.661-14.931-28.597-19.717-10.959-4.789-22.65-7.201-34.915-7.225a4.329 4.329 0 0 0-.22-.006v-.004c-12.336 0-24.083 2.412-35.086 7.213-10.942 4.772-20.526 11.363-28.617 19.711C55.296 74.712 48.866 84.367 44.1 95.27c-4.79 10.954-7.203 22.659-7.227 34.936a2.652 2.652 0 0 0 0 .13v.038h.004c0 .006 0 .016-.004.027-.005 12.327 2.404 24.029 7.222 34.92 4.759 10.803 11.213 20.243 19.31 28.213 8.083 7.968 17.656 14.298 28.567 18.936 11 4.694 22.735 7.029 35.061 7.029l39.004.014-.02 74.442-38.822-.012c-.137-.004-.263 0-.368 0-12.254.012-23.931 2.356-34.879 7.015-10.917 4.637-20.489 10.955-28.58 18.924-8.103 7.96-14.56 17.41-19.328 28.205-4.81 10.862-7.219 22.533-7.234 34.822v.154c-.008 12.327 2.395 24.076 7.21 35.083 4.751 10.901 11.201 20.469 19.292 28.554 8.079 8.095 17.644 14.539 28.548 19.311 11.006 4.813 22.767 7.228 35.103 7.228h3.1l.028-.056c11.201-.365 21.905-2.754 31.982-7.154 10.911-4.765 20.472-11.202 28.563-19.293 8.091-8.085 14.545-17.646 19.31-28.55 4.813-11.011 7.228-22.765 7.228-35.11l.012-37.578 74.084.026-.014 37.578v.038c-.008 12.322 2.402 24.066 7.213 35.07 4.754 10.903 11.202 20.479 19.287 28.561 8.085 8.094 17.644 14.544 28.557 19.309 10.97 4.795 22.69 7.207 34.987 7.225h.064l.052.002 8.103.004-.17-.342c9.44-.812 18.476-3.105 27.016-6.873 10.794-4.771 20.249-11.217 28.216-19.312 7.975-8.094 14.292-17.659 18.939-28.572 4.688-10.997 7.03-22.734 7.03-35.059v-.823l-.004-.008c-.103-11.798-2.444-23.086-7.019-33.718-4.641-10.806-11.033-20.32-19.12-28.405-8.088-8.092-17.594-14.484-28.395-19.14-10.88-4.691-22.451-7.042-34.549-7.042l-38.293-.014.019-74.442 43.305.018v-.138c10.285-.554 20.168-2.845 29.543-6.887 10.802-4.641 20.316-11.031 28.408-19.12 8.084-8.085 14.483-17.59 19.137-28.395 4.685-10.88 7.037-22.45 7.037-34.548v-.963l-.004-.015zm-304.61 253.549c-.006 5.332-1.008 10.295-3.013 15.055-2.036 4.793-4.814 8.936-8.417 12.539a39.494 39.494 0 0 1-12.405 8.425c-4.585 1.979-9.596 2.977-15.187 2.986-5.334-.01-10.299-1.007-15.045-3.012-4.783-2.022-8.751-4.765-12.083-8.306-3.402-3.619-6.105-7.802-8.153-12.653-1.932-4.563-2.917-9.312-3-14.394v-.665c0-5.061.981-9.823 2.988-14.471 2.025-4.679 4.746-8.637 8.194-11.985 3.501-3.384 7.556-6.079 12.289-8.127 4.411-1.905 9.089-2.901 14.172-2.981l39.672.011-.012 37.578zm.054-215.438l-39.008-.008c-5.332-.006-10.225-.997-14.83-2.991-4.734-2.048-8.783-4.742-12.274-8.13-3.476-3.371-6.191-7.282-8.208-11.849-1.989-4.498-2.968-9.191-2.968-14.25v-.012c.004-5.596 1.011-10.603 2.992-15.189 2.041-4.738 4.758-8.881 8.176-12.516 3.333-3.529 7.31-6.271 12.083-8.299 4.746-2.004 9.702-2.999 15.033-2.999h.02c5.593.013 10.604 1.017 15.188 2.999a39.371 39.371 0 0 1 12.398 8.429 39.595 39.595 0 0 1 8.431 12.405c1.97 4.583 2.983 9.594 2.983 15.195l-.016 37.215zm125.222 126.365l-74.084-.021.018-74.444 74.088.025-.022 74.44zm90.171 51.559c5.062 0 9.752.988 14.264 2.972 4.589 2.041 8.521 4.721 11.898 8.091 3.345 3.358 6.021 7.335 8.065 12.05 1.994 4.642 2.981 9.41 2.981 14.479h.004c-.006 5.335-1.007 10.219-2.997 14.828-2.049 4.74-4.766 8.881-8.18 12.512-3.387 3.596-7.312 6.424-11.885 8.549-4.492 2.084-9.142 3.102-14.17 3.108-5.338-.007-10.295-1.001-15.053-3.011-4.784-2.019-8.75-4.766-12.07-8.305-3.408-3.615-6.118-7.799-8.159-12.656-2.006-4.74-2.998-9.669-3.005-14.973l.013-37.657 38.294.013zm34.302-200.816c-2.037 4.604-4.715 8.538-8.084 11.9-3.383 3.376-7.312 6.051-11.912 8.081-4.5 1.984-9.182 2.964-14.236 2.97h-.02l-38.295-.014.012-37.218c0-5.593 1.008-10.605 2.992-15.181 2.045-4.746 4.76-8.882 8.179-12.518 3.327-3.529 7.302-6.275 12.084-8.3 4.55-1.925 9.296-2.918 14.386-3.001h.666c5.025.006 9.679 1.039 14.171 3.114 4.567 2.134 8.492 4.968 11.88 8.557 3.412 3.645 6.121 7.777 8.171 12.522 1.988 4.609 2.979 9.504 2.987 14.831-.008 5.061-.994 9.767-2.981 14.257z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-company.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-company.svg
new file mode 100644
index 0000000000..b22bdb63ad
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-company.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M157.333 454.494h162.278V56.031H157.333v398.463zm138.314-55.937h-43.354v-43.353h43.354v43.353zm-80.682-64.919v-43.353h43.353v43.353h-43.353zm80.682-64.925h-43.354v-43.347h43.354v43.347zm-80.682-64.918v-43.352h43.353v43.352h-43.353zm37.329-108.272h43.354v43.35h-43.354v-43.35zm-74.659 0h43.351v43.35h-43.351v-43.35zm0 129.843h43.351v43.347h-43.351v-43.347zm0 129.838h43.351v43.353h-43.351v-43.353zm-140.419 99.29h97.289V182.011H37.216v272.483zm26.972-251.092h43.348v43.353H64.188v-43.353zm0 77.073h43.348v43.351H64.188v-43.351zm0 74.056h43.348v43.354H64.188v-43.354zM454.4 220.403v-51.786h-23.607v-50.529h-16.941V71.089h-14.238v46.999h-16.94v50.529H359.07v51.786h-19.218v234.091H473.62V220.403H454.4zm-49.058 204.322H361.99v-43.349h43.352v43.349zm0-132.922H361.99v-43.352h43.352v43.352zm50.888 65.914h-43.35v-43.352h43.351v43.352z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-compress.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-compress.svg
new file mode 100644
index 0000000000..48664d5a36
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-compress.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M388.721 417.445c-8.585 0-16.17 4.188-20.895 10.592h-52.207v-55.393c.178-.192.389-.358.568-.521 10.545-9.814 17.758-24.368 17.743-40.544v-48.922h-18.312v-26.492h39.01v-30.643h-108.7v30.643h39.029v26.492H268.02v39.375H163.603V108.26h104.418v23.917h-22.093v30.663h108.701v-30.663h-20.698V100.25a57.949 57.949 0 0 0-57.899-57.888h-120.44a57.947 57.947 0 0 0-57.885 57.888v229.808a57.952 57.952 0 0 0 57.885 57.891h120.44a61.829 61.829 0 0 0 8.926-.754v40.843H232.75c-4.725-6.403-12.314-10.592-20.879-10.592-14.325 0-25.933 11.607-25.933 25.936 0 14.324 11.608 25.896 25.933 25.896 8.565 0 16.154-4.156 20.863-10.593h135.107c4.709 6.437 12.294 10.593 20.879 10.593 14.291 0 25.9-11.572 25.9-25.896.001-14.329-11.608-25.937-25.899-25.937z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-connection.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-connection.svg
new file mode 100644
index 0000000000..0619278e2a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-connection.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M44.96 375.143l173.402-201.609 93.2 72.769 154.09-108.785-154.09 200.497-93.2-73.517z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-console.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-console.svg
new file mode 100644
index 0000000000..8599aeb13a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-console.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M123.165 121.806l-36.463 36.427 97.565 97.579-97.565 97.551 36.463 36.442 134.009-133.993-134.009-134.006zm120.553 1.176v51.552h182.313v-51.552H243.718zm0 264.289h182.313V335.72H243.718v51.551zM306 280.911h120.031v-51.552H306v51.552z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-contrast.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-contrast.svg
new file mode 100644
index 0000000000..8dbd2d9e74
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-contrast.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.775 46.613c-115.387.014-208.906 93.533-208.918 208.92.012 115.394 93.531 208.91 208.918 208.921 115.387-.011 208.902-93.527 208.918-208.921-.015-115.387-93.531-208.906-208.918-208.92zm124.713 333.635c-31.972 31.938-75.957 51.645-124.709 51.65V79.17c48.752.002 92.737 19.713 124.709 51.655 31.942 31.965 51.646 75.951 51.661 124.708-.015 48.753-19.718 92.746-51.661 124.715z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-conversation-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-conversation-alt.svg
new file mode 100644
index 0000000000..111b651f89
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-conversation-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M175.903 192.325c-74.167-1.456-135.204 44.246-136.348 102.081-.392 20.108 6.506 39.042 18.769 55.234 21.125 27.121-1.929 73.803-1.929 73.803l68.084-29.331c14.651 4.642 30.61 7.355 47.306 7.683 74.167 1.476 135.235-44.262 136.348-102.125 1.144-57.801-58.046-105.891-132.23-107.345zM454.67 247.82c12.279-16.201 19.197-35.123 18.788-55.234-1.13-57.831-62.216-103.566-136.383-102.062-62.149 1.212-113.803 35.205-128.207 80.203 29.023 5.476 55.659 17.367 77.126 34.793 30.97 25.15 47.68 58.683 47.074 94.406 2.699.057 5.412.089 8.127 0 16.727-.256 32.651-2.971 47.335-7.65l68.067 29.338c.001-.001-23.054-46.669-1.927-73.794z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-conversation.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-conversation.svg
new file mode 100644
index 0000000000..d16115fdb0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-conversation.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M163.495 287.156c-118.242-14.047-68.454-85.798-2.329-154.135-230.392 155.777-90.703 223.496 3.175 238.084l.592 58.709 117.78-100.689-119.785-98.042.567 56.073zm181.776-147.633l-.592-58.712L226.9 181.503l119.784 98.046-.564-56.078c118.242 14.051 68.451 85.798 2.328 154.141 230.388-155.78 90.702-223.499-3.177-238.089z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coverflow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coverflow.svg
new file mode 100644
index 0000000000..72a230d15d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coverflow.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M89.486 379.302V131.713h30.778v247.589H89.486zm-54.822 36.243V95.473h30.778v320.072H34.664zm356.523-36.243V131.711h30.774v247.591h-30.774zm54.817 36.243V95.473h30.78v320.072h-30.78zM144.579 144.83h221.357v221.358H144.579z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-credit-card-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-credit-card-alt.svg
new file mode 100644
index 0000000000..c113197cf5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-credit-card-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M454.811 123.752H55.944c-11.259 0-20.381 8.518-20.381 19.02v224.975c0 10.5 9.122 19.006 20.381 19.006H454.81c11.258 0 20.382-8.506 20.382-19.006V142.771c0-10.501-9.124-19.019-20.381-19.019zm-9.821 232.797H65.763v-97.784H444.99v97.784zm0-178.278H65.763v-24.316H444.99v24.316zM161.433 290.063H98.547v16.782h62.886v-16.782zm94.002 0h-81.98v16.782h81.98v-16.782zm12.009 25.712H98.547v16.781h168.897v-16.781z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-credit-card.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-credit-card.svg
new file mode 100644
index 0000000000..af896af5f9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-credit-card.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M450.803 116.918H58.286c-11.082 0-20.063 8.98-20.063 20.061v237.386c0 11.071 8.981 20.054 20.063 20.054h392.517c11.081 0 20.062-8.982 20.062-20.054V136.979c-.001-11.08-8.981-20.061-20.062-20.061zM266.422 336.936H100.193v-17.094h166.229v17.094zM100.19 309.809v-17.101h61.91v17.101h-61.91zm73.732.003v-17.101h80.681v17.101h-80.681zm276.228-51.891H59.783v-82.017H450.15v82.017z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crop.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crop.svg
new file mode 100644
index 0000000000..570c261e8a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crop.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M426.671 134.494h-41.972v-41.99h-51.145v41.99H153.042l-49.74-49.775-17.644 17.63 49.542 49.54v180.939H93.229v51.116h41.972v41.954h51.164v-41.954H384.7V185.61h41.972v-51.116zm-240.307 68.543l129.761 129.791H186.364V203.037zm147.191 111.936L204.185 185.61h129.37v129.363z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crosshair.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crosshair.svg
new file mode 100644
index 0000000000..802be32987
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crosshair.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M446.055 240.544c-7.388-92.958-81.505-167.077-174.478-174.466V38.215H240.92v27.863C147.98 73.482 73.878 147.586 66.453 240.56h-27.86v30.64h27.86c7.425 92.952 81.526 167.071 174.467 174.481v27.857h30.657v-27.857c92.973-7.41 167.09-81.529 174.478-174.481h27.861v-30.656h-27.861zM382.551 271.2c-6.965 57.943-53.044 103.989-110.974 110.97v-36.428H240.92v36.428c-57.916-6.98-103.959-53.026-110.957-110.97h36.428v-30.64h-36.428c6.998-57.934 53.041-103.996 110.957-110.978v36.431h30.657v-36.431c57.93 6.982 103.976 53.028 110.974 110.961h-36.43V271.2h36.43zm-126.293-48.026c-18.053 0-32.701 14.634-32.701 32.705 0 18.051 14.648 32.704 32.701 32.704 18.081 0 32.7-14.652 32.7-32.704 0-18.071-14.619-32.705-32.7-32.705z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crown-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crown-alt.svg
new file mode 100644
index 0000000000..20bbacb2eb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crown-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M91.475 374.594h329.05v37.281H91.475zm311.64-144.555c-51.386 0-116.679-27.02-147.118-129.914-32.316 102.711-97.309 129.744-148.18 129.744-24.557 0-45.825-6.299-58.534-13.43L88.79 339.404h332.189l41.738-122.965c-12.797 7.178-34.541 13.6-59.602 13.6zm-147.114 61.82c-16.771 0-30.367-13.596-30.367-30.367 0-16.77 13.595-30.365 30.367-30.365 16.771 0 30.367 13.596 30.367 30.365 0 16.772-13.597 30.367-30.367 30.367z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crown.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crown.svg
new file mode 100644
index 0000000000..8ad5f1464a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crown.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M420.978 345.57l41.739-122.963c-12.798 7.178-34.541 13.598-59.603 13.598-51.385 0-116.679-27.018-147.117-129.91-32.317 102.707-97.312 129.742-148.184 129.742-24.555 0-45.824-6.299-58.531-13.43L88.79 345.57c30.149-36.213 98.121-54.316 166.095-54.316s135.948 18.107 166.093 54.316zm-22.369 18.623c-5.313-6.383-12.768-12.25-21.913-17.482-25.203 18.244-71.348 29.891-121.816 29.891-50.469 0-96.596-11.65-121.799-29.896-9.149 5.236-16.607 11.105-21.922 17.488l-1.147 1.377c31.771 26.748 88.296 40.135 144.869 40.135 56.562 0 113.104-13.393 144.873-40.137l-1.145-1.376z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cupcake.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cupcake.svg
new file mode 100644
index 0000000000..de3a7c7c81
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cupcake.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M162.516 260.2c-13.168 11.313-30.136 17.754-47.857 17.754-2.214 0-4.401-.115-6.565-.308l49.285 153.853h46.846L180.2 271.432a73.64 73.64 0 0 1-17.684-11.232zm191.431 0a73.538 73.538 0 0 1-17.687 11.232l-24.02 160.066h46.842l49.287-153.852a74.157 74.157 0 0 1-6.563.307c-17.722.001-34.69-6.44-47.859-17.753zm-95.715.002c-13.168 11.311-30.136 17.751-47.858 17.751-.154 0-.308-.009-.463-.009l23.046 153.554h50.549l23.046-153.554c-.154 0-.308.009-.462.009-17.723.001-34.692-6.44-47.858-17.751zM403.906 145.96c-.502 0-.997.022-1.496.034-27.494-17.892-66.256-31.892-111.045-36.644-2.267-16.292-16.213-28.848-33.131-28.848S227.366 93.058 225.1 109.35c-44.993 4.774-83.91 18.877-111.427 36.888a56.174 56.174 0 0 0-5.579-.278c-29.591 0-53.574 23.066-53.574 51.516 0 28.452 26.084 51.372 55.675 51.372l.213-.212c1.399.133 2.816.212 4.251.212 14.276 0 27.738-6.92 36.011-18.513l11.845-16.6 11.848 16.599c8.274 11.593 21.737 18.513 36.013 18.513 14.279 0 27.741-6.92 36.012-18.511l11.847-16.606 11.847 16.606c8.27 11.591 21.731 18.511 36.011 18.511 14.276 0 27.739-6.92 36.011-18.513l11.847-16.602 11.847 16.601c8.273 11.593 21.735 18.513 36.012 18.513 29.591 0 55.675-22.92 55.675-51.372-.005-28.448-23.988-51.514-53.579-51.514z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-curve.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-curve.svg
new file mode 100644
index 0000000000..ac749474d3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-curve.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M476.334 327.906c4.729-13.933 1.583-29.946-9.523-41.051-11.105-11.107-27.117-14.252-41.05-9.524l-60.618-60.617 18.271-18.271-69.113-69.111-18.273 18.271-57.298-57.296c7.186-14.856 4.652-33.233-7.676-45.562-15.583-15.58-40.84-15.583-56.42 0-15.582 15.58-15.582 40.841 0 56.42 11.086 11.087 27.063 14.243 40.979 9.549l55.022 55.021c-22.589-9.864-46.785-14.881-70.992-14.875-37.879-.013-75.873 11.897-107.688 35.803-15.23-8.686-34.94-6.575-47.942 6.425-15.578 15.58-15.578 40.841 0 56.421 15.58 15.581 40.841 15.581 56.422 0 11.2-11.201 14.304-27.393 9.399-41.406 26.596-19.606 58.148-29.319 89.809-29.334a149.773 149.773 0 0 1 54.791 10.429l-9.248 9.249 69.109 69.112 14.757-14.752a148.986 148.986 0 0 1 20.897 76.064c-.012 25.169-6.142 50.251-18.448 72.851-14.149-5.207-30.649-2.172-42.009 9.189-15.58 15.583-15.58 40.844 0 56.42 15.578 15.581 40.839 15.585 56.424 0 12.686-12.684 15.037-31.786 7.064-46.855 16.64-28.185 24.892-59.956 24.88-91.604.008-24.133-5.012-48.245-14.846-70.754l39.664 39.665c-7.142 14.848-4.601 33.184 7.71 45.494 15.578 15.576 40.84 15.58 56.422 0 4.317-4.316 7.391-9.387 9.316-14.776l.4-.401-.192-.194z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cut.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cut.svg
new file mode 100644
index 0000000000..63d892780c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cut.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M472.785 159.34l-4.563-9.12c-1.861-3.792-5.156-7.863-9.981-10.671-4.807-2.838-10.817-4.321-17.711-4.31-10.153.05-22.687 3.341-38.204 11.038l-133.889 63.166 57.259 32.088 147.089-82.191zM63.891 329.726l-.184.089c-8.903 4.719-15.864 9.744-20.75 16.609-4.913 6.867-6.78 15.089-6.719 23.229-.036 15.059 3.896 30.975 15.806 42.961 11.913 11.986 30.389 18.556 55.65 18.519l.825.001c25.365.002 44.087-9.187 55.192-23.832 11.225-14.671 15.03-32.854 16.747-50.711 1.109-12.717 1.812-22.076 4.063-28.498 2.301-6.344 5.209-10.687 13.945-16.396l26.585-14.879-45.371-25.424-115.789 58.332zm67.699 58.596c-23.329 12.497-52.377 3.716-64.871-19.613l84.477-45.258c12.504 23.325 3.724 52.375-19.606 64.871zm66.817-188.384c-8.692-5.691-11.589-10.027-13.885-16.354-2.245-6.423-2.954-15.78-4.063-28.476-1.717-17.881-5.522-36.065-16.747-50.736-11.228-14.804-30.241-24.03-56.017-23.829-25.262-.044-43.737 6.53-55.65 18.515-11.91 11.986-15.841 27.904-15.806 42.964-.062 8.137 1.806 16.361 6.719 23.225 4.886 6.866 11.847 11.891 20.75 16.609l.142.075 125.137 63.013 7.399 3.709c3.797 1.905 5.341 6.53 3.432 10.323-.263.522-.608.968-.965 1.397-.041.051-.066.107-.106.156-.011.012-.017.027-.028.037l119.661 67.057 83.948 38.963c15.516 7.695 28.049 10.986 38.202 11.035 6.894.011 12.904-1.468 17.711-4.314 4.825-2.809 8.12-6.875 9.981-10.666l4.558-9.121-234.265-131.149-40.108-22.433zm-46.712-10.391l-84.14-45.895c12.674-23.236 41.782-31.797 65.015-19.125 23.238 12.679 31.798 41.785 19.125 65.02z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dashboard.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dashboard.svg
new file mode 100644
index 0000000000..13cd3bfa96
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dashboard.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.188 58.56c-108.788 0-196.976 88.191-196.976 196.976 0 108.789 88.188 196.977 196.976 196.977 108.786 0 196.974-88.188 196.974-196.977 0-108.785-88.187-196.976-196.974-196.976zm-9.424 37.413h25.039v49.152h-25.039V95.973zm-74.912 91.94l-34.753-34.762 17.701-17.702 34.761 34.753-17.709 17.711zm12.352-73.917l22.694-10.58 20.768 44.545-22.688 10.578-20.774-44.543zm75.442 285.108c-21.773 0-39.42-17.647-39.42-39.417 0-17.004 10.781-31.445 25.863-36.979v-112.43h25.037v111.697c16.168 4.916 27.937 19.934 27.937 37.712 0 21.769-17.648 39.417-39.417 39.417zm29.333-251.183l20.776-44.552 22.693 10.59-20.774 44.541-22.695-10.579zm55.039 39.992l-17.708-17.711 34.76-34.753 17.701 17.702-34.753 34.762z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-defrag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-defrag.svg
new file mode 100644
index 0000000000..e26de351e9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-defrag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M191.562 190.834h58.301v130.333h-58.301zm0 142.607h58.301v58.302h-58.301zm-70.574-142.607h58.299v58.304h-58.299zm141.151-.135h58.301v201.044h-58.301zm70.576 142.742h58.301v58.302h-58.301zM191.562 120.258h58.301v58.302h-58.301zm141.153 0h58.301v58.302h-58.301zM120.986 49.68h58.301v58.303h-58.301zm211.729 215.006h58.301v58.303h-58.301zm-153.428-4.34h-58.299V462.32h270.028v-58.302H179.287z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-delete-key.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-delete-key.svg
new file mode 100644
index 0000000000..c738e7c8cf
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-delete-key.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M338.495 89.965H70.735c-15.6 0-28.255 12.673-28.255 28.271v274.608c0 15.619 12.655 28.26 28.255 28.26h267.76L469.01 255.532 338.495 89.965zm-14.844 300.508H73.122v-269.85h250.529l106.345 134.909-106.345 134.941zM298.633 159.93l-74.43 74.463-74.428-74.463-21.159 21.156 74.431 74.446-74.431 74.446 21.159 21.125 74.428-74.395 74.43 74.395 21.157-21.125-74.428-74.446 74.428-74.446-21.157-21.156z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-delete.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-delete.svg
new file mode 100644
index 0000000000..1d931cc09b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-delete.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M401.431 167.814l-58.757-58.76-88.029 88.026-88.028-88.026-58.76 58.76 88.026 88.027-88.026 88.024 58.76 58.768 88.028-88.031 88.029 88.031 58.757-58.768-88.027-88.024z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-departure.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-departure.svg
new file mode 100644
index 0000000000..243f789b80
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-departure.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M50.238 428.833h199.477v-65.892H50.238v65.892zm396.506-304.288c-7.881-16.383-27.569-23.285-43.983-15.438l-114.294 55.038-125.735-65.17c-15.077-10.204-32.147-15.961-42.317-.852-10.204 15.07-3.109 26.485 11.97 36.725l82.441 64.782-43.755 21.055-56.021-24.098-26.029 60.533 69.784 30.048c8.765 3.763 18.74 3.534 27.341-.587L431.34 168.494l29.695-14.254-14.291-29.695z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-desk.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-desk.svg
new file mode 100644
index 0000000000..270e0f1dff
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-desk.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M459.543 154.424H53.519v52.357h30.82v150.721h24.938V206.781h296.274v150.721h24.955V206.781h29.037z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-desktop.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-desktop.svg
new file mode 100644
index 0000000000..de5366b44b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-desktop.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M374.787 331.291H137.211l-23.68 37.098h284.938zM445.564 89.08H66.436c-9.34 0-16.91 7.572-16.91 16.912V422.92h412.947V105.992c0-9.34-7.569-16.912-16.909-16.912zm-12.197 304.732H78.629V169.059h354.738v224.753z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagnostics.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagnostics.svg
new file mode 100644
index 0000000000..66e2b4c653
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagnostics.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M384.37 112.165c0-21.599-4.415-42.043-12.067-60.374l-3.223-7.667h-67.677v24.948h50.805a131.485 131.485 0 0 1 7.242 43.093c0 19.243-4.056 37.351-11.149 53.329-7.865.174-15.535 4.056-20.213 11.095-17.232 25.712-43.099 41.002-71.55 41.017-28.45-.015-54.333-15.305-71.552-41.017-4.709-7.062-12.392-10.938-20.274-11.095-7.08-15.978-11.152-34.085-11.152-53.329.016-15.231 2.617-29.745 7.243-43.093h44.425V44.124h-61.314l-3.172 7.667c-7.686 18.331-12.1 38.775-12.1 60.374 0 23.532 5.134 45.782 14.225 65.453-4.79 7.99-4.905 18.321.605 26.597 19.44 29.368 48.791 51.446 83.143 59.724 0 1.076-.033 2.153-.033 3.241-.048 11.481.916 24.432 6.23 37.823 5.281 13.405 13.9 26.045 26.799 40.949a24.896 24.896 0 0 0 18.836 8.607c1.833 0 3.646-.227 5.46-.639a628.853 628.853 0 0 0 9.208 9.424c15.974 15.903 23.364 33.787 23.281 47.486-.081 9.727-3.219 17.152-9.563 22.865-6.377 5.678-17.005 10.057-33.585 10.072-14.421.068-26.456-7.98-35.381-17.2a78.212 78.212 0 0 1-3.108-3.391c7.88-9.489 12.623-21.69 12.623-34.966 0-30.262-24.624-54.877-54.89-54.877-30.265 0-54.857 24.615-54.857 54.877 0 30.268 24.593 54.869 54.857 54.869a54.596 54.596 0 0 0 22.4-4.787 118.472 118.472 0 0 0 5.053 5.607c11.381 11.809 29.268 24.756 53.304 24.821h.132c20.846 0 37.997-5.688 50.032-16.384 12.067-10.662 18.003-25.939 17.921-41.508-.065-22.213-10.955-45.413-30.594-65.145a551.42 551.42 0 0 1-8.518-8.654c2.484-7.963.947-16.979-4.939-23.76-10.985-12.637-15.824-20.779-18.033-26.462-2.174-5.714-2.764-10.22-2.797-19.631v-1.282c38.621-6.084 71.848-29.505 93.167-61.683 5.495-8.282 5.364-18.66.557-26.645 9.092-19.658 14.193-41.879 14.193-65.401zM162.537 388.211c0-16.551 13.424-29.939 29.956-29.939 16.529 0 29.955 13.389 29.955 29.939 0 16.534-13.426 29.939-29.955 29.939-16.532 0-29.956-13.405-29.956-29.939z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagonal-arrow-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagonal-arrow-alt.svg
new file mode 100644
index 0000000000..fb4970d319
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagonal-arrow-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M360.643 185.692l32.238 32.24 10.453-109.268-109.27 10.449 32.233 32.236-174.945 174.949-32.231-32.232-10.455 109.27 109.268-10.455-32.241-32.239z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagonal-arrow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagonal-arrow.svg
new file mode 100644
index 0000000000..c10853ffcc
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagonal-arrow.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M326.307 360.642l-32.241 32.239 109.268 10.455-10.449-109.274-32.233 32.236-174.951-174.949 32.233-32.23-109.268-10.455 10.455 109.268 32.236-32.24z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diamond.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diamond.svg
new file mode 100644
index 0000000000..e831ae1172
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diamond.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M382.256 70.832H129.031L57.2 171.553l198.436 269.51 198.434-269.51-71.814-100.721zm-158.555 85.252l31.967-42.512 31.967 42.512h-63.934zm69.77 30.642l-37.803 157.248-37.803-157.248h75.606zm-8.535-85.253h60.662l-30.33 40.337-30.332-40.337zm-88.848 40.337l-30.349-40.305h60.662l-30.313 40.305zm-27.635 14.274h-62.575l30.463-42.708 32.112 42.708zm17.904 30.642L225.09 347.86 106.45 186.726h79.907zm138.639 0h79.824L286.292 347.734l38.704-161.008zm17.886-30.642l32.099-42.677 30.43 42.677h-62.529z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diamonds.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diamonds.svg
new file mode 100644
index 0000000000..bf1cd0b8a4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diamonds.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.368 438.932L101.655 255.867 256.368 72.805l154.71 183.062z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dice.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dice.svg
new file mode 100644
index 0000000000..bbb86cf68d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dice.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M195.481 223.372c0-10.382 8.401-18.771 18.768-18.771 3.319 0 6.443.866 9.143 2.372l48.349-48.354V91.684c0-9.338-7.553-16.89-16.906-16.89H90.704c-9.336 0-16.906 7.552-16.906 16.89v164.161c0 9.321 7.57 16.89 16.906 16.89h66.941c.065-.048.097-.095.145-.165l40.062-40.058c-1.489-2.713-2.371-5.818-2.371-9.14zm-64.209 18.769c-10.367 0-18.788-8.387-18.788-18.769 0-10.382 8.421-18.771 18.788-18.771 10.365 0 18.787 8.388 18.787 18.771.001 10.382-8.421 18.769-18.787 18.769zm-18.788-68.38c0-10.383 8.421-18.785 18.788-18.785 10.365 0 18.787 8.402 18.787 18.785 0 10.367-8.422 18.775-18.787 18.775-10.367 0-18.788-8.408-18.788-18.775zm18.788-30.835c-10.367-.017-18.788-8.418-18.788-18.785 0-10.366 8.421-18.774 18.788-18.774 10.365 0 18.787 8.408 18.787 18.774.001 10.381-8.421 18.768-18.787 18.785zm82.977-37.56c10.367 0 18.788 8.408 18.788 18.774 0 10.367-8.421 18.785-18.788 18.785-10.367-.017-18.768-8.418-18.768-18.785 0-10.366 8.401-18.774 18.768-18.774zm0 49.61c10.402 0 18.771 8.402 18.788 18.785-.017 10.367-8.386 18.775-18.788 18.775-10.367 0-18.768-8.408-18.768-18.775 0-10.383 8.401-18.785 18.768-18.785zm217.225 135.222L315.398 174.141c-6.606-6.605-17.301-6.605-23.889-.015l-116.09 116.072c-6.591 6.606-6.591 17.301 0 23.908L291.51 430.179c6.588 6.606 17.282 6.606 23.904 0l116.06-116.072c6.602-6.608 6.602-17.302 0-23.909zM252.3 315.457a18.695 18.695 0 0 1-13.245 5.498h-.016c-4.808 0-9.63-1.833-13.276-5.498a18.493 18.493 0 0 1-5.495-13.277 18.5 18.5 0 0 1 5.495-13.26 18.717 18.717 0 0 1 13.276-5.507c4.773 0 9.599 1.831 13.261 5.507l-3.518 3.518 3.533-3.518a18.824 18.824 0 0 1 5.477 13.26c0 4.796-1.845 9.618-5.492 13.277zm64.421 64.408a18.862 18.862 0 0 1-13.242 5.476h-.018a18.776 18.776 0 0 1-13.293-5.509c-3.662-3.664-5.512-8.469-5.477-13.275a18.517 18.517 0 0 1 5.477-13.261 18.83 18.83 0 0 1 13.293-5.508c4.773 0 9.613 1.843 13.26 5.508a18.715 18.715 0 0 1 5.496 13.261c.014 4.806-1.85 9.611-5.496 13.308zm-32.162-77.685c0-4.773 1.835-9.626 5.496-13.26 3.627-3.659 8.483-5.507 13.26-5.507 4.79 0 9.631 1.848 13.293 5.507 3.662 3.649 5.493 8.486 5.493 13.281 0 4.774-1.831 9.613-5.493 13.256a18.694 18.694 0 0 1-13.244 5.498h-.049c-4.793 0-9.633-1.833-13.26-5.498-3.661-3.643-5.496-8.481-5.496-13.277zm32.162-51.173a18.757 18.757 0 0 1-13.242 5.509h-.018a18.78 18.78 0 0 1-13.293-5.509 18.772 18.772 0 0 1-5.512-13.282c0-4.789 1.85-9.625 5.512-13.275a18.768 18.768 0 0 1 13.293-5.493 18.647 18.647 0 0 1 13.275 5.493 18.67 18.67 0 0 1 5.48 13.275c.015 4.796-1.849 9.602-5.495 13.282zm64.408 64.45c-3.631 3.665-8.455 5.498-13.229 5.498h-.032a18.641 18.641 0 0 1-13.277-5.498 18.703 18.703 0 0 1-5.51-13.256c0-4.795 1.846-9.632 5.51-13.281 3.646-3.676 8.484-5.507 13.277-5.507 4.789 0 9.614 1.848 13.261 5.491l-3.5 3.533 3.5-3.518a18.73 18.73 0 0 1 5.508 13.26c0 4.776-1.846 9.619-5.508 13.278z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diploma-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diploma-alt.svg
new file mode 100644
index 0000000000..b4a5fcfeb9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diploma-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M173.896 109.807h158.748v49.727H173.896zm0 93.795h158.748v23.68H173.896zm0 46.951h158.748v23.68H173.896zM115.059 51.6v300.77l6.936 6.936 79.43 79.432 6.936 6.938h47.656v-23.678h-16.674c-35.182 0-18.23-83.396-18.23-83.396s-81.328 19.768-82.375-17.523V75.28h234.525v346.719h-31.33v23.678h55.01V51.6H115.059zm183.916 265.564c-22.643 0-41 18.355-41 40.998 0 22.639 18.357 40.996 41 40.996 22.639 0 40.996-18.357 40.996-40.996 0-22.642-18.358-40.998-40.996-40.998zm-21.719 97.545V460.4l21.717-10.379 21.719 10.379v-45.691a60.269 60.269 0 0 1-21.717 4.041 60.263 60.263 0 0 1-21.719-4.041z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diploma.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diploma.svg
new file mode 100644
index 0000000000..31b542d112
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diploma.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M76.37 267.502c3.113-7.115 6.701-21.167 8.232-41.068h-17.08c.963 19.599 4.389 35.352 8.848 41.068zm-9.123-135.056c-10.15 0-18.471 30.964-19.252 70.309h38.49c-.785-39.345-9.097-70.309-19.238-70.309zm243.994 153.633l-25.367 81.836 29.611-10.555 18.453 25.454 25.008-80.678c-1.299.075-2.6.123-3.916.123-16.697.001-31.99-6.104-43.789-16.18zm-1.914-51.362a45.703 45.703 0 1 1 91.406 0 45.703 45.703 0 1 1-91.406 0zm70.934 62.636l-14.791 47.71 11.701 37.752 18.455-25.454 29.611 10.555-25.588-82.553a67.713 67.713 0 0 1-19.388 11.99zm64.877-168.167H94.603c13.566 21.55 14.453 65.991 14.453 77.13 0 11.137-.887 55.576-14.455 77.125h197.627l4.533-14.63a67.102 67.102 0 0 1-9.273-34.094c0-37.243 30.301-67.543 67.543-67.543s67.539 30.3 67.539 67.543a67.096 67.096 0 0 1-8.59 32.909l4.902 15.814h26.256c10.418-.002 18.869-34.53 18.867-77.125 0-42.601-8.447-77.129-18.867-77.129zM234.507 244.188h-67.502v-23.68h67.502v23.68zm23.828-45.704H148.062v-23.679h110.273v23.679z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-directions-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-directions-alt.svg
new file mode 100644
index 0000000000..4a07354199
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-directions-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.758 38.612l-73.579 89.128h48.006v345.804h51.178V127.74h47.974l-73.579-89.128zm216.681 211.532l-89.147-73.58v47.989H307.49v248.991h51.145v-197.83h24.657v47.989l89.147-73.559zm-343.401 20.11l-89.144 73.582 89.144 73.575v-48.006h26.358V473.56h51.144V318.259h-77.502v-48.005z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-directions.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-directions.svg
new file mode 100644
index 0000000000..a56100bb2a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-directions.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M131.368 266.5L90.59 302.109l-6.442 5.635 6.442 5.632 40.778 35.599 2.111 1.853h240.179v-86.187H133.479l-2.111 1.859zm289.313-122.029l-40.778-35.611-2.109-1.857H137.617V193.2h240.176l2.109-1.867 40.778-35.597 6.441-5.631-6.44-5.634zM282.01 54.982h-65.88v34.582h65.88V54.982zm-65.88 401.789h65.88v-88.49h-65.88v88.49zm0-246.119v36.549h65.88v-36.549h-65.88z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-disc.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-disc.svg
new file mode 100644
index 0000000000..8f694bc43f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-disc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.209 37.588c120.4 0 217.998 97.602 217.998 217.999 0 120.395-97.598 217.996-217.998 217.996-120.397 0-218-97.602-218-217.996.001-120.397 97.603-217.999 218-217.999m0 115.178c-56.695 0-102.821 46.125-102.821 102.821 0 56.692 46.125 102.817 102.821 102.817 56.695 0 102.818-46.125 102.818-102.817 0-56.695-46.123-102.821-102.818-102.821zm0 30.651c-39.856 0-72.169 32.312-72.169 72.17 0 39.856 32.313 72.169 72.169 72.169s72.167-32.312 72.167-72.169c.001-39.858-32.311-72.17-72.167-72.17zm0 97.599c-14.043 0-25.43-11.388-25.43-25.429 0-14.044 11.387-25.43 25.43-25.43 14.044 0 25.429 11.386 25.429 25.43.001 14.041-11.384 25.429-25.429 25.429z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-disk-image.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-disk-image.svg
new file mode 100644
index 0000000000..80a69f30d0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-disk-image.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M130.681 367.364h250.641c6.537 0 11.84-5.301 11.84-11.839 0-6.536-5.303-11.839-11.84-11.839H130.681c-6.541 0-11.84 5.303-11.84 11.839 0 6.538 5.299 11.839 11.84 11.839zM385.989 94.026H125.955L49.623 289.662v128.312h412.754V289.662L385.989 94.026zm52.71 300.269H73.3V313.34h365.398v80.955z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-display.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-display.svg
new file mode 100644
index 0000000000..22cf1ef0eb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-display.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M307.748 395.951c-.893-4-1.52-7.932-1.982-11.646H201.583c-.933 7.47-2.595 15.908-5.507 23.7-2.911 7.846-7.047 14.971-12.662 19.989-5.64 5.007-12.646 8.146-22.442 8.18v9.323h185.397v-9.323c-9.799-.034-16.805-3.173-22.447-8.186-8.434-7.496-13.491-19.881-16.174-32.037zM458.844 67.933H48.502c-6.839 0-12.382 5.546-12.382 12.384v269.639c0 6.84 5.543 12.388 12.382 12.388h410.342c6.842 0 12.385-5.548 12.385-12.388V80.316c0-6.837-5.543-12.383-12.385-12.383zm-17.662 264.363H66.168V97.981h375.014v234.315z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dna.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dna.svg
new file mode 100644
index 0000000000..a4cc100411
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dna.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M315.299 155.551c-14.356-13.309-30.084-23.151-45.422-32.309-19.262-11.281-34.664-21.945-44.41-34.127a73.304 73.304 0 0 1-6.182-9.012l14.422-2.075c3.795-.538 9.29.997 12.197 3.419 0 0 3.957 3.306 10.336 3.306 8.404 0 14.159-7.2 14.159-7.2 2.355-3.004 7.39-5.882 11.183-6.421l16.777-2.423c0 .037-.031.066-.031.085-4.024 11.639-10.336 20.502-19.623 29.204-1.015.912-2.025 1.794-3.073 2.712 1.667 1.047 3.435 2.091 5.298 3.188l.032.014c12.82 7.621 27.472 16.615 41.531 28.386a128.033 128.033 0 0 0 6.477-7.355c8.532-10.562 15.891-23.121 20.798-37.506 4.61-13.379 7.161-28.29 7.488-44.479h-54.581a130.35 130.35 0 0 1-.295 5.414l-23.644 3.385c-3.758.521-9.252-.982-12.196-3.47 0 0-3.924-3.201-10.3-3.235-8.374.034-14.129 7.196-14.129 7.196-2.353 2.974-7.391 5.864-11.183 6.405L212.06 61.37c-1.211-5.36-2.026-11.416-2.256-18.412H155.26c.323 16.22 2.842 31.068 7.486 44.479 7.358 21.647 20.177 38.911 34.434 52.076 14.356 13.324 30.085 23.184 45.456 32.324 19.263 11.282 34.663 21.973 44.377 34.107 1.177 1.426 2.222 2.878 3.236 4.335l-11.513 1.667c-3.758.526-9.252-1.014-12.196-3.471 0 0-3.924-3.219-10.3-3.25-8.374.031-14.129 7.177-14.129 7.177-2.353 2.992-7.391 5.904-11.183 6.426l-14.65 2.128c4.056-9.093 9.712-16.55 17.528-23.875.95-.881 1.931-1.797 2.978-2.683-1.703-1.015-3.434-2.061-5.3-3.136l-.196-.135h-.032c-12.754-7.604-27.305-16.574-41.336-28.251a120.762 120.762 0 0 0-6.378 7.262c-8.566 10.53-15.891 23.083-20.827 37.489-4.939 14.374-7.491 30.43-7.491 48.025v.342c0 17.575 2.552 33.632 7.522 48.007 7.358 21.63 20.177 38.864 34.434 52.045 14.356 13.34 30.085 23.183 45.456 32.307 19.229 11.314 34.663 21.977 44.377 34.177 1.798 2.168 3.37 4.447 4.839 6.786l-13.115 1.912c-3.758.539-9.252-1-12.196-3.457 0 0-3.924-3.251-10.3-3.251-8.374 0-14.129 7.18-14.129 7.18-2.353 2.989-7.391 5.868-11.183 6.423l-15.829 2.26c4.057-10.449 10.107-18.655 18.707-26.75.95-.9 1.931-1.783 2.978-2.68a1193.703 1193.703 0 0 0-5.267-3.127l-.098-.078c-12.82-7.591-27.436-16.583-41.5-28.355a138.422 138.422 0 0 0-6.378 7.277c-8.566 10.564-15.891 23.121-20.827 37.506-4.613 13.393-7.132 28.275-7.455 44.478h54.545c.096-2.729.262-5.333.521-7.783l23.381-3.387c3.795-.536 9.29 1.016 12.197 3.436 0 0 3.957 3.289 10.336 3.289 8.404 0 14.159-7.184 14.159-7.184 2.355-2.988 7.39-5.884 11.183-6.405l18.282-2.652c1.535 5.875 2.583 12.657 2.811 20.687h54.581c-.327-16.202-2.878-31.085-7.488-44.478-7.359-21.63-20.21-38.877-34.469-52.047-14.356-13.354-30.084-23.211-45.457-32.341-19.227-11.294-34.629-21.956-44.375-34.12-2.485-3.123-4.674-6.295-6.572-9.717l14.812-2.123c3.795-.569 9.29.97 12.197 3.419 0 0 3.957 3.3 10.336 3.3 8.404 0 14.159-7.209 14.159-7.209 2.355-2.987 7.39-5.867 11.183-6.428l17.038-2.435c-.096.281-.193.573-.292.883-4.024 11.628-10.336 20.455-19.623 29.174-1.015.914-2.025 1.826-3.073 2.744 1.667 1.016 3.435 2.046 5.298 3.155l.096.051-.129-.083c12.85 7.635 27.502 16.677 41.597 28.447a145.393 145.393 0 0 0 6.477-7.341c8.532-10.577 15.858-23.137 20.798-37.536 4.936-14.343 7.521-30.431 7.521-48.011v-.307c0-17.596-2.586-33.668-7.521-48.025-7.359-21.629-20.21-38.864-34.438-52.045m-12.59 103.896h-.066c-.065 1.6-.13 3.136-.228 4.64l-23.711 3.435c-3.758.526-9.252-.994-12.196-3.466 0 0-3.924-3.221-10.3-3.252-8.374.031-14.129 7.178-14.129 7.178-2.353 3.011-7.391 5.886-11.183 6.409l-19.03 2.763c-1.344-6.117-2.126-13.098-2.16-21.372v-3.692h.066c.13-3.796.424-7.295.852-10.598l23.051-3.303c3.795-.553 9.29.983 12.197 3.404 0 0 3.957 3.299 10.336 3.299 8.404 0 14.159-7.192 14.159-7.192 2.355-2.989 7.39-5.869 11.183-6.412l17.561-2.529c2.19 7.326 3.565 16.085 3.599 27.023v3.665z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dock-connector.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dock-connector.svg
new file mode 100644
index 0000000000..82480deaa1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dock-connector.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M307.76 184.502H199.091c-11.674.031-21.192 9.516-21.192 21.224s9.518 21.188 21.192 21.227H307.76c11.706-.038 21.188-9.518 21.222-21.227-.034-11.708-9.516-21.193-21.222-21.224zm-6.641 29.939h-95.357v-17.466h95.357v17.466zM86.927 139.734v141.501h142.837v192.136h51.146V281.235h144.771V139.734H86.927zM307.76 244.377H199.091c-21.356 0-38.655-17.299-38.655-38.652 0-21.372 17.298-38.658 38.655-38.687l108.668.029c21.352 0 38.684 17.286 38.684 38.658 0 21.353-17.332 38.652-38.683 38.652zm89.372-205.855H115.506v75.932h281.626V38.522z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-document-dashed-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-document-dashed-line.svg
new file mode 100644
index 0000000000..6117d4c7f4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-document-dashed-line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M168.454 463.182h46.027v-24.51h-46.027v24.51zM107.973 92.637h24.934V73.555h18.084v-24.9h-43.018v43.982zm24.934 202.718h-24.934v44.309h24.934v-44.309zm0 123.497h-24.934v44.33h43.018v-24.51h-18.084v-19.82zm0-61.741h-24.934v44.293h24.934v-44.293zm0-247.025h-24.934v44.292h24.934v-44.292zm0 123.512h-24.934v44.308h24.934v-44.308zm0-61.757h-24.934v44.31h24.934v-44.31zm246.948 167.823h24.949v-44.309h-24.949v44.309zm0-61.758h24.949v-44.308h-24.949v44.308zm0 123.498h24.949v-44.293h-24.949v44.293zM397.48 139.58l-83.618-83.635-7.308-7.289h-74.608v24.9h41.989c37.049 0 19.179 87.836 19.179 87.836s85.712-20.829 86.741 18.478v36.281h24.949v-69.262l-7.324-7.309zM231.946 463.182h46.043v-24.51h-46.043v24.51zm147.909-24.51h-20.93v24.51h45.879v-44.33h-24.949v19.82zM168.454 73.555h46.027v-24.9h-46.027v24.9zm126.982 389.627h46.03v-24.51h-46.03v24.51z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-document.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-document.svg
new file mode 100644
index 0000000000..d2da15ad9e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-document.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M396.441 138.878l-83.997-83.993-7.331-7.333H105.702v416.701h298.071V146.214l-7.332-7.336zM130.74 439.217V72.591h141.613c37.201 0 19.274 88.18 19.274 88.18s86-20.901 87.104 18.534v259.912H130.74z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-documents.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-documents.svg
new file mode 100644
index 0000000000..4e56ca7b49
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-documents.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M243.47 64.86l-7.335-7.333H36.725V474.23h298.07V156.187l-7.332-7.335L243.47 64.86zm66.287 384.329H61.761V82.566h141.615c37.203 0 19.276 88.18 19.276 88.18s86-20.9 87.104 18.53v259.913zm157.051-330.866l-81.266-81.268H258.938l25.043 25.038h71.481c.063 0 .12.01.185.01-.006.286-.023.547-.023.837 11.174 0 16.69 9.045 19.118 20.95 4.358 22.959-2.312 55.826-2.312 55.826s.137-.031.341-.082c-.114.602-.181.933-.181.933s67.129-16.325 75.793 10.732c.077.294.161.585.225.887.083.302.14.612.207.921.154.928.26 1.889.287 2.904v228.807h-87.998l.002 25.037h113.037V125.66l-7.335-7.337z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dollar-bag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dollar-bag.svg
new file mode 100644
index 0000000000..bc9dcb83cf
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dollar-bag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M235.567 264.973c-1.914 1.523-3.401 3.427-4.498 5.698-1.08 2.251-1.636 4.907-1.636 7.976 0 4.806 1.537 8.521 4.595 11.158 3.058 2.613 8.094 4.742 15.092 6.337V260.49c-2.483 0-4.905.363-7.228 1.095-2.32.731-4.447 1.853-6.325 3.388zm44.718 73.703c-3.581-2.836-9.647-5.42-18.249-7.748v41.975c2.618-.275 5.364-.902 8.177-1.848 2.861-.952 5.396-2.292 7.686-4.051 2.239-1.737 4.087-3.898 5.56-6.444 1.454-2.555 2.189-5.582 2.189-9.077-.001-5.682-1.8-9.96-5.363-12.807zm44.05-165.904l.031.027c-.097-.108-.163-.213-.261-.319a667.29 667.29 0 0 0-12.46-16.761c-5.396-9.025-8.239-20.006-1.637-35.849v-.009l22.78-54.505-35.76-16.298 3.662-16.156h-89.832l4.709 20.585-36.787 11.869 22.761 54.505v.009c11.265 26.945-4.858 39.813-14.326 52.928-46.859 64.796-99.312 157.564-99.312 213.49 0 92.734 72.025 89.646 167.889 89.646 95.85 0 167.891 3.088 167.891-89.646-.001-55.934-52.504-148.702-99.348-213.516zm-91.106-45.504h45.846v28.931h-45.846v-28.931zm81.066 237.654c-1.602 4.901-4.479 9.67-8.633 14.328-4.154 4.678-9.744 8.83-16.745 12.479-6.998 3.644-15.958 5.826-26.881 6.554v18.602H249.12v-18.602c-16.335-1.161-29.104-6.195-38.277-15.098-9.206-8.893-14.52-21.934-15.974-39.154h30.839c-.134 8.334 2.057 14.879 6.57 19.697 4.512 4.807 10.14 7.869 16.842 9.174v-45.697c-.734-.303-1.715-.627-2.959-.99a47.127 47.127 0 0 0-4.039-.984 178.976 178.976 0 0 1-15.958-5.135c-5.265-1.965-9.973-4.604-14.125-7.873-4.155-3.28-7.473-7.379-9.945-12.247-2.482-4.89-3.727-10.974-3.727-18.267 0-7.436 1.424-14 4.284-19.684 2.843-5.693 6.573-10.465 11.25-14.333 4.676-3.859 10.072-6.842 16.187-8.965 6.133-2.112 12.459-3.385 19.032-3.828v-16.842h12.916v16.842c6.543.731 12.706 2.158 18.479 4.266 5.737 2.127 10.806 5.028 15.204 8.75 4.349 3.714 7.946 8.356 10.694 13.878 2.779 5.572 4.383 12.123 4.807 19.689h-31.049c-.149-5.82-1.98-10.791-5.463-14.861-3.516-4.089-7.734-6.132-12.673-6.132v38.714c1.736.447 3.52.884 5.364 1.312 1.799.442 3.745.938 5.788 1.537 10.791 2.908 19.1 6.522 24.919 10.824 5.82 4.299 10.138 8.779 12.917 13.447 2.763 4.683 4.398 9.347 4.921 14.004.507 4.67.77 8.813.77 12.475.001 3.191-.817 7.247-2.419 12.12z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-donate.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-donate.svg
new file mode 100644
index 0000000000..c2669c3a5c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-donate.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M236.555 298.982l-66.399-66.42-14.111 14.127c-7.8 7.781-7.8 20.435 0 28.188l40.614 40.635v21.271l-.801-.427-65.175-65.175V163.199c0-14.449-11.706-26.154-26.158-26.154H78.396v178.452h.017l68.542 68.542v83.958h89.621l-.02-31.899c0-.031.02-.068.02-.068l-.021-137.048zm171.684-161.937c-14.437 0-26.146 11.705-26.146 26.154v107.982l-65.156 65.175-.834.427v-21.271l40.631-40.635c7.799-7.753 7.799-20.406 0-28.188l-14.11-14.127-66.415 66.42v169.014h89.633v-83.958l68.51-68.542h.033V137.045h-26.146zm-85.04 62.849c0-21.062-17.071-38.099-38.113-38.099-21.043 0-38.098 17.036-38.098 38.099 0 21.062 17.055 38.129 38.098 38.129 21.042-.001 38.113-17.068 38.113-38.129zM212.241 99.111c-21.057 0-38.097 16.998-38.097 38.059 0 21.029 17.04 38.129 38.097 38.129 21.029 0 38.099-17.1 38.099-38.129 0-21.061-17.07-38.059-38.099-38.059zm78.745 21.006c21.03 0 38.117-17.066 38.117-38.114 0-21.026-17.087-38.081-38.117-38.081-21.057 0-38.097 17.055-38.097 38.081.001 21.048 17.041 38.114 38.097 38.114z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-door-open-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-door-open-alt.svg
new file mode 100644
index 0000000000..57552cc455
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-door-open-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M134.506 84.553v342.895h242.988V84.553H134.506zm214.572 314.48H162.922V112.967h186.156v286.066zm-52.244-274.226H174.76v262.369l122.074-70.186V124.807zm-21.449 83.646l-19.459 11.191V192.33l19.459-11.189v27.312z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-door-open.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-door-open.svg
new file mode 100644
index 0000000000..02339e4b8b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-door-open.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M134.935 396.086l148.268 61.566v-340.26L134.935 55.825v340.261zm97.309-123.089l19.953 8.285v25.639l-19.953-8.284v-25.64zM162.25 54.348l68.427 28.415h117.971v286.066h-53.607v28.414h82.023V54.348z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-download-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-download-alt.svg
new file mode 100644
index 0000000000..3b788ff610
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-download-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M348.842 268.008v30.672h59.451v91.495h-304.42V298.68h59.484v-30.672H73.23v152.807h365.737V268.008h-90.125zm25.343-78.879h-77.666V90.827h-82.768v98.302h-77.632l119.033 144.245 119.033-144.245z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-download.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-download.svg
new file mode 100644
index 0000000000..a328fe65f7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-download.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M374.438 134.578H296.45V35.849h-83.102v98.729H135.36l119.542 144.834 119.536-144.834zM283.64 456.812c-1.452-3.889-2.28-8.094-2.748-11.82h-51.995c-.465 3.729-1.293 7.938-2.747 11.827-3.039 7.893-7.913 14.011-17.521 14.06v4.656h92.537v-4.656c-9.613-.049-14.486-6.17-17.526-14.067zm73.664-169.73H152.492a6.179 6.179 0 0 0-6.18 6.182v134.58a6.182 6.182 0 0 0 6.18 6.184h204.812a6.183 6.183 0 0 0 6.183-6.184v-134.58a6.181 6.181 0 0 0-6.183-6.182zm-23.866 116.901H176.357v-86.855h157.081v86.855z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-drop.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-drop.svg
new file mode 100644
index 0000000000..7523004cad
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-drop.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M358.763 305.03c0-56.752-102.764-200.823-102.764-200.823S153.237 248.278 153.237 305.03c0 56.756 46.008 102.764 102.762 102.764 56.755-.001 102.764-46.008 102.764-102.764z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eco.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eco.svg
new file mode 100644
index 0000000000..dad4c564c0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eco.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M421.889 460.736c-.459-83.039-22.836-142.711-55.193-183.683-32.996-41.698-76.687-64.476-120.131-71.964-63.36-10.927-96.707-27.832-114.955-43.928-9.958-10.05-14.437-38.093-14.437-38.093s26.747 16.498 37.509 22.444c13.506 9.217 43.304 24.194 96.411 33.294 49.38 8.449 99.282 34.595 136.514 81.712 6.736 8.502 13.031 17.707 18.836 27.572 43.894-96.138-51.242-170.037-158.588-184.229C129.958 88.295 73.417 51.986 73.417 51.986c-11.3 114.114 30.167 238.013 127.971 278.382 70.372 29.072 125.688 34.927 164.52 8.751 15.96 34.277 25.736 73.843 25.77 120.113v1.631l30.211-.127z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-economy.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-economy.svg
new file mode 100644
index 0000000000..4e710b572a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-economy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.837 257.082c-.477.805-.542 1.186-.572 1.414.03.21.096.596.572 1.387.573.975 1.814 2.472 3.908 4.137 4.134 3.379 11.478 7.246 21.077 10.482 19.209 6.592 47.203 10.952 78.105 10.916 40.485.137 76.21-7.711 93.199-17.439 5.657-3.113 8.895-6.368 9.861-8.096.456-.791.538-1.177.572-1.387-.034-.229-.116-.609-.572-1.414-.572-.958-1.832-2.463-3.894-4.131-4.137-3.388-11.51-7.24-21.106-10.478-19.196-6.585-47.19-10.942-78.061-10.929-40.485-.127-76.245 7.743-93.231 17.466-5.657 3.105-8.91 6.38-9.858 8.072zm189.211 41.02c-22.826 7.744-52.895 12.242-86.12 12.266-42.676-.137-79.826-7.199-103.663-19.725v25.055c0 .229 0 .545.572 1.555.573.971 1.814 2.477 3.908 4.135 4.134 3.368 11.478 7.246 21.077 10.474 19.209 6.58 47.203 10.942 78.105 10.921 40.419.148 76.196-7.732 93.184-17.453 5.673-3.123 8.91-6.387 9.877-8.086.572-1 .555-1.326.572-1.545V290.67c-5.248 2.781-11.087 5.226-17.512 7.432zm-86.12 69.626c-42.676-.132-79.826-7.196-103.663-19.734v27.72c0 .227 0 .555.572 1.553.573.972 1.814 2.458 3.908 4.12 4.134 3.386 11.478 7.245 21.077 10.483 19.209 6.59 47.203 10.951 78.105 10.916 40.419.136 76.196-7.723 93.184-17.438 5.673-3.116 8.91-6.37 9.877-8.097.572-1 .555-1.324.572-1.537v-27.699c-5.265 2.805-11.118 5.245-17.562 7.446-22.791 7.742-52.879 12.225-86.07 12.267zM55.129 143.532c4.135 3.369 11.492 7.236 21.093 10.469 19.209 6.567 47.185 10.935 78.075 10.92 40.484.127 76.227-7.727 93.215-17.465 5.655-3.106 8.91-6.357 9.86-8.076.472-.801.554-1.16.587-1.409-.033-.216-.115-.596-.587-1.389-.558-.971-1.816-2.466-3.894-4.145-4.153-3.37-11.513-7.236-21.092-10.474-19.229-6.589-47.188-10.951-78.09-10.921-40.486-.131-76.23 7.732-93.2 17.45-5.66 3.122-8.929 6.363-9.876 8.09-.461.793-.526 1.173-.557 1.389.03.249.096.608.557 1.409.589.963 1.83 2.467 3.909 4.152zm174.2 232.181v-18.735c-21.108 5.666-46.942 8.888-75.032 8.909-42.646-.111-79.811-7.178-103.633-19.721v28.369c0 .211 0 .556.557 1.553.588.967 1.83 2.463 3.908 4.13 4.135 3.375 11.492 7.251 21.093 10.488 19.209 6.574 47.185 10.933 78.075 10.923 31.506.099 60.103-4.659 79.268-11.361a1.317 1.317 0 0 0-.116-.175c-2.501-4.134-4.136-9.145-4.12-14.38zm-174.2-56.147c4.135 3.373 11.492 7.245 21.093 10.482 19.209 6.568 47.185 10.938 78.075 10.911 29.266.089 56.016-3.998 75.032-9.952V315.9c0-.062-.016-.127-.016-.203l.016-17.398c-21.108 5.684-46.942 8.898-75.032 8.921-42.646-.14-79.811-7.179-103.633-19.727v26.39c0 .223 0 .533.557 1.537.588.971 1.829 2.462 3.908 4.146zm202.243-120.082c.587-1.002.554-1.341.587-1.553v-27.788c-5.264 2.805-11.102 5.255-17.529 7.46-22.825 7.739-52.895 12.217-86.133 12.248-42.646-.128-79.811-7.194-103.633-19.734v27.813c0 .228 0 .551.557 1.553.588.966 1.83 2.461 3.908 4.12 4.135 3.383 11.492 7.25 21.093 10.498 19.209 6.574 47.185 10.937 78.075 10.915 40.418.126 76.193-7.735 93.196-17.458 5.658-3.135 8.929-6.372 9.879-8.074zM50.664 230.215v24.995c0 .227 0 .545.557 1.544.588.98 1.83 2.459 3.908 4.134 4.135 3.378 11.492 7.229 21.093 10.493 19.209 6.57 47.185 10.936 78.075 10.911 29.266.09 56.016-4.004 75.032-9.95v-14.438h.016c.133-4.969 1.732-9.711 4.104-13.667 1.26-2.061 2.698-3.933 4.27-5.683-22.469 7.205-51.49 11.366-83.421 11.392-42.63-.127-79.812-7.187-103.634-19.731z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-edit.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-edit.svg
new file mode 100644
index 0000000000..2faeea0891
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-edit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M412.656 38.477l-49.973 49.975 58.761 58.76 49.976-49.98-58.764-58.755zM177.421 338.155l-15.932-15.935 190.923-190.928-16.286-16.283L85.215 365.922l.186.185-47.919 106.778 106.309-48.383.182.182.482-.482.006-.003 250.424-250.432-26.537-26.537-190.927 190.925zm-39.26 59.052l-46.369 21.102 20.9-46.572 23.388-23.387 3.367 22.301 22.097 3.164-23.383 23.392z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eject.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eject.svg
new file mode 100644
index 0000000000..5f74a4ccc1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eject.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M88.143 404.317v-83.096h333.738v83.096H88.143zm166.054-295.95l165.76 165.758H88.441z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-employee.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-employee.svg
new file mode 100644
index 0000000000..b1c4877b2b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-employee.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M471.66 395.484c-7.229-20.952-31.164-23.963-51.153-32.393-21.954-9.256-46.3-20.008-68.202-28.99-6.251-1.703-12.506-3.409-18.755-5.115-7.464-5.135-14.77-22.201-18.761-30.688-3.976-.568-7.951-1.137-11.938-1.701.618-13.129 8.745-13.834 11.938-23.868 2.812-8.845.294-20.349 4.754-28.537 3.096-5.688 10.095-5.728 13.59-10.604 3.175-4.424 5.263-12.141 6.25-17.559 1.805-9.909 3.379-23.461-1.323-33.287-2.706-5.643-4.413-6.184-5.165-13.037-.915-8.303 2.449-35.389 2.588-41.243.342-15.194-.025-16.423-3.704-31.222 0 0-4.462-13.41-11.462-17.447l-13.952-2.402-8.623-7.99C263 48.022 225.75 63.014 205.803 71.104c-28.747 9.326-46.923 37.471-34.232 97.607 2.166 10.272-5.624 14.865-5.116 20.469 1.116 12.255 1.351 41.722 12.93 48.977 1.078.676 9.292 2.733 9.238 2.172 1.14 11.932 2.274 23.877 3.409 35.809 2.891 7.93 9.829 8.803 11.845 20.007L195 298.299c-3.991 8.486-11.298 25.553-18.76 30.688-6.251 1.706-12.506 3.412-18.756 5.115-21.903 8.982-46.248 19.734-68.201 28.99-19.992 8.43-43.925 11.44-51.152 32.393 0 14.234-1.341 47.849-.974 66.492h435.475c.368-18.644-.972-52.258-.972-66.493zm-91.439 47.624h-77.537v-34.106h77.537v34.106z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-energy-saving-bulb.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-energy-saving-bulb.svg
new file mode 100644
index 0000000000..a45bbf5f4f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-energy-saving-bulb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M160.181 124.095c2.371 0 4.789-.328 7.194-.977l97.026-27.046c14.26-3.978 22.563-18.726 18.606-32.98-3.974-14.257-18.737-22.581-32.964-18.611l-97.058 27.061c-14.223 3.963-22.562 18.709-18.607 32.969 3.32 11.836 14.08 19.584 25.803 19.584zm0 73.712a26.72 26.72 0 0 0 7.194-.997l191.862-53.452c14.256-3.989 22.579-18.756 18.605-32.992-3.954-14.244-18.735-22.583-32.979-18.611L152.986 145.24c-14.223 3.956-22.562 18.722-18.607 32.982 3.303 11.817 14.079 19.585 25.802 19.585zm184.682-32.343l-191.877 53.452c-14.223 3.973-22.562 18.752-18.575 32.98 3.271 11.852 14.046 19.604 25.77 19.604 2.371 0 4.789-.327 7.194-.998l191.862-53.467c14.256-3.978 22.564-18.736 18.605-32.965-3.974-14.257-18.735-22.581-32.979-18.606zm0 74.43l-191.877 53.462c-14.223 3.962-22.562 18.745-18.575 32.968 3.271 11.854 14.046 19.586 25.77 19.586.31 0 .622-.031.917-.031.097 0 .146.015.228.015 1.176.119 12.476 2.062 22.009 8.013 4.578 2.8 8.616 6.366 11.755 10.779v65.434h122.06v-65.465c5.068-7.245 13.099-12.184 20.567-15.11 3.825-1.537 7.375-2.475 9.843-3.024a43.992 43.992 0 0 1 2.78-.542c.264-.043.458-.067.555-.084 6.64-.733 12.267-5.359 14.327-11.725a17.145 17.145 0 0 0-4.81-17.853l-21.338-19.244 20.162-5.624c14.256-3.958 22.564-18.721 18.605-32.964-3.973-14.242-18.734-22.563-32.978-18.591zm-32.162 83.993c-8.632 5.04-17.722 12.381-24.72 23.004-2.78 4.205-5.169 8.965-7.032 14.146h-49.674c-1.863-5.182-4.218-9.941-7.014-14.146-3.745-5.669-8.064-10.365-12.557-14.307l88.506-24.67 15.729 14.188a67.195 67.195 0 0 0-3.238 1.785zm-91.089 148.218h69.017v-20.602h-69.017v20.602z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-enter.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-enter.svg
new file mode 100644
index 0000000000..4dc8c5af3d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-enter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M248.138 108.354v51.364h64.001v142.549h-75.737v-48.199l-89.519 73.882 89.519 73.887V353.63h127.1V108.354z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-equalizer.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-equalizer.svg
new file mode 100644
index 0000000000..64b43e8537
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-equalizer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M158.297 172.265c0 12.833-10.405 23.238-23.239 23.238H43.926c-12.835 0-23.24-10.405-23.24-23.238 0-12.836 10.405-23.241 23.24-23.241h91.132c12.834 0 23.239 10.404 23.239 23.241zm166.864 162.289c0 12.836-10.404 23.239-23.237 23.239H210.79c-12.837 0-23.24-10.403-23.24-23.239 0-12.833 10.403-23.238 23.24-23.238h91.134c12.833-.001 23.237 10.405 23.237 23.238zm165.775-129.479c0 12.833-10.405 23.236-23.239 23.236h-91.134c-12.835 0-23.237-10.403-23.237-23.236 0-12.837 10.402-23.241 23.237-23.241h91.134c12.833 0 23.239 10.404 23.239 23.241zM57.498 123.446h66.174V41.247H57.498v82.199zm332.548-82.199v115.007h66.17V41.247h-66.17zM223.77 284.756h66.179V41.245H223.77v243.511zm166.276 186.42h66.17V257.818h-66.17v213.358zm-332.548 0h66.174V225.01H57.498v246.166zm166.272 0h66.179v-84.858H223.77v84.858z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-escape.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-escape.svg
new file mode 100644
index 0000000000..edb544f9d3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-escape.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M233.471 269.035l36.168-36.165-110.304-110.306 55.364-55.375H67.804v146.945l55.364-55.4 110.303 110.301zm22.825-201.519v51.158c37.934 0 72.042 15.306 96.929 40.163 24.82 24.853 40.092 58.958 40.125 96.892-.033 37.9-15.305 72.012-40.125 96.896-24.887 24.82-58.995 40.096-96.929 40.142-.031 0-.13 0-.164.017-37.867-.101-71.878-15.369-96.73-40.158-24.822-24.885-40.126-58.996-40.126-96.896H68.097c.034 103.926 84.272 188.147 188.199 188.147l25.573-1.717c91.663-12.424 162.332-90.876 162.625-185.839 0-.197.031-.428.031-.592-.031-103.958-84.271-188.213-188.229-188.213z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ethernet.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ethernet.svg
new file mode 100644
index 0000000000..2b16efe994
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ethernet.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M109.038 256.513l96.157-96.149-35.409-35.403L38.225 256.513l131.562 131.565 35.413-35.406-.004-.006-96.158-96.153zm250.855-113.126l-18.438-18.433-35.406 35.411 18.431 18.438 77.723 77.71-96.153 96.153 35.406 35.416 131.566-131.569-113.129-113.126zM160.074 258.438c0 12.386 10.047 22.432 22.436 22.432 12.391 0 22.436-10.046 22.436-22.432 0-12.392-10.045-22.438-22.436-22.438-12.389.001-22.436 10.047-22.436 22.438zm94.549-22.437c-12.392 0-22.435 10.046-22.435 22.438 0 12.386 10.043 22.432 22.435 22.432 12.39 0 22.434-10.046 22.434-22.432 0-12.392-10.044-22.438-22.434-22.438zm72.109 44.869c12.389 0 22.437-10.046 22.437-22.432 0-12.392-10.048-22.438-22.437-22.438-12.391 0-22.434 10.046-22.434 22.438.001 12.386 10.044 22.432 22.434 22.432z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-euro-bag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-euro-bag.svg
new file mode 100644
index 0000000000..cb19eafeb9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-euro-bag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M324.658 172.772l.018.027c-.081-.108-.148-.213-.246-.319a747.086 747.086 0 0 0-12.46-16.761c-5.396-9.025-8.24-20.006-1.618-35.849v-.009l22.762-54.505-35.777-16.298 3.697-16.156h-89.85l4.708 20.585-36.788 11.869 22.76 54.505v.009c11.25 26.945-4.857 39.813-14.321 52.928-46.848 64.796-99.316 157.564-99.316 213.49 0 92.734 72.04 89.646 167.872 89.646 95.866 0 167.893 3.088 167.893-89.646-.002-55.934-52.504-148.702-99.334-213.516zm-91.123-45.504h45.849v28.931h-45.849v-28.931zm64.684 167.994l-6.769 15.751h-49.004l-.229 9.19h46.601l-6.787 15.738h-38.063c4.677 23.061 15.467 34.562 32.376 34.562 10.921 0 22.171-4.594 33.681-13.781l-.227 33.041c-9.763 5.684-20.979 8.52-33.669 8.52-18.376 0-33.191-5.895-44.424-17.707-10.187-10.642-16.825-25.523-19.899-44.635H194.98l6.77-15.738h8.747v-5.682c0-2.043.083-3.217.229-3.509H194.75l6.787-15.751h11.151c3.514-17.641 10.724-31.57 21.665-41.773 11.528-11.077 25.949-16.621 43.3-16.621 12.241 0 25.505 3.639 39.826 10.933l-13.357 27.34c-10.22-6.562-19.751-9.844-28.664-9.844-15.287 0-25.507 9.99-30.624 29.965h53.385z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-exit-fullscreen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-exit-fullscreen.svg
new file mode 100644
index 0000000000..820c79522d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-exit-fullscreen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M434.567 107.615l34.897-34.901-32.369-32.37L402.2 75.247l-36.534-36.534v105.984h105.98l-37.079-37.082zm37.081 259.313H365.663v105.979l37.081-37.077 34.897 34.9 32.372-32.369-34.898-34.9 36.533-36.533zM73.187 403.997l-34.901 34.901 32.372 32.371 34.898-34.901 36.537 36.539V366.92H36.113l37.074 37.077zm68.907-259.306V38.713l-37.078 37.079-34.905-34.903L37.748 73.25l34.901 34.906-36.537 36.535h105.982zM386.4 300.484v-86.92c0-35.999-29.179-65.172-65.171-65.172H185.522c-35.992 0-65.171 29.173-65.171 65.172v86.92c0 35.99 29.179 65.164 65.171 65.164h135.707c35.993 0 65.171-29.173 65.171-65.164z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eye.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eye.svg
new file mode 100644
index 0000000000..8ea896a1f4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eye.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.867 214.401c-22.305 0-40.45 18.143-40.45 40.439 0 22.316 18.145 40.474 40.45 40.474 22.319 0 40.474-18.157 40.474-40.474 0-22.296-18.155-40.439-40.474-40.439zm0-74.942c-107.278 0-215.312 116.648-215.312 116.648s108.034 116.646 215.312 116.646c107.294 0 215.329-116.646 215.329-116.646S362.161 139.459 254.867 139.459zm0 197.952c-45.586 0-82.546-36.925-82.546-82.57 0-45.587 36.96-82.535 82.546-82.535 45.612 0 82.571 36.948 82.571 82.535 0 45.645-36.959 82.57-82.571 82.57z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-like.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-like.svg
new file mode 100644
index 0000000000..0f27d54a06
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-like.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M415.495 215.279l-22.299-13.428a23.68 23.68 0 0 0-12.214-3.393H345.86v-36.66l4.07-12.242a23.644 23.644 0 0 0 1.213-7.473V117.63c0-13.078-10.602-23.678-23.68-23.678h-28.316a23.68 23.68 0 0 0-21.312 13.355c-.328.676-32.99 68.129-48.221 101.205-7.062 15.334-30.904 22.451-41.861 24.57-1.264-5.178-5.9-9.041-11.469-9.041H96.88c-6.535 0-11.838 5.301-11.838 11.84v40.783h103.08v-19.65c8.408-1.26 49.291-8.828 63-38.602 15.311-33.248 48.025-100.783 48.025-100.783h28.316v24.453l-5.283 15.877v64.178h58.802l22.296 13.424v133.973l-30.277 24.834H271.415l-31.234-23.648h-52.059v-70.375H85.042v90.252c0 6.537 5.303 11.84 11.838 11.84h79.404c5.197 0 9.568-3.375 11.158-8.037h44.787l24.895 18.846a23.674 23.674 0 0 0 14.291 4.801h101.586a23.679 23.679 0 0 0 15.017-5.371l30.278-24.832a23.682 23.682 0 0 0 8.662-18.309V235.562c0-8.3-4.35-16-11.463-20.283z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-factory.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-factory.svg
new file mode 100644
index 0000000000..855727aad5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-factory.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M406.019 100.266v181.021l-93.774-50.065v60.793l-132.009-60.793v65.697L37.579 231.221v242.726h434.607V100.266h-66.167zm-22.888-38.008c13.594-.036 25.369 5.842 33.956 12.188a78.822 78.822 0 0 1 9.901 8.674 56.783 56.783 0 0 1 2.497 2.744c.265.309.45.541.56.672.031.037.054.067.073.088l-.008.004.033.023 2.574-2.022 17.276-13.239h-.008c-.48-.607-6.737-8.736-18.031-17.094-11.255-8.296-27.932-17.048-48.823-17.079-20.905-.088-44.743 9.234-68.29 32.937l17.716 17.707c20.341-20.212 37.007-25.523 50.574-25.603zm-186.87 60.778c11.255 8.296 27.935 17.049 48.822 17.079h.282c20.842 0 44.562-9.346 68.007-32.934l-17.696-17.707c-20.367 20.205-37.028 25.514-50.593 25.599-13.587.035-25.364-5.846-33.958-12.187a79.633 79.633 0 0 1-9.894-8.667 59.88 59.88 0 0 1-2.498-2.749c-.271-.306-.452-.535-.56-.669-.037-.05-.057-.071-.068-.095l-19.871 15.242c.479.611 6.732 8.74 18.027 17.088zm1.816-32.358l-2.853 2.229 2.881-2.199c-.009-.005-.026-.028-.028-.03zm-85.061-28.42c13.593-.036 25.367 5.846 33.954 12.188a78.653 78.653 0 0 1 9.906 8.678 55.78 55.78 0 0 1 2.495 2.74c.269.309.453.541.554.672.041.045.059.069.076.092l19.871-15.23v-.01c-.483-.609-6.732-8.732-18.034-17.086-11.251-8.295-27.937-17.061-48.822-17.084-20.904-.084-44.746 9.234-68.291 32.938L62.438 87.86c20.351-20.213 37.008-25.522 50.578-25.602zm49.86 22.167l-2.875 2.202.024.031 2.851-2.233z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-favorite.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-favorite.svg
new file mode 100644
index 0000000000..5fee2201b0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-favorite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M408.908 86.358c-55.975-26.379-122.761-2.379-149.132 53.615-1.831 3.885-3.421 8.767-4.813 14.428-1.391-5.661-2.984-10.543-4.814-14.428-26.373-55.994-93.143-79.994-149.135-53.615-55.959 26.371-79.969 93.122-53.597 149.113 26.369 55.989 207.502 216.478 207.502 216.478s.018-.203.042-.515l.043.515S436.139 291.46 462.506 235.471c26.373-55.991 2.397-122.742-53.598-149.113z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-female-symbol.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-female-symbol.svg
new file mode 100644
index 0000000000..9e003e51e5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-female-symbol.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M390.507 184.386c0-74.246-60.138-134.383-134.387-134.403-74.232.021-134.372 60.157-134.401 134.403.029 65.472 46.84 119.955 108.828 131.921v34.327H170.67v51.149h59.877v59.876h51.128v-59.876h59.912v-51.149h-59.912v-34.327c62.003-11.951 108.832-66.45 108.832-131.921zm-217.629 0c.015-23.083 9.271-43.736 24.38-58.894 15.14-15.093 35.792-24.362 58.862-24.362s43.738 9.27 58.847 24.362c15.142 15.157 24.38 35.811 24.396 58.894-.016 23.058-9.254 43.692-24.396 58.863-15.109 15.109-35.777 24.351-58.847 24.368-23.069-.018-43.722-9.259-58.862-24.368-15.11-15.171-24.365-35.806-24.38-58.863z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-file-cabinet.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-file-cabinet.svg
new file mode 100644
index 0000000000..8d34dc684f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-file-cabinet.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M97.856 49.524v412.951h316.287V49.524H97.856zM385.038 433.37H126.962V78.631h258.076V433.37zm-233.226-25.036h208.375v-137.86H151.812v137.86zm49.329-93.135c0-6.538 5.303-11.839 11.842-11.839 6.537 0 11.838 5.301 11.838 11.839v7.104h69.33v-7.104c0-6.538 5.303-11.839 11.842-11.839 6.537 0 11.838 5.301 11.838 11.839v18.942c0 6.538-5.301 11.838-11.838 11.838h-93.01c-6.539 0-11.842-5.301-11.842-11.838v-18.942zm-49.329-211.533v140.762h208.375V103.666H151.812zm166.018 63.145c0 6.54-5.301 11.84-11.838 11.84h-93.01c-6.539 0-11.842-5.301-11.842-11.84V147.87c0-6.539 5.303-11.841 11.842-11.841 6.537 0 11.838 5.302 11.838 11.841v7.102h69.33v-7.102c0-6.539 5.303-11.841 11.842-11.841 6.537 0 11.838 5.302 11.838 11.841v18.941z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-files.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-files.svg
new file mode 100644
index 0000000000..228b54980d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-files.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M178.713 232.455h154.576l-4.281-39.551H182.996zm11.932-110.189l-4.438 40.974h139.588l-4.436-40.974zm-19.368 178.872h169.448l-4.225-39.02h-161zM95.404 334.64l22.334 114.085h276.525l22.332-114.085H95.404zm208.731 65.761h-96.26v-36.255h96.26v36.255zM164.021 92.938h183.961l22.543 208.201h29.836L377.473 89.744c-1.629-15.058-14.344-26.469-29.49-26.469H164.021c-15.146 0-27.859 11.411-29.488 26.469l-22.895 211.395h29.836l22.547-208.201z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-filter-arrows.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-filter-arrows.svg
new file mode 100644
index 0000000000..2f17186e0c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-filter-arrows.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M115.777 178.399l77.85-61.421-77.85-61.418v37.128H48.656v48.574h67.121zm0 192.336H48.656v48.57h67.121v37.135l77.85-61.421-77.85-61.416zm347.567-114.737l-77.848-61.417v37.133h-48.75v48.567h48.75v37.14zM51.875 231.714h161.521v48.567H51.875zM243.859 55.56h62.58v400.881h-62.58z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-filter.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-filter.svg
new file mode 100644
index 0000000000..41a89b3eb0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-filter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M90.674 88.919h331.039v43.964L286.002 294.937v68.153l-67.318 59.824V294.937L90.674 131.642z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fingerprint.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fingerprint.svg
new file mode 100644
index 0000000000..b80eebd81c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fingerprint.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M207.504 97c22.009 0 52.552 2.224 84.438 11.218 30.674 8.603 62.492 23.316 89.684 47.941 14.275 12.949 27.322 28.676 38.377 47.856l6.996-1.974c-.359-11.186-1.521-22.145-3.484-32.77l-.178-.881-.539-.724a214.896 214.896 0 0 0-26.047-28.2c-30.413-27.552-65.566-43.66-98.741-52.964-27.913-7.817-54.451-10.857-76.032-11.708l-1.194-.063-.982.623c-7.062 4.542-14.028 9.579-20.862 15.04l-8.568 6.888 10.987-.217a360.4 360.4 0 0 1 6.145-.065zm-88.555 162.889c5.07 0 10.234-.396 15.386-1.276l-.636-3.661.652 3.661c9.711-1.717 19.556-5.43 27.945-12.395 8.451-6.968 14.992-17.021 18.588-29.924 1.146-4.089 2.028-8.503 2.585-13.224a84.401 84.401 0 0 1 2.486-12.676c3.744-13.174 9.909-21.615 17.235-27.793 10.89-9.125 25.307-12.854 37.228-13.931 3.287-.297 6.361-.396 9.091-.396 2.176 0 4.138.067 5.772.162 1.864.101 3.333.265 4.251.365.492.062.852.094.998.126.098 0 .18.037.246.037a12.68 12.68 0 0 0 1.813.128 11.247 11.247 0 0 0 11.103-9.463c.098-.625.145-1.231.145-1.803 0-5.445-3.938-10.218-9.465-11.099-.229-.033-6.279-.982-14.845-.982-7.343 0-16.777.654-26.915 3.089-11.119 2.667-23.153 7.573-33.847 16.465-10.694 8.862-19.703 21.748-24.493 39.012-1.405 4.991-2.469 10.335-3.171 16.044a64.153 64.153 0 0 1-1.93 9.891c-2.598 9.12-6.508 14.618-11.266 18.621-6.98 5.873-17.038 8.424-28.222 8.487h-.704c-5.576 0-11.316-.618-16.742-1.537l-3.206-.554-.982 3.104c-1.6 4.923-3.008 9.844-4.314 14.718l-1.015 3.894 3.958.749c6.901 1.243 14.47 2.161 22.271 2.161zm-9.86-35.843c11.872-.95 21.763-6.016 28.631-13.309 6.85-7.197 10.824-16.027 13.276-24.741 3.007-10.773 3.811-21.731 3.811-30.984 0-1.928-.05-3.759-.081-5.492-.05-1.426-.133-2.745-.199-3.993l-.292-4.705 6.326-2.292c10.58-3.86 22.059-7.13 34.256-9.252 5.46-.982 9.32-5.725 9.32-11.086 0-.654-.065-1.309-.179-1.932l-3.681.623 3.681-.656a11.267 11.267 0 0 0-13.097-9.141c-4.349.772-8.65 1.685-12.851 2.698l-1.048.232-.719.751a299.982 299.982 0 0 0-19.852 21.879l-2.45 2.973-.018-.228-1.978 2.615-4.317 5.234.506-.164-.328.423a319.114 319.114 0 0 0-15.647 22.63l-.456.723-.098.882c-.475 4.182-1.209 8.338-2.289 12.161-2.388 8.603-6.312 15.015-11.577 18.347-.917.56-1.962 1.082-3.155 1.589l-1.341.556-.605 1.308c-2.715 5.737-5.265 11.492-7.586 17.25l-2.242 5.591 6.018-.491a7.82 7.82 0 0 0 .261.001zM289.603 62.271c10.907 2.616 21.779 6.117 31.343 10.499 1.507.72 3.125 1.016 4.712 1.016 4.251 0 8.339-2.424 10.218-6.544a11.25 11.25 0 0 0 1.046-4.711c0-4.266-2.437-8.339-6.54-10.235-2.648-1.208-5.312-2.318-7.996-3.4l-.357-.132-.395-.047c-5.705-.982-11.51-1.453-17.396-1.453-10.367 0-20.944 1.468-31.607 4.214l.297 7.311c5.459.963 11.05 2.109 16.675 3.482zM113.504 383.629c47.399 0 81.691-9.875 106.296-25.001 31.527-19.322 46.11-46.858 52.292-69.213 4.037-14.485 4.806-26.88 4.806-34.368 0-4.363-.294-7.294-.294-7.356v-.195c-.621-5.789-5.494-10.071-11.216-10.071-.36 0-.785.031-1.343.094-5.639.625-9.922 5.493-9.922 11.187 0 .295.015.622.048.982v.032l.031.193c0 .065.182 1.997.182 5.04 0 5.898-.639 16.414-3.989 28.386-5.282 18.505-16.498 40.12-42.4 56.097-20.273 12.51-50.228 21.698-94.522 21.698-5.854 0-11.954-.163-18.315-.491l-5.102-.264 1.295 4.942a163.076 163.076 0 0 0 4.938 15.627l.881 2.324 2.485.101c4.727.195 9.321.258 13.801.258h.048zM346.977 83.723s.035 0 .102.032l.242.101c.065.015.146.063.213.095 3.207 1.372 18.938 8.353 36.203 19.687a286.5 286.5 0 0 1 10.039 6.966l5.363-5.002c-9.942-15.67-22.5-29.252-37.479-39.929l-.293-.197-.312-.147c-3.287-1.537-5.38-2.403-5.38-2.403-1.488-.624-2.959-.919-4.382-.919a11.269 11.269 0 0 0-10.413 6.999 10.899 10.899 0 0 0-.869 4.287 11.311 11.311 0 0 0 6.966 10.43zm18.904 229.5c-8.994-38.309-21.911-62.592-22.205-63.146l-3.303 1.717 3.303-1.749a11.31 11.31 0 0 0-9.959-5.967c-1.783 0-3.612.423-5.314 1.356-3.775 2.013-5.95 5.916-5.95 9.94 0 1.769.425 3.597 1.325 5.266l.096.194.05.068c1.392 2.694 13.033 25.945 20.799 60.854 4.056 18.22 7.031 39.57 7.079 62.87l.016 10.124 6.557-7.688c5.102-5.984 9.958-12.194 14.633-18.637l.789-1.062-.082-1.358a319.421 319.421 0 0 0-7.834-52.782zm9.696-80.807c-25.722-40.072-61.023-55.937-83.391-62.163a147.024 147.024 0 0 0-14.226-3.237c-1.88-.327-3.417-.561-4.595-.686-.573-.1-1.08-.164-1.471-.233-.198-.031-.326-.062-.442-.062h-.1c-7.667-1.39-14.535-2.059-20.814-2.059-7.079 0-13.488.85-19.292 2.549-9.679 2.81-17.464 8.143-23.201 14.745-9.925 11.545-14.161 25.64-18.363 39.017-3.124 10.103-6.114 20.01-10.316 28.55-3.157 6.475-6.917 12.129-11.839 16.936-7.392 7.146-17.445 12.771-34.124 15.517-5.967.934-12.754 1.49-20.472 1.49-6.491 0-13.604-.392-21.421-1.179l-3.597-.36-.489 3.565a257.967 257.967 0 0 0-1.601 15.174l-.26 3.633 3.627.374c8.503.866 16.384 1.294 23.71 1.294 22.138 0 39.341-3.86 52.961-10.857 17.493-9.01 27.911-23.09 34.5-37.232 4.956-10.594 8.094-21.339 11.102-31.037 2.255-7.271 4.448-13.948 6.966-19.438 1.912-4.119 3.99-7.57 6.327-10.303 3.614-4.12 7.374-6.803 13.88-8.551 3.207-.833 7.131-1.357 11.904-1.357 4.743 0 10.285.491 16.779 1.685.947.147 1.763.278 2.826.411 3.222.471 8.765 1.337 15.942 3.332 19.067 5.398 48.464 18.395 70.54 52.669 13.635 21.271 24.703 51.194 28.072 93.51l.963 12.131 6.02-10.577a283.727 283.727 0 0 0 12.441-24.658l.443-.998-.164-1.113c-5.331-33.833-15.763-60.138-28.825-80.482zm-39.228 92.777c-.063-.605-.13-1.114-.163-1.441 0-.164-.033-.295-.047-.357v-.064l-.033-.201a11.269 11.269 0 0 0-11.152-9.76c-.457 0-.965.017-1.52.117v-.015c-5.658.765-9.762 5.607-9.762 11.163.016.459.016.981.114 1.553 0 0 0 .068.015.232.246 1.848 1.194 10.546 1.194 23.088 0 15.711-1.487 37.625-7.716 59.729a168.073 168.073 0 0 1-7.426 20.991l-5.051 11.646 10.546-7.034a231.838 231.838 0 0 0 22.172-16.79l.868-.738.327-1.077c.063-.279.145-.575.226-.881 6.951-24.853 8.586-48.597 8.586-65.767 0-7.916-.329-14.454-.688-19.032a221.243 221.243 0 0 0-.49-5.362zm-27.241-192.06a11.336 11.336 0 0 0-4.446-.93 11.249 11.249 0 0 0-10.366 6.818 11.12 11.12 0 0 0-.916 4.446c0 4.353 2.551 8.519 6.817 10.368l1.064.459c39.895 17.443 67.822 42.771 88 72.497 9.354 13.817 17.006 28.65 23.219 44.019l4.314 10.679 2.779-11.171a257.674 257.674 0 0 0 5.053-25.967l.182-1.155-.523-1.036c-22.433-44.765-58.635-84.745-115.177-109.027zm-10.889 238.692c0-5.396-3.891-10.155-9.385-11.084a12.068 12.068 0 0 0-1.914-.163c-5.394 0-10.152 3.893-11.067 9.383-1.358 7.881-2.681 16.451-5.103 25.148-2.879 10.104-7.161 20.392-14.684 30.283-8.862 11.509-22.333 22.775-44.408 32.044l1.407 7.194h1.961c12.852 0 25.574-1.827 38.03-5.297l.72-.195.588-.461c7.883-6.178 14.373-12.785 19.59-19.618 9.681-12.653 15.106-25.868 18.477-37.87 2.879-10.33 4.316-19.846 5.623-27.436.116-.653.165-1.308.165-1.928zm-48.577 43.233c1.686-2.06 2.501-4.61 2.501-7.083 0-3.252-1.455-6.554-4.187-8.762a11.348 11.348 0 0 0-7.08-2.503c-3.27 0-6.555 1.442-8.778 4.204-6.265 7.717-12.804 13.588-22.076 18.544-13.767 7.388-34.435 12.573-68.118 14.563l-10.253.592 8.26 6.146c7.292 5.365 15.271 9.893 23.839 13.503l.916.38.997-.115c3.189-.375 6.294-.803 9.271-1.278 18.853-2.94 33.567-7.487 45.687-13.911 12.129-6.426 21.385-14.779 29.021-24.28zm60.676-121.586l-3.597-1.015 3.597.998a137.114 137.114 0 0 0 4.727-27.061c.246-3.464.375-6.77.375-9.991 0-14.144-2.435-25.818-7.13-35.266-5.753-11.646-15.302-19.524-26.111-22.468a41.905 41.905 0 0 0-11.329-1.535c-10.318 0-20.472 3.595-29.27 9.547-12.067 8.174-22.04 21.11-26.587 37.28a71.454 71.454 0 0 0-2.614 19.229c0 1.177.033 2.386.082 3.627.046.982.082 1.997.082 3.01 0 5.103-.654 9.58-1.765 13.541-1.865 6.655-5.005 11.904-9.404 16.577-7.586 8.097-19.438 14.096-33.402 17.925-16.763 4.642-36.251 6.11-53.452 6.11-4.252 0-8.39-.095-12.279-.229-4.546-.194-8.797-.438-12.657-.748l-4.251-.297.231 4.235c.26 5.25.718 10.414 1.389 15.484l.374 3.041 3.073.228c7.099.46 15.304.818 24.135.818 7.488 0 15.436-.264 23.53-.912 19.013-1.576 38.964-5.234 56.311-13.558 8.667-4.173 16.694-9.563 23.367-16.63 6.705-7.045 11.903-15.764 14.747-25.967 1.702-6.079 2.585-12.654 2.585-19.65 0-1.342-.034-2.716-.1-4.088-.032-.852-.064-1.686-.064-2.519 0-4.696.637-9.059 1.765-13.114 3.041-10.89 9.811-19.524 17.496-24.72 5.675-3.861 11.657-5.709 16.759-5.694 1.863 0 3.58.232 5.151.687 4.708 1.441 8.534 4.118 12.034 10.857 2.748 5.43 4.792 13.736 4.792 25.281 0 2.583-.116 5.329-.312 8.239a115.13 115.13 0 0 1-3.989 22.645c-10.578 37.902-40.582 69.574-81.444 89.129-27.795 13.312-60.482 20.834-94.752 20.834h-2.518l-6.523-.032 3.252 5.624c3.108 5.393 6.542 10.563 10.335 15.4l1.144 1.489 1.897-.085c34.812-.977 67.987-9.089 96.912-22.903 45.369-21.698 80.608-57.848 93.408-103.353z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fire.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fire.svg
new file mode 100644
index 0000000000..b0811f59f0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fire.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M288.311 65.344S132.49 123.676 132.49 286.369c0 111.828 49.936 146.785 90.839 157.717-10.693-5.025-20.893-16.164-20.893-40.924 0-45.586 44.824-61.936 44.824-61.936-11.688 24.494-1.173 33.389 9.825 43.461 14.635-18.652 19.415-36.57 3.575-79.654 0 0 70.424 29.889 55.853 99.934-4.674 22.475-17.8 34.857-32.061 41.689 36.017-9.098 95.059-44.814 95.059-116.504 0-129.111-161.659-113.22-91.2-264.808zm26.958 60.48c2.841 20.068 1.008 33.783-3.618 43.971 7.246 9.438 16.863 18.477 27.374 28.344 6.532 6.137 13.408 12.594 20.178 19.631-.889-59.202-43.934-91.946-43.934-91.946z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-firewall.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-firewall.svg
new file mode 100644
index 0000000000..b857e4349e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-firewall.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M309.135 167.681h58.909v-52.798H226.546v52.798h58.909zm-106.269 23.681h-58.911v52.799h141.5v-52.799h-58.909zM61.365 167.681h141.501v-52.798H61.365zm82.59 152.957h58.911v-52.799H61.365v52.799h58.908zm-82.59 23.678h58.908v52.801H61.365zm0-152.954h58.908v52.799H61.365zm330.36-76.479h58.91v52.798h-58.91zm0 152.956h58.91v52.799h-58.91zm-106.27 76.477h-141.5v52.801h141.5zm165.18-152.954h-141.5v52.799h141.5zm-141.5 129.276h58.909v-52.799H226.546v52.799h58.909zm141.5 23.678h-141.5v52.801h141.5z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-firewire.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-firewire.svg
new file mode 100644
index 0000000000..64807e9110
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-firewire.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.516 171.172c-40.747 0-73.777 32.919-73.777 73.533 0 40.615 33.03 73.536 73.777 73.536 40.749 0 73.77-32.921 73.77-73.536-.001-40.614-33.021-73.533-73.77-73.533zm0 114.715c-22.816 0-41.315-18.441-41.315-41.182 0-22.737 18.499-41.183 41.315-41.183 22.812 0 41.317 18.445 41.317 41.183 0 22.74-18.505 41.182-41.317 41.182zm-48.689 97.067h97.378v-32.362h-97.378v32.362zm0 64.719h97.378v-32.36h-97.378v32.36zm-14.958-335.035l-68.856 68.631 22.948 22.885 68.862-68.644-22.954-22.872zm-45.908-45.379l-68.854 68.636 22.954 22.882 68.86-69.024-22.96-22.494zm230.005-2.939l-75.585 75.346 60.131 59.566 75.588-74.598-60.134-60.314z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flag-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flag-alt.svg
new file mode 100644
index 0000000000..16d5b65bb6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flag-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M37.553 117.548l156.364 378.05 43.967-18.185L81.514 99.354l-43.961 18.194zm343.391-27.381s-62.443 85.464-154.828-6.919v.168c-65.885-67.603-123.106 9.303-123.106 9.303l92.72 222.697s38.514-109.396 154.827 6.918v-.171c65.883 67.598 123.107-9.305 123.107-9.305l-92.72-222.691z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flag.svg
new file mode 100644
index 0000000000..3665770b99
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M55.219 470.836V61.716h47.573v409.12H55.219zm215.927-187.563c-89.417-82.084-142.544-5.493-142.544-5.493V62.243S246.557-1.668 299.786 96.379l.005-.142c79.278 129.027 153.979 61.767 153.979 61.767S360.562 365.36 271.146 283.273z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flash.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flash.svg
new file mode 100644
index 0000000000..f37a9e3483
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flash.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M397.716 32.021L113.524 286.598h94.996l-94.996 193.177 284.192-254.581H302.72z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flashlight.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flashlight.svg
new file mode 100644
index 0000000000..4610c03a5b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flashlight.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M394.049 117.916c-23.246-23.244-51.133-37.123-74.594-37.123-12.814 0-23.775 4.18-31.688 12.092-3.967 3.969-6.955 8.635-8.984 13.855l-38.723 86.393L97.07 336.125c-21.754 21.752-21.754 57.018 0 78.768 10.875 10.877 25.129 16.314 39.385 16.314 14.254 0 28.51-5.438 39.385-16.314l142.99-142.99 87.449-39.197c.195-.086.402-.191.609-.293 4.578-2.004 8.693-4.721 12.188-8.215 23.162-23.161 12.401-68.854-25.027-106.282zm-74.594-5.297c11.201 0 31.568 7.279 52.088 27.803 25.938 25.939 32.242 54.055 25.027 61.268-2.291 2.293-6.256 2.773-9.18 2.773h-.002c-11.201 0-31.564-7.281-52.086-27.805-12.516-12.51-21.941-27.225-25.871-40.369-2.844-9.527-2.521-17.531.844-20.895 2.291-2.292 6.258-2.775 9.18-2.775z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flowerpot.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flowerpot.svg
new file mode 100644
index 0000000000..0524daab90
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flowerpot.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M260.094 173.309c22.761 0 41.236-18.463 41.236-41.238 0-22.764-41.236-92.594-41.236-92.594s-41.236 69.83-41.236 92.594c-.001 22.775 18.442 41.238 41.236 41.238zm-28.188 45.095c10.398-10.4 10.398-27.257 0-37.674-10.399-10.383-61.122-23.465-61.122-23.465s13.082 50.738 23.481 61.139c10.401 10.365 27.241 10.365 37.641 0zm56.182 0c10.398 10.364 27.271 10.364 37.672 0 10.398-10.4 23.446-61.139 23.446-61.139s-50.72 13.082-61.118 23.465c-10.401 10.417-10.401 27.274 0 37.674zm-16.092 63.932v-95.984h-24.918v95.984h-104.71v62.442H369.12v-62.442h-97.124zm-87.673 190.127h142.875l24.917-106.312H159.372l24.951 106.312z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder-open.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder-open.svg
new file mode 100644
index 0000000000..44de932cfd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder-open.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M455.482 339.613c1.043-31.146 16.383-86.462 16.383-86.462 0-8.433-6.035-15.438-14.018-16.967V126.918h-.006c-.027-8.96-7.293-16.211-16.256-16.211H235.937c-6.429-.156-11.382-11.842-11.382-16.307l.001-1.906c0-9.542-7.736-17.28-17.28-17.28H97.799c-9.543 0-17.279 7.738-17.279 17.28l.004 1.906c0 4.497-5.023 16.32-11.518 16.32h.154c-8.844.159-15.965 7.366-15.965 16.246l.005 109.227c-7.955 1.549-13.963 8.547-13.963 16.958 0 0 14.659 55.928 15.704 87.071 1.042 31.149-5.132 78.361-5.132 78.361 0 9.539 1.973 17.277 11.513 17.277H449.78c9.544 0 11.515-7.738 11.515-17.277-.001.001-6.856-47.825-5.813-78.97zM73.23 235.869v-88.924h364.584v88.924H73.23z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder-outline.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder-outline.svg
new file mode 100644
index 0000000000..77059225c7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder-outline.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M450.962 169.833v-19.248c0-23.398-19.035-42.436-42.434-42.436H257.306c-5.885-16.926-21.99-29.1-40.885-29.1h-89.758c-20.545 0-37.795 14.391-42.191 33.623-13.891 7.016-23.486 21.45-23.486 37.912V169.897c-7.148 7.774-11.443 18.122-11.443 29.287v.956l.062.953c.045.704 4.639 70.713 5.469 95.492l3.137 93.62c.033 6.024.682 14.788 5.271 23.301 6.564 12.175 19.002 19.442 33.273 19.442h318.49c14.273 0 26.713-7.268 33.275-19.445 4.588-8.512 5.236-17.275 5.271-23.298l3.135-93.62c.832-24.782 5.424-94.788 5.471-95.492l.061-.953v-.956c0-11.203-4.314-21.574-11.496-29.351zM90.093 150.585c0-7.281 5.84-13.189 13.09-13.318h-.125c5.324 0 9.441-9.694 9.441-13.382l-.006-1.562c0-7.824 6.344-14.168 14.17-14.168h89.758c7.826 0 14.166 6.344 14.166 14.168v1.562c0 3.663 4.062 13.239 9.332 13.37h168.609c7.363 0 13.328 5.969 13.328 13.33v9.201H90.093v-9.201zm337.744 145.028c-.854 25.538-3.15 94.062-3.15 94.062 0 7.825-1.617 14.171-9.441 14.171H96.755c-7.822 0-9.439-6.346-9.439-14.171l-3.152-94.062c-.855-25.538-5.516-96.428-5.516-96.428 0-6.893 4.926-12.631 11.445-13.9l331.764-.009c6.547 1.251 11.494 6.998 11.494 13.909 0 .001-4.657 70.89-5.514 96.428z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder.svg
new file mode 100644
index 0000000000..ce20ed705e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M457.211 169.501v-.316H52.564v.328c-7.956 1.548-13.959 8.547-13.959 16.955 0 0 5.683 86.463 6.726 117.611 1.045 31.147 3.844 114.728 3.844 114.728 0 9.544 1.973 17.281 11.514 17.281h388.458c9.543 0 11.514-7.737 11.514-17.281 0 0 2.804-83.58 3.845-114.728 1.044-31.147 6.727-117.611 6.727-117.611-.002-8.433-6.036-15.442-14.022-16.967zm0-42.313c0-8.98-7.277-16.256-16.258-16.256H235.305c-6.43-.161-11.384-11.842-11.384-16.311l.003-1.902c0-9.546-7.737-17.28-17.28-17.28H97.168c-9.544 0-17.281 7.734-17.281 17.28l.004 1.902c0 4.5-5.021 16.322-11.517 16.322h.155c-8.844.157-15.965 7.364-15.965 16.244v11.223h404.647v-11.222z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folders.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folders.svg
new file mode 100644
index 0000000000..08875280e9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folders.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M451.42 99.773l-170.92.004c-4.949-.125-8.762-9.12-8.762-12.559V85.75c0-7.349-5.959-13.309-13.311-13.309h-84.32c-7.35 0-13.307 5.96-13.307 13.309l.002 1.469c0 3.44-3.82 12.445-8.777 12.562h-12.273c-6.123 1.194-10.752 6.583-10.752 13.061 0 0 .779 11.868 1.742 27.377a13.282 13.282 0 0 1 3.758-.547h84.318c7.352 0 13.309 5.959 13.309 13.309v1.469c0 3.438 3.814 12.434 8.766 12.559l170.92-.005c6.15 1.175 10.799 6.574 10.799 13.067 0 0-4.377 66.594-5.184 90.587-.271 8.174-.705 21.039-1.154 34.445h28.936c7.352 0 8.869-5.96 8.869-13.31 0 0 2.156-64.377 2.961-88.366.803-23.992 5.18-90.585 5.18-90.585-.001-6.495-4.648-11.894-10.8-13.069zm-79.217 134.459l-170.922.004c-4.951-.125-8.76-9.119-8.76-12.559v-1.469c0-7.35-5.961-13.31-13.312-13.31H94.891c-7.35 0-13.311 5.96-13.311 13.31l.002 1.469c0 3.441-3.818 12.447-8.779 12.561H60.535c-6.127 1.194-10.754 6.583-10.754 13.061 0 0 4.379 66.593 5.182 90.586.807 23.989 2.961 88.364 2.961 88.364 0 7.352 1.52 13.31 8.871 13.31H365.99c7.35 0 8.871-5.958 8.871-13.31l2.959-88.364c.805-23.993 5.182-90.586 5.182-90.586 0-6.492-4.648-11.893-10.799-13.067z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-font.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-font.svg
new file mode 100644
index 0000000000..91689c5b49
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-font.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M294.768 47.514h98.208l58.981 415.973h-94.258l-8.748-85.508H195.713l-46.846 85.508h-90.87L294.768 47.514zm-60.392 258.784h105.545L322.707 142.62l-88.331 163.678z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-food.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-food.svg
new file mode 100644
index 0000000000..d39b58346a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-food.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M101.354 398.936c-5.464 5.477-8.207 12.592-8.207 19.769 0 7.159 2.743 14.288 8.207 19.767 5.461 5.474 12.591 8.193 19.751 8.193 7.096 0 14.094-2.647 19.588-7.982L250.67 300.814l-24.036-27.176-125.28 125.298zM450.868 78.54l-14.551-14.585-176.065 176.049 55.036 48.645a22.422 22.422 0 0 0 4.186-3.206l131.395-173.971c5.231-5.214 6.835-10.513 6.835-16.463-.001-5.986-2.257-11.923-6.836-16.469zM232.029 228.445l14.129-14.127c7.521-7.523 5.722-21.549-4.057-31.344l-115.73-115.73-14.258 14.221 102.288 102.277-14.551 14.565L97.562 96.035l-14.945 14.916L184.908 213.24l-14.588 14.555L68.064 125.531 53.837 139.76l115.765 115.743c9.777 9.782 23.808 11.599 31.329 4.071l14.126-14.127 170.538 193.108c5.463 5.36 12.526 8.041 19.623 8.041 7.195 0 14.323-2.712 19.784-8.19 5.494-5.476 8.175-12.59 8.175-19.766a27.938 27.938 0 0 0-8.044-19.656L232.029 228.445z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-footprints.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-footprints.svg
new file mode 100644
index 0000000000..118b8dc44f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-footprints.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M222.201 224.715l75.529-57.061c26.902-26.9 50.41-92.838 31.727-111.521-18.684-18.682-83.99 5.454-110.891 32.354l-57.057 75.533c-1.562 14.544 45.491 62.322 60.692 60.695zm-92.66-28.992l-20.896 20.899c-20.715 20.713-12.348 45.014 2.037 59.4 14.385 14.385 38.203 22.268 58.918 1.555l20.896-20.9c9.26-9.255-51.697-70.21-60.955-60.954zm279.531 32.692c-18.682-18.683-83.988 5.455-110.889 32.352l-57.059 75.536c-1.561 14.542 45.492 62.321 60.693 60.692l75.527-57.06c26.904-26.901 50.412-92.838 31.728-111.52zM209.158 368.003l-20.898 20.9c-20.713 20.711-12.348 45.012 2.037 59.4 14.387 14.388 38.205 22.269 58.918 1.553l20.898-20.897c9.258-9.255-51.697-70.212-60.955-60.956z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-forking.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-forking.svg
new file mode 100644
index 0000000000..441dead254
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-forking.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M369.825 368.683V236.7H318.68v131.982h-48.006l73.546 89.146 73.611-89.146h-48.006zM193.956 333.76c-.13-2.028.981-7.849 3.206-13.019 2.092-5.265 5.46-10.135 6.933-11.489l140.619-140.605c8.205-8.352 13.701-17.886 17.986-28.09 4.183-10.232 7.029-20.863 7.126-32.571V53.801h-51.145v54.185c.064 1.995-1.013 7.833-3.237 13.017-2.094 5.231-5.428 10.132-6.902 11.475L167.926 273.096c-8.208 8.337-13.704 17.885-18.018 28.059-4.154 10.268-7.033 20.863-7.098 32.605v34.923H94.771l73.578 89.146 73.58-89.146h-47.974V333.76z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-frame-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-frame-alt.svg
new file mode 100644
index 0000000000..24c8834c55
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-frame-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M409.529 131.667l51.144-51.165H50.528l51.146 51.165h307.855zm-320.183 12.34L38.2 92.867v325.935l51.146-51.162V144.007zm12.328 235.979L50.528 431.15h410.145l-51.144-51.164H101.674zm320.199-235.979V367.64l51.129 51.162V92.867l-51.129 51.14z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-frame.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-frame.svg
new file mode 100644
index 0000000000..6d48f3165d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-frame.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M429.714 386.966c-3.01-2.262-5.493-7.262-5.493-11.151V138.348c0-3.906 2.483-8.942 5.493-11.169 0 0 17.526-13.042 17.526-26.894 0-18.723-17.265-33.896-38.586-33.896-11.25 0-22.663 7.326-22.663 7.326-3.142 2.024-8.765 3.695-12.459 3.695h-34.796c-3.694 0-9.287-1.671-12.461-3.695 0 0-15.73-10.04-29.822-10.04h-2.943c-3.171.391-7.979-1.406-10.692-4.039 0 0-14.422-13.848-29.466-13.848-15.108 0-29.527 13.963-29.527 13.963-2.75 2.616-7.817 4.413-11.284 3.924h-3.335c-14.062 0-29.791 10.04-29.791 10.04-3.172 2.024-8.797 3.695-12.49 3.695h-28.29c-3.663 0-9.286-1.671-12.427-3.695 0 0-11.411-7.326-22.661-7.326-21.322 0-38.59 15.173-38.59 33.896 0 13.852 17.53 26.894 17.53 26.894 3.01 2.227 5.461 7.263 5.461 11.169v237.467c0 3.89-2.451 8.858-5.461 11.151 0 0-17.53 13.06-17.53 26.913 0 18.705 17.268 33.878 38.59 33.878 12.59 0 25.278-9.436 25.278-9.436 3.041-2.241 8.504-4.069 12.199-4.069h22.204c3.696 0 9.188 1.864 12.165 4.151 0 0 17.657 13.505 33.812 13.505 4.843 0 7.357-.495 7.357-.495 3.632-.73 8.962.658 11.871 3.061 0 0 13.604 11.366 27.305 11.366 13.181 0 26.425-10.431 26.425-10.431 2.942-2.339 8.011-3.926 11.216-3.501h3.074c16.156 0 33.812-13.505 33.812-13.505 3.01-2.287 8.471-4.151 12.166-4.151h28.712c3.693 0 9.19 1.828 12.198 4.069 0 0 12.719 9.436 25.312 9.436 21.321 0 38.586-15.173 38.586-33.878.001-13.854-17.525-26.913-17.525-26.913zm-57.653-13.195H136.148V137.858H372.06v235.913z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fullscreen-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fullscreen-alt.svg
new file mode 100644
index 0000000000..c2145c8171
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fullscreen-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M182.367 280.869l-90.338 90.344-56.066-56.068V474.89h159.739l-56.883-56.887 90.341-90.351-46.793-46.783zM311.836 38.456l56.877 56.882-90.337 90.347 46.792 46.785 90.336-90.341 56.068 56.073V38.456H311.836z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fullscreen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fullscreen.svg
new file mode 100644
index 0000000000..a63101cfe0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fullscreen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M368.432 110.765l32.367 32.362 34.896-34.898 36.539 36.539V38.783H366.256l37.075 37.077-34.899 34.905zm66.725 293.309l-34.901-34.899-32.37 32.368 34.9 34.899-36.534 36.536h105.986V366.996l-37.081 37.078zm-294.656-3.081l-32.37-32.365-34.898 34.902L36.7 366.993v105.985h105.979l-37.079-37.08 34.901-34.905zm-31.828-258.41l32.373-32.365-34.903-34.899 36.538-36.536H36.698v105.978l37.08-37.075 34.895 34.897zm278.314 157.969v-86.92c0-35.993-29.179-65.169-65.17-65.169H186.109c-35.991 0-65.171 29.177-65.171 65.169v86.92c0 35.993 29.18 65.168 65.171 65.168h135.708c35.992 0 65.17-29.175 65.17-65.168z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-game.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-game.svg
new file mode 100644
index 0000000000..78797b5601
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-game.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M454.236 216.826c-15.591-63.937-37.193-130.498-114.285-119.559-29.741 4.225-52.243 21.667-85.431 21.748-27.735.068-49.462-17.447-74.949-21.748-77.019-13-95.274 23.888-117.649 92.658-12.649 38.879-53.044 172.948-7.13 205.048 46.521 32.523 97.305-56.955 132.316-70.582 30.235-11.771 95.289-10.754 125.098-1.759 40.438 12.205 80.27 89.49 125.837 79.315 62.395-13.929 25.631-146.431 16.193-185.121zm-291.233 56.445c-33.544-.006-60.718-27.183-60.722-60.722.004-33.542 27.178-60.717 60.722-60.72 33.541.003 60.715 27.178 60.719 60.72-.004 33.54-27.178 60.717-60.719 60.722zM352.23 162.083c6.938-6.937 18.184-6.937 25.121 0 6.934 6.934 6.933 18.182-.002 25.116-6.938 6.938-18.181 6.938-25.119.003-6.936-6.937-6.936-18.183 0-25.119zm-33.81 58.931c-6.938-6.941-6.938-18.186 0-25.119 6.937-6.938 18.184-6.938 25.12 0 6.935 6.934 6.933 18.178-.002 25.115-6.936 6.934-18.182 6.937-25.118.004zm57.737 32.615c-6.937 6.937-18.183 6.937-25.119 0-6.937-6.935-6.933-18.182.002-25.116 6.937-6.937 18.184-6.94 25.117-.004 6.937 6.938 6.937 18.185 0 25.12zm33.812-33.808c-6.938 6.937-18.183 6.937-25.119 0-6.937-6.938-6.934-18.183.002-25.12 6.937-6.937 18.182-6.937 25.117 0 6.937 6.935 6.937 18.182 0 25.12zm-246.966-42.959c-19.707.04-35.649 15.982-35.684 35.688.034 19.704 15.977 35.649 35.684 35.686 19.702-.037 35.647-15.982 35.684-35.686-.037-19.705-15.982-35.648-35.684-35.688z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-geometry.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-geometry.svg
new file mode 100644
index 0000000000..c7ed79e0a1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-geometry.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M473.329 395.598l-62.49-49.281v33.979H131.466l-.229-279.599h33.977l-49.312-62.493-49.283 62.493h33.946v279.599H39.181v30.642h61.644v61.466h30.642v-61.466H410.84v33.978l62.489-49.318zM343.603 168.37H170.381v173.207h173.222V168.37z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-gift.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-gift.svg
new file mode 100644
index 0000000000..4e2030a6f1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-gift.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M75.032 473.603h167.263v-186.06H75.032v186.06zm376.972-315.941h-98.111c6.963-3.576 13.174-7.346 18.679-11.301 21.239-15.16 32.416-34.379 32.378-53.484.012-15.646-7.432-29.458-18.176-38.812-10.775-9.414-25.022-14.967-40.336-14.99-16.318-.009-31.459 5.64-44.43 14.297-19.507 13.075-34.857 32.779-45.791 54.401a199.951 199.951 0 0 0-1.536 3.163c-4.003-8.333-8.658-16.398-13.919-23.972-9.249-13.19-20.371-24.897-33.392-33.592-12.974-8.661-28.115-14.303-44.429-14.297-16.226.057-31.074 6.869-42.202 17.332-11.077 10.466-18.858 25.202-18.9 41.922-.03 9.776 2.827 19.986 8.691 29.263 7.371 11.668 19.049 21.777 35.218 30.07H57.631c-11.747 0-21.273 9.523-21.273 21.274v78.88h205.937V157.662h25.041v100.154h205.941v-78.88c0-11.751-9.527-21.274-21.273-21.274zm-299.112-31.28c-8.311-5.219-13.363-10.498-16.311-15.179-2.93-4.716-3.94-8.843-3.965-12.874-.044-6.749 3.331-13.948 9.257-19.547 5.83-5.552 13.754-8.934 20.889-8.934h.18c9.152.007 18.271 3.103 27.365 9.14 13.593 8.983 26.413 24.746 35.363 42.625 4.572 9.032 8.145 18.585 10.552 27.899-41.212-4.263-67.922-13.378-83.33-23.13zm140.94-21.767c7.439-10.654 16.19-19.612 25.238-25.626 9.096-6.037 18.214-9.133 27.367-9.14h.096c7.671 0 14.942 2.942 19.958 7.364 5.059 4.501 7.669 9.887 7.683 15.664-.044 6.852-3.641 16.84-19.615 28.524-15.213 11.04-41.457 22.377-81.949 30.297 3.881-16.083 11.325-33.081 21.222-47.083zm-26.496 368.988H434.6v-186.06H267.336v186.06z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-glasses.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-glasses.svg
new file mode 100644
index 0000000000..72b7c8b05b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-glasses.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M294.842 181.664c2.749 2.751 7.262 2.751 10.008 0l22.661-22.711c2.782-2.729 7.262-2.729 10.039 0l40.52 40.565c2.746 2.73 2.746 7.246 0 9.992l-1.504 1.52c-2.749 2.748-2.749 7.247 0 9.993l5.396 5.376h66.351L337.55 115.623c-2.777-2.744-7.257-2.744-10.039 0l-44.343 44.362c-2.746 2.744-2.746 7.245 0 10.007l11.674 11.672zm-167.496 39.358c2.745-2.747 2.745-7.246 0-9.993l-1.537-1.52c-2.749-2.746-2.749-7.261 0-9.992l40.547-40.565c2.749-2.729 7.263-2.729 10.008 0l22.695 22.711c2.746 2.751 7.229 2.751 9.974 0l11.708-11.672c2.747-2.762 2.747-7.263 0-10.007l-44.377-44.362c-2.745-2.744-7.259-2.744-10.008 0L55.597 226.399h66.351l5.398-5.377zm332.738 34.612H51.083c-6.571 0-11.935 5.381-11.935 11.956v119.737c0 6.571 5.364 11.952 11.935 11.952h163.639c6.573 0 13.966-4.97 16.483-11.051l8.568-21c2.485-6.062 9.614-11.053 15.828-11.053 6.213 0 13.342 4.99 15.829 11.053l8.568 21c2.482 6.081 9.906 11.051 16.479 11.051h163.607c6.607 0 11.969-5.381 11.969-11.952V267.59c0-6.574-5.362-11.956-11.969-11.956zM210.57 328.74c0 21.014-17.038 38.051-38.062 38.051h-60.63c-21.028 0-38.067-17.037-38.067-38.051v-2.551c0-21.021 17.039-38.066 38.067-38.066h60.63c21.025 0 38.062 17.045 38.062 38.066v2.551zm226.819 0c0 21.014-17.037 38.051-38.062 38.051h-60.631c-21.025 0-38.066-17.037-38.066-38.051v-2.551c0-21.021 17.041-38.066 38.066-38.066h60.631c21.025 0 38.062 17.045 38.062 38.066v2.551z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-alt.svg
new file mode 100644
index 0000000000..b02f41ad97
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.585 38.541c-120.05 0-217.402 97.323-217.402 217.404 0 120.098 97.353 217.434 217.402 217.434 120.114 0 217.433-97.336 217.433-217.434 0-120.081-97.319-217.404-217.433-217.404zM240.28 159.799c-21.485-1.342-41.89-5.491-60.596-11.966 15.042-30.624 36.134-55.493 60.596-71.716v83.682zm0 30.71v50.116h-84.567c1.341-22.79 5.657-44.443 12.297-64.391 22.4 7.931 46.73 12.834 72.27 14.275zm0 80.758v49.605c-25.671 1.456-50.099 6.426-72.598 14.438-6.542-19.885-10.726-41.397-11.969-64.043h84.567zm0 80.331v84.86c-24.755-16.404-46.011-41.616-61.088-72.662 18.837-6.607 39.407-10.824 61.088-12.198zm30.642 0c21.681 1.374 42.25 5.592 61.085 12.198-15.074 31.046-36.361 56.298-61.085 72.694v-84.892zm0-30.726v-49.605h84.566c-1.243 22.646-5.43 44.158-11.969 64.043-22.467-8.012-46.927-12.982-72.597-14.438zm0-80.247v-50.116c25.507-1.44 49.869-6.344 72.271-14.274 6.638 19.947 10.921 41.601 12.262 64.391h-84.533zm0-80.826V76.117c24.494 16.223 45.553 41.092 60.596 71.682-18.706 6.475-39.11 10.658-60.596 12zm53.304-77.483a187.154 187.154 0 0 1 59.745 38.177 188.574 188.574 0 0 1-24.232 15.172c-9.614-19.914-21.581-37.88-35.513-53.349zM151.43 135.665a188.208 188.208 0 0 1-24.202-15.172c17.168-16.282 37.379-29.348 59.714-38.177-13.898 15.469-25.867 33.435-35.512 53.349zm-11.642 28.401c-8.174 23.789-13.245 49.579-14.685 76.559H69.514c2.94-36.316 16.349-69.773 37.18-97.271a214.553 214.553 0 0 0 33.094 20.712zM125.04 271.267c1.373 26.828 6.377 52.538 14.39 76.21-11.807 6.048-22.829 13.013-32.966 20.765-20.733-27.471-34.01-60.757-36.95-96.975h55.526zm25.962 104.724c9.484 19.818 21.291 37.771 35.026 53.274a187.478 187.478 0 0 1-59.093-38.135c7.423-5.491 15.435-10.609 24.067-15.139zm209.196 0a182.74 182.74 0 0 1 24.034 15.157 186.463 186.463 0 0 1-59.059 38.08c13.734-15.466 25.54-33.418 35.025-53.237zm11.577-28.514c8.01-23.672 12.979-49.348 14.386-76.21h55.528c-2.944 36.218-16.221 69.504-36.953 96.975-10.137-7.753-21.19-14.718-32.961-20.765zm14.321-106.852c-1.439-26.979-6.506-52.77-14.648-76.559a214.011 214.011 0 0 0 33.025-20.712c20.867 27.497 34.242 60.923 37.217 97.271h-55.594z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-asia.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-asia.svg
new file mode 100644
index 0000000000..6a7334d5e8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-asia.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256 49.523C141.966 49.523 49.523 141.966 49.523 256c0 114.033 92.442 206.477 206.477 206.477 114.033 0 206.477-92.443 206.477-206.477S370.033 49.523 256 49.523zm125.396 82.687l-2.959-.668c5.191 7.278-18.457-1.57-24.64-.56l-1.833.362c-1.726 1.768-3.154 4.311-2.445 4.325.708.014-.635 7.567-4.043 9.482-3.406 1.915-3.896-1.846-1.092-8.358 2.805-6.512-4.687-6.033-4.687-6.033 6.618-2.779 6.237-4.107-.849-2.954 0 0-7.793 1.271-13.853.515-6.736-1.182-33.019 4.095-33.019 4.095-7.039 1.413-6.928 2.786.246 3.052 0 0 3.832.162 4.25 3.327.955-1.286 1.779-2.192 1.889-2.186.142.009 1.945 7.366 3.553 9.996 1.607 2.629 2.252 4.32 1.432 3.76l-.751-.077-4.392-.3c1.3 2.624 2.502 6.093 2.68 8.192.18 2.1 3.94 3.142 8.357 2.313l3.814-1.839c4.27-2.059 8.674-1.139 8.285 1.839.178-.271.408-.495.623-.484.392.022.318.737-.165 1.587l-.676-.033c-.011-.068-.018-.109-.024-.154-.359.888-1.076 1.909-2.262 3.057-2.572 2.49-8.127 3.148-12.407 4.794l-.427.227c-.201.095-.44.147-.656.229-1.75.8-3.197 1.824-3.969 3.325-2.284 4.439 1.605 11.432-1.096 16.299-2.717 4.894-10.279 4.955-15.008 7.309-3.557 1.771-13.704 6.729-20.097 6.324-.208.012-.612.03-1.409.07-.037-.123-.062-.191-.094-.287-.09-.023-.171-.054-.259-.078.002.033 0 .043.003.08l-3.319-.241c.345-.434.636-.861.905-1.28-.127-.143-.277-.255-.386-.418-.665-.987-.701-1.986-.347-2.948-.117-.059-.234-.114-.352-.184l.021-.359c.124-1.134.964-1.634 2.003-1.821.643-.615 1.402-1.182 2.201-1.693.356-3.067 16.803-6.602 18.139-6.715.084-.025 1.566-2.184 1.816-2.242-.742.636-.729 1.126.043 1.466l5.211.011c1.775-5.174 3.706-10.942 4.371-11.526.665-.585 1.658-.965 1.999-.885.342.08.491.083.423.068s-.351-.366-.625-.784l.246-.048c.576.016 1.205.804 1.76 1.775.393-1.849.588-3.766.646-5.725l-.473-.247c-3.111.814-4.631-.414-1.799 2.447-.946.939-2.003 1.334-3.172 1.183.29-1.139.066-2.112-.672-2.922l1.429-.646c.204-1.182.696-1.948.856-1.854.156.096.184.1.139.06-.045-.041.362.008.587-.004.226-.009 1.471-1.503 2.771-3.32l-.041-1.048c-.779-.613-.783-1.266-.012-1.953l.01.006c-.688-6.538-1.988-13.072-1.99-18.594-.545 1.304-1.412 2.833-2.795 4.684-4.936 6.282-10.241 21.516-21.234 21.543l-3.463-.131c-.197-1.186-7.388 2.03-10.229 4.018-2.844 1.99-6.82 13.326-7.465 16.237a180.087 180.087 0 0 0-.687 3.21c.011.621-.058 1.068-.146 1.201-.096.141-.031-.314.146-1.201a9.563 9.563 0 0 0-.31-2.226c-.434-1.647-.798-3.437-.797-3.647.002-.213 1.115-.668 1.361-1.04.244-.372-1.377-3.453-2.371-3.427-.994.028-2.69-.246-2.775-.627-.088-.379 1.021-2.154 1.037-2.849.014-.696-6.35-1.14-8.401-.553-2.052.586-2.771.157-1.595-.955l.039-1.25-.003-.373c-1.182-.612-5.118.238-8.202 1.877-3.084 1.64-2.741 4.739-2.12 5.892.622 1.15 2.528 2.506 3.089 2.426.561-.084 1.777-.943 2.084-1.851.306-.909 3.337.829 4.744 1.088 1.408.26-2.088 1.405-7.767 2.55l-.106 3.588.008 1.371c1.693.671 3.119 2.124 3.141 2.51.023.391.129.733.182.723.052-.009.037.011.018.037-.023.025-2.895 5.18-6.382 11.453l-16.095 25.52c-6.205 3.609-13.287 5.314-15.165 3.84-1.88-1.477-6.761-.708-10.849 1.705l-.09 4.955c.201 7.417 3.928 13.648 3.928 13.648 3.682 6.161 3.196 13.937-1.08 17.277l-1.164.01-.166-.004c-.07-.371-.642 1.145-1.364 1.816-.723.674-6.242-2.66-9.948-7.068-3.704-4.409-11.625-3.988-9.964.756 1.661 4.745 2.96 8.585 2.908 8.598-.052.014 4.745 3.324 10.663 7.359l.148 5.066-.031 3.251c1.598 3.097-11.453.091-13.141-5.574-1.688-5.663-2.922-12.699-2.643-13.587.281-.889.77-1.609.868-1.607.097.004-2.945-6.383-2.932-11.879.016-5.493-1.491-10.616-1.776-11.185-.285-.569-1.809 1.027-3.383 3.548l-2.913.045c-.829-.022-5.833-10.031-5.833-10.031-3.209-6.42-7.72-7.721-9.776-8.046-2.058-.323-10.375 8.512-15.474 12.611-5.101 4.098-9.066 14.358-9.051 16.97.018 2.613-2.86 6.514-3.73 8.295-.871 1.781-3.695-2.241-6.277-8.938l-3.947-7.445c-1.4-7.039-2.541-12.766-2.525-12.757.014.009.183-3.938.209-5.393.027-1.455-.518-1.046-1.211.911l-2.613.092-2.306.006c-.973-2.326-.044-4.618.331-5.162.375-.543-3.663-3.446-4.682-4.98-1.02-1.535-4.873-3.156-5.855-2.947-.979.211-2.16.694-2.232.824-.007.012-.079.013-.141.015C89.401 139.996 165.035 73.202 256 73.202c49.26 0 93.998 19.621 126.902 51.414.149 2.342-.291 4.859-1.506 7.594zM211.467 366.604c.3-.076.591.125.645.449l.047.259c3.131-.342 24.836-6.452 25.038-10.144l-.276-1.463c.916-1.262 2.484-1.233 2.77-.969.285.264 1.703-.719 1.705-1.351.002-.631 1.189-.663 1.574-.579.382.082 1.305-3 1.942-3.661.64-.663 4.758-1.706 5.535-2.202.778-.497 3.696-.018 4.022.896.326.915 1.589.905 2.088.803.498-.104 1.566.076 2.371.397l.142.123 4.107-5.617c3.394-1.622 5.408-3.402 4.479-3.957l-.212-1.107 4.262 2.711c4.631-.66 9.337-.764 10.463-.227l.014.617c-2.645 1.279-3.979 3.477-4.002 6.59-.021 1.695 11.45 6.785 13.762 6.655 8.244-.794 2.066-15.799 8.424-19.118l1.227 3.038c.804 3.489 2.79 6.621 4.416 6.959l.336.146c-.571-.367 10.82 17.274 10.854 17.478-.036-.123 6.647 5.383 7.507 6.109-.555 13.888-3.162 17.221-3.162 17.221a5071.487 5071.487 0 0 1-8.045 10.265c0-.005-3.824 1.267-8.496 2.821l-1.436 2.976c-5.838.659-16.056 2.099-18.153-5.477l-.997.478c-1.172.133-1.668-.512-1.535-.785.135-.275.039-.959-.213-1.52l-.367-.263-.178 1.422c-1.966.183-.876-1.295-.656-2.551.221-1.255-1.657.019-4.176 2.833l-2.137.143c-1.341-.01-5.586-6.127-8.701-6.539-7.062-.932-13.494 1.607-20.443 2.553-2.704.366-28.291 9.668-29.366 2.479-.026-2.251-1.241-5.72-1.241-5.72-2.371-6.773-4.041-12.776-3.938-12.97.104-.193.495.056.872.555 0 0 .006.006.295.155-.952-5.545-1.468-10.836-1.167-10.911zm-46.602-63.73l-.168-.24c-2.035-1.137-12.713-14.922-12.535-17.126 3.744.324 14.109 8.45 14.109 8.45 5.648 4.428 10.217 8.23 10.152 8.452l-.068.134.838-.168c.559.659.893 1.553.746 1.988l-.125.273c.084 3.445 6.201 10.14 6.682 15.518-.012 1.19-2.232 1.394-2.811 1.346-6.308-.886-9.307-6.672-9.307-6.672-3.303-6.371-6.683-11.751-7.513-11.955zm.524 6.368l-1.352-.769c-.354-1.254-.367-2.296-.029-2.314l.211.076c-.004 1.1.386 2.101 1.17 3.007zm-5.064-8.311c-.446-.646-.845-1.192-.868-1.187-.021.004.126-.042.329-.106l.124-.079c.66.456.862.942 1.108 1.538.248.596-.247.475-.693-.166zm23.219 8.771c-.466-.104-.116-.776.776-1.497h.592c1.887 1.227 2.877 2.826 2.971 4.795-1.762-.059-2.229-.718-2.994-2.233-.497-.878-.879-.962-1.345-1.065zm2.567 12.121l.49.087c4.494-.319 9.586 2.094 14.133 2.05l3.917.147c2.888.858 3.501 1.874 1.366 2.26l-.18-.07 1.758 1.503c4.533 1.186 7.844 2.664 7.562 2.88-.283.217-.949.018-1.48-.437l-1.355.058c-.256-.019-.078.789.027 1.028-4.447-1.715-15.619-4.348-15.619-4.348-6.986-1.646-11.765-3.965-10.619-5.158zm13.315-78.617c-3.799-.044-6.904-.752-6.902-1.039 0-.286 1.91-1.132 3.225-1.799 1.315-.666 2.941-.742 3.615-.169l-.006.429.068 2.578zm21.506 48.981c-.148.189 1.135 3.538 2.848 7.444l2.041.13a8.556 8.556 0 0 1-3.608 1.298l-6.753 13.085c-6.024-.006-11.342-.183-11.523-.318-.18-.136-.395-.825-.479-1.532l-.1-.323c-2.799-.402-7.938-.789-6.118-6.066-.59-1.556-2.956-2.631-3.206-5.287 0 2 15.719-11.057 15.719-11.057 5.521-4.586 10.605-6.973 12.721-5.293 2.113 1.682 3.268 4.06 2.586 4.174-.684.113-1.125.463-1.005.572.122.106-.66.725-1.513 1.086-.854.361-1.36 1.073-1.265 1.279.096.205-.199.618-.345.808zm-1.989 38.55l-.619 1.258c-.751-.537-1.377-1.428-1.379-1.639-.002-.21.333-.401.746-.429l.241.069c.422-.001.689.548 1.011.741zm9.651-77.535c1.807-5.647 4.75-9.798 4.916-9.294.168.503.906.539 1.644.083l.357-.172.084 4.916c-.839 3.068-1.081 7.827-.376 8.688.703.861 1.303 1.35 1.318 1.244.016-.109.387-.609.766-.75.379-.139 2.312.384 2.525 1.015.218.633.933 1.001 1.159.806.226-.2.685-.241.834-.206.149.033-.099.438-.553.901l-.054.375c.982-.158 1.732.27 2.252 1.281.08.616-.138 1.094-.658 1.433l-.941-1.804c-1.93-1.205-4.084-1.149-3.924-.822.16.326-1.742-.045-2.158-.641-.417-.594-1.754-.984-2.113-.811-.357.172-1.398-.18-2.313-.783l.037-.377c.729-.551 1.062-1.268.995-2.149-.68-.157-1.23.076-1.651.698-.356.009-2.433-1.437-2.417-1.896l.271-1.735zm4.427-30.564c3.243.297.331 9.559-2.567 9.824-4.733-.111-.43-9.596 2.567-9.824zm12.107 42.285c-.728-.425-.925-.952-.44-1.174l.259.012c.969-.025 1.334.081 1.78.21.447.13.762.642.734.862-.029.223.248.396.396.402.15.004.264.729.195 1.055-.07.329.062.807.291 1.063.232.255.131 1.105.004 1.35-.129.243-.844.418-1.592.386l-.438.029.723.836c.009 1.014-.357 1.81-.808 1.769l-.252.059-.411-.665c.04-.766-.976-1.739-1.187-2.099-.211-.357-.368-.863-.35-1.124l.04-.144.962.37c.708-.526.821-2.774.094-3.197zm2.794 7.603c.855.002 1.507.633 1.811.949l3.588 4.01c-1.913 3.959-3.939 6.609-4.184 6.021-.244-.583-.436-1.006-.441-.991-.005.012-.219-.244-.474-.569l-.156-.226-1.671.991c.865 1.406 1.145 3.479.765 3.646s-1.003.149-1.069-.081c-.064-.232-.545-.396-1.064-.363l-.267.025-2.85-1.52c.521-1.803.808-3.708.735-3.922-.073-.214-.834-.375-1.184-.387-.349-.014-.682.355-.705.545-.023.188-.865.222-.977.08-.111-.143-.363-.041-.457.055-.094.1-.61-.089-.839-.322-.229-.236-1.103 1.543-1.938 3.957l-1.302-.058c-3.56-.326 6.269-6.331 8.025-6.487.166-1.342 3.826-3.687 4.654-5.353zm-7.693 2.773c-.21.097-1.438-.805-2.73-2.001l.04-.521c.03-.162 4.751-5.838 4.399-2.384l-1.758 1.409c.249 1.744.256 3.401.049 3.497zm-2.651-4.991c-1.094.385-1.988-1.078-1.991-3.254l.104-.666c.434-.619.857-.675 1.268-.165a12.1 12.1 0 0 1 1.914.972c.538.323-.203 2.725-1.295 3.113zm-2.437-9.175c.197-.046 1.055-.136 1.207.018-.193.047-1.068.152-1.207-.018zm-4.411 40.429c1.625-2.461 3.21-3.647 6.174-3.09l3.198.604c3.155.108 4.644 2.002 3.306 4.205l-1.432.34c-.312.074-.666.025-1.037-.076-.744-.201-1.547-.613-2.182-.674-.996-.094-2.307-.275-3.171.32-1.652 1.14-1.474 2.754-.613 4.113.552.878 1.026.812 1.237 2.191l.269 1.759c.378 1.84.505 3.548.282 3.797l.008.167.024.498c.832.779.585 3.056-.442 3.263-1.029.207-2.7-1.339-3.713-3.433l.494-2.685c.018-.092-1.609.815-1.803 1.126-.391.62-.316 1.426-.326 2.119-.017 1.125.811 3.062-.849 2.951-2.067-.141-3.446-5.432-3.61-7.013-.346-3.333 2.406-7.781 4.186-10.482zm64.587 10.063l.056.065h-.002c.064.085.086.111.086.111.211.063.394.16.402.212l-.023.017c2.699 1.829 13.322 7.214 16.806 8.902 4.394 1.758 1.677-.439 1.027 3.151.099 2.977 6.97 8.696 9.99 8.345-6.79 5.346-11.099-6.61-17.82-6.416-2.646.188-4.296 2.817-4.588 5.115-4.628.699-6.099-2.734-9.962-2.642l-.472-.01c-2.759.008-3.998-.81-2.757-1.82l.469-.285c-2.809-2.685-4.121-3.458-4.121-3.458-6.187-3.639-11.221-7.015-11.223-7.208-.003-.191-.625.772-1 1.053-.373.282-1.142.496-1.705.473l-.061-.252.174-1.867c-1.44-.913-.477-1.942 2.145-2.29l.85-1.262c-1.533.169-9.434.545-9.494-3.037.203-4.879 10.021-.986 10.874-.802-.046 1.857.311 6.589 3.663 6.778 1.984-.014 6.098-5.547 8.24-5.771l.367 2.081c4.557.571 8.204.967 8.133.882-.02-.02-.023-.026-.054-.065zm11.995 94.27l-.178.907-1.284 4.585c-4.518-2.377-6.033-4.61-3.37-4.967l.072-.023c1.137-.175 1.785-.394 2.576-.66s1.774-.196 2.184.158zm32.878-84.82l.067.028c.018.008.031.015.029.017l-.002.004-.094-.049zm-229.848-41.448c-.127-3.267.998-5.567.971-9.017 5.238 9.71-.997 12.781-.971 9.017z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-europe-africa.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-europe-africa.svg
new file mode 100644
index 0000000000..4c9b6fac01
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-europe-africa.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M343.79 180.021c1.014 0 1.954-.093 2.797-.275l1.111-.242-.516-2.883c-.045-1.393-.789-6.567-2.695-7.379-.115-.051-.295-.457-.275-1.055l1.906.18c.566 0 1.056-.326 1.311-.873.432-.933.144-2.631-.586-3.494-.794-.946-2.57-1.431-4.476-1.118-.807-2.108-2.836-3.466-4.664-4.688-.932-.622-1.834-1.224-2.459-1.848 3.16-.108 10.229-.466 10.879-.758l1.539-.694-1.18-1.212c-6.496-6.665-11.006-8.405-13.44-5.826-1.666 1.767-1.539 4.899-1.518 5.252.428 7.448-1.14 14.466-1.324 14.981-.117.326-.436.455-.473.487l-1.821-.075.178 1.39c.841 6.611 9.664 10.13 15.706 10.13zm-34.164-18.001h.389l.509-.068.274-.159-.664-1.196-.119-.218v-.729l-.027.68v-.004l.023-.686-3.81-.136 3.066 2.27zm-17.873 37.322l.355-1.461-3.091-3.306.797 4.925zM256.001 49.523C141.966 49.523 49.522 141.965 49.522 256c0 114.033 92.444 206.477 206.479 206.477 114.031 0 206.474-92.443 206.474-206.477.001-114.035-92.442-206.477-206.474-206.477zm-90.607 94.385v.008l-.006-.008h.006zm60.048 247.681c-.232-.292-23.003-29.392-12.027-45.374 12.257-17.84-2.672-43.402-3.314-44.482-2.844-4.786-12.303-17.378-16.754-17.378l-.58.044c-.246 0-.292-.076-.338-.156-.475-.805-.19-3.973 2.604-9.045l.967-1.756h-2c-.208 0-.208 0-20.037 6.019-4.506 1.369-8.346 1.604-12.061 1.834-3.543.218-7.211.445-11.336 1.654-.971.284-1.971.428-2.979.428-9.906 0-18.566-13.654-18.656-13.792-3.553-5.688-6.352-10.332-6.816-11.161-.106-1.836-1.068-5.271-1.342-5.839-.498-1.025-1.238-7.459-1.312-15.608-.002-.173.068-17.556 16.75-28.448 7.695-5.375 12.369-13.532 12.566-13.877 3.438-6.072 12.137-12.292 18.795-13.561l20.973-.294.404-.077c6.041-2.296 13.619-4.002 15.385-4.205.047.26.053.628.006.846a1.725 1.725 0 0 0-.488 1.063c-.072.704.224 1.514.822 2.273l.002.269c-.019.459-.25.85-.626 1.447-.426.675-.955 1.515-1.024 2.714-.046 6.004 14.967 9.566 17.979 10.219 5.255 1.141 10.645 1.877 13.725 1.877 1.66 0 2.291-.211 2.648-.396l.67-.345-.045-1.195c.014-.734.033-1.624.02-2.115l.074-2.598c2.199-.284 4.523-.373 5.984-.428.832-.032 1.42-.063 1.502-.086.695.002 5.861 1.029 13.705 2.938l11.553 3.309.309.047c6.21.073 11.542.48 13.008.698l.127.198 1.305-.001.35-.544c.334-.525.195-.935-.133-1.664.066-1.469 1.258-9.829 2.582-12.679.383-.833.383-1.685-.008-2.464-1.127-2.257-5.168-3.283-9.566-4.221-.482-.102-.91-.192-1.248-.272-2.754-.653-9.616-1.069-12.29-1.069-.332 0-.615.007-.835.02-.983.055-1.784.044-2.183.015-.484-.562-1.5-1.51-3.631-3.431l-.918-.833c-.324-.296-.388-.546-.476-.5a.72.72 0 0 1 .236-.093l.861-.219.084-2.53-.006-.444a1.268 1.268 0 0 0-.457-1.006c.773-.2 1.562-.48 2.303-.818.309-.051.627-.079.955-.079l.327.009c3.221.188 11.396.335 18.613.335l1.221-.015 13.857-2.1c5.042.284 7.865-.594 8.477-2.562.461-1.478-.486-3.042-2.807-4.646-4.26-2.945-3.951-6.436-3.713-7.002a1.534 1.534 0 0 0-.125-1.469c-.482-.724-1.518-1.047-3.363-1.047-1.424 0-3.08.213-4.213.541-1.895.548-3.176 1.914-3.047 3.248.025.321.135.609.309.855a6.43 6.43 0 0 1-.49.118 7.113 7.113 0 0 1-1.367.114c-1.873 0-3.475-.459-3.869-.778a3.096 3.096 0 0 1-.528-.545l.276-.115-.192-.956c-.15-.771-.283-1.436-8.291-1.436-3.139 0-3.811.269-4.205.91-.432.693-.763 1.691-.863 2.354-.506.705-2.715 3.347-6.075 7.092l-.306.433.076 2.775.131.691.035.021c-.292.258-.801.61-1.553.979a9.772 9.772 0 0 0-2.474.875c-.823.187-1.551.251-2.193.175a23.956 23.956 0 0 0-2.901-.18c-2.238 0-3.428.257-4.072.574-.11-.028-.236-.064-.369-.1-.98-.263-2.162-.517-2.902-.166a1.878 1.878 0 0 0-1.069 1.527c-.097.929.398 1.863.956 2.46l-.09.167.19.557c.158.472.777 1.528 1.633 2.324a4.519 4.519 0 0 1-.418.162c-.206-.268-.504-.403-.883-.403h-.531l-.352.396c-.375.422-.375.422-.092 2.918-.037.142-.734.645-2.512.645-.312 0-.635-.016-.969-.049l-.018-2.027.008-.318c.623-.886.799-1.811.465-2.533a1.489 1.489 0 0 0-1.055-.852c-.835-.478-4.818-3.512-10.539-8.281l-3.469-3.381c-5.422-4.261-12.086-7.467-13.758-7.467l-.505.082c-.512.181-1.715.705-1.799 1.689l-.035.812.039.021c-.164.493.02.938.206 1.316.602 1.225 3.07 4.974 6.408 6.098 2.318.781 4.01 1.457 4.896 1.87l-.717 1.629 1.078.479a56.804 56.804 0 0 1 4.228 2.07c-.337.293-.617.614-.792.92-.387.656-.32 1.196-.19 1.538-.109.581-1.018 2.155-1.527 2.614-.301.27-.852.524-1.206.654-1.097-1.044-3.671-3.373-5.98-5.451.236.113.471.229.691.343l1.084-2.106c-1.67-.874-3.663-2.188-5.77-3.58-5.156-3.408-11-7.268-15.928-7.268-1.087 0-2.103.189-3.018.564-7.373 3.026-11.474 5.302-12.224 6.785l-.084-.039c-.346.735-3.801 5.08-5.777 6.097-.045.024-4.461 2.315-4.65 3.964-.375.49-1.422 1.642-3.266 3.371-2.186 2.052-3.371 3.166-4.002 3.842l-2.984.177-.414.103c-2.488 1.115-6.631 1.806-9.047 1.806-1.039 0-1.386-.128-1.419-.142a59.25 59.25 0 0 1-2.875-1.255l.107-1.079c.148-1.727-.506-3.323-.904-4.044 0-.964.4-4.798.816-6.656.369-1.642 7.635-11.619 13.105-11.633l2.09-.003c4.457 0 7.678.033 8.568.051l.15.101 1.607-.363-.139-.774a5.34 5.34 0 0 0 .162-.383c.117-.314.26-.708-.727-2.48-.692-1.25-2.594-4.217-5.25-4.768a125.85 125.85 0 0 1-2.895-.639c.588-.274 1.25-.481 1.902-.481h.004l.266.003c2.006 0 3.957-.617 4.744-1.503.115-.131.201-.263.262-.387.724-.357 2.757-1.079 4.29-1.622 2.052-.729 4.175-1.482 5.548-2.111 2.016-.925 5.941-2.957 9.742-4.924a616.96 616.96 0 0 1 5.49-2.824c4.061-2.059 6.584-5.476 7.08-7.244.18-.648.133-1.199-.057-1.442-.072-.608.971-2.86 2.039-3.11 1.186-.271 2.729.627 2.953.839.027.032.056.067.08.103a23.73 23.73 0 0 1-.82 1.213c-.299.178-.533.439-.6.84-.463.668-1.193 1.783-1.252 2.285l-.062.539.734.804h.531c.367 0 .81-.185 1.174-.46.26.204 1.037.732 4.412.732.555 0 2.447-.021 3.43-.306.5-.146.91-.215 1.184-.235 1.557.867 5.029 1.086 5.773 1.086 1.187 0 2.324-.132 3.383-.392 3.463-.855 6.215-1.384 6.97-1.489h.217c.346 0 8.604-1.759 10.45-4.471.939-1.381 3.713-1.935 5.203-2.233.44-.086.797-.161 1.024-.229 1.244-.367 2.645-2.218 2.432-3.682a2.03 2.03 0 0 0-.061-.282c1.193-.28 2.697-.615 4.176-.943 3.391-.755 3.732-2.383 3.631-3.286-.23-2.136-3.377-3.685-7.586-3.685l-.582.002c-3.869 0-6.904-.275-8.205-.464a4.306 4.306 0 0 0-.354-.501c.004-.246.029-.67.074-1.039.692-.425 2.663-1.267 4.143-1.9.879-.377 1.779-.764 2.604-1.133 1.822-.816 1.97-1.949 1.898-2.552-.299-2.408-5.061-3.759-9.006-4.469l-1.356-.243-.138 4.775c-.768.651-3.25 2.386-6.184 3.69-2.371 1.058-3.869 2.739-4.098 4.611-.17 1.402.369 2.754 1.537 3.86-.093.314-.658.5-1.892.793-1.73.412-4.621 1.101-4.594 4.432l-.03.784c-.602.626-2.175 1.841-4.201 2.448-1.677.502-3.635.813-5.115.813-.439 0-.732-.028-.914-.059a5.887 5.887 0 0 1-.113-.863l-.02-.003c.02-1.521-2.977-4.129-3.01-4.158a4.242 4.242 0 0 1-.807-.912l-.01-.115c-.063-.734-.631-1.056-1.418-1.5-.148-.083-.287-.157-.338-.189l-.471-.291h-.424c-.436 0-1.154.126-2.615.388-1.549.278-3.666.659-5.438.813-2.276.196-5.004.186-5.568.135-.496-.229-.768-.142-1.106-.12a9.662 9.662 0 0 0-.236-.817c-.341-1.055-.912-2.82-.332-3.883.268-.487.79-.826 1.596-1.037 5.193-1.353 7.187-2.109 7.936-2.688.342-.157 1.041-.442 1.955-.822 3.092-1.28 8.268-3.424 11.809-5.368 3.949-2.168 5.75-4.039 5.359-5.564a1.875 1.875 0 0 0-.078-.229c.781-.377 1.742-.758 2.441-.868 1.413-.224 2.375-.422 2.909-.79.684-.22 2.32-.672 3.049-.721.826-.056 1.68-.111 2.191-.478.524-.126 1.577-.326 2.231-.375.5-.035.947-.004 1.199.029l.141.143h.539c.498 0 2.469-.302 3.254-.549.176-.055.328-.078.477-.085l.635.116c.226 0 .424-.052 1.137-.248.691-.189 1.975-.541 2.545-.567.547-.024 1.504-.067 1.861-.791.846-.275 2.482-.659 4.176-.531 1.361.102 2.373.354 2.951.554l.209.765h1.079c.476 0 2.099-.096 2.863-.384.138-.053.346-.092.57-.108l.908.103c.24 0 .482-.064 1.004-.203.652-.172 1.74-.46 2.496-.462.686.29 1.805.339 3.562.387l.398.012-.011.097c-.141 1.278-.15 1.354 12.309 4.136 6.947 1.552 14.48 3.403 17.881 4.454-2.51 1.229-3.963.988-4.047.976-3.247-.661-5.943-1.011-7.803-1.011-1.829 0-2.809.314-3.283 1.048-.293.45-.331.998-.104 1.502.73 1.627 5.799 3.831 7.762 3.851.402 0 1.461 0 1.746-.962a1.15 1.15 0 0 0 .026-.653c1.291.113 2.757.296 3.695.412l.781.096c1.352.147 3.071-.342 3.575-1.422.01-.021.016-.04.025-.06.741-.153 2.19-.351 4.092-.509.689-.057 1.764-.062 2.755-.066.981-.008 1.885-.016 2.338-.062.695-.071 1.283-.488 1.609-1.146.109-.222.187-.465.234-.72l2.006.949c7.02 3.318 10.662 2.497 10.662 2.498 5.983-1.088 10.932-1.795 12.139-1.942 2.584 1.514 9.273 2.642 9.355 2.655 3.52.537 10.846 2.48 16.73 4.419 25.562 18.122 46.281 42.632 59.82 71.191 5.715 14.427 10.215 28.498 13.507 39.947a182.401 182.401 0 0 1 3.557 25.513 44.007 44.007 0 0 1-1.693-4.689c-1.981-6.642-4.273-7.359-5.167-7.359l-.299.014a5.948 5.948 0 0 1-1.348-.195l-.193-.365h-.75c-.572 0-.947.36-1.281.678-.062.062-.129.129-.194.186-.652.205-2.478 1.527-10.341 10.058-.135.147-3.312 3.65-3.205 8.284l-.062 4.611c.007 4.795-1.358 10.466-2.383 12.413-.781-.688-2.518-3.357-4.33-9.029l-3.549-7.247c-1.459-7.048-2.707-16.872-2.782-18.437-.18-4.03-1.318-4.002-1.791-4.03-.553.017-.667.139-2.076 1.619-.355.377-.721.76-.986 1.021a1.712 1.712 0 0 1-.234.013c-1.271 0-2.895-.663-3.119-1.047-.192-.365.259-.936.742-1.489a6.61 6.61 0 0 0 .303-.362l.326-.49-.07-.495c-.121-.809-.827-1.356-3.049-2.97-1.455-1.057-3.451-2.503-3.982-3.355-1.471-2.344-6.963-5.095-9.014-5.095h-.002c-.028.001-2.164.132-3.395.544-1.467-.356-8.187-2.513-11.376-4.102-2.875-1.434-7.975-2.358-12.996-2.358-1.334 0-2.604.065-3.78.197l-4.996-4.898c-.702-.732-1.178-1.772-1.682-2.874-1.086-2.373-2.439-5.325-6.719-5.486l-.271-.002c-2.528 0-4.153.71-4.829 2.111-1.146 2.377 1.223 5.468 1.502 5.813 3.119 3.925 7.949 8.614 10.177 9.674.045.363.059.814 0 1.029-.273 1.024.76 2.517 1.213 3.11.678.879 2.52 2.926 5.051 2.924 1.195 0 2.34-.453 3.4-1.348 2.753-2.324 4.998-3.304 5.982-3.561.902 1.846 3.498 5.077 5.15 6.238 2.059 1.447 3.037 2.134 3.568 2.459.297.375.543.664.751.887-.775 2.297-4.898 11.237-10.072 13.71-3.84 1.836-10.014 4.902-11.668 6.406l-.023-.03c-.838.585-11.709 5.775-16.053 7.455-3.771 1.46-7.484 2.332-8.896 2.332-.053 0-.096-.003-.129-.004-.792-.924-3.133-5.728-5.646-12.715-.521-1.46-2.271-6.285-2.75-7.088-4.039-6.768-5.311-8.555-5.36-8.627l-1.353-1.885c-4.114-5.74-9.749-13.598-11.473-16.533-1.891-3.205-3.111-6.761-3.133-7.297l.133-.719-.719-.876h-.564c-.861 0-1.002.319-2.006 2.778-.967-.027-2.863-.842-3.469-1.842-.217-.358-.621-1.025-1.392-1.025l-.657.02-.352.506c-.373.533-.724 1.036 2.823 10.695.058.157 1.46 3.941 5.593 11.412 1.699 3.07 2.801 6.34 3.963 9.801 1.019 3.031 2.074 6.164 3.562 9.125 1.139 2.263 2.775 4.331 4.355 6.332 1.797 2.27 3.492 4.416 4.384 6.691.336.842.428 1.773.53 2.762.125 1.246.253 2.537.879 3.762 2.641 5.203 7.177 7.952 13.119 7.952 5.172 0 9.588-2.065 9.773-2.153 5.461-2.585 9.379-4.007 11.17-4.438-1.025 16.225-20.637 33.969-29.051 41.587-15.787 13.314-12.787 19.712-12.388 20.397 3.566 6.197 6.414 16.89 6.187 19.112-.16 1.589-4.835 5.701-12.093 8.785-.334.14-8.192 3.583-8.598 12.853l-.133 12.396c-4.287 2.437-11.787 7.906-17.18 12.555l-.344.296-.641 4.974c-6.941 3.004-21.768 5.949-25.152 6.018l-.072 1.172v-1.171c-3.067-.006-9.522-3.998-14.23-9.938z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-america.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-america.svg
new file mode 100644
index 0000000000..a95c1a1975
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-america.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M245.627 109.839c-.154 0-.352-.011-.533-.017-.023.006-.045.014-.07.017h.603zM256 49.523C141.967 49.523 49.523 141.966 49.523 256S141.966 462.478 256 462.478 462.477 370.034 462.477 256 370.033 49.523 256 49.523zm29.582 33.756c-2.758 8.314-17.109 2.741-23.031 2.755 4.66-1.821 11.615-4.223 15.537-7.107 2.047-1.509-.033-2.51 2.781-3.987 3.605.492 7.184 1.067 10.719 1.766-4.186 1.408-8.166 3.324-11.74 5.692 1.914.292 3.822.589 5.734.881zm-67.008-6.06c-2.711 1.571-8.014 6.727-4.922 9.929 3.016 3.126 6.615-1.681 9.635-3.202 7.01-3.536 16.391-3.895 24.16-5.404-1.369 3.653-12.467 2.337-16.357 3.755-4.885 1.778-2.705 3.024-6.121 8.477 1.461-.156 3.041.694 4.516.663v.992c-3.357-.291-6.564-1.886-7.273 2.091-4.299-6.447-7.111-5.934-11.682-.218 4.529 2.518 8.971 5.653 5.402 9.973-4.342 5.255-6.975-1.212-2.535-3.913-4.033-1.867-7.191-5.049-10.361-.99 1.357-.131 2.82.558 4.188.552-.773 1.108-1.555 4.717-2.285 5.129-1.742.982-8.166-1.175-10.086-1.41-4.789-.585-9.521-.441-14.412-.194.891 5.979-5.814.259-8.262-1.213 4.424-4.477 9.799-2.78 14.91-2.078 4.275.585 10.598.544 11.098-4.862-4.656-.983-6.932-.702-9.32-4.244-.941-1.395-1.566-2.854-1.797-4.311a181.04 181.04 0 0 1 30.857-9.52h.647zM73.203 256c0-43.159 15.068-82.841 40.172-114.148 4.311 2.981 8.879 6.541 10.646 8.061 3.082 2.643 4.588 5.813 6.527 9.032.102.17 1.799 2.822 2.477 3.898 2.102 2.103 3.781 4.458 4.252 7.308.57 3.431-.717 6.287-1.035 9.855-.977 10.948.576 21.202 9.119 28.888 2.375 2.135 5.457 3.23 7.816 5.483 2.439 2.326 2.154 3.915 3.635 6.369 3.914 6.491 9.148 12.585 13.658 18.717 3.943 5.354 5.596 4.313 1.717-1.222-2.635-3.762-5.91-7.456-8.094-11.494-.227-.423-2.439-5.709-1.719-5.554 6.102 1.302 7.346 5.462 11.307 10.351 3.908 4.819 7.23 7.522 9.508 13.311 2.658 6.75 6.709 10.035 13.359 13.012 3.271 1.464 8.611 5.345 12.111 5.804 4.117.542 6.312-2.136 10.211-.271 2.604 1.245 4.59 5.219 7.812 6.171 3.088.909 5.141-.26 8.027 1.693 3.451 2.336 4.664 6.349 7.902 8.814 2.32 1.768 5.668 3.973 8.623 4.454 2.121.347 4.447-1.239 6.559-.552 3.785 1.231 4.66 5.862 3.514 9.55-1.275 4.139-5.156 6.698-6.709 10.804-1.404 3.714-.508 6.876-.984 10.416-.49 3.661-3.428-.035-.494 6.172 1.373 2.901 3.381 5.522 5.137 8.188 3.463 5.256 5.945 9.855 10.611 14.103 3.295 2.994 10.494 6.496 12.129 10.947 1.451 3.956.248 12.653-.486 16.833-1.541 8.739-1.316 19.253-3.729 27.366-2.35 7.893-5.078 10.25-3.066 18.868.859 3.679 1.521 1.893-.004 6.629-.445 1.372-.01 1.918-.537 3.304-1.107 2.933-3.727 4.661-4.84 7.69 4.164.198 3.852 1.644 2.541 3.293-4.912.398-9.863.657-14.877.657-100.794-.002-182.796-82.004-182.796-182.8zM291.49 435.311c-1.18-1.231-2.438-2.512-2.436-3.383 0-.956 3.734-5.747 4.242-6.943.805-1.905 1.361-6.037 2.527-7.509 1.994-2.52 6.285-1.583 5.461-6.268 9.57-.102 13.693-1.551 15.27-11.297-1.701-.857-1.363-.361-1.637-1.846.326 1.767 7.17-.713 7.816.523.5.952 9.18-10.906 10.125-11.903 2.463-2.604 4.611-4.579 6.172-7.707.613-1.227 1.27-4.964 2.572-6.786a8.31 8.31 0 0 1-.311.938c3.09-4.895 7.018-4.305 11.482-6.288 4.438-1.974 1.232-1.437 4.494-4.528 3.881-3.674 4.764-1.567 5.867-7.587.816-4.447-.258-8.503 1.172-12.518 1.807-5.064 6.172-6.715 9.068-11.019 2.213-3.285 4.285-8.645 1.293-11.943-2.486-2.743-9.885-5.006-13.24-5.807-3.951-.939-8.512-1.023-12.219-2.531-4.355-1.772-7.977-6.38-10.18.778-.729-.516-3.721-2.177-3.721-2.983 0 1.575 4.23-1.392 4.824-2.087-1.816.131-8.023 1.519-8.918.898 0 0 0 .006-.002.008.436.317 1.537.174 2.029.252-1.891 1.025-2.295.678-2.029-.252-.012-.011-.037-.011-.049-.024.01.01.041.01.051.017.521-1.793 3.568-5.776 3.631-6.57.33-4.432-6.104-9.477-9.594-10.475-4.775-1.362-7.479-.754-11.566-3.75-4.961-3.633-9.777-7.652-16.066-8.353-1.332-.148-2.775.581-4.17.375-3.4-.505-4.527-2.705-7.375-3.42-3.496-.881-4.824 2.136-6.914 2.127-3.074-.011-3.811-3.235-8.305-.522-6.662 4.019-3.041 6.532-10.623 4.6-4.018-1.021-8.533 1.438-12.373-1.222-3.459-2.395-4.246-9.032-.873-11.826-1.715 1.419-1.654-3.085-2.904-3.906-1.975-1.306-5.209.217-7.49-.329-3.09-.738-4.885-1.021-4.184-4.023.756-3.242 9.34-12.075.566-11.841-4.777.126-6.301 7.224-11.369 8.261-5.699 1.166-10.668-.783-13.615-5.821-6.152-10.506 3.613-23.448 13.582-24.359 7.801-.713 19.215-6.476 24.928 2.134 1.66 2.504 5.76 12.195 7.869 5.918.641-1.907-1.656-10.203-2.383-13.681-.023.037-.053.064-.074.1-.031-.372-.07-.744-.113-1.116.035.256.104.613.188 1.017 1.588-2.46 4.152-4.029 6.178-6.156-.262.273-.529.537-.801.798 2.025-1.996 7.291-4.341 8.213-7.107.506-1.527-1.797-3.485-.596-5.601.92-1.622 3.186-.972 4.07-2.044 1.258-1.533 1.424-4.072 2.754-5.689 1.367-1.664 4.006-1.878 5.4-3.144 3.197-2.903 4.07-6.209 7.822-7.987 3.539-2.394 7.293-6.484 11.795-4.63-1.623 1.857-5.74 2.998-6.938 4.723-.818 1.181 6.111.525 7.049.183 3.902-1.435 6.992-4.348 10.264-6.508 5.674-3.74 12.244-3.924 19.084-2.55 2.096.418-3.787-8.049-4.412-8.767-2.377-2.729-2.969-5.162-6.807-1.627-1.117 1.029-2.295 4.513-3.086 5.95-2.426 4.404-1.873 3.837-7.158 6.55.285-.123.557-.27.818-.433-3.867.774-7.555 2.44-9.117-2.343-.525-1.596 1.713-3.931.463-5.54-2.742-3.539-11.881 3.928-15.094 5.125 1.67-13.134 17.207-6.217 25.488-8.839 2.266-.719 10.736-3.962 11.211-6.101.701-3.175-6.715-8.323-8.41-9.77-3.643-3.101-5.578-4.894-7.625-9.728-2.182-5.146-3.617-10.292-9.076-6.503-2.037 1.414-.568 4.483-4.08 4.962-2.213.306-4.475-2.491-5.74-3.804-1.906-1.981-3.889-6.825-7.389-7.257-3.004-.367-11.361-4.776-15.283-1.916-3.004 2.191.414 10.475 1.32 13.443 1.949 6.378 3.172 6.622-2.254 10.626-2.656 1.964-4.27-.137-3.291 5.151.506 2.748 3.475 3.287 1.361 5.661-1.297 1.461-4.406 1.32-5.914.614-4.723-2.211-.512-5.165-2.771-8.311-1.688-2.345-10.738-4.264-13.834-5.667-6.857-3.104-24.939-6.4-19.379-17.019 1.508-2.882 7.168-7.13 9.736-8.785 2.633-1.694 5.918-2.165 8.123-4.513 1.238-1.317 1.332-4.953 2.439-5.859 1.568-1.283 6.137-.69 8.57-.602 10.533-2.11.941-17.409 14.814-14.639 3.83.765 7.664 4.646 10.822 6.81 3.553 2.432 4.736 2.152 3.613 5.869-.258.86-4.229 4.718-5.24 5.501-1.85 1.431-4.834 2.091-6.998 2.979 7.238 0 10.271-.354 16.18 3.57 5.064 3.362 8.24 5.607 14.461 5.357-.379-3.024-5.719-1.856-5.51-4.849.176-2.522 3.389.807 3.803.827 1.723.087 6.215 2.136 5.234-2.702-.863-4.246-10.145-2.22-7.166-9.146 4.176-.46 3.055 4.12 5.816 5.109 2.936 1.053 6.768-2.536 7.406-5-4.119-2.104-16.732-5.495-15.316-11.46 8.416 5.362 16.826 10.724 25.238 16.09-6.816 6.097 4.957 2.666 5.68 2.844 2.002.495 7.115 4.896 3.77 5.719-3.479.854-5.264-4.166-8.789-.409 2.926.771 13.252 1.354 10.498 6.922-1.104 2.226-7.742 1.842-9.725 6.193 1.422-.272 2.965.154 4.408-.22-3.168 4.933 1.521 8.195 4.096 12.138 2.922 4.479 7.014 11.34 12.822 12.768 12.361 3.034 10.871-17.063 20.256-20.243 2.596-.881 5.428-.238 8.047-.973 2.922-.824 4.486-2.931 6.789-4.521 5.717-3.948 10.67-3.96 17.783-4.174.178-.006.357 0 .537.003 31.178 32.8 50.375 77.094 50.375 125.813.006 88.656-63.439 162.744-147.303 179.315z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-asia.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-asia.svg
new file mode 100644
index 0000000000..c62b1e835a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-asia.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M242.904 278.507c-1.807.161-11.916 6.335-8.254 6.673l1.338.057c.861-2.479 1.758-4.312 1.992-4.072.236.245.768.436.865.336.096-.099.355-.2.469-.058.117.146.98.11 1.006-.084.023-.19.367-.572.725-.559.361.013 1.141.178 1.217.398s-.221 2.18-.756 4.036l2.932 1.561.273-.024c.535-.032 1.029.134 1.096.372.066.239.709.254 1.1.084.393-.172.104-2.303-.787-3.748l1.721-1.021.16.229c.262.336.48.601.486.588.006-.015.203.419.455 1.021.25.604 2.334-2.125 4.303-6.196l-3.691-4.126c-.312-.324-.982-.971-1.861-.975-.855 1.716-4.617 4.125-4.789 5.508zm-12.89-21.65c.436-.642 1-.88 1.701-.718.068.905-.273 1.644-1.025 2.212l-.037.385c.941.622 2.012.985 2.381.806.367-.18 1.746.226 2.174.836.428.611 2.387.993 2.219.657-.166-.337 2.051-.394 4.035.846l.969 1.856c.537-.35.762-.838.678-1.473-.535-1.041-1.305-1.483-2.316-1.318l.057-.387c.465-.476.721-.895.568-.929-.154-.036-.627.008-.859.21-.23.206-.965-.176-1.188-.825s-2.211-1.187-2.602-1.043c-.391.146-.773.66-.789.769-.014.111-.633-.392-1.355-1.276-.725-.887-.475-5.782.389-8.937l-.088-5.059-.369.176c-.756.471-1.518.434-1.689-.083-.17-.521-3.197 3.75-5.057 9.559l-.277 1.785c-.02.472 2.114 1.961 2.48 1.951zm-.293-25.07c2.982-.271 5.979-9.8 2.641-10.106-3.081.237-7.508 9.989-2.641 10.106zm-.307 89.079c1.707.114.857-1.878.873-3.034.012-.712-.064-1.545.338-2.184.199-.319 1.869-1.25 1.854-1.155l-.51 2.762c1.043 2.154 2.762 3.742 3.818 3.529 1.061-.213 1.312-2.551.457-3.355l-.025-.513-.008-.17c.229-.257.1-2.012-.291-3.904l-.275-1.809c-.217-1.419-.705-1.354-1.273-2.258-.885-1.397-1.068-3.058.631-4.23.891-.611 2.236-.426 3.264-.328.65.06 1.479.484 2.242.694.383.102.748.151 1.068.075l1.471-.35c1.377-2.267-.152-4.212-3.4-4.323l-3.291-.622c-3.047-.574-4.676.645-6.348 3.176-1.832 2.778-4.662 7.357-4.307 10.783.169 1.63 1.587 7.072 3.712 7.216zm15.857-49.315l.422.68.26-.056c.463.041.838-.779.83-1.823l-.744-.858.453-.032c.77.036 1.508-.142 1.637-.394.131-.252.234-1.127-.004-1.39-.236-.263-.371-.754-.299-1.092.07-.338-.047-1.082-.201-1.085-.152-.004-.438-.187-.408-.417.027-.228-.293-.752-.754-.885-.461-.135-.836-.243-1.834-.215l-.264-.015c-.5.229-.297.774.451 1.207.748.435.633 2.748-.094 3.291l-.99-.382-.043.148c-.02.269.143.786.359 1.156.22.373 1.263 1.374 1.223 2.162zm-10.728-10.271c.143.176 1.045.067 1.24.018-.156-.158-1.037-.065-1.24-.018zm26.209-62.043c.113.167.268.283.395.428-.275.433-.576.871-.928 1.315l3.414.251c-.004-.038-.002-.047-.004-.082.092.025.174.06.27.08.031.102.057.168.094.295.822-.038 1.24-.061 1.451-.07 6.576.414 17.014-4.687 20.672-6.51 4.863-2.416 12.641-2.48 15.438-7.515 3.273-5.893-.68-11.59 1.615-16.539.551-1.187 1.496-2.332 2.955-3.426.457-.132.912-.268 1.314-.457l3.289-1.753-.332-.12c-.105-.113-.193-.226-.285-.337 2.465-1.612 2.475-1.62 2.475-1.62 4.463-5.446 5.299-9.272 1.859-8.497l-3.221-.287c-2.092-.188-3.406-2.16-5.906-2.169-4.143-.016-6.053 2.315-7.26 5.93-.57 1.711-.742 3.521-.744 5.38-.57.693-.996 1.144-1.121 1.146-.23.01-.648-.037-.604.006.047.039.021.037-.143-.061-.164-.101-.67.688-.881 1.906l-1.471.661c.76.834.99 1.836.693 3.008 1.199.154 2.287-.253 3.26-1.219-2.412-2.436-1.73-2.001.385-2.246.295 4.694.855 9.469-1.754 13.424-5.828 8.84-17.25 7.457-25.988 9.477-1.936.446-5.396 2.057-7.57 4.135-1.072.19-1.936.706-2.062 1.874l-.02.37c.115.067.24.125.359.187-.365.99-.328 2.019.356 3.035zm-154.584 81.066c-.023 3.873 6.387.714.998-9.275.029 3.548-1.127 5.916-.998 9.275zm143.445-89.029c.09-.137.16-.598.148-1.236-.179.913-.247 1.379-.148 1.236zm42.201 139.281l.486.009c3.975-.098 5.488 3.435 10.248 2.719.299-2.363 1.996-5.071 4.719-5.265 6.912-.197 11.346 12.1 18.332 6.601-3.107.361-10.178-5.524-10.277-8.582.668-3.696 3.463-1.435-1.057-3.242-3.584-1.736-14.512-7.274-17.287-9.156l.023-.02c-.01-.054-.197-.152-.416-.219l-.088-.113c.068.087-3.68-.321-8.365-.908l-.375-2.141c-2.207.23-6.438 5.924-8.477 5.938-3.449-.194-3.816-5.064-3.77-6.975-.877-.188-10.977-4.192-11.184.829.059 3.682 8.188 3.297 9.764 3.121l-.873 1.3c-2.695.356-3.689 1.415-2.207 2.354l-.178 1.919.062.262c.578.023 1.369-.195 1.754-.483.385-.29 1.023-1.281 1.027-1.085.002.196 5.182 3.671 11.545 7.415 0 0 1.352.793 4.24 3.556l-.482.294c-1.275 1.037.001 1.877 2.836 1.872zm4.631-17.334c.029.039.035.043.053.065h.006l-.059-.065zm11.342 35.207l-.346-.151c-1.67-.35-3.717-3.568-4.543-7.157l-1.262-3.125c-6.541 3.413-.182 18.849-8.664 19.665-2.379.135-14.18-5.102-14.156-6.846.023-3.204 1.396-5.46 4.117-6.778l-.014-.635c-1.16-.553-6.002-.447-10.762.232l-4.385-2.79.217 1.139c.955.574-1.117 2.405-4.605 4.073l-4.227 5.777-.145-.124c-.828-.333-1.928-.519-2.439-.413-.514.107-1.812.115-2.148-.825-.338-.938-3.338-1.431-4.139-.922-.799.512-5.035 1.585-5.693 2.267-.656.682-1.604 3.853-2 3.766-.395-.085-1.615-.052-1.619.595-.002.649-1.457 1.66-1.752 1.394-.293-.272-1.908-.304-2.85.994l.285 1.502c-.209 3.803-22.535 10.082-25.756 10.438l-.047-.269c-.057-.333-.355-.54-.664-.461-.309.078.221 5.52 1.197 11.227a17.81 17.81 0 0 0-.305-.16c-.387-.512-.789-.77-.896-.571-.105.199 1.613 6.372 4.053 13.341 0 0 1.248 3.565 1.275 5.885 1.107 7.393 27.428-2.174 30.209-2.552 7.148-.973 13.764-3.582 21.027-2.626 3.207.425 7.572 6.722 8.951 6.73l2.197-.152c2.59-2.893 4.525-4.203 4.297-2.911-.227 1.292-1.346 2.81.676 2.622l.182-1.46.377.27c.26.576.359 1.279.221 1.561-.137.283.373.946 1.578.808l1.025-.486c2.158 7.792 12.672 6.31 18.674 5.63l1.479-3.06c4.805-1.602 8.738-2.907 8.738-2.901 0 .003 3.729-4.749 8.277-10.562 0 0 2.68-3.427 3.252-17.714-.885-.743-7.762-6.41-7.725-6.285-.033-.211-11.75-18.357-11.162-17.98zm-96.717-16.001l1.395-.055c.547.466 1.232.67 1.523.447s-3.115-1.743-7.779-2.962l-1.809-1.547.186.074c2.195-.397 1.562-1.443-1.404-2.326l-4.029-.151c-4.68.046-9.916-2.438-14.539-2.11l-.504-.087c-1.18 1.225 3.736 3.612 10.924 5.307 0 0 11.49 2.705 16.064 4.47-.106-.247-.291-1.078-.028-1.06zm95.467 77.599c-.814.276-1.48.501-2.65.68l-.074.024c-2.738.365-1.18 2.666 3.467 5.11l1.322-4.718.182-.935c-.423-.361-1.432-.437-2.247-.161zm36.067-87.084l.098.046.002-.002c.002-.003-.012-.009-.029-.016a1.55 1.55 0 0 0-.071-.028zm-23.094-1.37c.143-.013.291-.064.438-.085-.284-.153-.473-.176-.438.085zm10.644-4.78c-2.135.162-6.33 4.092-10.207 4.695.672.365 1.941 1.557 2.414 1.973l.076-.005c-.135-.095 3.543-.895 8.17-1.78l.359-3.395c.036-.5-.296-1.486-.812-1.488zm-137.898-14.899c.262 2.734 2.695 3.839 3.299 5.439-1.871 5.429 3.416 5.827 6.297 6.24l.1.331c.086.729.309 1.44.494 1.578s5.656.321 11.852.328l6.947-13.459a8.838 8.838 0 0 0 3.713-1.335l-2.102-.135c-1.76-4.017-3.08-7.461-2.93-7.659.152-.194.457-.617.357-.829-.1-.213.422-.944 1.299-1.316s1.684-1.009 1.559-1.12c-.125-.11.33-.469 1.031-.586.701-.119-.484-2.565-2.66-4.292-2.174-1.729-7.406.724-13.084 5.442 0 .001-16.168 13.431-16.172 11.373zm-16.551 3.857c.15-.447-.195-1.367-.768-2.045l-.865.172.07-.139c.068-.227-4.633-4.139-10.443-8.691 0 0-10.662-8.359-14.512-8.697-.184 2.271 10.801 16.45 12.893 17.62l.174.246c.854.209 4.33 5.743 7.73 12.299 0 0 3.084 5.951 9.572 6.861.594.051 2.879-.157 2.893-1.383-.494-5.531-6.787-12.417-6.875-15.965l.131-.278zM256 49.523c-96.727 0-177.902 66.514-200.324 156.296-.191.513-.383 1.03-.57 1.562-.521 1.465-.797 3.17-.924 4.875a207.149 207.149 0 0 0-4.658 43.743c0 114.034 92.443 206.478 206.477 206.478S462.477 370.034 462.477 256 370.033 49.523 256 49.523zm0 389.274c-100.795 0-182.797-82.003-182.797-182.798 0-10.145.867-20.087 2.463-29.785 1.285.59 2.594 1.421 3.133 2.233 1.047 1.577 5.203 4.563 4.818 5.123-.387.561-1.342 2.918-.34 5.311l2.371-.006 2.688-.097c.713-2.012 1.273-2.436 1.246-.938-.027 1.497-.201 5.558-.217 5.549-.016-.008 1.158 5.883 2.602 13.123l4.057 7.659c2.656 6.889 5.564 11.027 6.459 9.193.895-1.832 3.855-5.846 3.838-8.533-.018-2.686 4.062-13.237 9.309-17.455 5.246-4.219 13.801-13.307 15.918-12.974 2.115.334 6.754 1.672 10.057 8.277 0 0 5.146 10.296 6 10.318l2.998-.045c1.617-2.594 3.182-4.239 3.479-3.651.293.587 1.842 5.857 1.828 11.51-.016 5.648 3.115 12.216 3.012 12.214-.1 0-.6.742-.891 1.654-.287.914.98 8.149 2.717 13.977 1.738 5.828 15.162 8.919 13.52 5.736l.031-3.348-.154-5.21c-6.086-4.151-11.021-7.557-10.969-7.57.055-.015-1.281-3.965-2.99-8.843-1.707-4.881 6.439-5.314 10.25-.779 3.812 4.535 9.488 7.964 10.232 7.272.74-.691 1.33-2.25 1.404-1.87l.17.004 1.197-.012c4.398-3.437 4.9-11.433 1.111-17.771 0 0-3.834-6.413-4.041-14.038l.096-5.1c4.201-2.479 9.223-3.269 11.156-1.752s9.219-.236 15.6-3.946l16.557-26.255a5828.64 5828.64 0 0 1 6.562-11.784c.023-.027.037-.046-.016-.034-.053.009-.164-.345-.186-.744-.023-.4-1.488-1.892-3.232-2.58l-.01-1.411.111-3.695c5.842-1.174 9.438-2.354 7.99-2.62-1.447-.267-4.564-2.054-4.879-1.121-.318.935-1.568 1.821-2.146 1.904-.574.084-2.537-1.311-3.176-2.495-.641-1.183-.992-4.373 2.18-6.06 3.172-1.686 7.221-2.561 8.439-1.929l.004.383-.043 1.287c-1.207 1.142-.473 1.584 1.641.98 2.109-.604 8.656-.146 8.641.568-.014.714-1.154 2.54-1.064 2.93.086.391 1.832.672 2.854.645 1.021-.024 2.689 3.143 2.439 3.528-.254.382-1.4.849-1.4 1.067-.002.217.373 2.059.82 3.754.223.844.309 1.652.316 2.287.158-.79.402-1.911.709-3.302.664-2.994 4.754-14.655 7.678-16.702 2.922-2.046 10.32-5.352 10.521-4.131l3.561.133c11.311-.027 16.768-15.699 21.846-22.161 8.594-11.513-.814-11.86-.814-11.86-7.377-.274-7.492-1.687-.252-3.142 0 0 27.035-5.426 33.963-4.211 6.236.778 14.252-.528 14.252-.528 7.289-1.187 7.68.179.873 3.039 0 0 7.709-.495 4.82 6.206-2.885 6.698-2.381 10.567 1.125 8.597 3.504-1.971 4.889-9.738 4.156-9.755-.729-.016.74-2.631 2.516-4.448l1.885-.373c6.361-1.039 30.688 8.062 25.346.574l3.045.689a21.3 21.3 0 0 0 .586-1.461c32.87 33.07 53.218 78.602 53.218 128.802 0 100.794-82.002 182.797-182.797 182.797z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-europe-africa.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-europe-africa.svg
new file mode 100644
index 0000000000..af162e7949
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-europe-africa.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M414.422 265.342c-.039 1.591-.332 2.97-.641 4.428-.305 1.427-.619 2.902-.682 4.617l-.049 2.132.459.368c.293.231.633.354.984.354h.002c.68 0 2.732-.016 2.904-10.206l.002-.224-.689-1.854-2.29.385zM157.553 123.706l1.74-.396.252-.33c.654-.867.826-1.626.514-2.256-.324-.647-1.064-.936-1.9-.677-.74.228-2.387 1.259-2.066 2.473.28 1.07 1.116 1.186 1.46 1.186zm156.32-28.142c-1.217-.756-4.303-.307-4.76.452 3.961.569 6.102.389 4.76-.452zm-4.76.453c-.199-.027-.379-.048-.588-.082l.562.267c.003-.063-.011-.126.026-.185zm-131.595 36.079l.014-.001c.122-.073.089-.056-.014.001zm-15.254.259c.473-.05 1.602-.269 1.883-1.236.041-.148.08-.287.141-.554l.262-1.447h-1.477c-1.068 0-1.928.618-2.361 1.693l-.842 2.096 2.394-.552zm54.127 45.444l.354.194 1.848-.292.869-.042.33-.503c.494-.742.463-2.076.338-2.971l1.439-3.107-1.569-.231a6.243 6.243 0 0 0-.697-.027c-.988 0-7.771.209-9.041.704l-.705.456-.041.763c-.039.695-.069 1.244 6.875 5.056zm-18.262-17.778c.205.696.457 1.529.895 2.175-.055.037-.119.041-.17.085l-.223.166c-.887.652-1.521 1.177-1.586 1.937l.141.812.375.387s.039.085.051.196l-.07.387c-.361.782-.74 1.933-.783 2.667l-.008.592.887.803h.512c1.232 0 3.932-1.422 5.775-3.038l.684-.597-2.182-4.452-.326-.053c1.541-2.241 1.107-4.158.402-5.419l-.67-1.201-1.086.843a5.475 5.475 0 0 1-2.186 1.028l-1.883.358 1.176 1.485c.064.119.193.553.275.839zm124.537-62.688l.287.091 2.279-.454.666-.287.543-1.145-.371-.558c-.158-.233-.371-.556-3.588-1.959l-.369-.16-1.545.385-.416-.169-.531.383a1.4 1.4 0 0 0-.58 1.379c.057.353.23 1.432 3.625 2.494zM155.781 135.63c.248-1.161.451-2.344.602-3.524l.059-.244c-.582-.267-1.646-.661-3.375-1.106l-.002.005.033.031-.107.746c-.084.387-.234 1.102-3.055 2.123l-.281.25c.209.275.289.548.318.713.068.357.096 1.281-1.076 2.082-.264.216-.646 1.14-.795 1.751.072-.009.152-.022.238-.041 1.818-.158 5.836-1.701 7.441-2.786zm11.53-6.515c.543.098.953.227 1.242.635l.285.406-.082.524c-.145.757-1.32 1.839-2.104 2.278-.322.184-.889.426-1.463.664-.27.111-.648.27-.939.401v.006c-.162.678-.793 1.922-1.812 2.462.305.041.648.087 1.035.136a40.263 40.263 0 0 0 1.822-.68l2.359-2.234-.078 2.712.096.182-.17.501c-.16.459-.533.686-.881.846l-1.346 1.277-1.543-.186c-1.117.39-2.471.839-3.953 1.316l.012.048c5.143-.578 13.168-2.235 17.389-4.22a1.331 1.331 0 0 1-.061-.188c-.078-.295-.223-1.321 1.1-2.044.021-.042.123-.352.062-.743-.006-.057-.02-.112-.033-.166l-.391.222-.018-.029-.578.081c-.359 0-1.027-.079-1.469-.618l-.355-.435.188-1.396.154-.064c-.029-.042-.062-.083-.096-.127-1.275-1.559-4.998-3.047-7.092-3.605l-1.28 2.038zm-5.936-3.79c.033-.001.062-.003.096-.003.83.124 1.281.678 1.496.995a3.21 3.21 0 0 1 .566 1.771c1.033-.162 2.049-.403 2.254-.466l2.209-.692a3.483 3.483 0 0 0-.662-.089h-1.797l.67-1.65c.367-.854 1.25-1.517 2.178-2.214.227-.171.488-.365.74-.572-1.469.2-3.002.376-3.533.376h-.6l-.812-.962.029-.119c-.609.064-1.389.182-2.303.384l-.045.132c.045.078.078.159.105.244l.176.562-.359.586a1.456 1.456 0 0 1-.205.229 2.732 2.732 0 0 1-.346 1.243c.039.055.074.113.105.172l.038.073zm4.012 18.591v-.007h-.002zm157.506 207.16c-4.346 4.78-8.449 9.297-10.295 16.479-.127 2.151.258 6.593 1.969 8.419.498.535 1.047.781 1.727.781l.139-.002c8.408-.935 14.486-20.064 15.215-28.021l.09-1.018.795-.044c.352-.889.883-3.627 1.066-7.979l-1.82-.124c-2.646 4.645-5.814 8.132-8.886 11.509zM256 49.523c-114.033 0-206.477 92.443-206.477 206.478 0 114.033 92.443 206.476 206.477 206.476s206.477-92.442 206.477-206.476S370.033 49.523 256 49.523zm0 389.275c-100.795 0-182.797-82.002-182.797-182.797 0-100.796 82.002-182.798 182.797-182.798 26.637 0 51.936 5.773 74.783 16.062-.66.068-1.289.271-1.701.647a2.772 2.772 0 0 1-.428.047c-.803 0-1.471.523-1.664 1.307-.211.85.174 1.753.912 2.146l.342.18c.316.166.508.268.643.33v.002c4.695 2.011 9.072 3.075 14.143 4.308l.973-2.11c-.115-.083-.24-.155-.355-.236l.004-.01-.006.01c-.02-.015-.041-.026-.059-.041l.004-.01a1.678 1.678 0 0 0-.096-.051 36.731 36.731 0 0 0-1.689-1.128c1.359.724 2.693 1.484 4.033 2.244l-.67.044-.715 1.075.312.893.258.21c1.463 1.198 3.117 1.842 4.916 1.92l2.174.089-.5-.85a185.647 185.647 0 0 1 9.74 6.477c-5.875-1.929-13.133-3.851-16.619-4.385-.082-.012-6.773-1.141-9.357-2.652-1.199.144-6.143.85-12.137 1.939-.002.004-3.643.822-10.664-2.499l-2.006-.947a2.693 2.693 0 0 1-.236.72c-.328.657-.916 1.074-1.611 1.145-.449.045-1.357.055-2.336.061-.992.006-2.064.009-2.756.069-1.9.155-3.35.354-4.092.507-.006.019-.016.041-.023.059-.502 1.08-2.211 1.579-3.572 1.426l-.762-.093c-.941-.117-2.418-.302-3.715-.415.049.19.047.405-.025.651-.287.963-1.35.963-1.752.963-1.953-.019-7.025-2.223-7.758-3.848a1.56 1.56 0 0 1 .102-1.507c.477-.733 1.459-1.048 3.285-1.048 1.859 0 4.559.35 7.805 1.011.076.015 1.531.256 4.047-.976-3.404-1.049-10.938-2.898-17.885-4.451-12.457-2.782-12.447-2.86-12.309-4.139l.012-.095c-.133-.006-.268-.008-.393-.013-1.762-.046-2.879-.097-3.564-.387-.762.003-1.854.292-2.506.466-.537.142-.76.202-.996.202l-.912-.107c-.223.017-.43.056-.566.109-.76.289-2.389.383-2.865.383h-1.076l-.211-.763c-.576-.197-1.59-.453-2.947-.554-1.699-.14-3.332.259-4.18.534-.357.724-1.312.764-1.859.79-.572.024-1.859.378-2.551.568-.688.188-.896.246-1.131.246l-.635-.117a1.874 1.874 0 0 0-.475.087c-.789.245-2.758.548-3.256.548h-.539l-.141-.144a5.746 5.746 0 0 0-1.199-.028c-.652.049-1.707.251-2.229.376-.514.366-1.363.423-2.195.478-.729.048-2.367.501-3.047.72-.535.366-1.496.566-2.906.79-.697.109-1.662.491-2.441.869.033.075.055.153.076.229.393 1.525-1.412 3.395-5.357 5.564-3.543 1.944-8.723 4.089-11.816 5.369-.91.378-1.604.663-1.949.82-.744.579-2.736 1.338-7.936 2.691-.805.21-1.328.55-1.594 1.038-.582 1.059-.012 2.824.33 3.88.09.275.18.551.238.817.334-.022.602-.107 1.1.121.566.053 3.299.059 5.572-.136 1.77-.153 3.891-.535 5.438-.814 1.459-.261 2.18-.389 2.617-.389h.422l.475.291c.055.035.191.11.342.194.781.443 1.35.765 1.412 1.499l.01.114c.133.211.406.572.803.912.035.028 3.031 2.635 3.012 4.158l.023.002c-.004.102.029.461.109.863.182.028.471.06.91.06 1.479 0 3.439-.312 5.119-.815 2.027-.608 3.602-1.821 4.201-2.448l.027-.78c-.025-3.334 2.867-4.021 4.596-4.438 1.232-.291 1.799-.477 1.893-.791-1.166-1.109-1.709-2.458-1.535-3.859.229-1.873 1.723-3.556 4.1-4.614 2.932-1.307 5.412-3.041 6.18-3.688l.139-4.775 1.355.243c3.943.709 8.705 2.062 9.004 4.47.07.602-.076 1.734-1.895 2.551-.826.37-1.727.756-2.607 1.132-1.48.634-3.447 1.476-4.143 1.902-.043.368-.07.793-.072 1.037.127.16.252.326.354.502 1.299.191 4.33.465 8.193.465l.598-.002c4.209 0 7.35 1.549 7.584 3.684.1.905-.242 2.532-3.633 3.285-1.479.329-2.98.664-4.178.945.027.093.049.186.061.281.213 1.462-1.188 3.315-2.432 3.682-.227.066-.582.141-1.023.229-1.488.297-4.26.853-5.199 2.231-1.848 2.715-10.105 4.472-10.445 4.472h-.227c-.73.104-3.35.597-6.971 1.49a14.112 14.112 0 0 1-3.383.393c-.742 0-4.215-.221-5.771-1.088-.273.02-.682.089-1.182.234-.982.285-2.877.306-3.432.306-3.375 0-4.15-.528-4.41-.731-.363.276-.803.461-1.172.461h-.531l-.734-.802.061-.54c.059-.496.777-1.599 1.242-2.271-.002.022-.02.032-.02.053-.072.697.492 1.373.867 1.636.064.046.166.056.236.093l-.914.862 2.895-.056.01.028 3.756-.067.285-.768c.242-.659.779-2.282.49-3.115-.332-.967-1.463-.967-1.889-.967-.381 0-1.676.043-2.326.57a2.52 2.52 0 0 0-.564.669 2.737 2.737 0 0 0-.83-.158h-.004c-.463.021-.969.113-1.363.339.318-.443.613-.878.803-1.186-.027-.04-.059-.076-.086-.108-.217-.209-1.758-1.127-2.949-.833-1.068.25-2.109 2.503-2.039 3.108.191.247.236.795.055 1.445-.494 1.77-3.021 5.185-7.08 7.24-1.537.776-3.459 1.773-5.441 2.8-3.818 1.978-7.764 4.021-9.789 4.948-1.375.632-3.496 1.383-5.549 2.113-1.531.541-3.561 1.266-4.285 1.622a1.792 1.792 0 0 1-.264.385c-.785.887-2.738 1.503-4.752 1.503l-.26-.002c-.652 0-1.314.206-1.902.481.814.191 1.801.411 2.893.639 2.654.548 4.559 3.521 5.254 4.773.982 1.771.84 2.162.721 2.477-.039.106-.1.246-.162.378l.152.812-2.311.451-.049-.231a696.08 696.08 0 0 0-8.113-.042l-1.957.002c-5.477.013-12.734 9.991-13.104 11.635-.416 1.857-.816 5.688-.818 6.653.4.721 1.055 2.314.906 4.049l-.109 1.075c.652.309 1.703.776 2.877 1.254.035.016.381.146 1.422.146 2.412 0 6.557-.693 9.043-1.808l.414-.102 2.986-.178c.629-.677 1.816-1.789 4.002-3.845 1.842-1.729 2.889-2.877 3.264-3.368.189-1.653 4.605-3.94 4.65-3.963 1.979-1.018 5.432-5.363 5.777-6.099l.082.039c.754-1.48 4.852-3.757 12.227-6.785.916-.376 1.93-.564 3.018-.564 4.928 0 10.77 3.861 15.924 7.267 2.109 1.392 4.102 2.708 5.773 3.583l-1.084 2.106c-.223-.112 4.191 4.064 5.291 5.108.354-.13.902-.385 1.199-.653.514-.463 1.422-2.036 1.527-2.615-.129-.345-.195-.883.189-1.54.18-.305.461-.626.795-.92-.961-.529-2.354-1.236-4.229-2.069l-1.074-.481.717-1.628c-.889-.414-2.58-1.091-4.898-1.87-3.336-1.121-5.803-4.869-6.406-6.097-.186-.378-.369-.821-.205-1.312l-.041-.023.037-.819c.084-.98 1.285-1.504 1.799-1.686l.504-.079c1.674 0 8.334 3.204 13.758 7.462l3.469 3.382c5.725 4.77 9.705 7.804 10.539 8.281.461.095.85.401 1.057.853.334.723.156 1.649-.469 2.535l-.004.315.018 2.029c.332.031.656.049.969.049 1.537 0 2.279-.374 2.477-.595-.25-2.545-.25-2.545.127-2.967l.352-.395.531-.004c.379 0 .676.137.885.407.131-.046.273-.102.416-.165-.854-.794-1.475-1.85-1.633-2.32l-.189-.556.088-.169c-.557-.602-1.051-1.534-.951-2.466a1.864 1.864 0 0 1 1.066-1.524c.738-.348 1.918-.098 2.902.166l.369.103c.643-.32 1.834-.576 4.078-.576.951 0 1.924.06 2.895.179.641.076 1.375.011 2.197-.177a9.66 9.66 0 0 1 2.463-.871c.758-.37 1.266-.724 1.561-.98l-.037-.022-.133-.691-.07-2.773.303-.434c3.359-3.743 5.568-6.386 6.074-7.091.102-.663.434-1.66.861-2.354.396-.64 1.068-.908 4.207-.908 8.01 0 8.143.662 8.293 1.434l.188.957-.271.113c.119.161.293.354.523.544.395.318 2.002.779 3.875.779.492 0 .961-.035 1.365-.115.176-.033.338-.075.488-.12a1.733 1.733 0 0 1-.311-.854c-.127-1.335 1.154-2.699 3.047-3.247 1.135-.327 2.791-.54 4.213-.54 1.846 0 2.881.324 3.365 1.048.289.437.336.97.125 1.468-.238.565-.549 4.055 3.711 7 2.324 1.604 3.27 3.171 2.807 4.647-.611 1.968-3.436 2.849-8.477 2.562l-13.854 2.103-1.15.013c-7.268 0-15.475-.144-18.686-.335l-.324-.009c-.33 0-.652.029-.961.079-.74.337-1.527.616-2.299.818.283.249.459.568.457 1.005l.008.448-.086 2.526-.863.216a.75.75 0 0 0-.236.097c.049-.01.148.198.479.502l.934.847c2.117 1.911 3.131 2.854 3.615 3.418.4.023 1.201.039 2.184-.018.219-.01.502-.018.838-.018 2.674 0 9.537.416 12.283 1.067.34.082.766.173 1.248.272 4.398.937 8.439 1.964 9.568 4.222.389.779.393 1.633.006 2.464-1.324 2.853-2.514 11.216-2.58 12.678.328.733.469 1.145.131 1.664l-.35.543-1.305.004-.123-.2c-1.465-.216-6.793-.622-13.008-.696l-.312-.045-11.551-3.31c-7.842-1.91-13.008-2.936-13.705-2.941-.084.026-.67.055-1.504.089-1.463.055-3.785.142-5.98.427l-.076 2.598a52.67 52.67 0 0 1-.018 2.108l.045 1.205-.674.344c-.357.183-.986.396-2.648.396-3.08 0-8.469-.739-13.725-1.88-3.008-.651-18.021-4.212-17.977-10.216.068-1.202.598-2.04 1.023-2.716.377-.6.607-.99.629-1.447l-.004-.269c-.596-.76-.895-1.571-.824-2.272.045-.418.215-.788.492-1.066a2.59 2.59 0 0 0-.006-.842c-1.766.201-9.346 1.904-15.385 4.201l-.404.075-20.977.297c-6.656 1.268-15.354 7.484-18.795 13.56-.193.344-4.869 8.503-12.564 13.88-16.727 10.921-16.754 28.274-16.752 28.446.078 8.151.816 14.585 1.314 15.609.268.555 1.213 3.982 1.33 5.82.445.792 3.324 5.571 6.828 11.18.088.137 8.75 13.791 18.656 13.791 1.008 0 2.01-.145 2.977-.428 4.127-1.211 7.793-1.434 11.338-1.654 3.715-.229 7.555-.465 12.062-1.835 19.824-6.013 19.824-6.013 20.033-6.013H196l-.967 1.755c-2.793 5.072-3.08 8.238-2.607 9.043.051.083.094.155.338.155l.584-.044c4.451 0 13.908 12.593 16.756 17.38.639 1.079 15.566 26.642 3.314 44.479-10.979 15.982 11.791 45.082 12.021 45.375 4.707 5.939 11.164 9.931 14.238 9.931h.074c3.383-.069 18.213-3.017 25.152-6.017l.641-4.975.342-.296c5.396-4.649 12.895-10.119 17.176-12.553l.137-12.398c.41-9.271 8.262-12.714 8.598-12.854 7.256-3.081 11.934-7.191 12.094-8.782.225-2.226-2.621-12.918-6.189-19.114-.395-.686-3.398-7.084 12.391-20.396 8.416-7.617 28.025-25.359 29.049-41.585-1.785.429-5.709 1.85-11.166 4.437-.186.088-4.604 2.15-9.777 2.152-5.939 0-10.477-2.748-13.119-7.951-.623-1.226-.754-2.516-.879-3.765-.1-.988-.193-1.92-.525-2.762-.895-2.274-2.59-4.418-4.387-6.691-1.582-2.001-3.217-4.067-4.355-6.332-1.488-2.957-2.543-6.091-3.561-9.123-1.164-3.461-2.266-6.73-3.965-9.802-4.131-7.469-5.535-11.254-5.594-11.413-3.545-9.66-3.193-10.161-2.822-10.692l.352-.507.656-.021c.771 0 1.176.669 1.395 1.026.605.999 2.502 1.813 3.467 1.844 1.004-2.46 1.146-2.781 2.008-2.781h.564l.717.88-.135.72c.023.531 1.242 4.085 3.133 7.295 1.713 2.909 7.287 10.687 11.357 16.367l1.469 2.049c.053.072 1.322 1.86 5.363 8.626.479.807 2.225 5.634 2.752 7.092 2.51 6.987 4.854 11.79 5.645 12.714.035.002.076.002.129.002 1.406 0 5.119-.871 8.895-2.334 4.338-1.673 15.211-6.866 16.055-7.452l.023.03c1.656-1.505 7.826-4.57 11.668-6.406 5.178-2.473 9.295-11.416 10.072-13.711a14.328 14.328 0 0 1-.758-.891c-.531-.326-1.51-1.012-3.561-2.451-1.658-1.163-4.25-4.396-5.15-6.241-.988.257-3.23 1.237-5.986 3.559-1.061.896-2.205 1.351-3.4 1.351-2.527 0-4.373-2.047-5.049-2.924-.455-.597-1.484-2.086-1.213-3.111.059-.216.043-.667 0-1.029-2.232-1.059-7.059-5.751-10.182-9.675-.275-.345-2.646-3.438-1.498-5.814.674-1.4 2.299-2.111 4.828-2.111l.27.003c4.279.16 5.631 3.115 6.719 5.486.506 1.102.982 2.142 1.682 2.875l4.996 4.897a34.286 34.286 0 0 1 3.777-.197c5.02 0 10.123.926 12.998 2.361 3.191 1.587 9.914 3.742 11.377 4.1 1.23-.413 3.369-.544 3.395-.544h.002c2.053 0 7.543 2.75 9.012 5.093.533.854 2.527 2.301 3.984 3.358 2.221 1.611 2.93 2.159 3.049 2.967l.07.496-.322.49c-.08.104-.186.226-.303.362-.484.552-.938 1.124-.744 1.488.223.385 1.848 1.048 3.117 1.048.107 0 .186-.007.238-.011.262-.263.627-.648.986-1.025 1.408-1.485 1.525-1.604 2.086-1.616.504.076 1.6.002 1.779 4.031.07 1.561 1.318 11.379 2.779 18.437l3.547 7.246c1.814 5.675 3.551 8.343 4.33 9.028 1.027-1.944 2.395-7.613 2.387-12.411l.061-4.611c-.109-4.636 3.07-8.138 3.207-8.284 7.857-8.529 9.686-9.854 10.34-10.06.064-.056.131-.124.193-.185.336-.317.713-.678 1.281-.678h.754l.193.366c.322.093.92.194 1.344.194l.297-.013c.895 0 3.188.718 5.17 7.361a43.5 43.5 0 0 0 1.654 4.602c.287 4.183.486 8.39.486 12.645-.002 100.79-82.004 182.792-182.799 182.792zm75.523-285.69c-.02-.353-.148-3.485 1.518-5.25 2.434-2.574 6.943-.842 13.439 5.826l1.182 1.215-1.545.691c-.652.291-7.721.648-10.873.756.625.625 1.525 1.226 2.457 1.848 1.83 1.224 3.863 2.582 4.664 4.688 1.895-.312 3.674.174 4.475 1.116.734.865 1.018 2.565.586 3.495-.252.546-.742.873-1.312.873l-1.902-.178c-.021.601.164 1.007.281 1.054 1.898.811 2.646 5.986 2.689 7.379l.516 2.881-1.111.241c-.844.186-1.785.277-2.797.277-6.043 0-14.861-3.521-15.703-10.128l-.178-1.389 1.814.071c.197-.028.361-.164.477-.483.183-.517 1.751-7.547 1.323-14.983zm-21.408 7.503l.088.157.57 1.039-.266.146-.494.066h-.373l-.35-.224-3.094-2.156h3.771c-.068 0-.17 0-.336.091l.484.881zm-20.486 37.57l.969.039.119-.116.826-.808.469.374-.043 1.208-1.898 1.278-.412-1.634.936-.297-.966-.044z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe.svg
new file mode 100644
index 0000000000..28e4b649be
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M250.104 219.028c.023-.037.057-.069.08-.105-.09-.429-.163-.807-.196-1.075.04.392.082.785.116 1.18zm83.856 91.564c.004 0 .004-.004.004-.006-.012-.006-.05-.006-.058-.019.012.013.042.013.054.025zm2.147.268c-.52-.083-1.686.069-2.147-.269-.284.983.145 1.354 2.147.269zM254.426 37.775c-120.584 0-218.334 97.75-218.334 218.333s97.75 218.334 218.334 218.334c120.582 0 218.336-97.752 218.336-218.334 0-120.582-97.754-218.333-218.336-218.333zm139.46 85.292c-7.522.226-12.76.241-18.805 4.413-2.435 1.681-4.087 3.912-7.178 4.781-2.771.778-5.763.096-8.512 1.028-9.921 3.366-8.348 24.613-21.42 21.405-6.141-1.507-10.467-8.763-13.558-13.5-2.722-4.168-7.68-7.617-4.33-12.833-1.527.393-3.157-.055-4.66.232 2.095-4.602 9.116-4.197 10.284-6.547 2.91-5.89-8.01-6.505-11.103-7.321 3.727-3.974 5.614 1.335 9.293.434 3.536-.869-1.866-5.526-3.986-6.048-.762-.188-13.212 3.44-6.006-3.009-8.896-5.67-17.788-11.34-26.686-17.014-1.498 6.309 11.84 9.894 16.196 12.119-.676 2.604-4.729 6.399-7.832 5.287-2.922-1.047-1.735-5.89-6.148-5.405-3.151 7.327 6.662 5.186 7.573 9.675 1.037 5.115-3.709 2.949-5.534 2.858-.435-.021-3.836-3.543-4.021-.877-.221 3.165 5.427 1.932 5.824 5.127-6.576.266-9.936-2.109-15.289-5.665-6.248-4.147-9.455-3.773-17.11-3.773 2.29-.94 5.443-1.638 7.401-3.152 1.069-.828 5.266-4.906 5.542-5.818 1.187-3.927-.063-3.631-3.823-6.205-3.341-2.286-7.394-6.39-11.443-7.199-14.671-2.929-4.525 13.247-15.662 15.478.19.009.397.019.562.019h-.638c.027-.003.051-.013.076-.019-2.576-.093-7.403-.72-9.064.64-1.172.958-1.271 4.802-2.58 6.192-2.331 2.484-5.807 2.982-8.588 4.774-2.716 1.749-8.702 6.241-10.297 9.288-5.878 11.229 13.242 14.715 20.49 17.996 3.275 1.484 12.846 3.514 14.629 5.992 2.391 3.329-2.061 6.449 2.932 8.788 1.594.745 4.883.896 6.256-.648 2.231-2.513-.907-3.082-1.441-5.986-1.035-5.593.67-3.371 3.482-5.448 5.732-4.232 4.441-4.49 2.38-11.235-.959-3.14-4.57-11.9-1.394-14.217 4.145-3.025 12.981 1.638 16.159 2.027 3.698.454 5.797 5.577 7.812 7.672 1.339 1.391 3.732 4.344 6.071 4.023 3.712-.507 2.158-3.751 4.311-5.248 5.775-4.007 7.296 1.434 9.598 6.876 2.165 5.11 4.214 7.007 8.067 10.286 1.79 1.527 9.634 6.975 8.894 10.33-.502 2.262-9.462 5.692-11.857 6.452-8.759 2.772-25.188-4.542-26.952 9.347 3.397-1.267 13.062-9.162 15.962-5.419 1.322 1.699-1.048 4.171-.49 5.858 1.653 5.056 5.553 3.295 9.641 2.477a6.877 6.877 0 0 1-.865.46c5.586-2.871 5.006-2.271 7.568-6.929.837-1.52 2.083-5.203 3.262-6.291 4.062-3.736 4.687-1.164 7.201 1.719.659.759 6.879 9.715 4.665 9.269-7.234-1.452-14.181-1.257-20.181 2.698-3.457 2.283-6.727 5.364-10.855 6.881-.989.361-8.317 1.056-7.451-.195 1.264-1.82 5.617-3.028 7.334-4.993-4.759-1.96-8.729 2.367-12.47 4.898-3.969 1.878-4.892 5.376-8.271 8.444-1.476 1.338-4.265 1.564-5.713 3.326-1.406 1.708-1.581 4.393-2.912 6.016-.934 1.134-3.328.448-4.303 2.16-1.271 2.237 1.162 4.311.629 5.923-.976 2.926-6.543 5.408-8.684 7.516.286-.275.57-.558.85-.844-2.146 2.25-4.86 3.906-6.535 6.511.77 3.677 3.193 12.446 2.518 14.464-2.23 6.64-6.564-3.61-8.322-6.257-6.039-9.101-18.108-3.01-26.354-2.256-10.544.964-20.872 14.649-14.368 25.759 3.122 5.328 8.374 7.388 14.399 6.155 5.361-1.097 6.972-8.599 12.021-8.734 9.279-.248.205 9.093-.598 12.52-.742 3.175 1.157 3.47 4.425 4.255 2.414.578 5.832-1.031 7.924.347 1.318.87 1.255 5.634 3.068 4.131-3.569 2.958-2.736 9.972.923 12.509 4.058 2.812 8.835.207 13.082 1.288 8.019 2.046 4.19-.61 11.232-4.862 4.753-2.865 5.533.54 8.781.552 2.211.009 3.616-3.179 7.312-2.249 3.013.758 4.204 3.084 7.802 3.619 1.475.217 2.998-.554 4.404-.399 6.654.738 11.748 4.991 16.992 8.835 4.321 3.164 7.184 2.523 12.23 3.967 3.688 1.051 10.492 6.387 10.144 11.072-.062.837-3.285 5.053-3.836 6.949.944.655 7.507-.812 9.427-.952-.631.735-5.101 3.876-5.101 2.209 0 .853 3.163 2.608 3.933 3.155 2.331-7.569 6.16-2.699 10.768-.824 3.918 1.595 8.74 1.681 12.919 2.676 3.548.846 11.37 3.24 13.999 6.139 3.164 3.489.976 9.157-1.365 12.63-3.062 4.551-7.68 6.3-9.59 11.653-1.51 4.244-.376 8.531-1.239 13.236-1.166 6.367-2.101 4.135-6.201 8.021-3.451 3.271-.058 2.702-4.756 4.787-4.72 2.099-8.874 1.474-12.142 6.65.131-.325.237-.652.328-.992-1.378 1.929-2.068 5.881-2.721 7.176-1.647 3.308-3.919 5.395-6.523 8.15-.999 1.055-10.179 13.594-10.708 12.586-.683-1.31-7.919 1.316-8.265-.553.288 1.57-.068 1.044 1.729 1.95-1.665 10.305-6.023 11.841-16.144 11.946.87 4.953-3.667 3.964-5.775 6.628-1.232 1.556-1.821 5.927-2.676 7.941-.533 1.264-4.484 6.331-4.484 7.338-.004.924 1.328 2.278 2.577 3.578-7.134 1.41-14.409 2.396-21.798 2.995 1.383-1.742 1.716-3.273-2.689-3.483 1.179-3.203 3.946-5.03 5.12-8.133.557-1.464.096-2.043.566-3.492 1.612-5.008.913-3.12.004-7.01-2.128-9.113.758-11.607 3.242-19.952 2.551-8.579 2.313-19.697 3.947-28.936.775-4.422 2.047-13.618.511-17.799-1.729-4.706-9.34-8.412-12.825-11.578-4.935-4.494-7.558-9.354-11.221-14.91-1.86-2.821-3.98-5.59-5.431-8.66-3.104-6.561.002-2.654.523-6.527.5-3.742-.445-7.085 1.041-11.013 1.643-4.343 5.744-7.048 7.092-11.427 1.213-3.896.29-8.795-3.714-10.096-2.231-.727-4.692.949-6.935.582-3.127-.507-6.665-2.84-9.118-4.707-3.425-2.608-4.709-6.85-8.356-9.322-3.053-2.063-5.225-.828-8.49-1.793-3.406-1.004-5.509-5.206-8.257-6.522-4.124-1.972-6.447.859-10.8.288-3.702-.485-9.348-4.589-12.807-6.138-7.033-3.148-11.316-6.622-14.128-13.76-2.409-6.122-5.92-8.977-10.055-14.076-4.188-5.166-5.501-9.566-11.958-10.944-.758-.164 1.58 5.425 1.821 5.871 2.308 4.273 5.771 8.176 8.559 12.153 4.101 5.859 2.354 6.959-1.817 1.292-4.77-6.48-10.305-12.926-14.442-19.79-1.564-2.595-1.264-4.273-3.843-6.737-2.494-2.379-5.756-3.537-8.266-5.8-9.031-8.123-10.674-18.966-9.644-30.545.335-3.773 1.698-6.792 1.097-10.419-.496-3.013-2.275-5.503-4.496-7.724-.717-1.138-2.514-3.947-2.618-4.126-2.05-3.405-3.645-6.755-6.902-9.551-1.868-1.607-6.703-5.37-11.256-8.522 20.454-25.508 47.218-45.726 77.921-58.278.244 1.542.906 3.084 1.9 4.558 2.525 3.745 4.931 3.448 9.857 4.486-.527 5.717-7.213 5.763-11.738 5.142-5.401-.738-11.084-2.534-15.764 2.2 2.585 1.554 9.678 7.605 8.736 1.282 5.174-.259 10.176-.414 15.238.204 2.029.25 8.824 2.53 10.667 1.49.772-.437 1.597-4.25 2.414-5.423-1.443.008-2.991-.72-4.428-.582 3.353-4.292 6.692-.927 10.959 1.048-4.697 2.855-1.912 9.694 2.681 4.137 3.771-4.57-.924-7.885-5.713-10.547 4.829-6.04 7.808-6.587 12.352.233.75-4.207 4.143-2.522 7.69-2.213v-1.05c-1.562.036-3.229-.862-4.774-.699 3.613-5.765 1.307-7.083 6.473-8.963 4.114-1.499 15.85-.104 17.295-3.971-8.213 1.597-18.135 1.978-25.545 5.713-3.194 1.611-7 6.693-10.191 3.388-3.27-3.388 2.339-8.838 5.209-10.5h-.687a193.355 193.355 0 0 1 40.261-4.247c8.923 0 17.69.659 26.297 1.835-2.979 1.564-.775 2.621-2.945 4.219-4.143 3.047-11.497 5.589-16.427 7.515 6.267-.017 21.437 5.876 24.355-2.915-2.023-.309-4.041-.622-6.062-.933 3.776-2.504 7.988-4.53 12.411-6.016 39.905 7.907 75.4 28.147 102.401 56.551-.188-.003-.38-.009-.566-.003zm35.336 76.655c.359-.767 1.198-1.02 1.546-1.654.729-1.332.566-2.234 1.465-3.377.962-1.233 2.259-1.537 3.331-2.5a3.92 3.92 0 0 0 .873-1.115 191.52 191.52 0 0 1 7.654 27.822c-.057.068-.089.171-.159.229-.469.371-3.529.826-4.157.847-2.217.086-3.862-1.384-5.453-2.769-1.618-1.406-3.524-3.288-4.675-5.107-1.229-1.944-.47-3.94-.382-6.162.073-1.87-.835-4.531-.043-6.214zm2.498 100.108c-3.75-3.26-8.175-7.627-10.841-11.848-2.849-4.499-1.093-9.129-.886-14.282.174-4.335-1.943-10.503-.101-14.405.845-1.781 2.784-2.371 3.581-3.832 1.696-3.091 1.319-5.18 3.401-7.837 2.232-2.855 5.234-3.557 7.721-5.794 2.605-2.348 2.533-4.198 4.183-7.206 1.206-2.198 4.043-5.865 6.729-7.781a193.98 193.98 0 0 1 2.216 29.263c0 17.206-2.289 33.881-6.529 49.771-3.615-.933-6.589-3.537-9.474-6.049z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-gps.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-gps.svg
new file mode 100644
index 0000000000..90572f37f6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-gps.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M458.175 341.1c-1.179-1.178-51.538-51.547-78.026-78.018l-8.666-8.666-12.232-.091-46.469-.369L337.506 233l-58.471-58.46-20.929 24.706-.361-46.437-.13-12.264-8.665-8.666-78.061-78.082L149.7 32.648l-21.125 21.149-74.494 74.46-21.16 21.192 21.223 21.183c1.211 1.194 78.029 78.033 78.029 78.033l8.665 8.664 12.261.106 48.497.38 6.804.065-12.461 14.69 43.525 43.516 14.717-12.457.033 6.829.394 48.479.099 12.262 8.664 8.672 78.09 78.071 21.16 21.167 21.158-21.167 74.461-74.458 21.225-21.202-21.29-21.182zM201.824 227.895l-48.495-.395s-78.06-78.066-78.091-78.081l74.461-74.453 78.09 78.092.393 48.481-26.358 26.356zm160.795 208.897l-78.09-78.091-.361-48.494 26.324-26.342 48.496.372 78.093 78.087-74.462 74.468zM205.16 358.596c-28.548-.035-51.702-23.193-51.732-51.713 0-11.057-8.963-20.03-20.016-20.03-11.084 0-20.045 8.974-20.045 20.03.031 50.689 41.072 91.744 91.793 91.797 11.054 0 20.014-8.963 20.014-20.031 0-11.053-8.929-20.036-20.014-20.053zm.327 103.588c-.033.018-.033.031-.033.049-.063.083-.097.18-.163.275.066-.114.131-.237.196-.324zm2.225-13.864c-.13-.722-.327-1.414-.525-2.084 0 .026.034.039.034.062a8.634 8.634 0 0 1-.096-.285c-.229-.656-.461-1.299-.754-1.911.098.179.163.349.229.538-.065-.189-.164-.359-.229-.538-.1-.196-.164-.386-.232-.565.037.088.068.206.101.269a20.114 20.114 0 0 0-2.319-3.851c-.689-.844-1.408-1.65-2.193-2.381a17.842 17.842 0 0 0-1.896-1.57c-.324-.241-.721-.489-1.08-.727a21.204 21.204 0 0 0-3.236-1.645 20.03 20.03 0 0 0-7.162-1.43h-.262c-29.988-.004-56.9-12.07-76.588-31.69-19.523-19.582-31.59-46.348-31.686-76.134.195-8.332-4.907-16.244-13.18-19.229-10.398-3.803-21.876 1.58-25.67 11.969-1.668 5.133-1.082 6.801-1.211 6.9 0 81.88 66.382 148.236 148.334 148.25h.262c1.342-.014 2.683-.21 3.989-.486.623-.145 1.245-.279 1.864-.473.034-.025.098-.025.131-.053 0 0 .031 0 .066-.017-.035 0-.035.017-.066.017.164-.049.329-.139.492-.188-.163.049-.295.123-.426.171.621-.21 1.275-.465 2.092-.808.033-.016.033-.033.064-.042-.064.042-.161.067-.262.101.395-.165.755-.371 1.111-.572-.13.078-.293.188-.455.27a19.753 19.753 0 0 0 2.156-1.229c-.16.131-.359.206-.557.338.297-.192.623-.391.918-.6-.129.082-.229.182-.361.262a16.308 16.308 0 0 0 2.16-1.618c-.132.091-.229.181-.361.271.132-.117.295-.227.458-.358.067-.087.165-.165.263-.267.229-.178.424-.372.62-.586.229-.193.393-.407.591-.622.52-.543.98-1.141 1.437-1.758a20.66 20.66 0 0 0 1.178-1.79c.065-.128.099-.246.163-.359.295-.538.559-1.088.818-1.644.066-.18.164-.368.229-.548 0 .035-.031.066-.064.109.263-.596.458-1.193.652-1.816a2.273 2.273 0 0 1-.127.422c.096-.268.16-.539.26-.779.166-.578.262-1.16.393-1.756.195-1.101.326-2.222.359-3.363v-.253-.254c-.034-1.261-.199-2.475-.426-3.67zm-6.346 18.935zm3.009-3.355c.034-.049.064-.09.099-.137-.064.088-.128.163-.197.259a.563.563 0 0 0-.128.2c.064-.109.162-.217.226-.322zm3.5-8.55c-.03.18-.098.355-.098.512-.131.561-.227 1.09-.359 1.633.195-.71.359-1.427.457-2.145zm-.49 2.267c0-.044 0-.092.033-.123-.033.031-.033.079-.033.123zm-1.898 4.563a21.66 21.66 0 0 0 .818-1.595c-.229.437-.458.864-.688 1.288-.031.084-.097.189-.13.307zm.949-1.977v.026c-.031.118-.097.228-.13.355.033-.127.098-.25.13-.381zm-6.606-24.213v.014c.034.057.098.07.131.102-.033-.032-.097-.075-.131-.116zm1.666 1.375c.099.066.133.145.23.209.035.036.098.084.131.127-.13-.127-.228-.232-.361-.336zm2.291 2.427c.033.048.064.132.133.163 0 .06.064.092.096.139a1.694 1.694 0 0 1-.229-.302zm3.01 5.312c-.066-.168-.133-.312-.197-.464.098.244.197.464.297.713-.035-.072-.069-.173-.1-.249zm.328.935c-.067-.236-.166-.471-.229-.686.062.215.161.438.229.66v.026zm.587 2.197v.084a.39.39 0 0 0 .065.166c-.031-.075-.065-.148-.065-.25zm-13.507 23.063v.012c-.098.031-.229.079-.328.104.1-.025.23-.073.328-.116zm-2.582.666a19.096 19.096 0 0 0 2.254-.551c-.521.15-1.046.238-1.536.369-.229.049-.487.127-.718.182zm3.891-38.332h.033-.033zm3.205 1.628l.031.017c0 .021.033.025.033.025-.033-.004-.033-.026-.064-.042z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-graduate.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-graduate.svg
new file mode 100644
index 0000000000..81067c4cdb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-graduate.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M263.292 288.328l-7.293 2.361-7.291-2.361-102.213-33.09-7.133 97.459s33.734 37.411 117.809 37.411c84.07 0 115.473-37.411 115.473-37.411l-9.025-96.849-100.327 32.48zm-147.211-34.759v-4.565l130.646-67.268a5.917 5.917 0 0 1 7.973 2.553 5.918 5.918 0 0 1-2.553 7.973L165.96 236.65l90.039 29.15 222.262-71.955-222.262-71.954-222.26 71.954 84.566 27.377-25.902 13.34v18.27c-3.94 4.772-6.447 11.938-6.447 19.955 0 5.694 1.275 10.944 3.422 15.228l-2.379 27.797 11.443-4.519 5.504 4.519 7.281-5.702 9.668 5.702-2.377-27.793c2.146-4.284 3.428-9.536 3.428-15.231 0-7.613-2.261-14.461-5.865-19.219z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-grid.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-grid.svg
new file mode 100644
index 0000000000..2e363c0c47
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-grid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M473.591 145.183v-24.938h-81.87V38.396h-24.936v81.849h-98.168V38.396h-24.936v81.849h-98.152V38.396h-24.937v81.849H38.74v24.938h81.852v98.155H38.74v24.938h81.852v98.167H38.74v24.932h81.852v81.858h24.937v-81.858h98.152v81.858h24.936v-81.858h98.168v81.858h24.936v-81.858h81.87v-24.932h-81.87v-98.167h81.87v-24.938h-81.87v-98.155h81.87zm-328.062 0h98.152v98.155h-98.152v-98.155zm0 221.259v-98.167h98.152v98.167h-98.152zm221.256 0h-98.168v-98.167h98.168v98.167zm0-123.104h-98.168v-98.155h98.168v98.155z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hammer.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hammer.svg
new file mode 100644
index 0000000000..dfafc27d3c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hammer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M418.096 172.056c-8.127-8.122-11.791-18.993-11.074-29.616l-13.632-13.63s-83.13-95.442-180.261-40.045l4.597 5.758 36.221-5.624-29.849 13.607 5.591 7.002c40.31-6.065 112.967 22.953 89.013 52.977l-70.803 70.798-.152-.153a37.927 37.927 0 0 1-16.822 9.318L40.066 416.787l59.752 59.744L273.775 286.09c1.581-6.657 4.924-12.981 10.119-18.172.643-.646 1.328-1.226 2.01-1.818l75.918-75.915.002.002c9.754.023 20.184 3.071 27.628 10.514 7.776 7.773 11.46 18.062 11.136 28.248l22.462 22.461 46.472-46.467-21.812-21.813c-10.622.716-21.493-2.95-29.614-11.074z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-active-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-active-alt.svg
new file mode 100644
index 0000000000..102ae217cf
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-active-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M271.209 133.183c8.49 0 14.807 2.68 15.562 11.761l1.009 21.27c1.929 7.745 4.196 10.188 6.28 10.188 3.555 0 6.595-7.094 6.595-7.094l1.704-9.542c1.418-8.013 5.828-10.79 12.541-10.79 1.986 0 4.174.244 6.549.669 10.402 1.848 20.418 6.429 18.58 16.827l-1.322 7.415v-.008s-6.795 24.79-3.418 24.79c.811 0 2.2-1.414 4.404-4.928-.002-.02-.002-.02.02-.031l5.217-5.824c2.416-3.854 5.283-5.344 8.479-5.344 4.227 0 9.028 2.604 14.131 5.797 8.947 5.607 5.663 15.648.381 36.201l-37.268 117.543-.479 36.15H219.471l-.287-37.619s-21.283-11.607-39.887-45.162l-40.727-74.061c-2.699-10.217 3.399-20.681 13.608-23.377a19.15 19.15 0 0 1 4.898-.635c8.471 0 16.216 5.66 18.474 14.24l11.649 26.216c3.013 2.362 5.016 3.677 6.306 3.677 4.491 0 .399-15.928.399-59.352l-1.302-28.716c-.388-10.567 7.867-19.427 18.413-19.81.232-.008.468-.012.699-.012 10.252 0 18.739 8.119 19.116 18.438 0 0 .488 9.949.488 11.242 0 8.029 6.401 14.746 11.595 14.746 3.548 0 6.534-3.131 6.534-11.117l-.805-18.822c-.873-10.52 7.847-13.865 18.382-14.743a51.413 51.413 0 0 1 4.185-.183m0-25.038c-1.986 0-4.097.091-6.27.272-11.598.962-20.337 4.271-26.722 8.931-7.377-5.518-16.55-8.764-26.501-8.764-.525 0-1.059.01-1.587.029-11.802.43-22.718 5.416-30.753 14.053-8.038 8.643-12.227 19.897-11.793 31.698l.003.104.004.109.876 19.254a44.026 44.026 0 0 0-11.39-1.496c-3.806 0-7.605.495-11.294 1.467-11.401 3.015-20.953 10.287-26.888 20.48-5.936 10.196-7.547 22.094-4.535 33.498l.785 2.981 1.484 2.694 40.729 74.062c12.76 23.014 26.89 37.546 36.885 45.892l.19 25.012.188 24.848h160.259l.328-24.707.432-32.439 36.148-114.014.211-.666.173-.673.937-3.622c2.698-10.42 4.831-18.651 5.032-26.732.483-19.229-10.634-29.111-17.307-33.293-4.897-3.066-10.115-5.984-15.861-7.789-1.857-14.672-12.64-29.634-39.144-34.345-3.973-.707-7.55-1.053-10.93-1.053-3.225 0-6.307.328-9.217.966-6.099-9.422-17.075-16.757-34.472-16.757z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-active.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-active.svg
new file mode 100644
index 0000000000..49612abea3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-active.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M370.261 183.393c-5.674-3.548-12.311-7.326-19.448-7.326-1.332 0-2.811.131-4.372.486l.853-4.781c.954-5.402 1.845-23.377-26.688-28.45-3.098-.552-5.814-.821-8.303-.821-7.93 0-14.067 2.836-17.999 8.16l-.126-2.648-.006-.176-.016-.178c-.521-6.301-4.059-20.947-25.545-20.947-1.562 0-3.248.072-5.012.218-19.947 1.658-25.787 11.308-27.216 18.954-4.157-10.988-14.78-18.732-27.263-18.732-.36 0-.725.006-1.087.018-7.754.282-14.955 3.574-20.254 9.274-5.306 5.697-8.067 13.126-7.781 20.913l1.293 28.559c.004 9.138.184 17.01.426 23.807-4.244-11.217-15.044-18.816-27.238-18.816-2.512 0-5.018.326-7.45.971-7.527 1.983-13.828 6.781-17.748 13.512-3.917 6.727-4.979 14.576-2.99 22.104l.313 1.188.595 1.08 40.726 74.064c14.429 26.026 30.604 39.923 38.697 45.755l.238 26.561.09 9.927h130.488l.149-9.859.46-28.955 36.825-116.144.084-.262.067-.27.946-3.659c4.975-19.199 8.907-34.369-5.708-43.527z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-pointer-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-pointer-alt.svg
new file mode 100644
index 0000000000..3e1185fe73
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-pointer-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M228.176 82.887c10.252 0 18.739 8.118 19.119 18.44 0 0 .485 114.86.485 116.151 0 5.692 3.219 8.612 6.942 8.612 5.115 0 11.185-5.505 11.185-16.896l-.801-18.82c-.875-10.523 7.844-13.868 18.379-14.742a50.734 50.734 0 0 1 4.173-.186c8.5 0 14.82 2.674 15.574 11.76l1.007 21.27c1.357 6.021 3.57 7.874 5.778 7.874 3.554 0 7.099-4.779 7.099-4.779l1.703-9.54c1.421-8.016 5.826-10.791 12.538-10.791 1.988 0 4.178.244 6.553.668 10.4 1.848 20.418 6.434 18.579 16.826l-1.322 7.417v-.01s-7.258 21.058-1.859 21.058c.713 0 1.646-.365 2.847-1.195.016-.01-.004-.014.02-.029l5.215-5.824c2.417-3.854 5.287-5.344 8.484-5.344 4.228 0 9.029 2.602 14.13 5.797 8.944 5.606 5.661 15.646.38 36.199l-37.268 117.548-.479 43.882H235.929l-.284-45.354s-21.283-11.605-39.889-45.161l-63.545-53.722c-8.069-6.823-9.077-18.894-2.261-26.958a19.102 19.102 0 0 1 14.621-6.783c4.361 0 8.742 1.482 12.333 4.523l36.351 28.556c2.741 2.152 5.078 3.298 7.058 3.298 7.757 0 10.052-17.663 10.052-62.207l-1.299-121.713c-.393-10.569 7.865-19.432 18.414-19.811.23-.008.462-.014.696-.014m0-25.037c-.529 0-1.062.008-1.591.027-11.801.428-22.714 5.418-30.75 14.055-7.94 8.533-12.123 19.617-11.809 31.256l1.299 121.373c-.003 8.119-.091 14.881-.238 20.518l-12.398-9.74a44.179 44.179 0 0 0-28.118-10.123 44.104 44.104 0 0 0-33.742 15.658c-15.718 18.6-13.379 46.52 5.217 62.24l60.164 50.871c12.091 20.585 25.1 33.85 34.478 41.68l.206 32.723.153 24.883h160.355l.268-24.763.44-40.148 36.138-113.987.213-.664.171-.668.937-3.623c2.701-10.422 4.831-18.653 5.034-26.734.488-19.23-10.634-29.115-17.308-33.299-4.894-3.063-10.11-5.984-15.859-7.785-1.861-14.67-12.644-29.635-39.143-34.341-3.975-.709-7.555-1.056-10.936-1.056-3.222 0-6.3.331-9.21.967-6.102-9.42-17.084-16.763-34.489-16.763-1.973 0-4.069.095-6.237.272-3.146.262-6.101.68-8.875 1.264-.096-23.574-.189-45.65-.211-50.723l-.004-.401-.014-.404c-.874-23.871-20.263-42.565-44.141-42.565z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-pointer.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-pointer.svg
new file mode 100644
index 0000000000..a002ace0f3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-pointer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M383.389 231.515c-5.371-3.36-11.638-6.943-18.119-6.943-2.245 0-4.986.43-7.754 1.925.097-.371.195-.733.296-1.092l.091-.33.062-.327 1.316-7.416c1.095-6.178.872-21.009-24.659-25.544-2.946-.522-5.52-.779-7.863-.779-10.914 0-17.994 6.03-19.939 16.99l-.021.125-.664-13.991-.006-.138-.012-.127c-.576-6.97-4.34-18.654-23.051-18.654-1.507 0-3.074.069-4.802.211-23.315 1.939-25.854 14.997-25.257 22.709l.078 1.84c-.864 3.258-1.725 4.076-2.479 4.65-.131-32.344-.384-92.605-.401-96.048v-.123l-.006-.122a26.551 26.551 0 0 0-26.621-25.673c-.318 0-.634.006-.956.016-7.123.255-13.701 3.265-18.55 8.474-4.812 5.175-7.337 11.898-7.122 18.952l1.303 121.682c0 29.89-1.225 47.999-3.64 53.879-.363-.24-.804-.556-1.321-.958l-36.238-28.467a26.65 26.65 0 0 0-17.083-6.209c-7.86 0-15.28 3.438-20.354 9.439-4.592 5.436-6.796 12.331-6.199 19.423.594 7.091 3.912 13.525 9.35 18.118l62.503 52.843c14.716 26.068 31.001 39.37 38.296 44.433l.252 27.834.066 7.449h125.543l.117-7.396.462-29.319 36.934-116.494.065-.197.051-.205.948-3.666c4.897-18.922 8.44-32.588-4.616-40.774z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handprint.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handprint.svg
new file mode 100644
index 0000000000..c9c254204b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handprint.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M206.408 102.193h4.218c11.25-.034 20.374-9.143 20.405-20.407V68.493c-.031-11.265-9.155-20.359-20.405-20.39h-4.218c-11.249.03-20.375 9.141-20.375 20.39v13.293c0 11.264 9.126 20.373 20.375 20.407zm81.033-13.637l4.185.459c.755.095 1.474.128 2.195.128a20.492 20.492 0 0 0 20.306-18.184l1.602-15.039c.098-.75.131-1.46.131-2.208-.016-10.303-7.719-19.112-18.164-20.274l-4.205-.458c-.718-.097-1.521-.117-2.221-.117-10.271.021-19.098 7.736-20.26 18.166l-1.636 15.061a21.46 21.46 0 0 0-.129 2.208c.014 10.282 7.731 19.097 18.196 20.258zm66.157 32.604l4.17.735c1.158.18 2.338.296 3.531.296 9.729-.023 18.298-6.936 20.08-16.826l3.155-17.793c.164-1.193.278-2.354.278-3.532-.02-9.728-6.951-18.31-16.843-20.078l-4.15-.733a20.455 20.455 0 0 0-3.534-.313 20.429 20.429 0 0 0-20.096 16.841l-3.137 17.775a20.17 20.17 0 0 0-.314 3.514c.018 9.747 6.951 18.345 16.86 20.114zm77.371 10.251l-4.019-1.34c-2.128-.704-4.285-1.062-6.412-1.031-8.569 0-16.512 5.397-19.36 13.933l-4.396 13.176a19.546 19.546 0 0 0-1.065 6.426c0 8.55 5.396 16.514 13.932 19.377l3.992 1.342a20.435 20.435 0 0 0 6.358 1.03h.083c8.55 0 16.515-5.382 19.374-13.948l4.398-13.182c.688-2.123 1.047-4.283 1.047-6.422-.001-8.556-5.397-16.499-13.932-19.361zm-220.082 26.944c10.956-.147 18.722-9.695 18.737-20.374v-11.757c-.016-10.692-7.781-20.241-18.737-20.403-10.985.162-18.738 9.711-18.738 20.403v11.757c-.001 10.679 7.752 20.227 18.738 20.374zm75.001-13.504l.116.016c.262 0 .587.016.946.016 10.483-.148 18.281-8.91 18.902-19.228l.622-10.22c.032-.489.032-.896.032-1.372.033-10.108-7.03-19.361-17.494-20.132-.359-.047-.783-.047-1.063-.047-10.481.148-18.265 8.929-18.886 19.262l-.622 10.202c-.048.459-.048.95-.048 1.372-.049 10.109 7.031 19.376 17.495 20.131zm-11.639 55.25l5.837.852c.883.11 1.732.179 2.582.179 8.778-.015 16.416-6.411 17.725-15.321l1.258-8.501a19.98 19.98 0 0 0 .181-2.568 17.941 17.941 0 0 0-15.32-17.743l-5.838-.85a15.601 15.601 0 0 0-2.586-.196c-8.776.015-16.398 6.428-17.72 15.336l-1.261 8.487c-.13.867-.182 1.748-.182 2.599 0 8.764 6.411 16.417 15.324 17.726zm-83.245-4.32c.033 9.438 7.652 17.059 17.069 17.073h5.626c9.417-.015 17.036-7.636 17.07-17.073v-13.408c-.034-9.416-7.653-17.053-17.07-17.068h-5.626c-9.417.016-17.036 7.652-17.069 17.068v13.408zm156.086-21.91l.082.021c.604.079 1.225.11 1.914.11 10.039-.132 17.789-8.239 18.967-18.214l.668-5.625c.085-.882.148-1.717.148-2.583 0-9.617-6.441-18.574-16.417-19.852-.683-.08-1.37-.133-2.026-.133-10.038.133-17.788 8.245-18.937 18.221l-.667 5.655c-.117.85-.164 1.731-.164 2.551-.016 9.613 6.426 18.577 16.432 19.849zm-17.53 46.78l5.711 1.947c1.944.656 3.937.983 5.884.983 7.638 0 14.764-4.773 17.381-12.395l1.67-4.874c.653-1.928.98-3.924.98-5.883-.018-7.652-4.809-14.75-12.394-17.369l-5.726-1.959a18.2 18.2 0 0 0-5.902-.982c-7.635 0-14.763 4.791-17.379 12.425l-1.651 4.844a17.899 17.899 0 0 0-.979 5.883c-.001 7.635 4.769 14.749 12.405 17.38zm81.919-33.176a17.665 17.665 0 0 0-4.905-.702c-8.766.084-16.27 6.31-18.821 15.029l-1.486 5.001c-.622 2.06-.883 4.15-.883 6.163-.033 8.19 4.742 16.169 13.162 18.69 1.554.46 3.157.687 4.774.687h.083c8.779-.08 16.269-6.296 18.835-15.01l1.472-5.021c.606-2.061.883-4.136.883-6.164.067-8.174-4.741-16.139-13.114-18.673zm-12.819 55.218l-4.364-2.502a14.918 14.918 0 0 0-7.602-2.06 15.3 15.3 0 0 0-13.23 7.621l-2.5 4.384c-1.374 2.387-2.062 5.017-2.062 7.583 0 5.265 2.748 10.42 7.618 13.229l4.35 2.536c2.389 1.341 5.037 2.028 7.589 2.028 5.262 0 10.43-2.715 13.244-7.623l2.533-4.346a15.517 15.517 0 0 0 2.026-7.62c.001-5.25-2.727-10.399-7.602-13.23zm-16.054 68.202c-.935-4.907-4.09-9.486-8.341-12.101l-41.402-23.907c-2.81-1.631-7.535-4.805-10.071-6.801l-25.019-19.54c-3.562-2.663-8.711-4.822-13.145-5.478l-52.403-6.802c-1.603-.21-3.433-.291-5.331-.291-2.926 0-5.936.196-8.387.619l-19.865 3.633c-5.383 1.077-9.207 5.688-9.339 11.18l.017 31.692c.164 5.164 2.926 10.038 7.277 12.832l39.733 23.659c3.89 2.224 9.254 3.729 13.7 3.86l38.293.439c2.305-.064 7.262 1.721 8.994 3.258l21.747 17.624c3.581 2.798 8.731 4.922 13.228 5.459l46.305 4.696c.344.031.705.047 1.014.047h.066c2.257 0 4.446-.852 6-2.389 1.604-1.568 2.453-3.806 2.453-6.047 0-.521-.067-.997-.096-1.489l-5.428-34.153zm-7.785 45.484l-71.307-2.872c-.048 0-.211-.022-.424-.022-5.202.148-9.847 3.223-11.855 8.081l-10.334 26.569.443-12.607c.018-.147.018-.279.018-.342-.103-5.366-3.813-9.877-9.094-10.99l-.163-.031-7.668-.656 8.503-5.46c.883-.196 1.731-.454 2.599-.944 1.03-.576 2.486-2.062 2.486-4.188-.019-1.833-.949-2.995-1.703-3.729-.783-.75-1.65-1.242-2.647-1.732l-30.118-14.258c-3.041-1.404-8.128-4.019-11.086-5.672l-29.922-16.662a9.94 9.94 0 0 0-4.773-1.241c-3.596-.021-7.082 2.044-8.764 5.493l-11.035 22.545c-.805 1.917-4.566 5.086-6.609 5.546 0 0-11.756 3.399-23.562 7.261-5.885 1.928-11.771 3.955-16.334 5.788-2.271.882-4.202 1.732-5.69 2.566-.768.422-1.454.817-2.104 1.372-.559.603-1.674 1.178-1.867 3.612.063 1.421.312 1.717.59 2.551 1.928 5.351 9.582 21.093 16.904 36.007a3854.258 3854.258 0 0 0 14.228 28.386c1.963 3.808 5.493 8.175 8.812 10.874l42.202 33.908c3.058 2.389 6.965 3.449 10.775 3.502 1.227 0 2.436-.132 3.613-.428l49.183-13.049c1.406-.391 2.748-.656 3.631-.766.751.538 1.406.781 2.354 1.226 1.179.491 2.65 1.06 4.218 1.536l20.342 6.443c2.044.639 4.251.85 6.541.881 2.745-.031 5.493-.357 7.88-1.241l27.404-10.123c4.611-1.849 8.503-5.772 10.383-10.384l31.475-85.463c.395-1.082.621-2.176.621-3.268.128-4.355-3.796-7.981-8.146-8.019zm-248.55-74.838c0-.766-.031-1.484-.099-2.17l-1.39-13.854c-.392-3.743-1.372-9.368-2.287-13.027l-2.877-11.576a13.52 13.52 0 0 0-11.087-9.717l-17.249-1.976a13.615 13.615 0 0 0-1.408-.086c-4.628.101-9.206 2.062-12.279 5.626l-8.143 9.829c-1.979 2.439-2.797 5.428-2.812 8.37 0 2.145.44 4.304 1.57 6.28l33.831 59.041c1.159 2.028 3.09 3.992 6.066 4.057 3.302-.096 5.296-2.552 6.194-4.854l9.861-24.119c1.373-3.431 2.078-7.916 2.109-11.824z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handshake.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handshake.svg
new file mode 100644
index 0000000000..b83e3bf315
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handshake.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M401.914 170.85c-.828-.06-20.471-1.699-37.729-18.96-15.855-15.856-23.988-16.04-24.068-16.04H236.242l-59.924 52.295c5.25 3.096 12.924 6.374 21.871 6.374 7.898 0 15.754-2.566 23.342-7.625 18.061-12.038 32.398-19.5 48.047-19.5 16.365 0 32.326 8.078 53.367 27.016 37.914 34.122 79.26 74.921 79.672 75.33l2.465 2.434v46.345h57.67V170.873l-60.838-.023zm-220.67 156.512a17.263 17.263 0 0 0-12.279-5.087 17.27 17.27 0 0 0-12.285 5.087l-4.613 4.615 24.561 24.565 4.619-4.62c6.767-6.771 6.765-17.789-.003-24.56zm32.936 32.935a17.27 17.27 0 0 0-12.285-5.085 17.243 17.243 0 0 0-12.271 5.078c-.002 0-.002 0-.002.002L185 364.917l24.559 24.561 4.621-4.621c6.769-6.771 6.769-17.788 0-24.56zm20.652 27.847c-4.637 0-9 1.806-12.283 5.085l-4.615 4.619 24.557 24.561 4.621-4.619c6.771-6.77 6.771-17.789 0-24.563a17.25 17.25 0 0 0-12.28-5.083zm-86.525-93.713a17.244 17.244 0 0 0-12.277-5.088 17.256 17.256 0 0 0-12.281 5.084l-4.619 4.618 24.564 24.562 4.619-4.617c6.765-6.773 6.765-17.791-.006-24.559zm163.234-88.001l-.01.011c-17.324-15.532-30.279-22.474-41.953-22.474-11.471 0-23.371 6.398-38.852 16.719-10.363 6.907-21.309 10.408-32.537 10.408-23.775 0-40.209-15.802-40.896-16.475l-6.414-6.271 79.148-69.073h95.299c12.508-11.172 10.369-29.682 10.369-29.682h-95.059c-47.205 0-48.615 7.788-81.656 40.827-29.121 29.118-57.42 29.985-57.42 29.985H49.248v140.352h51.428l14.701-14.702c5.52-5.517 12.854-8.553 20.652-8.553s15.133 3.039 20.65 8.557c6.725 6.72 9.443 15.928 8.229 24.689 1.334-.184 2.686-.311 4.057-.311 7.801 0 15.133 3.038 20.652 8.555 6.721 6.722 9.439 15.93 8.227 24.694 1.332-.187 2.682-.314 4.051-.314 7.803 0 15.139 3.037 20.654 8.554 6.723 6.723 9.445 15.931 8.227 24.69 1.338-.184 2.689-.311 4.057-.311 7.801 0 15.135 3.037 20.652 8.551a29.05 29.05 0 0 1 7.451 12.796c5.877 4.513 14.348 4.093 19.727-1.285 5.846-5.846 5.846-15.362-.002-21.212l-69.92-69.922 11.721-11.721 69.922 69.923c5.848 5.847 15.363 5.848 21.213-.002a14.897 14.897 0 0 0 4.393-10.606c0-4.006-1.561-7.771-4.393-10.602l-69.924-69.922 11.721-11.721 69.922 69.921c5.85 5.844 15.367 5.843 21.215-.003 5.846-5.846 5.846-15.362 0-21.21l-69.92-69.92 11.721-11.722 69.918 69.923c5.848 5.842 15.363 5.841 21.215-.005 5.846-5.846 5.846-15.362 0-21.212l-69.924-69.924z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handtool-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handtool-alt.svg
new file mode 100644
index 0000000000..1464083b74
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handtool-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M248.783 78.871c9.851 0 18.21 7.547 19.038 17.531l10.328 124.342c1.933 7.75 4.196 10.189 6.282 10.189 3.555 0 6.595-7.09 6.595-7.09l18.366-103.214c1.642-9.254 9.717-15.771 18.814-15.771 1.109 0 2.236.097 3.366.296 10.4 1.853 17.329 11.783 15.49 22.181L329.078 228.42v-.008.01-.002c.012.398.468 15.027 5.367 15.027 1.682 0 3.884-1.722 6.77-6.32-.003-.02-.003-.02.02-.033l30.148-65.229c3.634-5.794 9.863-8.977 16.235-8.977 3.471 0 6.979.941 10.136 2.918 8.947 5.609 11.658 17.422 6.055 26.377L349.747 306.5s-6.678 49.663-28.724 90.12l-.479 34.612H209.841l-.286-36.086s-21.284-11.604-39.886-45.158l-63.544-53.725c-8.069-6.818-9.079-18.889-2.262-26.954 3.785-4.476 9.187-6.778 14.622-6.778a19.005 19.005 0 0 1 12.331 4.516l36.351 28.557c3.816 2.991 8.558 5.167 12.906 5.167 11.025 0 19.547-13.972 4.202-64.077l-30.55-99.506c-3.11-10.111 2.57-20.803 12.659-23.9a19.021 19.021 0 0 1 5.623-.85c8.184 0 15.755 5.291 18.287 13.52l30.27 98.619c.332.611.706 1.448 1.127 2.672 2.243 6.395 8.296 15.954 12.815 15.954 3.407 0 5.939-5.429 5.313-21.733L229.692 99.572c-.873-10.521 6.95-19.762 17.484-20.635a19.787 19.787 0 0 1 1.607-.066m0-25.039c-1.21 0-2.441.051-3.652.152-24.299 2.015-42.406 23.397-40.388 47.659l.021.235c-8.166-9.043-19.907-14.48-32.756-14.48-4.39 0-8.757.659-12.972 1.949-11.275 3.465-20.528 11.109-26.051 21.533-5.53 10.426-6.663 22.384-3.189 33.664l30.546 99.5c2.202 7.189 3.755 13.189 4.843 18.157l-18.601-14.61a44.184 44.184 0 0 0-28.094-10.104h-.012a44.123 44.123 0 0 0-33.734 15.65c-7.618 9.016-11.269 20.451-10.284 32.207.984 11.756 6.492 22.424 15.5 30.039l60.161 50.863c12.1 20.611 25.118 33.879 34.495 41.703l.188 23.477.196 24.844H345.239l.343-24.691.396-28.632c18.301-36.167 25.896-76.288 27.97-89.046l51.994-109.955c11.696-20.44 5.236-46.742-14.894-59.355a44.083 44.083 0 0 0-23.431-6.739 44.255 44.255 0 0 0-17.64 3.637l1.737-9.768c4.24-23.997-11.806-46.961-35.765-51.218a44.485 44.485 0 0 0-7.744-.684 44.087 44.087 0 0 0-35.188 17.46l-.244-2.95c-1.884-22.706-21.209-40.497-43.99-40.497z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handtool.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handtool.svg
new file mode 100644
index 0000000000..2202ced6d6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handtool.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M403.066 159.934a26.618 26.618 0 0 0-14.125-4.064c-9.244 0-17.693 4.669-22.599 12.497l-.255.403-.201.433-27.938 60.443c-.004-.074-.012-.146-.012-.218l17.843-100.286c2.557-14.469-7.119-28.321-21.569-30.893a26.787 26.787 0 0 0-4.684-.415 26.597 26.597 0 0 0-26.213 21.975l-16.861 94.763-9.824-118.296c-1.135-13.7-12.788-24.425-26.528-24.425-.729 0-1.476.028-2.214.086-14.653 1.218-25.572 14.114-24.356 28.746l10.108 121.72c.157 4.256.076 7.391-.109 9.678-1.305-2.02-2.603-4.471-3.428-6.829a28.575 28.575 0 0 0-1.227-3.015l-30.078-97.994c-3.465-11.262-13.698-18.825-25.47-18.825-2.644 0-5.281.393-7.822 1.179-6.802 2.087-12.382 6.699-15.715 12.984-3.333 6.289-4.018 13.5-1.921 20.305l30.548 99.507c12.183 39.772 7.347 50.681 5.573 53.074-.688.936-1.394 1.281-2.594 1.281-2.298 0-5.47-1.366-8.275-3.566l-36.234-28.464a26.634 26.634 0 0 0-17.08-6.209 26.606 26.606 0 0 0-20.36 9.443c-4.59 5.433-6.794 12.332-6.2 19.42.599 7.09 3.915 13.524 9.35 18.122l62.506 52.844c14.716 26.057 30.997 39.361 38.296 44.427l.251 32.019.062 7.45h125.564l.101-7.407.442-31.909c28.994-34.966 29.196-81.08 28.845-91.407l53.084-112.253c7.463-12.41 3.626-28.612-8.681-36.324z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hard-drive-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hard-drive-alt.svg
new file mode 100644
index 0000000000..89ce2fea0e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hard-drive-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M393.414 372.478c10.307 0 18.666-8.355 18.666-18.663 0-10.305-8.359-18.659-18.666-18.659-10.302 0-18.659 8.354-18.659 18.659 0 10.307 8.357 18.663 18.659 18.663zM157.819 339.19h23.686v31.966h-23.686zm57.911.003h23.673v31.966H215.73zm-115.812-.003h23.681v31.969H99.918zM385.987 94.027H125.952l-76.33 195.634v128.312h412.756V289.661L385.987 94.027zm52.712 300.267H73.301V313.34h365.398v80.954z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hard-drive.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hard-drive.svg
new file mode 100644
index 0000000000..98a2a993d4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hard-drive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M387.675 96.433h-261.94l-77 197.073h415.984L387.675 96.433zM36.933 324.146v85.258h439.625v-85.258H36.933zm55.968 62.1H67.983v-33.662h24.918v33.662zm60.99-.014h-24.955v-33.648h24.955v33.648zm60.972 0h-24.936v-33.648h24.936v33.648zm212.036 1.393c-10.839 0-19.653-8.783-19.653-19.641s8.814-19.649 19.653-19.649 19.653 8.792 19.653 19.649-8.814 19.641-19.653 19.641z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hat.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hat.svg
new file mode 100644
index 0000000000..c8a1106446
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M439.457 311.077c-15.4 6.983-34.01 13.167-55.02 18.197l-1.096-180.839c-30.885-13.931-76.686-22.746-127.782-22.746-51.129 0-96.927 8.815-127.813 22.746V329.26c-20.963-5.034-39.505-11.218-54.874-18.184l-17.529 38.917c50.459 22.645 121.453 35.975 200.804 36.068 79.35-.094 150.413-13.424 200.838-36.068l-17.528-38.916z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hd.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hd.svg
new file mode 100644
index 0000000000..77bf64d4fa
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M170.977 220.982H96.386v-87.949H33.43v245.73h62.956V275.799h74.591v102.965h62.961v-245.73h-62.961v87.948zm300.007-10.512c-3.131-14.316-9.05-27.702-17.629-39.955-10.861-15.422-25.482-26.33-43.125-32.092-10.525-3.458-23.12-5.163-37.949-5.386H265.186V378.77h107.757c36.557.003 65.527-16.162 83.098-46.78 13.136-22.679 19.516-50.065 19.5-81.719 0-12.713-1.529-25.979-4.557-39.801zm-66.317 84.259c-4.099 10.212-9.483 17.264-16.001 21.877-6.539 4.595-14.473 7.002-24.646 7.03h-36.979V188.169h36.979c10.261-.006 18.418 1.49 24.473 4.101 6.085 2.642 10.121 6.187 12.989 11.032 6.354 10.76 10.04 27.547 10.017 50.252.005 16.285-2.362 29.993-6.832 41.175z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-headphones.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-headphones.svg
new file mode 100644
index 0000000000..811c656c7e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-headphones.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M443.742 371.621V293.86c-.012-51.788-20.942-98.514-54.871-132.463-33.954-33.933-80.68-54.868-132.473-54.869-51.787.001-98.511 20.937-132.468 54.869-33.925 33.949-54.859 80.675-54.869 132.463v77.761h.006-35.06V293.86c.012-122.832 99.562-222.376 222.391-222.39 122.838.014 222.385 99.558 222.398 222.39v77.761h-35.054zm-35.251 56.393c0 7.08-5.739 12.822-12.82 12.822h-46.099c-7.08 0-12.818-5.742-12.818-12.822V286.977c0-7.077 5.738-12.818 12.818-12.818h46.099c7.081 0 12.82 5.741 12.82 12.818v141.037zm-232.439.004c0 7.079-5.737 12.82-12.819 12.82h-46.099c-7.081 0-12.819-5.741-12.819-12.82V286.979c0-7.075 5.739-12.818 12.819-12.818h46.099c7.083 0 12.819 5.743 12.819 12.818v141.039z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-headset.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-headset.svg
new file mode 100644
index 0000000000..98db2e30db
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-headset.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.998 49.497c-117.223.014-212.225 93.63-212.236 209.151v73.13h33.453v-73.13c.012-48.708 19.986-92.648 52.367-124.58 32.404-31.911 76.992-51.598 126.416-51.604 49.428.005 94.018 19.692 126.42 51.604 32.379 31.931 52.355 75.872 52.365 124.58v73.13h33.453v-73.13c-.009-115.521-95.013-209.137-212.238-209.151zM388.91 225.988h-43.994c-6.758 0-12.234 5.399-12.234 12.054v132.64c0 6.661 5.477 12.06 12.234 12.06h43.994c6.756 0 12.232-5.399 12.232-12.06v-132.64c.001-6.655-5.476-12.054-12.232-12.054zM167.088 382.746c6.756 0 12.232-5.399 12.232-12.059v-132.64c0-6.655-5.477-12.054-12.232-12.054h-43.994c-6.758 0-12.234 5.398-12.234 12.054v132.639c0 6.66 5.477 12.059 12.234 12.059h43.994zm105.91 10.994h-39.012c-8.496 0-15.383 6.789-15.383 15.161v20.636H77.217v-39.025H43.762v71.992h229.236c8.494 0 15.381-6.788 15.381-15.16v-38.442c0-8.373-6.887-15.162-15.381-15.162z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hearts.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hearts.svg
new file mode 100644
index 0000000000..c2edaafe03
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hearts.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M343.37 94.976c-42.628 0-82.753 17.632-87.626 59.189-4.857-41.558-44.981-59.189-87.64-59.189-45.962 0-78.255 49.901-78.255 96.14 0 105.434 166.958 225.643 166.958 225.643S421.64 296.549 421.64 191.115c0-46.238-32.277-96.139-78.27-96.139z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-height.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-height.svg
new file mode 100644
index 0000000000..bf6a75975b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-height.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M182.504 322.507l73.58 89.11 73.577-89.11h-47.973V193.003h47.973l-73.577-89.144-73.58 89.144h48.039v129.503h-48.039zM160.955 38.029v51.164h190.291V38.029H160.955zm0 436.113h190.291v-51.145H160.955v51.145z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-help-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-help-alt.svg
new file mode 100644
index 0000000000..101c65318d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-help-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.854 38.094c120.295 0 217.811 97.519 217.811 217.809 0 120.297-97.516 217.815-217.811 217.815-120.293 0-217.81-97.519-217.81-217.815 0-120.291 97.518-217.809 217.81-217.809m0 37.557c-99.391 0-180.253 80.86-180.253 180.251 0 99.395 80.862 180.256 180.253 180.256 99.391 0 180.251-80.861 180.251-180.256 0-99.39-80.86-180.251-180.251-180.251zm-57.097 58.14c14.748-9.496 32.873-14.247 54.371-14.247 28.244 0 51.714 6.748 70.399 20.25 18.686 13.497 28.029 33.496 28.029 59.995 0 16.246-4.051 29.933-12.153 41.058-4.739 6.751-13.837 15.375-27.301 25.87l-13.272 10.312c-7.232 5.628-12.032 12.188-14.398 19.69-1.497 4.748-2.309 12.122-2.433 22.12h-50.806c.745-21.122 2.741-35.716 5.979-43.778 3.24-8.062 11.591-17.34 25.048-27.84l13.648-10.686c4.484-3.373 8.1-7.062 10.843-11.062 4.982-6.876 7.476-14.438 7.476-22.688 0-9.499-2.774-18.154-8.324-25.966-5.547-7.811-15.68-11.718-30.393-11.718-14.465 0-24.725 4.812-30.77 14.437-6.048 9.627-9.069 19.622-9.069 29.999h-54.185c1.501-35.62 13.938-60.87 37.311-75.746zm31.123 210.731h56.055v54.184H229.88v-54.184z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-help.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-help.svg
new file mode 100644
index 0000000000..a1c5fdc7c1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-help.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M451.419 255.976c9.882-16.999 15.255-36.734 15.241-57.494.021-35.186-15.329-73.104-48.443-106.155-33.029-33.091-70.943-48.446-106.128-48.421-20.764-.012-40.501 5.358-57.503 15.243-17.006-9.885-36.747-15.255-57.506-15.247-35.186-.019-73.1 15.336-106.129 48.427-33.095 33.052-48.451 70.979-48.426 106.172-.016 20.75 5.354 40.479 15.238 57.473-9.888 16.997-15.254 36.733-15.238 57.489-.025 35.195 15.343 73.119 48.426 106.158 33.029 33.102 70.956 48.453 106.15 48.434h.068c20.734 0 40.445-5.365 57.426-15.236 16.998 9.871 36.726 15.236 57.487 15.223h.06c35.168.004 73.062-15.342 106.082-48.42 33.104-33.039 48.455-70.953 48.439-106.143.013-20.762-5.36-40.501-15.244-57.503zM312.089 68.945c27.88.024 59.294 11.999 88.43 41.088 29.096 29.143 41.076 60.568 41.102 88.449-.01 12.669-2.502 24.637-7.11 35.452-.061-.061-.118-.126-.179-.189-.039-.036-.085-.064-.127-.101-10.102-82.05-75.083-147.188-157.3-157.304-.027-.029-.047-.065-.08-.096-.062-.065-.131-.125-.193-.185 10.818-4.61 22.79-7.101 35.457-7.114zm50.889 300.135l-42.993-42.006.496-.487c38.047-38.038 38.222-100.114.421-138.397l42.745-42.21c61.185 61.934 60.793 161.626-.669 223.1zm-254.32-259.043c29.127-29.086 60.538-41.067 88.422-41.088 12.671.009 24.639 2.5 35.461 7.111-.064.061-.131.12-.196.185-.029.028-.05.065-.079.096-82.037 10.097-147.182 75.083-157.298 157.312-.033.035-.072.056-.107.09-.065.062-.125.131-.188.195-4.606-10.809-7.099-22.77-7.11-35.437.025-27.89 12.009-59.319 41.095-88.464zm80.343 75.746l-.494.488c-38.025 38.035-38.208 100.111-.411 138.393l-42.743 42.213c-61.176-61.937-60.811-161.633.67-223.104l42.978 42.01zm8.101 257.227c-27.892-.016-59.316-12.008-88.436-41.091-29.094-29.137-41.078-60.569-41.104-88.456.012-12.672 2.504-24.64 7.11-35.452.062.062.122.132.188.194.035.035.074.057.107.09 10.093 82.028 75.05 147.154 157.269 157.295.043.044.071.097.112.141.065.062.13.119.192.182-10.811 4.601-22.773 7.088-35.438 7.097zm56.88-114.381c-19.439-.173-37.316-7.707-51.098-21.597-13.598-13.847-20.892-31.636-20.946-51.038 0-.062.006-.176.006-.353v-.146c.177-39.664 32.954-72.25 72.603-72.174h.688c19.377.173 37.271 7.719 51.063 21.622 13.585 13.815 20.903 31.592 20.94 50.917v.586c-.147 39.658-32.958 72.258-72.611 72.181h-.645zm146.54 73.283c-29.134 29.092-60.556 41.066-88.439 41.089-12.667-.007-24.629-2.497-35.444-7.095.062-.062.125-.117.186-.176.045-.047.072-.1.116-.143 82.022-10.105 147.152-75.061 157.268-157.283.038-.041.088-.062.125-.103.061-.06.118-.123.181-.185 4.608 10.818 7.101 22.789 7.11 35.461-.028 27.89-12.013 59.302-41.103 88.435z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-home.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-home.svg
new file mode 100644
index 0000000000..ebb93f4056
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-home.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.971 36.979L25.167 266.75l43.226 43.233 186.586-186.539 186.518 186.527 43.223-43.215L254.971 36.979zM91.083 322.702v151.167h117.111V336.506h93.5v137.363h117.112V322.693L254.971 158.849 91.083 322.702z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hourglass.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hourglass.svg
new file mode 100644
index 0000000000..c918b5407b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hourglass.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M311.137 189.918c1.081-1.242 1.896-2.551 2.388-3.4v-18.949H198.806v18.949c.23.396.523.92.882 1.441 1.668 2.55 4.905 5.627 6.835 6.731l29.661 18.69c6.867 4.335 13.243 10.094 18.051 17.614a61.92 61.92 0 0 1 1.929 3.268 45.687 45.687 0 0 1 1.928-3.268c4.841-7.561 11.217-13.309 18.053-17.614l29.659-18.69c1.44-.848 3.632-2.761 5.333-4.772zm19.033 45.853c8.436-5.368 15.402-12.396 20.796-20.146 5.233-7.814 9.288-16.06 9.486-26.323v-70.247h13.701V66.732H138.177v52.322h13.702v70.247c.198 10.233 4.285 18.509 9.485 26.323 5.394 7.75 12.328 14.777 20.765 20.146l28.713 18.049c1.013.651 1.6 1.177 1.993 1.566-.394.43-.98.983-1.993 1.607l-28.713 18.065c-8.437 5.346-15.372 12.396-20.765 20.11-5.2 7.832-9.287 16.108-9.485 26.374v71.341h-13.702v52.307h235.977v-52.307h-13.701v-71.341c-.198-10.266-4.253-18.542-9.486-26.374-5.363-7.749-12.36-14.765-20.796-20.11l-28.713-18.065c-.98-.624-1.604-1.178-1.994-1.607.391-.39 1.014-.915 1.994-1.566l28.712-18.048zm-45.033 47.154l28.715 18.084c4.283 2.647 8.83 7.124 11.869 11.541 3.14 4.351 4.251 8.796 4.055 8.993v71.341h-16.251v-1.487c-.196-.43-.524-.937-.882-1.476-1.669-2.535-4.938-5.624-6.837-6.733l-29.659-18.674c-6.836-4.314-13.212-10.07-18.053-17.629-.686-1.044-1.307-2.122-1.928-3.235a69.141 69.141 0 0 1-1.929 3.254c-4.841 7.54-11.185 13.296-18.051 17.61l-29.628 18.674c-1.472.883-3.695 2.777-5.33 4.777a20.933 20.933 0 0 0-2.421 3.432v1.487h-16.253v-71.341c-.229-.197.917-4.643 4.057-8.993 3.007-4.417 7.554-8.894 11.837-11.541l28.744-18.084c9.421-5.822 16.679-15.801 16.646-27.539.033-11.707-7.225-21.694-16.646-27.495l-28.744-18.089c-4.283-2.665-8.83-7.162-11.837-11.545-3.14-4.332-4.286-8.795-4.057-8.955v-70.247h147.223v70.247c.196.16-.915 4.623-4.055 8.955-3.008 4.383-7.586 8.88-11.869 11.545l-28.715 18.089c-9.449 5.801-16.677 15.788-16.677 27.495-.001 11.738 7.227 21.717 16.676 27.539z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-imac.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-imac.svg
new file mode 100644
index 0000000000..76a01b97b8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-imac.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M309.632 422.164c-.884-3.977-1.507-7.9-1.998-11.611H203.906c-.949 7.455-2.584 15.862-5.461 23.609-2.91 7.816-7.032 14.914-12.625 19.916-5.623 4.974-12.588 8.111-22.333 8.145v9.287h184.6v-9.287c-9.745-.033-16.742-3.171-22.365-8.16-8.376-7.458-13.442-19.801-16.09-31.899zm150.46-381.498H51.448c-6.798 0-12.327 5.508-12.327 12.326v323.387c0 6.801 5.529 12.33 12.327 12.33h408.644c6.801 0 12.325-5.529 12.325-12.33V52.992c0-6.818-5.524-12.326-12.325-12.326zm-17.595 263.245H69.077V70.59h373.42v233.321z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inactive-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inactive-line.svg
new file mode 100644
index 0000000000..60a16437c2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inactive-line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M447.028 468.9L42.031 63.902l21.762-21.763 405 405.002-21.765 21.759z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inbox-full.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inbox-full.svg
new file mode 100644
index 0000000000..c0beabfa29
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inbox-full.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M179.723 136.117h152.551v29.351H179.723zm-21.498 51.628h195.551v38.382H158.225zm-21.529 91.296H192.858v63.934c0 5.223 4.246 9.471 9.471 9.471h107.346c5.224 0 9.473-4.248 9.473-9.471v-63.934h56.156v-27.63H136.696v27.63zm243.66-209.564h-248.78L47.252 287.765v154.759h417.494V285.358l-84.39-215.881zm-47.002 223.772v49.726c0 13.078-10.604 23.679-23.68 23.679H202.329c-13.076 0-23.68-10.601-23.68-23.679v-49.726H93.358l69.066-178.771h187.215l69.891 178.771h-86.176z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inbox.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inbox.svg
new file mode 100644
index 0000000000..0fd7c71b22
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inbox.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M387.65 58.675H124.582L35.415 289.498v163.646h441.474V286.95L387.65 58.675zm-49.703 236.622v52.58c0 13.828-11.211 25.039-25.036 25.039H199.399c-13.828 0-25.041-11.211-25.041-25.039v-52.58H84.17l73.031-189.041h197.967l73.906 189.041h-91.127zm-49.103-158.21h-61.342v72.882h-57.567l88.243 106.915 88.24-106.915h-57.574v-72.882z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-indent.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-indent.svg
new file mode 100644
index 0000000000..329b0f413e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-indent.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M204.67 166.785v-83.1h268.265v83.1H204.67zm0 131.002V214.69h268.265v83.097H204.67zm0 131.006v-83.1h268.265v83.1H204.67zm-60.865-172.551L35.514 319.291V193.187z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-infinity.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-infinity.svg
new file mode 100644
index 0000000000..c42e3bd49e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-infinity.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M144.192 365.176c-30.411.028-58.092-12.29-77.808-32.163-19.769-19.823-31.875-47.417-31.855-77.495.006-30.666 13.191-58.16 33.137-77.709 19.949-19.572 47.099-31.912 76.526-31.964 21.957-.063 41.812 5.919 58.365 15.51 16.62 9.567 30.071 22.332 41.774 35.899 4.18 4.885 8.168 9.896 12.011 14.953 2.728-3.65 5.52-7.273 8.397-10.841 14.787-18.177 32.267-35.504 55.794-46.071 13.375-5.997 28.59-9.476 44.9-9.444 59.838.165 109.449 48.753 109.666 109.667-.027 30.944-13.744 58.391-33.771 77.801-20.084 19.418-46.949 31.766-75.895 31.857h-.395c-21.291 0-40.588-6.099-56.568-15.703-16.146-9.646-29.146-22.399-40.549-35.914-4.016-4.809-7.868-9.729-11.59-14.703a358.626 358.626 0 0 1-8.685 11.013c-15.163 18.261-33.293 35.575-57.458 46.005-13.735 5.928-29.285 9.33-45.996 9.302m0-50.078c13.286-.059 23.464-3.195 33.416-8.849 9.887-5.654 19.406-14.249 28.803-25.169 6.63-7.616 13.056-16.305 19.557-25.554-5.619-8.004-11.186-15.582-16.897-22.414-12.52-15.151-25.101-26.172-38.647-31.945-7.807-3.329-16.09-5.213-26.23-5.236-15.042-.046-30.208 6.55-41.445 17.607-11.251 11.088-18.148 25.896-18.137 41.979.112 33.131 26.018 59.493 59.58 59.581m159.404-36.982c12.309 15.229 24.549 26.246 37.32 31.886 7.362 3.254 15.051 5.062 24.518 5.096 14.094.092 29.533-6.506 41.008-17.709 11.523-11.221 18.6-26.081 18.576-41.871-.008-16.369-6.722-31.133-17.706-42.08-11.005-10.909-25.895-17.519-41.878-17.507-12.384.069-21.808 3.066-31.295 8.636-9.406 5.588-18.658 14.185-27.88 25.158-6.534 7.687-12.916 16.467-19.427 25.813 5.612 8.06 11.135 15.698 16.764 22.578z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-info.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-info.svg
new file mode 100644
index 0000000000..f07ac8e7d1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-info.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M230.384 224.6c4.293-11.035-1.231-16.553-6.143-16.553-22.688 0-52.154 53.374-63.173 53.374-4.311 0-7.99-4.307-7.99-7.985 0-11.043 26.991-36.805 34.982-44.783 24.528-23.312 56.44-41.104 92.027-41.104 26.368 0 54.601 15.945 32.515 75.471L268.42 362.638c-3.665 9.205-10.415 24.557-10.415 34.367 0 4.29 2.438 8.595 7.348 8.595 18.396 0 52.155-52.158 60.748-52.158 3.061 0 7.351 3.675 7.351 9.196 0 17.793-71.771 93.876-133.744 93.876-22.088 0-37.423-10.421-37.423-33.738 0-29.441 20.854-79.757 25.169-90.194l42.93-107.982zm33.125-120.861c0-26.992 23.309-49.073 50.308-49.073 24.556 0 42.336 16.554 42.336 41.716 0 28.233-23.303 49.094-50.914 49.094-25.151 0-41.73-16.576-41.73-41.737z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-invoice.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-invoice.svg
new file mode 100644
index 0000000000..dd8457a63a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-invoice.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M390.008 145.332l-79.432-79.434-6.936-6.936H115.059v394.074h281.883v-300.77l-6.934-6.934zM373.26 429.355H138.738V82.642h133.92c35.182 0 18.23 83.392 18.23 83.392s81.328-19.766 82.371 17.527l.001 245.794zM200.121 200.674c-3.041-3.239-4.516-7.659-4.418-13.256h-20.77c.982 11.586 4.566 20.378 10.752 26.366 6.189 5.99 14.779 9.378 25.781 10.165v12.519h8.691v-12.519c7.365-.493 13.406-1.967 18.117-4.421 4.713-2.452 8.471-5.253 11.27-8.395 2.797-3.144 4.736-6.356 5.818-9.649 1.08-3.291 1.619-6.016 1.619-8.176 0-2.452-.17-5.252-.518-8.396-.344-3.144-1.445-6.285-3.309-9.429-1.869-3.143-4.766-6.162-8.695-9.06-3.93-2.895-9.525-5.325-16.787-7.291a106.997 106.997 0 0 0-3.908-1.031c-1.229-.294-2.428-.591-3.607-.882v-26.074c3.336 0 6.186 1.377 8.541 4.125 2.355 2.751 3.586 6.086 3.684 10.016H253.3c-.297-5.104-1.375-9.524-3.244-13.26-1.865-3.729-4.268-6.848-7.215-9.351-2.945-2.505-6.357-4.468-10.236-5.892-3.881-1.425-8.027-2.383-12.447-2.874v-11.343h-8.691v11.343a49.32 49.32 0 0 0-12.816 2.578c-4.123 1.423-7.758 3.44-10.898 6.04-3.146 2.604-5.674 5.816-7.59 9.649-1.914 3.827-2.869 8.248-2.869 13.256 0 4.909.83 9.013 2.5 12.3 1.67 3.293 3.908 6.041 6.705 8.252 2.797 2.208 5.967 3.975 9.5 5.303a119.314 119.314 0 0 0 10.752 3.459c.986.198 1.893.421 2.729.663.834.245 1.494.468 1.988.662v30.786c-4.519-.88-8.3-2.94-11.347-6.183zm20.037-22.097c5.795 1.573 9.891 3.315 12.299 5.23 2.4 1.914 3.609 4.787 3.609 8.618 0 2.356-.49 4.396-1.473 6.111a14.641 14.641 0 0 1-3.758 4.349 17.192 17.192 0 0 1-5.156 2.721c-1.914.642-3.756 1.058-5.521 1.253v-28.282zm-18.857-27.694c-2.061-1.767-3.092-4.269-3.092-7.51 0-2.063.369-3.854 1.105-5.378.738-1.521 1.742-2.799 3.02-3.829a12.764 12.764 0 0 1 4.271-2.282 16.175 16.175 0 0 1 4.861-.737v24.01c-4.716-1.08-8.101-2.505-10.165-4.274zm-28.483 107.454h166.363v23.678H172.818zm0 45.752v90.422h166.363v-90.422H172.818zm23.682 23.679h29.992v43.065H196.5v-43.065zm119.002 43.065h-65.328v-43.065h65.328v43.065z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ipad.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ipad.svg
new file mode 100644
index 0000000000..e79195e670
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ipad.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M407.693 37.204H105.369c-9.387 0-16.942 7.584-16.942 16.937v403.636c0 9.354 7.555 16.944 16.942 16.944h302.325c9.353 0 16.941-7.591 16.941-16.944V54.141c0-9.353-7.589-16.937-16.942-16.937zM256.515 467.593c-5.952 0-10.791-4.845-10.791-10.83 0-5.969 4.839-10.79 10.791-10.79a10.77 10.77 0 0 1 10.792 10.79c0 5.985-4.808 10.83-10.792 10.83zm137.475-31.005H119.07V75.334h274.92v361.254z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-iphone.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-iphone.svg
new file mode 100644
index 0000000000..b235644b03
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-iphone.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M334.191 65.595H173.834c-15.331 0-27.753 12.435-27.753 27.765v325.63c0 15.33 12.422 27.765 27.753 27.765h160.357c15.354 0 27.767-12.435 27.767-27.765V93.359c0-15.33-12.413-27.764-27.767-27.764zM235.885 89.24h36.274v12.048h-36.274V89.24zm18.15 342.938c-9.773 0-17.718-7.916-17.718-17.694 0-9.765 7.944-17.695 17.718-17.695 9.768 0 17.687 7.931 17.687 17.695 0 9.778-7.919 17.694-17.687 17.694zm87.132-46.555H166.881V126.725h174.286v258.898z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-item-arrangement.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-item-arrangement.svg
new file mode 100644
index 0000000000..fd9939dba3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-item-arrangement.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M49.035 60.434h413.93v33.592H49.035zm0 82.005h86.578v86.577H49.035zm163.677 0h86.576v86.577h-86.576zm163.676 0h86.576v86.577h-86.576zM49.035 282.984h413.93v33.593H49.035zm0 82.006h86.578v86.576H49.035zm163.677 0h86.576v86.576h-86.576zm163.676 0h86.576v86.576h-86.576z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-junk.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-junk.svg
new file mode 100644
index 0000000000..a8f48754d4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-junk.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M452.403 163.403l7.431-19.945-19.189-22.075-42.659-55.146-24.822-12.181H144.608l-23.572 10.666-56.893 64.735.065.145-12.042 13.855 4.167 85.021 3.153 13.709 18.386 37.854-19.668 54.384-1.871 10.675V426.561l31.382 31.382h335.527l29.005-43.362-14.491-35.087 16.006-66.918.258-13.424-17.603-88.482 15.986-47.267zM199.934 352.118v33.792H180.04a33.79 33.79 0 1 1-29.263-50.687l23.977-41.529-26.932-15.587 71.148-26.462 12.488 74.876-27.286-15.792-23.879 41.252-.129-.076-.124.213h19.894zm49.782-120.681l-7.932 13.741-29.245-16.93 7.913-13.706a33.792 33.792 0 0 1 58.528 0l23.888 41.373 26.561-15.271-12.499 73.597-69.894-26.228 26.536-15.258-23.856-41.318zm98.941 137.578a33.79 33.79 0 0 1-29.264 16.896h-42.768l.026 30.421-57.616-47.471 57.535-47.568.027 30.826h42.795l-6.953-12.042 29.296-16.842 6.921 11.989a33.79 33.79 0 0 1 .001 33.791zM87.715 150.177l56.893-64.738h228.554l50.08 64.738H87.715z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-key.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-key.svg
new file mode 100644
index 0000000000..4a32d0004e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-key.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.808 42.17c-58.417 0-105.779 47.362-105.779 105.782 0 41.388 23.786 77.202 58.419 94.581v35.723l1.985 2.498 35.609 35.609-37.595 37.596v1.962l34.63 34.63-32.645 32.642 46.244 46.244 46.493-46.492V242.533c34.636-17.378 58.419-53.192 58.419-94.581 0-58.419-47.361-105.782-105.78-105.782zm0 110.471c-18.027 0-32.643-14.616-32.643-32.645 0-18.029 14.616-32.643 32.643-32.643 18.029 0 32.644 14.613 32.644 32.643-.001 18.029-14.615 32.645-32.644 32.645z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keyboard.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keyboard.svg
new file mode 100644
index 0000000000..c08d8d9e93
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keyboard.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M37.521 104.271v303.855h436.853V104.271H37.521zm411.802 278.804H62.573V129.322h386.75v253.753zm-252.44-206.691h-41.205v41.178h41.205v-41.178zm65.144 0H220.84v41.178h41.188v-41.178zm65.172 0H285.99v41.178h41.209v-41.178zm-7.719 108.825h40.073v-41.188H319.48v41.188zM129.212 175.568H88.027v41.183h41.185v-41.183zm37.37 68.453H88.868v41.188h77.714v-41.188zm24.324 0v41.188h41.175v-41.188h-41.175zm65.543 0v41.188h41.208v-41.188h-41.208zM88.775 352.862h41.187v-41.201H88.775v41.201zm65.875 0h201.547v-41.201H154.65v41.201zm226.782-67.213h41.188V176.287h-69.042v41.179h27.854v68.183zm-.558 67.213h41.208v-41.201h-41.208v41.201z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keychain.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keychain.svg
new file mode 100644
index 0000000000..e206a9150e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keychain.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M197.291 214.937a91.431 91.431 0 0 1 19.494-23.541 76.406 76.406 0 0 1-4.023-7.661c-8.293-18.317-8.953-38.77-1.863-57.586 7.088-18.815 21.082-33.744 39.4-42.035 18.318-8.289 38.768-8.952 57.582-1.865v-.001l.008.004c18.809 7.089 33.736 21.08 42.033 39.398 8.289 18.322 8.947 38.769 1.857 57.583-11.059 29.348-39.145 48.76-70.363 48.76-.67 0-1.34-.009-2.01-.028-.127-.002-.252-.004-.373-.004-7.91 0-14.453 6.314-14.652 14.281-.203 8.088 6.182 14.812 14.275 15.015.9.016 1.795.04 2.699.04 43.375 0 82.473-26.945 97.84-67.723 9.852-26.15 8.941-54.557-2.578-80.004-11.518-25.446-32.258-44.885-58.395-54.736l-.047-.013c-26.125-9.835-54.523-8.912-79.961 2.602-25.447 11.52-44.887 32.257-54.734 58.397-9.848 26.139-8.93 54.551 2.586 79.997a105.61 105.61 0 0 0 11.225 19.12zm-7.322 74.318l-63.941 63.929v41.679h41.463v-29.254h31.051l12.244-12.24 11.434-11.435v-8.65a90.008 90.008 0 0 1-32.251-44.029zm173.371 70.234l-14.805-44.826a90.405 90.405 0 0 1-18.902 18.622v104.128l32.66 16.439 18.643-37.038-12.166-40.881-5.43-16.444zm-20.906-107.845c-18.025 11.157-39.092 17.491-61.078 17.491-.805 0-1.604-.016-2.4-.032l-.596-.012a26.307 26.307 0 0 1-9.967-2.233c-10.451-3.217-18.039-12.943-18.039-24.45 0-12.604 9.113-23.046 21.107-25.158a26.07 26.07 0 0 1 8.259-1.12c.564.013 1.131.022 1.693.022 12.328 0 24.109-3.696 34.117-10.128-11.1-8.14-24.787-12.957-39.604-12.957-37.041 0-67.062 30.027-67.062 67.066 0 26.237 15.082 48.939 37.033 59.951v22.653l1.26 1.58 22.574 22.578-23.834 23.832v1.25l21.951 21.953-20.691 20.691 29.32 29.318 29.477-29.476V320.085c21.957-11.012 37.033-33.714 37.033-59.951.001-2.878-.2-5.706-.553-8.49z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keyhole.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keyhole.svg
new file mode 100644
index 0000000000..b97b156002
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keyhole.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.652 38.669c-120.082 0-217.434 97.351-217.434 217.4 0 120.08 97.352 217.438 217.434 217.438 120.049 0 217.399-97.357 217.399-217.438.001-120.049-97.35-217.4-217.399-217.4zm0 383.691c-91.694 0-166.289-74.596-166.289-166.291 0-91.663 74.595-166.252 166.289-166.252 91.68 0 166.255 74.589 166.255 166.252 0 91.696-74.575 166.291-166.255 166.291zm52.976-221.26c0-29.252-23.74-52.975-52.976-52.975-29.269 0-52.993 23.723-52.993 52.975 0 24.001 15.976 44.261 37.853 50.751l-29.677 112.201h89.602l-29.691-112.201c21.893-6.491 37.882-26.735 37.882-50.751z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lab.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lab.svg
new file mode 100644
index 0000000000..b750677812
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lab.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M404.368 355.32l-.198-.375-.227-.373-71.224-119.722c-9.127-16.909-17.106-48.19-17.106-67.237v-55.3h15.029V82.392H180.883v29.921h17.547v55.3c0 19.001-7.932 50.157-17.054 67.106l-73.581 119.529-.31.54-.311.532c-9.683 17.678-10.236 36.248-1.539 50.977 8.734 14.689 25.28 23.134 45.423 23.134h209.424c20.141 0 36.689-8.444 45.422-23.134 8.699-14.729 8.143-33.299-1.536-50.977zM244.716 251.186l-74.133 120.442v.012-.012l-25.476-15.685 73.745-119.79c9.595-17.229 18.604-52.55 18.342-72.054v-41.336h29.922V164.1c-.242 26.976-9.466 62.975-22.202 86.788l-.198.298zm33.421 79.923c-10.512 0-19.03-8.505-19.03-19.029 0-10.516 8.519-19.021 19.03-19.021 10.5 0 19.035 8.506 19.035 19.021 0 10.524-8.535 19.029-19.035 19.029zm58.305 62.057c-16.708 0-30.265-13.546-30.265-30.256 0-16.714 13.557-30.264 30.265-30.264 16.712 0 30.269 13.55 30.269 30.264 0 16.71-13.557 30.256-30.269 30.256z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-laptop.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-laptop.svg
new file mode 100644
index 0000000000..dc120cca29
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-laptop.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M437.375 335.82H72.363l-27.084 52.807h419.179l-27.083-52.807zm-228.202 40.133l11.253-21.395h69.995l10.146 21.395h-91.394zm221.94-52.34c0-.334-.066-.65-.1-.975.033-.33.1-.645.1-.973V103.223c0-5.539-4.491-10.028-10.033-10.028H88.653c-5.539 0-10.029 4.489-10.029 10.028v218.443c0 .328.067.643.099.973-.031.324-.099.641-.099.975l-.085.162h352.658l-.084-.163zm-25.04-16.955h-302.41V118.23h302.41v188.428zm64.564 94.019H39.101l-1.046 2.036c0 5.542 4.492 15.041 10.03 15.041H461.65c5.541 0 10.033-9.499 10.033-15.041l-1.046-2.036z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layers-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layers-alt.svg
new file mode 100644
index 0000000000..e02a1cadbf
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layers-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M117.535 237.887H82.61V395.93h225.118v-36.139H117.535V237.887zm62.329-61.084h-37.38v61.084h-.031v96.962h165.275v-.015h59.812V298.68H179.864V176.803zm24.953-61.085v158.029H429.9V115.718H204.817z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layers.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layers.svg
new file mode 100644
index 0000000000..c6965e3e95
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layers.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M194.227 248.271l-43.363-41.089h-80.61l102.62 97.286h268.411l-59.317-56.197H194.227zm9.942-24.934H472.55l-102.648-97.29H101.518l102.651 97.29zm-41.239 106.05l-43.33-41.075H38.99l102.651 97.283h268.383l-59.32-56.208H162.93z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layout.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layout.svg
new file mode 100644
index 0000000000..355f314f0f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layout.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M472.986 37.758v436.666H36.32V37.758h436.666m-30.775 30.777H67.098v375.112h375.113V68.535zM110.673 219.579h73.331v178.48h-73.331zm117.47 1.442h168.32v175.805h-168.32zm-117.47-115.282h285.79v70.574h-285.79z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-left-double-arrow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-left-double-arrow.svg
new file mode 100644
index 0000000000..0958c291da
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-left-double-arrow.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M343.473 256.003L437.94 87.995h-34.024L250.857 256.003l153.057 168.002h34.027zM261.141 87.995h-34.025L74.059 256.003l153.055 168.002h34.027l-94.467-168.002z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-legal.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-legal.svg
new file mode 100644
index 0000000000..e4ea59375e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-legal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M174.359 291.527l-62.919-146.83-63.065 146.83c0 34.828 28.206 62.983 62.999 62.983 34.794.001 62.985-28.155 62.985-62.983zm-98.712 0l35.792-83.521 35.792 83.521H75.647zm325.858-146.83l-63.083 146.83c0 34.828 28.188 62.983 62.982 62.983 34.797 0 63.001-28.155 63.001-62.983l-62.9-146.83zm-35.808 146.83l35.808-83.521 35.774 83.521h-71.582zm-86.235 99.416V141.949h156.183V111.31H279.462v-.758c9.481-7.52 15.581-19.127 15.581-32.176 0-22.73-18.428-41.107-41.155-41.107-22.71 0-41.139 18.377-41.139 41.107 0 13.049 6.116 24.656 15.566 32.176v.758H77.103v30.639h151.212v248.994c0 28.545-23.151 51.732-51.768 51.732h-53.074v30.67h260.845v-30.67h-53.09c-28.582.001-51.766-23.187-51.766-51.732z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lense.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lense.svg
new file mode 100644
index 0000000000..229a7749bd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lense.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.39 38.42c-120.065 0-217.417 97.319-217.417 217.414 0 120.066 97.353 217.4 217.417 217.4 120.095 0 217.418-97.334 217.418-217.4.001-120.095-97.323-217.414-217.418-217.414zm0 383.668c-91.679 0-166.272-74.592-166.272-166.254 0-91.696 74.593-166.29 166.272-166.29 91.678 0 166.27 74.594 166.27 166.29 0 91.662-74.592 166.254-166.27 166.254zm-.016-305.399c-76.832 0-139.113 62.293-139.113 139.127 0 76.866 62.281 139.146 139.113 139.146 76.864 0 139.18-62.28 139.18-139.146 0-76.834-62.316-139.127-139.18-139.127zm-.752 240.863c-56.737-.015-102.733-46.027-102.733-102.779 0-6.427.604-12.704 1.733-18.788-7.164-.604-14.308-1.243-21.306-1.867a141.695 141.695 0 0 1 15.223-36.672l42.906 29.217a93.037 93.037 0 0 0-5.381 11.808c-4.612-.328-9.253-.687-13.964-1.062a85.58 85.58 0 0 0-1.766 17.365c0 23.588 9.55 44.86 24.984 60.332 15.469 15.453 36.725 24.984 60.303 24.984 18.574 0 35.694-5.919 49.673-15.959-7.454-2.761-12.785-9.893-12.785-18.293 0-10.775 8.747-19.493 19.523-19.493a19.441 19.441 0 0 1 17.527 10.989c7.243-12.526 11.38-27.03 11.38-42.561 0-23.596-9.517-44.851-24.983-60.319-15.469-15.436-36.726-24.985-60.335-24.985-2.092 0-4.187.101-6.245.266l-.493 12.162c-15.304 3.876-29.79 11.769-41.811 23.788-.274.314-.554.608-.831.885l-43.2-29.414a157.16 157.16 0 0 1 7.44-8.047c22.645-22.66 51.03-36.1 80.477-40.321l-.933 23.381c1.883-.097 3.746-.162 5.595-.162 56.771.034 102.78 46.015 102.78 102.768.002 56.749-46.007 102.762-102.778 102.777zm-10.498-101.718c0-6.229 5.069-11.268 11.267-11.268 6.228 0 11.25 5.039 11.25 11.268 0 6.209-5.021 11.25-11.25 11.25-6.199 0-11.267-5.041-11.267-11.25z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-library.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-library.svg
new file mode 100644
index 0000000000..1551dec3c9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-library.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M435.107 205.502v-19.731h-70.248v19.731h9.078v122.542h-9.078v19.729h70.248v-19.729h-9.078V205.502h9.078zm26.885-74.091h.002L255.518 67.374 49.039 131.411v30.682h412.953v-30.682zm-206.476 4.776c-10.811 0-19.574-8.764-19.574-19.576 0-10.81 8.764-19.573 19.574-19.573s19.574 8.764 19.574 19.573c0 10.811-8.764 19.576-19.574 19.576zm83.755 69.315v-19.731h-70.246v19.731h9.076v122.542h-9.076v19.729h70.246v-19.729h-9.076V205.502h9.076zm100.008 169.476H73.686l-23.682 69.649h412.957l-23.682-69.649zM243.441 205.502v-19.731h-70.248v19.731h9.076v122.542h-9.076v19.729h70.248v-19.729h-9.08V205.502h9.08zm-95.836 0v-19.731H77.357v19.731h9.076v122.542h-9.076v19.729h70.248v-19.729h-9.076V205.502h9.076z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-light-down.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-light-down.svg
new file mode 100644
index 0000000000..c214226f59
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-light-down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.989 186.463c38.106 0 68.999 30.891 68.999 68.994 0 38.112-30.893 69.002-68.999 69.002-38.109 0-69.002-30.89-69.002-69.002 0-38.103 30.893-68.994 69.002-68.994zm-17.53-54.484v-25.271c0-9.677 7.849-17.524 17.525-17.524 9.678 0 17.531 7.848 17.531 17.524v25.271c0 9.678-7.854 17.529-17.531 17.529-9.676 0-17.525-7.852-17.525-17.529zm0 272.23v-25.27c0-9.681 7.846-17.524 17.525-17.524 9.68 0 17.531 7.844 17.531 17.524v25.27c0 9.676-7.852 17.528-17.531 17.528-9.679 0-17.525-7.852-17.525-17.528zm92.447-223.671c-6.845-6.846-6.845-17.947 0-24.785l17.871-17.872c6.845-6.846 17.941-6.846 24.785 0 6.848 6.854 6.848 17.945 0 24.785l-17.873 17.872a17.456 17.456 0 0 1-12.391 5.135 17.46 17.46 0 0 1-12.392-5.135zM137.411 373.031c-6.846-6.846-6.846-17.937 0-24.783l17.869-17.87c6.848-6.843 17.945-6.843 24.786 0 6.848 6.847 6.848 17.944 0 24.785l-17.869 17.868a17.475 17.475 0 0 1-12.396 5.135 17.458 17.458 0 0 1-12.39-5.135zm241.053-100.047c-9.677 0-17.526-7.848-17.526-17.527.008-9.68 7.85-17.528 17.526-17.528h25.271c9.681.008 17.528 7.856 17.528 17.536 0 9.678-7.848 17.52-17.528 17.52h-25.271v-.001zm-272.225 0c-9.682 0-17.53-7.848-17.53-17.527 0-9.68 7.848-17.528 17.53-17.528h25.267c9.681.008 17.529 7.856 17.529 17.536 0 9.678-7.849 17.52-17.529 17.52h-25.267v-.001zm241.529 100.045l-17.861-17.87c-6.846-6.839-6.842-17.946.007-24.781 6.839-6.849 17.938-6.845 24.786.002l17.86 17.87c6.848 6.839 6.842 17.939-.004 24.787a17.444 17.444 0 0 1-12.386 5.129 17.487 17.487 0 0 1-12.402-5.137zM155.276 180.538l-17.864-17.872c-6.847-6.844-6.847-17.938 0-24.785 6.846-6.846 17.94-6.846 24.786 0l17.871 17.872c6.839 6.844 6.839 17.939-.005 24.785a17.464 17.464 0 0 1-12.394 5.135c-4.485 0-8.97-1.71-12.394-5.135z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-light-up.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-light-up.svg
new file mode 100644
index 0000000000..dbac39d507
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-light-up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.787 186.545c38.106 0 68.997 30.894 68.997 68.996 0 38.109-30.891 69-68.997 69-38.109 0-69-30.891-69-69 0-38.103 30.891-68.996 69-68.996zm-17.525-54.484v-75.35c0-9.68 7.846-17.525 17.522-17.525 9.681 0 17.529 7.846 17.529 17.525v75.35c0 9.676-7.849 17.527-17.529 17.527-9.676 0-17.522-7.852-17.522-17.527zm-.002 322.304V379.02c0-9.68 7.845-17.523 17.527-17.523 9.678 0 17.524 7.844 17.524 17.523v75.346c0 9.68-7.846 17.535-17.524 17.535-9.682-.001-17.527-7.856-17.527-17.536zm92.447-273.745c-6.845-6.846-6.845-17.945 0-24.791l53.278-53.28c6.847-6.843 17.941-6.843 24.785 0 6.845 6.846 6.845 17.948 0 24.793l-53.278 53.278a17.474 17.474 0 0 1-12.393 5.128 17.477 17.477 0 0 1-12.392-5.128zM101.799 408.523c-6.845-6.844-6.845-17.938 0-24.781l53.279-53.28c6.843-6.843 17.94-6.843 24.787 0 6.845 6.845 6.845 17.944 0 24.784l-53.278 53.277a17.471 17.471 0 0 1-12.395 5.135 17.469 17.469 0 0 1-12.393-5.135zM378.262 273.07c-9.679 0-17.527-7.854-17.527-17.529 0-9.68 7.849-17.526 17.527-17.526h75.35c9.678 0 17.526 7.847 17.526 17.526 0 9.675-7.849 17.529-17.526 17.529h-75.35zm-322.306 0c-9.68 0-17.526-7.854-17.526-17.529 0-9.68 7.846-17.526 17.526-17.526h75.35c9.679 0 17.526 7.847 17.526 17.526 0 9.675-7.848 17.529-17.526 17.529h-75.35zm327.029 135.453l-53.279-53.277c-6.845-6.84-6.845-17.939 0-24.784 6.843-6.843 17.943-6.843 24.786 0l53.282 53.28c6.841 6.843 6.841 17.938 0 24.781a17.49 17.49 0 0 1-12.397 5.135 17.466 17.466 0 0 1-12.392-5.135zM155.073 180.62l-53.281-53.278c-6.838-6.845-6.838-17.947 0-24.793 6.852-6.843 17.947-6.843 24.793 0l53.278 53.28c6.847 6.846 6.847 17.945 0 24.791a17.479 17.479 0 0 1-12.396 5.128 17.476 17.476 0 0 1-12.394-5.128z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightbulb-active.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightbulb-active.svg
new file mode 100644
index 0000000000..522460a54c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightbulb-active.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M338.233 80.661c-13.934-13.933-31.228-24.218-50.015-29.774-10.742-3.152-21.915-4.725-33.24-4.725-31.455 0-60.983 12.231-83.236 34.499-22.25 22.208-34.46 51.76-34.46 83.198l.494 10.821c1.477 16.173 6.198 31.601 14.04 45.825.082.789 44.311 80.123 44.311 129.688l1.516 14.678c2.385 9.789 7.382 14.767 14.848 14.767h84.977c7.468 0 12.457-4.978 14.85-14.767l1.512-14.678c0-49.564 44.227-128.898 44.685-129.688 7.47-14.225 12.191-29.652 13.646-45.825l.516-10.821c-.002-31.438-12.238-60.99-34.444-83.198zm4.022 91.933c-1.124 11.602-4.522 22.919-10.113 33.654-4.72 8.457-47.432 86.512-48.275 142.276l-.116 1.142h-13.787v-54.678h-29.979v54.678h-13.783l-.115-1.142c-.629-41.776-24.441-96.779-45.046-136.716l-.05-.461-2.924-5.311a86.42 86.42 0 0 1-10.383-33.469l-.427-9.333c.163-23.22 9.259-44.987 25.69-61.389 16.57-16.581 38.6-25.714 62.031-25.714 8.514 0 16.855 1.184 24.734 3.494 14.024 4.149 26.932 11.836 37.326 22.229 16.391 16.394 25.489 38.149 25.658 61.327l-.441 9.413zM207.14 429.956h95.676v-29.972H207.14v29.972zm20.78 34.542h54.096v-16.943H227.92v16.943z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightbulb.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightbulb.svg
new file mode 100644
index 0000000000..2d67f238ee
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightbulb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M374.638 173.241c-1.519 16.622-6.36 32.451-14.023 47.062-.472.818-45.887 82.276-45.887 133.174l-1.552 15.067c-2.454 10.046-7.57 15.153-15.257 15.153h-87.257c-7.651 0-12.783-5.107-15.247-15.153l-1.542-15.067c0-50.897-45.428-132.355-45.515-133.174-8.032-14.61-12.896-30.44-14.403-47.062l-.514-11.114c0-32.273 12.555-62.621 35.387-85.443 22.84-22.846 53.181-35.427 85.477-35.427a121.2 121.2 0 0 1 34.115 4.879c19.308 5.683 37.055 16.248 51.361 30.548 22.812 22.822 35.373 53.158 35.373 85.443l-.516 11.114zM205.169 435.373v-30.777h98.265v30.777h-98.265zm21.355 35.454v-17.394h55.55v17.394h-55.55z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightning.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightning.svg
new file mode 100644
index 0000000000..4f8b5a1146
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightning.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M282.137 304.436h-75.396l-43.248 78.006 45.127-9.479-45.161 90.322 147.667-137.529-46.779 9.811 17.79-31.131zM372.752 148.2a77.78 77.78 0 0 0 2.486-19.538c0-42.561-34.5-77.079-77.078-77.079-32 0-59.454 19.511-71.095 47.287-10.024-11.754-24.919-19.228-41.562-19.228-30.152 0-54.579 24.429-54.579 54.564 0 5.181.752 10.188 2.092 14.929-24.593 9.04-42.152 32.668-42.152 60.414 0 35.48 28.776 64.292 64.307 64.292h198.206c35.547 0 64.308-28.812 64.308-64.292 0-28.797-18.869-53.141-44.933-61.349z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-link.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-link.svg
new file mode 100644
index 0000000000..2bb9b95c01
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-link.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M270.508 338.006c-27.316.03-54.696-10.671-75.323-31.318l-3.266-3.266 46.784-46.799 3.271 3.267c8.054 8.036 18.233 11.915 28.533 11.942 10.79-.043 21.088-3.93 29.123-11.942l76.701-76.701c8.024-8.05 11.909-18.306 11.945-28.895-.036-10.495-3.915-20.722-11.936-28.769l-3.268-3.266c-8.049-8.025-18.283-11.903-28.827-11.943-10.55.04-20.785 3.918-28.835 11.943l-31.537 31.543c-12.916 12.922-33.867 12.922-46.788 0-12.924-12.919-12.924-33.867-.005-46.789l31.542-31.544c20.794-20.821 48.361-31.36 75.623-31.327 27.256-.034 54.82 10.505 75.618 31.327l3.266 3.263a106.693 106.693 0 0 1 31.319 75.561c.038 27.25-10.474 54.848-31.325 75.684l-76.704 76.7c-20.915 20.941-48.588 31.328-75.743 31.328l-.168.001zM163.966 468.393c-27.308.027-54.694-10.67-75.322-31.324l-3.264-3.26c-20.875-20.854-31.364-48.479-31.326-75.725-.033-27.27 10.556-54.782 31.326-75.518l76.704-76.707c20.794-20.821 48.361-31.366 75.623-31.327a106.798 106.798 0 0 1 61.267 19.273 33.045 33.045 0 0 1 8.42 6.119l5.931 5.93 3.266 3.263h-.001l.001.003-46.781 46.798-.005-.006-3.266-3.266c-8.052-8.024-18.285-11.903-28.832-11.943-10.545.04-20.781 3.918-28.832 11.943l-76.711 76.712c-8.021 8.048-11.901 18.261-11.935 28.726.038 10.627 3.922 20.886 11.938 28.932l3.269 3.26c8.055 8.038 18.235 11.913 28.531 11.941 10.794-.043 21.092-3.928 29.13-11.941l33.051-33.051c12.923-12.915 33.872-12.915 46.788.006 12.921 12.917 12.921 33.863 0 46.787l-33.053 33.051c-20.914 20.938-48.592 31.324-75.745 31.324h-.172z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linux-tux.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linux-tux.svg
new file mode 100644
index 0000000000..cd90e979cd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linux-tux.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M438.643 373.146c-1.897-1.469-6.736-8.403-8.47-14.782l-1.962-7.177c-3.369-12.394-13.212-21.734-25.312-24.854-.486 6.476-1.532 12.248-3.171 17.316 5.494 1.848 10.039 6.228 11.644 12.133l1.961 7.176c2.519 9.242 9.338 20.194 15.141 24.36 5.82 4.173 4.188 12.122-3.647 17.644l-53.714 38.066c-7.813 5.531-21.975 11.117-31.457 12.395l-.131.049c-.85.101-1.683.148-2.553.148-8.759 0-17.918-5.89-21.121-14.012l-2.534-6.41c-3.551-8.895-3.601-23.481-.116-32.41l17.823-45.91c-5.854-7.541-9.452-16.535-9.518-25.344.031-8.455 5.069-15.453 11.626-20.099 5.575-3.94 12.443-6.491 19.62-7.209.443-2.599.688-5.25.706-7.933.08-19.57-13.523-51.421-13.523-51.421a.447.447 0 0 1 .244-.078c3.206 0 23.12 25.685 23.25 51.5 0 2.683-.194 5.429-.588 8.176 3.483.544 6.917 1.605 10.171 3.32 2.421 1.275 3.368 4.302 2.093 6.719-.883 1.721-2.648 2.684-4.432 2.684-.784 0-1.554-.195-2.306-.555-3.434-1.816-7.39-2.682-11.51-2.682h-.065c-6.443 0-13.115 2.191-17.872 5.621-4.856 3.457-7.456 7.74-7.44 11.957-.032 6.703 3.468 15.09 9.288 21.438 5.806 6.389 13.571 10.672 21.78 10.672h.029c7.066-.031 14.457-2.678 20.294-9.384 5.84-6.703 10.317-17.824 10.335-35.367 0-4.548-.346-9.534-.998-14.929-5.135-26.195-15.877-47.89-32.949-69.209-17.315-21.669-23.822-36.091-33.911-54.843-9.497-17.677-7.488-59.271-11.46-86.954-2.779-32.752-33.881-54.268-69.329-54.268-32.047 0-58.766 20.422-58.766 65.861l.034 11.753-.034-.326s.034 2.604.05 7.393l.179 55.626c-.077 37.817-58.663 112.397-58.962 133.554-.014 1.895.116 3.71.329 5.49-7.292 2.667-13.377 8.486-16.809 16.529l-.751 1.738c-1.326 3.057-6.786 7.355-10.072 7.908l-1.832.314c-18.396 3.104-31.232 20.648-28.615 39.128l1.017 7.097c.88 6.146-.72 13.965-1.815 16.008-4.269 7.113-4.89 15.5-1.62 23.02 3.76 8.682 12.134 14.977 22.958 17.27l62.229 13.223c6.116 1.311 12.656 1.574 17.04 1.574 5.136 0 15.044-.357 23.938-2.848l.098-.031c11.362-3.158 20.634-11.809 25.277-22.465h76.945a48.134 48.134 0 0 0 1.703 5.148l2.532 6.357c5.854 14.768 21.225 25.056 37.36 25.056 1.638 0 3.271-.101 4.859-.312h.014l.084-.017h.063c12.248-1.671 29.107-8.308 39.212-15.469l53.711-38.065c9.192-6.49 14.456-15.732 14.488-25.313.033-8.249-3.893-15.809-10.76-20.745zM269.74 96.493c11.607 0 21.025 10.983 21.025 24.554 0 8.159-3.432 15.386-8.681 19.854-3.452-1.046-7.016-2.191-10.497-3.941 3.252-2.013 5.507-6.528 5.507-11.761 0-7.146-4.168-12.916-9.333-12.916-5.15 0-9.338 5.77-9.338 12.916 0 1.396.214 2.732.508 3.994-3.416-1.67-6.803-2.817-9.875-3.613a27.287 27.287 0 0 1-.378-4.532c.001-13.572 9.419-24.555 21.062-24.555zm-56.967 2.613c8.631 0 15.632 9.892 15.632 22.106 0 1.374-.117 2.714-.297 4.04-3.105.962-6.177 2.388-9.121 4.135.13-.981.211-1.958.211-2.994 0-6.833-2.993-12.373-6.688-12.373s-6.705 5.539-6.705 12.373c0 4.174 1.146 7.871 2.862 10.107a129.98 129.98 0 0 0-4.201 3.385c-4.385-3.907-7.31-10.81-7.31-18.673.001-12.214 6.983-22.106 15.617-22.106zm-14.192 57.965c3.105-1.947 6.344-4.624 10.069-7.735 7.865-6.524 18.641-15.454 27.569-15.454h.163l.112-.015h.148c1.376 0 13.622.231 23.596 7.769 6.982 5.28 14.536 7.504 20.586 9.289 8.929 2.629 10.659 3.644 11.576 6.803 2.059 6.979-11.904 15.366-19.655 17.722-5.197 1.567-8.795 4.495-11.968 7.059-4.938 4.01-9.615 7.802-23.203 7.802-11.005 0-17.578-6.341-25.196-13.669-4.414-4.201-8.927-8.571-14.42-11.379-1.178-.623-1.424-2.192-1.473-3.072-.096-2.114.803-4.318 2.096-5.12zm-10.075 285.075l-.129.049c-5.197 1.456-12.394 2.209-19.261 2.209-4.907 0-9.646-.394-13.406-1.194l-62.233-13.214c-9.059-1.942-13.539-8.355-9.977-14.275 3.565-5.914 5.398-18.261 4.104-27.418l-1.011-7.113c-1.291-9.152 5.101-17.904 14.226-19.439l1.815-.328c9.157-1.522 19.586-9.743 23.234-18.247l.749-1.732c2.109-4.954 5.82-7.557 9.83-7.557 2.876 0 5.887 1.325 8.598 4.087l46.667 47.389c6.507 6.59 12.034 19.539 12.296 28.793l.197 6.652c.262 9.256-6.786 18.853-15.699 21.338zm60.107-27.681c-4.252 0-8.666-.555-13.179-1.781a85.835 85.835 0 0 1-12.247-4.497c-.963-.782-1.849-1.765-2.763-3.074-1.847-9.105-6.019-18.704-11.416-26.178 3.159-7.786 2.161-16.794-7.273-24.347l-5.937-4.641c-22.662-13.853-34.697-26.867-41.005-37.443-6.673-11.007-6.901-19.64-6.868-22.224h.016a4.956 4.956 0 0 1 4.955-4.984c1.699 4.118.49 15.171 11.87 29.266-.212-3.089.065-6.591.752-10.419a183.86 183.86 0 0 0 1.03-4.951c8.191-33.304 40.027-85.319 35.841-100.674-2.239-8.256-3.008-14.814-2.731-20.011 9.746 8.271 19.213 21.748 37.917 21.748 25.622 0 28.043-12.23 38.066-15.256 4.235-1.295 10.104-3.955 15.253-7.669-1.65 10.969-1.026 27.194 10.237 48.45 10.726 20.189 15.37 41.304 16.482 61.789l-.134.28v21.972c-1.272 21.011-5.508 40.635-9.809 57.062-4.643 17.84-27.924 47.582-59.057 47.582zm-10.04-234.421c22.448-.1 32.538-13.979 45.863-17.482a2.682 2.682 0 0 0 1.849-3.299 2.657 2.657 0 0 0-3.302-1.863c-15.812 4.703-24.493 17.395-44.41 17.278-9.907 0-18.363-3.759-24.377-7.583a56.994 56.994 0 0 1-7.001-5.267c-1.583-1.424-2.37-2.308-2.402-2.308-.979-1.092-2.682-1.162-3.777-.162a2.68 2.68 0 0 0-.177 3.776c.209.201 15.139 16.81 37.734 16.91zm-11.525-36.693c2.616-1.124 4.398-2.777 4.022-3.674-.377-.889-2.833-.709-5.431.419-2.602 1.132-4.396 2.778-4.005 3.683.391.915 2.811.701 5.414-.428zm24.052-.749c2.843.36 5.214-.1 5.362-1.083.132-.961-2.06-2.061-4.876-2.433-2.811-.394-5.197.101-5.344 1.06-.13.983 2.061 2.06 4.858 2.456z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-list.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-list.svg
new file mode 100644
index 0000000000..78a748f1a1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-list.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M120.619 166.782V83.688h268.255v83.094H120.619zm0 131.009v-83.103h268.255v83.103H120.619zm0 130.998v-83.102h268.255v83.102H120.619z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-load.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-load.svg
new file mode 100644
index 0000000000..6f4ac6197c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-load.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M87.871 409.454v-83.1h333.74v83.1H87.871zm168.611-142.145L90.723 101.551h331.512z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-loading.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-loading.svg
new file mode 100644
index 0000000000..91372f4e34
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-loading.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M326.723 172.484V88.877H182.15v83.605c-25.638 20.956-42.013 52.819-42.015 88.522.002 35.704 16.376 67.567 42.015 88.526v75.004h144.572v-75.006c25.633-20.961 42.004-52.82 42.01-88.524-.005-35.698-16.377-67.561-42.009-88.52zm-9.173 151.641c-16.194 16.173-38.429 26.136-63.113 26.142-24.691-.006-46.929-9.969-63.119-26.142-16.172-16.199-26.136-38.432-26.142-63.12.006-24.686 9.97-46.925 26.142-63.113 16.189-16.173 38.428-26.134 63.119-26.142 24.684.008 46.918 9.969 63.113 26.142 16.173 16.188 26.138 38.428 26.142 63.113-.004 24.688-9.969 46.921-26.142 63.12zm-51.286-75.638v-46.856h-25.036l-.006 71.898h84.494v-25.042h-59.452z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-locate.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-locate.svg
new file mode 100644
index 0000000000..b6d715d2f0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-locate.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.796 37.191c-120.658.018-218.426 97.79-218.446 218.443.02 120.662 97.788 218.43 218.446 218.449 120.657-.02 218.423-97.787 218.448-218.449-.025-120.653-97.791-218.425-218.448-218.443zm22.538 369.049v-60.701h-45.073v60.701c-33.049-4.889-62.511-20.342-85.141-42.934-22.585-22.625-38.038-52.086-42.93-85.135h60.707v-45.07H104.19c4.892-33.049 20.345-62.509 42.93-85.137 22.63-22.589 52.092-38.043 85.141-42.936v60.706h45.073v-60.703c33.05 4.891 62.506 20.343 85.136 42.927 22.585 22.633 38.043 52.093 42.932 85.142h-60.7v45.07h60.7c-4.889 33.049-20.347 62.51-42.932 85.135-22.63 22.593-52.086 38.046-85.136 42.935z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-location-near-me.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-location-near-me.svg
new file mode 100644
index 0000000000..69028bf985
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-location-near-me.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M208.254 100.605a47.748 47.748 0 1 1 95.496 0 47.748 47.748 0 1 1-95.496 0zm111.965 202.933v29.496c49.871 8.225 84.32 25.722 84.32 45.99 0 28.173-66.502 51.012-148.539 51.012s-148.541-22.839-148.541-51.012c0-20.271 34.453-37.769 84.326-45.992v-29.494c-62.783 9.472-113.432 33.794-113.432 75.486 0 55.347 89.221 80.118 177.646 80.118 88.424 0 177.646-24.771 177.646-80.118.001-41.692-50.645-66.012-113.426-75.486zm3.885-127.887c0-10.661-8.643-19.303-19.303-19.303h-97.6c-10.66 0-19.305 8.642-19.305 19.303v101.103h27.568v104.638h81.074V276.754h27.564V175.651z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-location-nearby.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-location-nearby.svg
new file mode 100644
index 0000000000..884edb711b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-location-nearby.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.281 48.551c-59.443 0-107.625 48.182-107.625 107.62 0 59.44 107.625 254.112 107.625 254.112S363.9 215.612 363.9 156.171c0-59.438-48.185-107.62-107.619-107.62zm0 140.324c-18.062 0-32.705-14.641-32.705-32.704 0-18.057 14.643-32.697 32.705-32.697 18.057 0 32.697 14.641 32.697 32.697.001 18.064-14.64 32.704-32.697 32.704zm77.36 121.246c-.865 1.815-1.701 3.591-2.592 5.451a1984.393 1984.393 0 0 1-10.631 21.8c49.764 8.242 84.123 25.717 84.123 45.959 0 28.174-66.504 51.012-148.541 51.012-82.035 0-148.541-22.838-148.541-51.012 0-20.315 34.594-37.843 84.641-46.046a1923.73 1923.73 0 0 1-10.586-21.713c-.91-1.896-1.764-3.706-2.643-5.556-56.672 10.751-100.518 34.52-100.518 73.314 0 55.347 89.225 80.118 177.646 80.118 88.426 0 177.646-24.771 177.646-80.118.001-38.679-43.583-62.415-100.004-73.209z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lock.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lock.svg
new file mode 100644
index 0000000000..8f94c7cb96
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M404.84 246.573h-22.084l-.002-73.603c0-36.675-13.921-70.311-36.917-94.892-22.91-24.584-55.547-40.367-91.539-40.336-36.003-.031-68.643 15.752-91.55 40.336-23.001 24.582-36.918 58.217-36.925 94.892v73.603h-22.082c-9.16 0-16.585 7.421-16.585 16.583v194.531c0 9.158 7.425 16.585 16.585 16.585H404.84c9.162 0 16.586-7.427 16.586-16.585V263.156c0-9.161-7.424-16.583-16.586-16.583zm-218.013-73.602c0-21.167 8.012-39.893 20.468-53.219 12.552-13.316 28.896-20.982 47.003-21.007 18.095.025 34.438 7.685 46.987 21.007 12.455 13.326 20.467 32.052 20.467 53.219v73.603H186.827v-73.603z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-log-out.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-log-out.svg
new file mode 100644
index 0000000000..07c4ae9856
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-log-out.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M248.783 406.276l181.299-149.634-181.299-149.631v97.62h-91.922v104.02h91.922v97.625zm135.842 57.076v-42.624H124.541V91.271h260.084V48.649H81.918v414.703h302.707z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-logout.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-logout.svg
new file mode 100644
index 0000000000..e3eb856a9a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-logout.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M168.047 413.788l191.71-158.229-191.71-158.222v103.227H70.844v109.992h97.203v103.232zM118.912 36.985v45.068h275.021v348.378H118.912v45.07h320.092V36.985H118.912z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-loupe.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-loupe.svg
new file mode 100644
index 0000000000..ab5137dc24
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-loupe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M418.985 232.363c-.686-11.928-7.736-22.035-19.236-30.403-2.03 19.021-14.865 42.121-59.935 55.007-22.95 6.561-52.717 10.175-83.817 10.175-31.099 0-60.862-3.614-83.815-10.175-45.066-12.886-57.901-35.983-59.933-55.002-11.502 8.373-18.553 18.485-19.231 30.42L69.87 370.575v1.212c0 46.882 93.637 71.407 186.132 71.407 92.493 0 186.128-24.525 186.128-71.407v-1.212l-23.145-138.212zM256.002 414.09c-99.646 0-154.878-26.88-156.962-41.461l17.293-103.258c30.578 19.513 86.48 28.679 139.669 28.679 53.19 0 109.091-9.166 139.666-28.679l17.294 103.258c-2.088 14.581-57.315 41.461-156.96 41.461zM138.956 195.461c3.053 40.972 105.234 42.173 117.041 42.173 11.812 0 114.02-1.201 117.046-42.192l14.492-69.587c.774-2.216 1.212-4.518 1.353-6.896.03-.322.041-.644.055-.965.004-.197.033-.389.033-.586 0-.053-.007-.101-.007-.152 0-.126-.009-.252-.013-.376-.898-46.716-119.398-48.074-132.959-48.074-13.559 0-132.084 1.358-132.955 48.086-.004.118-.012.235-.016.354 0 .053-.006.105-.006.159 0 3.113.531 6.021 1.506 8.75l14.43 69.306zm117.041-96.719c30.408 0 55.061 6.019 55.061 13.44 0 7.421-24.652 13.438-55.061 13.438-30.404 0-55.055-6.018-55.055-13.438 0-7.421 24.651-13.44 55.055-13.44z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-magnet.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-magnet.svg
new file mode 100644
index 0000000000..b7c9ed6ab1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-magnet.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M437.161 277.216l-67.757-67.774-68.968 68.952v.03l-49.15 49.137c-9.517 9.438-21.289 13.899-33.748 13.979-12.394-.08-24.2-4.541-33.684-13.979-9.385-9.464-13.867-21.258-13.93-33.732.062-12.396 4.545-24.168 13.964-33.651l49.15-49.163 68.967-68.983L234.28 74.27 116.13 192.424c-28.026 28.026-42.055 64.831-42.025 101.487-.029 36.692 14.031 73.434 42.025 101.427 27.992 27.96 64.748 42.022 101.407 42.022h.033c36.656 0 73.447-14.032 101.44-42.022l118.151-118.122zm-202.88-167.679l32.474 32.493-33.716 33.746-32.505-32.505 33.747-33.734zm135.123 135.156l32.505 32.522-33.715 33.697-32.505-32.52 33.715-33.699z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mailbox.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mailbox.svg
new file mode 100644
index 0000000000..e55cdc452c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mailbox.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M386.65 57.791H123.582L34.415 288.615v163.646h441.474V286.066L386.65 57.791zm-49.703 236.625v52.578c0 13.829-11.211 25.037-25.036 25.037H198.399c-13.828 0-25.041-11.208-25.041-25.037v-52.578H83.17l73.031-189.043h197.967l73.906 189.043h-91.127z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-male-and-female.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-male-and-female.svg
new file mode 100644
index 0000000000..5ddf3b95e1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-male-and-female.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M466.371 366.898c-14.189-14.205-38.258-20.553-58.797-26.98-27.11-8.479-37.442-28.627-40.518-48.59a185.21 185.21 0 0 0 8.701-10.727c17.723 5.673 39.012 7.324 57.195-5.873-25.051-25.078-4.938-55.821-23.058-111.266-15.402-47.107-78.516-44.766-86.659-28.223-33.452-11.834-58.73 4.01-68.018 53.926-10.696 57.31 10.04 63.362-15.076 88.443 19.261 10.989 36.92 8.308 52.225 2.224a173.555 173.555 0 0 0 9.418 11.676c-3.074 19.898-13.443 39.962-40.451 48.41-20.537 6.428-44.606 12.775-58.801 26.98-11.214 11.201-3.759 38.02-3.759 38.02h271.326c.002 0 7.491-26.818-3.728-38.02zm-276.621-5.31c14.159-14.145 36.299-20.945 55.854-26.951 2.024-.617 4.022-1.24 5.981-1.863 8.243-2.567 15.078-6.475 20.536-11.72-6.536-2.783-12.981-5.512-19.162-8.048-4.446-1.209-8.96-2.435-13.471-3.676-5.362-3.682-10.597-15.942-13.475-22.043-2.878-.392-5.722-.818-8.567-1.226.457-9.437 6.277-9.944 8.567-17.151 2.029-6.343.197-14.618 3.434-20.505 1.864-3.451 5.757-4.038 8.438-6.226-.031-.494-.099-.985-.132-1.492-.816-10.367-1.863-24.198 1.345-45.322-.034-.163-.034-.311-.069-.476-.652-5.982 1.768-25.442 1.866-29.642.226-10.911-.033-11.808-2.649-22.435 0 0-3.236-9.63-8.24-12.539l-10.038-1.734-6.183-5.74c-24.986-15.352-51.733-4.564-66.092 1.239-20.634 6.691-33.683 26.912-24.557 70.131 1.538 7.39-4.088 10.689-3.697 14.714.817 8.799.983 29.97 9.288 35.188.783.477 6.671 1.96 6.638 1.568.819 8.57 1.637 17.153 2.453 25.72 2.062 5.691 7.064 6.331 8.503 14.375l-6.343 1.551c-2.881 6.101-8.145 18.361-13.509 22.043a2053.08 2053.08 0 0 1-13.472 3.676c-15.764 6.475-25.77 14.197-41.53 20.836-14.355 6.062-31.558 8.22-36.759 23.283 0 10.234-.945 34.385-.686 47.793h149.544c-1.763-7.422-6.112-31.004 6.184-43.328z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-male-symbol.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-male-symbol.svg
new file mode 100644
index 0000000000..eb91f509f5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-male-symbol.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M409.709 228.674l17.004-144.215-144.197 17.004L329.049 148l-33.665 33.682c-22.646-15.321-48.988-23.056-75.198-23.021-34.303-.035-68.853 13.177-95.015 39.355v.018c-26.193 26.16-39.404 60.695-39.374 95-.03 34.316 13.181 68.865 39.374 95.043 26.259 26.279 60.905 39.393 95.227 39.358h.148c34.224 0 68.607-13.275 94.689-39.358 26.175-26.178 39.371-60.727 39.354-95.043a134.169 134.169 0 0 0-23.021-75.182l33.665-33.65 44.476 44.472zm-248.37 5.528c16.317-16.319 37.478-24.351 58.847-24.399 21.389.048 42.561 8.08 58.881 24.399 16.284 16.318 24.326 37.474 24.377 58.831-.051 21.398-8.093 42.561-24.395 58.895-16.303 16.249-37.361 24.33-58.651 24.361-21.518-.031-42.741-8.043-59.059-24.395-16.316-16.301-24.346-37.447-24.396-58.861.05-21.389 8.079-42.513 24.381-58.831"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-alt.svg
new file mode 100644
index 0000000000..fcc39f5bb0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M457.298 457.615l-97.205-144.5a118.705 118.705 0 0 0 13.206-38.477l97.178-19.023-97.178-19.018c-8.12-50.775-48.209-90.859-98.98-98.98l-19.025-97.178-19.023 97.178a118.755 118.755 0 0 0-38.462 13.197L53.289 53.617l97.197 144.513a118.814 118.814 0 0 0-13.195 38.464l-97.184 19.021 97.184 19.023c8.119 50.773 48.205 90.854 98.98 98.978l19.021 97.179 19.02-97.179a118.788 118.788 0 0 0 38.467-13.194l144.519 97.193zM255.293 158.86c53.353 0 96.76 43.404 96.76 96.753a96.21 96.21 0 0 1-6.77 35.485l-40.984-60.923-23.543-23.566-60.934-40.982a96.18 96.18 0 0 1 35.471-6.767zm18.76 96.765c0 10.356-8.4 18.758-18.766 18.758-10.361 0-18.762-8.401-18.762-18.758 0-10.37 8.4-18.773 18.762-18.773 10.365 0 18.766 8.403 18.766 18.773zm-18.76 96.748c-53.354 0-96.755-43.408-96.755-96.76a96.172 96.172 0 0 1 6.761-35.457l40.984 60.932 23.535 23.541 60.938 40.981a96.216 96.216 0 0 1-35.463 6.763z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-location.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-location.svg
new file mode 100644
index 0000000000..ad9efb05ed
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-location.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M260.736 43.797c-60.557 0-109.646 49.088-109.646 109.646 0 60.557 109.646 258.888 109.646 258.888S370.381 214 370.381 153.443c0-60.558-49.093-109.646-109.645-109.646zm0 142.962c-18.4 0-33.317-14.915-33.317-33.316 0-18.398 14.917-33.312 33.317-33.312 18.397 0 33.312 14.914 33.312 33.312.001 18.401-14.914 33.316-33.312 33.316zm154.512 93.758h-61.913a1543.511 1543.511 0 0 1-13.472 29.104h52.711l32.672 129.477H86.754l32.672-129.477h62.184a1546.786 1546.786 0 0 1-13.473-29.104H96.752l-47.36 187.687h413.217l-47.361-187.687z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-marker.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-marker.svg
new file mode 100644
index 0000000000..a4f71dc084
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-marker.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M325.002 156.516c0-38.109-30.895-69.002-69.002-69.002s-69.002 30.893-69.002 69.002c0 33.114 23.332 60.767 54.449 67.45V408.05c-10.439 1.436-17.604 4.361-17.604 7.743 0 4.802 14.396 8.693 32.156 8.693 17.762 0 32.158-3.892 32.158-8.693 0-3.382-7.164-6.307-17.605-7.743V223.966c31.118-6.683 54.45-34.336 54.45-67.45zm-93.967-3.962c-10.697 0-19.369-8.669-19.369-19.367 0-10.694 8.672-19.364 19.369-19.364 10.695 0 19.365 8.669 19.365 19.364 0 10.698-8.67 19.367-19.365 19.367z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map.svg
new file mode 100644
index 0000000000..2c9ae42407
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M196.542 418.485l117.444 44.599V92.401L196.542 47.803v370.682zM41.22 467.958l130.275-49.473V47.803L41.22 97.272v370.686zM339.029 92.639V463.32l130.596-49.59V43.045L339.029 92.639z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medal.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medal.svg
new file mode 100644
index 0000000000..c97ccf0f32
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M291.739 214.211a132.978 132.978 0 0 0-36.604-5.145c-12.7 0-24.967 1.819-36.598 5.142V100.491h-97.792v56.525l47.555 84.365c-28.239 24.384-46.137 60.419-46.137 100.657 0 73.438 59.533 132.975 132.972 132.975 73.439 0 132.973-59.537 132.973-132.975 0-43.467-20.863-82.059-53.115-106.321l54.531-77.405v-57.821H291.74v113.72zm48.795 127.828c0 47.09-38.312 85.399-85.399 85.399-47.089 0-85.398-38.31-85.398-85.399 0-47.088 38.31-85.398 85.398-85.398 47.088 0 85.399 38.31 85.399 85.398zM83.035 36.876v38.577h344.2V36.876h-344.2zm169.227 225.523l-17.073 52.173h-54.78a3.016 3.016 0 1 0-1.78 5.456l44.327 32.292-17.078 52.456a3.03 3.03 0 0 0 1.093 3.378 3.036 3.036 0 0 0 3.548 0l44.613-32.387 44.516 32.387c.531.383 1.156.578 1.777.578s1.243-.195 1.774-.578a3.02 3.02 0 0 0 1.096-3.378l-17.079-52.452 44.422-32.296a3.018 3.018 0 0 0 1.096-3.37 3.026 3.026 0 0 0-2.87-2.086H274.99l-16.986-52.166a3.024 3.024 0 0 0-2.867-2.084c-1.306 0-2.471.84-2.875 2.077z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medical-emergency.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medical-emergency.svg
new file mode 100644
index 0000000000..0265c28988
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medical-emergency.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M270.439 138.247c-5.265-4.087-4.053-10.467-15.959-8.798 1.079 4.578 3.793 9.126 15.959 8.798zm203.178 64.29L411.318 94.736l-92.937 53.63V41.021H193.819v107.428l-93.005-53.713-62.23 107.801 93.005 53.63-93.005 53.731 62.23 107.881 93.005-53.73v107.429h124.562V364.133l92.937 53.646 62.299-107.881-93.04-53.646 93.04-53.715zM265.796 92.396l-.522 24.562c-1.864-.458-3.762-.739-5.691-.739-.621 0-1.273.038-1.896.101a83.98 83.98 0 0 0-10.66 1.7l-.557-25.624h19.326zm-56.378 80.156c-1.209-14.602 5.166-28.095 16.25-37.184 8.702-7.161 21.618-10.89 32.706-11.903.392-.048.815-.063 1.208-.063 9.615 0 20.665 9.676 26.063 16.873 4.773 6.344 6.571 12.887 3.957 14.532-2.617 1.656-6.737 4.665-9.255 6.657-1.471 1.208-3.14 1.651-4.938 1.651-3.074 0-6.443-1.324-9.747-2.63-3.303-1.34-6.507-2.65-9.22-2.65h-.426c-8.143.46-14.846 4.314-16.418 12.491-.291 1.604.296 3.634 1.505 5.903l.884 39.719c-13.341-8.995-27.532-18.87-32.569-43.396zm53.335 59.73l-.228 10.693c-1.896.914-4.087 1.844-5.822 2.599-2.091.882-4.445 1.88-6.833 3.009l-.718-32.672v-.127l-.852-39.704-.032-.031-.163-7.652c1.635-2.026 4.35-3.205 8.306-3.4 1.309 0 4.055 1.113 6.279 2.027l.294.101c.391.162.784.307 1.177.452l-.751 35.743s-.035.022-.035.037l-.621 28.871-.001.054zm-10.137 142.593v-.064l-.197-8.438v-.062l-.161-7.23c2.156-.981 5.199-1.997 7.783-2.811l-.491 22.271v.064l-.163 6.326c0 .015.03.046.03.085l-.358 16.116a55.844 55.844 0 0 1-1.732 1.686 138.445 138.445 0 0 0-4.022 4.055l-.689-31.998zm5.693 60.876h-4.351l-.396-17.593c.197.144.362.308.591.439l1.767 1.061c.851.523 1.799.771 2.715.903l-.326 15.19zm1.337-22.207l-1.766-1.062c6.441-7.146 14.324-11.625 12.396-20.571-.426-2.794-1.767-5.001-3.696-6.833l.164-6.31c3.989 3.025 7.13 7.043 7.588 12.753 1.635 11.118-9.484 17.038-14.686 22.023zm26.85-86.542c-1.735 14.664-15.73 18.342-23.087 20.765-8.308 2.583-17.758 4.886-20.146 9.907-1.504 3.417-.523 6.329 2.028 8.847l.165 8.456c-2.029-.983-3.991-2.192-5.92-4.04-4.122-4.136-5.986-10.431-3.859-16.22 5.918-11.761 16.809-12.773 24.328-16.496 15.797-4.976 18.675-14.868 8.012-19.002l.299-14.158c3.3 1.078 6.701 2.481 10.135 4.899 5.201 3.027 9.19 10.927 8.045 17.042zm-25.638-7.9l-.229 11.266c-.852.342-1.768.686-2.781 1.013-.358.116-.72.249-1.013.412-1.439.704-3.237 1.357-5.1 2.061l-.428-20.032v-.063l-.426-19.392c0-.031-.032-.053-.032-.084l-.162-7.146c.26-.359.489-.704.685-.982a.768.768 0 0 0 .198-.289c1.272-1.964 5.329-3.372 10.104-4.938l-.523 23.932v.07l-.293 14.127v.045zm31.099-64.207c-18.051 20.897-39.797 17.007-46.369 27.045-3.371 4.626-4.059 8.941-1.899 12.553l.458 19.43c-4.087-1.475-8.207-3.762-12.033-7.604-9.452-9.682-8.146-25.752-1.08-35.306 16.09-19.081 39.078-18.933 42.416-28.402 2.418-5.836 2.386-5.081-1.375-8.645a33.909 33.909 0 0 0-2.156-1.557l.619-28.889c5.298 3.17 11.478 6.67 17.853 12.506 4.284 3.978 9.354 10.905 9.717 19.328.192 8.386-2.195 14.175-6.151 19.541z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medicine.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medicine.svg
new file mode 100644
index 0000000000..1e2cb6aeef
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medicine.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M364.93 220.525l-14.911-31.263c-2.551-5.43-9.846-21.996-17.464-39.473H179.021c-7.62 17.477-14.913 34.043-17.463 39.473l-14.914 31.263c-6.181 12.981-11.248 35.385-11.248 49.785v181.332c0 13.358 10.825 24.165 24.167 24.165H351.98c13.373 0 24.167-10.807 24.167-24.165V270.311c-.001-14.401-5.036-36.804-11.217-49.786zm-27.438 122.4h-55.233v55.252H229.35v-55.252h-55.27v-52.911h55.27v-55.25h52.909v55.25h55.233v52.911zm15.731-282.066c0-13.362-10.794-24.181-24.135-24.181H182.486c-13.346 0-24.169 10.819-24.169 24.181v63.996h194.905V60.859z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-meeting.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-meeting.svg
new file mode 100644
index 0000000000..09af0d97c2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-meeting.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.607 143.279c17.742 0 32.18-14.437 32.18-32.178 0-17.745-14.438-32.179-32.18-32.179-17.744 0-32.18 14.434-32.18 32.179.001 17.742 14.436 32.178 32.18 32.178zm152.649 105.422c17.742 0 32.18-14.437 32.18-32.178 0-17.742-14.438-32.179-32.18-32.179-17.744 0-32.178 14.437-32.178 32.179 0 17.742 14.434 32.178 32.178 32.178zm-304.514 0c17.744 0 32.18-14.437 32.18-32.178 0-17.742-14.436-32.179-32.18-32.179s-32.178 14.437-32.178 32.179c0 17.742 14.434 32.178 32.178 32.178zm208.426-66.502c0-8.763-7.104-15.864-15.865-15.864h-80.215c-8.762 0-15.865 7.102-15.865 15.864v27.942h111.945v-27.942zm79.529 96.623c-.961 0-1.871.194-2.736.479l44.654 92.566v-84.244c0-4.855-3.949-8.802-8.803-8.802h-33.115zm-313.316 8.802v81.568l44.439-89.961c-.805-.241-1.639-.409-2.521-.409H87.186c-4.854 0-8.805 3.947-8.805 8.802zm93.197-53.935L73.09 433.077h126.545v-42.038c0-8.761 7.104-15.867 15.865-15.867h80.215c8.762 0 15.865 7.106 15.865 15.867v42.038h125.418l-96.186-199.388H171.578zm84.029 118.426c-17.744 0-32.18-14.432-32.18-32.175 0-17.742 14.436-32.177 32.18-32.177 17.742 0 32.18 14.435 32.18 32.177 0 17.744-14.437 32.175-32.18 32.175z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-megaphone.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-megaphone.svg
new file mode 100644
index 0000000000..25387c9357
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-megaphone.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M217.078 387.634l-53.529-14.348V326.21l-29.798-9.177v67.681l11.042 14.392 78.067 20.928 17.97-9.619 18.492-54.707-28.486-8.773zM401.997 92.027a9.115 9.115 0 0 0-.702-.039c-.117-.004-.229-.022-.348-.022-.142 0-.278.022-.419.025-.234.006-.468.019-.701.038-5.167.185-9.999 1.625-14.493 4.152l-308.597 95.05c-17.54 2.201-24.863 14.503-24.863 40.912 0 26.41 7.323 38.712 24.863 40.914l308.597 95.049c4.818 2.711 10.015 4.213 15.608 4.215h.005c38.851 0 59.179-70.519 59.179-140.178 0-69.021-19.969-138.844-58.129-140.116zm-1.05 254.711c-11.402 0-33.597-40.447-33.597-114.595 0-74.146 22.194-114.593 33.597-114.593s33.595 40.446 33.595 114.593c0 74.148-22.192 114.595-33.595 114.595z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-merge.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-merge.svg
new file mode 100644
index 0000000000..57ac52511a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-merge.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M397.824 384.982L297.037 284.198c-.523-.329-3.53-4.546-5.312-9.093-1.915-4.346-2.748-9.323-2.667-10.105v-71.52h57.244L256.357 79.484 166.426 193.48h56.738v71.455c.116.59-.718 5.722-2.682 10.202-1.766 4.515-4.788 8.731-5.297 9.061L114.398 384.982l46.583 46.601 95.131-95.128 95.112 95.128 46.6-46.601z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message-open.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message-open.svg
new file mode 100644
index 0000000000..98aaeeeb64
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message-open.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.521 409.886L37.191 224.103v252.453h436.665V224.099z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message-unopened.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message-unopened.svg
new file mode 100644
index 0000000000..e29ecbf60d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message-unopened.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M49.523 126.83v258.34h412.953V126.83H49.523zm244.02 185.5H148.277v-23.678h145.266v23.678zm0-55.975H148.277v-23.678h145.266v23.678zM424.5 215.176h-50.371v-50.371H424.5v50.371z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message.svg
new file mode 100644
index 0000000000..75785c1896
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M470.164 118.645H42.296l212.806 182.021 215.062-182.021zM255.018 333.541L36.735 146.834v245.924H473.4V148.704L255.018 333.541z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-microscope.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-microscope.svg
new file mode 100644
index 0000000000..9985552be3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-microscope.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M345.877 223.204l-63.098 63.098-21.219-21.219 63.098-63.098zm-8.121 206.65v-27.881h-40.945v-41.887c24.939-4.439 47.91-16.326 66.199-34.614l18.123-18.124-50.988-50.992-36.252 36.25 11.518 11.516c-9.52 4.378-19.957 6.68-30.748 6.68-19.68 0-38.182-7.662-52.098-21.579-28.639-28.641-28.717-75.187-.246-103.935l29.867 29.867 36.248-36.25-126.77-126.768-36.248 36.25 60.65 60.649c-48.455 48.739-48.379 127.806.248 176.437 16.574 16.573 36.99 27.889 59.232 33.175v43.326h-50.723v27.881h-48.828v30.009h240.586v-30.009h-48.825zM46.553 242.624"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mindmap.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mindmap.svg
new file mode 100644
index 0000000000..043927014b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mindmap.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M449.337 362.335h-35.842v-.555c-.065-15.959-5.492-31.639-13.781-45.459-8.39-13.799-19.755-25.882-33.815-33.371l-62.036-32.62c-7.602-3.941-15.957-12.211-21.845-22.086-6.001-9.797-9.435-21.077-9.386-29.595v-48.793h38.899c15.598 0 28.257-12.673 28.257-28.274V55.955c0-15.6-12.659-28.274-28.257-28.274H203.108c-15.613 0-28.271 12.674-28.271 28.274v65.627c0 15.601 12.658 28.274 28.271 28.274h38.884v48.793c.063 8.518-3.387 19.782-9.37 29.595-5.886 9.859-14.242 18.161-21.86 22.086l-62.035 32.62c-14.08 7.489-25.442 19.572-33.829 33.371-8.061 13.439-13.359 28.668-13.703 44.15H62.246c-15.632 0-28.271 12.654-28.271 28.252v65.635c0 15.615 12.64 28.267 28.271 28.267h108.407c15.614 0 28.286-12.651 28.286-28.267v-65.635c0-15.598-12.672-28.252-28.286-28.252h-38.835c.265-8.387 3.648-18.988 9.32-28.301 5.887-9.883 14.24-18.184 21.846-22.092l62.067-32.638c13.228-7.033 24.038-18.182 32.262-30.968 8.224 12.787 19.014 23.935 32.258 30.968l62.053 32.638c7.618 3.924 15.959 12.209 21.845 22.092 6.001 9.791 9.468 21.056 9.385 29.609v.555h-41.905c-15.615 0-28.272 12.654-28.272 28.269v65.634c0 15.602 12.657 28.253 28.272 28.253h108.389c15.63 0 28.287-12.651 28.287-28.253v-65.634c-.001-15.614-12.658-28.268-28.288-28.268z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mobile.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mobile.svg
new file mode 100644
index 0000000000..92532b8005
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mobile.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M360.199 36.871H149.281c-11.748 0-21.271 9.523-21.271 21.272v394.638c0 11.748 9.523 21.275 21.271 21.275h210.918c11.746 0 21.276-9.527 21.276-21.275V58.144c.001-11.75-9.53-21.273-21.276-21.273zM209.638 442.674h-46.302v-46.301h46.302v46.301zm0-68.079h-46.302V328.29h46.302v46.305zm69.599 68.079h-46.302v-46.301h46.302v46.301zm0-68.079h-46.302V328.29h46.302v46.305zm-44.276-80.341c0-10.939 8.869-19.809 19.807-19.809s19.803 8.869 19.803 19.809-8.865 19.807-19.803 19.807-19.807-8.868-19.807-19.807zm112.951 148.42H301.61v-46.301h46.302v46.301zm0-68.079H301.61V328.29h46.302v46.305zm0-109.27H163.336V70.915h184.576v194.41z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-molecular-network.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-molecular-network.svg
new file mode 100644
index 0000000000..20d87126aa
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-molecular-network.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M429.72 139.691c-24.298-9.315-51.538 2.832-60.925 27.114l-33.846-1.161c-6.801-25.133-32.046-40.992-57.881-35.648a52.422 52.422 0 0 0-4.843 1.262l-15.333-19.048c4.479-9.242 5.395-20.162 1.635-30.575-7.359-20.393-29.86-30.954-50.265-23.565-20.405 7.378-30.936 29.874-23.576 50.266 6.736 18.571 25.997 28.939 44.768 25.078l15.467 19.134c-6.409 10.414-9.091 23.153-6.409 36.071 2.125 10.381 7.39 19.289 14.553 26.029L235.21 244.21c-7.164-2.65-14.913-4.087-22.991-4.087-11.118 0-21.517 2.716-30.705 7.521l-19.196-20.797c8.763-15.358 10.397-34.502 2.746-51.935-12.819-29.167-46.895-42.443-76.065-29.593-29.169 12.821-42.444 46.862-29.626 76.03 12.852 29.205 46.863 42.45 76.063 29.631.458-.217.95-.427 1.406-.653l19.164 20.764c-6.508 10.268-10.269 22.436-10.269 35.479a66.297 66.297 0 0 0 9.549 34.353l-24.951 21.747c-6.215-3.713-13.245-6.227-20.897-7.044-28.253-3.045-53.597 17.41-56.64 45.649-3.009 28.254 17.398 53.596 45.653 56.64 28.254 3.01 53.599-17.412 56.606-45.649.882-7.996-.198-15.718-2.746-22.81l28.124-24.51c9.45 5.166 20.273 8.09 31.784 8.09 19.687 0 37.412-8.581 49.579-22.217l45.422 21.765c-.949 12.667 3.434 25.666 13.209 35.298 17.594 17.348 45.945 17.151 63.278-.46 17.396-17.591 17.168-45.961-.425-63.31-16.612-16.364-42.774-17.115-60.236-2.354l-45.717-21.906c.85-4.288 1.342-8.735 1.342-13.281 0-16.039-5.69-30.736-15.142-42.233l21.877-36.2c3.826.131 7.785-.126 11.71-.945 15.693-3.238 28.088-13.604 34.597-26.999l37.377 1.258c4.773 11.761 14.125 21.585 26.914 26.457 24.362 9.323 51.669-2.892 60.956-27.255 9.318-24.386-2.881-51.673-27.24-60.963z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-molecular.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-molecular.svg
new file mode 100644
index 0000000000..904e0976c3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-molecular.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M409.809 304.006a64.816 64.816 0 0 0-42.807 16.084l-58.209-33.338c.23-2.123.393-4.298.393-6.491 0-5.624-.85-11.056-2.418-16.155l34.891-20.225c9.517 9.928 22.893 16.169 37.738 16.169 28.844 0 52.225-23.378 52.225-52.239 0-28.82-23.381-52.209-52.225-52.209-28.875 0-52.224 23.389-52.224 52.209 0 5.154.751 10.094 2.156 14.797l-35.024 20.273c-5.131-5.408-11.312-9.773-18.311-12.717v-64.473c25.539-8.795 43.916-33.011 43.916-61.525 0-35.938-29.163-65.082-65.107-65.082-35.908 0-65.043 29.145-65.043 65.082 0 28.515 18.346 52.73 43.854 61.513v64.485c-6.541 2.777-12.461 6.803-17.363 11.79l-34.176-19.573c1.309-4.625 2.094-9.519 2.094-14.57 0-28.82-23.412-52.209-52.227-52.209-28.842 0-52.223 23.389-52.223 52.209 0 28.861 23.381 52.239 52.223 52.239 14.916 0 28.355-6.31 37.871-16.351l33.453 19.168a55.547 55.547 0 0 0-2.812 17.394c0 2.292.131 4.534.424 6.741l-56.802 32.894c-11.413-9.906-26.292-15.89-42.579-15.89-35.938 0-65.074 29.104-65.074 65.058 0 35.959 29.137 65.062 65.074 65.062 35.939 0 65.078-29.103 65.078-65.062 0-4.265-.457-8.448-1.21-12.492l56.737-32.88c6.378 4.807 13.799 8.24 21.912 9.877v36.162c-22.861 5.533-39.896 26.086-39.896 50.691 0 28.846 23.381 52.224 52.223 52.224 28.845 0 52.191-23.378 52.191-52.224 0-24.605-17.004-45.158-39.895-50.691v-36.884a54.152 54.152 0 0 0 19.098-9.317l58.175 33.322a65.3 65.3 0 0 0-1.144 12.212c0 35.959 29.136 65.062 65.043 65.062 35.939 0 65.078-29.103 65.078-65.062 0-35.955-29.139-65.058-65.078-65.058z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mountain.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mountain.svg
new file mode 100644
index 0000000000..a21324f819
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mountain.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M349.24 82.018L263.903 306.91 378.1 429.645h94.557L349.24 82.018zM38.835 429.645h305.202L141.225 211.646 38.835 429.645z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mouse-cursor.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mouse-cursor.svg
new file mode 100644
index 0000000000..b64dd7f88b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mouse-cursor.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M266.384 294.779l90.394 10.395L161.812 62.637l-6.531 311.402 8.748-8.464 57.315-55.47 44.009 122.979c3.482 9.718 12.623 15.785 22.396 15.779 2.664 0 5.376-.452 8.011-1.394 9.714-3.492 15.78-12.63 15.772-22.396 0-2.665-.451-5.378-1.392-8.016l-43.756-122.278z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mouse.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mouse.svg
new file mode 100644
index 0000000000..f063df5259
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mouse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M278.46099999999996 99.76c-6.994-35.505-38.273-62.273-75.833-62.279h-57.224v25.04l57.224-.004c23.524.045 43.377 15.568 49.95 36.934-50.645 5.814-89.981 48.804-89.981 101.007v45.183l.201-.157c.004-.006.043.052.286.346.242.286.627.735 1.155 1.333a100.182 100.182 0 0 0 4.873 5.048c4.374 4.237 10.963 9.963 19.639 15.684 17.383 11.446 42.908 22.846 76.217 22.854 62.378.052 97.146-35.215 101.032-39.379v-50.91c0-51.362-38.079-93.807-87.539-100.7zm3.342 96.201c0 9.67-7.836 17.507-17.504 17.507-9.668 0-17.504-7.837-17.504-17.507v-29.213c0-9.667 7.835-17.505 17.504-17.505 9.668 0 17.504 7.838 17.504 17.505v29.213zm-102.7 86.565a156.085 156.085 0 0 1-16.506-12.527v103.806c0 56.172 45.532 101.707 101.703 101.707 56.168 0 101.701-45.535 101.701-101.707v-99.008c-17.406 13.537-51.398 33.427-101.032 33.481-37.403 0-66.404-12.903-85.866-25.752z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-movie-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-movie-alt.svg
new file mode 100644
index 0000000000..1878dc9ec0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-movie-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M64.747 164.338l50.079 50.078-50.079 50.08zm73.929 49.973l-73.929 73.93v163.072h389.679V214.311h-315.75zM372.615 373.82H156.151v-25.039h216.464v25.039zm.002-57.522H156.156v-25.034h216.461v25.034zm76.096-172.936l-15.129-82.466h-.002L56.346 130.111l72.025 72.025 320.342-58.774zM407.25 81.001l21.574 37.223 2.398 13.07-46.038 8.449-28.657-49.435 50.723-9.307zm-103.652 19.02l28.655 49.435-50.724 9.306-28.656-49.433 50.725-9.308zm-103.653 19.015l28.656 49.437-50.723 9.304-28.655-49.433 50.722-9.308z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-movie.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-movie.svg
new file mode 100644
index 0000000000..d5b3481a83
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-movie.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M83.53 63.63v384.462h342.308V63.63H83.53zm54.119 359.738H100.92V386.64h36.729v36.728zm0-74.567H100.92v-36.734h36.729v36.734zm0-77.679H100.92v-36.731h36.729v36.731zm0-74.571H100.92V159.82h36.729v36.731zm0-71.47H100.92V88.35h36.729v36.731zM349.717 406.03H159.651V275.408h190.065V406.03zm0-169.717H159.651V105.691h190.065v130.622zm58.729 187.055h-36.729V386.64h36.729v36.728zm0-74.567h-36.729v-36.734h36.729v36.734zm0-77.679h-36.729v-36.731h36.729v36.731zm0-74.571h-36.729V159.82h36.729v36.731zm0-71.47h-36.729V88.35h36.729v36.731z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-multiple-credit-cards.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-multiple-credit-cards.svg
new file mode 100644
index 0000000000..1330826784
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-multiple-credit-cards.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M151.441 322.712h52.438v13.996h-52.438zm62.463 0h68.355v13.996h-68.355zm-62.463 21.44h140.832v13.99H151.441zm297.065-177.674h-35.428v-41.951c0-8.758-7.607-15.861-16.996-15.861H63.494c-9.387 0-16.996 7.104-16.996 15.861v205.15c0 8.754 7.609 15.848 16.996 15.848h35.428v41.963c0 8.751 7.607 15.846 16.998 15.846h332.586c9.389 0 16.996-7.095 16.996-15.846V182.339c0-8.762-7.607-15.861-16.996-15.861zM98.922 182.339V317.11H74.914V137.082h309.75v29.396H115.92c-9.391 0-16.998 7.099-16.998 15.861zM440.318 378.15H124.107v-81.535h316.211v81.535zm0-148.652H124.107v-37.836h316.211v37.836z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-multiple-windows.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-multiple-windows.svg
new file mode 100644
index 0000000000..c8b3ac5669
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-multiple-windows.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M342.261 186.492H61.814c-6.905 0-12.507 5.6-12.507 12.51v234.432H354.77V199.002c.001-6.91-5.599-12.51-12.509-12.51zm-13.537 220.895H75.354V250.168h253.369v157.219zM450.182 78.566H169.739c-6.91 0-12.51 5.602-12.51 12.512v71.734h26.047v-20.566h253.369v157.221h-62.654v26.045h88.701V91.078c0-6.91-5.599-12.512-12.51-12.512z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-music.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-music.svg
new file mode 100644
index 0000000000..87f4ba36a6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-music.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M416.672 50.64L187.203 87.86l.035 275.978c-12.004-4.206-26.398-4.981-41.04-1.319-32.527 8.135-53.833 34.966-47.59 59.924 6.247 24.959 37.676 38.595 70.213 30.446 28.581-7.15 48.497-28.749 48.663-50.819l.031-.005V181.497l168.869-26.476V325.6c-12.172-4.319-26.801-5.139-41.691-1.415-32.869 8.226-54.406 35.34-48.094 60.556 6.314 25.227 38.076 39.003 70.951 30.779 29.951-7.495 50.473-30.668 49.121-53.804V50.64z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-name-badge.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-name-badge.svg
new file mode 100644
index 0000000000..22f66c9234
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-name-badge.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M405.561 188.146v24.149H107.452v-24.149H38.566V441.75h435.88V188.146h-68.885zm-193.759 191.01c-3.171-3.893-9.025-4.922-14.077-7.062-6.771-2.876-14.275-6.162-21.044-8.945-1.93-.522-3.827-1.046-5.737-1.568-2.324-1.601-4.581-6.866-5.807-9.454-1.242-.194-2.468-.359-3.662-.553.163-4.02 2.681-4.251 3.662-7.357.852-2.699.1-6.248 1.439-8.766.98-1.75 3.106-1.766 4.201-3.27.966-1.373 1.621-3.729 1.915-5.412.604-3.059 1.046-7.241-.361-10.252-.849-1.732-1.387-1.896-1.619-4.025-.245-2.55.77-10.888.801-12.7.131-4.694 0-8.944-1.11-13.471 0 0-1.407-4.141-3.548-5.382l-4.301-.75-2.683-2.471c-10.693-6.575-22.187-1.965-28.287.539-8.86 2.876-14.518 15.371-10.593 33.945.685 3.136-1.735 4.541-1.538 6.279.327 3.791.426 12.85 3.957 15.071.328.233 2.845.883 2.845.688.376 3.664.687 7.361 1.063 11.021.866 2.457 3.009 2.73 3.663 6.18l-2.731.686c-1.242 2.588-3.499 7.854-5.821 9.454-1.914.522-3.859 1.046-5.789 1.568-6.72 2.783-14.226 6.069-20.993 8.945-4.58 1.912-9.795 2.942-13.114 5.937V257.755h129.269v121.401zm152.064-10.398H246.663v-24.899h117.203v24.899zm68.346-62.686H246.663v-24.906h185.549v24.906zm-51.407-176.494h-67.986c.081-1.226.162-2.466.162-3.712-.033-30.788-24.951-55.721-55.755-55.721-30.772 0-55.725 24.933-55.725 55.721 0 1.247.051 2.487.131 3.712h-69.066v57.771h248.239v-57.771zM256.703 150.95c-13.866 0-25.083-11.216-25.101-25.084.018-13.863 11.235-25.08 25.101-25.08 13.833 0 25.049 11.217 25.065 25.08-.016 13.868-11.233 25.084-25.065 25.084z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-bottom.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-bottom.svg
new file mode 100644
index 0000000000..eeb3e79bdc
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-bottom.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M419.598 113.003H85.734L252.662 324.59l166.936-211.587zM90.395 332.234v66.172h332.542v-66.172H90.395z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-down.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-down.svg
new file mode 100644
index 0000000000..007e8dd8ff
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.125 361.35L88.193 149.765h333.862z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-first.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-first.svg
new file mode 100644
index 0000000000..85d44722ee
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-first.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M186.178 256.243l211.583 166.934V89.312L186.178 256.243zm-73.826 166.269h66.179V89.975h-66.179v332.537z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-horizontal.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-horizontal.svg
new file mode 100644
index 0000000000..4988e723eb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-horizontal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M475.189 255.305l-89.517-73.889v48.204h-261.62v-48.204l-89.519 73.885 89.519 73.89v-48.209h261.62v48.209z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-last.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-last.svg
new file mode 100644
index 0000000000..53f70d36fd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-last.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M111.708 424.514l211.581-166.927L111.708 90.654v333.86zM330.935 87.311v332.544h66.173V87.311h-66.173z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-left.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-left.svg
new file mode 100644
index 0000000000..56cdecce10
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M148.584 255.516L360.168 88.583l-.002 333.862z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-right.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-right.svg
new file mode 100644
index 0000000000..251b6934d3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M360.124 255.513L148.535 422.442l.002-333.862z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-road.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-road.svg
new file mode 100644
index 0000000000..f05567099f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-road.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M214.496 188.216h83.486l-3.89-46.45h70.992l-108.827-56.36-108.866 56.36h70.995l-3.89 46.45zm93.787 122.225l-5.917-70.51H210.18l-5.954 70.51h-97.644l149.676 116.095 149.676-116.095h-97.651z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-top.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-top.svg
new file mode 100644
index 0000000000..c932714737
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-top.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.567 187.177L89.633 398.762h333.861L256.567 187.177zm162.265-73.818H86.29v66.173h332.542v-66.173z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-up.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-up.svg
new file mode 100644
index 0000000000..612ec9193e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.104 149.836l166.933 211.585H88.168z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-vertical.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-vertical.svg
new file mode 100644
index 0000000000..fbe3906472
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-vertical.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M281.194 124.49h48.21L255.52 34.973l-73.889 89.517h48.205v261.625h-48.201l73.885 89.519 73.884-89.519h-48.21z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation.svg
new file mode 100644
index 0000000000..67d9c2a0c2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M475.296 255.305l-89.521-73.889v48.204H280.648V124.49h48.206L254.97 34.973l-73.888 89.517h48.202v105.13H124.156v-48.204l-89.518 73.885 89.518 73.89v-48.209h105.128v105.133h-48.199l73.885 89.519 73.884-89.519h-48.206V280.982h105.127v48.209z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigational-arrow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigational-arrow.svg
new file mode 100644
index 0000000000..bf60bde293
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigational-arrow.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.303 372.245L89.721 455.097 256.303 56.825l166.581 398.272z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-network-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-network-alt.svg
new file mode 100644
index 0000000000..e6b2c25036
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-network-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M474.1 148.041V38.18H364.224v38.95h-6.702c-17.723.078-35.416 6.147-50.984 15.499-15.565 9.447-29.139 22.271-37.475 37.934l-37.479 71.227c-4.74 9.22-14.551 19.031-26.16 25.976-11.576 7.052-24.785 11.17-35.156 11.07h-23.217V199.27H37.205v109.877h109.846V269.48h23.217c10.371-.053 23.58 4.051 35.156 11.087 11.609 6.966 21.42 16.771 26.16 25.961l37.479 71.251c8.336 15.663 21.909 28.479 37.475 37.934 15.568 9.354 33.262 15.399 50.984 15.501h6.702v42.248H474.1V363.584H364.224v36.956h-6.702c-10.369.065-23.576-4.024-35.156-11.052-11.609-6.964-21.418-16.778-26.16-26l-37.479-71.213c-4.512-8.473-10.595-16.061-17.592-22.795h123.089v39.665H474.1V199.269H364.224v39.566H241.135c6.997-6.701 13.111-14.31 17.592-22.793l37.479-71.189c4.742-9.22 14.551-19.031 26.16-25.966 11.58-7.062 24.787-11.181 35.156-11.085h6.702v40.239H474.1z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-newspaper-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-newspaper-alt.svg
new file mode 100644
index 0000000000..1bcf422c64
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-newspaper-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M174.228 247.824h60.975v60.975h-60.975zm0-115.391h228.379v75.56H174.228zm100.767 114.916h127.611v25.403H274.995zm0 55.405h127.611v25.402H274.995zm0 51.189h127.611v25.404H274.995zM114.163 70.231V122.705H50.306v271.89c0 26.013 21.16 47.174 47.168 47.174h317.047c26.012 0 47.174-21.161 47.174-47.174V70.231H114.163zm0 324.364c0 9.201-7.486 16.686-16.689 16.686-9.197 0-16.682-7.484-16.682-16.686V153.191h33.371v241.404zm317.043 0c0 9.201-7.484 16.686-16.686 16.686H141.603a46.928 46.928 0 0 0 3.049-16.686V100.718h286.555v293.877z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-newspaper.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-newspaper.svg
new file mode 100644
index 0000000000..d585513f28
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-newspaper.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M114.162 70.231v25.217h.025v74.837h-.025v224.311c0 9.199-7.486 16.685-16.688 16.685-9.199 0-16.684-7.486-16.684-16.685V153.191h20.693v-30.487H50.307v271.892c0 26.01 21.156 47.173 47.168 47.173H414.52c26.012 0 47.174-21.163 47.174-47.173V70.231H114.162zM219.5 307.048h-60.973v-60.973H219.5v60.973zm199.143 72.299H256.049v-25.404h162.594v25.404zm0-51.188H256.049v-25.404h162.594v25.404zm0-55.408H256.049v-25.403h162.594v25.403zm1.697-74.23H160.223v-75.56H420.34v75.56z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-next-media.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-next-media.svg
new file mode 100644
index 0000000000..57d4c8e0e3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-next-media.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.88 256.048L42.096 380.525V131.568zm210.519 0L252.614 380.525V131.568z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-next.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-next.svg
new file mode 100644
index 0000000000..b00b37dd17
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-next.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M397.727 255.63l-286.7 166.932V88.697z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-nodes.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-nodes.svg
new file mode 100644
index 0000000000..e912e52d15
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-nodes.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M409.269 328.537v-87.092h-87.09c-6.66-30.424-33.752-53.207-66.178-53.207-32.428 0-59.52 22.783-66.18 53.207h-57.98v-57.984c30.426-6.66 53.207-33.75 53.207-66.18 0-37.422-30.338-67.758-67.762-67.758s-67.764 30.336-67.764 67.758c0 32.43 22.783 59.52 53.209 66.18v87.092h87.09c6.662 30.428 33.752 53.209 66.18 53.209 32.426 0 59.516-22.781 66.178-53.209h57.98v57.984c-30.426 6.66-53.207 33.75-53.207 66.176 0 37.424 30.338 67.764 67.762 67.764s67.764-30.34 67.764-67.764c0-32.426-22.784-59.516-53.209-66.176zM78.628 117.281c0-21.312 17.342-38.652 38.658-38.652s38.656 17.34 38.656 38.652c0 21.316-17.34 38.66-38.656 38.66s-38.658-17.343-38.658-38.66zm177.373 177.375c-21.316 0-38.656-17.344-38.656-38.658s17.34-38.652 38.656-38.652c21.314 0 38.654 17.338 38.654 38.652s-17.34 38.658-38.654 38.658zm138.713 138.713c-21.316 0-38.656-17.342-38.656-38.656s17.34-38.652 38.656-38.652c21.314 0 38.658 17.338 38.658 38.652s-17.344 38.656-38.658 38.656z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-notepad-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-notepad-alt.svg
new file mode 100644
index 0000000000..bca4d0c462
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-notepad-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M115.059 58.964v300.769l6.934 6.935 79.432 79.434 6.934 6.936h188.582V58.964H115.059zM239.34 429.356c-35.182 0-18.229-83.392-18.229-83.392s-21.539 5.233-42.586 5.233c-19.859 0-39.279-4.656-39.789-22.76v-181.92H373.26v282.838H239.34zm1.859-46.361h108.805v-23.679H243.236c-1.189 7.997-1.871 16.24-2.037 23.679zm-78.359-85.904h187.164v23.679H162.84zm0-124.45h187.164v23.679H162.84zm0 62.225h187.164v23.68H162.84z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-notepad.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-notepad.svg
new file mode 100644
index 0000000000..5fc428082e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-notepad.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M376.957 61.932v22.413c2.908 4.715 4.618 10.252 4.618 16.197 0 17.088-13.852 30.935-30.935 30.935-17.084 0-30.928-13.847-30.928-30.935 0-5.945 1.705-11.479 4.613-16.191V61.932H282.6v22.413c2.91 4.715 4.619 10.252 4.619 16.197 0 17.088-13.852 30.935-30.935 30.935-17.084 0-30.929-13.847-30.929-30.935 0-5.945 1.707-11.479 4.613-16.191V61.932h-41.725v22.413c2.909 4.715 4.62 10.252 4.62 16.197 0 17.088-13.853 30.935-30.934 30.935-17.086 0-30.931-13.847-30.931-30.935 0-5.945 1.708-11.479 4.614-16.191V61.932h-28.687v306.159l7.333 7.333 91.326 91.328h199.412V61.932h-28.039zm3.002 379.781H238.347c-37.202 0-19.276-88.181-19.276-88.181s-86 20.901-87.105-18.534v-179.96h247.993v286.675zm-21.804-207.87H159.513v30.774h198.642v-30.774zm0-51.786H159.513v30.777h198.642v-30.777zm0 103.566H159.513v30.774h198.642v-30.774zm-7.51-167.054c8.502 0 15.396-6.897 15.396-15.4V60.148c0-8.503-6.895-15.396-15.396-15.396-8.506 0-15.399 6.894-15.399 15.396v43.021c-.001 8.503 6.893 15.4 15.399 15.4zm-188.712 0c8.502 0 15.397-6.897 15.397-15.4V60.148c0-8.503-6.895-15.396-15.397-15.396-8.504 0-15.398 6.894-15.398 15.396v43.021c-.001 8.503 6.894 15.4 15.398 15.4zm94.354 0c8.504 0 15.398-6.897 15.398-15.4V60.148c0-8.503-6.895-15.396-15.398-15.396-8.502 0-15.396 6.894-15.396 15.396v43.021c0 8.503 6.894 15.4 15.396 15.4z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-old-key.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-old-key.svg
new file mode 100644
index 0000000000..a4003027a4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-old-key.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M474.274 270.657V219.51H195.232c-10.138-34.984-40.518-60.369-76.423-60.369-44.181 0-80.021 38.459-80.021 85.944 0 47.483 35.841 85.94 80.021 85.94 35.905 0 66.286-25.405 76.423-60.368h196.797v30.118h-30.574v51.148h112.313v-51.148h-30.591v-30.118h31.097zm-355.465 22.467c-23.218 0-42.103-21.554-42.103-48.039 0-26.519 18.885-48.073 42.103-48.073 23.234 0 42.12 21.555 42.12 48.073 0 26.485-18.886 48.039-42.12 48.039z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-old-phone.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-old-phone.svg
new file mode 100644
index 0000000000..8eb7804e74
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-old-phone.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M340.353 184.117l.189-.084c.051.047.084.084.084.084l.002 50.66s43.088 23.812 75.094 23.812c13.041 0 24.24-3.953 29.938-15.08 19.627-37.652-10.17-88.613-43.76-105.109-52.705-25.131-101.455-33.961-143.811-33.961-.699 0-1.393 0-2.09.004-.691-.004-1.391-.004-2.088-.004-42.355-.004-91.102 8.824-143.811 33.961-33.588 16.496-63.387 67.457-43.762 105.109 5.697 11.125 16.902 15.08 29.941 15.08 32.006 0 75.092-23.812 75.092-23.812l.004-50.66s.033-.037.082-.084l.189.084s15.127-16.508 84.352-16.527c69.228.019 84.355 16.527 84.355 16.527zm-84.354 84.219c-23.844 0-43.178 19.328-43.178 43.178 0 23.848 19.334 43.178 43.178 43.178 23.848 0 43.178-19.33 43.178-43.178 0-23.85-19.33-43.178-43.178-43.178zm73.178-12.834l-12.227-6.756v-13.967l-.002-32.959H195.052v32.959l-.002 13.967-12.225 6.756c-4.043 2.232-34.416 18.625-65.58 24.594l-21.973 67.748v59.717h314.486v-59.717l-22.5-69.373c-28.384-6.889-54.366-20.912-58.081-22.969zm-73.178 122.867c-36.863 0-66.854-29.99-66.854-66.855 0-36.863 29.99-66.857 66.854-66.857 36.865 0 66.855 29.994 66.855 66.857 0 36.865-29.99 66.855-66.855 66.855z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-operator.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-operator.svg
new file mode 100644
index 0000000000..ad78b8602f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-operator.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M460.993 383.942c-6.836-19.816-29.469-22.662-48.377-30.633-20.76-8.755-43.783-18.92-64.498-27.416-5.908-1.611-11.824-3.226-17.736-4.84-7.055-4.855-13.967-20.996-17.74-29.019a8283.48 8283.48 0 0 0-11.287-1.61c.582-12.418 8.27-13.084 11.287-22.571 2.662-8.366.279-19.242 4.498-26.988 2.926-5.379 9.543-5.416 12.85-10.026 3.002-4.187 4.977-11.484 5.912-16.608 1.707-9.367 3.195-22.185-1.254-31.477-2.557-5.337-4.172-5.85-4.883-12.329-.867-7.854 2.316-33.466 2.445-39.004.322-14.369-.023-15.532-3.502-29.527 0 0-4.223-12.681-10.838-16.5l-13.195-2.271-8.154-7.556c-32.855-20.216-68.082-6.037-86.947 1.609-25.795 8.374-42.572 32.787-33.965 83.85 2.875.402 5.098 2.847 5.098 5.837v64.401c1.121 1.615 2.396 2.962 3.885 3.895 1.018.639 8.787 2.586 8.736 2.054.787 8.232 1.57 16.47 2.352 24.706l10.543 10.096h25.736c1.273-5.899 6.418-10.317 12.58-10.317h19.506c7.117 0 12.887 5.895 12.887 13.163 0 7.27-5.77 13.161-12.887 13.161h-19.506c-3.711 0-7.041-1.606-9.395-4.167h-33.676l-32.602-31.22v-6.372l-.141-.138v-81.06c0-5.231-4.242-9.472-9.473-9.472-5.229 0-9.471 4.241-9.471 9.472v8.064H132.46v61.386h17.322v19.577l44.338 43.401h2.703c-3.934 8.416-9.52 19.651-15.205 23.562-5.912 1.614-11.828 3.229-17.736 4.84-20.715 8.495-43.736 18.66-64.498 27.416-18.906 7.971-41.541 10.817-48.377 30.633 0 13.46-1.268 45.25-.92 62.885h411.826c.348-17.637-.92-49.427-.92-62.887z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ordered-list.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ordered-list.svg
new file mode 100644
index 0000000000..de140283b8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ordered-list.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M180.938 166.79V83.688h268.261v83.102H180.938zm-.003 131.001v-83.098h268.264v83.098H180.935zm.003 131.005v-83.1h268.261v83.1H180.938zM65.94 107.674V95.645c5.566-.25 9.463-.621 11.689-1.119 3.544-.782 6.433-2.354 8.659-4.713 1.524-1.609 2.679-3.761 3.463-6.448.454-1.61.68-2.809.68-3.594h14.758v89.908H87.084v-62.005H65.94zm-.683 176.947c2.521-5.994 8.474-12.338 17.858-19.038 8.142-5.827 13.413-10.002 15.811-12.523 3.679-3.927 5.519-8.226 5.519-12.897 0-3.804-1.055-6.964-3.162-9.49-2.109-2.518-5.126-3.778-9.054-3.778-5.375 0-9.032 2.005-10.975 6.013-1.117 2.314-1.777 5.995-1.984 11.038H62.094c.29-7.648 1.676-13.828 4.16-18.541 4.717-8.97 13.096-13.454 25.138-13.454 9.518 0 17.09 2.633 22.719 7.904 5.626 5.271 8.441 12.246 8.441 20.925 0 6.656-1.988 12.567-5.964 17.734-2.609 3.433-6.895 7.256-12.86 11.474l-7.083 5.021c-4.431 3.144-7.464 5.417-9.097 6.823a19.99 19.99 0 0 0-4.124 4.897h39.251v15.564H61.102c.166-6.449 1.552-12.342 4.155-17.672zm12.589 117.477c0 3.598.577 6.574 1.731 8.93 2.144 4.34 6.042 6.512 11.691 6.512 3.464 0 6.485-1.187 9.062-3.565 2.578-2.377 3.868-5.796 3.868-10.263 0-5.91-2.391-9.859-7.171-11.844-2.722-1.115-7.008-1.675-12.858-1.675v-12.647c5.726-.084 9.721-.64 11.988-1.674 3.914-1.737 5.869-5.251 5.869-10.541 0-3.433-.999-6.224-2.998-8.374-2.001-2.147-4.816-3.223-8.443-3.223-4.164 0-7.226 1.325-9.184 3.968-1.959 2.647-2.896 6.18-2.813 10.605H62.094c.165-4.466.929-8.703 2.292-12.713 1.445-3.514 3.716-6.759 6.814-9.734 2.311-2.107 5.058-3.72 8.236-4.839 3.18-1.115 7.083-1.672 11.708-1.672 8.589 0 15.517 2.222 20.782 6.665 5.265 4.444 7.896 10.408 7.896 17.889 0 5.293-1.57 9.759-4.711 13.395-1.985 2.275-4.052 3.824-6.201 4.651 1.613 0 3.928 1.384 6.944 4.153 4.505 4.175 6.76 9.879 6.76 17.115 0 7.605-2.633 14.292-7.897 20.058-5.268 5.766-13.061 8.648-23.384 8.648-12.72 0-21.56-4.152-26.513-12.463-2.603-4.421-4.048-10.208-4.337-17.362h17.363z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-os-x.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-os-x.svg
new file mode 100644
index 0000000000..170f3aad47
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-os-x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M83.642 51.955h97.549l79.825 136.791 75.371-136.791h93.118L314.211 261.908l115.294 198.008h-93.118l-75.371-129.289-79.825 129.289H83.642l133.021-198.008z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-out.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-out.svg
new file mode 100644
index 0000000000..73d2cfe147
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-out.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M435.783 385.357H74.589V126.021h191.604V87.648H36.219V423.73h437.934V306.831h-38.369v78.526zM342.891 87.648l42.629 42.63-102.53 102.528 46.789 46.787 102.527-102.524 41.846 41.848V87.648H342.891z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-outbox.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-outbox.svg
new file mode 100644
index 0000000000..3b59c93933
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-outbox.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M387.156 57.791H124.088L34.923 288.615v163.646h441.47V286.066L387.156 57.791zm-49.702 236.625v52.578c0 13.829-11.211 25.037-25.038 25.037H198.905c-13.828 0-25.039-11.208-25.039-25.037v-52.578H83.677l73.03-189.043h197.966l73.906 189.043h-91.125zm-110.44 21.58h61.344v-72.879h57.564L257.68 136.205l-88.238 106.912h57.572v72.879z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-outdent.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-outdent.svg
new file mode 100644
index 0000000000..85ff01f440
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-outdent.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M206.663 166.845V83.742h268.265v83.103H206.663zm0 131.001v-83.099h268.265v83.099H206.663zm0 131.007V345.75h268.265v83.103H206.663zM34.462 256.295l108.29-63.048V319.35z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-add.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-add.svg
new file mode 100644
index 0000000000..538defed20
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-add.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M105.79 434.072V67.443h141.612c37.199 0 19.272 88.184 19.272 88.184s86.003-20.906 87.108 18.527v119.035a95.541 95.541 0 0 1 25.037 3.719V141.064l-91.322-91.326-7.338-7.337H80.75v416.707h205.809a96.569 96.569 0 0 1-19.142-25.036H105.79zm245.716-123.39c-43.354 0-78.502 35.15-78.502 78.51 0 43.354 35.148 78.498 78.502 78.498 43.359 0 78.505-35.145 78.505-78.498 0-43.36-35.146-78.51-78.505-78.51zm14.113 92.621v42.301h-28.231v-42.301H295.09v-28.238h42.298v-42.297h28.231v42.297h42.307v28.238h-42.307z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-down.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-down.svg
new file mode 100644
index 0000000000..2fae28dfd9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M398.426 191.625H305.51V51.115h-99.017v140.51h-92.918l142.427 172.564zM85.043 398.308h341.912v62.577H85.043z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-remove.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-remove.svg
new file mode 100644
index 0000000000..c5009604d4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-remove.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M105.396 434.072V67.443H247.01c37.201 0 19.274 88.184 19.274 88.184s85.998-20.906 87.104 18.527v119.035a95.525 95.525 0 0 1 25.039 3.719V141.064l-91.325-91.326-7.337-7.337H80.357v416.707h205.809a96.569 96.569 0 0 1-19.142-25.036H105.396zm245.717-123.39c-43.354 0-78.502 35.15-78.502 78.51 0 43.354 35.148 78.498 78.502 78.498 43.357 0 78.506-35.145 78.506-78.498 0-43.36-35.148-78.51-78.506-78.51zm-56.416 92.621v-28.238h112.836v28.238H294.697z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-restricted.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-restricted.svg
new file mode 100644
index 0000000000..4a7c8696e2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-restricted.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M105.982 434.072V67.443h141.611c37.199 0 19.274 88.184 19.274 88.184s86-20.906 87.106 18.527v119.035a95.55 95.55 0 0 1 25.039 3.719V141.064l-91.327-91.326-7.335-7.337H80.943v416.707H286.75a96.627 96.627 0 0 1-19.14-25.036H105.982zm208.164-46.092c0 20.791 16.912 37.703 37.704 37.703 7.419 0 14.326-2.186 20.166-5.901l-51.97-51.971c-3.714 5.839-5.9 12.746-5.9 20.169zm37.705-37.706c-7.423 0-14.33 2.187-20.173 5.903l51.974 51.967c3.716-5.84 5.901-12.748 5.901-20.164 0-20.792-16.915-37.706-37.702-37.706zm-.152-39.592c-43.354 0-78.498 35.15-78.498 78.51 0 43.354 35.145 78.498 78.498 78.498 43.359 0 78.506-35.145 78.506-78.498 0-43.36-35.146-78.51-78.506-78.51zm.152 131.455c-29.909 0-54.156-24.246-54.156-54.156 0-29.913 24.247-54.158 54.156-54.158 29.907 0 54.152 24.245 54.152 54.158 0 29.91-24.245 54.156-54.152 54.156z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-up.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-up.svg
new file mode 100644
index 0000000000..db6ad88927
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M206.491 364.184h99.013V223.676h92.922L255.997 51.111 113.575 223.676h92.916zM85.043 398.311h341.912v62.578H85.043z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paint-roller.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paint-roller.svg
new file mode 100644
index 0000000000..59665d6232
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paint-roller.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M456.479 241.509L276.031 61.071c-11.052-11.043-28.941-11.043-39.96 0l-5.788 5.758-29.335-29.359-76.031 76.001L225.671 268.77l-10.922 11.414-17.627-17.631L43.85 415.844l58.502 58.514 153.307-153.283-19.229-19.213 28.124-29.431L164.159 117.58l36.789-36.746 7.687 7.667-9.909 9.891c-11.053 11.038-11.053 28.94 0 39.979l180.417 180.438c11.051 11.046 28.971 11.046 39.991 0l37.346-37.338c11.023-11.027 11.023-28.929-.001-39.962z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-palette.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-palette.svg
new file mode 100644
index 0000000000..26c9f7f6b2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-palette.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M373.073 239.561c-14.137-2.883-31.906 3.329-45.281-2.604-23.164-10.264-23.168-47.011-25.08-67.755-2.34-25.318-13.271-39.891-32.422-50.529-38.291-21.273-91.846-26.396-132.5 10.76-52.771 48.225-55.17 143.19-5.35 212.118 28.314 39.176 89.383 68.36 134.994 68.36 71.602 0 137.303-43.64 146.811-101.841 5.805-35.541-10.402-62.23-41.172-68.509zm-222.99-73.403c16.375-19.559 44.195-21.785 62.152-4.98 17.938 16.806 19.221 46.28 2.848 65.845-16.363 19.553-44.186 21.777-62.133 4.979-17.953-16.811-19.23-46.279-2.867-65.844zm78.389 166.358c-13.189 15.759-35.613 17.554-50.076 4.013-14.469-13.547-15.5-37.297-2.311-53.062 13.195-15.766 35.617-17.56 50.09-4.017 14.455 13.545 15.492 37.299 2.297 53.066zm78.412 25.937c-9.498 11.348-25.648 12.641-36.066 2.889-10.42-9.756-11.16-26.861-1.662-38.217 9.502-11.352 25.65-12.644 36.074-2.89 10.41 9.752 11.154 26.863 1.654 38.218zm55.664-53.941c-7.092 8.471-19.145 9.436-26.92 2.157-7.777-7.28-8.33-20.048-1.238-28.521 7.092-8.473 19.143-9.438 26.922-2.158 7.773 7.279 8.328 20.049 1.236 28.522z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-panel-show.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-panel-show.svg
new file mode 100644
index 0000000000..91c3e9f0ca
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-panel-show.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M36.768 66.555v377.107h436.661V66.555H36.768zm400.627 343.174H73.74V138.653h363.654v271.076zm-183.34-215.542l115.577 146.492-231.152-.002z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pannel-close.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pannel-close.svg
new file mode 100644
index 0000000000..8006a60541
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pannel-close.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M37.324 67.555v377.107h436.664V67.555H37.324zm400.627 343.174H74.298V139.653h363.653v271.076zm-183.334-51.077L139.043 213.161l231.146.003z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pants.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pants.svg
new file mode 100644
index 0000000000..9604660ce0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pants.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M356.05 87.055V33.606H157.618v41.646l-20.539 402.902 77.685-.709 13.441-177.859 28.335-165.213 28.335 165.213L298.3 477.445l77.683.709z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-bag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-bag.svg
new file mode 100644
index 0000000000..e7435caf75
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-bag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M202.539 89.037h106.926v53.674h39.989V85.168l-39.989-36.117H202.539l-39.985 36.117v57.543h39.985zm181.967 77.354H106.333v296.558h299.334V166.391z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-plane-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-plane-alt.svg
new file mode 100644
index 0000000000..2c4259e954
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-plane-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M410.013 77.199L86.699 243.26l-32.807 16.851L83.8 281.692l76.875 55.472 26.316 111.602 44.961-60.169 72.869 52.58 25.396 18.325 9.391-29.878L441.9 104.079l16.207-51.58-48.094 24.7zm-91.966 345.65l-93.654-67.578L420.339 97.303 186.654 328.037l-89.629-64.673L420.339 97.303 318.047 422.849z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-plane.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-plane.svg
new file mode 100644
index 0000000000..fe60af779b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-plane.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M410.011 77.201L86.698 243.261l-32.807 16.85L83.8 281.693l68.36 49.327 28.243 119.776 48.254-64.576 76.163 54.957 25.397 18.325 9.39-29.879L441.9 104.079l16.208-51.582-48.097 24.704zM205.052 369.186l-13.361 26.305-15.819-67.088L419.599 98.194 205.052 369.186z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-parachute-drop.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-parachute-drop.svg
new file mode 100644
index 0000000000..cdd4a501d7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-parachute-drop.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M422.32 200.572L282.21 307.434l33.779-81.264c-.359-7.125-6.65-14.58-17.22-20.256l-41.781 100.512-43.389-100.705c-10.208 5.393-16.52 12.432-17.48 19.275l36.426 84.539L89.679 200.572c-9.877 3.02-17.729 7.391-22.963 12.266l158.297 120.734h61.973l158.299-120.734c-5.235-4.875-13.086-9.244-22.965-12.266zM183.5 357.25h145.002v98.932H183.5zm139.539-153.479c11.408-27.387 12.947-53.031 4.48-76.395-15.508-42.801-59.992-66.127-71.514-71.559-11.527 5.455-56.121 28.91-71.559 71.645-8.43 23.338-6.881 48.955 4.511 76.309 12.946-14.42 37.825-23.994 67.043-23.994s54.097 9.578 67.039 23.994zM285.335 55.879c19.421 12.965 44.26 34.771 55.783 66.568 7.775 21.457 8.337 44.346 1.734 68.359 13.297-6.902 30.602-11.029 49.771-11.029 25.079 0 47.15 7.012 61.081 18.262-3.273-72.31-75.346-131.705-168.369-142.16zM119.373 179.777c19.172 0 36.475 4.127 49.775 11.031-6.606-24.014-6.042-46.904 1.732-68.361 11.523-31.797 36.359-53.604 55.783-66.568-93.021 10.455-165.093 69.848-168.367 142.16 13.928-11.25 35.998-18.262 61.077-18.262z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-parental-control.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-parental-control.svg
new file mode 100644
index 0000000000..3a19170b80
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-parental-control.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M189.307 167.625c34.041 0 61.675-27.586 61.675-61.667 0-34.046-27.634-61.654-61.675-61.654-34.076 0-61.677 27.608-61.677 61.654-.001 34.081 27.6 61.667 61.677 61.667zm182.506 147.252c24.494 0 44.345-19.852 44.345-44.344 0-24.489-19.851-44.334-44.345-44.334-24.493 0-44.31 19.845-44.31 44.334.001 24.492 19.817 44.344 44.31 44.344zm41.138 18.59c-6.475-6.441-14.127-10.305-41.825-10.305-27.666 0-33.355 7.295-41.27 10.305l-40.255 12.035c-.229-7.424-4.547-137.281-17.17-149.939-13.047-13.028-28.514-20.855-84.502-20.855-55.983 0-71.06 8.476-83.454 20.855-12.361 12.364-8.174 144.273-8.174 144.273l27.372-65.048 17.2 193.753 49.641-99.142 46.339 99.142 16.383-193.753 36.233 70.762-.458.149 50.329 13.096 8.534 109.746L372.4 419.48l22.957 49.061 8.078-95.873 13.571 32.189c.001 0 2.388-64.948-4.055-71.39z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-partly-cloudy.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-partly-cloudy.svg
new file mode 100644
index 0000000000..57af81127e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-partly-cloudy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M438.801 350.975a80.815 80.815 0 0 0 2.584-20.338c0-44.345-35.955-80.33-80.315-80.33-33.356 0-61.935 20.354-74.103 49.294-10.398-12.263-25.932-20.041-43.296-20.041-31.393 0-56.837 25.438-56.837 56.849a57.69 57.69 0 0 0 2.16 15.58c-25.638 9.39-43.92 34.009-43.92 62.936 0 36.972 29.973 66.988 66.991 66.988H418.59c37.053 0 67.025-30.017 67.025-66.988 0-30.003-19.672-55.364-46.814-63.95zM210.118 96.412c10.662 0 19.295-8.635 19.295-19.313V49.305c0-10.646-8.633-19.298-19.295-19.298-10.628 0-19.261 8.651-19.261 19.298v27.794c0 10.678 8.633 19.313 19.261 19.313zm96.11 39.814a19.23 19.23 0 0 0 13.64-5.655l19.684-19.673c7.523-7.52 7.523-19.734 0-27.254-7.52-7.558-19.75-7.558-27.273 0l-19.685 19.649c-7.523 7.519-7.523 19.751 0 27.277a19.259 19.259 0 0 0 13.634 5.656zm-205.825-5.656a19.242 19.242 0 0 0 13.636 5.655 19.25 19.25 0 0 0 13.64-5.655c7.535-7.526 7.535-19.759 0-27.277l-19.654-19.649c-7.523-7.558-19.754-7.558-27.306 0-7.488 7.52-7.488 19.734 0 27.254l19.684 19.672zm226.363 82.452a19.241 19.241 0 0 0 6.998 14.897 106.007 106.007 0 0 1 27.306-3.579c8.798 0 17.364 1.092 25.538 3.137 4.01-3.528 6.542-8.684 6.542-14.44 0-10.655-8.647-19.291-19.295-19.291h-27.794c-10.665 0-19.295 8.636-19.295 19.276zm-143.103 66.406c-26.389-10.531-44.998-36.266-44.998-66.391 0-39.501 31.982-71.515 71.488-71.515 39.47 0 71.484 32.014 71.484 71.515 0 16.499-5.624 31.694-15.009 43.793a81.766 81.766 0 0 1 13.292 5.102 106.82 106.82 0 0 1 24.576-21.32c2.566-8.752 3.989-18.019 3.989-27.574 0-54.229-44.115-98.348-98.333-98.348-54.222 0-98.336 44.118-98.336 98.348 0 39.276 23.155 73.224 56.542 88.972a83.143 83.143 0 0 1 15.305-22.582zm-83.26 16.069l-19.685 19.672c-7.523 7.521-7.523 19.719 0 27.271 3.76 3.76 8.713 5.626 13.634 5.626 4.957 0 9.893-1.866 13.672-5.626l19.654-19.688c7.535-7.52 7.535-19.715 0-27.255-7.522-7.536-19.75-7.536-27.275 0zm-6.883-82.46c0-10.655-8.651-19.291-19.31-19.291H46.414c-10.646 0-19.296 8.636-19.296 19.276 0 10.647 8.65 19.281 19.296 19.281H74.21c10.659 0 19.31-8.603 19.31-19.266z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paste-in.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paste-in.svg
new file mode 100644
index 0000000000..eae1a1bd12
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paste-in.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M380.295 95.092h-68.479a54.17 54.17 0 0 0 .097-3.321c0-30.805-24.948-55.743-55.722-55.743-30.803 0-55.756 24.938-55.756 55.743 0 1.112.065 2.208.098 3.321h-68.446v57.766h248.208V95.092zm-124.104 21.76c-13.865-.033-25.049-11.232-25.079-25.081.03-13.862 11.214-25.081 25.079-25.1 13.834.019 25.083 11.237 25.083 25.1 0 13.848-11.249 25.047-25.083 25.081zm149.053 13.787v48.676H107.172v-48.676H79.537v345.078h353.307V130.639h-27.6z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-path.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-path.svg
new file mode 100644
index 0000000000..a8f5df6e4c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-path.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M351.649 115.632l-73.578 89.16h48.004v105.905c-.028 19.002-15.401 34.385-34.401 34.434-19.031-.049-34.398-15.432-34.467-34.434v-95.259c0-47.27-38.294-85.548-85.547-85.581-47.256.033-85.548 38.311-85.581 85.581v172.579h51.146V215.438c.031-19.001 15.437-34.4 34.436-34.438 19 .037 34.369 15.436 34.402 34.438v95.259c.034 47.271 38.328 85.549 85.611 85.565 47.225-.017 85.518-38.294 85.547-85.565V204.792h48.009l-73.581-89.16z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pause.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pause.svg
new file mode 100644
index 0000000000..7d9dce3838
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pause.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M289.335 420.379V90.8h83.103v329.579h-83.103zm-152.737-.002V90.804h83.101v329.573h-83.101z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pc.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pc.svg
new file mode 100644
index 0000000000..a8c8196797
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M435.822 51.502H76.626c-6.804 0-12.362 5.513-12.362 12.332V315.62c0 6.8 5.559 12.33 12.362 12.33h359.196c6.801 0 12.295-5.53 12.295-12.33V63.834c0-6.818-5.494-12.332-12.295-12.332zm-17.593 246.526H94.188V81.426h324.041v216.602zM65.146 460.668h381.008v-97.24H65.146v97.24zm242.552-61.085h109.386v24.932H307.698v-24.932zm-193.104-1.949c8.6 0 15.598 7.003 15.598 15.601 0 8.604-6.998 15.6-15.598 15.6-8.602 0-15.6-6.996-15.6-15.6 0-8.598 6.998-15.601 15.6-15.601z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-alt-2.svg
new file mode 100644
index 0000000000..4aa84eae75
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-alt-2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M380.285 262.184l-67.236-94.832c-3.039-4.427-6.604-7.14-10.397-9.242-4.09-2.133-8.504-3.612-14.128-3.693-.654 0-1.209.022-1.635.061l-30.708 1.926-31.653-1.986a23.975 23.975 0 0 0-1.604-.052c-5.625.069-10.073 1.557-14.126 3.723-3.793 2.125-7.359 4.866-10.433 9.311l-66.351 94.855c-5.56 7.909-3.631 18.782 4.283 24.329a17.45 17.45 0 0 0 24.298-4.305l61.643-88.057c.13.551.292 1.089.292 1.663v5.05-.031c0 35.709-5.722 128.409-56.607 246.123-3.826 8.839.229 19.115 9.09 22.949a17.562 17.562 0 0 0 6.902 1.42c6.769 0 13.177-3.931 16.024-10.538 23.708-54.768 45.029-139.398 45.029-139.398.951-3.795 4.904-6.86 8.764-6.86v-.014.014h8.829c3.893 0 7.883 3.065 8.799 6.86 0 0 21.32 84.631 44.997 139.398 2.843 6.607 9.286 10.538 16.056 10.538 2.322 0 4.643-.454 6.9-1.42 8.831-3.834 12.917-14.11 9.123-22.949-50.916-117.714-56.639-210.413-56.639-246.123v-5.037c0-.276.066-.538.133-.799l61.869 87.295c5.559 7.86 16.45 9.712 24.33 4.146 7.884-5.588 9.713-16.456 4.156-24.325zM256.181 141.833c27.731 0 50.167-22.471 50.167-50.185 0-27.709-22.436-50.191-50.167-50.191-27.729 0-50.195 22.482-50.195 50.191 0 27.714 22.466 50.185 50.195 50.185z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-alt.svg
new file mode 100644
index 0000000000..7f129069c7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.968 166.154c34.206 0 61.936-27.727 61.936-61.934 0-34.208-27.729-61.936-61.936-61.936s-61.936 27.728-61.936 61.936 27.73 61.934 61.936 61.934zm83.467 28.034c-13.082-13.088-28.625-20.924-84.83-20.924-56.214 0-71.38 8.505-83.796 20.924-12.422 12.416-8.23 144.883-8.23 144.883l27.485-65.304 17.28 194.554 49.856-99.57 46.521 99.57 16.456-194.554 27.487 65.304c0-.001 4.857-131.8-8.229-144.883z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-female.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-female.svg
new file mode 100644
index 0000000000..0cf6088418
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-female.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M197.43 113.067a58.571 58.571 0 1 1 117.142 0 58.571 58.571 0 1 1-117.142 0zm156.723 262.278l-30.607-115.811 4.156-54.407c0-13.077-10.602-23.68-23.68-23.68h-96.045c-13.078 0-23.68 10.603-23.68 23.68l4.154 54.403-30.605 115.814h56.951l15.158 82.159h52.09l15.156-82.159h56.952z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people.svg
new file mode 100644
index 0000000000..ab861f8814
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.173 165.941c34.204 0 61.936-27.729 61.936-61.932 0-34.207-27.731-61.939-61.936-61.939s-61.937 27.732-61.937 61.939c0 34.204 27.733 61.932 61.937 61.932zm63.298 10.375H191.873c-13.829 0-25.04 11.207-25.04 25.038v131.141h35.758v135.729h105.163V332.495h35.755V201.354c0-13.831-11.21-25.038-25.038-25.038z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-phone-ring.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-phone-ring.svg
new file mode 100644
index 0000000000..1797603bbc
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-phone-ring.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M392.454 280.446a12.187 12.187 0 0 0 8.658-3.585 12.221 12.221 0 0 0 3.592-8.663c-.004-44.182-18.023-84.239-46.963-113.156-28.855-28.872-68.869-46.687-112.879-46.681-6.766 0-12.246 5.481-12.25 12.246.004 6.766 5.484 12.246 12.25 12.243h-.004c37.354.01 71.088 15.055 95.566 39.513 24.566 24.59 39.773 58.373 39.783 95.84.001 6.766 5.485 12.246 12.247 12.243zm-90.637-69.291c14.602 14.629 23.613 34.685 23.619 56.966.004 6.766 5.49 12.249 12.25 12.246 3.383 0 6.447-1.374 8.66-3.589a12.189 12.189 0 0 0 3.586-8.657c0-28.984-11.811-55.317-30.799-74.283-18.955-18.975-45.273-30.714-74.191-30.709-6.766-.002-12.252 5.482-12.246 12.245 0 6.765 5.475 12.248 12.24 12.241v.006c22.254.005 42.292 8.969 56.881 23.534zm96.246-96.417c-38.959-38.983-92.945-63.056-152.396-63.056-6.766.003-12.25 5.484-12.242 12.249 0 6.764 5.477 12.244 12.242 12.244 52.781.009 100.488 21.31 135.076 55.881 34.674 34.691 56.127 82.441 56.141 135.336-.004 6.766 5.48 12.245 12.244 12.245a12.193 12.193 0 0 0 8.66-3.588 12.2 12.2 0 0 0 3.588-8.659c0-59.598-24.26-113.623-63.313-152.652zM276.925 375.442s-25.443 1.111-81.148-54.593c-55.699-55.702-54.59-81.146-54.59-81.146l40.691-40.697c-6.797-41.243-30.668-106.45-77.355-91.385-46.01 14.48-63.008 79.353-49.277 119.585 67.943 191.817 229.227 230.583 253.951 232.422 59.285 6.276 97.408-30.865 104.852-87.072 0 0-59.945-38.123-89.85-44.388l-47.274 47.274z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-phone.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-phone.svg
new file mode 100644
index 0000000000..085e41600e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-phone.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M44.928 192.299c83.139 234.707 280.482 282.143 310.735 284.393 72.542 7.683 119.189-37.768 128.298-106.547 0 0-73.348-46.646-109.94-54.308l-57.845 57.846s-31.13 1.358-99.292-66.801c-68.156-68.162-66.798-99.293-66.798-99.293l49.795-49.797c-8.322-50.463-37.53-130.254-94.654-111.818-56.299 17.72-77.099 97.097-60.299 146.325z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-photo-album.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-photo-album.svg
new file mode 100644
index 0000000000..532615bf2a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-photo-album.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M428.009 79.498l-298.81 58.337h298.81zM54.943 161.514h57.211v270.988H54.943zm80.89 0v270.988h321.223V161.514H135.833zm239.456 185.788H217.404v-100.59h157.885v100.59z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-picture.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-picture.svg
new file mode 100644
index 0000000000..9250074063
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-picture.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M246.486 299.31l-85.604-91.047-58.21 107.66v29.658h289.12c-36.821-31.753-114.476-99.682-114.476-99.682l-30.83 53.411zM347 230.786c16.062 0 29.073-13 29.073-29.06 0-16.04-13.012-29.062-29.073-29.062-16.019 0-29.038 13.021-29.038 29.062 0 16.06 13.019 29.06 29.038 29.06zM37.74 102.699v306.569h434.688V102.699H37.74zm396.082 267.916H77.635l-.016-228.033h354.928v.017h1.275v228.016z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures-alt-2.svg
new file mode 100644
index 0000000000..4bc1120750
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures-alt-2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M426.043 194.548L365.142 56.354 36.266 201.237l79.195 179.716v73.243h359.41V194.548h-48.828zm-310.582 26.805l-11.13 4.718 11.13 26.259v66.866L70.123 212.231 352.691 92.415l43.287 102.133h-28.342l-28.787-67.919-160.171 67.919h-63.217v26.805zm333.066 206.8h-306.94V220.917h306.94v207.236zm-26.095-181.14h-254.75v155.045h254.75V247.013z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures-alt.svg
new file mode 100644
index 0000000000..eee91913ed
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M61.246 47.151V368.5h81.19v-84.674H92.495V77.84h209.35v34.971h31.202v-65.66zm113.107 97.009v321.352h271.818V144.16H174.353zm240.618 236.679H205.597V174.851h209.374v205.988z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures.svg
new file mode 100644
index 0000000000..8844e068b2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M316.951 194.43c-45.108 0-81.675 36.565-81.675 81.674 0 45.107 36.566 81.676 81.675 81.676 45.107 0 81.674-36.568 81.674-81.676 0-45.109-36.566-81.674-81.674-81.674zm0 129.602c-26.47 0-47.927-21.456-47.927-47.929 0-26.47 21.457-47.927 47.927-47.927 26.468 0 47.928 21.457 47.928 47.927 0 26.473-21.46 47.929-47.928 47.929zM190.319 125.67l-22.872-26.302h-67.124L77.452 125.67h-41.75v286.494h438.306V125.67H190.319zm-16.901 57.213h-62.392c-7.379 0-13.362-5.982-13.362-13.361 0-7.378 5.982-13.362 13.362-13.362h62.392c7.38 0 13.363 5.984 13.363 13.362.001 7.378-5.983 13.361-13.363 13.361zm143.533 199.934c-58.842 0-106.714-47.871-106.714-106.714 0-58.841 47.872-106.715 106.714-106.715s106.713 47.874 106.713 106.715c0 58.843-47.871 106.714-106.713 106.714zm134.233-209.381a7.086 7.086 0 0 1-7.086 7.087h-16.443a7.084 7.084 0 0 1-7.084-7.087v-16.441a7.085 7.085 0 0 1 7.084-7.085h16.443a7.087 7.087 0 0 1 7.086 7.085v16.441z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pie-chart.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pie-chart.svg
new file mode 100644
index 0000000000..1db73f63d3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pie-chart.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M471.071 282.48c0 105.183-85.274 190.441-190.448 190.441V282.48h190.448zm-52.324-52.624c0-105.174-85.262-190.436-190.446-190.436-105.171 0-190.429 85.262-190.429 190.436 0 105.173 85.258 190.437 190.429 190.437V229.856h190.446z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-piggy-bank.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-piggy-bank.svg
new file mode 100644
index 0000000000..45c74819f8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-piggy-bank.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M461.357 264.329c-1.162-.782-2.388-1.811-3.632-3.005 2.028-1.934 3.761-4.367 4.841-6.965 1.422-3.355 1.93-6.802 1.93-10.124 0-3.301-.49-6.553-1.31-10.024-1.176-6.014-3.842-11.18-7.618-15.337-3.892-4.134-9.205-7.893-16.973-8.042-1.373-.016-2.797.197-4.218.522-15.124-73.448-67.153-120.849-169.364-120.849-43.327 0-79.693 8.554-108.683 23.971l-24.165-13.949c-13.687-7.896-26.929-1.601-29.449 14.014l-10.333 64.552c-5.102 10.092-9.19 20.912-12.165 32.362h-6.932c-15.812 0-28.746 12.95-28.746 28.747v51.451c0 15.812 12.934 28.732 28.746 28.732h11.69c9.975 22.006 26.7 37.183 49.918 47.332v52.16c0 .477.05.93.066 1.375h89.194c.016-.445.047-.898.047-1.375v-34.811c12.854.738 26.439 1.045 40.811 1.045 11.414 0 22.207-.391 32.375-1.178v34.943c0 .477.034.93.067 1.375H386.6c.033-.445.099-.898.099-1.375v-59.094c31.065-18.279 47.286-45.847 51.409-80.737 2.387 2.388 4.953 4.579 7.73 6.521 5.547 3.843 12.053 6.919 19.739 7.342l1.373-27.093c-.753.001-2.878-.585-5.593-2.486zm-330.714-18.654c-10.086 0-18.262-8.189-18.262-18.282 0-10.104 8.176-18.277 18.262-18.277 10.09 0 18.281 8.174 18.281 18.277 0 10.093-8.191 18.282-18.281 18.282zm191.83-81.507c-16.61-4.891-35.761-7.636-57.719-7.636-22.759 0-43.788 2.941-62.87 8.287l-8.338-29.807c21.928-6.13 45.798-9.416 71.208-9.416 24.493 0 46.635 3.058 66.451 8.877l-8.732 29.695z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pin-location.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pin-location.svg
new file mode 100644
index 0000000000..5907d6e541
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pin-location.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.221 60.807c-64.034 0-115.941 51.908-115.941 115.945 0 64.029 115.941 273.752 115.941 273.752s115.943-209.723 115.943-273.752c0-64.037-51.914-115.945-115.943-115.945zm0 151.172c-19.455 0-35.229-15.773-35.229-35.227 0-19.457 15.773-35.23 35.229-35.23s35.228 15.773 35.228 35.23c0 19.453-15.772 35.227-35.228 35.227z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-piracy.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-piracy.svg
new file mode 100644
index 0000000000..577d04e517
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-piracy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.851 154.223c3.791 0 4.708-1.416 4.708-1.416s-.395-11.29-4.708-11.29c-4.349 0-4.71 11.29-4.71 11.29s.882 1.416 4.71 1.416zm-19.13-8.964c2.32 0 6.114-1.029 8.434-2.281 2.356-1.278 4.188-4.425 4.154-7.029-.034-2.603-1.505-5.755-3.303-7.035-1.767-1.266-5.69-1.505-8.732-.479-3.074 1.002-5.886 3.68-6.311 5.978-.394 2.261-.23 5.644.393 7.504.623 1.833 3.041 3.342 5.365 3.342zm29.791-2.28c2.354 1.252 6.115 2.281 8.436 2.281 2.355 0 4.743-1.509 5.397-3.342.589-1.86.783-5.243.358-7.504-.424-2.298-3.204-4.976-6.278-5.978-3.043-1.026-6.997-.787-8.765.479-1.768 1.28-3.237 4.432-3.304 7.035-.03 2.603 1.833 5.751 4.156 7.029zm-104.286 47.418h60.466c26.129 8.018 60.302 15.623 99.641 17.591-.161-4.118.361-11.025.95-17.591h29.233c23.318 0 48.171-13.866 55.235-30.819 7.028-16.973-4.939-10.826-26.589-6.66-21.615 4.183-49.607-38.551-62.101-54.332-12.558-15.768-40.909-43.843-63.113-43.843-22.172 0-50.754 26.807-63.54 41.008-12.788 14.184-41.17 56.719-63.081 53.852-21.912-2.878-33.03-7.737-24.658 9.491 8.34 17.215 34.272 31.303 57.557 31.303zm93.625-103.501c21.812 0 35.349 16.139 35.349 27.086 0 10.973-4.149 17.39-5.231 20.584-2.191 6.492.426 9.656.426 9.656s-.784 6.689-2.909 9.647c-2.126 2.967-12.559-1.97-12.559 9.175 0 0-3.99 2.993-14.977 2.993-10.988 0-15.208-2.993-15.208-2.993 0-11.145-10.432-6.208-12.558-9.175-2.125-2.958-2.876-9.647-2.876-9.647s2.583-3.164.425-9.656c-1.081-3.194-5.265-9.611-5.265-20.584 0-10.947 13.538-27.086 35.383-27.086zm184.536 314.686c-6.148-17.812-26.489-20.363-43.494-27.529-18.671-7.87-39.34-17.006-57.981-24.653a7240.792 7240.792 0 0 1-15.925-4.341c-6.343-4.373-12.559-18.869-15.956-26.094a1536.56 1536.56 0 0 1-10.173-1.455c.555-11.135 7.457-11.747 10.173-20.274 2.386-7.517.261-17.304 4.054-24.251 2.617-4.838 8.566-4.887 11.543-9.025 2.681-3.762 4.48-10.316 5.332-14.936 1.24-6.833 2.29-15.739.523-23.315a422.872 422.872 0 0 1-23.94-1.479l-5.297 17.977c-2.028 6.776-9.418 11.618-16.447 10.751l-12.362-1.536c-6.999-.872-12.853-7.368-12.982-14.448l-.295-18.396c0-.474.096-.897.131-1.357-31.852-6.549-57.392-15.542-74.396-22.514.554 4.454 1.34 9.148 2.387 14.118 1.864 8.723-4.775 12.617-4.348 17.379.947 10.421 1.143 35.473 10.986 41.646.916.577 7.915 2.323 7.847 1.85a8789.064 8789.064 0 0 1 2.91 30.418c2.453 6.754 8.374 7.488 10.075 17.021l-7.556 1.827c-3.401 7.225-9.613 21.721-15.924 26.094-5.333 1.449-10.628 2.905-15.992 4.341-18.607 7.647-39.275 16.783-57.948 24.653-17.005 7.166-37.345 9.718-43.46 27.529 0 12.105-1.176 40.676-.851 56.53h370.186c.322-15.855-.82-44.425-.82-56.531z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-plane.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-plane.svg
new file mode 100644
index 0000000000..c09d4522e2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-plane.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M437.545 60.162c-12.654 4.859-26.52 10.547-37.246 19.087l-74.985 63.44L95.29 94.062l-28.026 27.646 177.113 100.969L155.56 330.1l-70.245-21.483-29.921 27.927 66.778 33.946-5.952 7.177c-3.208 3.221-3.01 13.392.032 17.053 3.629 3.072 13.866 3.289 17.102.036l7.358-5.937 34.14 67.148 27.928-29.884-21.485-70.08 107.685-86.99 98.664 173.076 27.63-28.058-47.581-225.2 64.686-77.31c8.436-10.773 14.159-24.643 19.13-37.265 4.97-12.604-1.305-18.963-13.964-14.094zm-320.999 334.9c-.1-.112-.195-.228-.293-.343-.1-.08-.195-.18-.327-.26l.62.603z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-planet.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-planet.svg
new file mode 100644
index 0000000000..455ce2da3a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-planet.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M453.938 46.288c-22.468 0-69.558 26.553-125.968 70.982l-2.452 1.912-2.814-1.341c-20.569-9.876-43.557-15.093-66.479-15.093-41.009 0-79.532 15.958-108.506 44.946-46.076 46.015-58.045 116.353-29.857 175.021l1.342 2.814-1.93 2.434c-61.905 78.599-78.777 124.581-68.051 135.308 1.928 1.958 5.067 2.925 9.353 2.925 21.681 0 66.156-24.643 119.852-66.172a157.344 157.344 0 0 1-14.392-8.767c-18.148 10.632-32.308 16.044-42.119 16.044-5.199 0-9.32-1.489-12.263-4.43-8.894-8.899-4.543-27.604 13.278-57.199l3.89-6.506 4.448 6.178a151.652 151.652 0 0 0 16.449 19.479 158.309 158.309 0 0 0 16.774 14.5c33.39-20.633 75.938-55.954 117.434-97.42 41.5-41.498 76.785-84.073 97.386-117.43a157.245 157.245 0 0 0-14.487-16.792c-5.918-5.901-12.46-11.43-19.457-16.431l-6.179-4.415 6.506-3.924c19.489-11.739 34.598-17.691 44.898-17.691 5.2 0 9.354 1.505 12.265 4.416 8.633 8.613 4.84 26.42-11.61 54.396a162.766 162.766 0 0 1 8.797 14.373c57.981-74.853 73.712-118.738 63.246-129.169-1.931-1.967-5.072-2.948-9.354-2.948zm-55.954 150.854c-27.403 34.109-60.171 70.469-95.259 105.579-35.093 35.071-71.421 67.872-105.561 95.244 18.606 7.714 38.88 11.785 59.157 11.785 40.974 0 79.531-15.958 108.503-44.928 44.116-44.097 56.969-110.581 33.16-167.68z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-play.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-play.svg
new file mode 100644
index 0000000000..3a041b7e2b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-play.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M397.727 256.048l-286.7 166.932V89.114z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-playing-cards.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-playing-cards.svg
new file mode 100644
index 0000000000..132d264d5b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-playing-cards.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M230.656 108.59h.066l53.535.101c.031-.032.062-.047.082-.064-9.307 6.295-16.63 15.5-20.457 26.664l-63.18 184.293a55.009 55.009 0 0 0-.785 2.483l.36-183.174c.034-16.762 13.637-30.303 30.379-30.303zM71.891 255.996c-12.722-10.954-14.126-30.15-3.173-42.841l29.891-34.648c.425 1.326.865 2.651 1.389 3.944l61.202 150.62-89.309-77.075zm105.887-117.125l-.343 174.385-56.592-139.277c-6.311-15.535 1.146-33.258 16.677-39.586l45.653-18.558c-3.399 6.968-5.362 14.782-5.395 23.036zm270.445 59.602l-63.18 184.289c-4.317 12.621-16.123 20.57-28.746 20.57-3.27 0-6.57-.54-9.844-1.669l-105.595-36.182c-15.859-5.429-24.33-22.73-18.866-38.604l63.177-184.292c4.317-12.607 16.123-20.541 28.744-20.541 3.242 0 6.574.53 9.844 1.655l105.562 36.186c15.893 5.445 24.331 22.709 18.904 38.588z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-playlist.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-playlist.svg
new file mode 100644
index 0000000000..0492601307
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-playlist.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M365.348 118.669c-24.918-24.931-23.123-45.422-23.123-45.422l-27.695-.062.065 257.229c-14.259-4.984-31.329-5.92-48.694-1.567-38.554 9.646-63.799 41.468-56.411 71.063 7.392 29.595 44.671 45.749 83.263 36.1 33.875-8.503 57.488-34.104 57.684-60.266V189.489s75.215 9.448 68.54 57.537c-6.636 48.091-13.896 64.323-13.896 64.323l10.039 10.055s29.689-55.327 32.079-90.859c4.61-69.004-54.092-84.145-81.851-111.876zm-109.26-53.3H59.848v51.146h196.24V65.369zm0 91.235H59.848v51.147h196.24v-51.147zm0 91.209H59.848v51.157h196.24v-51.157zM59.848 390.196h101.373v-51.148H59.848v51.148z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-plugin.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-plugin.svg
new file mode 100644
index 0000000000..c88e396dfa
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-plugin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M437.433 217.444h-.07c-18.95 0-38.133 22.244-38.133 3.306v-102h-96.227c-22.758 0 3.977 23.061 3.977 45.826v.083c0 22.771-18.46 41.228-41.218 41.228-22.766 0-41.223-18.457-41.223-41.228l-.078-.083c0-22.252 28.295-45.826 5.527-45.826H124.264v97.288c0 22.767-23.572-5.529-45.822-5.529l-.086.081c-22.769 0-41.228 18.454-41.228 41.222 0 22.756 18.459 41.217 41.228 41.217h.086c22.763 0 45.822-26.734 45.822-3.979v104.666h110.438c18.937 0-3.306-19.18-3.306-38.128v-.074c0-18.938 15.353-34.293 34.292-34.293 18.947 0 34.298 15.354 34.298 34.293l.057.074c0 18.519-23.533 38.128-4.591 38.128H399.23V281.499c0-18.938 19.612 4.595 38.133 4.595l.07-.059c18.938 0 34.294-15.352 34.294-34.299 0-18.939-15.357-34.292-34.294-34.292z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-podcast.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-podcast.svg
new file mode 100644
index 0000000000..796c263f0a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-podcast.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M314.992 305.392c5.872 72.313-34.037 161.206-34.037 161.206s-10.117 4.848-25.144 4.848c-14.985 0-25.378-4.848-25.378-4.848s-39.93-88.893-34.059-161.206c0 0 9.413-30.408 59.776-30.408s58.842 30.408 58.842 30.408zm-58.921-167.765c58.295.089 105.458 47.262 105.558 105.596-.061 31.896-12.681 60.379-29.485 84.446 25.291-13.313 57.188-41.241 57.21-84.446-.021-73.636-59.693-133.281-133.283-133.299h-.397c-73.587.018-133.263 59.663-133.281 133.299.019 43.205 31.909 71.133 57.209 84.446-16.802-24.067-29.432-52.55-29.485-84.446.101-58.334 47.264-105.507 105.557-105.596h.397zm-.376-99.061c-113.05 0-204.626 91.605-204.645 204.609 0 30.313 6.61 59.114 18.434 84.995 23.731 51.872 68.499 83.394 123.404 97.714l-3.725-7.703c-41.927-20.549-75.833-60.809-94.536-101.859-10.158-22.283-15.813-47.053-15.861-73.146.158-97.713 79.223-176.721 176.929-176.92 97.685.199 176.729 79.207 176.897 176.92-.129 72.83-44.094 144.15-106.927 174.631l-3.191 8.383c80.206-24.637 137.833-93.402 137.845-183.014-.021-113.004-91.616-204.61-204.624-204.61zm45.036 176.356c0 24.882-20.174 45.057-45.058 45.057-24.862 0-45.036-20.175-45.036-45.057 0-24.876 20.174-45.051 45.036-45.051 24.885 0 45.058 20.175 45.058 45.051z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-poker-chip.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-poker-chip.svg
new file mode 100644
index 0000000000..6f3698bd66
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-poker-chip.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256 49.756C142.1 49.756 49.758 142.098 49.758 256S142.1 462.244 256 462.244c113.902 0 206.242-92.342 206.242-206.244S369.902 49.756 256 49.756zm0 383.381c-97.674 0-177.137-79.463-177.137-177.137S158.326 78.863 256 78.863 433.135 158.326 433.135 256 353.674 433.137 256 433.137zm154.152-177.674v-.035-.051-.008-.105-.021-.105-.01-.055-.027l-.002-.074v-.049l-.004-.033v-.082-.014c0-.129 0-.26-.002-.391l-32.201.328c-.143-14.137-2.676-27.701-7.24-40.295l30.266-10.973a152.643 152.643 0 0 0-3.725-9.311c-.002-.004 0-.002-.004-.006a2.249 2.249 0 0 0-.033-.078v-.002a.87.87 0 0 1-.033-.076c-.004-.004-.004-.004-.004-.008l-.068-.156c0-.004-.002-.004-.004-.008l-.066-.152c-.004-.004-.004-.01-.008-.016-.02-.049-.043-.096-.064-.146-.004-.008-.004-.008-.004-.018-.023-.049-.047-.096-.068-.145-.002-.006-.008-.014-.008-.018-.008-.023-.023-.047-.031-.072 0-.004 0-.002-.006-.004-.008-.025-.018-.045-.027-.066 0-.004-.008-.016-.01-.021-.01-.023-.018-.045-.029-.068l-.006-.016a.372.372 0 0 1-.027-.057.047.047 0 0 0-.01-.02l-.029-.066-.008-.023a.382.382 0 0 1-.023-.051.123.123 0 0 1-.014-.025l-.029-.064-.01-.02a1.284 1.284 0 0 0-.023-.055c-.002-.01-.002-.014-.006-.021-.01-.021-.021-.045-.033-.064a.052.052 0 0 0-.01-.023.17.17 0 0 0-.023-.051c-.004-.01-.004-.016-.01-.025-.008-.02-.018-.039-.027-.064a.907.907 0 0 1-.035-.07c-.002-.008-.008-.016-.012-.025a.383.383 0 0 1-.025-.062c-.006-.01-.01-.02-.016-.027-.004-.014-.014-.031-.018-.047-.006-.008-.01-.02-.014-.029l-.029-.059c-.004-.008-.008-.018-.014-.027-.004-.016-.014-.031-.018-.047-.01-.014-.01-.018-.018-.031-.006-.02-.016-.037-.025-.055l-.014-.029c-.006-.014-.014-.029-.02-.045-.008-.02-.012-.023-.02-.043-.006-.014-.012-.031-.02-.045-.006-.008-.01-.02-.014-.029-.006-.016-.016-.033-.023-.049l-.016-.037c-.008-.014-.014-.029-.023-.047-.004-.006-.008-.02-.014-.029-.004-.014-.014-.029-.018-.041a.314.314 0 0 1-.023-.053.491.491 0 0 1-.018-.033c-.004-.014-.01-.023-.014-.033-.01-.018-.014-.035-.023-.049-.004-.014-.014-.027-.02-.043-.004-.012-.014-.025-.018-.037l-.014-.031a.243.243 0 0 1-.023-.053c-.01-.018-.016-.025-.02-.039a.18.18 0 0 0-.02-.035.159.159 0 0 0-.014-.037c-.01-.02-.016-.037-.025-.057a.088.088 0 0 0-.02-.035c-.004-.01-.008-.021-.014-.031-.004-.014-.01-.023-.016-.037l-.025-.051-.02-.041c-.004-.014-.01-.023-.014-.033l-.033-.068c-.004-.006-.004-.014-.01-.023s-.014-.027-.018-.039l-.012-.027c-.01-.021-.02-.039-.029-.061a.468.468 0 0 0-.014-.031c-.01-.014-.014-.027-.021-.041a.064.064 0 0 0-.012-.025l-.033-.068c-.004-.008-.008-.018-.014-.025-.004-.018-.01-.025-.018-.045-.006-.002-.006-.01-.01-.018-.014-.023-.025-.059-.041-.084 0-.002 0-.004-.004-.01-.004-.02-.014-.029-.02-.047-.004-.004-.004-.012-.008-.014a1.149 1.149 0 0 0-.043-.086c0-.006-.002-.01-.004-.014-.01-.018-.016-.027-.023-.045 0-.008-.006-.016-.01-.021-.01-.025-.023-.049-.035-.078-.002-.004-.008-.01-.008-.014l-.021-.047c0-.004-.004-.008-.004-.014-.014-.023-.027-.059-.041-.084-.006-.008-.006-.012-.01-.018-.023-.051-.045-.094-.07-.145 0-.004-.002-.006-.004-.01-.023-.051-.045-.1-.068-.146-.006-.008-.006-.01-.008-.016-.025-.051-.043-.094-.072-.148 0-.002 0-.006-.004-.008l-.07-.145c0-.006-.006-.014-.008-.018l-.07-.146c0-.002 0-.002-.004-.006-.023-.053-.047-.098-.07-.152-.006-.002-.006-.004-.006-.008a1.926 1.926 0 0 1-.072-.152c-.027-.053-.051-.107-.08-.156-.17-.352-.342-.699-.512-1.049 0 0 0-.002-.002-.002a154.145 154.145 0 0 0-14.738-23.904l-25.744 19.311a122.665 122.665 0 0 0-29.746-28.232l17.947-26.719a156.065 156.065 0 0 0-14.837-8.803c-.004 0-.006-.002-.008-.006-.051-.027-.098-.049-.148-.074l-.004-.002c-.051-.029-.104-.053-.154-.08l-.004-.002-.148-.078c-.004 0-.004-.004-.01-.004l-.146-.076c-.004-.002-.006-.004-.01-.004-.033-.016-.066-.035-.096-.051l-.047-.023c-.006-.002-.01-.006-.014-.006-.033-.018-.062-.031-.094-.047 0-.002-.006-.002-.006-.004-.016-.008-.027-.016-.045-.023l-.01-.004c-.031-.018-.064-.033-.092-.051-.006 0-.006-.002-.01-.002-.02-.008-.031-.016-.045-.025-.006 0-.006-.002-.01-.004l-.088-.043a.06.06 0 0 1-.016-.008l-.043-.023c-.008-.002-.012-.006-.016-.008-.027-.012-.055-.027-.084-.041l-.014-.008c-.02-.008-.027-.014-.047-.023l-.01-.004c-.025-.016-.053-.029-.082-.043l-.018-.01c-.02-.01-.029-.012-.043-.021-.006-.004-.014-.006-.02-.008-.023-.016-.049-.025-.074-.039-.008-.004-.016-.008-.023-.014-.012-.006-.031-.012-.039-.02-.008-.002-.016-.004-.02-.008a1.33 1.33 0 0 0-.076-.039l-.02-.01-.041-.021-.01-.006-.09-.043c-.004-.002-.014-.006-.018-.01-.012-.006-.031-.014-.041-.021-.004 0-.004 0-.004-.002-.027-.014-.061-.027-.094-.045l-.02-.01c-.043-.02-.096-.049-.137-.068l-.02-.01c-.027-.012-.059-.031-.086-.045h-.01c-.012-.008-.029-.016-.041-.023-.006-.004-.016-.008-.025-.012-.018-.01-.027-.016-.047-.021a.473.473 0 0 0-.045-.023l-.037-.021c-.01-.006-.021-.008-.033-.014-.018-.012-.037-.018-.055-.029-.016-.004-.023-.01-.033-.014a.158.158 0 0 0-.041-.021c-.008-.004-.014-.006-.023-.012-.023-.012-.047-.021-.064-.031l-.029-.016a.321.321 0 0 1-.037-.018l-.029-.018-.062-.029-.027-.012a.386.386 0 0 0-.041-.02.438.438 0 0 0-.084-.043.314.314 0 0 0-.037-.018.335.335 0 0 1-.037-.02.084.084 0 0 1-.033-.016c-.016-.01-.035-.016-.051-.025-.012-.004-.025-.012-.037-.018-.008-.004-.025-.014-.035-.016l-.037-.02c-.018-.008-.037-.018-.055-.025-.01-.004-.02-.012-.029-.018a.122.122 0 0 1-.035-.02c-.014-.002-.029-.01-.041-.014-.016-.008-.035-.016-.051-.025-.01-.008-.021-.012-.033-.02-.014-.006-.023-.008-.035-.016-.021-.01-.039-.02-.059-.027-.01-.004-.018-.01-.027-.014a.183.183 0 0 0-.041-.018c-.008-.008-.018-.01-.031-.018-.02-.01-.039-.02-.057-.027-.01-.006-.021-.01-.029-.016-.016-.004-.029-.012-.045-.02-.01-.008-.014-.008-.027-.014-.018-.01-.041-.02-.061-.029l-.023-.014c-.018-.006-.033-.014-.047-.02-.01-.004-.018-.01-.027-.014-.02-.008-.041-.021-.059-.031-.01-.004-.02-.006-.029-.012-.014-.006-.031-.016-.047-.021-.008-.006-.016-.008-.023-.012-.023-.01-.039-.021-.062-.031l-.025-.01c-.018-.008-.031-.018-.045-.021-.01-.006-.02-.014-.027-.016a.767.767 0 0 0-.061-.027l-.027-.016a.772.772 0 0 1-.074-.034c-.02-.01-.037-.02-.057-.027a.256.256 0 0 1-.033-.016c-.012-.008-.025-.012-.035-.018a.218.218 0 0 1-.037-.02c-.02-.008-.037-.018-.057-.021a.938.938 0 0 1-.029-.018l-.043-.02a.25.25 0 0 1-.033-.016c-.016-.01-.037-.018-.057-.027-.008-.004-.018-.01-.027-.012a.386.386 0 0 0-.041-.02l-.039-.02c-.016-.006-.035-.016-.049-.023-.01-.004-.02-.01-.027-.014-.02-.008-.033-.016-.051-.023-.01-.004-.021-.01-.031-.012-.018-.01-.033-.02-.051-.027-.01-.006-.02-.01-.029-.014a.322.322 0 0 1-.053-.025c-.008-.004-.018-.008-.025-.014-.018-.008-.037-.014-.055-.023a.1.1 0 0 1-.023-.012l-.061-.029a.174.174 0 0 1-.023-.01c-.02-.008-.035-.018-.055-.025-.008-.002-.014-.006-.023-.01a.387.387 0 0 0-.062-.029l-.021-.012c-.02-.008-.037-.018-.053-.025l-.02-.01c-.023-.01-.047-.018-.068-.029-.01-.004-.012-.004-.021-.01-.016-.008-.033-.018-.051-.021l-.021-.014a.606.606 0 0 0-.066-.029l-.023-.012-.047-.02a.191.191 0 0 0-.027-.016c-.018-.01-.041-.018-.062-.027l-.023-.01c-.016-.008-.033-.018-.053-.025-.006-.004-.014-.006-.02-.012a.889.889 0 0 1-.062-.027c-.01-.004-.018-.01-.027-.012-.014-.01-.033-.016-.049-.023l-.021-.01c-.023-.01-.047-.02-.064-.031a.526.526 0 0 0-.023-.01l-.055-.025-.02-.006c-.021-.012-.043-.021-.066-.033-.004-.002-.018-.006-.02-.008l-.059-.029c-.006-.002-.008-.002-.012-.006a2.072 2.072 0 0 0-.07-.029l-.02-.01c-.023-.01-.039-.02-.061-.029-.002-.002-.008-.002-.012-.004-.023-.012-.047-.021-.07-.033l-.023-.008a.32.32 0 0 0-.059-.027l-.01-.006a2.243 2.243 0 0 0-.154-.068l-.006-.006c-.023-.01-.047-.021-.07-.029-.01-.004-.012-.008-.021-.01-.021-.012-.045-.021-.062-.031l-.01-.004a1.069 1.069 0 0 0-.068-.029l-.018-.008c-.049-.023-.098-.043-.145-.066-.004-.002-.014-.004-.018-.008-.023-.012-.047-.02-.07-.031l-.006-.002-.068-.029c-.004-.004-.014-.008-.018-.01a1.104 1.104 0 0 1-.07-.033c-.006 0-.006 0-.01-.002l-.064-.029c-.006-.004-.014-.006-.018-.008-.023-.012-.047-.02-.07-.033l-.01-.004c-.023-.01-.047-.018-.066-.029-.006 0-.008-.004-.012-.006l-.074-.031-.01-.006c-.023-.008-.043-.018-.066-.029a.03.03 0 0 0-.014-.006l-.074-.033-.006-.004a2.072 2.072 0 0 0-.07-.029c-.006-.002-.008-.004-.012-.004-.025-.012-.049-.023-.07-.035-.006 0-.01-.002-.016-.006-.018-.01-.041-.018-.062-.027l-.016-.006c-.023-.008-.047-.021-.07-.033-.004 0-.006-.002-.012-.004-.023-.008-.047-.021-.07-.031l-.004-.002c-.029-.012-.053-.021-.08-.035-.002-.002-.004-.002-.01-.004a.631.631 0 0 1-.066-.029c-.004 0-.006-.004-.01-.006-.023-.008-.047-.02-.076-.031-.004 0-.004-.004-.008-.006a.776.776 0 0 1-.074-.031c-.004 0 .002.002-.002 0-.025-.012-.055-.023-.078-.035l-.008-.002c-.023-.012-.053-.023-.074-.033h-.004c-.023-.012-.049-.021-.074-.035a2.269 2.269 0 0 1-.162-.07c-.006-.004-.01-.004-.014-.004l-.152-.066-.01-.006a7.787 7.787 0 0 1-.152-.064c-.006-.004-.006-.006-.012-.006-.025-.012-.049-.021-.074-.031l-.008-.004-.068-.029c-.004-.002-.01-.004-.014-.008-.051-.02-.1-.041-.152-.064l-.01-.004c-.023-.01-.051-.02-.074-.033-.006-.002-.006 0-.01-.002-.023-.012-.047-.02-.07-.029-.004-.002-.004-.004-.01-.004a.87.87 0 0 0-.076-.033l-.006-.006-.074-.029c-.004-.002 0-.002-.004-.002-.027-.01-.049-.023-.078-.033l-.01-.004c-.023-.008-.045-.02-.068-.029l-.01-.006-.078-.031-.004-.002c-.023-.01-.051-.021-.076-.033h-.004c-.027-.01-.051-.023-.078-.035l-.004-.002c-.057-.02-.107-.043-.16-.066-.004 0-.004 0-.008-.004-.051-.021-.102-.041-.152-.064l-.016-.006c-.021-.008-.043-.018-.07-.027-.004-.004.004 0-.002-.004a.949.949 0 0 0-.08-.031l-.008-.006a2.876 2.876 0 0 1-.152-.064c-.006 0-.01-.002-.016-.004-.051-.02-.1-.043-.152-.062l-.014-.008-.146-.061c-.01-.002-.006-.002-.016-.006l-.152-.061a1.268 1.268 0 0 0-.088-.037l-.004-.004c-.023-.01-.045-.02-.068-.027l-.014-.006c-.027-.014-.051-.021-.078-.031-.004-.002-.002-.002-.006-.002a.817.817 0 0 0-.068-.029c-.004 0-.01-.006-.014-.008-.023-.01-.053-.02-.076-.031l-.008-.002c-.021-.008-.043-.018-.066-.025l-.016-.008-.07-.031-.016-.002-.064-.029a.037.037 0 0 1-.014-.004c-.021-.01-.051-.02-.074-.033-.004 0-.008 0-.014-.002-.018-.01-.041-.018-.061-.027-.004-.002-.014-.004-.018-.008l-.068-.027a.06.06 0 0 1-.02-.004c-.02-.01-.041-.018-.061-.027-.01-.006-.01-.002-.02-.008-.023-.008-.045-.018-.068-.027l-.016-.008-.061-.023-.016-.008-.07-.027a.207.207 0 0 1-.02-.008c-.021-.01-.041-.016-.064-.025-.004-.002-.008-.004-.014-.004a2.072 2.072 0 0 0-.07-.029c-.004-.004-.012-.006-.016-.008-.023-.01-.043-.016-.066-.025l-.008-.004a1.005 1.005 0 0 0-.076-.027l-.018-.01c-.021-.01-.041-.016-.061-.025a.67.67 0 0 0-.084-.033.064.064 0 0 1-.023-.01l-.059-.021c-.008-.002-.014-.006-.023-.01-.018-.008-.037-.018-.059-.021a.084.084 0 0 0-.023-.01l-.059-.027c-.01-.002-.016-.006-.023-.008-.02-.008-.039-.016-.061-.023a.073.073 0 0 1-.025-.01c-.018-.006-.041-.016-.062-.025a1.284 1.284 0 0 0-.104-.041c-.023-.008-.041-.018-.064-.027-.006 0-.012-.004-.018-.004a.56.56 0 0 0-.059-.023c-.002-.002-.016-.006-.021-.01-.021-.01-.045-.018-.068-.027a.046.046 0 0 1-.021-.008c-.016-.004-.033-.012-.053-.02a.1.1 0 0 1-.023-.012c-.023-.008-.047-.016-.064-.025a.142.142 0 0 1-.029-.01l-.045-.018c-.014-.004-.014-.006-.027-.012l-.064-.025a.11.11 0 0 1-.033-.012.127.127 0 0 1-.037-.018c-.014-.002-.018-.004-.031-.01-.023-.008-.043-.016-.066-.021a.307.307 0 0 0-.031-.016c-.016-.004-.023-.01-.039-.018-.012-.002-.016-.004-.029-.01-.023-.008-.043-.018-.061-.023-.016-.006-.023-.01-.039-.014-.014-.004-.023-.01-.037-.014-.01-.006-.021-.008-.031-.014a.404.404 0 0 0-.061-.023l-.031-.014c-.016-.004-.029-.01-.043-.014-.01-.006-.023-.01-.033-.014-.018-.008-.039-.014-.059-.023l-.035-.014c-.012-.002-.025-.01-.039-.014-.01-.004-.029-.01-.037-.016-.02-.008-.035-.014-.055-.02a.22.22 0 0 1-.031-.016c-.014-.002-.029-.008-.043-.012-.014-.008-.037-.016-.051-.021-.012-.006-.027-.01-.039-.014-.014-.008-.025-.012-.039-.018l-.035-.014c-.02-.008-.035-.01-.053-.018a1.772 1.772 0 0 0-.039-.016c-.01-.002-.027-.012-.037-.014l-.037-.016c-.02-.008-.035-.014-.055-.02l-.039-.014a.682.682 0 0 1-.037-.016c-.01-.002-.02-.008-.031-.012-.02-.008-.049-.02-.068-.023a.096.096 0 0 0-.027-.012l-.041-.018c-.008-.002-.018-.008-.027-.01a1.273 1.273 0 0 0-.074-.027l-.02-.008-.051-.02-.008-.002c-.027-.012-.059-.023-.084-.033l-.023-.008a.237.237 0 0 1-.047-.02.037.037 0 0 1-.014-.004c-.025-.01-.057-.02-.084-.033-.008-.002-.018-.004-.021-.006l-.148-.055c-.004-.004-.014-.006-.018-.008l-.047-.018c-.006-.002-.01-.004-.014-.004-.029-.012-.061-.023-.088-.035a.081.081 0 0 0-.02-.006c-.051-.02-.102-.037-.152-.057 0-.002-.004-.002-.008-.004-.053-.018-.104-.035-.152-.055-.004-.004-.01-.006-.014-.008l-.158-.055c0-.002-.004-.002-.008-.006a4.362 4.362 0 0 1-.16-.059h-.008a.828.828 0 0 0-.102-.039.645.645 0 0 0-.057-.02s-.004-.004-.008-.004a5.419 5.419 0 0 0-.158-.059h-.004a153.644 153.644 0 0 0-7.883-2.635l-9.365 30.809a121.862 121.862 0 0 0-35.525-5.275h-.004v-32.172H255.445c-.025 0-.051 0-.078.002H254.988c-.023 0-.047.004-.07.004h-.206c-.025 0-.051 0-.074.002h-.189l-.08.002H254.264c-.025 0-.053 0-.08.002h-.185c-.002.004-.006.004-.014.004H253.899c-.029 0-.057 0-.082.002H253.713l-.08.002h-.102c-.027.002-.055.002-.082.002h-.006c-.025 0-.051 0-.076.004h-.02c-.057 0-.107 0-.164.002h-.021c-.023 0-.047 0-.068.002h-.092c-.006 0-.016 0-.02.002H252.9l-.084.002h-.018l-.07.002h-.014c-.027 0-.057 0-.084.002h-.086c-.008 0-.008 0-.012.002h-.092c-.023.004-.051.004-.074.004h-.018c-.027.002-.057.002-.084.002h-.004l-.08.002h-.014c-.061.002-.111.002-.172.006h-.012l-.168.004h-.014c-.027.002-.055.002-.082.002-.006 0 .004 0 0 0-.029.002-.057.002-.084.002h-.018c-.025.002-.051.002-.08.002h-.002c-.029.002-.059.002-.086.002-.004.002-.008.002-.014.002-.021 0-.049 0-.074.004h-.008c-.029 0-.057 0-.084.002h-.016l-.072.002h-.014l-.084.002h-.01c-.021.004-.049.004-.072.004-.008 0-.01.002-.014.002-.029 0-.057 0-.088.002h-.002l-.08.002h-.016a4.842 4.842 0 0 1-.166.008h-.016c-.055.002-.109.002-.166.006-.004 0-.01 0-.014.002-.027 0-.053 0-.08.002h-.102c-.027.004-.055.004-.078.006h-.01l-.082.002h-.01c-.027.002-.057.002-.084.006h-.004l-.086.002h-.006l-.084.004h-.008a70.78 70.78 0 0 1-.172.006h-.01l-.172.008h-.008a4.727 4.727 0 0 0-.172.008h-.01l-.176.01h-.004l-.176.006h-.004a1.727 1.727 0 0 1-.176.008h-.006a153.748 153.748 0 0 0-37.578 6.461l9.354 30.811a121.457 121.457 0 0 0-36.58 18.328l-19.057-25.953a155.28 155.28 0 0 0-15.219 12.754v.002c-.168.156-.334.314-.5.477v.002l-.084.078v.004l-.121.113c-.004 0-.004.006-.01.006-.035.035-.072.076-.113.113l-.01.012-.115.111c-.006.002-.006.008-.01.01-.041.037-.074.07-.117.111-.004.002-.004.006-.01.008-.025.025-.045.049-.074.074-.002 0-.002.002-.002.002l-.037.035c-.006.004-.01.01-.012.012-.021.02-.049.045-.066.064-.004.004-.004.008-.008.01-.016.016-.021.023-.037.033l-.016.02c-.023.02-.037.037-.061.057l-.014.016c-.014.014-.023.02-.037.033l-.012.014c-.02.02-.043.039-.062.061-.004.006-.008.008-.014.014l-.037.035c-.002.002-.004.006-.01.01-.018.02-.041.039-.059.059l-.023.021c-.01.01-.023.02-.033.033 0 0 0 .002-.004.004-.023.023-.047.045-.07.07l-.014.014-.109.107c-.006.004-.01.012-.02.018-.018.018-.033.031-.049.051-.008.006-.018.016-.025.023-.01.01-.018.02-.029.029l-.02.018-.057.061c-.006.002-.01.006-.016.012-.014.012-.023.023-.033.033-.008.006-.014.014-.021.02-.016.018-.031.035-.051.053-.006.006-.014.016-.023.021-.004.008-.023.023-.027.031a.148.148 0 0 0-.027.021c-.016.016-.029.033-.043.045l-.027.027c-.008.01-.018.018-.027.027l-.027.031a.38.38 0 0 1-.043.037.37.37 0 0 1-.027.029c-.01.012-.016.016-.027.025-.016.018-.029.029-.043.047-.008.006-.016.016-.025.021-.01.014-.02.023-.031.033-.006.008-.016.014-.021.021l-.047.045c-.014.012-.014.016-.023.025-.014.01-.021.021-.031.031-.008.008-.018.016-.021.023-.016.016-.033.031-.047.047-.012.012-.014.016-.029.023l-.027.031c-.01.006-.018.021-.027.027l-.041.041c-.004.008-.018.02-.021.023-.016.012-.023.023-.037.035a.182.182 0 0 1-.031.031l-.035.037c-.004.006-.02.018-.023.023l-.035.037-.029.027c-.014.014-.021.025-.037.035a.084.084 0 0 1-.023.023 1.09 1.09 0 0 1-.061.067c-.014.012-.025.027-.039.039-.006.002-.018.018-.02.02-.018.018-.033.035-.051.051l-.018.016c-.012.016-.025.027-.039.039a.095.095 0 0 1-.02.02.565.565 0 0 1-.049.051c-.004.008-.01.012-.016.02-.012.01-.025.025-.041.035a.05.05 0 0 1-.018.021c-.018.016-.033.033-.053.053 0 0-.008.01-.014.014-.012.014-.025.027-.039.045l-.014.01c-.02.02-.039.037-.053.055a.065.065 0 0 1-.018.016c-.016.014-.029.031-.043.045-.004.004-.014.012-.014.014l-.049.053-.018.018c-.016.018-.035.033-.053.051l-.006.006a.307.307 0 0 1-.051.051l-.014.016c-.018.02-.031.035-.051.053-.002.004-.014.014-.014.018l-.041.041c-.006.002-.016.016-.02.018a.638.638 0 0 1-.051.053l-.012.014a.48.48 0 0 0-.043.047l-.014.01c-.02.018-.035.037-.053.057l-.016.014-.045.047c-.004.002-.008.008-.012.01-.018.02-.033.039-.051.057-.006.004-.01.01-.014.012a1.203 1.203 0 0 1-.049.051l-.008.006c-.02.02-.037.041-.057.059a.042.042 0 0 0-.008.012l-.055.057c-.006.002 0 0 0 0l-.059.059c-.002.006-.008.01-.012.014l-.109.113c-.006.006-.01.01-.01.012-.041.041-.08.078-.117.119l-.006.008c-.02.021-.039.039-.057.061l-.057.059c-.006.004-.006.008-.01.01l-.057.059-.002.006-.061.059v.002a2.39 2.39 0 0 0-.119.129h-.004l-.059.062-.004.004c-.043.043-.08.08-.119.123l-.006.006c-.037.041-.074.082-.115.123l-.006.006a3.403 3.403 0 0 0-.115.125c-.004.002-.004.002-.004.004a1.42 1.42 0 0 0-.119.127c-.043.041-.084.086-.123.125l-.004.004-.057.061-.002.006a155.489 155.489 0 0 0-10.976 13.057l25.738 19.318a121.582 121.582 0 0 0-18.707 36.395l-30.705-9.684c0 .004 0 .004-.004.01-.004.02-.014.043-.02.064-.004.008-.004.02-.008.029l-.016.043-.008.031a.228.228 0 0 0-.02.064c-.004.01-.01.018-.01.027-.004.016-.01.027-.014.043-.004.01-.01.021-.012.031-.008.021-.012.041-.018.059a.16.16 0 0 1-.01.033l-.016.045c0 .01-.004.021-.008.031-.006.02-.01.037-.02.057-.002.014-.004.018-.01.035-.004.012-.01.027-.014.045a.094.094 0 0 1-.01.031c-.004.016-.01.029-.014.043-.004.02-.01.031-.014.049a.27.27 0 0 0-.014.043c-.006.01-.01.027-.012.035l-.012.035-.02.064c-.004.008-.004.018-.01.027a.27.27 0 0 1-.012.043c0 .01-.004.021-.01.031-.004.023-.014.047-.02.07-.004.01-.008.016-.008.025l-.014.043c-.006.01-.006.018-.01.025-.014.047-.027.096-.043.146-.004.006-.004.014-.008.021-.016.047-.029.1-.043.145-.004.006-.004.016-.01.023l-.012.045c0 .006 0 .008-.004.012-.008.029-.02.062-.025.092-.004.006-.004.014-.008.02l-.014.047c0 .004-.002.008-.006.014a1.83 1.83 0 0 1-.027.088c0 .008-.002.014-.004.021l-.016.047c0 .004-.004.01-.004.014-.01.029-.018.066-.027.094 0 .006-.002.008-.006.012a.38.38 0 0 1-.014.051c0 .004-.004.008-.004.012a1.01 1.01 0 0 0-.027.094c0 .006 0 .008-.004.016-.004.018-.01.027-.014.045 0 .008-.006.014-.006.021l-.027.09c0 .002 0 .008-.004.012l-.016.049c0 .004 0 .012-.004.014a3.64 3.64 0 0 1-.045.158c0 .004 0 .008-.004.01a1.985 1.985 0 0 1-.049.16c0 .006 0 .008-.002.012a1.52 1.52 0 0 1-.045.156c-.002.006-.002.008-.002.014-.02.057-.033.104-.047.16-.004.002-.004.006-.004.008-.018.059-.033.105-.047.166 0 .002-.004.002-.006.004-.021.078-.039.148-.062.227v.004c-.02.057-.033.111-.051.166 0 .002 0 .002-.002.002a1.447 1.447 0 0 1-.047.166v.01c-.018.057-.031.109-.051.168-.012.053-.029.109-.045.164 0 .004 0 .01-.004.012-.014.061-.029.107-.047.166-.014.057-.033.113-.047.172v.002c-.055.188-.105.379-.162.568v.006c-.25.895-.49 1.795-.721 2.699-.047.174-.088.344-.135.518v.002c-.08.309-.154.615-.23.926l-.086.348s-.002 0-.002.002c-.102.424-.203.848-.307 1.275-.027.119-.055.23-.08.346a4.343 4.343 0 0 0-.039.178s-.002 0-.002.004c-.006.018-.008.035-.012.055 0 .002-.004.002-.004.004-.006.035-.016.072-.023.104v.012l-.016.053c0 .004 0 .008-.002.014l-.037.16c-.002.002-.002.008-.002.012a1.493 1.493 0 0 0-.035.164c0 .002-.004.004-.006.01-.014.057-.023.104-.037.16v.016l-.037.16c-.004.006-.004.008-.004.014-.014.051-.023.104-.039.16 0 .002 0 .01-.002.018-.002.018-.006.029-.012.047v.008c-.01.033-.014.066-.023.102 0 .004-.004.01-.004.014l-.008.053a.021.021 0 0 0-.004.01c-.006.031-.016.068-.021.098-.002.006-.002.012-.002.016l-.016.049v.018l-.021.092c0 .006 0 .01-.002.016-.004.014-.008.035-.014.049a.071.071 0 0 1-.004.02c-.004.031-.014.064-.02.094-.002.004-.004.008-.004.014-.002.014-.004.031-.01.047a.087.087 0 0 0-.004.025c-.008.025-.014.053-.02.076 0 .01-.004.018-.004.025-.006.016-.008.031-.01.043-.004.012-.004.02-.006.027-.014.049-.02.1-.029.148-.006.01-.006.018-.01.027 0 .016-.004.027-.01.045 0 .008-.004.02-.004.027a1.72 1.72 0 0 1-.016.074c-.004.01-.004.02-.008.029-.002.012-.004.027-.01.043 0 .01-.004.021-.004.029l-.016.072c-.004.01-.004.02-.008.029a.246.246 0 0 1-.01.041c0 .01-.004.02-.004.029-.008.031-.01.045-.02.072 0 .014-.002.02-.004.029-.006.016-.006.031-.01.045 0 .008-.006.018-.006.027a.396.396 0 0 1-.016.07.16.16 0 0 1-.008.033c0 .01-.004.029-.008.037 0 .016-.006.027-.006.041-.002.02-.008.041-.012.061-.004.01-.004.023-.01.037-.004.014-.004.025-.008.039 0 .012-.006.023-.006.035-.004.016-.004.023-.01.037-.004.02-.008.041-.014.062a1.704 1.704 0 0 0-.006.039c-.004.012-.008.023-.008.035-.004.016-.004.025-.01.039l-.014.062c0 .012-.004.02-.004.035a.103.103 0 0 0-.01.041c-.006.016-.006.018-.01.033-.004.021-.01.041-.014.066 0 .01-.002.02-.006.029-.004.018-.004.029-.008.045-.006.016-.006.02-.008.035-.002.02-.008.041-.012.061-.004.01-.004.023-.01.033 0 .016-.004.031-.006.049 0 .008-.006.018-.006.027l-.014.066-.004.025a.164.164 0 0 0-.01.051c-.006.012-.006.023-.01.033-.002.016-.004.035-.01.051-.004.014-.004.027-.01.043-.004.018-.004.031-.008.047 0 .01-.006.023-.008.033-.002.016-.008.031-.01.049l-.006.035-.016.061c0 .01-.002.02-.004.027-.004.018-.004.033-.01.051-.002.01-.004.018-.004.027-.006.021-.01.047-.014.066-.006.012-.006.021-.008.031-.002.018-.008.033-.012.049 0 .01 0 .018-.004.027-.006.023-.01.047-.014.068 0 .012-.006.02-.006.029-.002.018-.002.031-.008.049-.002.01-.004.018-.004.027l-.014.07c-.006.01-.006.02-.008.029-.002.014-.006.029-.008.047a1.082 1.082 0 0 0-.022.099c0 .01 0 .012-.006.021a.247.247 0 0 1-.01.053c0 .012-.004.02-.004.029l-.014.068c0 .006-.006.018-.006.023a.26.26 0 0 0-.008.055c-.006.012-.006.02-.01.027a.576.576 0 0 1-.01.066c-.004.008-.004.018-.004.021l-.014.057c0 .01-.002.02-.004.029-.006.02-.008.041-.01.062-.006.002-.006.012-.006.018-.004.021-.008.047-.014.068-.002.01-.004.016-.004.023l-.012.068v.008c-.006.025-.01.053-.016.074a.159.159 0 0 0-.004.023l-.014.066v.014c-.008.025-.012.047-.018.072-.002.008-.002.018-.002.021-.004.021-.008.043-.014.062 0 .01 0 .008-.004.02-.006.023-.01.047-.014.07 0 .012 0 .014-.004.023a.314.314 0 0 1-.012.061.088.088 0 0 1-.004.02l-.014.074c0 .01 0 .008-.004.018-.002.02-.006.041-.01.064 0 .004-.006.012-.006.016l-.014.076c0 .004 0 .012-.002.02-.002.021-.008.041-.012.061 0 .006-.006.016-.006.02a.526.526 0 0 1-.012.078v.002l-.014.076c0 .006-.004.014-.004.018l-.016.074v.01c-.004.025-.008.051-.014.072-.002.012 0 .01-.004.02l-.014.076v.002l-.014.078c0 .006 0 .012-.006.018-.002.021-.008.049-.012.072l-.002.006-.014.082v.01c-.006.025-.01.053-.014.076l-.006.006-.014.084v.008l-.014.076v.01c-.012.055-.021.109-.031.166v.008c-.01.055-.018.109-.031.166-.002.008-.002.002-.002.008-.008.057-.018.111-.027.168v.006a4.868 4.868 0 0 0-.033.166v.01c-.01.055-.018.111-.027.166-.004.006-.004.004-.006.01l-.027.166v.006a3.02 3.02 0 0 0-.025.17l-.004.004-.029.172v.004a155.447 155.447 0 0 0-2.17 24.326l32.201.336c-.006.436-.035.863-.035 1.301 0 13.701 2.293 26.859 6.461 39.154l-30.521 10.336a156.165 156.165 0 0 0 3.668 9.727l.141.33c.021.055.045.109.068.166l.07.162c.047.109.092.219.139.33l.07.162c.035.084.068.164.105.246v.004l.07.16c.002.006 0-.002 0 .004l.068.16.004.006c.023.051.047.105.066.158l.004.002.07.162v.002c.021.055.045.107.068.158l.004.01c.023.049.047.104.07.158v.002l.068.16c.004.006 0-.002 0 .004.014.027.023.051.037.078.014.029.023.055.037.08v.004l.035.08.002.002c.01.025.023.051.033.078l.002.002c.01.027.021.055.033.078l.002.008c.014.025.021.053.037.074v.006l.033.078c.004.006.004 0 .004.006.01.023.023.049.031.074l.002.002c.014.027.023.051.037.078 0 .006 0 .004.004.008.021.051.045.104.064.154l.008.01c.01.027.02.049.033.074v.002l.031.074.008.014c.021.051.045.104.066.15l.004.012c.023.053.047.1.07.15a7.438 7.438 0 0 0 .074.164v.01c.021.049.049.102.072.15l.002.01c.023.053.047.102.07.156.004.004.004.002.004.006.014.027.023.051.037.078v.004c.012.023.021.047.031.07.004.006.004.006.004.01.014.027.023.053.037.078v.004c.01.023.023.047.033.072l.006.01c.012.025.021.047.031.072.006.004.006.008.006.01.014.023.023.047.031.068l.006.01.033.074.002.008c.014.027.023.053.037.076.01.027.023.053.035.078.002.004.002.006.006.01.01.023.02.049.031.07l.002.006c.014.025.023.053.039.076 0 .006 0 .006.002.01l.033.072v.002c.014.025.023.053.037.074 0 .006 0 .01.004.014l.07.148.006.012.068.15c.002.006.004.008.004.012l.07.152c.004.002.004.002.004.008.014.023.023.051.037.076v.002c.016.025.023.047.033.072.006.004.006.008.008.012.01.025.023.047.033.072.002.006.004.006.004.01l.033.066c0 .004.002.008.004.014.012.021.023.047.035.074l.002.006c.012.021.023.047.033.068.006.002.006.004.006.01.014.027.023.049.035.074l.004.01c.01.021.021.047.033.068l.004.008.033.076.004.008c.016.025.023.049.039.076.01.023.023.051.037.074 0 .006 0 .006.004.01l.031.072.002.002c.012.027.025.051.035.08.004.002.004.002.004.006.023.051.053.104.076.152 0 .006 0 .002.004.008l.07.152.002.008c.023.051.051.1.074.152l.006.01.074.152v.002c.025.055.049.105.076.156.002.006.002.002.002.008.025.051.051.102.074.152l.004.008c.023.053.051.1.074.154.002.004 0 0 .004.004.023.051.051.105.074.156v.004c.029.053.055.104.078.158.014.027.029.051.041.078l.002.004c.012.023.023.051.037.078v.002a.511.511 0 0 1 .037.074l.004.006c.01.023.023.049.039.074v.004c.012.025.025.051.035.076.004.004.002.004.004.006.023.053.051.104.074.154l.006.004c.023.055.051.104.072.156l.006.004c.021.051.051.104.076.154l.002.002c.025.053.053.104.08.158v.002c.025.053.049.105.078.156v.004c.027.051.051.104.078.154.002.006 0 0 0 .004.029.051.055.104.078.156l.002.002a.732.732 0 0 0 .041.078v.004c.027.049.055.104.078.152l.002.004.08.156v.004l.08.154v.002c.027.053.055.105.078.154.004.006 0 .004.004.006.029.053.053.104.08.154v.002c.027.055.055.104.076.158h.006c.021.053.051.104.078.158v.002c.029.049.053.102.08.15l.004.008c.027.053.051.102.078.152v.004c.027.053.057.102.084.154 0 .004-.002 0 0 .004.055.102.105.209.162.312v.002a153.39 153.39 0 0 0 7.891 13.428c0 .004-.004-.004 0 .002.033.047.061.094.094.145h.002c.033.049.062.098.094.145l.004.004c.016.023.031.049.045.07l.002.004c.018.021.031.049.047.07l.004.004c.014.021.033.047.045.07l.006.006.041.064.006.008.045.068c.004.004 0 .002.004.006.014.021.033.047.047.07.016.023.033.047.047.072.004.004 0 0 .004.002.014.025.033.047.047.072.004.002 0-.002 0 .002.018.02.031.045.045.066.004.004.004.006.008.008.029.047.062.094.09.139.006.006.008.008.01.014.014.02.029.041.041.064h.004c.014.021.027.047.045.068l.006.01.094.137c0 .004.006.008.006.012.018.023.029.045.045.066.004.004 0 0 .004.006.014.02.027.039.043.059 0 .006.004.012.008.016a.943.943 0 0 1 .045.066c.002.004-.002 0 .002.002.016.02.029.041.043.062a1.037 1.037 0 0 0 .049.079c.008.006.01.006.014.016.01.018.023.033.033.053.006.002.01.01.014.014l.043.064.01.016a.184.184 0 0 1 .031.049l.014.018.041.061c.006.006.01.014.014.021l.029.043c.01.006.014.014.018.023.016.02.023.037.037.059l.02.021c.01.014.018.029.025.043l.016.021c.014.018.025.037.037.055.01.014.01.014.018.029.01.012.02.025.029.039.008.008.008.014.018.021.01.018.023.037.037.055.006.01.016.021.018.029.01.01.014.023.023.035.01.01.02.027.027.037l.029.043.023.031c.004.01.014.021.018.029.014.018.023.035.035.051.008.01.018.021.021.031.008.01.018.027.023.035.008.008.012.018.018.027a1.613 1.613 0 0 1 .055.079c.014.018.02.025.029.041.004.006.008.014.016.02a.367.367 0 0 0 .045.064l.012.021c.01.012.018.025.027.037.004.008.01.016.014.021.014.021.033.043.045.064a.07.07 0 0 0 .014.018c.012.016.016.025.029.043.002.002.006.008.006.012.02.021.037.047.049.072.006.004.01.012.014.02.033.041.062.086.094.131 0 0 .006.006.006.008.031.047.061.088.096.137l.002.004c.035.049.064.094.102.141l.096.143v.002c.314.445.631.889.949 1.33l26.162-18.785a122.644 122.644 0 0 0 29.145 28.846l-18.518 26.355a151.566 151.566 0 0 0 7.062 4.676c.004.002-.004-.002 0 0 .051.033.098.064.148.094l.002.002c.047.031.1.061.146.09l.004.002c.051.031.096.062.146.09l.006.006c.047.031.096.059.143.088l.008.006.145.088.006.004c.047.027.098.059.145.088l.008.004a.66.66 0 0 0 .07.043c.023.016.047.031.07.045l.008.006c.023.014.047.029.074.043v.002c.023.014.047.027.07.039l.008.006c.023.016.047.029.07.045l.004.002c.023.016.047.027.07.043l.004.004.072.043.008.004c.023.014.045.025.068.041l.002.002c.025.016.049.027.072.045l.01.004c.02.016.041.025.061.041.002.002.008.002.012.002.02.016.043.029.064.043l.016.006c.018.014.041.025.061.037a.035.035 0 0 0 .01.008l.068.039a.912.912 0 0 0 .073.045l.01.006.064.039c.008.006.008.008.018.012.02.014.037.023.061.035l.01.008c.021.01.043.025.061.037.01.004.014.008.021.012.02.01.037.023.057.033.01.004.01.008.02.012a.8.8 0 0 1 .055.033c.01.004.014.01.023.014.02.01.035.02.051.033.014.006.018.01.027.014.02.01.033.02.047.029l.027.014c.018.012.035.021.053.031.006.006.021.014.027.018a.762.762 0 0 1 .068.041c.023.014.041.023.061.037a.1.1 0 0 1 .023.012c.012.01.025.02.041.025a.551.551 0 0 0 .088.051l.023.018c.014.004.027.014.041.021.008.008.018.012.027.018.02.01.037.021.057.033l.027.014c.014.01.029.02.047.029.004 0 .014.008.02.01a.364.364 0 0 0 .059.037c.008.006.018.01.027.016l.043.025a1.097 1.097 0 0 0 .082.047l.027.02c.014.008.027.014.037.021.01.004.021.01.029.016l.055.035c.012.006.018.01.031.014.014.008.023.016.037.025.014.008.029.014.037.021.02.008.033.018.047.027.016.006.021.01.033.018s.021.016.033.02l.043.027a.9.9 0 0 0 .043.023c.01.004.023.012.033.018.012.01.023.016.037.023a.364.364 0 0 0 .039.023l.043.025c.01.004.023.014.033.018.012.008.023.016.037.021.016.012.027.016.043.029.012.006.025.012.035.02.008.004.027.012.037.018l.037.023c.016.01.027.016.047.025.01.008.021.014.031.021.014.008.021.01.037.018.012.01.027.016.037.025l.047.027c.01.004.023.01.033.018.014.006.021.012.035.02.008.008.023.012.031.02.023.014.033.018.053.029.012.008.023.012.033.02.014.008.023.014.037.02.012.01.025.016.039.025.02.01.029.016.043.025.012.006.023.01.033.018a.092.092 0 0 1 .031.02l.043.021c.016.01.031.02.049.029l.023.016c.043.021.09.049.129.074.01.004.014.008.023.012l.131.074.021.014c.029.014.057.031.084.045 0 .002.006.004.006.004a.273.273 0 0 0 .047.027c.004.002.008.006.014.008a.577.577 0 0 0 .092.051v.004c.018.008.027.014.045.023l.014.008c.027.018.055.033.078.047.004.002.012.004.018.008.016.01.025.016.043.025.006.002.01.006.014.006l.084.047c0 .004.004.006.008.008.02.008.029.014.047.023l.014.01a1.198 1.198 0 0 1 .094.053c.02.008.029.016.045.025.006.002.008.006.01.006l.09.049c.004 0 .006.002.008.006.02.01.033.014.047.023.004.004.006.004.006.004.025.016.059.033.092.051.004.002.006.006.012.008.016.012.027.016.043.025.006.002.006.004.01.004l.082.049c.006.004.012.004.02.008.01.008.027.018.041.023l.01.004c.027.018.061.035.088.051a7.064 7.064 0 0 0 .307.17c.004.002.008.006.014.008l.141.078c.002.004.006.006.008.006l.146.08c0 .002.004.002.004.004l.15.082h.002c.051.027.102.057.15.082l.002.002c.135.074.27.15.408.223l.152.084v.002c.051.027.098.051.146.08l.01.002a22.496 22.496 0 0 0 .313.168l.299.164h.006a151.067 151.067 0 0 0 7.615 3.816v.004c.516.236 1.025.475 1.541.707l.004.002c.051.025.096.045.152.07.004 0 .004.002.01.004.057.023.104.045.152.07h.004c.055.023.104.047.158.07l.004.004c.055.021.104.043.154.068l.008.002.154.07.01.004c.049.021.1.043.152.068l.004.002c.037.016.059.027.096.045.006 0 .006.002.01.002.016.008.033.012.049.021.004 0 .008.004.008.004.037.014.059.027.096.041 0 .002.006.002.01.006.016.008.033.012.049.021h.002c.033.016.066.029.098.043l.014.004c.018.01.027.016.047.023l.014.006c.027.012.061.025.088.035l.012.008a8.53 8.53 0 0 1 .165.074.222.222 0 0 1 .045.02l.008.002c.025.01.062.027.086.039.01.004.018.008.023.008l.143.064.02.006.143.064.016.004c.045.023.102.045.146.066.004.004.014.006.018.006a.624.624 0 0 0 .094.039c0 .004.004.004.004.006a.222.222 0 0 1 .045.02l.023.01c.023.01.053.02.076.029a.052.052 0 0 0 .023.01c.01.008.025.014.039.02a.161.161 0 0 0 .023.012l.07.031c.01.002.02.008.027.008l.041.02.023.01.074.031a.17.17 0 0 0 .023.012c.014.004.029.012.043.016l.025.012c.023.01.043.02.066.029.008.002.02.008.029.012.01.006.031.012.041.018l.027.014.068.027c.01.004.018.006.025.012l.041.016c.008.006.021.01.025.014.023.01.045.018.068.029a.733.733 0 0 1 .103.044c.018.006.037.016.055.023l.037.016c.014.004.023.008.037.014.014.008.031.014.047.021a.182.182 0 0 1 .045.02l.035.012c.012.008.021.01.035.014.018.01.037.02.055.025l.039.018.035.012a.2.2 0 0 0 .033.016c.018.01.041.018.061.025.014.006.018.01.031.014.016.006.029.01.039.016.012.004.016.008.029.014.023.008.043.018.061.023.016.008.023.012.039.018.01.004.023.01.037.014.012.008.018.01.031.016.018.008.039.018.061.021l.031.016c.016.008.029.012.043.02.01.002.02.006.027.01l.059.025c.016.004.023.01.039.014.008.006.023.01.033.016.014.008.037.012.051.02s.025.012.045.02a.106.106 0 0 0 .031.014c.016.004.025.012.039.016.018.006.031.014.051.021.014.004.027.012.039.016.01.006.029.012.035.016.014.006.029.01.043.018a.702.702 0 0 1 .045.018c.014.008.027.012.047.02a.178.178 0 0 1 .029.012c.018.008.033.016.051.023.01.002.023.01.033.012l.051.02c.01.004.02.008.029.014.02.006.039.016.059.023a.619.619 0 0 1 .08.033c.008.002.014.006.023.01.021.01.045.018.066.027l.02.008c.02.006.033.014.051.021.01.002.02.008.029.01l.062.027c.01.004.014.004.023.01.02.006.033.012.053.02.004.002.021.008.023.01.023.01.047.018.066.027l.02.01c.02.008.037.016.057.02.01.004.014.008.023.01.023.01.047.018.066.027.01.002.012.006.02.01.02.008.037.016.057.02.01.006.014.006.023.01.021.01.043.02.064.027.006 0 .02.008.023.008.018.008.037.018.055.023l.02.006.07.029c.004.004.014.006.018.008.023.008.041.018.059.023.006.002.016.004.02.008l.07.029a.058.058 0 0 0 .018.004l.061.027c.004.002.008.006.014.006l.074.029c.004 0 .012.002.016.006.023.01.045.016.068.029.006 0 .004 0 .008.002l.074.027.02.008.064.027c.004.002.004 0 .01.002.021.01.047.02.072.029.01.002.004.002.014.008.053.018.102.037.152.059l.012.004c.025.012.055.02.078.031h.004l.072.029c.006 0 .01.004.016.006l.074.029.008.002.07.029.014.004.074.029c.006.002.006 0 .01.002l.068.029c.004.002.01.002.012.004l.076.031.01.002.07.027c.004.004.004.004.01.004l.078.031.008.002c.023.012.053.021.076.031l.004.002c.025.008.049.018.078.029l.006.002.078.029.004.004.078.029.01.002c.023.01.051.02.076.029h.002c.029.014.053.023.078.033h.006c.055.021.111.041.16.062l.01.002c.051.021.107.041.162.062l.004.002.164.064h.004c.109.041.221.086.332.125 2.123.803 4.266 1.557 6.434 2.264l10.018-30.615a121.786 121.786 0 0 0 37.961 6.057c.859 0 1.709-.047 2.566-.064l.66 32.205.311-.008h.004l.178-.004h.012c.066-.004.113-.004.172-.006h.02l.16-.004h.029l.047-.002h.018l.092-.002h.023c.02-.002.037-.002.051-.002h.023c.033-.002.055-.002.084-.002.01 0 .02-.004.031-.004h.047c.01 0 .016 0 .023-.002.029 0 .053 0 .086-.002h.023c.018 0 .033 0 .047-.002h.037c.02 0 .045-.004.064-.004h.041c.01-.002.029-.002.041-.002.016 0 .029 0 .043-.002h.041l.061-.002h.037c.014-.004.029-.004.047-.004.01 0 .018 0 .031-.002.021 0 .047 0 .07-.002h.033l.049-.002h.027c.023-.004.047-.004.072-.004l.031-.002c.02 0 .037 0 .053-.002h.029l.072-.002h.025c.02-.002.043-.002.059-.002l.025-.002.074-.002h.023c.02-.002.041-.002.061-.002l.023-.004.078-.002h.014c.023-.002.047-.002.07-.002l.021-.002.078-.002h.016c.023-.002.047-.002.07-.002.006-.002.006-.002.016-.002l.168-.008h.012l.084-.002c.027-.002.057-.002.084-.006h.012l.174-.006.008-.004.084-.002h.004l.09-.004c.092-.006.18-.008.271-.012.119-.006.242-.012.361-.02a153.77 153.77 0 0 0 28.225-4c.258-.059.514-.121.768-.186.059-.012.115-.027.172-.039.055-.016.111-.027.172-.043.053-.014.111-.029.166-.041h.006c.055-.014.109-.027.164-.043.006 0 .002 0 .008-.002l.164-.039.004-.004.082-.018.002-.002c.055-.012.111-.027.168-.041h.004l.166-.041.004-.002c.055-.016.111-.029.166-.043.006 0 0 0 .006-.002.051-.014.107-.029.16-.041h.01c.055-.016.105-.027.162-.043l.008-.002c.053-.016.107-.027.164-.043l.004-.002c.057-.012.111-.027.166-.039l.006-.004.166-.043c.057-.016.111-.027.168-.045h.002c.029-.008.057-.016.086-.02a.71.71 0 0 1 .082-.025h.004c.025-.008.051-.012.08-.02l.004-.002c.055-.014.111-.027.166-.045.006 0-.004.002.002 0 .057-.012.107-.029.164-.043l.008-.002c.053-.014.107-.029.164-.041l.004-.004c.057-.014.111-.031.162-.043l.01-.004c.055-.012.109-.027.166-.043l.422-.115.166-.045h.004c.057-.016.105-.029.162-.047l.008-.002c.053-.012.107-.029.164-.043l.004-.002c.057-.014.107-.031.16-.045l.01-.002a6.77 6.77 0 0 0 .162-.045l.004-.002c.057-.016.113-.029.166-.047.004-.002-.004 0 .002 0 .115-.031.223-.062.334-.094h.002l.42-.119h.002l.162-.047.006-.002c.055-.016.111-.029.166-.047h.004l.164-.049h.002c.057-.016.113-.031.168-.049.305-.088.615-.18.92-.27 1.34-.398 2.674-.814 3.994-1.246l-10.012-30.617a121.552 121.552 0 0 0 36.197-19.09l19.598 25.557a154.834 154.834 0 0 0 16.037-14.166v-.002c.043-.041.086-.082.125-.123.066-.064.127-.127.189-.191v-.002c.041-.039.08-.082.123-.123l.004-.004c.041-.041.078-.084.119-.125l.006-.002c.037-.041.076-.08.113-.119l.01-.01c.037-.041.078-.078.117-.117 0-.002.006-.008.01-.01.016-.021.035-.039.055-.061l.004-.002c.02-.02.033-.037.051-.055l.016-.014.051-.053.012-.012a.348.348 0 0 1 .047-.047c.002-.006.006-.01.01-.016l.057-.055c.004-.002.006-.008.008-.01l.053-.051.006-.01c.02-.018.033-.035.053-.057l.014-.012.047-.049c.004-.002.01-.008.01-.01l.055-.055c.006-.004.008-.012.014-.014.014-.018.031-.035.047-.053l.008-.006c.018-.02.033-.037.053-.055.008-.006.006-.006.014-.014.018-.02.037-.037.053-.059v-.004l.057-.055c.002-.002.01-.01.012-.014l.053-.055c.006-.002.006-.006.01-.008.014-.018.033-.035.047-.051.006-.004.008-.008.012-.014a.471.471 0 0 0 .053-.057c.004 0 .008-.002.008-.008l.053-.051c0-.004.01-.008.01-.012.018-.02.037-.035.051-.053l.016-.018.043-.043c.004-.006.004-.006.014-.014a.332.332 0 0 1 .053-.053c0-.004.008-.014.014-.02l.041-.043c.006-.006.008-.006.012-.014l.053-.055c.004-.008.01-.012.018-.018.016-.014.023-.027.039-.041.004-.006.014-.016.018-.02l.047-.049a.076.076 0 0 1 .018-.018l.041-.047c.01-.006.014-.012.02-.02.014-.012.027-.029.041-.043.006-.006.016-.014.02-.021l.049-.051c.002-.004.01-.01.012-.014.014-.014.025-.027.041-.041.004-.006.014-.016.018-.023.02-.016.033-.031.049-.049.008-.008.012-.014.021-.02l.033-.035.021-.027.043-.047a.19.19 0 0 0 .021-.023.257.257 0 0 0 .033-.033.23.23 0 0 1 .023-.021c.014-.016.027-.033.043-.049.006-.008.014-.014.025-.025.006-.01.014-.018.023-.027l.041-.043.029-.031.027-.027.029-.029c.008-.01.016-.023.025-.033a.332.332 0 0 0 .037-.039.086.086 0 0 0 .023-.025.53.53 0 0 0 .033-.035c.014-.014.023-.021.035-.035a.224.224 0 0 0 .029-.035.128.128 0 0 0 .023-.025c.014-.012.021-.021.033-.035l.035-.037c.01-.008.018-.018.027-.029.01-.01.014-.018.027-.027l.029-.031.035-.043c.01-.01.02-.018.027-.027a.154.154 0 0 0 .023-.029c.016-.012.029-.027.043-.043.01-.01.02-.02.027-.031a.172.172 0 0 0 .027-.027c.01-.008.016-.016.023-.025l.041-.045c.01-.014.02-.018.029-.027.008-.012.018-.021.025-.031.006-.006.016-.02.025-.023l.041-.051.025-.023a.24.24 0 0 1 .025-.033.396.396 0 0 0 .041-.041c.01-.01.016-.018.023-.027.01-.01.021-.023.033-.031.004-.01.014-.016.02-.025.014-.014.031-.035.045-.051l.023-.023c.004-.006.023-.023.027-.031.01-.01.018-.02.027-.027l.041-.043c.006-.01.016-.018.025-.027s.018-.023.025-.031c.01-.01.014-.018.023-.027.014-.014.029-.031.043-.043.008-.014.018-.02.025-.029.012-.012.016-.021.025-.029.014-.012.023-.025.035-.039a.562.562 0 0 0 .033-.035c.01-.01.014-.02.023-.025l.027-.031c.014-.016.029-.029.039-.041.014-.014.021-.025.031-.035a.406.406 0 0 0 .02-.021l.049-.053c.006-.01.014-.014.02-.023a.313.313 0 0 1 .031-.033l.016-.018c.018-.021.037-.041.055-.064.008-.004.01-.01.016-.014.008-.01.023-.023.031-.033.006-.008.01-.014.018-.021.018-.02.035-.039.057-.061.004-.004.008-.01.014-.014.01-.016.018-.023.033-.039a.035.035 0 0 1 .008-.01c.02-.02.043-.049.064-.07 0-.002.004-.008.01-.01.01-.016.018-.023.031-.039.006-.004.008-.008.01-.01.02-.021.043-.045.061-.066.006-.004.01-.012.016-.02l.033-.033c.004 0 .004-.004.004-.004a1.491 1.491 0 0 1 .076-.09l.107-.117c.004-.004.01-.008.01-.012.035-.039.072-.082.109-.119 0-.002.006-.006.006-.008.037-.045.07-.078.105-.121.004-.004.008-.01.014-.014.023-.025.041-.049.064-.074 0-.004.004-.004.006-.004l.037-.039c0-.006.004-.008.004-.008.021-.025.045-.055.064-.076a.044.044 0 0 0 .01-.008c.037-.043.074-.082.111-.127.004-.002 0-.002.006-.002.035-.045.072-.084.109-.127 0-.002 0-.002.004-.004.039-.045.072-.084.111-.127 0-.002 0-.004.002-.004a3.3 3.3 0 0 1 .115-.127v-.002l.109-.127c.006-.002.006-.002.006-.004l.299-.344c0-.004 0 0 .002-.004a154.747 154.747 0 0 0 9.021-11.385l-26.16-18.795a121.518 121.518 0 0 0 17.938-36.762l30.924 9.041a153.371 153.371 0 0 0 5.615-30.158c.02-.201.037-.402.053-.604v-.004c.004-.057.008-.113.014-.168l.021-.26v-.004c.012-.143.02-.283.035-.428v-.004c.004-.055.006-.111.008-.168.004-.006 0-.004.004-.008a2.37 2.37 0 0 1 .012-.168c.004-.027.004-.055.006-.082 0-.006 0-.002.002-.008 0-.055.006-.109.01-.166v-.01a4.28 4.28 0 0 0 .014-.166v-.004c0-.027.004-.053.004-.082v-.004a5.07 5.07 0 0 1 .014-.166v-.008c.004-.057.004-.111.01-.166v-.01c.004-.029.004-.055.006-.082.002-.055.008-.111.012-.168v-.008c.006-.057.01-.111.01-.166l.002-.01c.002-.057.008-.111.012-.168 0-.029.006-.057.006-.082v-.01c.004-.053.006-.111.008-.164v-.01l.016-.168v-.004c0-.027 0-.055.004-.082v-.002c.002-.059.004-.113.01-.17v-.006c.004-.059.008-.115.01-.168v-.008c.004-.055.008-.111.008-.168v-.004a.369.369 0 0 0 .006-.08v-.006c.004-.057.01-.113.01-.168l.002-.008c.002-.057.006-.111.01-.168l.002-.008c0-.027 0-.053.002-.076v-.008c.002-.059.006-.113.01-.168v-.008c.002-.057.006-.111.006-.17l.004-.004c.002-.027.002-.057.002-.08v-.006a2.26 2.26 0 0 0 .006-.166v-.012c.006-.053.008-.107.01-.164v-.01c.006-.055.006-.109.01-.166v-.008c0-.023.002-.051.004-.078v-.008c0-.055.006-.111.008-.162l.002-.016v-.076-.004c.053-.023.053-.048.053-.077v-.01a.822.822 0 0 0 .004-.072v-.012c0-.027.004-.055.004-.082v-.006c0-.023 0-.051.004-.07.002-.008.002-.018.002-.021 0-.055.004-.105.004-.156v-.018a.462.462 0 0 0 .006-.074v-.009c0-.027.002-.053.004-.078v-.016c0-.023 0-.047.002-.068 0-.006 0-.01.002-.016v-.082a.512.512 0 0 0 .006-.078v-.018c0-.025.002-.049.004-.074v-.006-.078c.004-.008.004-.01.004-.018a.695.695 0 0 0 .002-.064v-.02c0-.025.004-.053.004-.078v-.01-.068l.004-.025V261.529c0-.025.006-.053.006-.078v-.02c0-.023 0-.045.002-.07v-.01a1.15 1.15 0 0 0 .002-.082v-.012c0-.021.004-.045.006-.068v-.016c0-.053.004-.109.004-.16v-.016c0-.025 0-.047.002-.07.002-.004.002-.01.002-.014v-.078-.014c0-.025.004-.047.006-.07v-.016-.082c.002-.027.004-.053.004-.076v-.02c0-.025 0-.053.004-.076v-.002a1.15 1.15 0 0 0 .002-.082v-.014c0-.025 0-.047.002-.07v-.012c.002-.029.002-.057.002-.082v-.012c0-.023 0-.047.002-.07v-.014c.002-.055.002-.109.006-.166v-.012c.002-.023.002-.049.002-.072v-.01-.082l.002-.014c.002-.021.002-.043.002-.068v-.018c0-.053.004-.105.004-.158v-.02-.068-.01c0-.027 0-.053.004-.08.002-.006.002-.012.002-.02v-.062-.02-.076-.016a.732.732 0 0 0 .004-.064v-.023-.068-.01-.076c.004-.004.004-.02.004-.023.002-.018.002-.037.002-.059v-.021-.076-.02-.061l.002-.021c.002-.055.002-.105.002-.158v-.021-.066-.012c.004-.025.004-.055.004-.078v-.02-.066-.018-.076-.01-.074c.004-.008 0-.004.004-.014v-.072-.012-.078-.02-.062-.021-.074-.016l.002-.066v-.021c.002-.025.002-.051.002-.074v-.004-.076-.025-.059-.02-.08-.016-.062-.021c0-.027.004-.051.004-.078v-.006c0-.025 0-.049.002-.074v-.021-.064-.016-.076-.021-.059-.025-.074-.016-.066-.021-.068-.01-.078-.023-.061-.018-.078-.016-.064-.021-.08-.086-.023-.082-.023-.066-.027-.072-.043-.045c-.004-.026-.004-.052-.004-.073zM271.34 328.434h-26.209V225.969H210.19v-16.256c8.432-.416 14.287-1.01 17.861-1.807 6.199-1.371 11.332-4.174 15.258-8.324 2.709-2.865 4.783-6.703 6.16-11.424.512-1.824.859-3.344 1.041-4.592h20.83v144.868z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-poll.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-poll.svg
new file mode 100644
index 0000000000..089fa647d1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-poll.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M57.904 49.855H87.01v412.289H57.904zm76.727 28.223h202.784v78.587H134.631zm0 137.87h319.465v78.588H134.631zm0 137.872h262.168v78.586H134.631z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-post-it.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-post-it.svg
new file mode 100644
index 0000000000..61a2787df8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-post-it.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M93.479 94.333v221.376l8.993 8.975 83.633 83.632 8.978 8.979h222.928V94.333H93.479zm293.874 292.321H230.074c-37.05 0-19.194-87.822-19.194-87.822s-85.646 20.832-86.742-18.441V124.989h263.215v261.665z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pound-bag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pound-bag.svg
new file mode 100644
index 0000000000..dfb460d22a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pound-bag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M324.932 172.613v.014c-.066-.116-.164-.215-.227-.311a752.036 752.036 0 0 0-12.461-16.778c-5.43-9.025-8.273-19.992-1.635-35.837l22.76-54.517-35.775-16.303 3.695-16.154h-89.862l4.708 20.585-36.79 11.872 22.761 54.517c11.283 26.943-4.84 39.813-14.321 52.926-46.831 64.8-99.286 157.572-99.286 213.493 0 92.726 72.011 89.637 167.858 89.637 95.882 0 167.923 3.089 167.923-89.637-.001-55.936-52.517-148.693-99.348-213.507zm-91.138-45.523h45.848v28.939h-45.848V127.09zm65.435 269.919c-5.983 2.062-11.739 3.075-17.267 3.075-5.558 0-10.137-.359-13.769-1.077-3.662-.739-7.031-1.623-10.07-2.652-3.205-1.146-6.411-2.176-9.648-3.041-3.204-.882-7.193-1.305-12.002-1.305-3.955 0-8.077.523-12.394 1.616-4.283 1.092-8.534 3.252-12.787 6.459l-13.537-20.111c3.042-1.896 6.082-4.14 9.058-6.691 2.975-2.55 5.625-5.344 7.882-8.402 2.257-3.057 4.119-6.395 5.593-9.953 1.438-3.588 2.191-7.332 2.191-11.27 0-2.467-.426-4.922-1.212-7.342-.815-2.402-1.799-4.82-2.941-7.309h-21.682v-18.59h13.995c-2.188-2.783-4.38-6.85-6.541-12.264-2.19-5.381-3.301-11.365-3.301-17.938 0-5.821 1.21-11.365 3.629-16.61 2.387-5.25 5.951-9.896 10.597-13.898 4.675-4.009 10.531-7.179 17.495-9.517 6.998-2.324 15.075-3.486 24.296-3.486 16.743 0 29.792 4.663 39.146 13.999 9.318 9.322 13.994 22.89 13.994 40.68h-29.529c-.131-2.19-.424-4.937-.884-8.189-.426-3.306-1.405-6.459-2.941-9.532-1.538-3.058-3.858-5.725-6.999-7.98-3.139-2.275-7.488-3.4-13.014-3.4-6.575 0-11.775 1.833-15.666 5.478-3.825 3.643-5.789 8.535-5.789 14.633 0 1.764.098 3.449.23 5.054.165 1.585.49 3.448 1.014 5.577.491 2.106 1.374 4.557 2.618 7.325 1.208 2.777 2.941 6.115 5.132 10.07h29.073v18.59h-22.958c.718 2.176 1.21 4.367 1.439 6.559.197 2.191.293 4.511.293 6.998 0 6.849-1.766 12.721-5.328 17.607-3.6 4.89-7.786 9.204-12.592 13.002l.427.438c3.498-2.17 6.342-3.581 8.533-4.134 2.192-.588 4.319-.883 6.346-.883 2.941 0 5.819.243 8.663.749 2.847.522 5.69 1.067 8.635 1.638 2.91.749 5.756 1.356 8.502 1.864 2.812.522 5.625.766 8.568.766 2.879 0 5.854-.507 8.862-1.521 2.944-1.029 6.443-3.642 10.366-7.862l13.113 22.091c-5.263 5.08-10.855 8.662-16.839 10.689z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-power-outlet.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-power-outlet.svg
new file mode 100644
index 0000000000..41e3e51e20
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-power-outlet.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M234.979 138.555c-6.706 0-12.135 5.398-12.135 12.121v28.106c0 6.701 5.429 12.13 12.135 12.13 6.672 0 12.099-5.429 12.099-12.13v-28.106c0-6.723-5.427-12.121-12.099-12.121zm41.564 182.704c-6.672 0-12.1 5.431-12.1 12.136v28.12c0 6.688 5.428 12.1 12.1 12.1 6.705 0 12.131-5.411 12.131-12.1v-28.12c0-6.706-5.426-12.136-12.131-12.136zm-41.564 0c-6.706 0-12.135 5.431-12.135 12.136v28.12c0 6.688 5.429 12.1 12.135 12.1 6.672 0 12.099-5.411 12.099-12.1v-28.12c0-6.706-5.427-12.136-12.099-12.136zM361.271 65.978H150.25c-13.375 0-24.201 10.805-24.201 24.167v331.873c0 13.339 10.826 24.181 24.201 24.181h211.022c13.344 0 24.167-10.842 24.167-24.148V90.144c-.001-13.362-10.824-24.166-24.168-24.166zM255.744 411.026c-35.122 0-63.57-28.465-63.57-63.575 0-35.119 28.449-63.581 63.57-63.581 35.122 0 63.573 28.462 63.573 63.581 0 35.111-28.451 63.575-63.573 63.575zm0-182.734c-35.122 0-63.57-28.45-63.57-63.573 0-35.087 28.449-63.574 63.57-63.574 35.122 0 63.573 28.486 63.573 63.574 0 35.122-28.451 63.573-63.573 63.573zm20.799-89.737c-6.672 0-12.1 5.398-12.1 12.121v28.106c0 6.701 5.428 12.097 12.1 12.097 6.705 0 12.131-5.396 12.131-12.097v-28.106c0-6.723-5.426-12.121-12.131-12.121z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-power.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-power.svg
new file mode 100644
index 0000000000..9c4fb4b087
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-power.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.621 481.605c-55.604.036-111.517-21.319-153.936-63.766-42.451-42.425-63.807-98.339-63.77-153.944-.037-55.605 21.318-111.52 63.773-153.942 12.921-12.917 33.87-12.917 46.79.006 12.921 12.919 12.914 33.87-.005 46.789-29.652 29.675-44.347 68.253-44.384 107.147.038 38.892 14.732 77.478 44.389 107.157 29.661 29.645 68.248 44.339 107.142 44.376 38.894-.037 77.481-14.728 107.154-44.376 29.65-29.68 44.346-68.266 44.382-107.157-.036-38.888-14.731-77.472-44.382-107.153v.006c-12.92-12.925-12.92-33.873 0-46.795 12.921-12.917 33.867-12.917 46.794 0 42.445 42.426 63.803 98.336 63.758 153.942.045 55.605-21.316 111.52-63.764 153.944-42.391 42.416-98.238 63.768-153.8 63.766h-.141zm-33.084-217.704V64.165c0-18.269 14.812-33.085 33.088-33.085 18.276 0 33.086 14.816 33.086 33.085v199.736c0 18.269-14.811 33.083-33.086 33.083-18.276 0-33.088-14.814-33.088-33.083z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-presentation.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-presentation.svg
new file mode 100644
index 0000000000..59e720c81e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-presentation.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M49.524 344.264a30.396 30.396 0 1 1 60.792 0 30.396 30.396 0 1 1-60.792 0zm147.781-30.397c-16.787 0-30.394 13.61-30.394 30.396s13.606 30.397 30.394 30.397c16.789 0 30.397-13.611 30.397-30.397 0-16.785-13.608-30.396-30.397-30.396zm86.994 30.397a30.396 30.396 0 1 1 60.792 0 30.396 30.396 0 1 1-60.792 0zm-58.697 81.95a30.396 30.396 0 1 1 60.792 0 30.396 30.396 0 1 1-60.792 0zm176.08-81.95a30.396 30.396 0 1 1 60.792 0 30.396 30.396 0 1 1-60.792 0zm-58.693 81.948a30.396 30.396 0 1 1 60.792 0 30.396 30.396 0 1 1-60.792 0zm-234.771 0a30.396 30.396 0 1 1 60.792 0 30.396 30.396 0 1 1-60.792 0zM49.523 55.391v219.775h296.119c5.828-29.321 6.857-51.505 6.857-63.472l.002.008v-.008-3.15a3.852 3.852 0 0 0-.196-1.049s-70.114 33.923-73.567 33.923c-2.169 0-4.355-.641-6.264-1.976-4.953-3.464-6.154-10.291-2.689-15.243 0 0 71.713-38.02 74.098-39.35 2.558-1.355 5.339-2.296 8.863-2.333.256 0 .656.005 1.011.032l19.833 1.236 19.268-1.204c.275-.016.61-.033 1.025-.033 3.513.038 6.285.974 8.84 2.318 2.378 1.314 5.852 2.875 6.668 7.346l6.287 72.056c.229 3.62 1.166 7.601.344 10.897h46.455V55.391H49.523zm72.631 171.438H98.476V160.64h23.679v66.189zm54.912 0h-23.68V115.765h23.68v111.064zm54.913 0h-23.68v-36.62h23.68v36.62zm141.61-56.906c-17.379 0-31.465-14.087-31.465-31.464s14.086-31.466 31.465-31.466 31.465 14.088 31.465 31.466c0 17.377-14.086 31.464-31.465 31.464z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-previous-media.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-previous-media.svg
new file mode 100644
index 0000000000..656c29d14c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-previous-media.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M253.006 256.045l213.783-124.477v248.955zm-210.52 0l213.785-124.477v248.955z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-previous.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-previous.svg
new file mode 100644
index 0000000000..f858829633
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-previous.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M110.924 255.632L397.623 88.699v333.867z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-dollar.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-dollar.svg
new file mode 100644
index 0000000000..72d42718a9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-dollar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M280.146 276.758c-3.596-2.846-9.68-5.444-18.279-7.77v41.992c2.615-.299 5.365-.917 8.209-1.865a25.537 25.537 0 0 0 7.65-4.024 21.367 21.367 0 0 0 5.559-6.477c1.506-2.534 2.192-5.556 2.192-9.056.001-5.689-1.766-9.975-5.331-12.8zm163.739-117.647c-9.842-9.547-17.855-23.362-17.855-30.688 0-7.339-11.249-13.361-24.952-13.361H110.195c-13.701 0-24.916 6.022-24.916 13.361 0 7.326-8.045 21.142-17.889 30.688 0 0-36.139 35.188-36.139 96.421 0 61.252 36.139 96.423 36.139 96.423 9.844 9.547 17.889 23.381 17.889 30.726 0 7.307 11.215 13.306 24.916 13.306h290.882c13.703 0 24.952-5.999 24.952-13.306 0-7.345 8.014-21.179 17.855-30.726 0 0 36.168-35.171 36.168-96.423.001-61.233-36.167-96.421-36.167-96.421zM314.154 302.999c-1.6 4.891-4.477 9.664-8.631 14.323-4.184 4.677-9.744 8.829-16.744 12.461-6.998 3.661-15.955 5.837-26.912 6.569v18.595h-12.92v-18.595c-16.318-1.177-29.07-6.177-38.26-15.07-9.188-8.897-14.486-21.98-15.957-39.181h30.838c-.162 8.309 2.027 14.881 6.541 19.688 4.545 4.807 10.137 7.895 16.838 9.191v-45.72c-.686-.289-1.695-.619-2.939-.977a45.827 45.827 0 0 0-4.061-.98 178.732 178.732 0 0 1-15.92-5.134c-5.299-1.981-9.979-4.595-14.13-7.887-4.187-3.284-7.487-7.354-9.938-12.246-2.523-4.888-3.727-10.97-3.727-18.261 0-7.426 1.4-13.994 4.25-19.688 2.875-5.687 6.604-10.461 11.282-14.308 4.673-3.874 10.038-6.879 16.187-8.976a72.6 72.6 0 0 1 18.996-3.841v-16.841h12.92v16.841c6.572.733 12.722 2.14 18.477 4.268 5.754 2.121 10.824 5.016 15.205 8.762 4.416 3.695 7.98 8.34 10.728 13.884 2.779 5.54 4.382 12.082 4.808 19.686h-31.07c-.127-5.841-1.928-10.792-5.425-14.88-3.532-4.074-7.753-6.13-12.722-6.13v38.72c1.766.438 3.533.881 5.365 1.304 1.83.442 3.756.95 5.785 1.534 10.793 2.933 19.1 6.547 24.953 10.83 5.822 4.297 10.105 8.797 12.881 13.454 2.783 4.664 4.418 9.339 4.907 13.996.558 4.665.784 8.814.784 12.477 0 3.207-.784 7.262-2.389 12.132zm-78.742-99.95c-1.896 1.516-3.402 3.42-4.515 5.674-1.079 2.271-1.601 4.937-1.601 7.977 0 4.821 1.504 8.553 4.575 11.148 3.075 2.653 8.075 4.762 15.075 6.365v-35.661c-2.449 0-4.869.357-7.191 1.112a19.09 19.09 0 0 0-6.343 3.385z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-euro.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-euro.svg
new file mode 100644
index 0000000000..0c437bc769
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-euro.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M443.736 159.461c-9.843-9.546-17.88-23.381-17.88-30.709 0-7.324-11.199-13.338-24.917-13.338H110.056c-13.7 0-24.934 6.014-24.934 13.338 0 7.328-8.028 21.163-17.871 30.709 0 0-36.151 35.221-36.151 96.406 0 61.252 36.151 96.439 36.151 96.439 9.843 9.545 17.871 23.377 17.871 30.739 0 7.288 11.233 13.276 24.934 13.276H400.94c13.718 0 24.917-5.988 24.917-13.276 0-7.362 8.037-21.194 17.88-30.739 0 0 36.168-35.188 36.168-96.439-.001-61.185-36.169-96.406-36.169-96.406zM297.6 233.598l-6.786 15.695h-48.968l-.23 9.189H288.2l-6.786 15.765h-38.047c4.675 23.087 15.45 34.597 32.356 34.597 10.956 0 22.188-4.611 33.699-13.803l-.213 33.031c-9.793 5.661-21.01 8.531-33.699 8.531-18.359 0-33.176-5.883-44.407-17.721-10.203-10.656-16.841-25.539-19.899-44.636h-16.842l6.786-15.765h8.731v-5.656c0-2.061.099-3.238.228-3.533h-15.958l6.787-15.695h11.133c3.5-17.658 10.729-31.559 21.666-41.797 11.512-11.082 25.967-16.609 43.297-16.609 12.28 0 25.541 3.632 39.814 10.958l-13.325 27.302c-10.204-6.537-19.784-9.84-28.663-9.84-15.305 0-25.507 9.973-30.609 29.986H297.6z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-pound.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-pound.svg
new file mode 100644
index 0000000000..0858462da8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-pound.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M444.366 158.889c-9.842-9.58-17.889-23.379-17.889-30.705 0-7.324-11.214-13.348-24.933-13.348H110.68c-13.721 0-24.934 6.023-24.934 13.348 0 7.326-8.061 21.125-17.89 30.705 0 0-36.15 35.184-36.15 96.402 0 61.252 36.15 96.437 36.15 96.437 9.83 9.55 17.89 23.384 17.89 30.712 0 7.324 11.213 13.341 24.934 13.341h290.865c13.719 0 24.933-6.017 24.933-13.341 0-7.328 8.047-21.162 17.889-30.712 0 0 36.151-35.185 36.151-96.437 0-61.219-36.152-96.402-36.152-96.402zm-145.39 175.054c-5.967 2.026-11.741 3.072-17.265 3.072-5.545 0-10.139-.359-13.785-1.146-3.646-.719-7.015-1.566-10.059-2.611a118.673 118.673 0 0 0-9.63-3.043c-3.222-.85-7.227-1.34-12.033-1.34-3.941 0-8.06.553-12.344 1.666-4.316 1.11-8.584 3.236-12.818 6.475l-13.558-20.148a71.785 71.785 0 0 0 9.092-6.699c2.976-2.519 5.608-5.295 7.866-8.408a46.247 46.247 0 0 0 5.573-9.938 29.542 29.542 0 0 0 2.193-11.249c0-2.486-.392-4.939-1.194-7.322a74.444 74.444 0 0 0-2.942-7.359h-21.681v-18.576h13.996c-2.159-2.78-4.35-6.838-6.541-12.264-2.208-5.399-3.303-11.346-3.303-17.92 0-5.818 1.212-11.381 3.63-16.644 2.403-5.233 5.952-9.88 10.597-13.899 4.658-3.991 10.496-7.132 17.494-9.48 6.999-2.324 15.109-3.504 24.283-3.504 16.774 0 29.823 4.643 39.158 13.996 9.337 9.352 13.997 22.894 13.997 40.68h-29.529c-.162-2.187-.439-4.902-.884-8.206a29.343 29.343 0 0 0-2.942-9.485c-1.535-3.106-3.859-5.752-7.016-8.012-3.121-2.223-7.453-3.4-12.999-3.4-6.573 0-11.771 1.832-15.628 5.497-3.893 3.628-5.806 8.504-5.806 14.649 0 1.732.081 3.434.213 5.035.147 1.602.457 3.466.979 5.559.524 2.127 1.376 4.577 2.633 7.324 1.226 2.779 2.96 6.116 5.134 10.074h29.089v18.576h-22.958c.721 2.226 1.211 4.412 1.406 6.602.23 2.162.343 4.514.343 6.967 0 6.832-1.781 12.721-5.345 17.629a67.27 67.27 0 0 1-12.592 13.012l.425.395c3.517-2.129 6.361-3.533 8.538-4.117 2.191-.592 4.298-.887 6.342-.887 2.93 0 5.807.262 8.634.784 2.844.491 5.758 1.017 8.65 1.604a99.103 99.103 0 0 0 8.519 1.896c2.777.486 5.625.719 8.55.719 2.912 0 5.854-.49 8.846-1.471 2.976-1.048 6.459-3.662 10.4-7.914l13.114 22.072c-5.235 5.132-10.859 8.699-16.842 10.759z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-yen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-yen.svg
new file mode 100644
index 0000000000..96c3917842
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-yen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M444.769 159.533c-9.81-9.565-17.87-23.395-17.87-30.719 0-7.331-11.232-13.313-24.934-13.313H111.1c-13.719 0-24.937 5.982-24.937 13.313 0 7.324-8.046 21.154-17.854 30.719 0 0-36.187 35.172-36.187 96.406 0 61.234 36.187 96.438 36.187 96.438 9.809 9.532 17.854 23.363 17.854 30.688 0 7.324 11.218 13.329 24.937 13.329h290.865c13.701 0 24.934-6.005 24.934-13.329 0-7.325 8.061-21.156 17.87-30.688 0 0 36.171-35.203 36.171-96.438-.001-61.234-36.171-96.406-36.171-96.406zm-137.363 86.35v20.765h-31.295l-3.27 6.342v10.072h34.564v20.802h-34.564v30.165h-33.257v-30.165h-34.338v-20.802h34.338V272.99l-3.059-6.342h-31.279v-20.765h20.782l-33.469-68.02h35.431l28.875 68.02 28.224-68.02h35.414l-33.879 68.02h20.782z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-print.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-print.svg
new file mode 100644
index 0000000000..3bce86bedd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-print.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M131.829 41.945H377.26v70.459H131.829zm319.901 95.851H57.359c-11.747 0-21.273 9.526-21.273 21.274v156.501h64.086v-95.006h308.749v95.006h64.083V159.07c0-11.748-9.527-21.274-21.274-21.274zm-24.939 52.159c-9.396 0-17.012-7.62-17.012-17.017s7.616-17.014 17.012-17.014c9.398 0 17.016 7.617 17.016 17.014s-7.618 17.017-17.016 17.017zm-67.676 66.479v187.652H256.407c-37.201 0-19.274-88.177-19.274-88.177s-86 20.897-87.106-18.534v-80.941h-25.039v114.032l7.333 7.336 91.326 91.326h160.506V256.434h-25.038z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-printer-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-printer-alt.svg
new file mode 100644
index 0000000000..050ec1d81c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-printer-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M452.418 126.255h-67.577V52.619H125.674v73.636H58.046c-11.745 0-21.272 9.526-21.272 21.271V328.15h88.9v30.775l98.66 98.659h160.507v-128.41h88.851V147.525c-.001-11.744-9.528-21.27-21.274-21.27zm-301.7-48.596h209.087v48.596H150.718V77.659zm258.891 216.747H384.84V244.89h-25.036v187.654H257.098c-37.202 0-19.275-88.18-19.275-88.18s-86.003 20.9-87.108-18.533V244.89h-25.04v48.492h-24.811v-84.357H409.61v85.381zm17.873-115.994c-9.4 0-17.016-7.616-17.016-17.014 0-9.396 7.615-17.014 17.016-17.014 9.394 0 17.013 7.617 17.013 17.014 0 9.398-7.619 17.014-17.013 17.014zm-97.336 69.932H186.215v25.047h143.932v-25.047zm-143.929 74.157h143.928v-25.036H186.217v25.036z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-projector.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-projector.svg
new file mode 100644
index 0000000000..afc95283c3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-projector.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M451.941 170.788c0-11.111-9.008-20.118-20.119-20.118H80.176c-11.107 0-20.117 9.007-20.117 20.118v136.168h391.883V170.788zm-249.41 93.418H98.736v-23.678h103.795v23.678zm0-49.504H98.736v-23.68h103.795v23.68zm94.026 75.246c-34.371 0-62.332-27.964-62.332-62.332 0-34.37 27.961-62.335 62.332-62.335s62.334 27.965 62.334 62.335c0 34.368-27.963 62.332-62.334 62.332zm105.996-81.185c-9.877 0-17.889-8.011-17.889-17.89 0-9.878 8.012-17.888 17.889-17.888 9.879 0 17.889 8.01 17.889 17.888-.001 9.879-8.01 17.89-17.889 17.89zM78.559 330.635h62.576v30.695H78.559zm292.3 0h62.578v30.695h-62.578zm-74.302-143.797c-22.518 0-40.775 18.256-40.775 40.778 0 22.52 18.258 40.774 40.775 40.774 22.523 0 40.777-18.255 40.777-40.774 0-22.522-18.254-40.778-40.777-40.778z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pulse.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pulse.svg
new file mode 100644
index 0000000000..8a655631af
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pulse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M189.611 233.457l-19.082 50.947H38.219v-51.142h96.863l64.961-173.537 49.33 203.132 45.783-143.582 45.864 120.461 2.845-6.474H474.18v51.142h-96.946l-39.646 90.063-38.147-100.229-56.707 177.93-53.123-218.711z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pushpin.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pushpin.svg
new file mode 100644
index 0000000000..586bf4fdc0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pushpin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M151.92 320.061L72.639 439.597l119.24-79.868a292.208 292.208 0 0 1-21.63-19.576 295.97 295.97 0 0 1-18.329-20.092zm237.764-197.332c-34.521-34.52-75.025-49.983-90.471-34.541-4.723 4.725-6.543 11.802-5.821 20.326-.318 6.984-1.187 13.398-2.536 19.283l-59.557 59.557c-18.267 5.196-35.852 5.529-45.293 5.2-19.958-6.244-36.812-5.263-46.569 4.493-21.638 21.638-.239 78.106 47.784 126.133 48.026 48.026 104.493 69.418 126.129 47.781 8.24-8.239 10.223-21.534 6.889-37.488l.19.189s-3.414-27.452 5.06-55.496l56.104-56.105c6.793-1.702 14.314-2.757 22.654-3.016 8.368.644 15.32-1.188 19.978-5.847 15.443-15.443-.018-55.946-34.541-90.469z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-qr-code.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-qr-code.svg
new file mode 100644
index 0000000000..bdbf3d64fb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-qr-code.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M183.656 40.044H40.519v143.15h143.137V40.044zM164.428 163.98H59.747V59.29h104.682v104.69zm81.165-123.936h-40.552V80.66h21.389v21.354h19.163v-61.97zm62.002 0H266.98V59.29h19.228v42.724h21.388v-61.97zm21.319 0v143.15h143.171V40.044H328.914zM452.855 163.98h-104.68V59.29h104.68v104.69zM143.07 80.66H81.104v61.952h61.966V80.66zm288.399 0H369.53v61.952h61.939V80.66zM226.43 102.014h-21.389v19.227h21.389v-19.227zm59.777 40.598v-40.599h-19.228v19.227h-40.55v21.372h59.778zm-19.228 102.539v-40.586h19.228v-21.371h-19.228V163.98h-21.387v19.214H226.43V163.98h-21.389v40.585h21.389v21.356h-21.389v-21.356H143.07v21.356h40.585v19.229h21.385v21.351h21.389V245.15h40.55zm40.616-81.171h-21.388v19.214h21.388V163.98zM40.519 204.565v40.586h19.228v-40.586H40.519zm40.585 0v21.356h40.613v-21.356H81.104zm226.491 21.357v-21.356h-21.388v21.356h21.388zm21.319-21.357v21.356h19.262v-21.356h-19.262zm81.199 21.357v-21.356h-19.227v21.356h-42.711v59.808h-19.262v21.389h40.615v21.353h-40.615v19.223h19.262v42.739h-19.262v40.585h-21.319v-61.934h-21.388v83.284h42.707v19.229h61.973v-19.229h-21.357v-21.351h-21.354v-21.356h21.354v-61.968h21.357V285.73h19.227v-19.228h-40.584v-21.351h61.939v-19.229h-21.355zm21.356 0h21.387v19.229h-21.387v40.578h21.387v-19.228h19.229v-61.937h-40.616v21.358zm-288.399 0h-21.353v19.229h-61.97v21.351h21.357v19.228H59.747v21.389h42.743V285.73h19.228v-19.228h61.938v-21.351H143.07v-19.229zm185.844 19.229h-21.319v21.351h21.319v-21.351zM40.519 266.502v19.228h19.228v-19.228H40.519zm185.911 0v19.228h19.163v-19.228H226.43zm81.165 40.616v-40.616H266.98v19.228h19.228v21.389H266.98v40.575h19.228v-19.223h42.707v-21.353h-21.32zm-143.167 0h19.228v-21.389h-19.228v21.389zm81.165-21.389v21.389h21.387v-21.389h-21.387zm226.492 42.742V285.73h-19.229v42.741h19.229zm-267.044 40.613h21.389v-40.613h19.163v-21.353h-40.552v61.966zm205.072-40.613h21.355v-21.353h-21.355v21.353zM40.519 471.598h143.137V328.471H40.519v143.127zm19.228-123.905h104.682v104.675H59.747V347.693zm269.167 0h-21.319v21.391h21.319v-21.391zm81.199 21.391v21.349h21.355v19.229h21.387v-40.577h-21.387v-21.391h-40.582v21.391h19.227zm61.972-21.391h-19.229v21.391h19.229v-21.391zM81.104 431.018h61.966v-61.934H81.104v61.934zm164.489-40.585h-40.552v40.585h21.389v-21.356h19.163v21.356h21.387v-61.934h-21.387v21.349zm145.294 19.228h19.227v-19.229h-19.227v19.229zm61.968 42.707h19.229v-21.351h-19.229v21.351zm-247.814 19.23h61.938v-19.229h-61.938v19.229zm205.072 0h21.355v-19.229h-21.355v19.229z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-quote.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-quote.svg
new file mode 100644
index 0000000000..16746643b6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-quote.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M169.68 123.562c-16.466 9.026-30.677 20.406-42.498 34.143-11.902 13.735-21.06 29.659-27.599 47.677-6.001 16.482-8.961 34.041-8.961 52.583 0 1.77.017 3.535.082 5.335v143.131h136.872V258.588h-60.151c.456-20.405 4.594-37.542 12.293-51.553 7.947-14.471 22.793-25.655 45.374-33.408l2.484-.849v-67.04l-4.136.545c-19.309 2.482-37.247 8.254-53.76 17.279zm249.726 50.064l2.482-.849v-67.04l-4.169.545c-19.277 2.482-37.23 8.254-53.745 17.279-16.479 9.026-30.673 20.406-42.511 34.143-11.871 13.735-21.077 29.659-27.583 47.677-6.001 16.482-8.979 34.041-8.979 52.551 0 1.801.032 3.566.082 5.366v143.131h136.904V258.588h-60.171c.44-20.405 4.597-37.542 12.297-51.553 7.932-14.471 22.81-25.656 45.393-33.409z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio-alt.svg
new file mode 100644
index 0000000000..c7dcf65677
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M214.738 142.071c-10.892 10.9-16.312 25.036-16.321 39.271.021 14.382 5.4 28.608 16.33 39.547 10.911 10.904 25.097 16.308 39.406 16.322 14.304-.015 28.486-5.418 39.401-16.322 10.916-10.92 16.316-25.106 16.326-39.41-.01-14.309-5.41-28.489-16.326-39.407-10.92-10.912-25.098-16.312-39.401-16.328-14.309.015-28.495 5.415-39.415 16.327zm-85.043 99.021c-16.768-16.752-25.22-38.886-25.198-60.834-.022-21.954 8.43-44.086 25.198-60.834 7.336-7.336 19.227-7.336 26.561 0 7.33 7.336 7.33 19.228-.005 26.562-9.497 9.508-14.176 21.8-14.193 34.271.017 12.473 4.692 24.762 14.193 34.279h.005c7.33 7.334 7.33 19.224-.005 26.555a18.723 18.723 0 0 1-13.282 5.5 18.703 18.703 0 0 1-13.274-5.499zm225.897.006c-7.335-7.337-7.34-19.223-.005-26.559 9.503-9.527 14.181-21.818 14.198-34.283-.018-12.47-4.695-24.762-14.193-34.273v.004c-7.335-7.335-7.335-19.225 0-26.559 7.332-7.336 19.221-7.336 26.556 0 16.765 16.744 25.219 38.88 25.199 60.828a85.905 85.905 0 0 1-25.193 60.832 18.71 18.71 0 0 1-13.284 5.504 18.745 18.745 0 0 1-13.278-5.494zM69.571 278.562c-27.111-27.101-40.733-62.79-40.717-98.304-.017-35.522 13.605-71.215 40.725-98.301 7.337-7.334 19.223-7.334 26.558 0 7.331 7.336 7.327 19.225-.005 26.562-19.845 19.843-29.692 45.7-29.717 71.739.025 26.027 9.872 51.881 29.717 71.754h.005c7.331 7.327 7.331 19.221-.005 26.558a18.734 18.734 0 0 1-13.279 5.496 18.734 18.734 0 0 1-13.282-5.504zm346.14.007c-7.338-7.337-7.338-19.225-.009-26.56 19.854-19.863 29.706-45.725 29.722-71.746-.016-26.034-9.867-51.895-29.713-71.757v.012c-7.338-7.337-7.338-19.226 0-26.562 7.331-7.334 19.221-7.334 26.557 0 27.107 27.095 40.742 62.792 40.718 98.307.024 35.514-13.61 71.201-40.71 98.306a18.732 18.732 0 0 1-13.282 5.502 18.728 18.728 0 0 1-13.283-5.502zm-161.494-15.038h-.068a83.08 83.08 0 0 1-23.353-3.335v177.368h46.705v-177.37a83.082 83.082 0 0 1-23.284 3.337z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio-receiver.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio-receiver.svg
new file mode 100644
index 0000000000..a3bea41462
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio-receiver.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M412.084 217.042h-45.748L157.24 115.24c-2.322-13.228-13.832-23.3-27.73-23.3-15.564 0-28.191 12.606-28.191 28.174 0 15.579 12.627 28.207 28.191 28.207a27.86 27.86 0 0 0 15.73-4.828l151.08 73.549H100.73c-6.834 0-12.363 5.524-12.363 12.327V407.89c0 6.817 5.529 12.342 12.363 12.342h311.354c6.836 0 12.328-5.524 12.328-12.342V229.369c0-6.803-5.492-12.327-12.328-12.327zM197.43 384.721c-36.264 0-65.697-29.416-65.697-65.684 0-36.281 29.434-65.666 65.697-65.666 36.266 0 65.667 29.384 65.667 65.666 0 36.268-29.402 65.684-65.667 65.684zm149.316-13.69c-10.366 0-18.772-8.385-18.772-18.751 0-10.367 8.406-18.773 18.772-18.773 10.367 0 18.77 8.406 18.77 18.773 0 10.366-8.403 18.751-18.77 18.751zm0-65.158c-10.366 0-18.772-8.384-18.772-18.751 0-10.366 8.406-18.759 18.772-18.759 10.367 0 18.77 8.393 18.77 18.759 0 10.367-8.403 18.751-18.77 18.751z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio.svg
new file mode 100644
index 0000000000..2cf8718a2e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.091 222.902h-.059c-13.374.012-26.839-3.171-39.051-9.582L114.008 477.969h48.297l8.205-21.296 83.722-33.747 84.673 33.521 8.295 21.521h48.296L293.537 213.361c-11.994 6.324-25.221 9.541-38.446 9.541zm-.341 15.148l14.659 38.041h-29.314l14.655-38.041zm-24.306 63.079h48.613l6.43 16.686-29.924 17.277-30.952-18.822 5.833-15.141zm-14.981 38.885l15.38 9.352-24.414 14.094 9.034-23.446zm111.194 84.651l-67.855-26.86-9.292.024-66.684 26.883 9.272-24.065 63.137-36.453 62.845 38.213 8.577 22.258zm-23.32-60.522l-23.383-14.219 14.646-8.457 8.737 22.676zM142.009 205.958c4.806 0 9.611-1.831 13.279-5.495 7.335-7.336 7.335-19.229.004-26.56h-.004c-9.501-9.514-14.174-21.809-14.195-34.281.021-12.465 4.693-24.76 14.195-34.269 7.335-7.332 7.335-19.226.004-26.556-7.336-7.335-19.224-7.338-26.56-.002-16.764 16.741-25.223 38.873-25.202 60.827a85.868 85.868 0 0 0 25.202 60.841 18.72 18.72 0 0 0 13.277 5.495zM354.627 78.795c-7.336 7.332-7.336 19.226 0 26.555 9.5 9.515 14.174 21.804 14.195 34.276-.021 12.464-4.695 24.761-14.195 34.273-7.336 7.337-7.336 19.231 0 26.561a18.725 18.725 0 0 0 13.279 5.498c4.807 0 9.614-1.831 13.279-5.498a85.864 85.864 0 0 0 25.197-60.834 85.86 85.86 0 0 0-25.197-60.834c-7.335-7.333-19.227-7.333-26.558.003zM95.168 211.375C75.318 191.51 65.47 165.65 65.45 139.622c.02-26.027 9.875-51.887 29.718-71.741 7.333-7.336 7.333-19.223 0-26.559-7.334-7.333-19.222-7.333-26.559 0-27.11 27.093-40.739 62.787-40.719 98.3-.021 35.514 13.609 71.207 40.719 98.31a18.736 18.736 0 0 0 13.281 5.497c4.807 0 9.61-1.833 13.278-5.497 7.333-7.335 7.333-19.224.006-26.557h-.006zM441.303 41.322c-7.332-7.333-19.228-7.333-26.557 0-7.335 7.336-7.335 19.223 0 26.556 19.845 19.86 29.697 45.717 29.718 71.748-.021 26.026-9.873 51.881-29.724 71.746-7.332 7.333-7.329 19.23.006 26.562a18.712 18.712 0 0 0 13.273 5.497c4.806 0 9.615-1.832 13.283-5.503 27.106-27.1 40.741-62.79 40.717-98.303.025-35.514-13.605-71.206-40.716-98.303zM254.75 195.441c30.827 0 55.812-24.99 55.812-55.812 0-30.827-24.985-55.815-55.812-55.815-30.822 0-55.812 24.988-55.812 55.815 0 30.822 24.99 55.812 55.812 55.812z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rain.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rain.svg
new file mode 100644
index 0000000000..0007d98d6c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rain.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M219.141 364.039c0 18.901 15.304 34.207 34.176 34.207 18.897 0 34.202-15.306 34.202-34.207 0-18.886-34.202-59.12-34.202-59.12s-34.176 40.234-34.176 59.12zM110.309 411.85c0 18.885 15.305 34.19 34.207 34.19 18.868 0 34.172-15.306 34.172-34.19 0-18.886-34.172-59.138-34.172-59.138s-34.207 40.252-34.207 59.138zm217.664 0c0 18.885 15.305 34.19 34.172 34.19 18.901 0 34.207-15.306 34.207-34.19 0-18.886-34.207-59.138-34.207-59.138s-34.172 40.252-34.172 59.138zm46.108-249.367a77.018 77.018 0 0 0 2.52-19.525c0-42.56-34.535-77.077-77.08-77.077-32.012 0-59.451 19.512-71.125 47.272-10.007-11.755-24.887-19.211-41.532-19.211-30.15 0-54.577 24.413-54.577 54.546 0 5.181.717 10.188 2.091 14.945-24.592 9.026-42.153 32.653-42.153 60.401 0 35.498 28.747 64.291 64.293 64.291h198.205c35.581 0 64.323-28.793 64.323-64.291-.001-28.794-18.868-53.124-44.965-61.351z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rate.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rate.svg
new file mode 100644
index 0000000000..aac2ba0481
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rate.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M479.66 204.083a8.79 8.79 0 0 0-8.334-6.057H311.987L262.668 46.552a8.79 8.79 0 0 0-8.329-6.05 8.769 8.769 0 0 0-8.332 6.038l-49.596 151.486H37.348a8.783 8.783 0 0 0-8.333 6.05 8.797 8.797 0 0 0 3.171 9.801l128.717 93.759-49.595 152.322a8.787 8.787 0 0 0 3.177 9.803 8.786 8.786 0 0 0 10.301 0l129.542-94.046 129.276 94.046a8.743 8.743 0 0 0 10.304 0 8.752 8.752 0 0 0 3.186-9.803L347.49 307.64l128.987-93.756a8.79 8.79 0 0 0 3.183-9.801z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-re-post.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-re-post.svg
new file mode 100644
index 0000000000..80b7a9673d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-re-post.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M137.521 170.136h139.212l42.217-51.146H86.393v185.291H38.385l73.549 89.145 73.594-89.145h-48.007V170.136zm263.297-51.668l-73.58 89.145h48.008v134.112H236.053l-42.221 51.162 232.56-.021V207.612h48.022l-73.596-89.144z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-readonly.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-readonly.svg
new file mode 100644
index 0000000000..b0840b5171
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-readonly.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M42.203 63.436l405 404.999 21.763-21.765-405-404.996-21.763 21.762zm430.35 33.166l-58.761-58.754-49.978 49.976 58.764 58.764 49.975-49.986zM313.428 255.73l82.593-82.596-26.54-26.534-82.592 82.589 26.539 26.541zm-134.875 81.799l-15.927-15.938 51.162-51.167-16.288-16.28L86.348 365.297l.188.185-47.922 106.775 106.313-48.384.181.182.484-.484 110.666-110.672-26.539-26.537-51.166 51.167zm-39.259 59.049l-46.367 21.104 20.896-46.573 23.39-23.389 3.366 22.303 22.1 3.165-23.385 23.39zm214.254-265.916l-16.285-16.28-82.591 82.592 16.285 16.279 82.591-82.591z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-alt.svg
new file mode 100644
index 0000000000..d7b6f5e860
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M115.362 49.87v412.26h281.275V49.87H115.362zm29.106 383.157V230.409h29.342v-21.312h-29.342V78.979H367.53v130.118h-27.969v21.312h27.969v202.618H144.468zm62.492-223.93h33.15v21.312h-33.15zm66.301 0h33.15v21.312h-33.15zm-83.862-83.428h133.203v30.785H189.399zm103.799 217.5c-1.869-3.144-4.766-6.164-8.695-9.061-3.928-2.897-9.525-5.327-16.789-7.293-1.379-.39-2.68-.734-3.904-1.03-1.23-.292-2.428-.589-3.609-.883V298.83c3.338 0 6.186 1.375 8.541 4.126 2.357 2.748 3.588 6.085 3.684 10.014h20.92c-.297-5.105-1.377-9.524-3.246-13.259-1.865-3.729-4.268-6.851-7.213-9.352-2.947-2.505-6.359-4.468-10.238-5.893s-8.027-2.382-12.447-2.874V270.25h-8.691v11.343a49.404 49.404 0 0 0-12.816 2.578c-4.123 1.426-7.758 3.441-10.9 6.039-3.143 2.605-5.67 5.82-7.59 9.651-1.912 3.829-2.867 8.248-2.867 13.256 0 4.91.832 9.012 2.502 12.302 1.67 3.293 3.906 6.039 6.705 8.248 2.797 2.209 5.965 3.977 9.5 5.303s7.121 2.479 10.752 3.461c.984.198 1.889.419 2.725.663.838.245 1.496.467 1.99.661v30.789c-4.518-.884-8.299-2.945-11.344-6.186-3.043-3.241-4.516-7.659-4.42-13.258h-20.77c.982 11.589 4.568 20.381 10.754 26.365 6.188 5.992 14.777 9.38 25.779 10.166v12.519h8.691v-12.519c7.365-.492 13.406-1.966 18.117-4.419 4.713-2.454 8.473-5.254 11.271-8.397 2.793-3.141 4.734-6.355 5.816-9.647 1.08-3.291 1.621-6.017 1.621-8.176 0-2.452-.172-5.254-.518-8.396-.344-3.143-1.447-6.286-3.311-9.427zm-41.689-20.329c-4.715-1.08-8.098-2.504-10.166-4.273-2.061-1.768-3.094-4.269-3.094-7.512 0-2.062.371-3.851 1.107-5.378.738-1.52 1.742-2.799 3.02-3.83a12.798 12.798 0 0 1 4.271-2.281 16.183 16.183 0 0 1 4.861-.735v24.009zm23.127 43.38a14.56 14.56 0 0 1-3.758 4.348c-1.52 1.177-3.24 2.086-5.154 2.722-1.914.644-3.758 1.06-5.523 1.254v-28.283c5.791 1.575 9.891 3.315 12.301 5.23 2.402 1.914 3.605 4.786 3.605 8.618-.001 2.355-.489 4.395-1.471 6.111z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-dollar.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-dollar.svg
new file mode 100644
index 0000000000..6784c6e8df
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-dollar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M108.023 38.888v434.118h296.179V38.888H108.023zM373.545 442.36H138.664V69.549h234.881V442.36zm-45.768-116.151H185.655v24.932h142.122v-24.932zm0 57.014H185.655v24.915h142.122v-24.915zm-97.105-140.846c-4.515-4.828-6.705-11.381-6.557-19.705H193.26c1.456 17.233 6.802 30.283 15.975 39.175 9.206 8.895 21.943 13.9 38.277 15.078v18.604h12.918v-18.604c10.922-.739 19.899-2.928 26.895-6.544 6.998-3.659 12.576-7.814 16.745-12.488 4.135-4.644 7.028-9.438 8.615-14.322 1.604-4.876 2.42-8.93 2.42-12.137 0-3.642-.263-7.794-.75-12.458-.541-4.673-2.177-9.353-4.956-13.995-2.762-4.679-7.08-9.174-12.885-13.457-5.854-4.303-14.161-7.914-24.932-10.826a130.285 130.285 0 0 0-5.789-1.537 338.96 338.96 0 0 1-5.363-1.325v-38.699c4.937 0 9.171 2.043 12.673 6.131 3.496 4.071 5.327 9.041 5.476 14.86h31.05c-.425-7.568-2.029-14.142-4.824-19.688-2.746-5.539-6.327-10.181-10.691-13.878-4.383-3.729-9.47-6.639-15.224-8.751-5.757-2.108-11.902-3.543-18.459-4.267V96.688h-12.918v16.857a72.619 72.619 0 0 0-19.032 3.829c-6.117 2.108-11.51 5.102-16.188 8.977-4.659 3.84-8.405 8.615-11.268 14.307-2.827 5.688-4.266 12.264-4.266 19.683 0 7.309 1.243 13.394 3.728 18.284 2.485 4.874 5.804 8.961 9.942 12.246 4.169 3.268 8.877 5.905 14.109 7.864 5.249 1.964 10.579 3.697 15.974 5.133 1.454.296 2.796.623 4.056.981 1.226.375 2.225.686 2.944.983v45.734c-6.706-1.31-12.328-4.399-16.84-9.189zm29.758-32.8c8.6 2.323 14.681 4.921 18.246 7.768 3.564 2.825 5.348 7.094 5.348 12.787 0 3.495-.719 6.521-2.193 9.072a21.593 21.593 0 0 1-5.574 6.459c-2.258 1.75-4.808 3.088-7.618 4.04-2.845.945-5.609 1.554-8.208 1.865v-41.991zm-28.012-41.14c-3.057-2.615-4.595-6.343-4.595-11.154 0-3.057.559-5.703 1.654-7.974 1.093-2.277 2.566-4.172 4.478-5.693a18.829 18.829 0 0 1 6.347-3.385 24.225 24.225 0 0 1 7.21-1.093v35.642c-7-1.6-12.037-3.714-15.094-6.343z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-euro.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-euro.svg
new file mode 100644
index 0000000000..82e99b2eec
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-euro.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M108.292 38.797V472.94h296.197V38.797H108.292zm265.537 403.435H138.933V69.436h234.896v372.796zm-45.765-116.121H185.942v24.918h142.123v-24.918zm0 57.032H185.942v24.919h142.123v-24.919zM207.591 193.08v5.657h-8.749l-6.785 15.763h16.856c3.059 19.098 9.695 33.973 19.9 44.605 11.232 11.803 26.015 17.723 44.408 17.723 12.673 0 23.89-2.846 33.668-8.533l.213-33.026c-11.513 9.188-22.747 13.765-33.683 13.765-16.923 0-27.7-11.512-32.36-34.533h38.049l6.785-15.763H239.31l.21-9.187h48.988l6.787-15.732h-53.353c5.084-19.979 15.289-29.957 30.61-29.957 8.894 0 18.442 3.238 28.646 9.814l13.357-27.342c-14.307-7.293-27.567-10.92-39.814-10.92-17.363 0-31.783 5.562-43.312 16.611-10.92 10.238-18.148 24.137-21.649 41.793h-11.15l-6.802 15.732h15.99c-.145.294-.227 1.471-.227 3.53z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-pound.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-pound.svg
new file mode 100644
index 0000000000..b28cf9e00d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-pound.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M101.195 29.148v452.328h308.621V29.148H101.195zm276.69 420.407h-244.74V61.062h244.74v388.493zm-47.68-121.025h-148.09v25.963h148.09V328.53zm0 59.386h-148.09v25.966h148.09v-25.966zM220.474 205.541c.802 2.52 1.241 5.069 1.241 7.621 0 4.116-.767 8.008-2.269 11.738-1.539 3.723-3.468 7.191-5.84 10.398-2.337 3.168-5.084 6.076-8.191 8.762-3.124 2.65-6.279 4.969-9.45 6.932l14.126 20.961c4.399-3.334 8.83-5.556 13.326-6.703 4.463-1.143 8.782-1.73 12.868-1.73 5.021 0 9.222.483 12.557 1.373 3.335.914 6.672 1.99 10.007 3.201 3.205 1.053 6.704 1.966 10.497 2.714 3.794.756 8.602 1.146 14.339 1.146 5.789 0 11.789-1.074 18.037-3.205 6.212-2.092 12.049-5.819 17.527-11.148l-13.67-23.027c-4.104 4.418-7.718 7.166-10.824 8.213-3.107 1.08-6.18 1.602-9.238 1.602-3.023 0-5.999-.258-8.878-.787a180.815 180.815 0 0 1-8.894-1.96c-3.045-.591-6.019-1.144-8.996-1.702a52.139 52.139 0 0 0-9.008-.783c-2.141 0-4.333.298-6.623.918-2.255.587-5.231 2.029-8.877 4.314l-.458-.461a70.105 70.105 0 0 0 13.129-13.566c3.696-5.1 5.576-11.217 5.576-18.312 0-2.582-.146-5.039-.343-7.328-.229-2.252-.753-4.547-1.473-6.832h23.938v-19.357h-30.346c-2.258-4.092-4.056-7.621-5.332-10.504-1.31-2.907-2.223-5.428-2.747-7.618-.54-2.19-.883-4.153-1.013-5.82a53.521 53.521 0 0 1-.263-5.264c0-6.343 2.027-11.442 6.051-15.272 4.021-3.762 9.45-5.654 16.285-5.654 5.788 0 10.317 1.145 13.571 3.531 3.271 2.355 5.707 5.1 7.293 8.305 1.602 3.207 2.648 6.477 3.074 9.942.457 3.366.769 6.246.932 8.502h30.756c0-18.543-4.84-32.671-14.585-42.382-9.712-9.711-23.316-14.584-40.796-14.584-9.565 0-18.003 1.207-25.293 3.664-7.293 2.416-13.377 5.715-18.232 9.906-4.856 4.188-8.552 8.99-11.053 14.453-2.504 5.494-3.778 11.251-3.778 17.332 0 6.834 1.146 13.049 3.402 18.674 2.289 5.656 4.578 9.877 6.868 12.789H194.82v19.357h22.547a73.26 73.26 0 0 1 3.107 7.651z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-yen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-yen.svg
new file mode 100644
index 0000000000..529fd87d4e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-yen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M107.566 39.19v434.12h296.176V39.19H107.566zM373.07 442.668H138.205v-372.8H373.07v372.8zm-45.748-116.156H185.198v24.932h142.124v-24.932zm0 56.997H185.198v24.952h142.124v-24.952zM203.739 185.582v20.779h31.296l3.042 6.349v10.07h-34.338v20.78h34.338v30.183h33.259V243.56h34.53v-20.78h-34.53v-10.07l3.268-6.349h31.263v-20.779h-20.761l33.907-68.021h-35.444l-28.226 68.021-28.876-68.021h-35.418l33.455 68.021h-20.765z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-reception.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-reception.svg
new file mode 100644
index 0000000000..01a61f4ae9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-reception.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.004 146.532c26.324 0 47.664-21.339 47.664-47.66 0-26.323-21.34-47.664-47.664-47.664s-47.664 21.34-47.664 47.664c0 26.321 21.34 47.66 47.664 47.66zM49.525 271.882v98.662h41.977l16.445 90.249h296.105l16.445-90.249h41.977v-98.662H49.525zm174.239-75.609c.16.515.281 1.043.299 1.59v4.785l-.004-.012c0 10.362-.523 25.816-2.611 45.43h69.102c-2.086-19.613-2.611-35.067-2.611-45.43v-4.796c.008-.262.064-.514.111-.767l36.145 50.992h40.629l-54.791-77.304c-2.895-4.201-6.293-6.775-9.893-8.766-3.873-2.038-8.07-3.453-13.395-3.511-.629 0-1.135.024-1.551.051l-29.188 1.819-30.045-1.87a21.47 21.47 0 0 0-1.529-.049c-5.338.059-9.555 1.48-13.428 3.534-3.607 2.015-7 4.612-9.881 8.844l-.004-.001-54.059 77.253h40.455l36.249-51.792z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-record.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-record.svg
new file mode 100644
index 0000000000..5a928928d3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-record.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M421.553 256.006c0 91.873-74.479 166.354-166.354 166.354-91.869 0-166.352-74.48-166.352-166.354 0-91.873 74.482-166.351 166.352-166.351 91.874 0 166.354 74.478 166.354 166.351z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-redo.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-redo.svg
new file mode 100644
index 0000000000..b1fcfc01d6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-redo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M293.803 250.02l-64.785 64.762L463.1 337.197l-22.402-234.091-63.539 63.547c-36.348-25.028-79.562-39.056-124.348-39.161-37.917-.057-77.537 10.596-111.611 34.809-10.58 7.456-20.488 16.197-29.562 26.066 11.625-4.024 23.954-6.052 36.641-5.971 46.468.2 97.189 24.819 145.524 67.624zm-129.5 160.701v-35.424c0-43.781 8.699-73.252 19.409-92.192 10.875-18.97 23.234-28.682 37.492-34.859 7.047-2.946 14.684-4.844 22.795-5.65-34.208-23.274-67.579-35.41-95.72-35.262-29.038.238-52.666 11.643-71.159 38.472-3.499 5.161-6.802 10.941-9.811 17.327a240.87 240.87 0 0 0-2.371 6.924c-10.137 30.984-15.303 66.023-15.303 105.242v35.424h114.668z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-refresh.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-refresh.svg
new file mode 100644
index 0000000000..b3c932583f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-refresh.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M251.886 36.967c.051 0 .101.003.152.004.048.002.083.002.133.002l-.285-.006zM469.053 255.5c-.021-120.031-96.842-217.653-217.015-218.53a127.06 127.06 0 0 0-1.572-.009c-61.856-.011-117.971 25.852-157.694 67.277l-51.88-52.545v152.691h150.756l-52.354-53.025c27.891-29.734 67.271-48.214 111.172-48.224.405 0 .626 0 .722.004h.278c83.815.51 151.432 68.677 151.411 152.361.004.1-.004.507.004 1.202-.625 83.712-68.756 151.222-152.361 151.202-.271.006-.712 0-1.311 0l.206 66.178a32.07 32.07 0 0 1 1.105 0c120.078-.023 217.738-96.924 218.533-217.167v-.36l-.004-.435c0-.11.004-.317.004-.62z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-remote.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-remote.svg
new file mode 100644
index 0000000000..ff3d1de672
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-remote.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M355.731 49.279H156.269c-11.109 0-20.118 9.008-20.118 20.118v373.204c0 11.11 9.009 20.119 20.118 20.119h199.463c11.109 0 20.118-9.009 20.118-20.119V69.397c0-11.11-9.009-20.118-20.119-20.118zm-32.043 136.333c7.487 0 13.556 6.069 13.556 13.558s-6.069 13.558-13.556 13.558h-11.435c1.05-4.352 1.62-8.889 1.62-13.558s-.57-9.206-1.62-13.558h11.435zm-81.245-54.128c0-7.487 6.07-13.558 13.557-13.558s13.558 6.07 13.558 13.558v11.433c-4.352-1.049-8.889-1.62-13.558-1.62s-9.205.571-13.557 1.62v-11.433zm-54.131 54.128h11.434c-1.05 4.352-1.62 8.889-1.62 13.558s.57 9.206 1.62 13.558h-11.434c-7.487 0-13.557-6.069-13.557-13.558s6.07-13.558 13.557-13.558zm25.034 247.432h-43.788v-43.788h43.788v43.788zm0-64.384h-43.788v-43.787h43.788v43.787zm65.82 64.384h-43.79v-43.788h43.79v43.788zm0-64.384h-43.79v-43.787h43.79v43.787zm-36.723-101.804v-11.432c4.352 1.049 8.888 1.62 13.557 1.62s9.206-.571 13.558-1.62v11.432c0 7.487-6.07 13.558-13.558 13.558s-13.557-6.07-13.557-13.558zM256 229.93c-16.985 0-30.759-13.771-30.759-30.76 0-16.987 13.773-30.758 30.759-30.758 16.987 0 30.759 13.771 30.759 30.758 0 16.988-13.772 30.76-30.759 30.76zm88.112 203.114h-43.788v-43.788h43.788v43.788zm0-64.384h-43.788v-43.787h43.788v43.787z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-remove.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-remove.svg
new file mode 100644
index 0000000000..97bff0169f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-remove.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M88.871 297.086v-83.1h332.084v83.1H88.871z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-repeat-one.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-repeat-one.svg
new file mode 100644
index 0000000000..054185177f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-repeat-one.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M109.469 190.795l24.132-23.979h173.582v48.212l89.521-73.884-89.521-73.891v48.208H112.416L58.11 169.434v66.409h51.359v-45.048zm256.216 68.963l-10.965 10.896a96.156 96.156 0 0 1 19.202-1.932 95.438 95.438 0 0 1 43.122 10.268v-64.275h-51.359v45.043zm-43.228 23.982H168.384v-48.201l-89.519 73.887 89.519 73.885V335.11l114.213-.004c6.962-21.387 21.234-39.491 39.86-51.366zm51.465 2.508c-43.356 0-78.504 35.152-78.504 78.508 0 43.352 35.147 78.504 78.504 78.504 43.357 0 78.503-35.152 78.503-78.504 0-43.356-35.146-78.508-78.503-78.508zm12.517 131.123H365.49v-71.744h-24.465v-13.916c6.44-.293 10.949-.721 13.524-1.291 4.104-.912 7.443-2.725 10.019-5.455 1.767-1.866 3.104-4.352 4.008-7.464.526-1.862.789-3.25.789-4.157h17.074v104.027z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-repeat.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-repeat.svg
new file mode 100644
index 0000000000..68e7b30f8a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-repeat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M126.692 221.774l24.129-23.978h173.583V246l89.521-73.886-89.521-73.885v48.207l-145.444-.006h-49.319l-54.31 53.98v66.409h51.362v-45.045zM382.9 245.692v45.043l-24.129 23.981H185.606v-48.203l-89.521 73.885 89.521 73.889V366.08h194.346l54.312-53.979v-66.409H382.9z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-reply-arrow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-reply-arrow.svg
new file mode 100644
index 0000000000..fd708c5173
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-reply-arrow.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M251.11 142.632l.468-73.222L102.65 192.545l147.352 124.717.444-69.943c147.146 19.949 83.59 108.396-.264 192.248 290.48-189.515 117.69-276.817.928-296.935z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-resize.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-resize.svg
new file mode 100644
index 0000000000..e26e9fb196
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-resize.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M473.996 261.389l-92.818-92.818v59.734H293.15V89.28h-83.099v139.025h-81.019v-59.734l-92.819 92.822 92.819 92.818v-59.74l81.019.006v127.341h83.099V294.477h88.028v59.734z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-return-to-top.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-return-to-top.svg
new file mode 100644
index 0000000000..15e5d82289
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-return-to-top.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M298.174 290.192v43.226c0 35.787-29.01 64.801-64.801 64.801-35.787 0-64.799-29.014-64.799-64.801V178.582c0-35.79 29.012-64.8 64.799-64.8 35.791 0 64.801 29.011 64.801 64.8v12.808h-44.766l69.871 84.656 69.873-84.656H347.9v-12.808c0-63.15-51.377-114.527-114.527-114.527-63.148 0-114.525 51.377-114.525 114.527v154.836c0 63.149 51.377 114.527 114.525 114.527 63.15 0 114.527-51.378 114.527-114.527V290.78l-24.621 29.831-25.105-30.419z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-right-double-arrow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-right-double-arrow.svg
new file mode 100644
index 0000000000..a8f4a03cb7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-right-double-arrow.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M168.528 256.002L74.059 87.996h34.025l153.057 168.006-153.055 168.002H74.057zm82.33-168.006h34.025l153.059 168.006-153.057 168.002h-34.027l94.467-168.002z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-road.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-road.svg
new file mode 100644
index 0000000000..e9dedee5bd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-road.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M261.312 78.641l.949 23.021H250.57l.935-23.021h-82.771l-81.18 354.471h153.19v-32.264h31.328v32.264H425.25L344.082 78.641h-82.77zm-12.015 54.775h14.221l1.097 27.012h-16.431l1.113-27.012zm-2.387 58.745h18.997l1.421 34.501h-21.826l1.408-34.501zm-2.683 66.243h24.361l1.508 36.998h-27.391l1.522-36.998zm-3.483 110.713V344.67l.688-17.528h29.939l.701 17.396v24.58h-31.328z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-roadsign.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-roadsign.svg
new file mode 100644
index 0000000000..4115c305c4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-roadsign.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M463.605 239.344L272.661 48.379c-4.545-4.572-10.562-6.851-16.547-6.851-5.983 0-12.032 2.279-16.577 6.851L48.59 239.344c-9.153 9.147-9.153 23.982 0 33.127l190.947 190.963c4.545 4.581 10.562 6.867 16.577 6.867a23.284 23.284 0 0 0 16.547-6.877l190.944-190.953c9.161-9.145 9.161-23.98 0-33.127zm-15.856 17.269L256.803 447.557c-.1.1-.292.283-.688.283-.424 0-.618-.184-.718-.273L64.451 256.613a.99.99 0 0 1 0-1.41L255.396 64.261c.1-.09.294-.297.718-.297.396 0 .589.198.688.297l190.946 190.942c.096.083.294.292.294.712.001.403-.197.591-.293.698zm-349.388-.697l157.753 157.747 157.722-157.747L256.114 98.155 98.361 255.916z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rocket.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rocket.svg
new file mode 100644
index 0000000000..5fab3cf1ba
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rocket.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M368.744 80.665c2.058 18.558 8.239 33.472 18.476 43.668 10.202 10.272 25.114 16.436 43.724 18.479C458.117 87.875 466.72 44.9 466.72 44.9s-43.006 8.571-97.976 35.765zm-28.582 15.321c-29.628 17.182-60.988 39.601-89.996 68.604-18.54 18.577-33.452 36.562-45.487 53.472L131.2 231.647l-86.334 86.365 76.98 2.401 54.186-54.184c-19.098 39.636-20.799 65.894-20.799 65.894l24.234 24.234s27.143-2.588 67.039-21.91l-55.331 55.298 2.419 76.974 86.332-86.329 13.636-73.837c17.07-11.957 35.091-26.773 53.436-45.134 29.006-29.003 51.439-60.361 68.607-89.993-18.934-3.824-36.296-11.741-50.033-25.408-13.67-13.737-21.617-31.084-25.41-50.032z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rss.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rss.svg
new file mode 100644
index 0000000000..96a210c20c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rss.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M95.143 355.051c33.239 0 60.186 26.948 60.186 60.186 0 33.235-26.947 60.188-60.186 60.188-33.242 0-60.188-26.952-60.188-60.188 0-33.238 26.946-60.186 60.188-60.186zm230.709 120.373h-85.258c0-113.572-92.071-205.637-205.638-205.637v-85.263c160.662 0 290.896 130.236 290.896 290.9zm60.189 0c0-193.9-157.187-351.084-351.086-351.084V36.567c242.372 0 438.855 196.482 438.855 438.857h-87.769z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ruler-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ruler-alt.svg
new file mode 100644
index 0000000000..695d110031
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ruler-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M37.465 95.444L473.737 415.17H37.465V95.444m67.381 132.937v119.424h162.952L104.846 228.381z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ruler.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ruler.svg
new file mode 100644
index 0000000000..15eff181d8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ruler.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M379.978 37.318L37.23 380.053l94.393 94.389 342.749-342.724-94.394-94.4zM117.315 428.486l-45.864-45.871 8.551-8.52 45.848 45.855-8.535 8.536zm10.337-50.149l-25.934-25.956 8.501-8.533 25.966 25.943-8.533 8.546zm30.247-30.241l-25.95-25.965 8.52-8.524 25.965 25.958-8.535 8.531zm30.247-30.25l-25.963-25.965 8.535-8.523 25.964 25.957-8.536 8.531zm30.25-30.248l-25.966-25.945 8.536-8.539 25.967 25.948-8.537 8.536zm50.166-10.34l-45.879-45.855 8.533-8.535 45.865 45.876-8.519 8.514zm10.301-50.151l-25.934-25.939 8.536-8.562 25.947 25.974-8.549 8.527zm30.267-30.222l-25.969-25.971 8.52-8.531 25.981 25.931-8.532 8.571zm30.23-30.266l-25.965-25.955 8.552-8.531 25.949 25.958-8.536 8.528zm30.25-30.265l-25.967-25.93 8.535-8.54 25.967 25.956-8.535 8.514zm4.283-56.175l8.555-8.522 45.863 45.842-8.535 8.547-45.883-45.867z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-safe.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-safe.svg
new file mode 100644
index 0000000000..9bdce49ca5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-safe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M63.09 481.656h385.094v-41.563H63.09v41.563zM459.139 30.178H52.168c-12.199 0-22.074 9.876-22.074 22.057v341.679c0 12.201 9.875 22.072 22.074 22.072h406.971c12.184 0 22.075-9.871 22.075-22.072V52.235c0-12.181-9.892-22.057-22.075-22.057zM95.84 184.676h25.949v78.13H95.84v-78.13zm319.627-22.579v201.292H95.84V303.9h25.949v33.519h267.693v-228.66H121.789v34.804H95.84V82.746h319.627v79.351zm-164.932 13.405a58.76 58.76 0 0 1 26.098-10.854v16.008h17.82v-16.008a58.73 58.73 0 0 1 26.064 10.854l-11.281 11.257 12.59 12.617 11.282-11.301c5.558 7.557 9.386 16.419 10.823 26.089h-15.957v17.825h15.957c-1.438 9.669-5.266 18.546-10.823 26.103l-11.282-11.307-12.59 12.59 11.281 11.307a58.514 58.514 0 0 1-26.064 10.806v-15.97h-17.82v15.97c-9.684-1.452-18.561-5.253-26.098-10.806l11.283-11.307-12.592-12.59-11.281 11.307c-5.558-7.557-9.367-16.434-10.826-26.103h15.963v-17.825h-15.976c1.472-9.669 5.281-18.532 10.839-26.089l11.281 11.301 12.592-12.617-11.283-11.257zm34.994 69.155c11.902 0 21.582-9.675 21.582-21.58 0-11.914-9.68-21.561-21.582-21.561-11.906 0-21.568 9.647-21.568 21.561 0 11.905 9.662 21.58 21.568 21.58z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-safedial.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-safedial.svg
new file mode 100644
index 0000000000..da9a6a6275
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-safedial.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M388.177 244.9c-2.354-28.221-13.505-53.924-30.772-74.33l-28.286 28.285-15.663-15.631 28.286-28.27c-20.371-17.264-46.076-28.45-74.299-30.789v39.994h-22.105v-39.994c-28.221 2.339-53.926 13.525-74.329 30.789l28.284 28.29-15.631 15.611-28.284-28.285c-17.268 20.406-28.42 46.109-30.775 74.33h40.029v22.108h-40.029c2.355 28.222 13.507 53.894 30.775 74.314l28.284-28.285 15.631 15.633-28.284 28.269c20.403 17.278 46.108 28.45 74.329 30.789v-39.993h22.105v39.993a131.413 131.413 0 0 0 74.299-30.789l-28.286-28.269 15.631-15.633 28.318 28.285c17.268-20.421 28.419-46.093 30.772-74.331h-39.993V244.9h39.993zm-131.785 52.256c-22.762 0-41.206-18.439-41.206-41.203 0-22.761 18.444-41.202 41.206-41.202 22.758 0 41.202 18.441 41.202 41.202 0 22.764-18.445 41.203-41.202 41.203zm0-258.063c-119.788 0-216.846 97.093-216.846 216.86 0 119.754 97.059 216.845 216.846 216.845 119.751 0 216.844-97.091 216.844-216.845-.001-119.766-97.093-216.86-216.844-216.86zm0 403.067c-102.686 0-186.206-83.536-186.206-186.207 0-89.798 63.867-164.949 148.597-182.392l37.609 47.678 37.606-47.678c84.695 17.443 148.596 92.594 148.596 182.392 0 102.671-83.555 186.207-186.202 186.207z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sandbox-toys.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sandbox-toys.svg
new file mode 100644
index 0000000000..727e62cc18
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sandbox-toys.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M169.555 79.228c-60.875 0-110.402 49.526-110.402 110.405 0 8.036 6.516 14.552 14.555 14.552 8.037 0 14.553-6.516 14.553-14.552 0-44.829 36.467-81.302 81.295-81.302 44.826 0 81.295 36.473 81.295 81.302 0 8.036 6.514 14.552 14.553 14.552 8.037 0 14.553-6.516 14.553-14.552-.002-60.879-49.525-110.405-110.402-110.405zm98.619 147.223H69.715c-6.1 0-11.049 4.947-11.049 11.049v38.675c0 6.101 4.949 11.05 11.049 11.05h198.459c6.104 0 11.049-4.949 11.049-11.05V237.5c0-6.102-4.946-11.049-11.049-11.049zM93.699 410.128c1.248 8.816 8.791 15.368 17.695 15.368H226.5c8.902 0 16.447-6.552 17.693-15.368l13.16-93.114H80.537l13.162 93.114zm350.699-255.663H352.07a8.935 8.935 0 0 0-8.934 8.935v101.263c0 4.936 4 8.935 8.934 8.935h92.328a8.934 8.934 0 0 0 8.936-8.935V163.399c0-4.933-4-8.934-8.936-8.934zM420.387 303.44h-44.303v76.498c-5.512 5.61-8.924 13.289-8.924 21.757 0 17.138 13.938 31.077 31.074 31.077 17.133 0 31.076-13.939 31.076-31.077 0-8.468-3.412-16.146-8.924-21.757V303.44zm-22.153 113.255c-8.27 0-14.998-6.728-14.998-15 0-8.271 6.729-15.001 14.998-15.001 8.271 0 15 6.729 15 15.001 0 8.273-6.728 15-15 15z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-satellite-dish.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-satellite-dish.svg
new file mode 100644
index 0000000000..235d67c316
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-satellite-dish.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M110.866 352.532v118.48l65.93-.001v-62.069c-18.937-12.035-36.691-26.263-52.913-42.544a300.62 300.62 0 0 1-13.017-13.866zm347.686-170.178c-.391-81.529-66.613-147.484-148.334-147.484-11.055 0-20.014 8.972-20.014 20.041 0 11.054 8.959 20.03 20.014 20.03 29.988 0 56.933 12.068 76.588 31.687 19.49 19.541 31.522 46.256 31.688 76-.035.687.064 4.009.85 6.294 2.616 8.683 10.562 14.291 19.195 14.291 1.896 0 3.861-.258 5.755-.851 8.961-2.674 14.65-11.082 14.258-20.008zm-165.373-73.875c-11.051-.017-20.047 8.961-20.047 20.014 0 11.085 8.961 20.048 20.016 20.048 28.548.062 51.7 23.216 51.734 51.732 0 11.054 8.992 20.031 20.047 20.031 11.083 0 20.012-8.978 20.012-20.031-.001-50.703-41.073-91.759-91.762-91.794zm2.671 85.199H103.47l-44.566-44.679C58.71 304.526 184.643 430.787 340.172 430.98l-44.322-44.435V193.678zm-167.315 25.129h124.417l-62.287 62.288-62.13-62.288zm79.877 80.079l62.309-62.309.001 124.777-62.31-62.468z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-save.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-save.svg
new file mode 100644
index 0000000000..c4a56c7268
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-save.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M390.631 44.497c-12.884.081-24.87 3.306-36.398 8.011-11.479 4.809-22.221 11.024-31.393 20.081l-63.932 63.901c-.883.914-1.685 1.832-2.501 2.729-.833-.896-1.653-1.814-2.521-2.729l-63.932-63.901c-9.14-9.057-19.914-15.272-31.392-20.081-11.546-4.705-23.513-7.93-36.398-8.011H60.279v51.149h61.886c3.154-.101 10.351 1.32 16.825 4.119 6.541 2.613 12.641 6.67 14.782 8.979l63.948 63.948c2.306 2.152 6.362 8.271 8.994 14.778 2.763 6.408 4.169 13.508 4.119 16.713 0 .029-.016.078-.016.127v68.641h-80.414l103.908 103.91 103.877-103.875h-76.212V204.31c-.099-3.186 1.325-10.365 4.106-16.84 2.613-6.508 6.685-12.626 8.975-14.778l63.949-63.948c2.158-2.309 8.242-6.365 14.797-8.979 6.459-2.799 13.653-4.22 16.826-4.119H452.5V44.497h-61.869zm-37.33 136.48c26.767 26.817 40.094 61.629 40.126 96.601-.032 35.306-13.278 70.359-40.126 97.241-26.815 26.797-61.74 40.092-96.894 40.124-35.156-.032-70.079-13.327-96.913-40.124-26.814-26.865-40.107-61.855-40.126-97.059.019-35.073 13.343-69.966 40.111-96.783l-36.167-36.148c-36.627 36.625-55.137 84.893-55.12 132.932-.017 48.085 18.379 96.486 55.151 133.229 36.658 36.672 84.958 55.149 133.064 55.116h.113c48.025 0 96.292-18.476 132.932-55.116 36.821-36.824 55.152-85.287 55.136-133.411.017-48.019-18.54-96.19-55.136-132.749l-36.151 36.147z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-scan.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-scan.svg
new file mode 100644
index 0000000000..de0a84c4b6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-scan.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M404.57 105.592c-41.244-41.266-95.477-61.967-149.535-61.949-54.064-.018-108.296 20.684-149.54 61.949-41.745 41.73-61.961 96.664-61.935 151.076-.013 53.703 21.164 107.231 61.935 147.995 41.251 41.26 95.476 61.964 149.54 61.944h.08c54.031 0 108.23-20.704 149.455-61.944 41.265-41.249 61.967-95.476 61.947-149.54.02-54.062-20.682-108.295-61.947-149.531zm-25.443 273.623c-34.32 34.303-79.121 51.387-124.091 51.408-44.976-.021-89.777-17.1-124.09-51.408-34.01-34.021-51.386-78.254-51.401-122.547.028-45.648 16.802-91.021 51.401-125.633 34.313-34.303 79.115-51.379 124.09-51.404 44.97.025 89.777 17.102 124.091 51.404 34.301 34.305 51.379 79.112 51.399 124.088-.02 44.973-17.098 89.778-51.399 124.092zm10.853-164.598c-6.478-21.637-18.254-42.029-35.332-59.104a6.264 6.264 0 0 0-8.854 0c-2.441 2.452-2.441 6.417.006 8.856 15.322 15.316 25.928 33.537 31.881 52.89-8.026 4.086-13.535 12.401-13.535 22.026 0 11.668 8.086 21.416 18.95 24.018-1.909 30.082-14.305 59.588-37.302 82.586-25.081 25.071-57.895 37.587-90.763 37.594-32.869-.007-65.678-12.522-90.756-37.594a129.78 129.78 0 0 1-4.471-4.701 17.003 17.003 0 0 0 2.28-8.506c0-9.447-7.656-17.106-17.104-17.106-1.044 0-2.062.11-3.057.289a127.404 127.404 0 0 1-14.414-46.167c10.667-2.746 18.558-12.393 18.558-23.916 0-10.298-6.299-19.119-15.25-22.836a127.472 127.472 0 0 1 21.838-45.201l22.059 22.062a97.326 97.326 0 0 0-17.224 55.316c-.006 24.94 9.535 49.938 28.574 68.975a97.228 97.228 0 0 0 29.312 20.139c-.011.306-.046.607-.046.92 0 13.654 11.067 24.718 24.721 24.718 11.183 0 20.62-7.421 23.674-17.608 21.986-1.958 43.464-11.347 60.28-28.168 19.034-19.036 28.581-44.034 28.573-68.975.008-24.941-9.539-49.949-28.573-68.969a6.266 6.266 0 0 0-8.854 0 6.26 6.26 0 0 0 .007 8.857c16.609 16.605 24.891 38.333 24.898 60.111-.008 21.777-8.289 43.502-24.905 60.119-14.297 14.293-32.374 22.407-51.017 24.4-2.508-10.996-12.327-19.21-24.084-19.21-8.884 0-16.653 4.703-21.011 11.74-8.727-4.075-16.906-9.715-24.121-16.931-16.618-16.623-24.899-38.342-24.905-60.119.005-16.153 4.576-32.272 13.711-46.307l45.471 45.477c0 .082-.012.164-.012.244 0 13.658 11.069 24.723 24.722 24.723 13.655 0 24.723-11.064 24.723-24.723 0-13.043-10.111-23.705-22.92-24.631l-90.243-90.246c-7.028-7.028-18.421-7.028-25.45 0-7.021 7.031-7.021 18.42 0 25.445l3.719 3.721a140.088 140.088 0 0 0-25.423 52.436c-12.22 1.496-21.687 11.893-21.687 24.52 0 11.42 7.751 21.002 18.271 23.842a140.008 140.008 0 0 0 16.387 52.854 16.985 16.985 0 0 0-3.403 10.205c0 9.441 7.658 17.102 17.102 17.102 1.757 0 3.45-.268 5.046-.758a145.385 145.385 0 0 0 5.395 5.719c27.486 27.49 63.58 41.26 99.611 41.26 36.031 0 72.122-13.77 99.616-41.26 25.48-25.483 39.157-58.353 41.02-91.71 10.345-2.954 17.922-12.454 17.922-23.749-.001-13.28-10.477-24.084-23.611-24.669z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-school.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-school.svg
new file mode 100644
index 0000000000..216a3ff764
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-school.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M94.363 423.925h322.971v29.106H94.363zm37.041-54.097h248.889v29.106H131.404zm124.75-164.59c20.357 0 36.924-16.564 36.924-36.925s-16.566-36.925-36.924-36.925c-20.361 0-36.928 16.564-36.928 36.925s16.567 36.925 36.928 36.925zm-5.922-58.401h11.838v21.573h19.605v11.839h-31.443v-33.412zm-45.634 195.899V253.67h39.412v88.974h23.68V253.67h39.412v88.881l72.031-.131-.402-221.535-122.93-61.916-122.627 62.36.402 221.537 71.022-.13zm51.556-227.44c29.279 0 53.016 23.737 53.016 53.018s-23.736 53.018-53.016 53.018c-29.281 0-53.02-23.737-53.02-53.018s23.739-53.018 53.02-53.018zm146.27 14.249l.375 205.758 59.521-11.808v-48.072h.307v-129.28zm-292.914.157l-59.832 16.441v84.019h-.305v93.333l60.512 12.044z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-screensharing.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-screensharing.svg
new file mode 100644
index 0000000000..065d04c278
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-screensharing.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M375.853 187.912V64.959H36.746v257.146h97.83v122.947h339.101v-257.14h-97.824zM74.309 284.541v-182.02h263.99v85.391H134.575v96.629H74.309zm361.814 122.952H172.14v-182.02h263.983v182.02z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-script-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-script-alt.svg
new file mode 100644
index 0000000000..4efc77d194
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-script-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M392.395 243.232l-13.322-13.321-71.176-71.178 20.873-20.876a57.271 57.271 0 0 0 16.82-40.602 57.305 57.305 0 0 0-16.82-40.613 57.31 57.31 0 0 0-40.604-16.82 57.325 57.325 0 0 0-40.613 16.826L122.468 182.303a58.387 58.387 0 0 0-5.165 4.59 57.332 57.332 0 0 0-16.813 40.606 57.331 57.331 0 0 0 16.819 40.606l84.497 84.494-20.876 20.871c-11.193 11.176-16.833 25.959-16.819 40.613a57.316 57.316 0 0 0 16.827 40.611 57.302 57.302 0 0 0 40.557 16.818h.054c14.63 0 29.411-5.629 40.597-16.822l.005.004 130.244-130.246a57.29 57.29 0 0 0 16.816-40.61 57.273 57.273 0 0 0-16.816-40.606zM267.308 76.354c5.782-5.766 13.255-8.608 20.857-8.622 7.601.014 15.068 2.847 20.871 8.646 5.79 5.802 8.63 13.276 8.649 20.878-.02 7.596-2.859 15.066-8.649 20.869l-8.251 8.252-87.153 87.154a57.213 57.213 0 0 0-15.112-26.645 57.2 57.2 0 0 0-26.283-15.014l95.071-95.518zm-24.895 358.601c-5.796 5.799-13.282 8.628-20.918 8.652-7.568-.024-15.034-2.861-20.823-8.652-5.795-5.793-8.637-13.274-8.65-20.871.013-7.607 2.855-15.072 8.644-20.869l20.877-20.879 7.554 7.557 13.323 13.314c5.79 5.805 8.629 13.277 8.644 20.877-.015 7.597-2.855 15.07-8.651 20.871zm130.246-130.236l-95.458 95.453c-2.439-9.779-7.424-19.085-15.047-26.701l-13.322-13.314-111.789-111.788c-5.788-5.805-8.63-13.275-8.642-20.87.012-7.603 2.854-15.077 8.642-20.872 5.803-5.795 13.27-8.634 20.878-8.656 7.594.022 15.068 2.861 20.871 8.648 5.789 5.797 8.63 13.271 8.65 20.88-.021 7.595-2.862 15.075-8.65 20.87l19.736 19.736 89.632-89.632 71.184 71.171 13.315 13.324c5.792 5.795 8.633 13.272 8.645 20.87-.012 7.6-2.853 15.074-8.645 20.881zm-91.127-101.607l-74.458 74.458 19.736 19.732 74.456-74.447-19.734-19.743zm29.779 29.783l-74.453 74.46 19.73 19.737 74.461-74.459-19.738-19.738zm-44.674 104.242l19.738 19.734 74.454-74.453-19.731-19.734-74.461 74.453z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-script.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-script.svg
new file mode 100644
index 0000000000..224b12e0a4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-script.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M233.52 375.158l-12.11-12.105-25.437 25.428c-7.037 7.037-10.521 16.193-10.529 25.438.008 9.223 3.502 18.385 10.535 25.429 7.029 7.018 16.179 10.518 25.386 10.523 9.248-.006 18.427-3.482 25.47-10.523 7.033-7.044 10.527-16.206 10.535-25.438-.008-9.227-3.492-18.385-10.529-25.428l-13.321-13.324zM208.781 227.19l96.43-96.434 8.252-8.243c7.033-7.047 10.525-16.203 10.533-25.434-.008-9.226-3.5-18.381-10.533-25.424-7.045-7.041-16.203-10.531-25.429-10.537-9.229.006-18.394 3.498-25.423 10.527L158.395 176.338a50.868 50.868 0 0 1 35.442 14.93 50.904 50.904 0 0 1 14.944 35.922zm168.61 30.748l-13.323-13.323-75.729-75.734-94.496 94.5-10.628-10.625c7.038-7.047 10.527-16.202 10.535-25.43-.008-9.228-3.497-18.393-10.535-25.428-7.043-7.043-16.205-10.527-25.428-10.537-9.232.01-18.391 3.494-25.432 10.537-7.037 7.041-10.522 16.2-10.53 25.428.008 9.228 3.493 18.383 10.538 25.43l111.785 111.786 13.316 13.317a50.881 50.881 0 0 1 14.934 36.049c0 .174-.023.342-.025.513l105.018-105.016c7.112-7.131 10.648-16.396 10.654-25.743-.006-9.329-3.534-18.6-10.654-25.724zm-140.6 48.429l-17.713-17.708 74.459-74.452 17.707 17.709-74.453 74.451zm41.15 41.157l-17.707-17.71 74.46-74.452 17.706 17.705-74.459 74.457z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-scull.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-scull.svg
new file mode 100644
index 0000000000..fc2d5cc4b2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-scull.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M402.109 295.102c5.184-15.395 25.376-46.526 25.376-99.526 0-52.996-65.503-131.134-171.113-131.134-105.626 0-171.077 78.138-171.077 131.134 0 53 20.16 84.131 25.329 99.526 10.511 31.41-2.062 46.77-2.062 46.77s3.763 32.367 14.063 46.652c10.316 14.275 60.727-9.527 60.727 44.393 0 0 20.257 14.47 73.496 14.47 53.207 0 72.564-14.47 72.564-14.47 0-53.92 50.41-30.117 60.728-44.393 10.317-14.285 14.062-46.652 14.062-46.652s-12.591-15.36-2.093-46.77zm-197.373 40.71c-11.249 6.101-29.643 11.096-40.894 11.096-11.264 0-22.921-7.336-25.932-16.275-3.023-8.947-3.843-25.28-1.864-36.308 1.98-10.995 15.648-23.986 30.413-28.86 14.75-4.881 33.83-3.84 42.43 2.281 8.568 6.146 15.73 21.494 15.94 34.083.2 12.591-8.844 27.896-20.093 33.983zm51.621 54.427c-18.477 0-22.779-6.829-22.779-6.829s1.882-54.673 22.779-54.673c20.896 0 22.81 54.673 22.81 54.673s-4.334 6.829-22.81 6.829zm118.48-59.606c-2.993 8.939-14.667 16.275-25.917 16.275-11.266 0-29.66-4.995-40.911-11.096-11.248-6.088-20.29-21.393-20.079-33.983.213-12.589 7.376-27.937 15.943-34.083 8.584-6.121 27.664-7.162 42.413-2.281 14.766 4.874 28.45 17.865 30.431 28.86 1.976 11.028 1.143 27.361-1.88 36.308z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-search.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-search.svg
new file mode 100644
index 0000000000..1e0715b800
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-search.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M470.704 407.906l-2.691-2.689.006-.002-107.514-107.523c14.938-25.733 23.616-55.565 23.82-87.451.626-97.615-77.99-177.243-175.599-177.857l-1.168-.002c-97.06.005-176.067 78.392-176.692 175.598-.618 97.609 77.999 177.236 175.597 177.859.389.002.766.004 1.155.004 32.442 0 62.846-8.79 88.998-24.075L404.035 469.2l.01-.01 2.686 2.686c8.125 8.124 21.293 8.117 29.414 0l34.56-34.554c8.115-8.117 8.121-21.293-.001-29.416zm-263.956-67.135c-72.589-.466-131.271-59.907-130.812-132.502C76.4 136.14 135.45 77.457 207.561 77.453l.88.002c35.167.22 68.144 14.124 92.851 39.148 24.705 25.025 38.188 58.178 37.962 93.352-.222 35.015-14.027 67.893-38.867 92.564-24.834 24.67-57.78 38.252-92.768 38.252h-.871z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-security-camera.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-security-camera.svg
new file mode 100644
index 0000000000..09bb6613aa
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-security-camera.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M395.869 91.516L73.502 245.323l111.799 44.392 248.553-118.588zm6.387 204.508v44.31h-57.147v-39.48l29.102-13.882-10.383-21.761 65.088-31.051-11.861-24.861-197.506 94.235 11.863 24.856 47.42-22.627 10.385 21.76 19.652-9.377v58.427h93.387v43.911h36.24v-124.46z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sensor.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sensor.svg
new file mode 100644
index 0000000000..a73de18bb1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sensor.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M342.238 170.195l-36.834 36.836c13.08 13.078 20.283 30.467 20.283 48.967s-7.205 35.889-20.284 48.971l36.836 36.834c22.919-22.918 35.542-53.393 35.542-85.805 0-32.414-12.622-62.887-35.543-85.803zm58.774-60.572l-36.836 36.838c60.4 60.4 60.4 158.68 0 219.082l36.836 36.834c80.71-80.711 80.71-212.039 0-292.754zm-194.414 97.408l-36.834-36.836c-22.921 22.916-35.543 53.389-35.543 85.803 0 32.412 12.622 62.887 35.542 85.807l36.836-36.838c-13.081-13.08-20.284-30.469-20.284-48.969-.001-18.498 7.203-35.889 20.283-48.967zm-58.774-60.57l-36.837-36.838c-80.709 80.713-80.709 212.043 0 292.754l36.837-36.834c-60.4-60.402-60.4-158.684 0-219.082zM217.172 256a37.494 37.494 0 1 1 74.988 0 37.494 37.494 0 1 1-74.988 0z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-server-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-server-alt.svg
new file mode 100644
index 0000000000..e1d6a449a5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-server-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.399 374.473c-51.539 0-100.38-6.965-137.526-19.617-19.656-6.689-34.142-14.323-44.721-22.303v73.543c0 19.282 25.801 36.514 66.316 47.894 31.494 8.862 71.897 14.177 115.931 14.177 100.656 0 182.229-27.794 182.229-62.07v-73.543c-10.595 7.979-25.065 15.613-44.72 22.303-37.132 12.651-85.99 19.616-137.509 19.616zm182.229-84.923v-75.572c-10.595 7.946-25.065 15.598-44.72 22.285-37.132 12.638-85.99 19.604-137.509 19.604-51.539 0-100.38-6.966-137.526-19.604-19.656-6.688-34.159-14.339-44.721-22.285v75.572c6.051 32.44 85.529 58.112 182.247 58.112 96.697 0 176.196-25.672 182.229-58.112zM74.152 169.895c4.449 32.928 84.452 59.156 182.247 59.156 97.776 0 177.784-26.229 182.229-59.156v-64.343c0-34.286-81.573-62.07-182.229-62.07-100.673 0-182.247 27.784-182.247 62.07v64.343z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-server.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-server.svg
new file mode 100644
index 0000000000..04636e254a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-server.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M36.586 169.321v85.236h439.609v-85.236H36.586zm55.983 62.057H67.62V197.73h24.95v33.648zm60.956 0h-24.918V197.73h24.918v33.648zm60.991 0H189.58V197.73h24.936v33.648zm212.039 1.405c-10.859 0-19.654-8.791-19.654-19.649 0-10.848 8.795-19.64 19.654-19.64 10.855 0 19.651 8.792 19.651 19.64 0 10.858-8.796 19.649-19.651 19.649zm-156.66 155.582H244.96v58.223H44.09v24.938h426.676v-24.938H269.895v-58.223zm92.513-347.041H150.321l-86.79 97.347h385.717l-86.84-97.347zM36.586 370.492h439.609v-85.227H36.586v85.227zm389.969-61.054c10.855 0 19.651 8.788 19.651 19.64 0 10.854-8.796 19.647-19.651 19.647-10.859 0-19.654-8.794-19.654-19.647-.001-10.851 8.794-19.64 19.654-19.64zm-236.975 4.248h24.936v33.645H189.58v-33.645zm-60.973 0h24.918v33.645h-24.918v-33.645zm-60.987 0h24.95v33.645H67.62v-33.645z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings-alt-2.svg
new file mode 100644
index 0000000000..da84deb9e5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings-alt-2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M414.21 287.29v-62.577h-42.395a119.121 119.121 0 0 0-11.832-28.448l30.012-30.011-44.25-44.249-30.01 30.01a119.215 119.215 0 0 0-28.447-11.83V97.791h-62.576v42.394a119.234 119.234 0 0 0-28.445 11.83l-30.012-30.01-44.25 44.249 30.01 30.011a119.116 119.116 0 0 0-11.83 28.448H97.79v62.577h42.395a119.183 119.183 0 0 0 11.832 28.449l-30.012 30.01 44.25 44.249 30.012-30.011a119.106 119.106 0 0 0 28.445 11.828v42.395h62.576v-42.395a119.087 119.087 0 0 0 28.447-11.828l30.01 30.011 44.25-44.249-30.012-30.01a119.265 119.265 0 0 0 11.832-28.449h42.395zm-158.209 26.112c-31.652 0-57.404-25.752-57.404-57.405 0-31.649 25.752-57.399 57.404-57.399s57.404 25.75 57.404 57.399c0 31.653-25.752 57.405-57.404 57.405z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings-alt.svg
new file mode 100644
index 0000000000..ab9eb44951
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M284.859 300.655l9.021-21.78 38.209-13.684v-31.579l-4.461-1.46-33.811-11.035-9.02-21.784 17.34-36.692-22.334-22.331-4.182 2.125-31.711 16.104-21.775-9.021-13.689-38.214h-31.582l-1.451 4.463-11.039 33.811-21.773 9.02-36.705-17.338-22.328 22.333 2.129 4.179 16.1 31.718-9.016 21.766-38.219 13.686v31.588l4.461 1.452 33.811 11.04 9.021 21.775-17.34 36.696 22.326 22.336 4.184-2.128 31.711-16.1 21.779 9.022 13.68 38.21h31.584l1.459-4.465 11.041-33.808 21.777-9.019 36.695 17.343 22.334-22.339-2.123-4.181-16.103-31.709zm-91.531-6.363c-24.424 0-44.227-19.797-44.227-44.224 0-24.427 19.803-44.227 44.227-44.227 24.418 0 44.219 19.8 44.219 44.227 0 24.428-19.801 44.224-44.219 44.224zm242.791 23.432a57.989 57.989 0 0 0-18.26-38.319l2.096-25.743-30.906-10.955-14.584 21.315a58.01 58.01 0 0 0-38.318 18.266l-25.746-2.095-10.949 30.904 21.314 14.585A58.007 58.007 0 0 0 339.028 364l-2.094 25.744 30.902 10.953 14.588-21.315a57.984 57.984 0 0 0 38.314-18.264l25.746 2.094 10.951-30.903-21.316-14.585zm-34.416 12.226c-4.551 12.845-18.66 19.569-31.508 15.015-12.85-4.555-19.572-18.659-15.016-31.506 4.555-12.852 18.66-19.572 31.508-15.022 12.848 4.554 19.573 18.661 15.016 31.513z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings.svg
new file mode 100644
index 0000000000..6311ad6122
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M469.92 279.717v-48.898l-6.906-2.256-52.35-17.091-13.971-33.728 26.852-56.814-34.586-34.581-6.477 3.288-49.1 24.937-33.721-13.971-21.198-59.171h-48.899l-2.253 6.912-17.091 52.352-33.712 13.966-56.833-26.849-34.573 34.58 3.287 6.474 24.933 49.116-13.96 33.707-59.182 21.189v48.909l6.914 2.253 52.352 17.094 13.966 33.718-26.845 56.82 34.567 34.587 6.484-3.294 49.103-24.931 33.719 13.968 21.188 59.165h48.902l2.26-6.908 17.094-52.35 33.721-13.967 56.818 26.855 34.584-34.59-3.286-6.48-24.937-49.094 13.969-33.726 59.167-21.191zM255.054 324.78c-37.819 0-68.478-30.657-68.478-68.479 0-37.819 30.659-68.481 68.478-68.481 37.819 0 68.475 30.662 68.475 68.481 0 37.822-30.656 68.479-68.475 68.479z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share-alt-2.svg
new file mode 100644
index 0000000000..6f220aaa6d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share-alt-2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M386.075 257.393c-12.787 0-23.848 8.894-26.596 21.381-7.811 35.521-32.711 62.957-64.156 75.589-.19.075-.374.154-.564.229-1.061.422-2.139.803-3.215 1.188-.689.245-1.375.499-2.07.729-.582.196-1.174.372-1.762.557-1.199.375-2.402.75-3.615 1.081-.084.022-.166.043-.252.067-32.787 8.884-69.278 1.925-96.928-21.836-11.406-9.798-28.597-8.501-38.4 2.907-9.801 11.405-8.501 28.599 2.905 38.398 20.838 17.906 44.988 29.506 70.115 34.987l-.006.028c1.934.425 3.865.76 5.801 1.111.318.057.636.127.959.182 2.193.387 4.383.709 6.57.999.111.017.221.032.334.047 6.975.917 13.926 1.422 20.816 1.422 17.027 0 33.666-2.751 49.402-7.878.562-.184 1.117-.381 1.678-.57a158.169 158.169 0 0 0 4.818-1.71 157.01 157.01 0 0 0 3.455-1.315c.47-.188.937-.391 1.404-.586 21.033-8.574 40.5-21.734 56.832-39.363.732-.788 1.458-1.59 2.176-2.394.622-.698 1.27-1.359 1.879-2.07.159-.182.289-.381.439-.566a159.283 159.283 0 0 0 28.303-48.152h56.078v-54.462h-76.4zm-233.578-24.142c3.776-17.169 11.568-32.78 22.643-45.804.154-.174.326-.324.478-.501a107.133 107.133 0 0 1 10.844-10.921 107.529 107.529 0 0 1 12.437-9.283 106.502 106.502 0 0 1 24.911-11.709 106.76 106.76 0 0 1 24.184-4.686c5.172-.39 10.311-.398 15.393-.054 5.125.369 15.373 2.187 15.373 2.187 16.928 3.701 32.781 11.554 46.291 23.165 11.409 9.805 28.599 8.504 38.4-2.905 9.803-11.405 8.504-28.598-2.904-38.399-26.555-22.819-59.068-36.067-93.387-38.389a158.691 158.691 0 0 0-61.136 7.563c-18.676 6.082-36.007 15.574-51.286 28.059a169.65 169.65 0 0 0-2.176 1.793c-.801.682-1.605 1.363-2.396 2.062-20.09 17.555-35.359 39.683-44.604 64.743H49.524v54.462H125.9c12.786.001 23.852-8.896 26.597-21.383zm44.175 22.764c0 32.653 26.557 59.13 59.312 59.13 32.76 0 59.321-26.477 59.321-59.13 0-32.652-26.561-59.127-59.321-59.127-32.755 0-59.312 26.474-59.312 59.127z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share-alt.svg
new file mode 100644
index 0000000000..7cff7b3840
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M109.398 342.752c-34.338 0-62.168 27.829-62.168 62.13 0 34.387 27.83 62.2 62.168 62.2 34.367 0 62.197-27.813 62.197-62.2.001-34.301-27.829-62.13-62.197-62.13zm16.025-97.826l-11.642 46.287v1.344c26.617-.821 53.498 8.829 73.809 29.165 20.34 20.311 29.986 47.193 29.198 73.809h.034l47.615-10.445c-1.767-35.398-15.93-70.329-42.906-97.306-26.717-26.702-61.086-40.81-96.108-42.854zm50.261-200.069l-12.062 47.854c61.475 9.534 120.601 37.655 167.983 85.044 48.858 48.837 77.212 110.253 85.808 173.826l48.141-10.562C443.412 189.886 325.782 70.131 175.684 44.857zm-24.788 98.623l-12.59 50.116c43.852 4.743 86.462 23.661 120.111 57.296 34.336 34.337 53.5 78.027 57.688 122.891l50.362-11.033c-6.576-55.951-31.363-107.74-71.783-148.122-39.372-39.393-89.534-63.803-143.788-71.148z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share.svg
new file mode 100644
index 0000000000..2e4584a775
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M329.047 331.74a70.262 70.262 0 0 0-30.949 7.142l-54.123-54.129a70.3 70.3 0 0 0 6.216-28.953 70.31 70.31 0 0 0-6.218-28.96l53.899-53.899a70.258 70.258 0 0 0 31.175 7.259c38.983 0 70.581-31.603 70.581-70.583s-31.598-70.579-70.581-70.579c-38.979 0-70.576 31.599-70.576 70.579a70.364 70.364 0 0 0 5.23 26.682l-55.138 55.136a70.325 70.325 0 0 0-28.952-6.214c-38.981 0-70.58 31.598-70.58 70.58s31.599 70.579 70.58 70.579a70.234 70.234 0 0 0 28.952-6.214L263.8 375.4a70.33 70.33 0 0 0-5.329 26.923c0 38.98 31.597 70.579 70.576 70.579 38.983 0 70.581-31.599 70.581-70.579 0-38.981-31.598-70.583-70.581-70.583z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sharing-iphone.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sharing-iphone.svg
new file mode 100644
index 0000000000..04d34e0fe3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sharing-iphone.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M155.931 327.997S173 255.414 307.895 255.414v65.603L436.56 214.805 307.896 108.618v63.573c-22.466-.587-140.7 3.761-151.965 155.806zm190.093 40.665H111.129V204.304h66.876c9.728-11.185 20.864-20.865 33.421-28.861 3.417-2.191 6.881-4.182 10.332-6.031H76.22v234.14h304.714V291.03l-34.91 28.809v48.823z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shield.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shield.svg
new file mode 100644
index 0000000000..f34195c7d4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shield.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M100.985 99.107c132.819 0 153.603-52.337 153.603-52.337s20.28 52.337 153.607 52.337v214.628c0 84.827-153.607 152.104-153.607 152.104s-153.603-67.276-153.603-152.104V99.107z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shift.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shift.svg
new file mode 100644
index 0000000000..3d6f9aea9d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shift.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.065 98.396l183.224 196.959h-82.807v117.392H154.645V295.354H71.842L255.065 98.396m0 36.764L129.333 270.318H179.682v117.387h150.761V270.318h50.353L255.065 135.16z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shipping-box.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shipping-box.svg
new file mode 100644
index 0000000000..66e12cea40
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shipping-box.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M376.106 135.832H135.012v44.769h241.094v-44.769zM135.012 376.93h241.094v-44.762H135.012v44.762zm241.094-113.512H135.012v54.673h241.094v-54.673zm0-68.746H135.012v54.676h241.094v-54.676zm-253.639 207.11l-45.125 45.12h356.442l-45.118-45.12H122.467zM400.97 123.284v266.2l45.12 45.122V78.156l-45.12 45.128zm-12.305-12.305l45.118-45.121H77.344l45.121 45.121h266.2zm-278.505 12.3l-45.121-45.12v356.444l45.121-45.121V123.279z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shipping.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shipping.svg
new file mode 100644
index 0000000000..102cb0be70
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shipping.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M316.074 329.032c.867 0 1.732.064 2.582.079L158.844 125.66c-10.726-13.637-26.849-20.797-42.839-20.767a54.147 54.147 0 0 0-33.585 11.608l-50.017 39.312L64.01 196.02l50-39.293c.622-.475 1.179-.654 1.995-.688 1.112.033 1.995.438 2.601 1.209l149.168 189.865c12.997-11.278 29.955-18.065 48.3-18.081zm131.136-85.744l-112.301 88.18c18.151 4.774 33.309 16.172 43.086 31.217l100.802-79.174-31.587-40.223zM321.96 354.346a44.398 44.398 0 0 0-5.886-.374c-24.363 0-45.421 18.228-48.397 43.014-3.206 26.751 15.874 51.05 42.641 54.287a51.47 51.47 0 0 0 5.886.361c24.365 0 45.426-18.214 48.434-43.006 3.206-26.787-15.894-51.076-42.678-54.282zm139.376-163.084L358.21 59.978 226.93 163.104l103.139 131.281 131.267-103.123zm-113.084-65.043l37.559 47.807-22.531 17.695-37.559-47.795 22.531-17.707z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shoe.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shoe.svg
new file mode 100644
index 0000000000..f784c832a6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shoe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M384.793 242.506c-24.33 0-41.48-6.568-41.48-6.568l-143.608-82.246-48.171 38.409-90.158-7.669c-25.654 0-26.767 45.707-26.767 45.707v79.222h435.945c0-.001 6.884-66.855-85.761-66.855zM220.06 193.161c-1.422 5.73-7.244 9.237-12.999 7.8-5.738-1.437-9.239-7.26-7.799-13.017 1.423-5.736 7.244-9.236 13-7.792 5.738 1.432 9.236 7.246 7.798 13.009zm40.321 22.567c-1.439 5.755-7.276 9.252-13.014 7.816-5.739-1.447-9.239-7.252-7.783-13.018 1.406-5.729 7.242-9.238 12.998-7.79 5.756 1.431 9.236 7.25 7.799 12.992zm38.719 21.69c-1.439 5.746-7.262 9.246-13.016 7.805-5.738-1.438-9.256-7.252-7.797-12.997 1.437-5.757 7.257-9.247 12.997-7.815 5.757 1.445 9.255 7.25 7.816 13.007zM34.609 327.491v30.644h437.793v-30.644H34.609z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket-alt-2.svg
new file mode 100644
index 0000000000..06beb2dc40
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket-alt-2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M199.17 220.037c0-11.993 3.6-23.389 10.303-33.012H43.381v65.881h166.025c-6.636-9.607-10.236-20.944-10.236-32.869zm173.093-33.012L306.4 252.906h162.952v-65.881h-97.089zM114.834 470.889h283.064l40.844-181.026H74.022l40.812 181.026zm142.352-217.983c8.468 0 16.938-3.225 23.412-9.669l142.777-142.773c12.949-12.935 12.918-33.888 0-46.821-12.918-12.919-33.881-12.919-46.83 0L233.77 196.424c-12.918 12.918-12.918 33.889 0 46.787 6.473 6.47 14.944 9.695 23.416 9.695z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket-alt.svg
new file mode 100644
index 0000000000..5cdd20bf19
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M198.664 161.585l-.005-.006s-.006-.065-.03-.437a147.748 147.748 0 0 1-.216-8.293c-.066-11.91 1.413-33.954 8.334-50.872 3.407-8.498 7.999-15.48 13.565-20.059 5.634-4.538 12.123-7.381 22.623-7.475h25.036c10.6.104 17.123 3.033 22.855 7.782 8.52 7.062 14.715 20.391 18.013 34.776 3.379 14.284 4.059 29.022 4.043 37.48 0 2.375-.045 4.256-.092 5.516-.028.627-.046 1.106-.06 1.399-.018.301-.023.35-.018.35l30.712 2.042c.016-.284.238-3.735.238-9.307-.069-13.335-1.102-38.549-10.403-62.546-4.704-11.974-11.637-23.883-22.485-33.149-10.771-9.299-25.656-15.219-42.804-15.116h-25.036c-16.848-.099-31.511 5.544-42.241 14.533-16.178 13.552-23.803 32.524-28.089 49.949-4.221 17.538-4.954 34.179-4.97 44.695 0 6.62.316 10.785.339 11.105l30.691-2.367zm185.701 28.729H126.94l-20.033 277.87h297.489l-20.031-277.87z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket.svg
new file mode 100644
index 0000000000..71cdd1de20
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M408.991 400.004c-17.772 0-32.183 14.405-32.183 32.18 0 17.777 14.41 32.187 32.183 32.187 17.774 0 32.185-14.409 32.185-32.187 0-17.775-14.41-32.18-32.185-32.18zm-253.141 0c-17.774 0-32.18 14.405-32.18 32.18 0 17.777 14.406 32.187 32.18 32.187 17.776 0 32.186-14.409 32.186-32.187 0-17.775-14.41-32.18-32.186-32.18zm230.866-128.459l73.421-73.417V97.693h-315.22l-18.358-50.098H73.497c-13.136 0-23.789 10.647-23.789 23.79 0 13.133 10.653 23.784 23.789 23.784h19.826l64.049 174.794-34.105 105.721h309.034c13.133 0 23.781-10.649 23.781-23.784 0-13.143-10.648-23.791-23.781-23.791H188.604l18.247-56.562h179.865z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shorts.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shorts.svg
new file mode 100644
index 0000000000..e3f8ab2625
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shorts.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M221.72 421.579l34.662-201.949 34.598 201.949h115.094l-21.826-274.453V90.181H129.254v47.286l-22.595 284.112z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shuffle.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shuffle.svg
new file mode 100644
index 0000000000..546f0a2965
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shuffle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M346.724 197.79l35.438.007v48.204l89.522-73.886-89.522-73.885v48.205h-56.624l-46.73 46.446 36.209 36.433 31.707-31.524zm34.905 116.331h-39.592L168.019 140.105H33.328v51.362h113.413l174.02 174.02h60.868v48.204l89.521-73.887-89.521-73.886v48.203zm-224.401.002H33.331v51.36h145.176l43.485-43.485-36.314-36.321-28.45 28.446z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sience.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sience.svg
new file mode 100644
index 0000000000..e692a2ec0c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sience.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M415.374 266.682a273.835 273.835 0 0 0-10.042-10.844 303.337 303.337 0 0 0 10.042-10.849c41.496-47.631 38.098-78.668 27.895-96.312-7.36-12.733-23.909-27.896-60.99-27.896-14.978 0-32.212 2.503-50.788 7.2C317.105 77.7 292.84 41.482 257.62 41.482c-35.189 0-59.452 36.218-73.84 86.499-18.607-4.697-35.842-7.2-50.787-7.2-37.082 0-53.63 15.163-60.99 27.896-17.593 30.482 1.639 69.61 37.938 107.161-36.299 37.543-55.53 76.656-37.938 107.159 7.36 12.725 23.908 27.896 60.99 27.896 14.945 0 32.18-2.519 50.787-7.191 14.388 50.259 38.65 86.461 73.84 86.461 35.22 0 59.485-36.202 73.871-86.461 18.576 4.673 35.811 7.191 50.788 7.191 37.081 0 53.63-15.171 60.99-27.896 10.203-17.659 13.601-48.701-27.895-96.315zm-282.382 99.29c-19.359 0-33.321-5.003-39.371-15.433-10.043-17.389 4.02-46.267 34.302-77.48 12.886 11.526 27.143 22.711 42.152 33.342 1.669 18.278 4.22 36.222 7.784 53.098-16.808 4.217-32.047 6.473-44.867 6.473zm35.09-91.981c-7.816-6.032-15.207-12.102-22.04-18.153 6.833-6.045 14.224-12.132 22.04-18.176a672.554 672.554 0 0 0-.263 18.164c0 6.049.099 12.117.263 18.165zm1.993-68.707c-15.01 10.599-29.267 21.795-42.152 33.321-30.282-31.223-44.345-60.07-34.302-77.464 6.05-10.47 20.012-15.439 39.371-15.439 12.82 0 28.059 2.225 44.867 6.441-3.564 16.908-6.115 34.862-7.784 53.141zm148.072-17.888a570.477 570.477 0 0 0-15.628-9.336c-5.267-3.058-10.565-5.969-15.894-8.812 9.188-3.793 18.149-7.162 26.814-10.071 1.834 8.961 3.404 18.391 4.708 28.219zM257.619 66.434c20.112 0 38.032 26.634 49.936 68.459-16.057 5.281-32.831 11.92-49.936 19.834-17.07-7.914-33.846-14.553-49.936-19.834 11.936-41.826 29.858-68.459 49.936-68.459zm-55.79 92.742c8.666 2.909 17.628 6.278 26.786 10.071-5.301 2.844-10.596 5.755-15.895 8.812a558.124 558.124 0 0 0-15.602 9.336c1.312-9.827 2.88-19.257 4.711-28.219zm-4.71 165.11a551.484 551.484 0 0 0 15.602 9.325c5.299 3.071 10.594 5.979 15.895 8.816-9.158 3.762-18.12 7.16-26.786 10.038-1.832-8.925-3.4-18.364-4.711-28.179zm60.5 120.953c-20.078 0-38-26.648-49.936-68.476 16.09-5.266 32.865-11.902 49.936-19.817 17.104 7.915 33.879 14.552 49.936 19.817-11.904 41.828-29.824 68.476-49.936 68.476zm55.821-92.773c-8.665-2.878-17.627-6.276-26.814-10.07a420.505 420.505 0 0 0 15.894-8.784 619.711 619.711 0 0 0 15.628-9.325c-1.305 9.814-2.875 19.253-4.708 28.179zm7.848-59.886a535.436 535.436 0 0 1-31.226 19.444c-10.893 6.28-21.717 12.067-32.443 17.295-10.693-5.228-21.519-11.015-32.441-17.295a546.668 546.668 0 0 1-31.195-19.421 559.028 559.028 0 0 1 0-73.521 548.16 548.16 0 0 1 31.195-19.423 545.816 545.816 0 0 1 32.441-17.317 526.922 526.922 0 0 1 32.443 17.317 549.492 549.492 0 0 1 31.226 19.423 557.175 557.175 0 0 1 1.211 36.744c0 12.571-.424 24.871-1.211 36.754zm60.99-146.878c19.361 0 33.354 4.97 39.371 15.439 10.072 17.364-4.021 46.241-34.269 77.433-12.658-11.317-26.85-22.532-42.22-33.32-1.634-18.278-4.219-36.203-7.751-53.11 16.812-4.217 32.049-6.442 44.869-6.442zm-35.122 91.96c7.849 6.044 15.239 12.131 22.074 18.176-6.835 6.052-14.226 12.121-22.074 18.153a562.757 562.757 0 0 0 0-36.329zm74.493 112.877c-6.017 10.43-20.01 15.433-39.371 15.433-12.82 0-28.058-2.256-44.868-6.474 3.532-16.876 6.117-34.787 7.751-53.098 15.37-10.797 29.562-22.01 42.22-33.307 30.247 31.209 44.341 60.057 34.268 77.446zm-164.03-125.404c-16.907 0-30.674 13.751-30.674 30.691 0 16.955 13.767 30.69 30.674 30.69 16.972 0 30.705-13.735 30.705-30.69 0-16.94-13.733-30.691-30.705-30.691z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-simcard.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-simcard.svg
new file mode 100644
index 0000000000..a65fc9ffb5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-simcard.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M340.908 89.496H171.841c-13.343 0-24.167 10.826-24.167 24.167v308.703l142.417.032 74.968-74.971V113.663c.001-13.341-10.825-24.167-24.151-24.167zm-65.582 182.281h-39.767v-90.703h91.402v39.782h-51.635v50.921zm-93.217-90.703h35.988v39.782h-35.988v-39.782zm53.45-17.443v-36.725h39.767v36.725h-39.767zm91.402-18.215v18.215h-34.189v-36.725h15.664c10.218.001 18.525 8.293 18.525 18.51zm-126.344-18.509h17.48v36.725h-35.988v-18.215c0-10.218 8.288-18.51 18.508-18.51zm-18.508 126.359v-14.945h35.988v33.457h-17.48c-10.22-.001-18.508-8.309-18.508-18.512zm126.327 18.511h-15.664v-33.472h34.189v14.96c0 10.204-8.307 18.512-18.525 18.512z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-single-note.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-single-note.svg
new file mode 100644
index 0000000000..f98a14c285
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-single-note.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M279.385 372.145v.031c-.197 26.161-23.824 51.765-57.719 60.267-38.557 9.647-75.835-6.507-83.226-36.101-7.407-29.596 17.854-61.415 56.409-71.062 17.364-4.346 34.437-3.4 48.661 1.605l-.032-257.282 27.664.084s-1.765 20.502 23.152 45.422c27.765 27.729 86.446 42.872 81.855 111.87-2.39 35.545-32.084 90.88-32.084 90.88l-10.071-10.075s7.293-16.219 13.933-64.324c6.67-48.068-68.543-57.552-68.543-57.552v186.237z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sitemap.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sitemap.svg
new file mode 100644
index 0000000000..0cbd6659a4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sitemap.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M429.595 310.486V232.87H270.554v-52.116h32.259V87.127h-93.628v93.627h32.259v52.116H82.403v77.616H50.142v93.628h93.629v-93.628h-32.26v-48.512h129.933v48.512h-32.259v93.628h93.628v-93.628h-32.259v-48.512h129.937v48.512h-32.262v93.628h93.629v-93.628z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sleep.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sleep.svg
new file mode 100644
index 0000000000..c85ac0dc8a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sleep.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M329.983 399.502c-120.081 0-217.416-97.331-217.416-217.422 0-45.978 14.272-88.622 38.636-123.741-56.591 39.248-93.658 104.678-93.658 178.765 0 120.08 97.336 217.412 217.417 217.412 74.086 0 139.522-37.064 178.765-93.656-35.123 24.367-77.766 38.642-123.744 38.642z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-slideshow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-slideshow.svg
new file mode 100644
index 0000000000..484e86cd28
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-slideshow.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M262.87 71.692V35.216h-25.04v36.476H35.939v64.594h22.144v243.906h154.286l-93.862 76.862 15.86 19.371 117.519-96.233h.833l117.521 96.233 15.863-19.378-93.868-76.855h153.682V136.286h26.691V71.692H262.87zm158.007 283.461H83.121V136.286h337.756v218.867zm-255.558-56.386v-65.084h65.084c0-35.942-29.138-65.082-65.084-65.082-35.942 0-65.079 29.139-65.079 65.082 0 35.944 29.137 65.084 65.079 65.084zm18.285 17.749c35.942 0 65.084-29.141 65.084-65.087h-65.084v65.087zm199.057-133.627h-83.242v25.039h83.242v-25.039zm0 45.955h-83.242v25.036h83.242v-25.036zm0 45.952h-83.242v25.046h83.242v-25.046z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-smiley-inverted.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-smiley-inverted.svg
new file mode 100644
index 0000000000..8c2bc19928
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-smiley-inverted.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.636 38.102c-120.065 0-217.417 97.352-217.417 217.431 0 120.049 97.352 217.433 217.417 217.433 120.077 0 217.416-97.384 217.416-217.433 0-120.08-97.339-217.431-217.416-217.431zm0 409.916c-106.136 0-192.482-86.367-192.482-192.485 0-106.147 86.347-192.517 192.482-192.517 106.134 0 192.499 86.369 192.499 192.517 0 106.117-86.365 192.485-192.499 192.485zm52.649-192.455c13.08 0 23.674-10.562 23.674-23.642v-49.183c0-13.081-10.594-23.676-23.674-23.676s-23.692 10.595-23.692 23.676v49.183c0 13.08 10.612 23.642 23.692 23.642zm-105.281 0c13.062 0 23.691-10.562 23.691-23.642v-49.183c0-13.081-10.629-23.676-23.691-23.676-13.099 0-23.68 10.595-23.68 23.676v49.183c0 13.08 10.581 23.642 23.68 23.642zm191.222 56.351l-25.539-25.545c-4.875-4.838-12.771-4.838-17.642 0-4.856 4.873-4.856 12.753 0 17.597l4.412 4.414c-28.663 24.688-64.208 37.055-99.854 37.055-35.533 0-70.931-12.301-99.53-36.827l4.139-4.116c4.857-4.878 4.857-12.756 0-17.664-4.873-4.837-12.771-4.837-17.66 0L117.046 312.4c-4.871 4.842-4.871 12.751 0 17.629 2.454 2.417 5.624 3.666 8.812 3.666 3.189 0 6.394-1.249 8.829-3.666l4.447-4.48c4.824 7.357 11.938 16.81 21.632 26.389 20.063 19.815 51.98 40.059 96.341 40.027h.179c44.312 0 75.525-20.274 94.854-40.223 9.253-9.452 15.94-18.868 20.503-26.193l3.958 3.988c2.418 2.418 5.605 3.633 8.81 3.633a12.45 12.45 0 0 0 8.815-3.633c4.856-4.871 4.856-12.787 0-17.623z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-smiley.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-smiley.svg
new file mode 100644
index 0000000000..5504a545cd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-smiley.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.393 38.396c-120.08 0-217.404 97.318-217.404 217.398 0 120.052 97.324 217.438 217.404 217.438s217.434-97.387 217.434-217.438c-.001-120.08-97.354-217.398-217.434-217.398zm28.972 144.657c0-13.096 10.598-23.696 23.676-23.696s23.676 10.601 23.676 23.696v49.135c0 13.078-10.598 23.675-23.676 23.675s-23.676-10.597-23.676-23.675v-49.135zm-105.299 0c0-13.096 10.596-23.696 23.674-23.696 13.082 0 23.709 10.601 23.709 23.696v49.135c0 13.078-10.627 23.675-23.709 23.675-13.078 0-23.674-10.597-23.674-23.675v-49.135zm214.915 146.746c-2.417 2.455-5.592 3.666-8.798 3.666-3.205 0-6.408-1.211-8.83-3.666l-3.956-3.971c-4.544 7.371-11.247 16.725-20.503 26.209-19.297 19.93-50.525 40.227-94.801 40.227h-.197c-44.377.03-76.293-20.243-96.372-40.062-9.712-9.564-16.808-19.002-21.616-26.373l-4.48 4.463a12.32 12.32 0 0 1-8.796 3.664c-3.204 0-6.377-1.21-8.831-3.664-4.839-4.838-4.839-12.754 0-17.624l25.542-25.522a12.419 12.419 0 0 1 17.626 0c4.871 4.852 4.871 12.771 0 17.623l-4.121 4.103c28.58 24.563 63.998 36.84 99.512 36.84 35.643 0 71.189-12.378 99.869-37.036l-4.414-4.414c-4.87-4.869-4.87-12.771 0-17.622 4.873-4.861 12.757-4.861 17.627 0l25.54 25.522c4.873 4.881 4.873 12.782-.001 17.637z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-snow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-snow.svg
new file mode 100644
index 0000000000..2ba7134a91
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-snow.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M157.138 286.452h198.237c35.547 0 64.291-28.815 64.291-64.314 0-28.793-18.901-53.122-44.932-61.33a78.517 78.517 0 0 0 2.485-19.539c0-42.575-34.501-77.077-77.077-77.077-32.016 0-59.452 19.509-71.094 47.288-10.039-11.773-24.918-19.229-41.597-19.229-30.12 0-54.516 24.424-54.516 54.541 0 5.187.72 10.188 2.06 14.945-24.623 9.011-42.151 32.654-42.151 60.401.001 35.499 28.748 64.314 64.294 64.314zm237.804 111.017h-2.679l1.896-1.896c4.187-4.202 4.187-11.037 0-15.236-4.218-4.202-11.054-4.202-15.24 0l-1.896 1.896v-2.682c0-5.951-4.843-10.796-10.791-10.796-5.952 0-10.794 4.845-10.794 10.796v2.682l-1.897-1.896c-4.183-4.202-11.021-4.202-15.237 0-4.188 4.199-4.188 11.034 0 15.236l1.896 1.912h-2.68c-5.951 0-10.761 4.828-10.761 10.763 0 5.969 4.81 10.788 10.761 10.788h2.68l-1.896 1.897c-4.188 4.204-4.188 11.038 0 15.24 2.093 2.108 4.872 3.155 7.65 3.155 2.748 0 5.496-1.047 7.587-3.155l1.897-1.894v2.678c0 5.949 4.842 10.777 10.794 10.777 5.948 0 10.791-4.828 10.791-10.777v-2.678l1.896 1.894c2.092 2.108 4.84 3.155 7.62 3.155 2.745 0 5.495-1.047 7.62-3.155 4.187-4.202 4.187-11.036 0-15.24l-1.896-1.912h2.679a10.748 10.748 0 0 0 10.761-10.773c0-5.936-4.807-10.779-10.761-10.779zm-217.857 0h-2.649l1.896-1.896c4.188-4.202 4.188-11.037 0-15.236-4.218-4.218-11.054-4.218-15.27 0l-1.896 1.896v-2.682c0-5.951-4.809-10.796-10.76-10.796-5.953 0-10.759 4.845-10.759 10.796v2.682l-1.93-1.896c-4.219-4.218-11.054-4.218-15.238 0-4.218 4.199-4.218 11.034 0 15.236l1.896 1.912h-2.683c-5.951 0-10.793 4.828-10.793 10.78 0 5.951 4.842 10.756 10.793 10.756h2.683l-1.896 1.912c-4.218 4.204-4.218 11.038 0 15.24a10.776 10.776 0 0 0 7.618 3.155c2.779 0 5.527-1.047 7.62-3.155l1.93-1.91v2.694a10.75 10.75 0 0 0 10.759 10.762c5.951 0 10.76-4.812 10.76-10.762v-2.694l1.896 1.91a10.776 10.776 0 0 0 7.618 3.155c2.78 0 5.526-1.047 7.651-3.155 4.188-4.202 4.188-11.036 0-15.24l-1.929-1.912h2.682c5.952 0 10.793-4.805 10.793-10.756.001-5.953-4.84-10.796-10.792-10.796zm110.957-54.885h-2.681l1.896-1.902c4.22-4.198 4.22-11.016 0-15.236a10.755 10.755 0 0 0-15.238 0l-1.898 1.912v-2.699c0-5.951-4.838-10.772-10.793-10.772-5.916 0-10.756 4.821-10.756 10.772v2.683l-1.93-1.896c-4.188-4.219-11.022-4.219-15.241 0-4.185 4.221-4.185 11.038 0 15.236l1.932 1.902h-2.683c-5.95 0-10.791 4.821-10.791 10.774 0 5.949 4.841 10.786 10.791 10.786h2.683l-1.932 1.896c-4.185 4.188-4.185 11.037 0 15.242 2.125 2.09 4.874 3.157 7.653 3.157 2.746 0 5.527-1.067 7.588-3.157l1.93-1.912v2.698c0 5.967 4.84 10.789 10.756 10.789 5.955 0 10.793-4.822 10.793-10.789v-2.698l1.898 1.912a10.796 10.796 0 0 0 7.62 3.157c2.777 0 5.491-1.067 7.618-3.157 4.22-4.205 4.22-11.054 0-15.242l-1.896-1.896h2.681c5.951 0 10.794-4.837 10.794-10.786 0-5.953-4.843-10.774-10.794-10.774z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-low.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-low.svg
new file mode 100644
index 0000000000..1a5abc0193
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-low.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M121.997 198.599v113.095h50.837l113.565 84.295V114.307l-113.563 84.292h-50.839zm224.112-47.009c-6.672-6.67-17.485-6.67-24.156 0-6.67 6.672-6.67 17.486.01 24.157h-.01c21.943 21.954 32.868 50.562 32.888 79.309-.02 28.835-10.917 57.493-32.888 79.491-6.67 6.673-6.67 17.488.01 24.158a17.032 17.032 0 0 0 12.069 5.001c4.375 0 8.749-1.673 12.085-5.009 28.584-28.582 42.906-66.205 42.887-103.642.019-37.405-14.358-74.943-42.895-103.465z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-medium.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-medium.svg
new file mode 100644
index 0000000000..d6497c7c88
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-medium.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M83.474 199.599v113.095h50.839l113.563 84.295V115.307l-113.56 84.292H83.474zm224.118-47.009c-6.68-6.67-17.49-6.67-24.159 0-6.674 6.674-6.674 17.484.004 24.153h-.004c21.94 21.956 32.865 50.56 32.885 79.316-.02 28.835-10.917 57.489-32.885 79.487-6.674 6.673-6.674 17.492.004 24.158a17.046 17.046 0 0 0 12.078 5.001c4.376 0 8.748-1.669 12.085-5.007 28.576-28.588 42.895-66.207 42.883-103.64.011-37.408-14.361-74.944-42.891-103.468zm53.939-54.093c-6.678-6.67-17.492-6.67-24.161 0-6.667 6.671-6.667 17.487.006 24.154h-.006c36.837 36.851 55.274 84.958 55.288 133.22-.02 48.484-18.344 96.797-55.288 133.771-6.667 6.666-6.667 17.486.006 24.16a17.033 17.033 0 0 0 12.073 4.998c4.373 0 8.743-1.672 12.082-5.004 43.575-43.588 65.312-100.864 65.294-157.926.016-56.938-21.884-113.975-65.294-157.373z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-off.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-off.svg
new file mode 100644
index 0000000000..173ea47692
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M337.652 114.307l-113.564 84.292H173.25v113.094h50.838l113.564 84.295z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-waves.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-waves.svg
new file mode 100644
index 0000000000..cf21b5606b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-waves.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M461.444 267.153c0-6.132-6.645-11.151-14.76-11.151-8.119 0-17.688-3.494-21.264-7.765-3.576-4.271-6.504-15.902-6.504-25.846 0-9.948-8.029-18.083-17.844-18.083s-17.846 8.135-17.846 18.083c0 9.943-4.926 18.084-10.947 18.084-6.02 0-10.945-8.539-10.945-18.973v-24.824c0-10.432-8.031-18.967-17.848-18.967-9.812 0-17.844 8.535-17.844 18.967v24.824c0 10.434-4.926 18.973-10.945 18.973s-10.945-8.539-10.945-18.973v-62.815c0-10.434-8.033-18.97-17.848-18.97-9.812 0-17.844 8.536-17.844 18.97v62.815c0 10.434-4.928 18.973-10.947 18.973-6.021 0-10.945-8.539-10.945-18.973v-24.824c0-10.432-8.031-18.967-17.846-18.967-9.816 0-17.846 8.535-17.846 18.967v24.824c0 10.434-4.928 18.973-10.947 18.973s-10.945-8.539-10.945-18.973V123.26c0-10.432-8.029-18.969-17.846-18.969-9.814 0-17.844 8.537-17.844 18.969v98.242c0 10.434-4.928 18.973-10.949 18.973-6.02 0-10.945-8.141-10.945-18.084 0-9.948-8.031-18.083-17.846-18.083-9.816 0-17.844 8.135-17.844 18.083 0 9.943-2.518 21.574-5.592 25.846-3.074 4.271-13.143 7.765-22.377 7.765s-16.787 5.02-16.787 11.151c0 6.136 7.553 11.155 16.787 11.155s19.303 3.493 22.377 7.764c3.074 4.271 5.592 15.902 5.592 25.846 0 9.947 8.027 18.084 17.844 18.084 9.814 0 17.846-8.137 17.846-18.084 0-9.943 4.926-18.083 10.945-18.083 6.021 0 10.949 8.537 10.949 18.971v75.933c0 10.432 8.029 18.97 17.844 18.97 9.816 0 17.846-8.538 17.846-18.97v-75.933c0-10.434 4.926-18.971 10.945-18.971s10.947 8.537 10.947 18.971v24.824c0 10.431 8.029 18.969 17.846 18.969 9.814 0 17.846-8.538 17.846-18.969v-24.824c0-10.434 4.924-18.971 10.945-18.971 6.02 0 10.947 8.537 10.947 18.971v62.816c0 10.432 8.031 18.968 17.844 18.968 9.814 0 17.848-8.536 17.848-18.968v-62.816c0-10.434 4.926-18.971 10.945-18.971s10.945 8.537 10.945 18.971v24.824c0 10.431 8.031 18.969 17.844 18.969 9.816 0 17.848-8.538 17.848-18.969v-24.824c0-10.434 4.926-18.971 10.945-18.971 6.021 0 10.947 8.14 10.947 18.083 0 9.947 8.031 18.084 17.846 18.084s17.844-8.137 17.844-18.084c0-9.943 2.928-21.574 6.504-25.846 3.576-4.271 13.145-7.764 21.264-7.764 8.116.001 14.76-5.019 14.76-11.155z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound.svg
new file mode 100644
index 0000000000..ff3ba17166
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M43.602 200.257v113.096h50.839l113.564 84.29v-281.68L94.441 200.257H43.602zm224.117-47.005c-6.67-6.671-17.488-6.671-24.158 0-6.671 6.671-6.671 17.48.005 24.152h-.005c21.941 21.955 32.863 50.555 32.886 79.312-.022 28.833-10.919 57.503-32.886 79.485-6.671 6.677-6.671 17.492.005 24.163a17.033 17.033 0 0 0 12.077 4.997c4.371 0 8.746-1.665 12.081-5.003 28.579-28.583 42.903-66.207 42.885-103.643.018-37.407-14.359-74.942-42.89-103.463zm53.939-54.097c-6.672-6.668-17.486-6.668-24.159 0-6.669 6.674-6.669 17.486.005 24.158l-.005-.006c36.835 36.852 55.274 84.963 55.291 133.223-.022 48.486-18.349 96.805-55.291 133.768-6.673 6.671-6.669 17.489.005 24.157a17.03 17.03 0 0 0 12.074 5.004c4.375 0 8.748-1.67 12.085-5.004 43.572-43.578 65.308-100.86 65.286-157.925.018-56.936-21.879-113.973-65.291-157.375zm56.7-55.102c-6.679-6.671-17.493-6.671-24.161 0-6.669 6.671-6.669 17.483 0 24.155 52.05 52.071 78.095 120.128 78.111 188.341-.017 68.417-25.954 136.67-78.111 188.851-6.674 6.671-6.669 17.487 0 24.155a17.022 17.022 0 0 0 12.079 5.006 17.04 17.04 0 0 0 12.082-5.006c58.782-58.781 88.136-135.992 88.114-213.006.022-76.874-29.48-153.862-88.114-212.496z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-spades.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-spades.svg
new file mode 100644
index 0000000000..f97a5457f8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-spades.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.485 87.896s-164.85 92.901-164.85 198.3c0 46.212 37.266 83.656 83.257 83.656 28.828 0 54.222-8.082 69.133-26.133-9.893 36.531-22.615 80.119-26.979 80.119h80.969c-4.364 0-17.07-43.588-26.979-80.08 14.928 18.012 40.306 26.094 69.148 26.094 45.961 0 83.242-37.444 83.242-83.656.002-105.399-166.941-198.3-166.941-198.3z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-speaker.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-speaker.svg
new file mode 100644
index 0000000000..dc922a00d3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-speaker.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.999 230.876c-45.492 0-82.502 37.008-82.502 82.501 0 45.491 37.01 82.502 82.502 82.502s82.503-37.011 82.503-82.502c0-45.493-37.011-82.501-82.503-82.501zm0 117.302c-19.217 0-34.8-15.581-34.8-34.801 0-19.222 15.583-34.802 34.8-34.802 19.22 0 34.802 15.58 34.802 34.802 0 19.22-15.582 34.801-34.802 34.801zm124.91-298.924H131.087c-11.105 0-20.115 9.007-20.115 20.117v393.375h290.057V69.371c-.001-11.11-9.011-20.117-20.12-20.117zm-124.91 58.252c15.651 0 28.342 12.688 28.342 28.339 0 15.653-12.69 28.341-28.342 28.341-15.65 0-28.338-12.688-28.338-28.341 0-15.652 12.688-28.339 28.338-28.339zm0 317.451c-61.525 0-111.582-50.056-111.582-111.58s50.057-111.582 111.582-111.582c61.527 0 111.58 50.058 111.58 111.582s-50.053 111.58-111.58 111.58z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-speed-gauge.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-speed-gauge.svg
new file mode 100644
index 0000000000..ce52283ddb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-speed-gauge.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.79 101.919c-120.28 0-217.73 97.483-217.765 217.759.065 17.729.852 32.161 4.711 45.164 2.844 9.683 8.012 18.707 15.729 25.494 11.706 10.184 26.684 14.467 45.258 16.855 18.676 2.371 41.894 2.809 72.207 2.809 22.5 0 48.825-.227 79.86-.227 31.031 0 57.356.227 79.856.227 26.911 0 48.266-.328 65.793-2.089 13.146-1.312 24.232-3.341 34.027-7.133 7.357-2.845 14.061-6.833 19.489-12.216 8.308-8.026 13.049-18.65 15.472-29.939 2.448-11.396 3.07-23.999 3.103-38.945-.032-120.276-97.5-217.759-217.74-217.759zm20.206 44.243a167.658 167.658 0 0 1 32.213 7l-7.099 21.982a144.75 144.75 0 0 0-27.86-6.056l2.746-22.926zM109.35 315.574H86.229c0-11.201 1.111-22.186 3.14-32.816l22.694 4.418c-1.797 9.187-2.713 18.672-2.713 28.398zm12.754-60.119l-21.127-9.384h.032a167.515 167.515 0 0 1 16.316-28.714l18.873 13.311c-5.463 7.781-10.203 16.052-14.094 24.787zm36.2-49.642l-15.468-17.168c8.175-7.325 17.039-13.933 26.554-19.591l11.871 19.816c-8.21 4.909-15.894 10.564-22.957 16.943zm46.14-52.651c10.336-3.332 21.092-5.721 32.212-7l2.713 22.927a145.746 145.746 0 0 0-27.86 6.056l-7.065-21.983zm80.118 208.149l-54.513 9.709-13.863-53.63L357.03 173.338l-72.468 187.973zm91.861-130.643l18.869-13.311a167.487 167.487 0 0 1 16.352 28.714l-21.092 9.384a148.031 148.031 0 0 0-14.129-24.787zm26.882 84.906c0-9.727-.949-19.211-2.748-28.398l22.695-4.418a172.56 172.56 0 0 1 3.141 32.816h-23.088zm-159.979 34.731c9.516 6.099 22.14 3.367 28.256-6.133 6.083-9.479 3.302-22.124-6.179-28.223-9.484-6.115-22.107-3.332-28.225 6.184-6.08 9.431-3.366 22.108 6.148 28.172z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-split-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-split-alt.svg
new file mode 100644
index 0000000000..a5ad049940
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-split-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M455.854 255.945l-81.985-64.687v39.098H216.115l87.116-85.074c1.408-1.505 6.379-4.858 11.711-6.934 5.229-2.224 11.148-3.333 13.177-3.238h45.749v39.128l81.985-64.669-81.985-64.663v39.056h-45.749c-11.643.133-22.236 2.934-32.472 7.034-10.204 4.221-19.754 9.613-28.157 17.691L153.296 220.22c-1.406 1.537-6.376 4.821-11.707 6.912-5.166 2.192-10.954 3.271-13.081 3.225H55.419v51.162h74.953c2.059-.099 7.945 1.014 13.209 3.22 5.299 2.074 10.271 5.413 11.678 6.951l114.227 111.508c8.404 8.082 17.954 13.44 28.156 17.692 10.235 4.125 20.831 6.918 32.473 6.997h43.754v39.135l81.985-64.689-81.985-64.668v39.113h-43.754c-2.062.063-7.946-1.047-13.179-3.238-5.33-2.06-10.302-5.431-11.706-6.935l-87.152-85.086h155.791v39.109l81.985-64.683z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-split.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-split.svg
new file mode 100644
index 0000000000..1bdfd8a66b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-split.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M400.424 340.116v-41.529c-.131-13.113-3.236-24.411-7.686-35.385-4.609-10.921-10.431-21.124-19.618-30.461l-75.247-75.261c-.492-.326-3.534-4.578-5.299-9.108-1.964-4.432-2.815-9.551-2.681-10.175v-80.39h-65.896v80.39c.131.624-.718 5.743-2.648 10.175-1.766 4.53-4.807 8.782-5.331 9.108l-75.279 75.261c-9.154 9.337-14.944 19.557-19.587 30.461-4.447 10.974-7.554 22.271-7.685 35.385v41.529h-57l89.964 114.019 89.962-114.019h-57v-41.529c-.13-.604.688-5.76 2.649-10.169 1.799-4.545 4.806-8.749 5.332-9.092l69.586-69.588 69.592 69.588c.489.343 3.562 4.547 5.33 9.092 1.927 4.463 2.777 9.565 2.646 10.169v41.529h-58.667l89.966 114.019 89.926-114.019h-55.329z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sprout.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sprout.svg
new file mode 100644
index 0000000000..1d139dd355
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sprout.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M252.555 361.822c-43.691 0-65.025 21.736-100.373 57.748-1.793 1.826-3.639 3.701-5.494 5.59h211.734c-1.904-1.938-3.797-3.859-5.637-5.73-35.264-35.924-56.549-57.608-100.23-57.608zM313.51 86.84c-34.564 0-62.586 28.021-62.586 62.592v.607c0-24.131-19.562-43.693-43.695-43.693h-36.162v34.262c0 24.131 19.561 43.693 43.689 43.693h18.855v155.086c5.941-.818 12.232-1.242 18.943-1.242 6.713 0 13.004.424 18.943 1.242V198.51h31.227c34.566 0 62.588-28.023 62.588-62.59V86.84H313.51z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-squiggly-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-squiggly-line.svg
new file mode 100644
index 0000000000..2c88881018
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-squiggly-line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M166.792 418.313c-28.153 0-51.056-22.903-51.056-51.055V144.741c0-4.648-3.783-8.432-8.432-8.432-4.65 0-8.434 3.783-8.434 8.432v126.3H56.249v-126.3c0-28.149 22.904-51.055 51.057-51.055 28.15 0 51.054 22.905 51.054 51.055v222.518c0 4.649 3.782 8.433 8.434 8.433 4.648 0 8.433-3.783 8.433-8.433V166.931c0-28.151 22.902-51.055 51.055-51.055 28.151 0 51.055 22.903 51.055 51.055v176.924c0 4.649 3.783 8.433 8.433 8.433s8.433-3.783 8.433-8.433v-154.32h-.045c0-28.15 22.903-51.056 51.055-51.056s51.055 22.905 51.055 51.056v133.761c0 4.651 3.783 8.432 8.433 8.432s8.433-3.78 8.433-8.432v-65.702h42.622v65.702c0 28.152-22.903 51.055-51.055 51.055s-51.056-22.902-51.056-51.055V189.534c0-4.649-3.781-8.434-8.432-8.434-4.354 0-7.947 3.319-8.388 7.559v155.195c0 28.15-22.903 51.055-51.055 51.055-27.745 0-50.392-22.247-51.04-49.839h-.015V166.93c0-4.651-3.782-8.435-8.433-8.435s-8.434 3.783-8.434 8.435v200.328c-.002 28.152-22.904 51.055-51.056 51.055z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ssd.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ssd.svg
new file mode 100644
index 0000000000..483398df2d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ssd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M391.744 112.546c-2.849-7.245-11.481-13.144-19.297-13.144H138.762c-7.752 0-16.449 5.898-19.26 13.144l-77.57 198.531h427.41l-77.598-198.531zM35.85 341.734v56.496c0 7.765 6.344 14.127 14.129 14.127H180.49v-24.055h24.95v24.055h20.079v-24.055h24.953v24.055h20.074v-24.055h24.92v24.055h20.082v-24.055H340.5v24.055h120.832c7.752 0 14.125-6.362 14.125-14.127v-56.496H35.85z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stacked-disks.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stacked-disks.svg
new file mode 100644
index 0000000000..0c6fb6e8d1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stacked-disks.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M36.571 269.686v85.244h11.836l-.016.053h415.982l-.018-.053h11.854v-85.244H36.571zm55.968 62.086H67.637v-33.657h24.902v33.657zm60.988 0h-24.919v-33.661h24.919v33.661zm60.974 0h-24.919v-33.661h24.919v33.661zm212.036 1.392c-10.842 0-19.652-8.797-19.652-19.645 0-10.857 8.811-19.67 19.652-19.67 10.857 0 19.654 8.812 19.654 19.67 0 10.848-8.796 19.645-19.654 19.645zM387.328 41.963H125.372l-76.98 197.079h415.982L387.328 41.963zM36.571 470.887H476.21v-85.254H36.571v85.254zm389.966-61.076c10.857 0 19.654 8.793 19.654 19.635 0 10.868-8.797 19.662-19.654 19.662-10.842 0-19.652-8.794-19.652-19.662 0-10.842 8.81-19.635 19.652-19.635zm-236.955 4.24h24.919v33.684h-24.919v-33.684zm-60.974 0h24.919v33.684h-24.919v-33.684zm-60.971 0h24.902v33.684H67.637v-33.684z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stamp.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stamp.svg
new file mode 100644
index 0000000000..2468ef2c74
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stamp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M153.638 153.638h204.725v204.725H153.638zm231.916 282.011c0 2.915 3.021 5.379 6.602 5.379h41.705c3.58 0 6.604-3.024 6.604-6.604v-41.697c0-3.89-2.537-6.602-4.818-6.602-13.682 0-24.811-11.248-24.811-25.074 0-13.825 11.129-25.072 24.811-25.072 1.42 0 2.492-.963 3.002-1.537 1.152-1.291 1.812-3.137 1.812-5.065v-41.7c0-3.89-2.537-6.604-4.816-6.604-13.68 0-24.809-11.245-24.809-25.07 0-13.824 11.129-25.071 24.811-25.071 2.281 0 4.818-2.711 4.818-6.603v-41.701c0-3.892-2.537-6.603-4.818-6.603-13.682 0-24.811-11.248-24.811-25.072 0-13.825 11.129-25.072 24.811-25.072 2.281 0 4.818-2.712 4.818-6.604V77.574c0-3.579-3.023-6.603-6.604-6.603h-41.705c-3.58 0-6.602 2.547-6.602 5.562 0 14.094-11.162 25.561-24.883 25.561s-24.883-11.467-24.883-25.561c0-3.015-3.021-5.562-6.6-5.562h-41.705c-3.576 0-6.604 2.547-6.604 5.562 0 14.094-11.162 25.561-24.881 25.561-13.723 0-24.881-11.467-24.885-25.56 0-3.016-3.025-5.562-6.605-5.562h-41.697c-3.578 0-6.602 2.547-6.602 5.562 0 14.094-11.162 25.561-24.885 25.561-13.721 0-24.883-11.467-24.883-25.561 0-3.015-3.021-5.562-6.602-5.562H78.14c-3.58 0-6.604 3.023-6.604 6.603v41.702c0 3.58 2.547 6.604 5.561 6.604 14.092 0 25.557 11.247 25.557 25.072 0 13.824-11.465 25.072-25.557 25.072-3.014 0-5.561 3.023-5.561 6.603v41.699c0 3.58 2.547 6.604 5.561 6.604 14.094.002 25.557 11.249 25.557 25.071 0 13.825-11.465 25.07-25.557 25.07-3.014 0-5.561 3.025-5.561 6.604v41.698c0 3.58 2.547 6.604 5.561 6.604 14.092 0 25.557 11.247 25.557 25.072 0 13.826-11.465 25.074-25.557 25.074-3.014 0-5.561 3.022-5.561 6.602v41.697c0 3.58 3.023 6.604 6.604 6.604h41.701c3.58 0 6.602-2.464 6.602-5.379 0-13.991 11.162-25.374 24.883-25.374 13.723 0 24.885 11.383 24.885 25.374 0 2.915 3.023 5.379 6.602 5.379h41.701c3.58 0 6.604-2.464 6.604-5.379 0-13.991 11.16-25.374 24.883-25.374 13.719 0 24.881 11.383 24.881 25.374 0 2.915 3.027 5.379 6.604 5.379h41.705c3.578 0 6.6-2.464 6.6-5.379 0-13.991 11.162-25.374 24.883-25.374s24.88 11.384 24.88 25.375zm-255.596-53.608V129.957h252.084v252.084H129.958z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop-alt.svg
new file mode 100644
index 0000000000..ed61a5b6cc
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M169.763 465.451L47.189 342.875V169.531L169.763 46.954h173.346l122.579 122.577v173.344L343.109 465.451z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop-hand.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop-hand.svg
new file mode 100644
index 0000000000..3742256b80
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop-hand.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M388.45 236.752c-12.509-6.719-28.093-2.024-34.829 10.467l-36.202 66.758V100.663c0-11.295-9.123-20.453-20.452-20.453-11.299 0-20.457 9.157-20.457 20.453v151.362c0 4.267-3.465 7.736-7.75 7.736-4.281 0-7.749-3.469-7.749-7.736V60.084c0-11.318-9.158-20.475-20.474-20.475-11.28 0-20.469 9.157-20.469 20.475v195.652a7.73 7.73 0 0 1-7.734 7.735c-4.268 0-7.769-3.452-7.769-7.735V98.261c0-11.312-9.138-20.468-20.437-20.468-11.316 0-20.472 9.156-20.472 20.468v157.476a7.747 7.747 0 0 1-7.75 7.752 7.747 7.747 0 0 1-7.75-7.752V151.71c0-11.313-9.155-20.47-20.472-20.47-11.281 0-20.453 9.157-20.453 20.47v236.074c0 7.245 3.876 17.628 8.65 23.087l44.799 51.426c4.743 5.426 14.571 9.926 21.831 9.926h100.738c7.259 0 16.007-5.233 19.456-11.593l96.21-189.065c6.704-12.491 2.027-28.074-10.465-34.813z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop.svg
new file mode 100644
index 0000000000..6b61d9904b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M87.412 87.559h334.271v336.147H87.412z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-store.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-store.svg
new file mode 100644
index 0000000000..3a9618fef2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-store.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M60.328 426.793h391.343v29.109H60.328zm402.081-241.854c-.042-8.307-70.976-128.842-70.976-128.842H120.567s-71.042 120.58-71.042 128.992c0 16.285 13.205 29.492 29.493 29.492 16.288 0 29.493-13.207 29.493-29.492 0 16.285 13.204 29.492 29.492 29.492 16.286 0 29.492-13.207 29.492-29.492 0 16.285 13.204 29.492 29.491 29.492 16.289 0 29.493-13.207 29.493-29.492 0 16.285 13.203 29.492 29.492 29.492s29.493-13.207 29.493-29.492c0 16.285 13.204 29.492 29.492 29.492 16.287 0 29.493-13.207 29.493-29.492 0 16.285 13.204 29.492 29.492 29.492s29.492-13.207 29.492-29.492c0 16.285 13.204 29.492 29.493 29.492 16.288 0 29.492-13.207 29.492-29.492h.058l-.067-.15zm-29.52 210.235V238.258a52.872 52.872 0 0 1-29.457-8.943c-8.445 5.65-18.591 8.945-29.492 8.945s-21.047-3.295-29.492-8.945a52.866 52.866 0 0 1-29.493 8.945 52.865 52.865 0 0 1-29.492-8.945c-8.445 5.65-18.591 8.945-29.493 8.945s-21.047-3.295-29.492-8.945c-8.446 5.65-18.591 8.945-29.493 8.945s-21.046-3.295-29.491-8.945c-8.445 5.65-18.59 8.945-29.492 8.945s-21.047-3.295-29.492-8.945a52.861 52.861 0 0 1-29.4 8.943v156.916h213.294V270.643h94.716v124.531h45.769zM249.044 350.65H122.978v-80.508h126.066v80.508z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stream.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stream.svg
new file mode 100644
index 0000000000..97ea6bed56
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stream.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M146.435 195.141c6.213-17.369 13.604-31.495 23.118-42.387 9.32-10.756 22.012-18.604 36.234-18.572 14.225-.031 26.914 7.816 36.236 18.572 9.515 10.892 16.903 25.018 23.119 42.402L300 293.279c4.709 13.305 9.976 22.231 13.965 26.747 4.218 4.595 5.918 4.416 6.082 4.448.131-.032 1.83.146 6.017-4.448 4.022-4.516 9.288-13.442 13.998-26.747l34.859-98.139c9.842-27.504 26.49-51.902 46.858-71.945-38.845-48.642-98.593-79.855-165.695-79.855-117.039 0-211.939 94.898-211.939 211.969 0 37.902 10.006 73.447 27.438 104.254 16.316-17.41 31.13-41.124 39.992-66.283l34.86-98.139zm299.94-33.261c-14.456 15.173-25.901 32.802-32.146 50.591l-34.864 98.104c-6.211 17.36-13.599 31.489-23.085 42.38-9.317 10.748-22.009 18.609-36.232 18.579-14.257.03-26.946-7.817-36.267-18.579-9.518-10.891-16.908-25.02-23.119-42.38l-34.828-98.104c-4.742-13.342-10.007-22.268-13.998-26.784-4.186-4.577-5.885-4.416-6.049-4.444-.16.028-1.862-.133-6.049 4.444-4.023 4.493-9.287 13.442-13.998 26.784l-34.823 98.104c-11.938 33.485-30.938 63.278-52.915 85.876 38.818 43.443 95.264 70.832 158.082 70.832 117.07 0 211.97-94.915 211.97-211.975 0-33.519-7.813-65.22-21.679-93.428z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sunny.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sunny.svg
new file mode 100644
index 0000000000..07391fec24
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sunny.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.175 143.656c-61.939 0-112.299 50.391-112.299 112.312 0 61.92 50.36 112.302 112.299 112.302 61.905 0 112.28-50.382 112.28-112.302 0-61.921-50.375-112.312-112.28-112.312zm0 193.969c-45.114 0-81.656-36.561-81.656-81.656s36.542-81.639 81.656-81.639c45.078 0 81.621 36.543 81.621 81.639s-36.543 81.656-81.621 81.656zm-.035 51.521c-12.166 0-22.009 9.86-22.009 22.028v31.769c0 12.162 9.844 22.023 22.009 22.023 12.199 0 22.042-9.861 22.042-22.023v-31.769c0-12.167-9.843-22.028-22.042-22.028zm0-266.356c12.165 0 22.042-9.875 22.042-22.038v-31.77c0-12.147-9.877-22.022-22.042-22.022-12.131 0-22.009 9.875-22.009 22.022v31.77c0 12.163 9.878 22.038 22.009 22.038zm109.764 45.46c5.623 0 11.282-2.144 15.581-6.442l22.467-22.466c8.599-8.603 8.599-22.55 0-31.169-8.633-8.597-22.563-8.597-31.164 0l-22.466 22.473c-8.6 8.582-8.6 22.543 0 31.163a22 22 0 0 0 15.582 6.441zM130.83 350.15l-22.467 22.451c-8.604 8.601-8.604 22.549 0 31.146a21.982 21.982 0 0 0 15.566 6.476 21.967 21.967 0 0 0 15.582-6.476l22.481-22.464c8.584-8.582 8.584-22.544 0-31.133-8.6-8.619-22.564-8.619-31.162 0zm312.297-116.219h-31.751c-12.164 0-22.042 9.875-22.042 22.038 0 12.167 9.878 22.026 22.042 22.026h31.751c12.166 0 22.043-9.859 22.043-22.012 0-12.177-9.877-22.037-22.043-22.052zM122.98 255.983c0-12.178-9.86-22.037-22.044-22.053H69.184c-12.164 0-22.023 9.875-22.023 22.038 0 12.167 9.859 22.026 22.023 22.026h31.752c12.184.001 22.044-9.858 22.044-22.011zm258.521 94.167c-8.614-8.635-22.562-8.635-31.163-.016-8.615 8.604-8.615 22.55-.016 31.148l22.466 22.464c4.317 4.301 9.942 6.476 15.597 6.476a21.917 21.917 0 0 0 15.551-6.458c8.615-8.614 8.615-22.562.017-31.163l-22.452-22.451zM130.83 161.808a21.95 21.95 0 0 0 15.564 6.442 22.011 22.011 0 0 0 15.599-6.442c8.584-8.62 8.584-22.566 0-31.163l-22.466-22.473c-8.602-8.597-22.531-8.597-31.147 0-8.62 8.619-8.62 22.566 0 31.169l22.45 22.467z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sweatshirt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sweatshirt.svg
new file mode 100644
index 0000000000..3b33e88738
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sweatshirt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M368.49 95.604l-51.635-16.922c-3.596 9.144-9.45 16.99-16.58 23.022-11.903 10.022-27.371 15.646-43.885 15.663-16.515-.017-31.982-5.64-43.788-15.632-7.194-6.063-13.047-13.909-16.643-23.053l-51.64 16.922L42.293 337.161l40.648 41.498 64.487-149.598v204.007h217.957V229.062L429.84 378.66l40.648-41.498L368.49 95.604z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sync.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sync.svg
new file mode 100644
index 0000000000..b3e8e396bc
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sync.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M203.447 202.931l-54.568-54.566c27.503-27.173 65.183-43.913 106.927-43.913 42.13.014 79.972 16.983 107.622 44.577 27.594 27.648 44.561 65.492 44.578 107.629h66.177c-.024-120.624-97.761-218.361-218.376-218.386-59.897 0-114.277 24.203-153.724 63.295l-50.36-50.36.003 151.725h151.721zM363.991 363.67c-27.605 27.918-65.809 45.184-108.183 45.176-42.139-.008-79.978-16.981-107.623-44.574-27.601-27.645-44.565-65.482-44.582-107.614H37.436c.017 120.614 97.751 218.347 218.373 218.374 60.54-.008 115.433-24.73 154.979-64.562l48.997 49V311.423H311.742l52.249 52.247z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-t-shirt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-t-shirt.svg
new file mode 100644
index 0000000000..860762bf35
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-t-shirt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M368.631 99.671l-43.018-14.093c-4.054 10.667-10.809 19.829-19.147 26.833-13.506 11.443-31.147 17.844-49.951 17.85-18.787-.005-36.413-6.417-49.886-17.814-8.372-7.022-15.126-16.201-19.195-26.869l-43.002 14.093-77.078 67.022 30.673 41.5h49.509v220.054h217.992V208.194l49.476-.011 30.705-41.489-77.078-67.023z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tab-key.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tab-key.svg
new file mode 100644
index 0000000000..dcd4d918c8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tab-key.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M252.263 230.963H92.58v51.146h159.683v48.007l89.16-73.576-89.16-73.582v48.005zm116.712-83.06V362.72h51.18V147.903h-51.18zM157.459 255.309"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tab.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tab.svg
new file mode 100644
index 0000000000..a03fd4e379
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tab.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M422.444 283.7v-95.826c0-13.828-11.21-25.039-25.038-25.039h-282.47c-13.828 0-25.038 11.211-25.038 25.039V283.7h-52.06v65.401h436.664V283.7h-52.058z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tactics.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tactics.svg
new file mode 100644
index 0000000000..ba1a383471
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tactics.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M137.991 82.309l-29.203 29.205-29.204-29.205-26.363 26.361 29.206 29.205-29.206 29.205 26.363 26.361 29.204-29.203 29.203 29.203 26.364-26.361-29.206-29.205 29.206-29.205zm0 236.113l-29.203 29.205-29.204-29.205-26.363 26.363 29.206 29.207-29.206 29.205 26.363 26.362 29.204-29.204 29.203 29.204 26.364-26.362-29.206-29.205 29.206-29.207zm320.788-98.93l-26.361-26.365-29.206 29.205-29.206-29.205-26.363 26.365 29.206 29.203-29.206 29.205 26.363 26.364 29.206-29.207 29.206 29.207 26.361-26.364-29.204-29.205zM323.469 334.48c-35.204 0-63.744 28.539-63.744 63.742 0 35.207 28.54 63.75 63.744 63.75 35.207 0 63.746-28.543 63.746-63.75 0-35.202-28.539-63.742-63.746-63.742zm0 90.206c-14.59 0-26.461-11.867-26.461-26.463 0-14.59 11.871-26.461 26.461-26.461 14.592 0 26.463 11.871 26.463 26.461 0 14.595-11.87 26.463-26.463 26.463zm-99.629-186.45l112.612-112.613 28.023 28.021 21.212-103.617-103.62 21.213 28.022 28.023-125.792 125.788c-7.28 7.285-7.28 19.086 0 26.367l71.525 71.521 26.361-26.359-58.343-58.344z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tag.svg
new file mode 100644
index 0000000000..ffeadcc433
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M396.022 84.033l-108.391.003L84.305 286.304 224.947 426.95l199.867-199.87V112.828l-28.792-28.795zm-7.9 77.728c-11.337 11.339-29.72 11.339-41.058 0-11.34-11.334-11.34-29.718 0-41.055 11.336-11.344 29.721-11.344 41.058-.004 11.337 11.341 11.338 29.724 0 41.059z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tags.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tags.svg
new file mode 100644
index 0000000000..681f38712d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tags.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M411.412 126.379H303.02L99.692 328.647l140.645 140.649 199.869-199.87V155.171l-28.794-28.792zm-7.901 77.725c-11.336 11.338-29.72 11.338-41.058 0-11.34-11.337-11.34-29.72 0-41.054 11.338-11.344 29.722-11.344 41.058-.004 11.337 11.339 11.338 29.722 0 41.058zm-116.275-93.589l6.549-6.518h117.629V72.076L382.621 43.28l-108.392.006L70.903 245.554l40.187 40.189z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-takeaway-cup.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-takeaway-cup.svg
new file mode 100644
index 0000000000..5360908485
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-takeaway-cup.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M368.255 130.577h-3.824l-17.005-40.696H165.178l-17.004 40.696h-3.86c-6.865 0-12.458 5.592-12.458 12.464 0 6.896 5.593 12.49 12.458 12.49h223.941c6.902 0 12.493-5.594 12.493-12.49 0-6.872-5.591-12.464-12.493-12.464zm-49.574-.88h-15.107a12.037 12.037 0 0 1-12.067-12.07c0-6.668 5.396-12.096 12.067-12.096h15.107c6.668 0 12.067 5.428 12.067 12.096a12.04 12.04 0 0 1-12.067 12.07zM175.513 421.168h161.578l23.969-242.023H151.542l23.971 242.023z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-target.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-target.svg
new file mode 100644
index 0000000000..f61b84adc6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-target.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M323.389 256.516c0 37.027-30.018 67.046-67.042 67.046-37.026 0-67.044-30.019-67.044-67.046 0-37.025 30.018-67.038 67.044-67.038 37.024 0 67.042 30.012 67.042 67.038zm-251.846 0C71.56 154.438 154.27 71.735 256.345 71.71c102.074.025 184.781 82.729 184.804 184.806-.022 102.073-82.729 184.779-184.804 184.8-102.075-.021-184.785-82.727-184.802-184.8zm96.186-88.61c-22.726 22.771-36.689 53.906-36.705 88.609.016 34.698 13.979 65.839 36.705 88.612 22.775 22.721 53.914 36.683 88.615 36.7 34.7-.018 65.839-13.979 88.616-36.7 22.725-22.773 36.688-53.914 36.705-88.612-.018-34.703-13.986-65.838-36.705-88.609-22.777-22.728-53.916-36.695-88.616-36.707-34.701.012-65.839 13.98-88.615 36.707z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-temperatrure-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-temperatrure-alt.svg
new file mode 100644
index 0000000000..235b8a1eb9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-temperatrure-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.39 59.798c-108.323 0-196.144 87.821-196.144 196.165 0 108.324 87.821 196.157 196.144 196.157 108.338 0 196.145-87.833 196.145-196.157 0-108.344-87.806-196.165-196.145-196.165zm3.434 339.149c-21.666 0-39.243-17.593-39.243-39.275 0-16.937 10.726-31.296 25.753-36.82v-111.94h24.935v111.221c16.089 4.87 27.813 19.847 27.813 37.539 0 21.682-17.576 39.275-39.258 39.275zm99.381-148.12c-.492-27.78-11.871-52.768-30.119-71.075-18.754-18.674-44.393-30.186-72.942-30.186v-25.15c-.13 0-.276-.015-.405-.015-34.943.015-66.452 14.14-89.375 37.035-22.91 22.894-37.053 54.433-37.053 89.391h-22.727c.015-82.392 66.775-149.168 149.154-149.168 79.855 0 145.03 62.704 148.985 141.612.164 2.488.245 4.987.296 7.556h-45.814z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-temperature.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-temperature.svg
new file mode 100644
index 0000000000..fa6c7859fa
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-temperature.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M326.578 259.653V123.007c0-38.717-31.493-70.213-70.21-70.213-38.703 0-70.179 31.496-70.179 70.213v136.646c-26.375 21.109-42.152 53.285-42.152 87.687 0 61.952 50.395 112.35 112.331 112.35 61.935 0 112.33-50.397 112.33-112.35-.001-34.402-15.764-66.577-42.12-87.687zm-70.21 169.374c-45.112 0-81.672-36.561-81.672-81.688 0-30.758 17.02-57.554 42.133-71.485V123.007c0-21.844 17.708-39.551 39.539-39.551 21.843 0 39.537 17.707 39.537 39.551v152.879c25.129 13.933 42.133 40.695 42.133 71.453-.001 45.128-36.542 81.688-81.67 81.688zm15.303-132.212V195.979c0-8.472-6.833-15.32-15.303-15.32-8.471 0-15.337 6.849-15.337 15.32v100.836c-21.68 6.576-37.478 26.702-37.478 50.524 0 29.173 23.643 52.816 52.815 52.816 29.169 0 52.796-23.644 52.796-52.816 0-23.821-15.78-43.947-37.493-50.524z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-terminal.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-terminal.svg
new file mode 100644
index 0000000000..edb6b159e0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-terminal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M425.286 155.794H87.838v238.792h337.448V155.794zm-230.703 74.771l-72.7 30.599v-20.195l55.191-19.644-55.191-19.828v-19.645l72.7 30.848v17.865zm90.563 27.349h-68.578v-16.568h68.578v16.568zM37.761 67.555v377.107h436.664V67.555H37.761zm412.564 352.069H62.798V130.756h387.527v288.868z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-theater.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-theater.svg
new file mode 100644
index 0000000000..b3a293ab48
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-theater.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M272.366 99.513c-26.162-91.959-3.893-28.323-120.474 4.865-116.547 33.174-131.33-33.281-104.971 59.31 17.625 61.947 86.071 184.552 167.76 161.3 81.72-23.247 75.311-163.522 57.685-225.475zm-155.822 83.255c-14.587 1.882-26.098 9.75-28.845 18.855-1.046-1.717-1.732-3.566-1.962-5.535-1.47-11.381 11.677-22.434 29.368-24.704 17.693-2.267 33.192 5.128 34.63 16.48.293 1.976.099 3.939-.492 5.863-4.937-8.112-18.084-12.823-32.699-10.959zm87.345 97.601c-24.528 6.998-47.091 3.336-54.056-21.077l88.622-26.195c6.933 24.405-10.04 40.289-34.566 47.272zm20.732-128.351c-13.407 6.095-22.107 17.021-22.04 26.512-1.471-1.327-2.715-2.89-3.499-4.7-4.775-10.437 4.545-24.88 20.8-32.247 16.218-7.389 33.222-4.922 37.964 5.503.82 1.822 1.21 3.753 1.21 5.762-7.095-6.296-21.026-6.931-34.435-.83zm134.861 107.717c-24.297-8.43-42.25-17.882-55.753-26.701-4.614 30.377-13.345 53.044-24.104 69.974a50.065 50.065 0 0 0 9.778 1.886c14.685 1.293 27.603-3.94 32.244-12.21.653 1.858.917 3.834.72 5.809-1.013 11.425-16.221 19.408-34.01 17.814-5.625-.487-10.824-1.912-15.273-3.955-15.401 19.749-33.714 29.826-50.032 34.811-.916 55.902 13.245 112.614 61.25 129.292 80.282 27.831 155.529-90.703 176.62-151.556 31.363-90.343 13.082-25.44-101.44-65.164zm-8.794 171.894l-87.606-29.363c8.339-23.987 31.358-27.266 55.46-18.901 24.099 8.37 40.45 24.278 32.146 48.264zm68.932-76.734c-6.899 9.167-24.001 7.917-38.261-2.804-14.225-10.716-20.207-26.839-13.339-36.002a14.173 14.173 0 0 1 4.478-3.828c-2.156 9.264 3.99 21.795 15.729 30.651 11.807 8.851 25.54 11.259 33.814 6.653-.424 1.946-1.209 3.755-2.421 5.33z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-theif.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-theif.svg
new file mode 100644
index 0000000000..f3b3ec69ad
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-theif.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M471.68 400.535c-.098-3.891-2.715-8.992-5.821-11.364 0 0-25.409-19.57-45.324-27.973-21.843-9.22-61.413-26.1-61.413-26.1-3.564-1.536-9.321-3.526-12.721-4.462-1.83-.493-5.823-2.072-9.517-3.877-29.957 11.514-59.093 15.422-84.666 15.422-37.313-.029-67.104-8.188-81.624-13.112-3.89 1.094-15.041 4.562-18.474 6.029 0 0-39.54 16.88-61.415 26.1-19.882 8.402-45.325 27.973-45.325 27.973-3.071 2.372-5.723 7.474-5.821 11.364l-.622 52.096c-.096 3.89 3.043 7.047 6.935 7.047H465.4c3.856 0 6.964-3.157 6.934-7.047l-.654-52.096zM167.816 195.236s1.108 34.369 12.62 41.566c1.079.689 2.979 9.027 2.879 8.451 1.145 11.886 9.059 22.318 9.059 22.318.359 3.893-.948 9.779-2.877 13.178l-9.747 16.907a10.458 10.458 0 0 0-9.581 6.349c-2.353 5.328.099 11.537 5.428 13.894.852.312 33.488 14.507 79.433 14.538h.066c24.724 0 53.337-4.188 82.507-17.09 5.364-2.354 7.749-8.615 5.396-13.945-1.861-4.172-6.08-6.521-10.398-6.227-4.611-7.426-10.563-15.127-10.563-15.127-2.353-3.055-3.236-8.555-1.961-12.247l8.666-24.724c1.273-3.66 2.451-7.162 2.519-7.701.096-.57.882-1.616 1.697-2.305l.592-.814c3.138-4.418 5.231-12.117 6.213-17.516 1.47-7.947.981-20.061.981-20.061-.133-3.892.325-10.203 1.078-14.033l2.551-13.337c.751-3.793.884-10.075.325-13.9l-10.233-50.44c-.295-1.917-9.551-52.029-81.329-52.029-71.78 0-83.455 50.112-83.652 52.076l-7.52 65.93c-.326 3.855.783 9.774 2.484 13.143 1.699 3.355 3.2 9.269 3.367 13.146zm130.216-30.166c11.643 0 21.126 9.484 21.126 21.157 0 11.69-9.483 21.139-21.126 21.139-11.708 0-35.09-9.448-35.09-21.139 0-11.672 23.382-21.157 35.09-21.157zm-44.046 68.691c7.423 0 13.439 4.608 13.439 10.333 0 5.721-6.017 10.332-13.439 10.332-7.394 0-13.41-4.611-13.41-10.332 0-5.725 6.017-10.333 13.41-10.333zm-45.72-68.691c11.643 0 35.027 9.484 35.027 21.157 0 11.69-23.385 21.139-35.027 21.139-11.705 0-21.188-9.448-21.188-21.139 0-11.672 9.483-21.157 21.188-21.157z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thought-bubble.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thought-bubble.svg
new file mode 100644
index 0000000000..59b9b71150
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thought-bubble.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M267.179 392.949c-1.756-15.215-17.393-25.909-34.934-23.89-17.537 2.023-30.33 16.001-28.578 31.213 1.756 15.217 17.396 25.912 34.936 23.886 17.537-2.018 30.33-15.995 28.576-31.209zm4.136 32.179c-8.928 3.498-13.697 12.612-10.664 20.351 3.037 7.747 12.73 11.186 21.654 7.685 8.924-3.498 13.697-12.612 10.664-20.352-3.038-7.743-12.732-11.183-21.654-7.684zm171.842-242.846c-9.924-26.373-30.6-47.198-56.51-57.506a68.536 68.536 0 0 0-3.555-13.429c-9.979-26.521-35.719-44.339-64.047-44.339a68.135 68.135 0 0 0-24.086 4.398 68.437 68.437 0 0 0-15.332 8.112c-14.807-14.041-34.523-22.049-55.537-22.052-9.715 0-19.287 1.747-28.447 5.194-22.584 8.498-39.711 26.091-47.625 48.301a99.658 99.658 0 0 0-20.945 5.386c-24.916 9.374-44.689 27.891-55.678 52.136-10.99 24.245-11.879 51.319-2.506 76.233 10.172 27.038 31.549 48.174 58.312 58.214a69.029 69.029 0 0 0 2.389 7.71c9.984 26.527 35.723 44.347 64.051 44.347a68.178 68.178 0 0 0 24.086-4.396 68.53 68.53 0 0 0 13.918-7.124c13.051 8.539 28.314 13.129 44.188 13.129 9.715 0 19.287-1.748 28.447-5.193 17.293-6.507 31.756-18.754 41.072-34.464 1.531.071 3.062.106 4.588.106 11.973 0 23.76-2.15 35.033-6.393 51.434-19.35 77.538-76.936 58.184-128.37z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumb-down.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumb-down.svg
new file mode 100644
index 0000000000..933450deab
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumb-down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M401.858 207.052c0-18.415-3.433-33.365-21.861-33.365h-.138c13.774-2.35 16.537-15.661 16.537-31.804 0-17.775-3.312-32.195-21.104-32.195h-15.285c12.057-3.413 14.562-16.354 14.562-31.854 0-18.089-3.373-32.758-21.458-32.758H198.813c-50.815 0-92.016 41.194-92.016 92.017v98.203c0 36.04 19.936 64.626 51.273 76.835 24.394 16.037 73.521 54.229 83.988 107.306v40.044s68.626 7.453 68.626-57.061c0-75.979-47.833-88.326-9.752-90.177h56.8c20.065 0 23.791-16.267 23.791-36.337 0-17.426-2.824-31.959-16.699-35.49h15.173c18.429 0 21.861-14.934 21.861-33.364z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumb-up.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumb-up.svg
new file mode 100644
index 0000000000..1068c845bd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumb-up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M261.992 239.754c0 16.044 2.982 29.038 19.029 29.038h88.588c16.043 0 19.022-12.994 19.022-29.038 0-16.046-2.979-29.05-19.022-29.05h-88.588c-16.046 0-19.029 13.004-19.029 29.05zM245.909 308.6c0 16.035 2.988 29.05 19.017 29.05H383.48c16.047 0 19.035-13.015 19.035-29.05 0-16.043-2.988-29.047-19.035-29.047H264.926c-16.029 0-19.017 13.004-19.017 29.047zm15.864 69.9c0 16.033 2.988 29.036 19.014 29.036h93.52c16.043 0 19.034-13.003 19.034-29.036 0-16.054-2.991-29.05-19.034-29.05h-93.52c-16.025 0-19.014 12.996-19.014 29.05zm15.435 71.36c0 16.035 2.988 29.039 19.021 29.039H349.5c16.034 0 19.027-13.004 19.027-29.039 0-16.053-2.993-29.05-19.027-29.05h-53.271c-16.033.001-19.021 12.998-19.021 29.05zm-7.389 25.459c-3.258-6.221-4.71-14.074-4.71-25.459 0-11.392 1.452-19.251 4.71-25.47a27.12 27.12 0 0 1 4.749-6.54c-11.305-1.479-17.19-8.165-20.19-13.895-3.256-6.222-4.703-14.071-4.703-25.456 0-11.394 1.447-19.248 4.703-25.473a28.095 28.095 0 0 1 3.501-5.185c-10.767-1.689-16.441-8.195-19.365-13.781-3.257-6.222-4.709-14.076-4.709-25.462 0-11.388 1.452-19.243 4.709-25.466 2.874-5.486 8.411-11.852 18.818-13.677a28.043 28.043 0 0 1-2.732-4.238c-3.257-6.22-4.71-14.074-4.71-25.465 0-11.393 1.453-19.246 4.71-25.468 3.394-6.479 10.475-14.206 24.944-14.206h18.061c1.859-13.459 39.114-42.243 39.114-101.103 0-64.51-68.624-57.057-68.624-57.057v40.044c-12.038 44.633-91.93 113.537-114.558 132.355-26.783 13.676-43.424 40.396-43.424 73.333v98.201c0 50.822 41.199 92.019 92.015 92.019h69.2a27.721 27.721 0 0 1-1.509-2.551z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnail-list.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnail-list.svg
new file mode 100644
index 0000000000..c6ddb31ec2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnail-list.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M260.584 141.379V90.017h161.574v51.362H260.584zm0 78.326v-51.362h161.574v51.362H260.584zm0 122.799v-51.367h161.574v51.367H260.584zm0 78.32v-51.363h161.574v51.363H260.584zM87.979 91.28h128.868v128.87H87.979zm0 200.309h128.868v128.87H87.979z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnails-small.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnails-small.svg
new file mode 100644
index 0000000000..ced7db6e71
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnails-small.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M57.012 169.89h112.223V57.667H57.012V169.89zm141.888 0h112.223V57.667H198.9V169.89zM340.79 57.667V169.89h112.218V57.667H340.79zM57.012 311.136h112.223V198.91H57.012v112.226zm141.888 0h112.223V198.91H198.9v112.226zm141.89 0h112.218V198.91H340.79v112.226zM57.012 452.38h112.223V340.156H57.012V452.38zm141.888 0h112.223V340.156H198.9V452.38zm141.89 0h112.218V340.156H340.79V452.38z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnails.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnails.svg
new file mode 100644
index 0000000000..b8800a7000
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnails.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M87.898 91.28h128.868v128.87H87.898zm204.066 0h128.87v128.87h-128.87zM87.898 291.589h128.868v128.87H87.898zm204.066 0h128.87v128.87h-128.87z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ticket.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ticket.svg
new file mode 100644
index 0000000000..b69e61beec
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ticket.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M473.307 190.176v-13.668c-21.581-2.176-36.07-19.555-37.802-41.239H76.078c-1.699 21.685-16.218 39.063-37.802 41.239v9.972c6.899 0 9.974 5.591 9.974 12.479 0 6.912-3.074 12.49-9.974 12.49v12.1c6.899 0 9.974 5.607 9.974 12.494 0 6.896-3.074 12.488-9.974 12.488v11.904c6.899 0 9.974 5.609 9.974 12.495 0 6.896-3.074 12.489-9.974 12.489v11.903c6.899 0 9.974 5.593 9.974 12.494 0 6.883-3.074 12.491-9.974 12.491v13.684c21.584 2.16 36.103 19.539 37.802 41.239h359.427c1.731-21.7 16.221-39.079 37.802-41.239v-9.987c-6.899 0-9.975-5.594-9.975-12.494 0-6.882 3.075-12.49 9.975-12.49v-12.083c-6.899 0-9.975-5.593-9.975-12.495 0-6.896 3.075-12.49 9.975-12.49V252.05c-6.899 0-9.975-5.592-9.975-12.494 0-6.898 3.075-12.491 9.975-12.491v-11.919c-6.899 0-9.975-5.593-9.975-12.49 0-6.887 3.075-12.48 9.975-12.48zm-356.743 135.68H91.482V186.61h25.082v139.246zm158.278-4.382h-28.025v-89.65h-34.762v-21.141c4.87.127 9.58-.233 14.126-1.083 4.513-.85 8.634-2.348 12.23-4.54a29.72 29.72 0 0 0 9.189-8.588c2.484-3.548 4.152-7.947 4.938-13.23h22.303v138.232zm145.26 4.382h-25.05V186.61h25.05v139.246z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-time.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-time.svg
new file mode 100644
index 0000000000..cd65d62e2e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-time.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.169 37.716c120.399 0 217.999 97.602 217.999 217.999 0 120.394-97.6 217.996-217.999 217.996-120.397 0-217.998-97.603-217.998-217.996 0-120.398 97.601-217.999 217.998-217.999m0 66.173c-83.716 0-151.826 68.108-151.826 151.826 0 83.715 68.11 151.826 151.826 151.826s151.826-68.111 151.826-151.826c0-83.718-68.11-151.826-151.826-151.826zm39.456 219.541l-58.234-60.113V142.313c0-10.371 8.405-18.775 18.779-18.775 10.371 0 18.78 8.405 18.78 18.775l-.005 105.793 47.654 49.194c7.217 7.447 7.03 19.334-.424 26.553a18.716 18.716 0 0 1-13.064 5.289 18.706 18.706 0 0 1-13.486-5.712z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-timer.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-timer.svg
new file mode 100644
index 0000000000..f93538095b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-timer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M401.477 135.004c-28.908-28.903-64.812-46.452-102.289-52.749V41.514h-65.894v41.235c-19.261 3.515-38.063 10.038-55.659 19.587L144.15 68.885l11.38-11.38-21.685-21.687-96.401 96.408 21.681 21.685 13.537-13.571 32.08 32.077c-43.102 72.631-33.387 167.825 29.074 230.282 73.904 73.893 193.756 73.893 267.66 0 73.942-73.9 73.942-193.756.001-267.695zm-40.615 227.05c-51.407 51.41-135.026 51.41-186.431 0-51.377-51.376-51.377-134.992 0-186.435 51.404-51.373 135.023-51.373 186.431 0 51.374 51.443 51.374 135.059 0 186.435zm-26.915-108.437l-59.451-.951-64.941-64.946c-6.379-6.372-16.68-6.372-23.057 0-6.375 6.331-6.375 16.679 0 23.058l74.299 74.267 72.631 1.142c4.641.084 8.796-1.731 11.805-4.742 2.876-2.909 4.705-6.864 4.775-11.28.131-8.997-7.032-16.438-16.061-16.548z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tools.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tools.svg
new file mode 100644
index 0000000000..a8a1aec10f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tools.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M167.564 237.883c.098.098.18.207.279.307l41.582 41.581 14.504-14.504-15.655-15.652-7.078-7.085 36.284-36.283 4.785.532c1.221.14 2.468.208 3.709.208 2.506 0 4.96-.308 7.346-.841l-26.714-26.717c-.539-.541-1.122-1.017-1.685-1.524 8.233-29.596.738-62.65-22.536-85.922-23.101-23.104-55.84-30.654-85.27-22.712l49.864 49.861-13.092 48.849-48.85 13.095-49.864-49.866c-7.944 29.435-.386 62.177 22.715 85.276 24.258 24.261 59.153 31.378 89.676 21.397zm147.338 29.845a33.37 33.37 0 0 0-.612 11.079l.531 4.783-3.406 3.405-25.792 25.8-7.084 7.078-22.736-22.736-14.506 14.506 131.626 131.632c8.116 8.113 18.749 12.168 29.385 12.168 10.632 0 21.266-4.055 29.376-12.168 16.231-16.229 16.231-42.537 0-58.762L314.902 267.728zm101.629 161.907l-20.877 5.594-16.938-16.94 5.595-20.873 20.879-5.597 16.937 16.939-5.596 20.877zM255.954 283.126l22.742 22.741 25.797-25.797c-1.399-12.586 2.698-25.662 12.346-35.307 9.644-9.645 22.721-13.74 35.302-12.346l112.796-112.796-63.181-63.177L288.963 169.24c1.398 12.582-2.701 25.658-12.346 35.307-9.646 9.646-22.722 13.74-35.307 12.342l-25.794 25.799 22.731 22.733-111.455 111.456-4.077-4.078-21.396 17.233-35.987 56.832 9.187 9.189 56.838-35.985 17.228-21.396-4.092-4.088 111.461-111.458z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-top.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-top.svg
new file mode 100644
index 0000000000..2bea18be1e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-top.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M368.928 438.927V227.135s-30.216-11.004-30.216-154.301h-24.068s5.982 100.604-54.774 100.604h-8.504c-60.758 0-54.774-100.604-54.774-100.604H172.49c0 143.296-30.218 154.301-30.218 154.301v211.792h226.656z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-traffic-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-traffic-alt.svg
new file mode 100644
index 0000000000..9cb29dfaa0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-traffic-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M196.861 258.204l89.142-73.582-89.142-73.574v48.004H38.404v51.147h158.457v48.005zm118.904-4.515l-89.144 73.583 89.144 73.574V352.84h158.046v-51.146H315.765v-48.005z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trafic.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trafic.svg
new file mode 100644
index 0000000000..420832c521
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trafic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M324.727 245.551l89.521-73.883-89.521-73.885v48.2H140.551v51.362h184.175v48.206zm-138.8 20.517L96.406 339.95l89.521 73.887V365.63h183.761v-51.363H185.927v-48.199z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-train.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-train.svg
new file mode 100644
index 0000000000..b1de2d26e1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-train.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M377.747 348.745V109.892s-5.349-63.34-121.355-63.34c-116.027 0-121.358 63.31-121.358 63.31v238.884c0 13.346 10.072 24.15 22.484 24.15h48.709l-68.379 93.034h38.031l11.903-16.199h139.031l11.805 16.199h37.92l-67.791-93.034h46.501c12.425 0 22.499-10.805 22.499-24.151zm-167.433 70.327l12.195-16.582h69.869l12.098 16.582h-94.162zm29.56-355.109h32.997c10.334 0 18.705 8.387 18.705 18.722 0 10.318-8.371 18.688-18.705 18.688h-32.997c-10.316 0-18.687-8.37-18.687-18.688 0-10.334 8.371-18.722 18.687-18.722zm-71.518 70.602c0-6.49 6.508-11.755 14.536-11.755h147.01c8.013 0 14.521 5.265 14.521 11.755v82.216s-13.112 22.578-88.031 22.578c-74.921 0-88.035-22.6-88.035-22.6v-82.194zm-.456 182.526c0-15.072 12.23-27.305 27.305-27.305 15.076 0 27.305 12.232 27.305 27.305 0 15.077-12.229 27.307-27.305 27.307-15.075-.001-27.305-12.23-27.305-27.307zm151.735 27.306c-15.06 0-27.272-12.229-27.272-27.307 0-15.072 12.213-27.305 27.272-27.305 15.092 0 27.307 12.232 27.307 27.305-.001 15.078-12.215 27.307-27.307 27.307z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash-alt-2.svg
new file mode 100644
index 0000000000..8bb390a394
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash-alt-2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M438.474 117.1c0-36.855-50.238-48.518-66.746-52.348-31.23-7.25-72.334-11.242-115.73-11.242-43.395 0-84.496 3.992-115.727 11.242-16.508 3.83-66.744 15.492-66.744 52.348 0 13.449 9.605 24.643 22.328 27.127l53.32 251.887c-3.867 4.383-6.23 10.121-6.23 16.426 0 19.967 15.898 33.471 47.252 40.139 17.645 3.75 41.014 5.812 65.801 5.812 24.789 0 48.158-2.062 65.803-5.812 31.354-6.668 47.252-20.172 47.252-40.139 0-6.305-2.365-12.043-6.232-16.426l53.326-251.887c12.719-2.485 22.327-13.678 22.327-27.127zm-312.676 12.556a27.06 27.06 0 0 0 1.182-2.6c3.309-1.84 8.799-3.941 16.309-6.047l76.107 35.805-79.559 39.162-14.039-66.32zm127.295 43.012l82.639 38.881L256 249.735l-80.828-38.709 77.921-38.358zm-30.787 93.201l-61.445 29.428-13.863-65.494 75.308 36.066zm33.693 16.137l69.279 33.178-69.279 33.18-69.277-33.18 69.277-33.178zM222.308 364.5l-42.49 20.348-9.586-45.291 52.076 24.943zm33.691 16.133l50.756 24.309c-12.172 2.127-29.57 3.824-50.758 3.824-21.186 0-38.582-1.697-50.754-3.824l50.756-24.309zm76.178 4.213L289.69 364.5l52.074-24.939-9.587 45.285zm18.959-89.551l-61.443-29.426L365 229.805l-13.864 65.49zm-64.633-139.072l75.223-37.025c11.164 2.689 19.035 5.492 23.293 7.859.344.893.75 1.752 1.182 2.6l-14.145 66.816-85.553-40.25zm25.293-44.891l-58.99 29.037-60.092-28.273c17.965-1.988 39.156-3.285 63.283-3.285 20.861 0 39.514.972 55.799 2.521z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash-alt.svg
new file mode 100644
index 0000000000..5fba12abc3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M123.8 475.729h263.142l25.235-287.633H98.566L123.8 475.729zM425.02 90.446h-82.252v-9.367c-.011-24.943-20.209-45.144-45.146-45.146H213.12c-24.945.002-45.144 20.202-45.156 45.146v9.367h-82.24c-11.746 0-21.273 9.525-21.273 21.272v51.338h381.841v-51.338c0-11.746-9.526-21.272-21.272-21.272zm-113.028 0H198.746v-9.367c.009-7.93 6.441-14.355 14.373-14.376h84.502c7.928.021 14.354 6.446 14.371 14.376v9.367z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash.svg
new file mode 100644
index 0000000000..abae234837
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M122.844 475.519h263.145V195.703H122.844v279.816zm181.281-223.79c0-8.498 6.891-15.386 15.395-15.386 8.494 0 15.385 6.888 15.385 15.386v162.128c0 8.496-6.891 15.394-15.385 15.394-8.504 0-15.395-6.897-15.395-15.394V251.729zm-65.101.003c0-8.496 6.892-15.392 15.39-15.392 8.496 0 15.392 6.896 15.392 15.392v162.125c0 8.496-6.896 15.391-15.392 15.391-8.498 0-15.39-6.895-15.39-15.391V251.732zm-65.098 0c0-8.501 6.895-15.392 15.389-15.392 8.498 0 15.391 6.891 15.391 15.392v162.127c0 8.498-6.893 15.389-15.391 15.389-8.494 0-15.389-6.891-15.389-15.389V251.732zM399.02 90.23h-57.209v-9.36c-.004-24.942-20.209-45.145-45.148-45.152h-84.498c-24.941.007-45.145 20.209-45.153 45.152v9.36h-57.2c-11.744 0-21.273 9.526-21.273 21.275v56.348h331.756v-56.348c-.002-11.748-9.527-21.275-21.275-21.275zm-87.989 0H197.785l-.004-9.36c.023-7.938 6.445-14.359 14.383-14.372h84.498c7.929.013 14.359 6.433 14.369 14.372v9.36z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tree.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tree.svg
new file mode 100644
index 0000000000..8da9048412
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tree.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M406.566 223.748c0-21.37-9.564-40.481-24.657-53.335a73.046 73.046 0 0 0 2.616-19.408c0-40.075-32.211-72.616-72.139-73.186-8.078-22.124-29.303-37.95-54.221-37.95-24.919 0-46.16 15.826-54.219 37.95-39.962.569-72.173 33.11-72.173 73.186 0 5.934.753 11.708 2.076 17.253-16.627 12.784-27.353 32.895-27.353 55.49 0 32.211 21.81 59.354 51.44 67.499.099 2.481.195 5.049.195 7.684 0 22.763 28.976 41.202 64.685 41.202.586 0 1.16 0 1.749-.015v131.643h65.894V340.118c.753.015 1.486.015 2.241.015 35.726 0 64.683-18.439 64.683-41.202 0-2.831-.033-5.593-.194-8.274 28.581-8.795 49.377-35.448 49.377-66.909z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trophy.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trophy.svg
new file mode 100644
index 0000000000..75229f89a8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trophy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M281.693 340.922v-41.975a116.332 116.332 0 0 1-25.297 2.763c-8.86 0-17.527-1.017-25.85-2.878v42.761c-.36 28.267-23.363 51.078-51.749 51.078h-3.237v30.656h161.12v-30.656h-3.204c-28.615 0-51.783-23.169-51.783-51.749zM423.601 118.81l-.589-12.264h-73.84V88.301h-185.55v18.276H89.817l-.623 12.184c0 .179-.064 1.453-.064 3.528.064 8.62.817 31.513 11.413 54.044 5.329 11.216 13.375 22.464 25.343 30.888 11.674 8.221 26.947 13.32 45.325 13.536 14.226 32.979 46.991 56.035 85.186 56.035 38.164 0 70.965-23.056 85.189-56.035 18.346-.216 33.65-5.315 45.325-13.536 18.019-12.705 26.946-31.381 31.588-47.63 4.645-16.352 5.151-30.843 5.151-37.315 0-2.062-.049-3.271-.049-3.466zm-282.932 67.365c-11.252-7.816-17.957-20.649-21.634-33.649-2.11-7.309-3.172-14.502-3.71-20.244h48.297v51.733c0 3.566.23 7.099.623 10.562-10.089-1.141-17.562-4.254-23.576-8.402zm248.336-20.898c-3.942 8.292-9.354 15.602-16.875 20.897-6.001 4.148-13.508 7.261-23.577 8.402.392-3.464.619-6.996.619-10.562v-51.733h48.285c-.865 9.112-3.074 21.848-8.452 32.996z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-truck.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-truck.svg
new file mode 100644
index 0000000000..112c57941f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-truck.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M435.303 149.064h-98.088v157.718a64.095 64.095 0 0 1 20.782-3.465c30.004 0 55.184 20.733 61.983 48.691h50.23V233.729l-34.907-84.665zm-48.039 89.408l-23.691-64.454h55.039l26.566 64.454h-57.914zM286.919 105.699H65.512c-13.359 0-24.183 10.829-24.183 24.17v223.154h31.347c6.426-28.45 31.852-49.706 62.211-49.706 30.414 0 55.84 21.256 62.25 49.706h98.612a63.695 63.695 0 0 1 15.353-29.168V129.869c0-13.341-10.825-24.17-24.183-24.17zM134.887 328.266c-21.418 0-38.847 17.436-38.847 38.887s17.429 38.887 38.847 38.887c21.47 0 38.901-17.436 38.901-38.887s-17.432-38.887-38.901-38.887zm223.11 0c-21.452 0-38.901 17.436-38.901 38.887s17.449 38.887 38.901 38.887 38.882-17.436 38.882-38.887-17.43-38.887-38.882-38.887z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tv-old.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tv-old.svg
new file mode 100644
index 0000000000..6bde7d04ac
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tv-old.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M462.346 74.159H50.471c-6.803 0-12.328 5.509-12.328 12.343V368.2c0 6.803 5.525 12.324 12.328 12.324h411.875a12.311 12.311 0 0 0 12.329-12.324V86.502a12.308 12.308 0 0 0-12.329-12.343zm-105.952 207.3c0 12.754-8.798 28.853-19.554 35.726 0 0-41.86 26.78-117.598 26.78-75.702 0-117.562-26.78-117.562-26.78-10.758-6.873-19.556-22.972-19.556-35.726V173.688c0-12.787 8.798-28.862 19.556-35.745 0 0 41.86-26.786 117.562-26.786 75.737 0 117.598 26.786 117.598 26.786 10.756 6.883 19.554 22.958 19.554 35.745v107.771zm63.672-43.317c-10.369 0-18.773-8.405-18.773-18.769 0-10.365 8.404-18.743 18.773-18.743 10.362 0 18.736 8.378 18.736 18.743.001 10.363-8.373 18.769-18.736 18.769zm0-65.172c-10.369 0-18.773-8.409-18.773-18.737 0-10.369 8.404-18.774 18.773-18.774 10.362 0 18.736 8.405 18.736 18.774.001 10.328-8.373 18.737-18.736 18.737zM106.684 437.494h287.58v-30.643h-287.58v30.643z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tv.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tv.svg
new file mode 100644
index 0000000000..d3fc2d2cd9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tv.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.209 439.747c55.07 0 99.705-22.302 99.705-49.868H156.469c0 27.566 44.669 49.868 99.74 49.868zM460.528 71.894H51.887c-6.801 0-12.329 5.51-12.329 12.327v268.51c0 6.803 5.528 12.325 12.329 12.325h408.642c6.802 0 12.296-5.522 12.296-12.325V84.221c-.001-6.818-5.495-12.327-12.297-12.327zm-17.624 263.252H69.482V101.818h373.422v233.328z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-content.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-content.svg
new file mode 100644
index 0000000000..3ee9892c48
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-content.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M410.48 148.4l-93.312-93.312a39.972 39.972 0 0 0-28.288-11.712H129.808c-22.096 0-40 17.904-40 40v345.248c0 22.096 17.904 40 40 40h252.368c22.096 0 40-17.904 40-40V176.688A39.917 39.917 0 0 0 410.48 148.4zM129.808 428.624V83.376h151.088l.064.192c.08.304 8.64 31.28-6.128 88.064a8.084 8.084 0 0 0 2.544 8.16 8.065 8.065 0 0 0 8.448 1.296c62.528-26.784 94.704 3.36 96.336 4.976V428.64H129.808z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-contour.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-contour.svg
new file mode 100644
index 0000000000..2590acf88d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-contour.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M444.72 215.28H67.28c-11.04 0-20-8.96-20-20V64.896c0-11.04 8.96-20 20-20h377.44c11.04 0 20 8.96 20 20V195.28c0 11.056-8.96 20-20 20zm-357.44-40h337.44V84.896H87.28v90.384zm185.504 215.696c0-6.848.704-13.504 1.936-20H87.28v-90.384h337.44v12.496a108.098 108.098 0 0 1 40 31.36v-63.856c0-11.04-8.96-20-20-20H67.28c-11.04 0-20 8.96-20 20v130.384c0 11.04 8.96 20 20 20h207.44c-1.232-6.496-1.936-13.152-1.936-20zm107.552-76.128c-41.968 0-76.112 34.16-76.112 76.128s34.144 76.128 76.112 76.128 76.128-34.16 76.128-76.128-34.144-76.128-76.128-76.128zm46.016 80.464a7.293 7.293 0 0 1-7.296 7.296h-27.072v27.088a7.293 7.293 0 0 1-7.296 7.296H376a7.293 7.293 0 0 1-7.296-7.296v-27.088h-27.072a7.293 7.293 0 0 1-7.296-7.296v-8.672a7.293 7.293 0 0 1 7.296-7.296h27.072v-27.088A7.293 7.293 0 0 1 376 344.96h8.688a7.293 7.293 0 0 1 7.296 7.296v27.088h27.072a7.293 7.293 0 0 1 7.296 7.296v8.672z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-deploy.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-deploy.svg
new file mode 100644
index 0000000000..37c500ddd3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-deploy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.016 49.296c-117.152 0-212.112 94.96-212.112 212.096 0 80.32 44.656 150.192 110.496 186.192v-47.616c-42.656-31.344-70.496-81.712-70.496-138.576 0-94.896 77.2-172.096 172.112-172.096 94.896 0 172.08 77.2 172.08 172.096 0 56.88-27.84 107.248-70.496 138.592v47.6c65.84-36 110.496-105.872 110.496-186.192 0-117.136-94.944-212.096-212.08-212.096zm5.92 130.768a8 8 0 0 0-5.904-2.608 8 8 0 0 0-5.904 2.608l-82.288 90.128a7.981 7.981 0 0 0-1.408 8.624 7.978 7.978 0 0 0 7.312 4.768h34.688v171.12c0 4.416 3.584 8 8 8h79.136c4.416 0 8-3.584 8-8V283.6h34.672a7.978 7.978 0 0 0 7.312-4.768 7.991 7.991 0 0 0-1.408-8.624l-82.208-90.144z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-developer.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-developer.svg
new file mode 100644
index 0000000000..f99365c4b4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-developer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M451.936 215.264l-38.08-13.552A168.663 168.663 0 0 0 406 182.768l17.344-36.496a15.985 15.985 0 0 0-3.136-18.176L383.92 91.792a15.974 15.974 0 0 0-18.192-3.136l-36.496 17.36a164.773 164.773 0 0 0-18.96-7.856l-13.536-38.08a16.01 16.01 0 0 0-15.072-10.64h-51.328c-6.768 0-12.816 4.272-15.072 10.64l-13.536 38.08a165.963 165.963 0 0 0-18.96 7.856l-36.496-17.36a15.974 15.974 0 0 0-18.192 3.136l-36.288 36.304a15.985 15.985 0 0 0-3.136 18.176l17.36 36.496c-3.008 6.16-5.648 12.48-7.856 18.96l-38.08 13.536c-6.368 2.272-10.64 8.32-10.64 15.072v51.328c0 6.768 4.256 12.8 10.64 15.072l38.064 13.536a167.17 167.17 0 0 0 7.856 18.96l-17.36 36.512a15.985 15.985 0 0 0 3.136 18.176l36.288 36.288c4.768 4.784 12.064 6.016 18.176 3.136l36.496-17.36a167.272 167.272 0 0 0 18.96 7.872l13.536 38.064a15.995 15.995 0 0 0 15.072 10.64h51.328c6.768 0 12.8-4.256 15.072-10.64l13.552-38.064a165.824 165.824 0 0 0 18.944-7.872l36.496 17.36c6.112 2.896 13.408 1.648 18.176-3.136l36.288-36.288a15.985 15.985 0 0 0 3.136-18.176l-17.344-36.496a165.963 165.963 0 0 0 7.856-18.96l38.064-13.536a15.995 15.995 0 0 0 10.64-15.072v-51.328c.048-6.768-4.208-12.816-10.576-15.088zM256 330.512c-41.136 0-74.512-33.344-74.512-74.512s33.36-74.512 74.512-74.512 74.512 33.344 74.512 74.512-33.376 74.512-74.512 74.512z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-media.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-media.svg
new file mode 100644
index 0000000000..9230e040bd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-media.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M451.056 72.576H60.944c-10.72 0-19.424 8.688-19.424 19.424v328c0 10.72 8.688 19.424 19.424 19.424h390.128c10.72 0 19.424-8.688 19.424-19.424V92c-.016-10.72-8.72-19.424-19.44-19.424zm-19.408 328H80.352V111.424h351.28v289.152zm-309.424-34.48h267.568c6.112 0 11.472-4.096 13.056-10a13.513 13.513 0 0 0-6.224-15.232l-111.488-65.36a13.514 13.514 0 0 0-15.68 1.424l-27.264 23.504-52.736-45.328c-2.944-2.528-6.816-3.616-10.656-3.152a13.58 13.58 0 0 0-9.424 5.888l-58.4 87.168a13.519 13.519 0 0 0-.688 13.92 13.518 13.518 0 0 0 11.936 7.168zm197.968-167.84a41.056 41.056 0 1 1 82.112 0 41.056 41.056 0 1 1-82.112 0z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-members.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-members.svg
new file mode 100644
index 0000000000..9193b6baa6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-members.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M455.184 87.44H56.816c-11.04 0-20 8.96-20 20v297.12c0 11.04 8.96 20 20 20h398.368c11.04 0 20-8.96 20-20V107.44c0-11.056-8.944-20-20-20zm-20 297.12H76.816V127.44h54.128v38.992h64V127.44h122.128v38.992h64V127.44H435.2v257.12zm-282.88-117.408c7.584 13.952 17.2 16.864 23.92 16.864 6.704 0 16.32-2.912 23.968-16.816l.464-.848c3.792-6.88 6.528-11.856 6.528-23.104 0-9.952 0-36.384-30.944-36.384-30.784 0-30.784 25.504-30.784 36.384 0 11.28 2.704 16.256 6.464 23.152l.384.752zm82.592 34.464l-30.768-13.776c-1.312-.592-2.784-.624-4.096-.048l-15.632 6.576h-16.224l-15.632-6.528a5.059 5.059 0 0 0-4.064.048l-30.8 13.744a5.14 5.14 0 0 0-3.04 4.688v18.768a5.142 5.142 0 0 0 5.136 5.136h113.008a5.142 5.142 0 0 0 5.136-5.136v-18.8a5.086 5.086 0 0 0-3.024-4.672zm48.848-85.648h113.632v31.456H283.744zm0 72.512h113.632v31.456H283.744z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-settings.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-settings.svg
new file mode 100644
index 0000000000..554ecdef32
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-settings.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M440.624 351.664c-.192-.176-189.248-167.392-189.248-167.392a101.607 101.607 0 0 0 4.72-30.64c0-27.056-10.528-52.496-29.664-71.632s-44.56-29.664-71.632-29.664c-12.72 0-25.056 2.416-36.56 6.88l54.848 54.864v57.856h-57.84l-54.816-54.832C46.464 153.36 54 196.08 83.184 225.264c19.12 19.12 44.56 29.664 71.632 29.664 9.312 0 18.4-1.328 27.12-3.744 0 0 166.72 189.008 167.472 189.76 12.064 12.064 28.096 18.704 45.152 18.704 17.088 0 33.12-6.656 45.184-18.72 24.576-24.56 24.784-64.272.88-89.264zm-45.808 69.952c-14.288 0-25.84-11.584-25.84-25.856s11.568-25.856 25.84-25.856c14.256 0 25.84 11.584 25.84 25.856s-11.6 25.856-25.84 25.856z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-users.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-users.svg
new file mode 100644
index 0000000000..f8ef77731c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-users.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M184.32 243.392c23.136 42.592 51.664 51.536 71.52 51.536 19.824 0 48.352-8.928 71.68-51.424l1.552-2.816c12.512-22.72 20.784-37.728 20.784-73.072 0-55.616-11.168-112.448-94.016-112.448-93.472 0-93.472 75.952-93.472 112.448 0 35.376 8.176 50.432 20.544 73.2l1.408 2.576zm268.016 126.8L348.144 323.52a12.122 12.122 0 0 0-9.568-.112l-53.936 22.688h-57.152l-53.952-22.528c-3.04-1.28-6.48-1.232-9.52.112L59.68 370.24a11.985 11.985 0 0 0-7.104 10.96v63.632c0 6.624 5.376 12 12 12h382.848c6.624 0 12-5.376 12-12v-63.696c0-4.72-2.784-9.008-7.088-10.944z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umbrella.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umbrella.svg
new file mode 100644
index 0000000000..620eac158a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umbrella.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M267.709 71.077V42.055h-25.72v29.022C127.396 77.74 36.515 172.762 36.515 289.029h4.634c7.414-20.715 27.156-35.559 50.416-35.559 23.258 0 43.001 14.844 50.417 35.559h8.023c7.416-20.715 27.156-35.559 50.417-35.559 17.003 0 32.104 7.956 41.906 20.316v148.201c.006 25.669 20.802 46.455 46.465 46.461 25.657-.006 46.454-20.792 46.46-46.461 0-6.917-5.606-12.518-12.522-12.518-6.913 0-12.519 5.601-12.519 12.518-.023 11.826-9.598 21.403-21.419 21.419-11.828-.016-21.401-9.593-21.428-21.419V273.791c9.802-12.364 24.905-20.32 41.911-20.32 23.26 0 43.002 14.844 50.418 35.559h8.022c7.417-20.715 27.157-35.559 50.417-35.559 23.259 0 43.002 14.844 50.416 35.559h4.632c.002-116.268-90.877-211.292-205.472-217.953z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-undo.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-undo.svg
new file mode 100644
index 0000000000..ca5152f6da
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-undo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M364.26 182.396c12.688-.081 25.018 1.947 36.66 5.971-9.091-9.87-19.001-18.611-29.596-26.066-34.059-24.212-73.679-34.865-111.596-34.809-44.784.105-88.015 14.132-124.348 39.161l-63.555-63.547-22.383 234.091 234.077-22.416-64.746-64.762c48.284-42.804 99.018-67.423 145.487-67.623zm98.627 228.325v-35.424c0-39.219-5.164-74.258-15.27-105.242a244.473 244.473 0 0 0-2.404-6.924c-2.992-6.385-6.277-12.166-9.794-17.327-18.476-26.829-42.119-38.233-71.159-38.472-28.138-.147-61.527 11.988-95.717 35.262 8.092.806 15.762 2.704 22.793 5.65 14.259 6.177 26.619 15.89 37.494 34.859 10.709 18.94 19.391 48.411 19.406 92.192v35.424h114.651z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-universal.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-universal.svg
new file mode 100644
index 0000000000..49118f2935
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-universal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.176 33.044c-122.418 0-222.014 99.596-222.014 222.017 0 122.417 99.596 222.014 222.014 222.014 122.421 0 222.02-99.597 222.02-222.014-.001-122.421-99.599-222.017-222.02-222.017zm0 25.043c108.787 0 196.982 88.187 196.982 196.974 0 13.479-1.366 26.636-3.941 39.35-12.725 40.065-50.199 69.1-94.465 69.1-54.748 0-99.137-44.377-99.137-99.123 0-54.744-44.379-99.124-99.126-99.124-47.665 0-87.448 33.651-96.942 78.492C64.41 140.232 150.189 58.087 255.176 58.087z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-unlocked.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-unlocked.svg
new file mode 100644
index 0000000000..2254dfc910
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-unlocked.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M457.915 242.222H269.053l-.004-78.416c0-33.277-12.63-63.824-33.538-86.175-20.82-22.357-50.579-36.756-83.391-36.731-32.814-.024-62.57 14.375-83.391 36.731-20.915 22.351-33.541 52.897-33.547 86.175v103.859H96.19v-13.476l-35.656-35.656H96.19v-54.728c0-17.765 6.717-33.406 17.084-44.502 10.463-11.09 23.927-17.37 38.845-17.394 14.916.024 28.375 6.304 38.837 17.394 10.375 11.096 17.092 26.738 17.087 44.502v78.416h-26.189c-9.159 0-16.582 7.426-16.582 16.585v194.53c0 9.158 7.423 16.583 16.582 16.583h276.06c9.164 0 16.587-7.425 16.587-16.583v-194.53c.001-9.159-7.422-16.584-16.586-16.584z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-untitled.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-untitled.svg
new file mode 100644
index 0000000000..4e621d71c1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-untitled.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.305 52.237L91.877 147.163l165.496 95.543 164.426-94.921-165.494-95.548zM75.951 364.608l164.967 95.241V268.743L75.951 173.5v191.108zm195.737-94.629v189.873l164.969-95.244v-189.87l-164.969 95.241z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-usb-connector.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-usb-connector.svg
new file mode 100644
index 0000000000..0d97d4094d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-usb-connector.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M187.154 176.858v139.633c0 15.601 12.656 28.259 28.252 28.259h14.748v118.936H281.3V344.75h14.748c15.615 0 28.287-12.658 28.287-28.259V176.858H187.154zm102.291 61.448h-3.338c-.195 5.163-.784 9.417-2.321 13.309-2.028 5.133-5.772 8.993-10.792 12.325-4.381 2.979-7.129 5.466-8.861 8.486-1.7 2.948-2.746 6.855-2.828 13.229v8.783c5.084 2.139 8.666 7.146 8.666 12.98 0 7.768-6.295 14.08-14.078 14.08-7.767 0-14.062-6.312-14.062-14.08 0-6.083 3.858-11.263 9.271-13.229-.491-2.81-1.26-4.938-2.306-6.718-1.735-3.042-4.48-5.53-8.864-8.486-5.019-3.354-8.729-7.194-10.756-12.331-1.768-4.479-2.324-9.386-2.422-15.626a9.526 9.526 0 0 1-4.725-8.229 9.59 9.59 0 0 1 9.599-9.596c5.28 0 9.58 4.283 9.58 9.596 0 3.486-1.879 6.526-4.676 8.229.1 5.654.655 9.429 1.701 11.997 1.227 2.94 2.975 4.97 7.195 7.863 2.192 1.49 4.25 3.026 6.099 4.727v-55.493h-5.771l10.675-18.348 10.677 18.348h-5.787v40.517c1.896-1.716 3.956-3.271 6.215-4.774 4.184-2.91 5.934-4.938 7.16-7.896.916-2.191 1.455-5.265 1.635-9.663h-3.123v-16.319h16.238v16.319zm19.278-190.098H202.736v100.43h105.987V48.208zm-66.175 76.623h-17.446V98.686h17.446v26.145zm42.841 0h-17.461V98.686h17.461v26.145z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-usb.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-usb.svg
new file mode 100644
index 0000000000..7478d50f9e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-usb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M378.594 108.588h-51.951v52.247h12.021c-.586 19.484-2.632 33.068-6.7 43.055-4.973 12.141-12.647 20.826-28.882 31.934-11.669 7.908-22.107 16.011-30.842 25.602V92.1h18.431l-32.198-55.291L226.278 92.1H244.7v225.768c-8.656-9.415-18.973-17.395-30.481-25.187-16.23-11.107-23.908-19.794-28.882-31.934-4.532-11.117-6.543-26.706-6.831-49.912 10.486-5.126 17.726-15.868 17.726-28.325 0-17.42-14.119-31.541-31.542-31.541-17.417 0-31.542 14.121-31.542 31.541 0 12.494 7.285 23.263 17.823 28.368.313 24.652 2.197 43.483 8.81 60.126 7.242 18.289 20.47 32.06 38.997 44.481 16.771 11.354 27.846 21.156 35.008 33.614 4.676 8.122 8.046 17.935 9.838 31.074-20.537 5.646-35.647 24.395-35.647 46.722 0 26.792 21.719 48.502 48.507 48.502 26.777 0 48.496-21.71 48.496-48.502 0-21.261-13.703-39.279-32.738-45.827v-36.443c.299-24.722 4.374-40.381 11.277-52.387 7.169-12.445 18.232-22.251 35.012-33.609 18.519-12.419 31.749-26.188 38.995-44.479 5.988-15.08 8.095-31.947 8.677-53.315h12.393v-52.247z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-female.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-female.svg
new file mode 100644
index 0000000000..61b554428b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-female.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M438.488 403.4c-19.689-19.678-53.045-28.459-81.495-37.354-37.508-11.723-51.833-39.521-56.115-67.105a238.99 238.99 0 0 0 12.003-14.813c24.59 7.862 54.055 10.161 79.3-8.134-34.762-34.764-6.866-77.386-31.95-154.179-21.352-65.292-108.83-62.08-120.112-39.138-46.402-16.392-81.396 5.549-94.277 74.71-14.814 79.438 13.896 87.825-20.866 122.575 26.684 15.252 51.146 11.523 72.368 3.094 4.187 5.634 8.536 11.052 13.019 16.139-4.32 27.492-18.706 55.161-56.054 66.852-28.48 8.895-61.804 17.676-81.493 37.354C57.286 418.96 67.62 456.1 67.62 456.1h376.034c-.002 0 10.366-37.141-5.166-52.7z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-females-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-females-alt.svg
new file mode 100644
index 0000000000..e4813ece0b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-females-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M257.006 338.165c-28.092-8.783-38.783-29.665-41.941-50.331a174.19 174.19 0 0 0 8.977-11.121c18.379 5.889 40.386 7.605 59.255-6.047-25.966-25.999-5.115-57.816-23.872-115.227-15.94-48.808-81.327-46.384-89.767-29.214-34.63-12.265-60.81 4.118-70.439 55.819-11.053 59.354 10.383 65.603-15.597 91.579 19.945 11.396 38.21 8.587 54.088 2.308a183.876 183.876 0 0 0 9.744 12.1c-3.188 20.601-13.897 41.366-41.923 50.134-21.255 6.637-46.173 13.207-60.873 27.926-11.611 11.606-3.876 39.369-3.876 39.369h280.974s7.75-27.763-3.877-39.369c-14.7-14.719-39.618-21.289-60.873-27.926zm103.338-13.019c-19.427-6.085-26.817-20.502-28.975-34.793 2.109-2.424 4.2-5.006 6.197-7.688 12.703 4.072 27.928 5.265 40.957-4.184-17.953-17.954-3.53-39.961-16.514-79.628-11.004-33.719-56.181-32.049-62.018-20.211-10.254-3.626-19.377-3.595-27.028.346 2.682 15.647 2.908 29.119 3.106 40.694.293 20.274.524 33.683 12.509 45.688l6.213 6.211-7.113 5.132a61.41 61.41 0 0 1-9.598 5.692c2.108 2.811 4.3 5.524 6.556 8.076-2.205 14.259-9.614 28.616-28.972 34.665-2.027.622-4.086 1.263-6.149 1.896a64.421 64.421 0 0 0 9.714 3.991c2.059.619 4.119 1.272 6.227 1.912 20.229 6.196 43.12 13.261 57.721 27.847 3.074 3.074 5.117 6.835 6.459 10.858h75.474s5.364-19.165-2.681-27.207c-10.17-10.172-27.388-14.703-42.085-19.297zm112.559-.914c-6.999-7.034-18.871-10.14-29.008-13.309-13.391-4.188-18.476-14.147-19.979-23.971 1.453-1.699 2.908-3.47 4.284-5.319 8.729 2.801 19.259 3.62 28.22-2.877-12.359-12.374-2.42-27.552-11.378-54.902-7.591-23.268-38.737-22.122-42.743-13.947-11.888-4.188-21.648-1.292-27.924 9.775 1.172 8.893 1.338 16.692 1.437 23.528.242 15.092.687 22.665 7.978 29.975l6.232 6.21-2.83 2.029a89.923 89.923 0 0 0 4.479 5.591c-1.505 9.829-6.605 19.72-19.947 23.908-4.757 1.484-9.878 2.975-14.716 4.838 1.734.849 3.563 1.637 5.576 2.238 1.406.459 2.828.883 4.283 1.343 14.227 4.367 30.348 9.304 40.861 19.799 1.143 1.177 2.091 2.485 2.911 3.843h64.11s3.714-13.228-1.846-18.752z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-females.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-females.svg
new file mode 100644
index 0000000000..b4f9776fa5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-females.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M338.739 338.203c-28.189-8.81-38.981-29.701-42.15-50.45a192.926 192.926 0 0 0 8.991-11.134c18.477 5.912 40.648 7.639 59.615-6.115-26.127-26.137-5.135-58.186-24.004-115.935-16.054-49.087-81.852-46.67-90.32-29.41-34.859-12.352-61.186 4.172-70.898 56.17-11.117 59.717 10.466 66.029-15.665 92.159 20.047 11.461 38.456 8.652 54.418 2.33a174.51 174.51 0 0 0 9.775 12.124c-3.268 20.677-14.061 41.483-42.151 50.261-21.388 6.695-46.436 13.295-61.25 28.096-11.706 11.699-3.924 39.622-3.924 39.622h282.738s7.749-27.923-3.927-39.622c-14.778-14.801-39.861-21.401-61.248-28.096zm131.822 11.865c-11.674-11.691-31.492-16.898-48.398-22.19-22.235-6.948-30.739-23.454-33.291-39.856a149.53 149.53 0 0 0 7.098-8.776c14.584 4.673 32.111 6.031 47.09-4.843-20.637-20.634-4.055-45.918-18.969-91.531-12.687-38.773-64.617-36.874-71.321-23.242a34.523 34.523 0 0 0-2.484-.809c6.996 24.33 7.325 44.175 7.586 60.385.327 20.422.524 33.907 12.624 46.003l6.21 6.195-7.094 5.143c-10.071 7.292-21.681 11.238-34.566 11.834-1.733 11.006-6.213 22.044-15.794 30.17 5.754 5.608 12.98 9.777 21.746 12.518 2.06.643 4.152 1.281 6.278 1.938 20.309 6.252 43.331 13.335 58.014 28 5.429 5.404 7.686 12.906 8.403 20.349h59.974c-.002-.002 6.114-22.051-3.106-31.288zm-292.713-17.062c2.093-.656 4.186-1.295 6.279-1.938 5.855-1.838 11.053-4.341 15.564-7.49-14.848-8.23-21.123-21.91-23.25-35.557.358-.359.687-.766 1.012-1.168-5.756-1.462-11.38-3.732-16.874-6.864l-8.502-4.862 6.932-6.92c12.493-12.517 12.067-18.15 10.892-33.207-.913-12.031-2.224-28.5 2.746-55.038 1.931-10.474 4.513-19.347 7.523-26.881-17.528-5.15-36.006-1.194-39.8 6.549-27.535-9.738-48.331 3.301-55.985 44.359-8.797 47.172 8.273 52.142-12.394 72.785 15.86 9.057 30.38 6.833 42.969 1.832a150.151 150.151 0 0 0 7.72 9.59c-2.553 16.324-11.086 32.734-33.258 39.683-16.907 5.292-36.693 10.499-48.366 22.19-9.254 9.236-3.106 31.286-3.106 31.286h73.447c.72-7.442 3.009-14.944 8.405-20.349 14.648-14.665 37.705-21.748 58.046-28z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-glasses.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-glasses.svg
new file mode 100644
index 0000000000..3816df4ce6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-glasses.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M178.432 161.715a817.81 817.81 0 0 1 9.405-.53 795.75 795.75 0 0 1 9.498-.435c.949-.04 1.895-.098 2.84-.159 2.191-.135 4.479-.275 6.834-.191.574.02 1.154.027 1.734.027l3.757-.027h.008c.932 0 1.85.013 2.766.056 2.615.121 5.396.398 8.752.874 4.492.636 8.928 1.472 13.219 2.282 1.551.292 2.982.564 4.416.824l1.219.226c3.82.709 7.766 1.441 11.383 1.441l.693-.008c4.002-.105 8.352-.929 12.559-1.728l4.178-.788c4.953-.935 10.031-1.894 15.18-2.532 5.1-.634 9.945-.686 15.303-.686l1.932.001c2.023 0 3.947.134 5.802.264 1.056.073 2.1.148 3.146.192 2.754.113 5.514.243 8.271.387 2.816.144 5.633.3 8.441.476.543-10.772 2.342-26.122 2.442-30.262.324-14.369-.021-15.532-3.5-29.527 0 0-4.223-12.683-10.842-16.501l-13.195-2.271-8.152-7.557c-32.857-20.215-68.08-6.035-86.947 1.61-25.94 8.42-42.758 33.062-33.818 84.708l2.676-.166zm282.559 222.227c-6.834-19.818-29.468-22.661-48.374-30.635-20.761-8.756-43.783-18.92-64.498-27.416-5.912-1.61-11.826-3.223-17.737-4.837-7.058-4.857-13.967-20.997-17.74-29.021-3.762-.537-7.52-1.076-11.291-1.609.584-12.418 8.27-13.084 11.291-22.573 2.658-8.367.277-19.241 4.494-26.987 2.927-5.38 9.546-5.416 12.854-10.027 3.002-4.186 4.976-11.484 5.91-16.608 1.692-9.293 3.164-21.98-1.158-31.252h-4.529c-.244.402-.68 1.444-1.377 4.118l-.256.964c-1.543 11.029-6.34 20.264-13.512 26.014-6.084 4.872-13.924 7.447-22.67 7.447-1.912 0-3.851-.128-5.761-.383-6.237-.827-12.092-3.042-16.934-6.407-2.272-1.58-4.472-3.197-6.459-5.595-1.619-1.953-3.018-4.182-4.398-7.009-.816-1.668-1.504-3.354-2.114-4.841l-2.171-5.544a15.472 15.472 0 0 0-.416-.993c-.07.183-.145.409-.211.688l-2.577 7.612c-1.64 3.955-3.567 7.966-6.944 11.481-4.112 4.288-9.559 7.51-15.752 9.32a42.488 42.488 0 0 1-11.932 1.703c-6.848 0-13.316-1.658-18.709-4.792-7.98-4.642-13.62-12.627-16.299-23.094-.375-1.458-.783-2.908-1.19-4.362l-.992-3.617c-.41-1.545-.758-2.863-1.274-3.613l-.016-.022-3.521-.033c-1.324 2.434-2.574 4.54-2.367 6.823 1.054 11.59 1.277 39.454 12.229 46.317 1.018.637 8.787 2.585 8.738 2.053 1.076 11.285 2.15 22.58 3.22 33.863 2.734 7.501 9.297 8.325 11.204 18.92l-8.395 2.04c-3.774 8.024-10.684 24.164-17.741 29.021a25694.65 25694.65 0 0 1-17.738 4.837c-20.711 8.496-43.736 18.66-64.497 27.416-18.906 7.974-41.539 10.817-48.375 30.635 0 13.458-1.268 45.249-.92 62.883h411.822c.35-17.636-.917-49.427-.917-62.885zm-267.68-192.015c3.068 10.883 10.52 17.841 23.498 17.841 12.982 0 23.502-7.987 23.502-17.841 0-9.852 3.17-17.089-23.502-18.992-12.18-.868-30.297-5.105-23.498 18.992zm98.85-18.991c-26.672 1.903-23.502 9.14-23.502 18.992 0 9.854 10.523 17.841 23.502 17.841 12.977 0 20.432-6.958 23.5-17.841 6.798-24.098-11.323-19.861-23.5-18.992z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user.svg
new file mode 100644
index 0000000000..9f46a9853d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M331.135 98.375c3.677 14.798 4.045 16.031 3.702 31.225-.138 5.855-3.5 32.936-2.586 41.242.751 6.851 2.46 7.395 5.162 13.041 4.705 9.824 3.13 23.376 1.325 33.282-.988 5.42-3.076 13.136-6.248 17.561-3.497 4.876-10.498 4.913-13.592 10.602-4.459 8.195-1.941 19.692-4.752 28.54-3.193 10.033-11.325 10.738-11.938 23.867 3.986.562 7.962 1.134 11.938 1.703 3.99 8.484 11.297 25.552 18.759 30.688 6.25 1.705 12.505 3.411 18.752 5.113 21.907 8.982 46.251 19.732 68.204 28.987 19.991 8.434 43.927 11.439 51.151 32.396 0 14.229 1.343 47.849.976 66.497H36.514c-.367-18.648.974-52.268.974-66.497 7.226-20.957 31.16-23.963 51.151-32.396 21.953-9.255 46.297-20.005 68.201-28.987 6.25-1.702 12.506-3.408 18.754-5.113 7.461-5.136 14.77-22.203 18.76-30.688l8.877-2.158c-2.017-11.206-8.954-12.078-11.845-20.01a91882.59 91882.59 0 0 0-3.408-35.806c.055.563-8.163-1.497-9.238-2.171-11.58-7.256-11.816-36.723-12.931-48.978-.508-5.603 7.283-10.193 5.118-20.465-12.69-60.138 5.486-88.282 34.229-97.614 19.95-8.083 57.198-23.074 91.941-1.703l8.621 7.991 13.952 2.405c7 4.041 11.465 17.446 11.465 17.446z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-users-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-users-alt.svg
new file mode 100644
index 0000000000..6d87232e4d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-users-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M306.818 335.551c-15.453-6.512-32.588-14.08-48.007-20.406-4.398-1.196-8.8-2.396-13.202-3.6-5.251-3.611-10.395-15.626-13.204-21.602l-8.402-1.193c.434-9.242 6.158-9.739 8.402-16.8 1.981-6.229.208-14.323 3.348-20.089 2.179-4.002 7.103-4.029 9.565-7.461 2.232-3.117 3.701-8.549 4.398-12.361 1.269-6.971 2.376-16.512-.935-23.43-1.903-3.97-3.104-4.353-3.632-9.176-.641-5.845 1.723-24.907 1.821-29.031.241-10.694-.017-20.369-2.606-30.789 0 0-3.145-9.436-8.07-12.281l-9.817-1.687-6.071-5.626c-24.454-15.049-50.673-4.493-64.712 1.197-20.235 6.568-33.03 35.189-24.098 77.518 1.525 7.227-3.959 10.463-3.6 14.407.785 8.628.947 29.365 9.103 34.472.756.479 6.538 1.925 6.504 1.528l2.395 25.204c2.038 5.586 6.919 6.197 8.338 14.083l-6.247 1.515c-2.811 5.976-7.953 17.99-13.208 21.602-4.397 1.203-8.8 2.403-13.198 3.6-15.418 6.326-32.555 13.895-48.005 20.406-14.069 5.94-30.916 8.053-36.006 22.802 0 10.021-.94 33.677-.687 46.804h306.521c.256-13.127-.686-36.783-.686-46.804-5.085-14.749-21.933-16.862-36.002-22.802zm86.719-1.363c-11.013-4.641-23.227-10.036-34.215-14.543-3.136-.85-6.275-1.708-9.41-2.564-3.744-2.576-7.408-11.139-9.41-15.396-1.996-.286-3.991-.572-5.989-.856.308-6.592 4.384-6.941 5.989-11.974 1.41-4.442.146-10.204 2.383-14.316 1.554-2.856 5.063-2.873 6.816-5.319 1.593-2.221 2.645-6.098 3.141-8.813.904-4.966 1.69-11.771-.668-16.697-1.356-2.833-2.212-3.106-2.589-6.54-.46-4.168 1.228-17.756 1.296-20.695.172-7.625-.009-14.521-1.855-21.944 0 0-2.24-6.729-5.754-8.754l-6.999-1.2-4.328-4.011c-17.429-10.729-36.12-3.208-46.122.849-14.424 4.684-23.545 25.086-17.178 55.255 1.088 5.151-2.823 7.456-2.562 10.265.557 6.154.671 20.936 6.484 24.576.536.34 4.66 1.373 4.636 1.088.567 5.984 1.14 11.979 1.708 17.965 1.451 3.979 4.932 4.418 5.939 10.038l-4.449 1.086c-1.428 3.032-3.702 8.226-6.245 11.904a3482.803 3482.803 0 0 1 16.646 7.12c6.428 2.764 12.804 5.506 18.918 8.08 2.908 1.232 5.965 2.289 9.198 3.41 12.079 4.186 25.772 8.925 30.888 23.758l.4 1.163v1.232c0 3.856.15 10.017.307 16.532.07 2.904.143 5.915.207 8.92h68.973c.186-9.353-.486-26.225-.486-33.363-3.629-10.512-15.638-12.023-25.67-16.256zm79.609 6.764c-2.528-7.335-10.91-8.388-17.911-11.343-7.685-3.24-16.209-7-23.882-10.151-2.184-.592-4.372-1.192-6.562-1.788-2.612-1.799-5.169-7.773-6.567-10.742-1.394-.202-2.787-.4-4.18-.602.215-4.594 3.059-4.844 4.18-8.354.982-3.1.102-7.124 1.665-9.988 1.083-1.996 3.53-2.01 4.757-3.72 1.111-1.548 1.846-4.247 2.189-6.146.631-3.472 1.181-8.216-.468-11.653-.944-1.977-1.542-2.168-1.805-4.564-.323-2.906.858-12.392.905-14.439.121-5.322-.008-10.135-1.297-15.321 0 0-1.564-4.689-4.014-6.101l-4.883-.842-3.021-2.799c-12.168-7.486-25.207-2.239-32.189.594-10.064 3.27-16.431 17.503-11.984 38.559.756 3.6-1.971 5.205-1.79 7.169.386 4.29.47 14.606 4.523 17.147.378.237 3.254.956 3.235.76.396 4.176.799 8.359 1.196 12.536 1.009 2.778 3.438 3.081 4.143 7.003l-3.106.762c-1.184 2.516-3.201 7.16-5.379 9.624 3.961 1.681 7.971 3.401 11.914 5.097 4.597 1.971 9.155 3.935 13.53 5.778 2.011.847 4.155 1.593 6.425 2.378 8.617 2.984 19.345 6.697 23.326 18.243l.4 1.165v1.229c0 2.719.104 7.074.215 11.688.019.691.035 1.4.053 2.105h46.723c.13-6.529-.341-18.298-.341-23.284z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-users.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-users.svg
new file mode 100644
index 0000000000..65f0703bcc
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-users.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M310.761 137.421c2.649 10.664 2.913 20.567 2.669 31.515-.099 4.223-2.521 23.736-1.865 29.717.541 4.936 1.774 5.328 3.72 9.395 3.39 7.08 2.255 16.842.956 23.979-.712 3.906-2.216 9.468-4.502 12.653-2.521 3.518-7.562 3.541-9.793 7.641-3.213 5.899-1.398 14.186-3.424 20.56-2.302 7.23-8.16 7.737-8.604 17.195 2.875.412 5.738.819 8.604 1.23 2.875 6.112 8.139 18.406 13.515 22.107 4.504 1.231 9.008 2.46 13.514 3.686 15.781 6.475 33.32 14.22 49.139 20.889 14.403 6.074 31.645 8.24 36.853 23.339 0 10.253.968 34.471.701 47.907H98.489c-.262-13.437.702-37.654.702-47.907 5.209-15.099 22.451-17.265 36.854-23.339 15.818-6.669 33.357-14.414 49.137-20.889a9943.03 9943.03 0 0 0 13.514-3.686c5.379-3.701 10.644-15.995 13.519-22.107l6.396-1.557c-1.451-8.072-6.451-8.697-8.536-14.415-.815-8.597-1.636-17.201-2.452-25.802.035.408-5.882-1.072-6.657-1.558-8.345-5.233-8.515-26.461-9.317-35.289-.366-4.038 5.244-7.349 3.686-14.745-9.142-43.33 3.954-72.625 24.665-79.349 14.371-5.826 41.207-16.63 66.239-1.228l6.216 5.76 10.05 1.729c5.037 2.909 8.256 12.569 8.256 12.569zM179.18 213.988c-.494-5.428 1.757-9.537 3.102-11.999.258-.477.599-1.097.766-1.472a157.541 157.541 0 0 1-2.49-15.715l-6.959-1.193-4.427-4.104c-17.843-10.977-36.974-3.276-47.214.87-14.765 4.797-24.1 25.678-17.58 56.56 1.108 5.274-2.892 7.633-2.628 10.513.571 6.292.688 21.426 6.64 25.153.551.346 4.77 1.404 4.746 1.116l1.747 18.385c1.485 4.076 5.052 4.521 6.082 10.272l-4.56 1.114c-2.048 4.357-5.799 13.122-9.631 15.76-3.209.874-6.424 1.751-9.631 2.627-11.249 4.611-23.751 10.134-35.028 14.888-10.264 4.329-22.555 5.875-26.268 16.633 0 7.308-.69 24.576-.498 34.15H86.15c.065-3.128.138-6.257.213-9.276.158-6.631.309-12.892.309-16.776v-2.097l.686-1.984c6.035-17.492 21.939-23.002 34.72-27.426 3.229-1.116 6.278-2.172 9.104-3.367 6.203-2.612 12.673-5.396 19.196-8.201 9.602-4.128 19.502-8.377 28.808-12.213-.465-1.008-.893-1.936-1.26-2.717l-6.131-.876c.316-6.743 4.492-7.106 6.131-12.258 1.445-4.548.15-10.449 2.442-14.653 1.588-2.922 5.183-2.943 6.978-5.445 1.627-2.273 2.704-6.24 3.21-9.021.272-1.495.526-3.158.697-4.877-9.748-8.984-10.966-26.442-11.777-38.37-.103-1.506-.195-2.86-.296-4.001zm295.474 139.408c-3.71-10.758-16.003-12.304-26.271-16.633-11.273-4.754-23.774-10.276-35.024-14.888-3.209-.876-6.422-1.753-9.631-2.627-3.834-2.638-7.582-11.402-9.636-15.76l-6.129-.876c.316-6.743 4.489-7.106 6.129-12.258 1.445-4.548.152-10.449 2.443-14.653 1.587-2.922 5.183-2.943 6.979-5.445 1.63-2.273 2.704-6.24 3.211-9.021.927-5.086 1.733-12.047-.684-17.093-1.386-2.898-2.264-3.177-2.649-6.691-.471-4.267 1.256-18.175 1.328-21.185.176-7.804-.014-14.862-1.9-22.463 0 0-2.296-6.887-5.888-8.963l-7.166-1.23-4.429-4.104c-17.843-10.977-36.974-3.276-47.214.87-5.7 1.85-10.574 6.125-14.056 12.418-.113 2.086-.152 3.793-.061 4.668.049.457.099.726.124.858.12.228.26.451.402.694.521.893 1.238 2.113 2.042 3.799 5.022 10.492 3.538 23.072 1.981 31.629-.77 4.221-2.655 12.138-6.646 17.706a19.816 19.816 0 0 1-3.354 3.603c.634 6.669 1.994 14.343 5.998 16.851.553.346 4.771 1.404 4.747 1.116l1.749 18.385c1.483 4.076 5.049 4.521 6.082 10.272l-4.56 1.114c-.357.76-.769 1.659-1.224 2.633 9.354 3.854 19.317 8.128 28.973 12.283a2926.156 2926.156 0 0 0 19.229 8.215c2.824 1.195 5.875 2.251 9.104 3.367 12.781 4.424 28.688 9.934 34.72 27.426l.686 1.984v2.097c0 3.885.151 10.146.312 16.776.07 3.02.146 6.148.214 9.276h50.566c.193-9.574-.497-26.843-.497-34.15z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-utilities.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-utilities.svg
new file mode 100644
index 0000000000..5181d06074
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-utilities.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M305.692 268.619v58.607h-99.905v-58.607H37.408v173.058h436.666V268.619H305.692zm-99.905-65.598h99.905v39.939h168.356v-78.883c0-11.743-9.525-21.27-21.273-21.27h-78.438V115.44c-.01-24.944-20.207-45.143-45.151-45.154H182.01c-24.938.012-45.139 20.21-45.152 45.154v27.368H58.404c-11.747 0-21.273 9.526-21.273 21.27v78.883h168.656v-39.94zm-38.149-87.581c.014-7.931 6.44-14.36 14.373-14.374h147.175c7.937.014 14.358 6.443 14.378 14.374v27.368H167.638V115.44zm112.878 186.685v-74.13h-49.829v74.13h49.829z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-vcard.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-vcard.svg
new file mode 100644
index 0000000000..485275849a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-vcard.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M36.742 120.063v272.518h93.897v-32.553h-27.543V334.99h70.108v25.038h-27.541v32.553h219.089v-32.553h-27.543V334.99h70.109v25.038h-27.543v32.553h95.192V120.063H36.742zm209.075 70.952h186.539v25.038H245.817v-25.038zm-49.985 81.036c-2.703-3.315-7.695-4.218-12.017-6.044-5.773-2.436-12.173-5.253-17.932-7.616-1.643-.449-3.285-.895-4.929-1.342-1.963-1.352-3.878-5.84-4.93-8.071-1.045-.148-2.086-.3-3.135-.443.161-3.449 2.295-3.642 3.135-6.278.742-2.326.078-5.345 1.251-7.496.814-1.496 2.65-1.506 3.567-2.789.834-1.162 1.389-3.193 1.644-4.614.479-2.605.891-6.17-.346-8.748-.714-1.483-1.158-1.629-1.356-3.427-.24-2.182.643-9.301.68-10.839.088-3.991-.004-7.612-.97-11.499 0 0-1.175-3.52-3.016-4.586l-3.668-.631-2.264-2.096c-9.135-5.622-18.921-1.683-24.165.444-7.559 2.45-12.334 13.137-8.997 28.942.567 2.7-1.481 3.91-1.344 5.382.291 3.218.354 10.962 3.396 12.873.285.175 2.443.72 2.43.57l.894 9.409c.765 2.088 2.586 2.312 3.112 5.258l-2.333.567c-1.045 2.231-2.967 6.72-4.927 8.071-1.646.447-3.29.893-4.931 1.342-5.757 2.363-12.158 5.181-17.922 7.616-3.906 1.643-8.364 2.515-11.189 5.099V168.482h110.261v103.569zm236.526-8.418H245.816v-25.044h186.542v25.044z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-video.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-video.svg
new file mode 100644
index 0000000000..48cb996cae
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-video.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M344.551 204.658v101.827l124.494 80.393v-262.61l-124.494 80.39zm-45.487-64.712H60.246c-11.292 0-20.447 9.156-20.447 20.447v190.358c0 11.293 9.155 20.447 20.447 20.447h238.818c11.293 0 20.449-9.154 20.449-20.447V160.394c.001-11.292-9.156-20.448-20.449-20.448z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-voice.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-voice.svg
new file mode 100644
index 0000000000..786dc7572c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-voice.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.529 321.226c38.885 0 70.41-31.521 70.41-70.41V117.083c0-38.886-31.525-70.41-70.41-70.41-38.888 0-70.409 31.524-70.409 70.41v133.733c.001 38.888 31.522 70.41 70.409 70.41zm95.801-117.199v46.968c-.012 26.512-10.698 50.349-28.057 67.743-17.395 17.363-41.233 28.051-67.744 28.061-26.512-.01-50.354-10.697-67.745-28.061-17.366-17.395-28.049-41.231-28.058-67.743v-46.968h-35.054l-.004 46.968c.014 66.331 49.349 121.077 113.332 129.651v48.715h-57.424v35.057h149.899v-35.057h-57.419v-48.715c63.977-8.574 113.318-63.32 113.33-129.651v-46.968H350.33z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wall-plug.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wall-plug.svg
new file mode 100644
index 0000000000..d7d6d12e26
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wall-plug.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M401.938 153.472H346.18V74.12c0-14.128-11.445-25.572-25.539-25.572-14.128 0-25.59 11.444-25.59 25.572v79.352h-88.393V74.12c0-14.128-11.428-25.572-25.571-25.572-14.112 0-25.557 11.444-25.557 25.572v79.352h-46.403v50.768l66.122 120.439h160.565l66.124-120.439v-50.768zM187.594 406.096h42.364v57.001h51.147v-57.001h42.38v-51.14H187.594v51.14z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wallet.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wallet.svg
new file mode 100644
index 0000000000..36506ede4a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wallet.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M445.271 140.871c0-28.207-22.925-51.165-51.113-51.165H65.932v39.277h3.463c6.182 0 11.218 5 11.218 11.2 0 6.18-5.036 11.201-11.218 11.201h-3.463v211.153h3.463c6.182 0 11.218 5.006 11.218 11.201 0 6.164-5.036 11.201-11.218 11.201h-3.463v37.247h328.225c28.188 0 51.113-22.94 51.113-51.132v-60.549h-74.003c-16.221 0-29.432-13.174-29.432-29.446v-50.212c0-16.27 13.211-29.446 29.432-29.446h74.003v-60.53zm-82.05 221.666h19.752v-20.553c0-6.181 5.004-11.183 11.185-11.183 6.182 0 11.187 5.002 11.187 11.183v29.25c0 .654-.035 1.179-.165 1.605-.817 6.803-6.508 12.1-13.474 12.1h-28.484c-6.179 0-11.183-5.037-11.183-11.201-.001-6.195 5.003-11.201 11.182-11.201zm-230.022 22.402h-22.402c-6.182 0-11.183-5.037-11.183-11.201 0-6.195 5.001-11.201 11.183-11.201h22.402c6.181 0 11.215 5.006 11.215 11.201 0 6.164-5.034 11.201-11.215 11.201zm0-233.555h-22.402c-6.182 0-11.183-5.021-11.183-11.201 0-6.199 5.001-11.2 11.183-11.2h22.402c6.181 0 11.215 5 11.215 11.2 0 6.179-5.034 11.201-11.215 11.201zm63.114 233.555H173.91c-6.146 0-11.182-5.037-11.182-11.201 0-6.195 5.035-11.201 11.182-11.201h22.403c6.178 0 11.183 5.006 11.183 11.201 0 6.164-5.004 11.201-11.183 11.201zm0-233.555H173.91c-6.146 0-11.182-5.021-11.182-11.201 0-6.199 5.035-11.2 11.182-11.2h22.403c6.178 0 11.183 5 11.183 11.2 0 6.179-5.004 11.201-11.183 11.201zm63.081 233.555h-22.37c-6.177 0-11.216-5.037-11.216-11.201 0-6.195 5.039-11.201 11.216-11.201h22.37c6.213 0 11.216 5.006 11.216 11.201-.001 6.164-5.004 11.201-11.216 11.201zm0-233.555h-22.37c-6.177 0-11.216-5.021-11.216-11.201 0-6.199 5.039-11.2 11.216-11.2h22.37c6.213 0 11.216 5 11.216 11.2-.001 6.179-5.004 11.201-11.216 11.201zm63.114 233.555h-22.399c-6.183 0-11.185-5.037-11.185-11.201 0-6.195 5.002-11.201 11.185-11.201h22.399c6.18 0 11.217 5.006 11.217 11.201 0 6.164-5.037 11.201-11.217 11.201zm0-233.555h-22.399c-6.183 0-11.185-5.021-11.185-11.201 0-6.199 5.002-11.2 11.185-11.2h22.399c6.18 0 11.217 5 11.217 11.2 0 6.179-5.037 11.201-11.217 11.201zm82.836 20.533c0 6.185-5.005 11.216-11.187 11.216-6.181 0-11.185-5.032-11.185-11.216v-20.533H363.22c-6.179 0-11.183-5.021-11.183-11.201 0-6.199 5.004-11.2 11.183-11.2h28.484c6.966 0 12.656 5.281 13.474 12.065.13.445.165.967.165 1.602v29.267zm-36.663 84.027c0 14.062 11.417 25.459 25.509 25.459 14.029 0 25.444-11.397 25.444-25.459 0-14.042-11.415-25.455-25.444-25.455-14.092 0-25.509 11.412-25.509 25.455z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wand.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wand.svg
new file mode 100644
index 0000000000..beeffe5d4e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wand.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M306.997 124.391c8.992 0 16.277-7.286 16.277-16.276V57.184c.002-8.989-7.285-16.276-16.277-16.276-8.983 0-16.271 7.287-16.273 16.276v50.932c0 8.989 7.29 16.278 16.273 16.275zm80.752 23.244l36.015-36.017c6.356-6.357 6.353-16.662 0-23.015-6.357-6.356-16.662-6.356-23.019 0l-36.013 36.014c-6.356 6.356-6.358 16.661 0 23.018 6.354 6.356 16.661 6.353 23.017 0zm-161.066 2.552c6.354 6.353 16.663 6.353 23.018 0 6.353-6.356 6.353-16.662 0-23.018l-36.018-36.018c-6.355-6.353-16.661-6.353-23.015 0-6.359 6.356-6.359 16.662 0 23.018l36.015 36.018zm159.5 113.463c-6.356-6.357-16.663-6.357-23.02 0-6.354 6.355-6.354 16.661 0 23.018l36.015 36.014c6.356 6.356 16.663 6.356 23.018 0 6.358-6.356 6.358-16.658 0-23.015l-36.013-36.017zm-70.019-131.061L37.625 411.125l58.761 58.76 278.541-278.533-58.763-58.763zm-65.195 99.172l67.606-67.608 24.787 24.788-67.606 67.608-24.787-24.788zm205.2-41.684h-50.934c-8.99 0-16.275 7.289-16.275 16.275-.004 8.985 7.285 16.275 16.275 16.275h50.934c8.988 0 16.273-7.29 16.273-16.275 0-8.99-7.285-16.275-16.273-16.275z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-war.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-war.svg
new file mode 100644
index 0000000000..ae01d407d2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-war.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M453.475 328.994H57.719c-14.093 0-20.271 10.201-13.734 22.697l29.463 56.295c6.576 12.474 23.449 22.694 37.575 22.694h289.15c14.093 0 31-10.221 37.538-22.694l29.5-56.295c6.539-12.496.359-22.697-13.736-22.697zm-334.146 76.39c-14.095 0-25.539-11.445-25.539-25.539 0-14.112 11.444-25.539 25.539-25.539 14.129 0 25.54 11.427 25.54 25.539 0 14.093-11.411 25.539-25.54 25.539zm92.056 0c-14.094 0-25.509-11.445-25.509-25.539 0-14.112 11.415-25.539 25.509-25.539 14.127 0 25.539 11.427 25.539 25.539 0 14.093-11.412 25.539-25.539 25.539zm92.088-1.109c-13.506 0-24.428-10.959-24.428-24.431 0-13.504 10.922-24.44 24.428-24.44 13.505 0 24.43 10.937 24.43 24.44-.001 13.472-10.925 24.431-24.43 24.431zm92.056 0c-13.474 0-24.432-10.959-24.432-24.431 0-13.504 10.958-24.44 24.432-24.44 13.504 0 24.46 10.937 24.46 24.44 0 13.472-10.956 24.431-24.46 24.431zM117.826 164.26l60.367 35.057c0 .26-.032.523-.032.802v42.625h-49.447l-32.831 56.755h326.428l-32.865-56.755h-48.398v-42.625c0-13.523-10.987-24.476-24.495-24.476H202.656c-.493 0-.919.031-1.375.046l-67.367-39.11 7.719-13.277-71.487-41.499-31.591 54.352 71.487 41.5 7.784-13.395z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-weight.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-weight.svg
new file mode 100644
index 0000000000..cd5f49fbb8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-weight.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M418.059 410.875l-38.232-206.578a15.354 15.354 0 0 0-15.094-12.557h-60.451c10.457-11.557 16.834-26.867 16.834-43.645 0-35.902-29.209-65.115-65.117-65.115-35.902 0-65.115 29.213-65.115 65.115 0 16.777 6.381 32.088 16.838 43.645h-60.457a15.352 15.352 0 0 0-15.092 12.557l-38.23 206.578a15.345 15.345 0 0 0 3.293 12.611 15.344 15.344 0 0 0 11.799 5.533h293.932a15.348 15.348 0 0 0 15.092-18.144zM255.998 111.842c20.025 0 36.258 16.232 36.258 36.254 0 20.027-16.232 36.26-36.258 36.26-20.023 0-36.254-16.232-36.254-36.26 0-20.022 16.231-36.254 36.254-36.254zm-32.58 263.57l-31.246-44.273-7.84 7.947v36.326h-26.199V266.254h26.199v39.406l36.953-39.406h34.926l-45.449 45.553 46.609 63.605h-33.953zm135.893 0h-18.82l-1.715-10.172c-3.086 3.236-5.92 5.621-8.594 7.234-6.1 3.732-13.664 5.627-22.473 5.627-14.461 0-26.492-5.092-35.746-15.135-9.574-10.008-14.439-23.846-14.439-41.109 0-17.428 4.902-31.637 14.574-42.23 9.725-10.66 22.732-16.064 38.656-16.064 13.779 0 25.051 3.582 33.504 10.646 8.494 7.102 13.434 16.092 14.682 26.723l.311 2.645h-26.008l-.426-1.832c-1.488-6.422-5.008-10.779-10.764-13.316-3.26-1.416-6.971-2.139-11.014-2.139-7.752 0-13.939 2.842-18.92 8.682-5.008 5.869-7.547 14.977-7.547 27.061 0 12.068 2.693 20.637 8.01 25.473 5.457 4.961 11.469 7.373 18.385 7.373 6.777 0 12.148-1.863 16.41-5.693 3.656-3.285 6.068-7.354 7.328-12.381h-23.629v-22.164h48.234v60.771z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-width.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-width.svg
new file mode 100644
index 0000000000..77864d37b5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-width.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M322.193 230.358H192.709v-47.99l-89.144 73.576 89.144 73.565V281.52h129.484v47.989l89.143-73.565-89.143-73.576v47.99zM37.735 351.078h51.147V160.816H37.735v190.262zm384.964-190.262v190.262h51.146V160.816h-51.146z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wifi.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wifi.svg
new file mode 100644
index 0000000000..0118ed13b1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wifi.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M162.073 334.729l29.878 29.873c16.092-17.093 38.877-27.82 64.209-27.82 25.336 0 48.119 10.728 64.221 27.82l29.873-29.873c-23.778-24.761-57.131-40.255-94.094-40.255-36.957 0-70.303 15.494-94.087 40.255zm94.087 48.055c-12.612 0-23.822 5.661-31.58 14.446l31.586 31.586 31.584-31.586c-7.764-8.785-18.973-14.446-31.59-14.446zm220.051-177.742c-121.531-121.532-318.568-121.524-440.1 0-.625.625-1.195 1.283-1.812 1.906l30.662 30.663c48.605-49.566 116.294-80.354 191.205-80.354 74.906 0 142.592 30.787 191.203 80.354l30.66-30.663c-.621-.623-1.191-1.281-1.818-1.906zm-220.045-1.785c-59.254 0-114.965 23.073-156.863 64.971-.622.623-1.197 1.279-1.818 1.909l31.976 31.973c32.094-33.061 76.987-53.637 126.7-53.637 49.72 0 94.608 20.576 126.711 53.637l31.967-31.969c-.617-.634-1.195-1.29-1.819-1.913-41.899-41.898-97.603-64.971-156.854-64.971z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-window-popin.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-window-popin.svg
new file mode 100644
index 0000000000..aec2173f09
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-window-popin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M366.118 238.292l96.957-96.959-44.246-44.249-96.962 96.958-39.571-39.575v124.138h124.135zm60.672 140.334H85.21V133.372h181.197V97.084H48.925v317.832h414.15V304.363H426.79z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-window-sizes.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-window-sizes.svg
new file mode 100644
index 0000000000..26af884833
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-window-sizes.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M49.525 292.792h169.383v113.943H49.525zm0-97.951v74.273h29.106V223.95H335.41v153.682h-92.824v29.103h121.93V194.841H78.631zm0-89.576v61.855h29.106v-32.748h354.738v243.26h-41.131v29.103h70.239v-301.47z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-windows.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-windows.svg
new file mode 100644
index 0000000000..3e00719e9e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-windows.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M229.882 259.469c-18.919-11.596-37.02-21.375-59.731-23.158-27.751-2.188-55.429 6.158-80.847 16.53L52.779 380.639c48.963-18.699 94.119-20.855 139.427 7.877l37.692-129.039s-.008-.008-.016-.008m-48.833-49.548c23.059 2.835 41.371 12.591 56.304 21.974 12.356-42.651 24.59-85.335 37.052-127.946-17.793-11.319-35.975-21.131-57.284-23.254-28.043-3.347-57.26 5.064-82.912 15.557-12.502 42.748-24.746 85.578-37.11 128.367 26.479-10.388 55.292-18.215 83.95-14.698m149.499 90.261c-34.347 0-57.722-12.104-77.752-25.426-.097.113-.251.211-.364.293l-37.109 128.439c47.042 31.178 100.299 30.887 151.458 9.285l35.983-125.539-.323.082c-27.128 9.075-50.909 12.866-71.893 12.866m117.907-171.625c-.098-.065-.179-.146-.26-.227-51.67 20.977-102.577 23.173-150.544-8.703-2.195 7.568-4.214 13.289-5.492 17.728l-12.715 43.997c-6.497 22.525-13.004 45.05-19.51 67.566 46.889 30.312 100.105 31.932 150.933 9.092l37.668-129.381-.08-.072"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wine-glass.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wine-glass.svg
new file mode 100644
index 0000000000..abb0115e23
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wine-glass.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M271.017 409.8V274.197c64.194-7.588 114.194-62.334 114.194-128.535 0-18.39-4.25-55.384-15.729-76.408l-8.111-14.917H150.118l-8.142 14.917c-11.447 21.05-15.697 58.018-15.697 76.408 0 66.889 50.949 122.083 116.122 128.777V409.8c-52.388 1.594-92.806 11.767-92.806 24.07 0 13.414 47.973 24.288 107.131 24.288 59.124 0 107.066-10.874 107.066-24.288.001-12.304-40.421-22.476-92.775-24.07z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wrench.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wrench.svg
new file mode 100644
index 0000000000..96040a486e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wrench.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M411.685 161.576l-48.849-13.089-13.093-48.851 49.864-49.864c-29.43-7.945-62.171-.389-85.272 22.712-23.24 23.237-30.747 56.229-22.568 85.794L157.22 292.826c-29.565-8.176-62.555-.668-85.797 22.569-23.1 23.101-30.655 55.843-22.71 85.274l49.866-49.861 48.85 13.088 13.09 48.851-49.864 49.864c29.43 7.941 62.172.386 85.271-22.715 24.258-24.254 31.373-59.141 21.405-89.658L349.183 218.39c30.52 9.972 65.401 2.853 89.653-21.404 23.103-23.101 30.657-55.843 22.713-85.273l-49.864 49.863z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wrong.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wrong.svg
new file mode 100644
index 0000000000..09f0a7376d
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wrong.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M422.952 371.305L307.064 255.418l115.884-115.887-51.722-51.723L255.34 203.693 139.457 87.812l-51.726 51.719 115.885 115.885L87.731 371.305l51.726 51.721L255.344 307.14l115.884 115.882z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-yen-bag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-yen-bag.svg
new file mode 100644
index 0000000000..2680a40cca
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-yen-bag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M324.816 172.772l.014.027c-.08-.108-.146-.213-.242-.319a810.557 810.557 0 0 0-12.461-16.761c-5.395-9.025-8.242-20.006-1.619-35.849v-.009l22.776-54.505-35.808-16.298 3.696-16.156h-89.834l4.708 20.585-36.804 11.869 22.761 54.505.018.009c11.247 26.945-4.856 39.813-14.325 52.928-46.861 64.796-99.313 157.564-99.313 213.49 0 92.734 72.008 89.646 167.857 89.646 95.881 0 167.889 3.088 167.889-89.646 0-55.934-52.467-148.702-99.313-213.516zm-91.138-45.504h45.879v28.931h-45.879v-28.931zm73.431 179.369v20.791h-31.283l-3.282 6.344v10.058h34.565v20.782h-34.565v30.181h-33.245v-30.181h-34.336V343.83h34.336v-10.058l-3.041-6.344h-31.295v-20.791h20.801l-33.489-68.015h35.449l28.859 68.015 28.221-68.015h35.435l-33.915 68.015h20.785z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zip.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zip.svg
new file mode 100644
index 0000000000..2691f1c586
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zip.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M239.408 400.078h27.732v-38.637h-27.732v38.637zM398.535 38.141H289.933v12.911h-52.355V68.32h-21.519V38.14H113.047c-13.373 0-24.164 10.822-24.164 24.162v386.011c0 13.359 10.791 24.169 24.164 24.169h285.488c13.343 0 24.164-10.81 24.164-24.169V62.303c0-13.34-10.821-24.162-24.164-24.162zM252.621 66.428h36.296v30.771H267.4V79.933h-14.779V66.428zm0 57.027h36.296v30.771H267.4v-17.262h-14.779v-13.509zm0 55.986h36.296v30.771H267.4v-17.264h-14.779v-13.507zm0 58.471h36.296v13.524h-36.296v-13.524zM216.059 94.577h36.332v13.511h-14.813v17.266h-21.519V94.577zm0 55.989h36.332v13.507h-14.813v17.263h-21.519v-30.77zm0 58.471h36.332v13.521h-14.813v17.283h-21.519v-30.804zm59.549 207.754h-44.702c-13.899 0-23.513-11.214-21.454-24.951l7.522-49.15c2.062-13.707 15.142-24.919 29.007-24.919h14.552c13.866 0 26.913 11.212 29.005 24.919l7.491 49.15c2.124 13.737-7.522 24.951-21.421 24.951zm-8.895-115.7h-27.827l-33.324-32.326h94.475l-33.324 32.326z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zom-out.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zom-out.svg
new file mode 100644
index 0000000000..8afc74de61
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zom-out.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M471.012 406.744l-2.691-2.688.006-.006-107.515-107.521c14.937-25.73 23.615-55.564 23.818-87.448.631-97.618-77.989-177.245-175.596-177.856-.393-.004-.774-.004-1.167-.004-97.062.004-176.067 78.391-176.693 175.598-.617 97.609 78 177.237 175.598 177.859h1.15c32.447 0 62.846-8.787 89-24.07l107.421 107.429.01-.01 2.688 2.687c8.123 8.123 21.292 8.117 29.414 0l34.556-34.552c8.118-8.119 8.123-21.293.001-29.418zM300.693 301.357c-24.835 24.668-57.778 38.252-92.77 38.252h-.862c-72.591-.465-131.276-59.906-130.816-132.504.464-72.127 59.511-130.809 131.628-130.816h.877c35.169.223 68.144 14.127 92.849 39.15 24.706 25.027 38.188 58.177 37.963 93.352-.222 35.02-14.025 67.895-38.869 92.566zm-178.876-67.341h177.254v-54.224H121.817v54.224z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zoom-in.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zoom-in.svg
new file mode 100644
index 0000000000..df7748938e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zoom-in.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M471.823 407.401l-2.69-2.691.005-.006-107.515-107.518c14.938-25.734 23.617-55.566 23.822-87.453.627-97.611-77.992-177.241-175.599-177.854-.394-.002-.773-.002-1.167-.002-97.062.006-176.067 78.389-176.693 175.599-.617 97.608 78 177.231 175.598 177.857.385.005.762.005 1.149.005 32.445 0 62.846-8.792 89.003-24.078l107.42 107.435.01-.01 2.688 2.685c8.121 8.125 21.289 8.118 29.412 0l34.556-34.555c8.118-8.118 8.122-21.294.001-29.414zM301.504 302.017c-24.832 24.667-57.781 38.251-92.77 38.251l-.861-.004c-72.59-.464-131.275-59.904-130.816-132.499.226-35.015 14.03-67.888 38.875-92.563 24.833-24.667 57.773-38.252 92.751-38.252h.882c35.164.223 68.138 14.121 92.847 39.146 24.705 25.028 38.189 58.178 37.963 93.354-.223 35.013-14.027 67.889-38.871 92.567zM238.365 115.8h-54.219v61.519H122.63v54.222h61.516v61.519h54.219v-61.52h61.52v-54.222h-61.52V115.8z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js
index 8efaf0c024..b52b0a5763 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function AppHeaderDirective(eventsService, appState, userService, focusService, backdropService) {
+    function AppHeaderDirective(eventsService, appState, userService, focusService, backdropService, overlayService) {
 
         function link(scope, el, attr, ctrl) {
 
@@ -71,21 +71,17 @@
             };
 
             scope.avatarClick = function () {
-                if (!scope.userDialog) {
-                    backdropService.open();
-                    scope.userDialog = {
-                        view: "user",
-                        show: true,
-                        close: function (oldModel) {
-                            scope.userDialog.show = false;
-                            scope.userDialog = null;
-                            backdropService.close();
-                        }
-                    };
-                } else {
-                    scope.userDialog.show = false;
-                    scope.userDialog = null;
-                }
+
+                const dialog = {
+                    view: "user",
+                    position: "right",
+                    name: "overlay-user",
+                    close: function () {
+                        overlayService.close();
+                    }
+                };
+
+                overlayService.open(dialog);
             };
 
         }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbcontextmenu.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbcontextmenu.directive.js
index 32034818a3..f666e62587 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbcontextmenu.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbcontextmenu.directive.js
@@ -1,3 +1,11 @@
+/**
+* @ngdoc directive
+* @name umbraco.directives.directive:umbContextMenu
+* @restrict A
+ *
+ * @description
+ * Handles the click events on the context menu
+**/
 angular.module("umbraco.directives")
 .directive('umbContextMenu', function (navigationService, keyboardService, backdropService) {
     return {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawer.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawer.directive.js
index e2e94e466f..8fa1bf4a46 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawer.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawer.directive.js
@@ -57,7 +57,7 @@ The drawer component is a global component and is already added to the umbraco m
 <ul>
     <li>{@link umbraco.directives.directive:umbDrawerView umbDrawerView}</li>
     <li>{@link umbraco.directives.directive:umbDrawerHeader umbDrawerHeader}</li>
-    <li>{@link umbraco.directives.directive:umbDrawerView umbDrawerContent}</li>
+    <li>{@link umbraco.directives.directive:umbDrawerContent umbDrawerContent}</li>
     <li>{@link umbraco.directives.directive:umbDrawerFooter umbDrawerFooter}</li>
 </ul>
 
@@ -106,4 +106,4 @@ function Drawer($location, $routeParams, helpService, userService, localizationS
         };
     }
     
-    angular.module('umbraco.directives').directive("umbDrawer", Drawer);
\ No newline at end of file
+    angular.module('umbraco.directives').directive("umbDrawer", Drawer);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
index c2b298ad24..36eeb173d6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
@@ -13,7 +13,10 @@
             }
         });
 
-    function UmbLoginController($scope, $location, currentUserResource, formHelper, mediaHelper, umbRequestHelper, Upload, localizationService, userService, externalLoginInfo, resetPasswordCodeInfo, $timeout, authResource, $q, $route) {
+    function UmbLoginController($scope, $location, currentUserResource, formHelper,
+        mediaHelper, umbRequestHelper, Upload, localizationService,
+        userService, externalLoginInfo, externalLoginInfoService,
+        resetPasswordCodeInfo, $timeout, authResource, $q, $route) {
 
         const vm = this;
 
@@ -43,9 +46,18 @@
         vm.allowPasswordReset = Umbraco.Sys.ServerVariables.umbracoSettings.canSendRequiredEmail && Umbraco.Sys.ServerVariables.umbracoSettings.allowPasswordReset;
         vm.errorMsg = "";
         vm.externalLoginFormAction = Umbraco.Sys.ServerVariables.umbracoUrls.externalLoginsUrl;
-        vm.externalLoginProviders = externalLoginInfo.providers;
+        vm.externalLoginProviders = externalLoginInfoService.getLoginProviders();
+        vm.externalLoginProviders.forEach(x => {
+            x.customView = externalLoginInfoService.getLoginProviderView(x);
+            // if there are errors set for this specific provider than assign them directly to the model
+            if (externalLoginInfo.errorProvider === x.authType) {
+                x.errors = externalLoginInfo.errors;
+            }
+        });
+        vm.denyLocalLogin = externalLoginInfoService.hasDenyLocalLogin();
         vm.externalLoginInfo = externalLoginInfo;
         vm.resetPasswordCodeInfo = resetPasswordCodeInfo;
+        vm.logoImage = Umbraco.Sys.ServerVariables.umbracoSettings.loginLogoImage;
         vm.backgroundImage = Umbraco.Sys.ServerVariables.umbracoSettings.loginBackgroundImage;
         vm.usernameIsEmail = Umbraco.Sys.ServerVariables.umbracoSettings.usernameIsEmail;
 
@@ -62,7 +74,7 @@
         vm.setPasswordSubmit = setPasswordSubmit;
         vm.labels = {};
         localizationService.localizeMany([
-            vm.usernameIsEmail ? "general_email" : "general_username", 
+            vm.usernameIsEmail ? "general_email" : "general_username",
             vm.usernameIsEmail ? "placeholders_email" : "placeholders_usernameHint",
             vm.usernameIsEmail ? "placeholders_emptyEmail" : "placeholders_emptyUsername",
             "placeholders_emptyPassword"]
@@ -72,9 +84,11 @@
             vm.labels.usernameError = data[2];
             vm.labels.passwordError = data[3];
         });
-        
+
         vm.twoFactor = {};
 
+        vm.loginSuccess = loginSuccess;
+
         function onInit() {
 
             // Check if it is a new user
@@ -98,11 +112,11 @@
 
                         //localize the text
                         localizationService.localize("errorHandling_errorInPasswordFormat", [
-                                vm.invitedUserPasswordModel.passwordPolicies.minPasswordLength,
-                                vm.invitedUserPasswordModel.passwordPolicies.minNonAlphaNumericChars
-                            ]).then(function (data) {
-                                vm.invitedUserPasswordModel.passwordPolicyText = data;
-                            });
+                            vm.invitedUserPasswordModel.passwordPolicies.minPasswordLength,
+                            vm.invitedUserPasswordModel.passwordPolicies.minNonAlphaNumericChars
+                        ]).then(function (data) {
+                            vm.invitedUserPasswordModel.passwordPolicyText = data;
+                        });
                     })
                 ]).then(function () {
                     vm.inviteStep = Number(inviteVal);
@@ -144,14 +158,14 @@
 
         function getStarted() {
             $location.search('invite', null);
-            if(vm.onLogin) {
+            if (vm.onLogin) {
                 vm.onLogin();
             }
         }
 
-        function inviteSavePassword () {
+        function inviteSavePassword() {
 
-            if (formHelper.submitForm({ scope: $scope })) {
+            if (formHelper.submitForm({ scope: $scope, formCtrl: vm.inviteUserPasswordForm })) {
 
                 vm.invitedUserPasswordModel.buttonState = "busy";
 
@@ -159,7 +173,7 @@
                     .then(function (data) {
 
                         //success
-                        formHelper.resetForm({ scope: $scope });
+                        formHelper.resetForm({ scope: $scope, formCtrl: vm.inviteUserPasswordForm });
                         vm.invitedUserPasswordModel.buttonState = "success";
                         //set the user and set them as logged in
                         vm.invitedUser = data;
@@ -168,6 +182,7 @@
                         vm.inviteStep = 2;
 
                     }, function (err) {
+                        formHelper.resetForm({ scope: $scope, hasErrors: true, formCtrl: vm.inviteUserPasswordForm });
                         formHelper.handleError(err);
                         vm.invitedUserPasswordModel.buttonState = "error";
                     });
@@ -196,37 +211,41 @@
             SetTitle();
         }
 
+        function loginSuccess() {
+            vm.loginStates.submitButton = "success";
+            userService._retryRequestQueue(true);
+            if (vm.onLogin) {
+                vm.onLogin();
+            }
+        }
+
         function loginSubmit() {
-                       
-            if (formHelper.submitForm({ scope: $scope })) {
+
+            if (formHelper.submitForm({ scope: $scope, formCtrl: vm.loginForm })) {
                 //if the login and password are not empty we need to automatically
                 // validate them - this is because if there are validation errors on the server	
                 // then the user has to change both username & password to resubmit which isn't ideal,	            
                 // so if they're not empty, we'll just make sure to set them to valid.
-                if (vm.login && vm.password && vm.login.length > 0 && vm.password.length > 0) {	
+                if (vm.login && vm.password && vm.login.length > 0 && vm.password.length > 0) {
                     vm.loginForm.username.$setValidity('auth', true);
                     vm.loginForm.password.$setValidity('auth', true);
                 }
-                
+
                 if (vm.loginForm.$invalid) {
                     SetTitle();
                     return;
                 }
-                
+
                 // make sure that we are returning to the login view.
                 vm.view = "login";
 
                 vm.loginStates.submitButton = "busy";
 
                 userService.authenticate(vm.login, vm.password)
-                    .then(function(data) {
-                            vm.loginStates.submitButton = "success";
-                            userService._retryRequestQueue(true);
-                            if (vm.onLogin) {
-                                vm.onLogin();
-                            }
-                        },
-                        function(reason) {
+                    .then(function (data) {
+                        loginSuccess();
+                    },
+                        function (reason) {
 
                             //is Two Factor required?
                             if (reason.status === 402) {
@@ -248,13 +267,13 @@
                 //setup a watch for both of the model values changing, if they change
                 // while the form is invalid, then revalidate them so that the form can
                 // be submitted again.
-                vm.loginForm.username.$viewChangeListeners.push(function() {
+                vm.loginForm.username.$viewChangeListeners.push(function () {
                     if (vm.loginForm.$invalid) {
                         vm.loginForm.username.$setValidity('auth', true);
                         vm.loginForm.password.$setValidity('auth', true);
                     }
                 });
-                vm.loginForm.password.$viewChangeListeners.push(function() {
+                vm.loginForm.password.$viewChangeListeners.push(function () {
                     if (vm.loginForm.$invalid) {
                         vm.loginForm.username.$setValidity('auth', true);
                         vm.loginForm.password.$setValidity('auth', true);
@@ -459,7 +478,7 @@
                 case "2fa-login":
                     title = "Two Factor Authentication";
                     break;
-            } 
+            }
 
             $scope.$emit("$changeTitle", title);
         }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js
index e03e63b68f..42daf1dd75 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js
@@ -160,7 +160,8 @@
                 searchService.searchAll(search).then(function (result) {
                     //result is a dictionary of group Title and it's results
                     var filtered = {};
-                    _.each(result, function (value, key) {
+                    Object.keys(result).forEach(key => {
+                        let value = result[key];
                         if (value.results.length > 0) {
                             filtered[key] = value;
                         }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
index 514e26f38f..b34a9eb8fd 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
@@ -11,7 +11,7 @@ You can easily add you own tours to the Help-drawer or show and start tours from
 anywhere in the Umbraco backoffice. To see a real world example of a custom tour implementation, install <a href="https://our.umbraco.com/projects/starter-kits/the-starter-kit/">The Starter Kit</a> in Umbraco 7.8
 
 <h1><b>Extending the help drawer with custom tours</b></h1>
-The easiet way to add new tours to Umbraco is through the Help-drawer. All it requires is a my-tour.json file. 
+The easiet way to add new tours to Umbraco is through the Help-drawer. All it requires is a my-tour.json file.
 Place the file in <i>App_Plugins/{MyPackage}/backoffice/tours/{my-tour}.json</i> and it will automatically be
 picked up by Umbraco and shown in the Help-drawer.
 
@@ -277,7 +277,6 @@ In the following example you see how to run some custom logic before a step goes
                     }
 
                     startStep();
-                    // tour completed - final step
                 } else {
                     // tour completed - final step
                     scope.loadingStep = true;
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
index dc012945dd..dd6fa5c5c8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
@@ -55,21 +55,21 @@ Use this directive to render an umbraco button. The directive can be used to gen
 </pre>
 
 @param {callback} action The button action which should be performed when the button is clicked.
-@param {string=} href Url/Path to navigato to.
-@param {string=} type Set the button type ("button" or "submit").
+@param {string=} href Url/Path to navigato to. (requires "type" to be set to "link")
+@param {string=} type Set the button type ("button", "link", "submit").
 @param {string=} buttonStyle Set the style of the button. The directive uses the default bootstrap styles ("primary", "info", "success", "warning", "danger", "inverse", "link", "block"). Pass in array to add multple styles [success,block].
 @param {string=} state Set a progress state on the button ("init", "busy", "success", "error").
 @param {string=} shortcut Set a keyboard shortcut for the button ("ctrl+c").
 @param {string=} label Set the button label.
-@param {string=} labelKey Set a localization key to make a multi lingual button ("general_buttonText").
+@param {string=} labelKey Set a localization key to make a multi-lingual button ("general_buttonText").
 @param {string=} icon Set a button icon.
-@param {string=} size Set a button icon ("xs", "m", "l", "xl").
+@param {string=} size Set a button size ("xs", "m", "l", "xl").
 @param {boolean=} disabled Set to <code>true</code> to disable the button.
-@param {string=} addEllipsis Adds an ellipsis character (…) to the button label which means the button will open a dialog or prompt the user for more information.
-@param {string=} showCaret Shows a caret on the right side of the button label
-@param {string=} autoFocus add autoFocus to the button
-@param {string=} hasPopup Used to expose to the accessibility API whether the button will trigger a popup or not
-@param {string=]} isExpanded Used to add an aria-expanded attribute and expose whether the button has expanded a popup or not
+@param {boolean=} addEllipsis Adds an ellipsis character (…) to the button label which means the button will open a dialog or prompt the user for more information.
+@param {boolean=} showCaret Shows a caret on the right side of the button label
+@param {boolean=} autoFocus add autoFocus to the button
+@param {boolean=} hasPopup Used to expose to the accessibility API whether the button will trigger a popup or not
+@param {boolean=} isExpanded Used to add an aria-expanded attribute and expose whether the button controls collapsible content
 
 **/
 
@@ -86,6 +86,7 @@ Use this directive to render an umbraco button. The directive can be used to gen
             bindings: {
                 action: "&?",
                 href: "@?",
+                hrefTarget: "@?",
                 type: "@",
                 buttonStyle: "@?",
                 state: "<?",
@@ -123,6 +124,10 @@ Use this directive to render an umbraco button. The directive can be used to gen
             vm.innerState = "init";
             vm.generalActions = vm.labelKey === "general_actions";
 
+            if (!vm.type) {
+                vm.type = "button"; // set the default
+            }
+
             vm.buttonLabel = vm.label;
             // is this a primary button style (i.e. anything but an 'info' button)?
             vm.isPrimaryButtonStyle = vm.buttonStyle && vm.buttonStyle !== 'info';
@@ -166,7 +171,7 @@ Use this directive to render an umbraco button. The directive can be used to gen
                     vm.innerState = changes.state.currentValue;
                 }
                 if (changes.state.currentValue === 'success' || changes.state.currentValue === 'error') {
-                    // set the state back to 'init' after a success or error 
+                    // set the state back to 'init' after a success or error
                     $timeout(function () {
                         vm.innerState = 'init';
                     }, 2000);
@@ -191,6 +196,13 @@ Use this directive to render an umbraco button. The directive can be used to gen
                 setButtonLabel();
             }
 
+            // watch for type changes
+            if(changes.type) {
+                if (!vm.type) {
+                    vm.type = "button";// set the default
+                }
+            }
+
         }
 
         function clickButton(event) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttonellipsis.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttonellipsis.directive.js
new file mode 100644
index 0000000000..c24c6e82d2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttonellipsis.directive.js
@@ -0,0 +1,92 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbButtonEllipsis
+@restrict E
+@scope
+
+@description
+<b>Added in Umbraco version 8.7.0</b> Use this directive to render an umbraco ellipsis.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <umb-button-ellipsis
+            text="{{text}}"
+            labelKey="{{labelKey}}"
+            action="{{vm.open()}}"
+            >
+        </umb-button-ellipsis>
+
+    </div>
+</pre>
+
+@param {callback} action Callback when the value of the checkbox changes through interaction.
+@param {string} text Set the text for the checkbox label.
+@param {string=} labelKey Set a dictionary/localization string for the checkbox label
+@param {string=} cssClass Set a css class modifier
+@param {string=} color Set a hex code e.g. <code>#f5c1bc</code>. <code>#000000</code> by default
+@param {boolean=} showText Set to <code>true</code> to show the text. <code>false</code> by default
+@param {string=} element Highlights a DOM-element (HTML selector) e.g. "my-div-name"
+@param {string=} state Set the initial state of the component. To have it hidden use <code>hidden</code>
+@param {string=} mode Set the mode, which decides how to style the component. "small" and "tab" are currently supported
+**/
+
+(function () {
+    'use strict';
+
+    function UmbButtonEllipsis($timeout, localizationService) {
+
+        var vm = this;
+
+        vm.$onInit = onInit;
+        vm.clickButton = clickButton;
+
+        function onInit() {
+            setText();
+            setColor();
+        }
+
+        function clickButton(event) {
+            if(vm.action) {
+                vm.action({$event: event});
+            }
+        }
+
+        function setText() {
+            if (vm.labelKey) {
+                localizationService.localize(vm.labelKey).then(function (data) {
+                    // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
+                     if(data.indexOf('[') === -1){
+                       vm.text = data;
+                     }
+                });
+           }
+        }
+
+        function setColor() {
+            vm.color = vm.color ? vm.color : '#000000';
+        }
+    }
+
+    var component = {
+        templateUrl: 'views/components/buttons/umb-button-ellipsis.html',
+        controller: UmbButtonEllipsis,
+        controllerAs: 'vm',
+        transclude: true,
+        bindings: {
+            text: "@",
+            labelKey: "@?",
+            action: "&",
+            cssClass: "@?",
+            color: "@?",
+            showText: "<?",
+            element: "@?",
+            state: "@?",
+            mode: "@?"
+        }
+    };
+
+    angular.module('umbraco.directives').component('umbButtonEllipsis', component);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js
index 79cb99cf07..bbda02806e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js
@@ -78,7 +78,8 @@
                 scope.inputId = scope.inputId || "umb-toggle_" + String.CreateGuid();
 
                 setLabelText();
-                // must wait until the current digest cycle is finished before we emit this event on init, 
+
+                // Must wait until the current digest cycle is finished before we emit this event on init, 
                 // otherwise other property editors might not yet be ready to receive the event
                 $timeout(function () {
                     eventsService.emit("toggleValue", { value: scope.checked });
@@ -86,22 +87,28 @@
             }
 
             function setLabelText() {
-
-                // set default label for "on"
+                
                 if (scope.labelOn) {
                     scope.displayLabelOn = scope.labelOn;
-                } else {
-                    localizationService.localize("general_on").then(function (value) {
-                        scope.displayLabelOn = value;
-                    });
                 }
-
-                // set default label for "Off"
+                
                 if (scope.labelOff) {
                     scope.displayLabelOff = scope.labelOff;
-                } else {
-                    localizationService.localize("general_off").then(function (value) {
-                        scope.displayLabelOff = value;
+                }
+
+                if (scope.displayLabelOn.length === 0 && scope.displayLabelOff.length === 0)
+                {
+                    var labelKeys = [
+                        "general_on",
+                        "general_off"
+                    ];
+
+                    localizationService.localizeMany(labelKeys).then(function (data) {
+                        // Set default label for "On"
+                        scope.displayLabelOn = data[0];
+
+                        // Set default label for "Off"
+                        scope.displayLabelOff = data[1];
                     });
                 }
 
@@ -115,7 +122,6 @@
             };
 
             onInit();
-
         }
 
         var directive = {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtogglegroup.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtogglegroup.directive.js
index 709a3aaae4..092908cd8d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtogglegroup.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtogglegroup.directive.js
@@ -71,7 +71,9 @@ Use this directive to render a group of toggle buttons.
     function ToggleGroupDirective() {
 
         function link(scope, el, attr, ctrl) {
-
+            for(let i = 0; i < scope.items.length; i++) {
+                scope.items[i].inputId = "umb-toggle-group-item_" + String.CreateGuid();
+            }
             scope.change = function(item) {
                 if (item.disabled) {
                     return;
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index c07bb9bc83..b56c7212db 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -2,9 +2,10 @@
     'use strict';
 
     function ContentEditController($rootScope, $scope, $routeParams, $q, $window,
-        appState, contentResource, entityResource, navigationService, notificationsService,
+        appState, contentResource, entityResource, navigationService, notificationsService, contentAppHelper,
         serverValidationManager, contentEditingHelper, localizationService, formHelper, umbRequestHelper,
-        editorState, $http, eventsService, overlayService, $location, localStorageService, treeService) {
+        editorState, $http, eventsService, overlayService, $location, localStorageService, treeService,
+        $exceptionHandler) {
 
         var evts = [];
         var infiniteMode = $scope.infiniteModel && $scope.infiniteModel.infiniteMode;
@@ -271,11 +272,17 @@
          */
         function createButtons(content) {
 
+            var isBlueprint = content.isBlueprint;
+
+            if ($scope.page.isNew && $location.path().search(/contentBlueprints/i) !== -1) {
+               isBlueprint = true;
+            }
+
             // for trashed and element type items, the save button is the primary action - otherwise it's a secondary action
-            $scope.page.saveButtonStyle = content.trashed || content.isElement || content.isBlueprint ? "primary" : "info";
+            $scope.page.saveButtonStyle = content.trashed || content.isElement || isBlueprint ? "primary" : "info";
             // only create the save/publish/preview buttons if the
             // content app is "Conent"
-            if ($scope.activeApp && $scope.activeApp.alias !== "umbContent" && $scope.activeApp.alias !== "umbInfo" && $scope.activeApp.alias !== "umbListView") {
+            if ($scope.activeApp && !contentAppHelper.isContentBasedApp($scope.activeApp)) {
                 $scope.defaultButton = null;
                 $scope.subButtons = null;
                 $scope.page.showSaveButton = false;
@@ -459,7 +466,7 @@
 
                 syncTreeNode($scope.content, data.path, false, args.reloadChildren);
 
-                eventsService.emit("content.saved", { content: $scope.content, action: args.action });
+                eventsService.emit("content.saved", { content: $scope.content, action: args.action, valid: true });
 
                 resetNestedFieldValiation(fieldsToRollback);
                 ensureDirtyIsSetIfAnyVariantIsDirty();
@@ -467,8 +474,15 @@
                 return $q.when(data);
             },
                 function (err) {
+
+
                     syncTreeNode($scope.content, $scope.content.path);
 
+                    if (err && err.status === 400 && err.data) {
+                        // content was saved but is invalid.
+                        eventsService.emit("content.saved", { content: $scope.content, action: args.action, valid: false });
+                    }
+
                     resetNestedFieldValiation(fieldsToRollback);
 
                     return $q.reject(err);
@@ -515,6 +529,12 @@
             }
         }
 
+        function handleHttpException(err) {
+            if (err && !err.status) {
+                $exceptionHandler(err);
+            }
+        }
+
         /** Just shows a simple notification that there are client side validation issues to be fixed */
         function showValidationNotification() {
             //TODO: We need to make the validation UI much better, there's a lot of inconsistencies in v8 including colors, issues with the property groups and validation errors between variants
@@ -555,6 +575,7 @@
                     view: "views/content/overlays/unpublish.html",
                     variants: $scope.content.variants, //set a model property for the dialog
                     skipFormValidation: true, //when submitting the overlay form, skip any client side validation
+                    includeUnpublished: false,
                     submitButtonLabelKey: "content_unpublish",
                     submitButtonStyle: "warning",
                     submit: function (model) {
@@ -574,7 +595,9 @@
                                 eventsService.emit("content.unpublished", { content: $scope.content });
                                 overlayService.close();
                             }, function (err) {
+                                formHelper.resetForm({ scope: $scope, hasErrors: true });
                                 $scope.page.buttonGroupState = 'error';
+                                handleHttpException(err);
                             });
 
 
@@ -620,8 +643,7 @@
                                     model.submitButtonState = "error";
                                     //re-map the dialog model since we've re-bound the properties
                                     dialog.variants = $scope.content.variants;
-                                    //don't reject, we've handled the error
-                                    return $q.when(err);
+                                    handleHttpException(err);
                                 });
                         },
                         close: function () {
@@ -642,8 +664,9 @@
                     action: "sendToPublish"
                 }).then(function () {
                     $scope.page.buttonGroupState = "success";
-                }, function () {
+                }, function (err) {
                     $scope.page.buttonGroupState = "error";
+                    handleHttpException(err);
                 });;
             }
         };
@@ -679,8 +702,7 @@
                                     model.submitButtonState = "error";
                                     //re-map the dialog model since we've re-bound the properties
                                     dialog.variants = $scope.content.variants;
-                                    //don't reject, we've handled the error
-                                    return $q.when(err);
+                                    handleHttpException(err);
                                 });
                         },
                         close: function () {
@@ -703,8 +725,9 @@
                     action: "publish"
                 }).then(function () {
                     $scope.page.buttonGroupState = "success";
-                }, function () {
+                }, function (err) {
                     $scope.page.buttonGroupState = "error";
+                    handleHttpException(err);
                 });
             }
         };
@@ -742,8 +765,7 @@
                                     model.submitButtonState = "error";
                                     //re-map the dialog model since we've re-bound the properties
                                     dialog.variants = $scope.content.variants;
-                                    //don't reject, we've handled the error
-                                    return $q.when(err);
+                                    handleHttpException(err);
                                 });
                         },
                         close: function (oldModel) {
@@ -766,8 +788,9 @@
                     action: "save"
                 }).then(function () {
                     $scope.page.saveButtonState = "success";
-                }, function () {
+                }, function (err) {
                     $scope.page.saveButtonState = "error";
+                    handleHttpException(err);
                 });
             }
 
@@ -820,8 +843,7 @@
                             model.submitButtonState = "error";
                             //re-map the dialog model since we've re-bound the properties
                             dialog.variants = Utilities.copy($scope.content.variants);
-                            //don't reject, we've handled the error
-                            return $q.when(err);
+                            handleHttpException(err);
                         });
 
                     },
@@ -880,8 +902,7 @@
                             model.submitButtonState = "error";
                             //re-map the dialog model since we've re-bound the properties
                             dialog.variants = $scope.content.variants;
-                            //don't reject, we've handled the error
-                            return $q.when(err);
+                            handleHttpException(err);
                         });
 
                     },
@@ -967,7 +988,7 @@
         $scope.appChanged = function (activeApp) {
 
             $scope.activeApp = activeApp;
-            
+
             _.forEach($scope.content.apps, function (app) {
                 app.active = false;
                 if (app.alias === $scope.activeApp.alias) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
index 1e929af6e9..c20c2a368d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
@@ -1,4 +1,4 @@
-(function () {
+(function () {
     'use strict';
 
     function ContentNodeInfoDirective($timeout, logResource, eventsService, userService, localizationService, dateHelper, editorService, redirectUrlsResource, overlayService, entityResource) {
@@ -18,6 +18,8 @@
             scope.allowChangeTemplate = false;
             scope.allTemplates = [];
 
+            scope.historyLabelKey = scope.node.variants && scope.node.variants.length === 1 ? "general_history" : "auditTrails_historyIncludingVariants";
+
             function onInit() {
                 entityResource.getAll("Template").then(function (templates) {
                     scope.allTemplates = templates;
@@ -46,25 +48,21 @@
                     "content_notCreated",
                     "prompt_unsavedChanges",
                     "prompt_doctypeChangeWarning",
-                    "general_history",
-                    "auditTrails_historyIncludingVariants",
                     "content_itemNotPublished",
                     "general_choose"
                 ];
 
                 localizationService.localizeMany(keys)
                     .then(function (data) {
-                        labels.deleted = data[0];
-                        labels.unpublished = data[1]; //aka draft
-                        labels.published = data[2];
-                        labels.publishedPendingChanges = data[3];
-                        labels.notCreated = data[4];
-                        labels.unsavedChanges = data[5];
-                        labels.doctypeChangeWarning = data[6];
-                        labels.notPublished = data[9];
-
-                        scope.historyLabel = scope.node.variants && scope.node.variants.length === 1 ? data[7] : data[8];
-                        scope.chooseLabel = data[10];
+                        [labels.deleted, 
+                        labels.unpublished, 
+                        labels.published,
+                        labels.publishedPendingChanges,
+                        labels.notCreated,
+                        labels.unsavedChanges,
+                        labels.doctypeChangeWarning,
+                        labels.notPublished,
+                        scope.chooseLabel] = data;
 
                         setNodePublishStatus();
 
@@ -161,7 +159,7 @@
             }
 
             scope.openTemplate = function () {
-                var template = _.findWhere(scope.allTemplates, {alias: scope.node.template})
+                var template = _.findWhere(scope.allTemplates, { alias: scope.node.template })
                 if (!template) {
                     return;
                 }
@@ -202,7 +200,7 @@
 
                 //don't load this if it's already done
                 if (auditTrailLoaded && !forceReload) {
-                    return; 
+                    return;
                 }
 
                 scope.loadingAuditTrail = true;
@@ -233,7 +231,7 @@
             }
             function loadRedirectUrls() {
                 scope.loadingRedirectUrls = true;
-                //check if Redirect Url Management is enabled
+                //check if Redirect URL Management is enabled
                 redirectUrlsResource.getEnableState().then(function (response) {
                     scope.urlTrackerDisabled = response.enabled !== true;
                     if (scope.urlTrackerDisabled === false) {
@@ -253,7 +251,7 @@
 
             function setAuditTrailLogTypeColor(auditTrail) {
                 angular.forEach(auditTrail, function (item) {
-                    
+
                     switch (item.logType) {
                         case "Save":
                             item.logTypeColor = "primary";
@@ -265,7 +263,7 @@
                         case "Unpublish":
                         case "UnpublishVariant":
                             item.logTypeColor = "warning";
-                        break;
+                            break;
                         case "Delete":
                             item.logTypeColor = "danger";
                             break;
@@ -314,22 +312,17 @@
             }
 
             function updateCurrentUrls() {
-                // never show urls for element types (if they happen to have been created in the content tree)
-                if (scope.node.isElement) {
+                // never show URLs for element types (if they happen to have been created in the content tree)
+                if (scope.node.isElement || scope.node.urls === null) {
                     scope.currentUrls = null;
                     return;
                 }
 
                 // find the urls for the currently selected language
-                if (scope.node.variants.length > 1) {
-                    // nodes with variants
-                    scope.currentUrls = _.filter(scope.node.urls, (url) => (scope.currentVariant.language && scope.currentVariant.language.culture === url.culture));
-                } else {
-                    // invariant nodes
-                    scope.currentUrls = scope.node.urls;
-                }
+                // when there is no selected language (allow vary by culture == false), show all urls of the node.
+                scope.currentUrls = _.filter(scope.node.urls, (url) => (scope.currentVariant.language == null || scope.currentVariant.language.culture === url.culture));
 
-                // figure out if multiple cultures apply across the content urls
+                // figure out if multiple cultures apply across the content URLs
                 scope.currentUrlsHaveMultipleCultures = _.keys(_.groupBy(scope.currentUrls, url => url.culture)).length > 1;
             }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
index 2d3a8e2238..55e66c5706 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
@@ -23,8 +23,8 @@
         controllerAs: 'vm',
         controller: umbVariantContentController
     };
-    
-    function umbVariantContentController($scope) {
+
+    function umbVariantContentController($scope, contentAppHelper) {
 
         var unsubscribe = [];
 
@@ -41,20 +41,19 @@
         vm.showBackButton = showBackButton;
 
         function onInit() {
-            
+
             // Make copy of apps, so we can have a variant specific model for the App. (needed for validation etc.)
             vm.editor.variantApps = Utilities.copy(vm.content.apps);
 
             var activeApp = vm.content.apps.find((app) => app.active);
 
             onAppChanged(activeApp);
-
         }
-        
+
         function showBackButton() {
             return vm.page.listViewPath !== null && vm.showBack;
         }
-        
+
         /** Called when the component has linked all elements, this is when the form controller is available */
         function postLink() {
             //set the content to dirty if the header changes
@@ -65,7 +64,7 @@
                     }
                 }));
         }
-        
+
         function onDestroy() {
             for (var i = 0; i < unsubscribe.length; i++) {
                 unsubscribe[i]();
@@ -88,12 +87,12 @@
          */
         function selectApp(item) {
             // call the callback if any is registered
-            if(vm.onSelectApp) {
-                vm.onSelectApp({"app": item});
+            if (vm.onSelectApp) {
+                vm.onSelectApp({ "app": item });
             }
         }
-        
-        $scope.$on("editors.apps.appChanged", function($event, $args) {
+
+        $scope.$on("editors.apps.appChanged", function ($event, $args) {
             var activeApp = $args.app;
 
             // sync varaintApps active with new active.
@@ -104,11 +103,14 @@
             onAppChanged(activeApp);
         });
 
+        $scope.$on("listView.itemsChanged", function ($event, $args) {
+            vm.disableActionsMenu = $args.items.length > 0;
+        });
+
         function onAppChanged(activeApp) {
 
             // disable the name field if the active content app is not "Content" or "Info"
-            vm.nameDisabled = (activeApp && activeApp.alias !== "umbContent" && activeApp.alias !== "umbInfo" && activeApp.alias !== "umbListView");
-
+            vm.nameDisabled = (activeApp && !contentAppHelper.isContentBasedApp(activeApp));
         }
 
         /**
@@ -117,8 +119,8 @@
          */
         function selectAppAnchor(item, anchor) {
             // call the callback if any is registered
-            if(vm.onSelectAppAnchor) {
-                vm.onSelectAppAnchor({"app": item, "anchor": anchor});
+            if (vm.onSelectAppAnchor) {
+                vm.onSelectAppAnchor({ "app": item, "anchor": anchor });
             }
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
index a188a83d83..3e227bfcb3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
@@ -20,7 +20,7 @@
         controller: umbVariantContentEditorsController
     };
 
-    function umbVariantContentEditorsController($scope, $location, contentEditingHelper) {
+    function umbVariantContentEditorsController($scope, $location, eventsService) {
 
         var prevContentDateUpdated = null;
 
@@ -36,6 +36,9 @@
         vm.selectVariant = selectVariant;
         vm.selectApp = selectApp;
         vm.selectAppAnchor = selectAppAnchor;
+        vm.requestSplitView = requestSplitView;
+
+        vm.getScope = getScope;// used by property editors to get a scope that is the root of split view, content apps etc.
 
         //Used to track how many content views there are (for split view there will be 2, it could support more in theory)
         vm.editors = [];
@@ -66,7 +69,7 @@
 
         /** Allows us to deep watch whatever we want - executes on every digest cycle */
         function doCheck() {
-            if (!angular.equals(vm.content.updateDate, prevContentDateUpdated)) {
+            if (!Utilities.equals(vm.content.updateDate, prevContentDateUpdated)) {
                 setActiveVariant();
                 prevContentDateUpdated = Utilities.copy(vm.content.updateDate);
             }
@@ -84,11 +87,12 @@
         function setActiveVariant() {
             // set the active variant
             var activeVariant = null;
-            _.each(vm.content.variants, function (v) {
+            vm.content.variants.forEach(v => {
                 if ((vm.culture === "invariant" || v.language && v.language.culture === vm.culture) && v.segment === vm.segment) {
                     activeVariant = v;
                 }
             });
+
             if (!activeVariant) {
                 // Set the first variant to active if we can't find it.
                 // If the content item is invariant, then only one item exists in the array.
@@ -101,13 +105,16 @@
                 //now re-sync any other editor content (i.e. if split view is open)
                 for (var s = 1; s < vm.editors.length; s++) {
                     //get the variant from the scope model
-                    var variant = _.find(vm.content.variants, function (v) {
-                        return (!v.language || v.language.culture === vm.editors[s].content.language.culture) && v.segment === vm.editors[s].content.segment;
-                    });
+                    var variant = vm.content.variants.find(v =>
+                        (!v.language || v.language.culture === vm.editors[s].content.language.culture) && v.segment === vm.editors[s].content.segment);
+
                     vm.editors[s].content = variant;
                 }
             }
-
+            
+            if (vm.content.variants.length > 1) {
+                eventsService.emit('editors.content.cultureChanged', activeVariant.language);
+            }
         }
 
         /**
@@ -158,32 +165,29 @@
          */
         function openSplitView(selectedVariant) {
             // enforce content contentApp in splitview.
-            var contentApp = vm.content.apps.find((app) => app.alias === "umbContent");
+            var contentApp = vm.content.apps.find(app => app.alias === "umbContent");
             if(contentApp) {
                 selectApp(contentApp);
             }
             
             insertVariantEditor(vm.editors.length, selectedVariant);
             
-            splitViewChanged();
-            
+            splitViewChanged();            
         }
-
-        $scope.$on("editors.content.splitViewRequest", function(event, args) {requestSplitView(args);});
-        vm.requestSplitView = requestSplitView;
+        
         function requestSplitView(args) {
             var culture = args.culture;
             var segment = args.segment;
 
-            var variant = _.find(vm.content.variants, function (v) {
-                return (!v.language || v.language.culture === culture) && v.segment === segment;
-            });
+            var variant = vm.content.variants.find(v =>
+                (!v.language || v.language.culture === culture) && v.segment === segment);
 
             if (variant != null) {
                 openSplitView(variant);
             }
         }
 
+        var unbindSplitViewRequest = eventsService.on("editors.content.splitViewRequest", (_, args) => requestSplitView(args));
         /** Closes the split view */
         function closeSplitView(editorIndex) {
             // TODO: hacking animation states - these should hopefully be easier to do when we upgrade angular
@@ -192,9 +196,11 @@
             editor.content.active = false;
             
             //update the current culture to reflect the last open variant (closing the split view corresponds to selecting the other variant)
-            
-            $location.search({"cculture": vm.editors[0].content.language ? vm.editors[0].content.language.culture : null, "csegment": vm.editors[0].content.segment});
+            const culture = vm.editors[0].content.language ? vm.editors[0].content.language.culture : null;
+
+            $location.search({"cculture": culture, "csegment": vm.editors[0].content.segment});
             splitViewChanged();
+            unbindSplitViewRequest();
         }
 
         /**
@@ -220,11 +226,9 @@
                 $location.search("cculture", variantCulture).search("csegment", variantSegment);
             }
             else {
-
                 //update the editors collection
-                insertVariantEditor(editorIndex, variant);
-                
-            }
+                insertVariantEditor(editorIndex, variant);                
+            }            
         }
 
         /**
@@ -242,6 +246,9 @@
                 vm.onSelectAppAnchor({"app": app, "anchor": anchor});
             }
         }
+        function getScope() {
+            return $scope;
+        }
 
     }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbbreadcrumbs.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbbreadcrumbs.directive.js
index f80b3ceb3e..1be2bb9739 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbbreadcrumbs.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbbreadcrumbs.directive.js
@@ -13,7 +13,8 @@ Use this directive to generate a list of breadcrumbs.
         <umb-breadcrumbs
             ng-if="vm.ancestors && vm.ancestors.length > 0"
             ancestors="vm.ancestors"
-            entity-type="content">
+            entity-type="content"
+            on-open="clickBreadcrumb(ancestor)">
         </umb-breadcrumbs>
     </div>
 </pre>
@@ -32,6 +33,9 @@ Use this directive to generate a list of breadcrumbs.
                 vm.ancestors = ancestors;
             });
 
+            $scope.clickBreadcrumb = function(ancestor) {
+                // manipulate breadcrumb display
+            }
         }
 
         angular.module("umbraco").controller("My.Controller", Controller);
@@ -40,7 +44,7 @@ Use this directive to generate a list of breadcrumbs.
 
 @param {array} ancestors Array of ancestors
 @param {string} entityType The content entity type (member, media, content).
-@param {callback} Callback when an ancestor is clicked. It will override the default link behaviour.
+@param {callback=} onOpen Function callback when an ancestor is clicked. This will override the default link behaviour.
 **/
 
 (function () {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
index 9b8f92d7c3..846d5c85fe 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
@@ -2,10 +2,10 @@
     'use strict';
 
     function EditorContentHeader(serverValidationManager, localizationService, editorState) {
-          function link(scope) {
+        function link(scope) {
 
             var unsubscribe = [];
-            
+
             if (!scope.serverValidationNameField) {
                 scope.serverValidationNameField = "Name";
             }
@@ -46,55 +46,55 @@
             scope.vm.variantsWithError = [];
             scope.vm.defaultVariant = null;
             scope.vm.errorsOnOtherVariants = false;// indicating wether to show that other variants, than the current, have errors.
-            
+
             function updateVaraintErrors() {
-                scope.content.variants.forEach( function (variant) {
+                scope.content.variants.forEach(function (variant) {
                     variant.hasError = scope.variantHasError(variant);
-                    
+
                 });
                 checkErrorsOnOtherVariants();
             }
 
             function checkErrorsOnOtherVariants() {
                 var check = false;
-                scope.content.variants.forEach( function (variant) {
+                scope.content.variants.forEach(function (variant) {
                     if (variant.active !== true && variant.hasError) {
                         check = true;
                     }
                 });
                 scope.vm.errorsOnOtherVariants = check;
             }
-            
+
             function onVariantValidation(valid, errors, allErrors, culture, segment) {
 
                 // only want to react to property errors:
-            if(errors.findIndex(error => {return error.propertyAlias !== null;}) === -1) {
+                if (errors.findIndex(error => { return error.propertyAlias !== null; }) === -1) {
                     // we dont have any errors for properties, meaning we will back out.
                     return;
                 }
 
                 // If error coming back is invariant, we will assign the error to the default variant by picking the defaultVariant language.
-                if(culture === "invariant") {
+                if (culture === "invariant" && scope.vm.defaultVariant) {
                     culture = scope.vm.defaultVariant.language.culture;
                 }
 
                 var index = scope.vm.variantsWithError.findIndex((item) => item.culture === culture && item.segment === segment)
-                if(valid === true) {
+                if (valid === true) {
                     if (index !== -1) {
                         scope.vm.variantsWithError.splice(index, 1);
                     }
                 } else {
                     if (index === -1) {
-                        scope.vm.variantsWithError.push({"culture": culture, "segment": segment});
+                        scope.vm.variantsWithError.push({ "culture": culture, "segment": segment });
                     }
                 }
                 scope.$evalAsync(updateVaraintErrors);
             }
-            
+
             function onInit() {
-                
+
                 // find default + check if we have variants.
-                scope.content.variants.forEach( function (variant) {
+                scope.content.variants.forEach(function (variant) {
                     if (variant.language !== null && variant.language.isDefault) {
                         scope.vm.defaultVariant = variant;
                     }
@@ -113,41 +113,41 @@
 
                 scope.vm.variantMenu = [];
                 if (scope.vm.hasCulture) {
-                    scope.content.variants.forEach( (v) => {
+                    scope.content.variants.forEach((v) => {
                         if (v.language !== null && v.segment === null) {
                             var variantMenuEntry = {
                                 key: String.CreateGuid(),
                                 open: v.language && v.language.culture === scope.editor.culture,
                                 variant: v,
-                                subVariants: scope.content.variants.filter( (subVariant) => subVariant.language.culture === v.language.culture && subVariant.segment !== null)
+                                subVariants: scope.content.variants.filter((subVariant) => subVariant.language.culture === v.language.culture && subVariant.segment !== null)
                             };
                             scope.vm.variantMenu.push(variantMenuEntry);
                         }
                     });
                 } else {
-                    scope.content.variants.forEach( (v) => {
+                    scope.content.variants.forEach((v) => {
                         scope.vm.variantMenu.push({
                             key: String.CreateGuid(),
                             variant: v
                         });
                     });
                 }
- 
-                scope.editor.variantApps.forEach( (app) => {
+
+                scope.editor.variantApps.forEach((app) => {
                     if (app.alias === "umbContent") {
                         app.anchors = scope.editor.content.tabs;
                     }
                 });
 
-                scope.content.variants.forEach( function (variant) {
-                    
+                scope.content.variants.forEach(function (variant) {
+
                     // if we are looking for the variant with default language then we also want to check for invariant variant.
-                    if (variant.language && variant.language.culture === scope.vm.defaultVariant.language.culture && variant.segment === null) {
+                    if (variant.language && scope.vm.defaultVariant && variant.language.culture === scope.vm.defaultVariant.language.culture && variant.segment === null) {
                         unsubscribe.push(serverValidationManager.subscribe(null, "invariant", null, onVariantValidation, null));
                     }
                     unsubscribe.push(serverValidationManager.subscribe(null, variant.language !== null ? variant.language.culture : null, null, onVariantValidation, variant.segment));
                 });
-                
+
             }
 
             scope.goBack = function () {
@@ -164,15 +164,15 @@
                 }
             };
 
-            scope.selectNavigationItem = function(item) {
-                if(scope.onSelectNavigationItem) {
-                    scope.onSelectNavigationItem({"item": item});
+            scope.selectNavigationItem = function (item) {
+                if (scope.onSelectNavigationItem) {
+                    scope.onSelectNavigationItem({ "item": item });
                 }
             }
 
-            scope.selectAnchorItem = function(item, anchor) {
-                if(scope.onSelectAnchorItem) {
-                    scope.onSelectAnchorItem({"item": item, "anchor": anchor});
+            scope.selectAnchorItem = function (item, anchor) {
+                if (scope.onSelectAnchorItem) {
+                    scope.onSelectAnchorItem({ "item": item, "anchor": anchor });
                 }
             }
 
@@ -188,20 +188,20 @@
                     scope.onOpenInSplitView({ "variant": variant });
                 }
             };
-            
+
             /**
              * Check whether a variant has a error, used to display errors in variant switcher.
              * @param {any} culture
              */
-            scope.variantHasError = function(variant) {
-                if(scope.vm.variantsWithError.find((item) => (!variant.language || item.culture === variant.language.culture) && item.segment === variant.segment) !== undefined) {
+            scope.variantHasError = function (variant) {
+                if (scope.vm.variantsWithError.find((item) => (!variant.language || item.culture === variant.language.culture) && item.segment === variant.segment) !== undefined) {
                     return true;
                 }
                 return false;
             }
 
             onInit();
-            
+
             scope.$on('$destroy', function () {
                 for (var u in unsubscribe) {
                     unsubscribe[u]();
@@ -220,6 +220,7 @@
                 nameDisabled: "<?",
                 menu: "=",
                 hideActionsMenu: "<?",
+                disableActionsMenu: "<?",
                 content: "=",
                 editor: "=",
                 hideChangeVariant: "<?",
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
index 58f799e5af..6f272f1ea2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
@@ -188,6 +188,7 @@ Use this directive to construct a header inside the main editor window.
 </ul>
 
 @param {string} name The content name.
+@param {boolean=} nameRequired Require name to be defined. (True by default)
 @param {array=} tabs Array of tabs. See example above.
 @param {array=} navigation Array of sub views. See example above.
 @param {boolean=} nameLocked Set to <code>true</code> to lock the name.
@@ -198,8 +199,9 @@ Use this directive to construct a header inside the main editor window.
 @param {boolean=} aliasLocked Set to <code>true</code> to lock the alias.
 @param {boolean=} hideAlias Set to <code>true</code> to hide alias.
 @param {string=} description Add a description to the content.
+@param {boolean=} descriptionLocked Set to <code>true</code> to lock the description.
 @param {boolean=} hideDescription Set to <code>true</code> to hide description.
-@param {boolean=} setpagetitle If true the page title will be set to reflect the type of data the header is working with 
+@param {boolean=} setpagetitle If true the page title will be set to reflect the type of data the header is working with
 @param {string=} editorfor The localization to use to aid accessibility on the edit and create screen
 **/
 
@@ -207,7 +209,7 @@ Use this directive to construct a header inside the main editor window.
     'use strict';
 
     function EditorHeaderDirective(editorService, localizationService, editorState, $rootScope) {
-        
+
         function link(scope, $injector) {
 
             scope.vm = {};
@@ -227,6 +229,9 @@ Use this directive to construct a header inside the main editor window.
                 // to make it work for language edit/create
                 setAccessibilityForEditorState();
                 scope.loading = false;
+            } else if (scope.name) {
+                setAccessibilityForName();
+                scope.loading = false;
             } else {
                 scope.loading = false;
             }
@@ -265,6 +270,15 @@ Use this directive to construct a header inside the main editor window.
                 editorService.iconPicker(iconPicker);
             };
 
+            function setAccessibilityForName() {
+                var setTitle = false;
+                if (scope.setpagetitle !== undefined) {
+                    setTitle = scope.setpagetitle;
+                }
+                if (setTitle) {
+                    setAccessibilityHeaderDirective(false, scope.editorfor, scope.nameLocked, scope.name, "", true);
+                }
+            }
             function setAccessibilityForEditorState() {
                 var isNew = editorState.current.id === 0 ||
                     editorState.current.id === "0" ||
@@ -329,11 +343,11 @@ Use this directive to construct a header inside the main editor window.
                     }
                     scope.accessibility.a11yMessageVisible = !isEmptyOrSpaces(scope.accessibility.a11yMessage);
                     scope.accessibility.a11yNameVisible = !isEmptyOrSpaces(scope.accessibility.a11yName);
-                    
+
                 });
             }
 
-           
+
 
            function isEmptyOrSpaces(str) {
                return str === null || str===undefined || str.trim ==='';
@@ -343,12 +357,15 @@ Use this directive to construct a header inside the main editor window.
                     scope.$emit("$changeTitle", title);
             }
 
-            $rootScope.$on('$setAccessibleHeader', function (event, isNew, editorFor, nameLocked, name, contentTypeName, setTitle) {
+            var unbindEventHandler = $rootScope.$on('$setAccessibleHeader', function (event, isNew, editorFor, nameLocked, name, contentTypeName, setTitle) {
                 setAccessibilityHeaderDirective(isNew, editorFor, nameLocked, name, contentTypeName, setTitle);
             });
+            scope.$on('$destroy', function () {
+                unbindEventHandler();
+            });
         }
 
-        
+
 
         var directive = {
             transclude: true,
@@ -358,6 +375,7 @@ Use this directive to construct a header inside the main editor window.
             scope: {
                 name: "=",
                 nameLocked: "=",
+                nameRequired: "=?",
                 menu: "=",
                 hideActionsMenu: "<?",
                 icon: "=",
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
index 665f315bee..281a52e4e5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
@@ -52,7 +52,8 @@
             link: link,
             scope: {
                 currentNode: "=",
-                currentSection: "@"
+                currentSection: "@",
+                isDisabled: "<?"
             }
         };
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
index ae725ef25e..11ebd9dc3f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
@@ -4,8 +4,13 @@
     function UmbEditorNavigationItemController($scope, $element, $attrs) {
         
         var vm = this;
-        
-        vm.clicked = function() {
+
+        vm.close = function () {
+            vm.expanded = false;
+        };
+
+        vm.clicked = function () {
+            vm.expanded = vm.item.anchors && vm.item.anchors.length > 1 && !vm.expanded;
             vm.onOpen({item:vm.item});
         };
         
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
index 672b3fa286..20fba6eb6e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
@@ -11,13 +11,13 @@
             var sectionId = '#leftcolumn';
             var isLeftColumnAbove = false;
             scope.editors = [];
-            
+
             function addEditor(editor) {
                 editor.inFront = true;
                 editor.moveRight = true;
                 editor.level = 0;
                 editor.styleIndex = 0;
-                                
+
                 // push the new editor to the dom
                 scope.editors.push(editor);
 
@@ -32,20 +32,20 @@
                 $timeout(() => {
                     editor.moveRight = false;
                 })
-                
+
                 editor.animating = true;
                 setTimeout(revealEditorContent.bind(this, editor), 400);
-                
+
                 updateEditors();
 
             }
-            
+
             function removeEditor(editor) {
                 editor.moveRight = true;
-                
+
                 editor.animating = true;
                 setTimeout(removeEditorFromDOM.bind(this, editor), 400);
-                
+
                 updateEditors(-1);
 
                 if(scope.editors.length === 1){
@@ -56,17 +56,17 @@
                     isLeftColumnAbove = false;
                 }
             }
-            
+
             function revealEditorContent(editor) {
-                
+
                 editor.animating = false;
-                
+
                 scope.$digest();
-                
+
             }
-            
+
             function removeEditorFromDOM(editor) {
-                
+
                 // push the new editor to the dom
                 var index = scope.editors.indexOf(editor);
                 if (index !== -1) {
@@ -74,42 +74,42 @@
                 }
  
                 updateEditors();
-                
+
                 scope.$digest();
-                
+
             }
-            
+
             /** update layer positions. With ability to offset positions, needed for when an item is moving out, then we dont want it to influence positions */
             function updateEditors(offset) {
-                
+
                 offset = offset || 0;// fallback value.
-                
+
                 var len = scope.editors.length;
                 var calcLen = len + offset;
                 var ceiling = Math.min(calcLen, allowedNumberOfVisibleEditors);
-                var origin = Math.max(calcLen-1, 0)-ceiling;
+                var origin = Math.max(calcLen - 1, 0) - ceiling;
                 var i = 0;
-                while(i<len) {
+                while (i < len) {
                     var iEditor = scope.editors[i];
-                    iEditor.styleIndex = Math.min(i+1, allowedNumberOfVisibleEditors);
-                    iEditor.level = Math.max(i-origin, -1);
+                    iEditor.styleIndex = Math.min(i + 1, allowedNumberOfVisibleEditors);
+                    iEditor.level = Math.max(i - origin, -1);
                     iEditor.inFront = iEditor.level >= ceiling;
                     i++;
                 }
 
             }
-            
+
             evts.push(eventsService.on("appState.editors.open", function (name, args) {
                 addEditor(args.editor);
             }));
 
             evts.push(eventsService.on("appState.editors.close", function (name, args) {
                 // remove the closed editor
-                if(args && args.editor) {
+                if (args && args.editor) {
                     removeEditor(args.editor);
                 }
                 // close all editors
-                if(args && !args.editor && args.editors.length === 0) {
+                if (args && !args.editor && args.editors.length === 0) {
                     scope.editors = [];
                 }
             }));
@@ -134,6 +134,74 @@
 
     }
 
+    // This directive allows for us to run a custom $compile for the view within the repeater which allows
+    // us to maintain a $scope hierarchy with the rendered view based on the $scope that initiated the 
+    // infinite editing. The retain the $scope hiearchy a special $parentScope property is passed in to the model.
+    function EditorRepeaterDirective($http, $templateCache, $compile, angularHelper) {
+        function link(scope, el, attr, ctrl) {
+            
+            var editor = scope && scope.$parent ? scope.$parent.model : null;
+            if (!editor) {
+                return;
+            }
+
+            var unsubscribe = [];
+
+            //if a custom parent scope is defined then we need to manually compile the view
+            if (editor.$parentScope) {
+                var element = el.find(".scoped-view");
+                $http.get(editor.view, { cache: $templateCache })
+                    .then(function (response) {
+                        var templateScope = editor.$parentScope.$new();
+
+                        unsubscribe.push(function () {
+                            templateScope.$destroy();
+                        });
+
+                        // NOTE: the 'model' name here directly affects the naming convention used in infinite editors, this why you access the model
+                        // like $scope.model.If this is changed, everything breaks.This is because we are entirely reliant upon ng-include and inheriting $scopes.
+                        // by default without a $parentScope used for infinite editing the 'model' propety will be set because the view creates the scopes in 
+                        // ng-repeat by ng-repeat="model in editors"
+                        templateScope.model = editor;
+
+                        element.show();
+
+                        // if a parentForm is supplied then we can link them but to do that we need to inject a top level form
+                        if (editor.$parentForm) {
+                            element.html("<ng-form name='infiniteEditorForm'>" + response.data + "</ng-form>");
+                        }
+                        
+                        $compile(element)(templateScope);
+
+                        // if a parentForm is supplied then we can link them
+                        if (editor.$parentForm) {
+                            editor.$parentForm.$addControl(templateScope.infiniteEditorForm);
+                        }
+                    });
+            }
+
+            scope.$on('$destroy', function () {
+                for (var i = 0; i < unsubscribe.length; i++) {
+                    unsubscribe[i]();
+                }
+            });
+        }
+
+        var directive = {
+            restrict: 'E',
+            replace: true,
+            transclude: true,
+            scope: {
+                editors: "="
+            },
+            template: "<div ng-transclude></div>",            
+            link: link
+        };
+
+        return directive;
+    }
+
     angular.module('umbraco.directives').directive('umbEditors', EditorsDirective);
+    angular.module('umbraco.directives').directive('umbEditorRepeater', EditorRepeaterDirective);
 
 })();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onOutsideClick.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onOutsideClick.directive.js
index a657fcbc55..07c8dc88fe 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onOutsideClick.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onOutsideClick.directive.js
@@ -44,7 +44,7 @@
                 }
 
                 // please to not use angularHelper.safeApply here, it won't work
-                scope.$apply(attrs.onOutsideClick);
+                scope.$evalAsync(attrs.onOutsideClick);
             }
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/checklistmodel.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/checklistmodel.directive.js
index d944989bab..491dff3a41 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/checklistmodel.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/checklistmodel.directive.js
@@ -11,7 +11,7 @@ angular.module('umbraco.directives')
   function contains(arr, item) {
     if (Utilities.isArray(arr)) {
       for (var i = 0; i < arr.length; i++) {
-        if (angular.equals(arr[i], item)) {
+        if (Utilities.equals(arr[i], item)) {
           return true;
         }
       }
@@ -19,23 +19,23 @@ angular.module('umbraco.directives')
     return false;
   }
 
-  // add 
+  // add
   function add(arr, item) {
     arr = Utilities.isArray(arr) ? arr : [];
     for (var i = 0; i < arr.length; i++) {
-      if (angular.equals(arr[i], item)) {
+      if (Utilities.equals(arr[i], item)) {
         return arr;
       }
-    }    
+    }
     arr.push(item);
     return arr;
-  }  
+  }
 
   // remove
   function remove(arr, item) {
     if (Utilities.isArray(arr)) {
       for (var i = 0; i < arr.length; i++) {
-        if (angular.equals(arr[i], item)) {
+        if (Utilities.equals(arr[i], item)) {
           arr.splice(i, 1);
           break;
         }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/focuswhen.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/focuswhen.directive.js
index d8dbcc1012..dda5c51175 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/focuswhen.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/focuswhen.directive.js
@@ -2,13 +2,20 @@ angular.module("umbraco.directives").directive('focusWhen', function ($timeout)
     return {
         restrict: 'A',
         link: function (scope, elm, attrs, ctrl) {
+
+            var delayTimer;
+
             attrs.$observe("focusWhen", function (newValue) {
-                if (newValue === "true") {
-                   $timeout(function () {
-                      elm.trigger("focus");
-                   });
+                if (newValue === "true" && document.activeelement !== elm[0]) {
+                    delayTimer = $timeout(function () {
+                        elm[0].focus();
+                    });
                 }
             });
+
+            scope.$on('$destroy', function() {
+                $timeout.cancel(delayTimer);
+            });
         }
     };
 });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbautofocus.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbautofocus.directive.js
index eb3503f799..98c4ef691e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbautofocus.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbautofocus.directive.js
@@ -1,18 +1,23 @@
 angular.module("umbraco.directives")
     .directive('umbAutoFocus', function($timeout) {
 
-        return function(scope, element, attr){
+        return function (scope, element, attrs) {
+            
             var update = function() {
                 //if it uses its default naming
-                if(element.val() === "" || attr.focusOnFilled){
+                if (element.val() === "" || attrs.focusOnFilled) {
                     element.trigger("focus");
                 }
             };
 
-            if (attr.umbAutoFocus !== "false") {
-                $timeout(function() {
-                    update();
-                });
-            }
-    };
+            attrs.$observe("umbAutoFocus", function (newVal) {
+                var enabled = (newVal === "false" || newVal === 0 || newVal === false) ? false : true;
+                if (enabled) {
+                    $timeout(function() {
+                        update();
+                    });
+                }
+            });
+
+        };
 });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
index 389aec2044..717cefbb0a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
@@ -31,8 +31,10 @@
 @param {boolean} disabled Set the checkbox to be disabled.
 @param {boolean} required Set the checkbox to be required.
 @param {callback} onChange Callback when the value of the checkbox change by interaction.
-@param {string} cssClass Set a css class modifier
-@param {boolean} disableDirtyCheck Disable checking if the model is dirty
+@param {string} cssClass Set a css class modifier.
+@deprecated @param {string} iconClass Set an icon next to checkbox. Use "icon" parameter instead.
+@param {string} icon Set an icon next to checkbox.
+@param {boolean} disableDirtyCheck Disable checking if the model is dirty.
 
 **/
 
@@ -49,6 +51,8 @@
         function onInit() {
             vm.inputId = vm.inputId || "umb-check_" + String.CreateGuid();
 
+            vm.icon = vm.icon || vm.iconClass || null;
+
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
             if (vm.labelKey) {
                  localizationService.localize(vm.labelKey).then(function (data) {
@@ -85,7 +89,8 @@
             required: "<",
             onChange: "&?",
             cssClass: "@?",
-            iconClass: "@?",
+            iconClass: "@?", // deprecated
+            icon: "@?",
             disableDirtyCheck: "=?"
         }
     };
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js
new file mode 100644
index 0000000000..569f49b88a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js
@@ -0,0 +1,82 @@
+(function() {
+    'use strict';
+
+    function FocusLock($timeout) {
+
+        function getAutoFocusElement (elements) {
+            var elmentWithAutoFocus = null;
+
+            elements.forEach((element) => {
+                if(element.getAttribute('umb-auto-focus') === 'true') {
+                    elmentWithAutoFocus = element;
+                }
+            });
+
+            return elmentWithAutoFocus;
+        }
+
+        function link(scope, element) {
+
+            function onInit() {
+                // List of elements that can be focusable within the focus lock
+                var focusableElementsSelector = 'a[href]:not([disabled]), button:not([disabled]), textarea:not([disabled]), input:not([disabled]), select:not([disabled])';
+                var bodyElement = document.querySelector('body');
+                
+                $timeout(function() {
+                    var target = element[0];
+    
+                    var focusableElements = target.querySelectorAll(focusableElementsSelector);
+                    var defaultFocusedElement = getAutoFocusElement(focusableElements);
+                    var firstFocusableElement = focusableElements[0];
+                    var lastFocusableElement = focusableElements[focusableElements.length -1];
+
+                    // We need to add the tabbing-active class in order to highlight the focused button since the default style is
+                    // outline: none; set in the stylesheet specifically
+                    bodyElement.classList.add('tabbing-active');
+    
+                    // If there is no default focused element put focus on the first focusable element in the nodelist
+                    if(defaultFocusedElement === null ){
+                        firstFocusableElement.focus();
+                    }
+    
+                    target.addEventListener('keydown', function(event){
+                        var isTabPressed = (event.key === 'Tab' || event.keyCode === 9);
+            
+                        if (!isTabPressed){
+                            return;
+                        }
+            
+                        // If shift + tab key
+                        if(event.shiftKey){
+                            // Set focus on the last focusable element if shift+tab are pressed meaning we go backwards
+                            if(document.activeElement === firstFocusableElement){
+                                lastFocusableElement.focus();
+                                event.preventDefault();
+                            }
+                        }
+                        // Else only the tab key is pressed
+                        else{
+                            // Using only the tab key we set focus on the first focusable element mening we go forward
+                            if (document.activeElement === lastFocusableElement) {
+                                firstFocusableElement.focus();
+                                event.preventDefault();
+                            }
+                        }
+                    });
+                }, 250);
+            }
+
+            onInit();
+        }
+
+        var directive = {
+            restrict: 'A',
+            link: link
+        };
+
+        return directive;
+    }
+
+    angular.module('umbraco.directives').directive('umbFocusLock', FocusLock);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index d79140f947..8c7157c414 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -26,17 +26,21 @@
 @param {string} value Set the value of the radiobutton.
 @param {string} name Set the name of the radiobutton.
 @param {string} text Set the text for the radiobutton label.
-@param {string} labelKey Set a dictinary/localization string for the checkbox label
+@param {string} labelKey Set a dictinary/localization string for the checkbox label.
+@param {string} serverValidationField Set the <code>val-server-field</code> of the radiobutton.
 @param {boolean} disabled Set the radiobutton to be disabled.
 @param {boolean} required Set the radiobutton to be required.
 @param {callback} onChange Callback when the value of the radiobutton change by interaction.
+@param {string} cssClass Set a css class modifier.
+@param {string} iconClass Set an icon next to radiobutton.
+@param {boolean} disableDirtyCheck Disable checking if the model is dirty.
 
 **/
 
 (function () {
     'use strict';
 
-    function UmbRadiobuttonController($timeout) {
+    function UmbRadiobuttonController($timeout, localizationService) {
 
         var vm = this;
 
@@ -46,6 +50,8 @@
         function onInit() {
             vm.inputId = vm.inputId || "umb-radio_" + String.CreateGuid();
 
+            vm.icon = vm.icon || vm.iconClass || null;
+
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
             if (vm.labelKey) {
                  localizationService.localize(vm.labelKey).then(function (data) {
@@ -77,9 +83,14 @@
             name: "@",
             text: "@",
             labelKey: "@?",
+            serverValidationField: "@",
             disabled: "<",
             required: "<",
-            onChange: "&?"
+            onChange: "&?",
+            cssClass: "@?",
+            iconClass: "@?", // deprecated
+            icon: "@?",
+            disableDirtyCheck: "=?"
         }
     };
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js
new file mode 100644
index 0000000000..efbc384cb4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js
@@ -0,0 +1,85 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbSearchFilter
+@restrict E
+@scope
+
+@description
+<b>Added in Umbraco version 8.7.0</b> Use this directive to render an umbraco search filter.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.Controller as vm">
+
+        <umb-search-filter
+            name="checkboxlist"
+            value="{{key}}"
+            model="true"
+            text="{{text}}">
+        </umb-search-filter>
+
+    </div>
+</pre>
+
+@param {boolean} model Set to <code>true</code> or <code>false</code> to set the checkbox to checked or unchecked.
+@param {string} inputId Set the <code>id</code> of the checkbox.
+@param {string} text Set the text for the checkbox label.
+@param {string} labelKey Set a dictinary/localization string for the checkbox label
+@param {callback} onChange Callback when the value of the checkbox change by interaction.
+@param {boolean} autoFocus Add autofocus to the input field
+@param {boolean} preventSubmitOnEnter Set the enter prevent directive or not
+
+**/
+
+(function () {
+    'use strict';
+
+    function UmbSearchFilterController($timeout, localizationService) {
+
+        var vm = this;
+
+        vm.$onInit = onInit;
+        vm.change = change;
+
+        function onInit() {
+            vm.inputId = vm.inputId || "umb-check_" + String.CreateGuid();
+
+            // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
+            if (vm.labelKey) {
+                 localizationService.localize(vm.labelKey).then(function (data) {
+                      if(data.indexOf('[') === -1){
+                        vm.text = data;
+                      }
+                 });
+            }
+        }
+
+        function change() {
+            if (vm.onChange) {
+                $timeout(function () {
+                    vm.onChange({ model: vm.model, value: vm.value });
+                }, 0);
+            }
+        }
+    }
+
+    var component = {
+        templateUrl: 'views/components/forms/umb-search-filter.html',
+        controller: UmbSearchFilterController,
+        controllerAs: 'vm',
+        transclude: true,
+        bindings: {
+            model: "=",
+            inputId: "@",
+            text: "@",
+            labelKey: "@?",
+            onChange: "&?",
+            autoFocus: "<?",
+            preventSubmitOnEnter: "<?",
+            cssClass: "@?"
+        }
+    };
+
+    angular.module('umbraco.directives').component('umbSearchFilter', component);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
index 3578624b50..e2b2e2c3df 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
@@ -1,5 +1,5 @@
 angular.module("umbraco.directives")
-    .directive('gridRte', function (tinyMceService, angularHelper, assetsService, $q, $timeout, eventsService) {
+    .directive('gridRte', function (tinyMceService, angularHelper, assetsService, $q, $timeout, eventsService, tinyMceAssets) {
         return {
             scope: {
                 uniqueId: '=',
@@ -22,11 +22,6 @@ angular.module("umbraco.directives")
                 // because now we have to support having 2x (maybe more at some stage) content editors being displayed at once. This is because
                 // we have this mini content editor panel that can be launched with MNTP.
                 scope.textAreaHtmlId = scope.uniqueId + "_" + String.CreateGuid();
-                
-                //queue file loading
-                if (typeof (tinymce) === "undefined") {
-                    promises.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", scope));
-                }
 
                 var editorConfig = scope.configuration ? scope.configuration : null;
                 if (!editorConfig || Utilities.isString(editorConfig)) {
@@ -50,6 +45,10 @@ angular.module("umbraco.directives")
                 //stores a reference to the editor
                 var tinyMceEditor = null;
 
+                //queue file loading
+                tinyMceAssets.forEach(function (tinyJsAsset) {
+                    promises.push(assetsService.loadJs(tinyJsAsset, scope));
+                });
                 promises.push(tinyMceService.getTinyMceEditorConfig({
                     htmlId: scope.textAreaHtmlId,
                     stylesheets: editorConfig.stylesheets,
@@ -87,7 +86,9 @@ angular.module("umbraco.directives")
                         tinyMceService.initializeEditor({
                             editor: editor,
                             model: scope,
-                            currentForm: angularHelper.getCurrentForm(scope)
+                            // Form is found in the scope of the grid controller above us, not in our isolated scope
+                            // https://github.com/umbraco/Umbraco-CMS/issues/7461
+                            currentForm: angularHelper.getCurrentForm(scope.$parent)
                         });
 
                         //custom initialization for this editor within the grid
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbcontrolgroup.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbcontrolgroup.directive.js
index 6717b23061..a52189a0a8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbcontrolgroup.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbcontrolgroup.directive.js
@@ -2,7 +2,16 @@
 * @ngdoc directive
 * @name umbraco.directives.directive:umbControlGroup
 * @restrict E
+
+@param {string=} label The label for the control group field.
+@param {string=} description The description for the control group field.
+@param {boolean=} hideLabel Set to <code>true</code> to hide the label.
+@param {string=} alias The alias of the field within the control group.
+@param {string=} labelFor The alias of the field that the label is for, used for validation.
+@param {boolean=} required Set to <code>true</code> to mark the field as required.
+
 **/
+
 angular.module("umbraco.directives.html")
   .directive('umbControlGroup', function (localizationService) {
     return {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js
index 1625986751..f1f2cb38e8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js
@@ -5,38 +5,38 @@
 * @function
 **/
 angular.module("umbraco.directives")
-	.directive('umbImageCrop',
-		function ($timeout, cropperHelper) {
-	    return {
-				restrict: 'E',
-				replace: true,
-				templateUrl: 'views/components/imaging/umb-image-crop.html',
-				scope: {
-					src: '=',
-					width: '@',
-					height: '@',
-					crop: "=",
-					center: "=",
-					maxSize: '@'
-				},
+    .directive('umbImageCrop',
+        function ($timeout, cropperHelper) {
+            return {
+                restrict: 'E',
+                replace: true,
+                templateUrl: 'views/components/imaging/umb-image-crop.html',
+                scope: {
+                    src: '=',
+                    width: '@',
+                    height: '@',
+                    crop: "=",
+                    center: "=",
+                    maxSize: '@'
+                },
 
-				link: function(scope, element, attrs) {
+                link: function (scope, element, attrs) {
 
                     let sliderRef = null;
 
-					scope.width = 400;
-					scope.height = 320;
+                    scope.width = 400;
+                    scope.height = 320;
 
-					scope.dimensions = {
-						image: {},
-						cropper:{},
-						viewport:{},
-						margin: 20,
-						scale: {
-							min: 0,
-							max: 3,
-							current: 1
-						}
+                    scope.dimensions = {
+                        image: {},
+                        cropper: {},
+                        viewport: {},
+                        margin: 20,
+                        scale: {
+                            min: 0,
+                            max: 3,
+                            current: 1
+                        }
                     };
 
                     scope.sliderOptions = {
@@ -84,211 +84,232 @@ angular.module("umbraco.directives")
                         }
                     };
 
-					//live rendering of viewport and image styles
-					scope.style = function () {
-						return {
-							'height': (parseInt(scope.dimensions.viewport.height, 10)) + 'px',
-							'width': (parseInt(scope.dimensions.viewport.width, 10)) + 'px'
-						};
-					};
+                    //live rendering of viewport and image styles
+                    scope.style = function () {
+                        return {
+                            'height': (parseInt(scope.dimensions.viewport.height, 10)) + 'px',
+                            'width': (parseInt(scope.dimensions.viewport.width, 10)) + 'px'
+                        };
+                    };
 
 
-					//elements
-					var $viewport = element.find(".viewport");
-					var $image = element.find("img");
-					var $overlay = element.find(".overlay");
-					var $container = element.find(".crop-container");
+                    //elements
+                    var $viewport = element.find(".viewport");
+                    var $image = element.find("img");
+                    var $overlay = element.find(".overlay");
+                    var $container = element.find(".crop-container");
 
-					//default constraints for drag n drop
-					var constraints = {left: {max: scope.dimensions.margin, min: scope.dimensions.margin}, top: {max: scope.dimensions.margin, min: scope.dimensions.margin} };
-					scope.constraints = constraints;
+                    //default constraints for drag n drop
+                    var constraints = { left: { max: scope.dimensions.margin, min: scope.dimensions.margin }, top: { max: scope.dimensions.margin, min: scope.dimensions.margin } };
+                    scope.constraints = constraints;
 
 
-					//set constaints for cropping drag and drop
-					var setConstraints = function(){
-						constraints.left.min = scope.dimensions.margin + scope.dimensions.cropper.width - scope.dimensions.image.width;
-						constraints.top.min = scope.dimensions.margin + scope.dimensions.cropper.height - scope.dimensions.image.height;
-					};
+                    //set constaints for cropping drag and drop
+                    var setConstraints = function () {
+                        constraints.left.min = scope.dimensions.margin + scope.dimensions.cropper.width - scope.dimensions.image.width;
+                        constraints.top.min = scope.dimensions.margin + scope.dimensions.cropper.height - scope.dimensions.image.height;
+                    };
 
-					var setDimensions = function(originalImage){
-						originalImage.width("auto");
-						originalImage.height("auto");
+                    var setDimensions = function (originalImage) {
+                        originalImage.width("auto");
+                        originalImage.height("auto");
 
-						var image = {};
-						image.originalWidth = originalImage.width();
-						image.originalHeight = originalImage.height();
+                        var image = {};
+                        image.originalWidth = originalImage.width();
+                        image.originalHeight = originalImage.height();
 
-						image.width = image.originalWidth;
-						image.height = image.originalHeight;
-						image.left = originalImage[0].offsetLeft;
-						image.top = originalImage[0].offsetTop;
+                        image.width = image.originalWidth;
+                        image.height = image.originalHeight;
+                        image.left = originalImage[0].offsetLeft;
+                        image.top = originalImage[0].offsetTop;
 
-						scope.dimensions.image = image;
+                        scope.dimensions.image = image;
 
-						//unscaled editor size
-						//var viewPortW =  $viewport.width();
-						//var viewPortH =  $viewport.height();
-						var _viewPortW =  parseInt(scope.width, 10);
-						var _viewPortH =  parseInt(scope.height, 10);
+                        //unscaled editor size
+                        //var viewPortW =  $viewport.width();
+                        //var viewPortH =  $viewport.height();
+                        var _viewPortW = parseInt(scope.width, 10);
+                        var _viewPortH = parseInt(scope.height, 10);
 
-						//if we set a constraint we will scale it down if needed
-						if(scope.maxSize){
-							var ratioCalculation = cropperHelper.scaleToMaxSize(
-									_viewPortW,
-									_viewPortH,
-									scope.maxSize);
+                        //if we set a constraint we will scale it down if needed
+                        if (scope.maxSize) {
+                            var ratioCalculation = cropperHelper.scaleToMaxSize(
+                                _viewPortW,
+                                _viewPortH,
+                                scope.maxSize);
 
-							//so if we have a max size, override the thumb sizes
-							_viewPortW = ratioCalculation.width;
-							_viewPortH = ratioCalculation.height;
-						}
+                            //so if we have a max size, override the thumb sizes
+                            _viewPortW = ratioCalculation.width;
+                            _viewPortH = ratioCalculation.height;
+                        }
 
-						scope.dimensions.viewport.width = _viewPortW + 2 * scope.dimensions.margin;
-						scope.dimensions.viewport.height = _viewPortH + 2 * scope.dimensions.margin;
-						scope.dimensions.cropper.width = _viewPortW; // scope.dimensions.viewport.width - 2 * scope.dimensions.margin;
-						scope.dimensions.cropper.height = _viewPortH; //  scope.dimensions.viewport.height - 2 * scope.dimensions.margin;
-					};
+                        scope.dimensions.viewport.width = _viewPortW + 2 * scope.dimensions.margin;
+                        scope.dimensions.viewport.height = _viewPortH + 2 * scope.dimensions.margin;
+                        scope.dimensions.cropper.width = _viewPortW; // scope.dimensions.viewport.width - 2 * scope.dimensions.margin;
+                        scope.dimensions.cropper.height = _viewPortH; //  scope.dimensions.viewport.height - 2 * scope.dimensions.margin;
+                    };
 
-					//resize to a given ratio
-					var resizeImageToScale = function(ratio){
-						//do stuff
-						var size = cropperHelper.calculateSizeToRatio(scope.dimensions.image.originalWidth, scope.dimensions.image.originalHeight, ratio);
-						scope.dimensions.image.width = size.width;
-						scope.dimensions.image.height = size.height;
+                    //resize to a given ratio
+                    var resizeImageToScale = function (ratio) {
+                        //do stuff
+                        var size = cropperHelper.calculateSizeToRatio(scope.dimensions.image.originalWidth, scope.dimensions.image.originalHeight, ratio);
+                        scope.dimensions.image.width = size.width;
+                        scope.dimensions.image.height = size.height;
 
-						setConstraints();
-						validatePosition(scope.dimensions.image.left, scope.dimensions.image.top);
-					};
+                        setConstraints();
+                        validatePosition(scope.dimensions.image.left, scope.dimensions.image.top);
+                    };
 
-					//resize the image to a predefined crop coordinate
-					var resizeImageToCrop = function(){
-						scope.dimensions.image = cropperHelper.convertToStyle(
-												scope.crop,
-												{width: scope.dimensions.image.originalWidth, height: scope.dimensions.image.originalHeight},
-												scope.dimensions.cropper,
-												scope.dimensions.margin);
+                    //resize the image to a predefined crop coordinate
+                    var resizeImageToCrop = function () {
+                        scope.dimensions.image = cropperHelper.convertToStyle(
+                            scope.crop,
+                            { width: scope.dimensions.image.originalWidth, height: scope.dimensions.image.originalHeight },
+                            scope.dimensions.cropper,
+                            scope.dimensions.margin);
 
-						var ratioCalculation = cropperHelper.calculateAspectRatioFit(
-								scope.dimensions.image.originalWidth,
-								scope.dimensions.image.originalHeight,
-								scope.dimensions.cropper.width,
-								scope.dimensions.cropper.height,
-								true);
+                        var ratioCalculation = cropperHelper.calculateAspectRatioFit(
+                            scope.dimensions.image.originalWidth,
+                            scope.dimensions.image.originalHeight,
+                            scope.dimensions.cropper.width,
+                            scope.dimensions.cropper.height,
+                            true);
 
-						scope.dimensions.scale.current = scope.dimensions.image.ratio;
+                        scope.dimensions.scale.current = scope.dimensions.image.ratio;
 
-						// Update min and max based on original width/height
-						scope.dimensions.scale.min = ratioCalculation.ratio;
+                        // Update min and max based on original width/height
+                        scope.dimensions.scale.min = ratioCalculation.ratio;
                         scope.dimensions.scale.max = 2;
-					};
+                    };
 
-					var validatePosition = function(left, top){
-						if(left > constraints.left.max)
-						{
-							left = constraints.left.max;
-						}
+                    var validatePosition = function (left, top) {
+                        if (left > constraints.left.max) {
+                            left = constraints.left.max;
+                        }
 
-						if(left <= constraints.left.min){
-							left = constraints.left.min;
-						}
+                        if (left <= constraints.left.min) {
+                            left = constraints.left.min;
+                        }
 
-						if(top > constraints.top.max)
-						{
-							top = constraints.top.max;
-						}
-						if(top <= constraints.top.min){
-							top = constraints.top.min;
-						}
+                        if (top > constraints.top.max) {
+                            top = constraints.top.max;
+                        }
+                        if (top <= constraints.top.min) {
+                            top = constraints.top.min;
+                        }
 
-						if(scope.dimensions.image.left !== left){
-							scope.dimensions.image.left = left;
-						}
+                        if (scope.dimensions.image.left !== left) {
+                            scope.dimensions.image.left = left;
+                        }
 
-						if(scope.dimensions.image.top !== top){
-							scope.dimensions.image.top = top;
-						}
-					};
+                        if (scope.dimensions.image.top !== top) {
+                            scope.dimensions.image.top = top;
+                        }
+                    };
 
 
-					//sets scope.crop to the recalculated % based crop
-					var calculateCropBox = function(){
-						scope.crop = cropperHelper.pixelsToCoordinates(scope.dimensions.image, scope.dimensions.cropper.width, scope.dimensions.cropper.height, scope.dimensions.margin);
-					};
+                    //sets scope.crop to the recalculated % based crop
+                    var calculateCropBox = function () {
+                        scope.crop = cropperHelper.pixelsToCoordinates(scope.dimensions.image, scope.dimensions.cropper.width, scope.dimensions.cropper.height, scope.dimensions.margin);
+                    };
 
 
-					//Drag and drop positioning, using jquery ui draggable
-					var onStartDragPosition, top, left;
-					$overlay.draggable({
-						drag: function(event, ui) {
-							scope.$apply(function(){
-								validatePosition(ui.position.left, ui.position.top);
-							});
-						},
-						stop: function(event, ui){
-							scope.$apply(function(){
-								//make sure that every validates one more time...
-								validatePosition(ui.position.left, ui.position.top);
+                    //Drag and drop positioning, using jquery ui draggable
+                    var onStartDragPosition, top, left;
+                    $overlay.draggable({
+                        drag: function (event, ui) {
+                            scope.$apply(function () {
+                                validatePosition(ui.position.left, ui.position.top);
+                            });
+                        },
+                        stop: function (event, ui) {
+                            scope.$apply(function () {
+                                //make sure that every validates one more time...
+                                validatePosition(ui.position.left, ui.position.top);
 
-								calculateCropBox();
-								scope.dimensions.image.rnd = Math.random();
-							});
-						}
-					});
+                                calculateCropBox();
+                                scope.dimensions.image.rnd = Math.random();
+                            });
+                        }
+                    });
 
-					var init = function(image){
-						scope.loaded = false;
+                    var init = function (image) {
+                        scope.loaded = false;
 
-						//set dimensions on image, viewport, cropper etc
-						setDimensions(image);
+                        //set dimensions on image, viewport, cropper etc
+                        setDimensions(image);
 
-						//create a default crop if we haven't got one already
+                        //create a default crop if we haven't got one already
                         var createDefaultCrop = !scope.crop;
                         if (createDefaultCrop) {
                             calculateCropBox();
                         }
 
-						resizeImageToCrop();
+                        resizeImageToCrop();
 
                         //if we're creating a new crop, make sure to zoom out fully
                         if (createDefaultCrop) {
                             scope.dimensions.scale.current = scope.dimensions.scale.min;
-    						resizeImageToScale(scope.dimensions.scale.min);
+                            resizeImageToScale(scope.dimensions.scale.min);
+
+                            if (scope.center) {
+                                // Move image to focal point if set
+                                // Repeating a few calls here, but logic is too difficult to follow elsewhere
+                                var x1 = Math.min(
+                                    Math.max(
+                                        scope.center.left * scope.dimensions.image.width - scope.dimensions.cropper.width / 2,
+                                        0
+                                    ),
+                                    scope.dimensions.image.width - scope.dimensions.cropper.width
+                                );
+                                var y1 = Math.min(
+                                    Math.max(
+                                        scope.center.top * scope.dimensions.image.height - scope.dimensions.cropper.height / 2,
+                                        0
+                                    ),
+                                    scope.dimensions.image.height - scope.dimensions.cropper.height
+                                );
+                                scope.dimensions.image.left = x1;
+                                scope.dimensions.image.top = y1;
+                                calculateCropBox();
+                                resizeImageToCrop();
+                            }
                         }
 
-						//sets constaints for the cropper
-						setConstraints();
-						scope.loaded = true;
-					};
+                        //sets constaints for the cropper
+                        setConstraints();
+                        scope.loaded = true;
+                    };
 
 
-					// Watchers
-					scope.$watchCollection('[width, height]', function(newValues, oldValues){
-							// We have to reinit the whole thing if
-							// one of the external params changes
-							if(newValues !== oldValues){
-								setDimensions($image);
-								setConstraints();
-							}
-					});
+                    // Watchers
+                    scope.$watchCollection('[width, height]', function (newValues, oldValues) {
+                        // We have to reinit the whole thing if
+                        // one of the external params changes
+                        if (newValues !== oldValues) {
+                            setDimensions($image);
+                            setConstraints();
+                        }
+                    });
 
-					var throttledResizing = _.throttle(function(){
+                    var throttledResizing = _.throttle(function () {
                         resizeImageToScale(scope.dimensions.scale.current);
-						calculateCropBox();
-					}, 15);
+                        calculateCropBox();
+                    }, 15);
 
-					// Happens when we change the scale
+                    // Happens when we change the scale
                     scope.$watch("dimensions.scale.current", function (newValue, oldValue) {
-						if (scope.loaded) {
-							throttledResizing();
-						}
-					});
+                        if (scope.loaded) {
+                            throttledResizing();
+                        }
+                    });
 
-					// Init
-					$image.on("load", function(){
-						$timeout(function(){
-							init($image);
-						});
-					});
-				}
-			};
-		});
+                    // Init
+                    $image.on("load", function () {
+                        $timeout(function () {
+                            init($image);
+                        });
+                    });
+                }
+            };
+        });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
index dfa58f34f8..fd9a236f87 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
@@ -160,7 +160,7 @@
         function onChanges(changes) {
             if (changes.center && !changes.center.isFirstChange()
                 && changes.center.currentValue
-                && !angular.equals(changes.center.currentValue, changes.center.previousValue)) {
+                && !Utilities.equals(changes.center.currentValue, changes.center.previousValue)) {
                 //when center changes update the dimensions
                 setDimensions();
             }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
index dfa1afc247..6f34cfc0a1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
@@ -1,7 +1,7 @@
 (function () {
     'use strict';
 
-    function MediaNodeInfoDirective($timeout, $location, eventsService, userService, dateHelper, editorService, mediaHelper, mediaResource, $q) {
+    function MediaNodeInfoDirective($timeout, $location, $q, eventsService, userService, dateHelper, editorService, mediaHelper, mediaResource) {
 
         function link(scope, element, attrs, ctrl) {
 
@@ -37,7 +37,7 @@
                     });
                 });
 
-                // get document type details
+                // get media type details
                 scope.mediaType = scope.node.contentType;
 
                 // set the media link initially
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembernodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembernodeinfo.directive.js
index 3b6a2c069a..8dd6d56139 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembernodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembernodeinfo.directive.js
@@ -11,6 +11,19 @@
             scope.allowChangeMemberType = false;
 
             function onInit() {
+                
+                userService.getCurrentUser().then(function (user) {
+                    // only allow change of member type if user has access to the settings sections
+                    Utilities.forEach(user.sections, function (section) {
+                        if (section.alias === "settings") {
+                            scope.allowChangeMemberType = true;
+                        }
+                    });
+                });
+
+                // get member type details
+                scope.memberType = scope.node.contentType;
+
                 // make sure dates are formatted to the user's locale
                 formatDatesToLocal();
             }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
index ad396e7a9a..f7ba043ef1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
@@ -221,6 +221,10 @@ Opens an overlay to show a custom YSOD. </br>
 
                 $timeout(function () {
 
+                    if (!scope.name) {
+                        scope.name = 'overlay';
+                    }
+
                     if (scope.position === "target" && scope.model.event) {
                         setTargetPosition();
 
@@ -280,7 +284,7 @@ Opens an overlay to show a custom YSOD. </br>
                                 templateScope.model = scope.model;
                                 element.html(response.data);
                                 element.show();
-                                $compile(element.contents())(templateScope);
+                                $compile(element)(templateScope);
                             });
                     }
                 }
@@ -403,11 +407,15 @@ Opens an overlay to show a custom YSOD. </br>
 
             function setTargetPosition() {
 
-                var container = $("#contentwrapper");
-                var containerLeft = container[0].offsetLeft;
-                var containerRight = containerLeft + container[0].offsetWidth;
-                var containerTop = container[0].offsetTop;
-                var containerBottom = containerTop + container[0].offsetHeight;
+                var overlay = $(scope.model.event.target).closest('.umb-overlay');
+                var container = overlay.length > 0 ? overlay : $("#contentwrapper");
+
+                let rect = container[0].getBoundingClientRect();
+
+                var containerLeft = rect.left;
+                var containerRight = containerLeft + rect.width;
+                var containerTop = rect.top;
+                var containerBottom = containerTop + rect.height;
 
                 var mousePositionClickX = null;
                 var mousePositionClickY = null;
@@ -430,8 +438,9 @@ Opens an overlay to show a custom YSOD. </br>
                 elementWidth = el[0].clientWidth;
 
                 // move element to this position
-                position.left = mousePositionClickX - (elementWidth / 2);
-                position.top = mousePositionClickY - (elementHeight / 2);
+                // when using hotkey it fallback to center of container
+                position.left = mousePositionClickX ? mousePositionClickX - (elementWidth / 2) : (containerLeft + containerRight) / 2 - (elementWidth / 2);
+                position.top = mousePositionClickY ? mousePositionClickY - (elementHeight / 2) : (containerTop + containerBottom) / 2 - (elementHeight / 2);
 
                 // check to see if element is outside screen
                 // outside right
@@ -459,11 +468,12 @@ Opens an overlay to show a custom YSOD. </br>
                 }
 
                 el.css(position);
+                el.css("visibility", "visible");
             }
 
             scope.submitForm = function (model) {
                 if (scope.model.submit) {
-                    if (formHelper.submitForm({ scope: scope, skipValidation: scope.model.skipFormValidation })) {
+                    if (formHelper.submitForm({ scope: scope, skipValidation: scope.model.skipFormValidation, keepServerValidation: true })) {
 
                         if (scope.model.confirmSubmit && scope.model.confirmSubmit.enable && !scope.directive.enableConfirmButton) {
                             //wrap in a when since we don't know if this is a promise or not
@@ -530,6 +540,7 @@ Opens an overlay to show a custom YSOD. </br>
                 view: "=",
                 position: "@",
                 size: "=?",
+                name: "=?",
                 parentScope: "=?"
             },
             link: link
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
index ad62bcd3db..2b2f36dd7d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
@@ -3,46 +3,75 @@
 * @name umbraco.directives.directive:umbProperty
 * @restrict E
 **/
-angular.module("umbraco.directives")
-    .directive('umbProperty', function (userService) {
-        return {
-            scope: {
+(function () {
+    'use strict';
+
+    angular
+        .module("umbraco.directives")
+        .component('umbProperty', {
+            templateUrl: 'views/components/property/umb-property.html',
+            controller: UmbPropertyController,
+            controllerAs: 'vm',
+            transclude: true,
+            require: {
+                parentUmbProperty: '?^^umbProperty',
+                parentForm: '?^^form'
+            },
+            bindings: {
                 property: "=",
+                elementKey: "@",
+                // optional, if set this will be used for the property alias validation path (hack required because NC changes the actual property.alias :/)
+                propertyAlias: "@",
                 showInherit: "<",
                 inheritsFrom: "<"
-            },
-            transclude: true,
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/property/umb-property.html',
-            link: function (scope) {
-
-                scope.controlLabelTitle = null;
-                if(Umbraco.Sys.ServerVariables.isDebuggingEnabled) {
-                    userService.getCurrentUser().then(function (u) {
-                        if(u.allowedSections.indexOf("settings") !== -1 ? true : false) {
-                            scope.controlLabelTitle = scope.property.alias;
-                        }
-                    });
-                }
-            },
-            //Define a controller for this directive to expose APIs to other directives
-            controller: function ($scope) {
-
-                var self = this;
-                
-                //set the API properties/methods
-
-                self.property = $scope.property;
-                self.setPropertyError = function (errorMsg) {
-                    $scope.property.propertyErrorMessage = errorMsg;
-                };
-
-                $scope.propertyActions = [];
-                self.setPropertyActions = function(actions) {
-                    $scope.propertyActions = actions;
-                };
-
             }
+        });
+
+    
+
+    function UmbPropertyController($scope, userService, serverValidationManager, udiService, angularHelper) {
+
+        const vm = this;
+
+        vm.$onInit = onInit;
+
+        vm.setPropertyError = function (errorMsg) {
+            vm.property.propertyErrorMessage = errorMsg;
         };
-    });
+
+        vm.propertyActions = [];
+        vm.setPropertyActions = function (actions) {
+            vm.propertyActions = actions;
+        };
+
+        // returns the validation path for the property to be used as the validation key for server side validation logic
+        vm.getValidationPath = function () {
+
+            var parentValidationPath = vm.parentUmbProperty ? vm.parentUmbProperty.getValidationPath() : null;            
+            var propAlias = vm.propertyAlias ? vm.propertyAlias : vm.property.alias;
+            // the elementKey will be empty when this is not a nested property
+            var valPath = vm.elementKey ? vm.elementKey + "/" + propAlias : propAlias;
+            return serverValidationManager.createPropertyValidationKey(valPath, parentValidationPath);
+        }
+
+        function onInit() {
+            vm.controlLabelTitle = null;
+            if (Umbraco.Sys.ServerVariables.isDebuggingEnabled) {
+                userService.getCurrentUser().then(function (u) {
+                    if (u.allowedSections.indexOf("settings") !== -1 ? true : false) {
+                        vm.controlLabelTitle = vm.property.alias;
+                    }
+                });
+            }
+
+            if (!vm.parentUmbProperty) {
+                // not found, then fallback to searching the scope chain, this may be needed when DOM inheritance isn't maintained but scope
+                // inheritance is (i.e.infinite editing)
+                var found = angularHelper.traverseScopeChain($scope, s => s && s.vm && s.vm.constructor.name === "UmbPropertyController");
+                vm.parentUmbProperty = found ? found.vm : null;
+            }
+        }
+
+    }
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umbpropertyactions.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertyactions.component.js
similarity index 51%
rename from src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umbpropertyactions.component.js
rename to src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertyactions.component.js
index b0dc15d6cd..41dbd9f547 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umbpropertyactions.component.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertyactions.component.js
@@ -5,50 +5,77 @@
      * A component to render the property action toggle
      */
     
-    function umbPropertyActionsController(keyboardService) {
+    function umbPropertyActionsController(keyboardService, localizationService) {
 
         var vm = this;
 
         vm.isOpen = false;
+        vm.labels = {
+            openText: "Open Property Actions",
+            closeText: "Close Property Actions"
+        };
+
+        vm.open = open;
+        vm.close = close;
+        vm.toggle = toggle;
+        vm.executeAction = executeAction;
+
+        vm.$onDestroy = onDestroy;
+        vm.$onInit = onInit;
 
         function initDropDown() {
             keyboardService.bind("esc", vm.close);
         }
+
         function destroyDropDown() {
             keyboardService.unbind("esc");
         }
 
-        vm.toggle = function() {
+        function toggle() {
             if (vm.isOpen === true) {
                 vm.close();
             } else {
                 vm.open();
             }
         }
-        vm.open = function() {
+
+        function open() {
             vm.isOpen = true;
             initDropDown();
         }
-        vm.close = function() {
+
+        function close() {
             vm.isOpen = false;
             destroyDropDown();
         }
 
-        vm.executeAction = function(action) {
+        function executeAction(action) {
             action.method();
             vm.close();
         }
 
-        vm.$onDestroy = function () {
+        function onDestroy() {
             if (vm.isOpen === true) {
                 destroyDropDown();
             }
         }
-        
+
+        function onInit() {
+            
+            var labelKeys = [
+                "propertyActions_tooltipForPropertyActionsMenu",
+                "propertyActions_tooltipForPropertyActionsMenuClose"
+            ]
+
+            localizationService.localizeMany(labelKeys).then(values => {
+                vm.labels.openText = values[0];
+                vm.labels.closeText = values[1];
+            });
+        }
     }
 
     var umbPropertyActionsComponent = {
-        templateUrl: 'views/components/property/property-actions/umb-property-actions.html',
+        templateUrl: 'views/components/property/umb-property-actions.html',
         bindings: {
             actions: "<"
         },
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
index 0ccaf7b05c..7868f79809 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
@@ -88,9 +88,8 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
             /** Helper function to emit tree events */
             function emitEvent(eventName, args) {
                 if (registeredCallbacks[eventName] && Utilities.isArray(registeredCallbacks[eventName])) {
-                    _.each(registeredCallbacks[eventName], function (c) {
-                        c(args);//call it
-                    });
+                    // call it
+                    registeredCallbacks[eventName].forEach(c => c(args));
                 }
             }
 
@@ -342,26 +341,17 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
 
                 var css = [];
                 if (node.cssClasses) {
-                    _.each(node.cssClasses, function (c) {
-                        css.push(c);
-                    });
+                    node.cssClasses.forEach(c => css.push(c));
                 }
 
                 return css.join(" ");
             };
 
-            $scope.selectEnabledNodeClass = function (node) {
-                return node ?
-                    node.selected ?
-                        'icon umb-tree-icon sprTree icon-check green temporary' :
-                        '' :
-                    '';
-            };
+            $scope.selectEnabledNodeClass = node =>
+                node && node.selected ? 'icon sprTree icon-check green temporary' : '-hidden';
 
             /* helper to force reloading children of a tree node */
-            $scope.loadChildren = function (node, forceReload) {
-                return loadChildren(node, forceReload);
-            };
+            $scope.loadChildren = (node, forceReload) => loadChildren(node, forceReload);
 
             /**
               Method called when the options button next to the root node is called.
@@ -419,8 +409,8 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
                 //load the tree
                 loadTree().then(function () {
                     //because angular doesn't return a promise for the resolve method, we need to resort to some hackery, else
-                    //like normal JS promises we could do resolve(...).then() 
-                    if (args && args.onLoaded && angular.isFunction(args.onLoaded)) {
+                    //like normal JS promises we could do resolve(...).then()
+                    if (args && args.onLoaded && Utilities.isFunction(args.onLoaded)) {
                         args.onLoaded();
                     }
                 });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
index 8767de446a..3ec1756e6c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
@@ -70,9 +70,7 @@ angular.module("umbraco.directives")
                 
                 var css = [];                
                 if (node.cssClasses) {
-                    _.each(node.cssClasses, function(c) {
-                        css.push(c);
-                    });
+                    node.cssClasses.forEach(c => css.push(c));
                 }
                 if (node.selected) {
                     css.push("umb-tree-node-checked");
@@ -192,7 +190,7 @@ angular.module("umbraco.directives")
 
             var evts = [];
 
-            //listen for section changes
+            // Listen for section changes
             evts.push(eventsService.on("appState.sectionState.changed", function(e, args) {
                 if (args.key === "currentSection") {
                     //when the section changes disable all delete animations
@@ -200,6 +198,13 @@ angular.module("umbraco.directives")
                 }
             }));
 
+            // Update tree icon if changed
+            evts.push(eventsService.on("editors.tree.icon.changed", function (e, args) {          
+                if (args.icon !== scope.node.icon && args.id === scope.node.id) {
+                    scope.node.icon = args.icon;
+                }
+            }));
+
             /** Depending on if any menu is shown and if the menu is shown for the current node, toggle delete animations */
             function toggleDeleteAnimations() {
                 //if both are false then remove animations
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchresults.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchresults.directive.js
index bc74cbb13b..b006f75e6b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchresults.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchresults.directive.js
@@ -9,13 +9,14 @@ function treeSearchResults() {
     return {
         scope: {
             results: "=",
-            selectResultCallback: "="
+            selectResultCallback: "=",
+            emptySearchResultPosition: '@'
         },
         restrict: "E",    // restrict to an element
         replace: true,   // replace the html element with the template
         templateUrl: 'views/components/tree/umb-tree-search-results.html',
         link: function (scope, element, attrs, ctrl) {
-
+            scope.emptySearchResultPosition = scope.emptySearchResultPosition || "center";
         }
     };
 }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js
index 10fc44c2c6..5e1f2489e6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js
@@ -82,7 +82,7 @@
             if (Utilities.isDefined(opts.firstLineNumber)) {
                 if (Utilities.isNumber(opts.firstLineNumber)) {
                     session.setOption('firstLineNumber', opts.firstLineNumber);
-                } else if (angular.isFunction(opts.firstLineNumber)) {
+                } else if (Utilities.isFunction(opts.firstLineNumber)) {
                     session.setOption('firstLineNumber', opts.firstLineNumber());
                 }
             }
@@ -116,7 +116,7 @@
 
             // onLoad callbacks
             angular.forEach(opts.callbacks, function(cb) {
-                if (angular.isFunction(cb)) {
+                if (Utilities.isFunction(cb)) {
                     cb(acee);
                 }
             });
@@ -126,7 +126,7 @@
 
             // Load in ace library
             assetsService.load(['lib/ace-builds/src-min-noconflict/ace.js', 'lib/ace-builds/src-min-noconflict/ext-language_tools.js'], scope).then(function () {
-                if (angular.isUndefined(window.ace)) {
+                if (Utilities.isUndefined(window.ace)) {
                     throw new Error('ui-ace need ace to work... (o rly?)');
                 } else {
                     // init editor
@@ -208,7 +208,7 @@
 
                     if (Utilities.isDefined(callback)) {
                         scope.$evalAsync(function() {
-                            if (angular.isFunction(callback)) {
+                            if (Utilities.isFunction(callback)) {
                                 callback(args);
                             } else {
                                 throw new Error('ui-ace use a function as callback.');
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js
index 7dd2f0d7a3..321cd8a59d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js
@@ -50,18 +50,20 @@ Use this directive to render an avatar.
 (function() {
     'use strict';
 
-    function AvatarDirective() {
+    function AvatarDirective(localizationService) {
 
         function link(scope, element, attrs, ctrl) {
             
             var eventBindings = [];
             scope.initials = "";
+            scope.avatarAlt = "";
 
             function onInit() {
                 if (!scope.unknownChar) {
                     scope.unknownChar = "?";
                 }
                 scope.initials = getNameInitials(scope.name);
+                setAvatarAlt(scope.name);
             }
 
             function getNameInitials(name) {
@@ -77,10 +79,23 @@ Use this directive to render an avatar.
                 return null;
             }
 
+            function setAvatarAlt(name) {
+                if (name) {
+                    localizationService
+                        .localize('general_avatar')
+                        .then(function(data) {
+                                scope.avatarAlt = data + ' ' + name;
+                            }
+                        );
+                }
+                scope.avatarAlt = null;
+            }
+
             eventBindings.push(scope.$watch('name', function (newValue, oldValue) {
                 if (newValue === oldValue) { return; }
                 if (oldValue === undefined || newValue === undefined) { return; }
                 scope.initials = getNameInitials(newValue);
+                setAvatarAlt(newValue);
             }));
 
             onInit();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js
index 96ce8735eb..9a841e3e4a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js
@@ -21,14 +21,6 @@ Use this directive to render a ui component for selecting child items to a paren
                 on-remove="vm.removeChild">
         </umb-child-selector>
 
-        <!-- use overlay to select children from -->
-        <umb-overlay
-           ng-if="vm.overlay.show"
-           model="vm.overlay"
-           position="target"
-           view="vm.overlay.view">
-        </umb-overlay>
-
 	</div>
 </pre>
 
@@ -37,7 +29,7 @@ Use this directive to render a ui component for selecting child items to a paren
 	(function () {
 		"use strict";
 
-		function Controller() {
+		function Controller(overlayService) {
 
             var vm = this;
 
@@ -64,23 +56,29 @@ Use this directive to render a ui component for selecting child items to a paren
             vm.removeChild = removeChild;
 
             function addChild($event) {
-                vm.overlay = {
+                
+                const dialog = {
                     view: "itempicker",
                     title: "Choose child",
                     availableItems: vm.availableChildren,
                     selectedItems: vm.selectedChildren,
                     event: $event,
-                    show: true,
                     submit: function(model) {
-
-                        // add selected child
-                        vm.selectedChildren.push(model.selectedItem);
+                        
+                        if (model.selectedItem) {
+                            // add selected child
+                            vm.selectedChildren.push(model.selectedItem);
+                        }
 
                         // close overlay
-                        vm.overlay.show = false;
-                        vm.overlay = null;
+                        overlayService.close();
+                    },
+                    close: function() {
+                        overlayService.close();
                     }
                 };
+
+                overlayService.open(dialog);
             }
 
             function removeChild($index) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorpicker.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorpicker.directive.js
new file mode 100644
index 0000000000..b8731c9c51
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorpicker.directive.js
@@ -0,0 +1,243 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbColorPicker
+@restrict E
+@scope
+
+@description
+<strong>Added in Umbraco v. 8.10:</strong> Use this directive to render a color picker.
+
+<h3>Markup example</h3>
+<pre>
+    <div ng-controller="My.ColorController as vm">
+        
+        <umb-color-picker
+            options="vm.options"
+            on-show="vm.show(color)"
+            on-hide="vm.hide(color)"
+            on-change="vm.change(color)">
+        </umb-color-picker>
+    
+    </div>
+</pre>
+
+<h3>Controller example</h3>
+<pre>
+    (function () {
+        "use strict";
+    
+        function Controller() {
+    
+            var vm = this;
+
+            vm.options = {
+                type: "color",
+                color: defaultColor,
+                showAlpha: false,
+                showPalette: true,
+                showPaletteOnly: false,
+                preferredFormat: "hex",
+            };
+            
+            vm.show = show;
+            vm.hide = hide;
+            vm.change = change;
+
+            function show(color) {
+                color.toHexString().trimStart("#");
+            }
+
+            function hide(color) {
+                color.toHexString().trimStart("#");
+            }
+
+            function change(color) {
+                color.toHexString().trimStart("#");
+            }
+        }
+    
+        angular.module("umbraco").controller("My.ColorController", Controller);
+    
+    })();
+</pre>
+
+@param {string} ngModel (<code>binding</code>): Value for the color picker.
+@param {object} options (<code>binding</code>): Config object for the color picker.
+@param {function} onBeforeShow (<code>expression</code>): Callback function before color picker is shown.
+@param {function} onChange (<code>expression</code>): Callback function when the color is changed.
+@param {function} onShow (<code>expression</code>): Callback function when color picker is shown.
+@param {function} onHide (<code>expression</code>): Callback function when color picker is hidden.
+@param {function} onMove (<code>expression</code>): Callback function when the color is moved in color picker.
+
+**/
+
+(function () {
+    'use strict';
+
+    function ColorPickerController($scope, $element, $timeout, assetsService, localizationService) {
+
+        const ctrl = this;
+
+        let colorPickerInstance = null;
+        let labels = {};
+
+        ctrl.$onInit = function () {
+
+            // load the separate css for the editor to avoid it blocking our js loading
+            assetsService.loadCss("lib/spectrum/spectrum.css", $scope);
+
+            // load the js file for the color picker
+            assetsService.load([
+                //"lib/spectrum/tinycolor.js",
+                "lib/spectrum/spectrum.js"
+            ], $scope).then(function () {
+
+                // init color picker
+                grabElementAndRun();
+            });
+        }
+
+        ctrl.$onChanges = function (changes) {
+            if (colorPickerInstance && changes.ngModel) {
+                colorPickerInstance.spectrum("set", changes.ngModel.currentValue);
+            }
+        }
+
+        function grabElementAndRun() {
+
+            var labelKeys = [
+                "general_cancel",
+                "general_choose",
+                "general_clear"
+            ];
+
+            localizationService.localizeMany(labelKeys).then(values => {
+                labels.cancel = values[0];
+                labels.choose = values[1];
+                labels.clear = values[2];
+            });
+
+            $timeout(function () {
+                const element = $element.find('.umb-color-picker > input')[0];
+                setColorPicker(element, labels);
+            }, 0, true);
+
+        }
+
+        function setColorPicker(element, labels) {
+
+            // Spectrum options: https://seballot.github.io/spectrum/#options
+
+            const defaultOptions = {
+                type: "color",
+                color: null,
+                showAlpha: false,
+                showInitial: false,
+                showInput: true,
+                cancelText: labels.cancel,
+                clearText: labels.clear,
+                chooseText: labels.choose,
+                preferredFormat: "hex",
+                clickoutFiresChange: true
+            };
+
+            // If has ngModel set the color
+            if (ctrl.ngModel) {
+                defaultOptions.color = ctrl.ngModel;
+            }
+
+            //const options = ctrl.options ? ctrl.options : defaultOptions;
+            const options = Utilities.extend(defaultOptions, ctrl.options);
+
+            var elem = angular.element(element);
+
+            // Create new color pickr instance
+            const colorPicker = elem.spectrum(options);
+
+            colorPickerInstance = colorPicker;
+
+            if (colorPickerInstance) {
+                // destroy the color picker instance when the dom element is removed
+                elem.on('$destroy', function () {
+                    colorPickerInstance.spectrum('destroy');
+                });
+            }
+
+            setUpCallbacks();
+
+            // Refresh the scope
+            $scope.$applyAsync();
+        }
+
+        // Spectrum events: https://seballot.github.io/spectrum/#events
+
+        function setUpCallbacks() {
+
+            if (colorPickerInstance) {
+
+                // bind hook for beforeShow
+                if (ctrl.onBeforeShow) {
+                    colorPickerInstance.on('beforeShow.spectrum', (e, tinycolor) => {
+                        $timeout(function () {
+                            ctrl.onBeforeShow({ color: tinycolor });
+                        });
+                    });
+                }
+
+                // bind hook for show
+                if (ctrl.onShow) {
+                    colorPickerInstance.on('show.spectrum', (e, tinycolor) => {
+                        $timeout(function () {
+                            ctrl.onShow({ color: tinycolor });
+                        });
+                    });
+                }
+
+                // bind hook for hide
+                if (ctrl.onHide) {
+                    colorPickerInstance.on('hide.spectrum', (e, tinycolor) => {
+                        $timeout(function () {
+                            ctrl.onHide({ color: tinycolor });
+                        });
+                    });
+                }
+
+                // bind hook for change
+                if (ctrl.onChange) {
+                    colorPickerInstance.on('change.spectrum', (e, tinycolor) => {
+                        $timeout(function () {
+                            ctrl.onChange({ color: tinycolor });
+                        });
+                    });
+                }
+
+                // bind hook for move
+                if (ctrl.onMove) {
+                    colorPickerInstance.on('move.spectrum', (e, tinycolor) => {
+                        $timeout(function () {
+                            ctrl.onMove({ color: tinycolor });
+                        });
+                    });
+                }
+
+            }
+        }
+    }
+
+    angular
+        .module('umbraco.directives')
+        .component('umbColorPicker', {
+            template: '<div class="umb-color-picker"><input type="hidden" /></div>',
+            controller: ColorPickerController,
+            bindings: {
+                ngModel: '<',
+                options: '<',
+                onBeforeShow: '&',
+                onShow: '&',
+                onHide: '&',
+                onChange: '&',
+                onMove: '&'
+            }
+        });
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
index 9d7927f59a..d6eda76940 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
@@ -30,15 +30,15 @@ Use this directive to generate color swatches to pick from.
         function link(scope, el, attr, ctrl) {
 
             // Set default to true if not defined
-            if (angular.isUndefined(scope.useColorClass)) {
+            if (Utilities.isUndefined(scope.useColorClass)) {
                 scope.useColorClass = false;
             }
 
             // Set default to "btn" if not defined
-            if (angular.isUndefined(scope.colorClassNamePrefix)) {
+            if (Utilities.isUndefined(scope.colorClassNamePrefix)) {
                 scope.colorClassNamePrefix = "btn";
             }
-            
+
             scope.setColor = function (color, $index, $event) {
                 if (scope.onSelect) {
                     // did the value change?
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js
index 0498b81963..ed9c011d72 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js
@@ -189,7 +189,7 @@ Use this directive to render a date time picker
                 };
             }
 
-            // bind hook for onOpen
+			// bind hook for onOpen
             if (ctrl.options && ctrl.onClose) {
                 ctrl.options.onClose = function (selectedDates, dateStr, instance) {
                     $timeout(function () {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdropdown.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdropdown.directive.js
index d6006114a6..cfba5be2ce 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdropdown.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdropdown.directive.js
@@ -22,7 +22,7 @@
             <umb-dropdown ng-if="vm.dropdownOpen" on-close="vm.close()" umb-keyboard-list>
                 <umb-dropdown-item
                     ng-repeat="item in vm.items">
-                    <a href="" ng-click="vm.select(item)">{{ item.name }}</a>
+                    <button type="button" class="btn-reset" ng-click="vm.select(item)">{{ item.name }}</button>
                 </umb-dropdown-item>
             </umb-dropdown>
 
@@ -110,7 +110,7 @@
 
             // Stop listening when scope is destroyed.
             scope.$on('$destroy', stopListening);
-            
+
         }
 
         var directive = {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index 3f53a1e18c..06e1c61f1e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -161,19 +161,17 @@
                 var resourceLookup = scope.contentType === "documentType" ? contentTypeResource.getAvailableCompositeContentTypes : mediaTypeResource.getAvailableCompositeContentTypes;
 
                 return resourceLookup(scope.model.id, selectedContentTypeAliases, propAliasesExisting).then(function (filteredAvailableCompositeTypes) {
-                    _.each(scope.compositionsDialogModel.availableCompositeContentTypes, function (current) {
+                    scope.compositionsDialogModel.availableCompositeContentTypes.forEach(current => {
                         //reset first
                         current.allowed = true;
                         //see if this list item is found in the response (allowed) list
-                        var found = _.find(filteredAvailableCompositeTypes, function (f) {
-                            return current.contentType.alias === f.contentType.alias;
-                        });
+                        var found = filteredAvailableCompositeTypes.find(f => current.contentType.alias === f.contentType.alias);
 
                         //allow if the item was  found in the response (allowed) list -
                         // and ensure its set to allowed if it is currently checked,
                         // DO not allow if it's a locked content type.
-                        current.allowed = scope.model.lockedCompositeContentTypes.indexOf(current.contentType.alias) === -1 &&
-                            (selectedContentTypeAliases.indexOf(current.contentType.alias) !== -1) || ((found !== null && found !== undefined) ? found.allowed : false);
+                        current.allowed = scope.model.lockedCompositeContentTypes.includes(current.contentType.alias) &&
+                            (selectedContentTypeAliases.includes(current.contentType.alias)) || (found ? found.allowed : false);
 
                     });
                 });
@@ -192,15 +190,15 @@
             function setupAvailableContentTypesModel(result) {
                 scope.compositionsDialogModel.availableCompositeContentTypes = result;
                 //iterate each one and set it up
-                _.each(scope.compositionsDialogModel.availableCompositeContentTypes, function (c) {
+                scope.compositionsDialogModel.availableCompositeContentTypes.forEach(c => {
                     //enable it if it's part of the selected model
-                    if (scope.compositionsDialogModel.compositeContentTypes.indexOf(c.contentType.alias) !== -1) {
+                    if (scope.compositionsDialogModel.compositeContentTypes.includes(c.contentType.alias)) {
                         c.allowed = true;
                     }
 
                     //set the inherited flags
                     c.inherited = false;
-                    if (scope.model.lockedCompositeContentTypes.indexOf(c.contentType.alias) > -1) {
+                    if (scope.model.lockedCompositeContentTypes.includes(c.contentType.alias)) {
                         c.inherited = true;
                     }
                     // convert icons for composite content types
@@ -281,6 +279,8 @@
                     },
                     selectCompositeContentType: function (selectedContentType) {
 
+                        var deferred = $q.defer();
+
                         //first check if this is a new selection - we need to store this value here before any further digests/async
                         // because after that the scope.model.compositeContentTypes will be populated with the selected value.
                         var newSelection = scope.model.compositeContentTypes.indexOf(selectedContentType.alias) === -1;
@@ -308,7 +308,10 @@
 
                                 //based on the selection, we need to filter the available composite types list
                                 filterAvailableCompositions(selectedContentType, newSelection).then(function () {
+                            deferred.resolve({ selectedContentType, newSelection });
                                     // TODO: Here we could probably re-enable selection if we previously showed a throbber or something
+                        }, function () {
+                                    deferred.reject();
                                 });
                             });
                         }
@@ -318,10 +321,14 @@
 
                             //based on the selection, we need to filter the available composite types list
                             filterAvailableCompositions(selectedContentType, newSelection).then(function () {
+                            deferred.resolve({ selectedContentType, newSelection });
                                 // TODO: Here we could probably re-enable selection if we previously showed a throbber or something
+                    }, function () {
+                                deferred.reject();
                             });
                         }
 
+                        return deferred.promise;
                     }
                 };
 
@@ -346,7 +353,7 @@
                     }),
                     //get where used document types
                     whereUsedContentTypeResource(scope.model.id).then(function (whereUsed) {
-                        //pass to the dialog model the content type eg documentType or mediaType 
+                        //pass to the dialog model the content type eg documentType or mediaType
                         scope.compositionsDialogModel.section = scope.contentType;
                         //pass the list of 'where used' document types
                         scope.compositionsDialogModel.whereCompositionUsed = whereUsed;
@@ -559,6 +566,7 @@
                             property.isSensitiveValue = propertyModel.isSensitiveValue;
                             property.allowCultureVariant = propertyModel.allowCultureVariant;
                             property.allowSegmentVariant = propertyModel.allowSegmentVariant;
+                            property.labelOnTop = propertyModel.labelOnTop;
 
                             // update existing data types
                             if (model.updateSameDataTypes) {
@@ -640,7 +648,8 @@
                         mandatoryMessage: null,
                         pattern: null,
                         patternMessage: null
-                    }
+                    },
+                    labelOnTop: false
                 };
 
                 // check if there already is an init property
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
new file mode 100644
index 0000000000..87d976f6d9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
@@ -0,0 +1,94 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbIcon
+@restrict E
+@scope
+@description
+Use this directive to show an render an umbraco backoffice svg icon. All svg icons used by this directive should use the following naming convention to keep things consistent: icon-[name of icon]. For example <pre>icon-alert.svg</pre>
+
+<h3>Markup example</h3>
+
+Simple icon
+<pre>
+    <umb-icon icon="icon-alert"></umb-icon>
+</pre>
+
+Icon with additional attribute. It can be treated like any other dom element
+<pre>
+    <umb-icon icon="icon-alert" class="icon-class"></umb-icon>
+</pre>
+@example
+ **/
+
+(function () {
+    "use strict";
+
+    function UmbIconDirective(iconHelper) {
+
+        var directive = {
+            replace: true,
+            transclude: true,
+            templateUrl: "views/components/umb-icon.html",
+            scope: {
+                icon: "@",
+                svgString: "=?"
+            },
+
+            link: function (scope, element) {
+                if (scope.svgString === undefined && scope.svgString !== null && scope.icon !== undefined && scope.icon !== null) {
+                    const observer = new IntersectionObserver(_lazyRequestIcon, {rootMargin: "100px"});
+                    const iconEl = element[0];
+
+                    observer.observe(iconEl);
+
+                    // make sure to disconnect the observer when the scope is destroyed
+                    scope.$on('$destroy', function () {
+                        observer.disconnect();
+                    });
+                }
+
+                scope.$watch("icon", function (newValue, oldValue) {
+                    if (newValue && oldValue) {
+                        var newicon = newValue.split(" ")[0];
+                        var oldicon = oldValue.split(" ")[0];
+
+                        if (newicon !== oldicon) {
+                            _requestIcon(newicon);
+                        }
+                    }
+                });
+
+                function _lazyRequestIcon(entries, observer) {
+                    entries.forEach(entry => {
+                        if (entry.isIntersecting === true) {
+                            observer.disconnect();
+
+                            var icon = scope.icon.split(" ")[0]; // Ensure that only the first part of the icon is used as sometimes the color is added too, e.g. see umbeditorheader.directive scope.openIconPicker
+                            _requestIcon(icon);
+                        }
+                    });
+                }
+
+                function _requestIcon(icon) {
+                    // Reset svg string before requesting new icon.
+                    scope.svgString = null;
+
+                    iconHelper.getIcon(icon)
+                        .then(data => {
+                            if (data !== null && data.svgString !== undefined) {
+                                // Watch source SVG string
+                                //icon.svgString.$$unwrapTrustedValue();
+                                scope.svgString = data.svgString;
+                            }
+                        });
+                }
+            }
+
+        };
+
+        return directive;
+    }
+
+    angular.module("umbraco.directives").directive("umbIcon", UmbIconDirective);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
index aa28d49c4a..241f1e80e8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
@@ -322,6 +322,41 @@ Use this directive to generate a thumbnail grid of media items.
             scope.$on('$destroy', function() {
                 unbindItemsWatcher();
             });
+            //determine if sort is current
+            scope.sortColumn = "name";
+            scope.sortReverse = false;
+            scope.sortDirection = "asc";
+            //check sort status
+            scope.isSortDirection = function (col, direction) {
+                return col === scope.sortColumn && direction === scope.sortDirection;
+            };
+            //change sort
+            scope.setSort = function (col) {
+                if (scope.sortColumn === col) {
+                    scope.sortReverse = !scope.sortReverse;      
+                }
+                else {
+                    scope.sortColumn = col;
+                    if (col === "updateDate") {
+                        scope.sortReverse = true;
+                    }
+                    else {
+                        scope.sortReverse = false;
+                    }
+                }
+                scope.sortDirection = scope.sortReverse ? "desc" : "asc";
+              
+            }
+            // sort function          
+            scope.sortBy = function (item) {
+                if (scope.sortColumn === "updateDate") {
+                    return [-item['isFolder'],item['updateDate']];
+                }
+                else {
+                    return [-item['isFolder'],item['name']];
+                }
+            };
+
 
         }
 
@@ -345,7 +380,8 @@ Use this directive to generate a thumbnail grid of media items.
                 onlyImages: "@",
                 onlyFolders: "@",
                 includeSubFolders: "@",
-                currentFolderId: "@"
+                currentFolderId: "@",
+                showMediaList: "="
             },
             link: link
         };
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js
index 66e03a7302..783cd7f90a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js
@@ -63,7 +63,7 @@
                         }
                         // update children
                         miniListView.children = data.items;
-                        _.each(miniListView.children, function(c) {
+                        miniListView.children.forEach(c => {
                             // child allowed by default
                             c.allowed = true;
  
@@ -92,10 +92,11 @@
 
                         // advanced item filtering is handled here
                         if (scope.entityTypeFilter && scope.entityTypeFilter.filter && scope.entityTypeFilter.filterAdvanced) {
-                            var filtered = angular.isFunction(scope.entityTypeFilter.filter)
+                            var filtered = Utilities.isFunction(scope.entityTypeFilter.filter)
                                 ? _.filter(miniListView.children, scope.entityTypeFilter.filter)
                                 : _.where(miniListView.children, scope.entityTypeFilter.filter);
-                            _.each(filtered, (node) => node.allowed = false);
+                            
+                            filtered.forEach(node => node.allowed = false);
                         }
 
                         // update pagination
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search/umbminisearch.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminisearch.component.js
similarity index 79%
rename from src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search/umbminisearch.component.js
rename to src/Umbraco.Web.UI.Client/src/common/directives/components/umbminisearch.component.js
index d7aee744e4..6c65cb6e23 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search/umbminisearch.component.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminisearch.component.js
@@ -4,7 +4,7 @@
     angular
         .module('umbraco')
         .component('umbMiniSearch', {
-            templateUrl: 'views/components/umb-mini-search/umb-mini-search.html',
+            templateUrl: 'views/components/umb-mini-search.html',
             controller: UmbMiniSearchController,
             controllerAs: 'vm',
             bindings: {
@@ -18,6 +18,9 @@
     function UmbMiniSearchController($scope) {
         
         var vm = this;
+
+        vm.onKeyDown = onKeyDown;
+        vm.onChange = onChange;
         
         var searchDelay = _.debounce(function () {
             $scope.$apply(function () {
@@ -27,23 +30,23 @@
             });
         }, 500);
     
-        vm.onKeyDown = function (ev) {
+        function onKeyDown(evt) {
             //13: enter
-            switch (ev.keyCode) {
+            switch (evt.keyCode) {
                 case 13:
                     if (vm.onSearch) {
                         vm.onSearch();
                     }
                     break;
             }
-        };
+        }
     
-        vm.onChange = function () {
+        function onChange() {
             if (vm.onStartTyping) {
                 vm.onStartTyping();
             }
             searchDelay();
-        };
+        }
 
     }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js
index 72dba3ca2f..f9b26c81a5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js
@@ -49,6 +49,7 @@
 
                         }
                     });
+                    
                 }
             });
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js
index b49d47b979..f939eb5e46 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js
@@ -16,6 +16,7 @@ Use this directive to generate a pagination.
             total-pages="vm.pagination.totalPages"
             on-next="vm.nextPage"
             on-prev="vm.prevPage"
+            on-change="vm.changePage"
             on-go-to-page="vm.goToPage">
         </umb-pagination>
 
@@ -34,10 +35,11 @@ Use this directive to generate a pagination.
             vm.pagination = {
                 pageNumber: 1,
                 totalPages: 10
-            }
+            };
 
             vm.nextPage = nextPage;
             vm.prevPage = prevPage;
+            vm.changePage = changePage;
             vm.goToPage = goToPage;
 
             function nextPage(pageNumber) {
@@ -51,6 +53,12 @@ Use this directive to generate a pagination.
                 console.log(pageNumber);
                 alert("prevpage");
             }
+            
+            function changePage(pageNumber) {
+                // do magic here
+                console.log(pageNumber);
+                alert("changepage");
+            }
 
             function goToPage(pageNumber) {
                 // do magic here
@@ -81,6 +89,11 @@ Use this directive to generate a pagination.
     <ul>
         <li><code>pageNumber</code>: The page number</li>
     </ul>
+@param {callback=} onChange (<code>binding</code>): Callback method when changing page.
+    <h3>The callback returns:</h3>
+    <ul>
+        <li><code>pageNumber</code>: The page number</li>
+    </ul>
 **/
 
 (function() {
@@ -175,9 +188,7 @@ Use this directive to generate a pagination.
                  scope.onGoToPage(scope.pageNumber);
              }
              if (scope.onChange) {
-                 if (scope.onChange) {
-                     scope.onChange({ "pageNumber": scope.pageNumber });
-                 }
+                 scope.onChange({ "pageNumber": scope.pageNumber });
              }
          };
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbrangeslider.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbrangeslider.directive.js
index e467522c84..ed74f94f26 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbrangeslider.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbrangeslider.directive.js
@@ -46,7 +46,7 @@ For extra details about options and events take a look here: https://refreshless
 </pre>
 
 @param {object} ngModel (<code>binding</code>): Value for the slider.
-@param {object} options (<code>binding</code>): Config object for the date picker.
+@param {object} options (<code>binding</code>): Config object for the slider.
 @param {callback} onSetup (<code>callback</code>): onSetup gets triggered when the slider is initialized
 @param {callback} onUpdate (<code>callback</code>): onUpdate fires every time the slider values are changed.
 @param {callback} onSlide (<code>callback</code>): onSlide gets triggered when the handle is being dragged.
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js
index 3f1929e97d..1554c136b6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js
@@ -98,9 +98,9 @@
     })();
 </pre>
 
-@param {string} icon (<code>binding</code>): The node icon.
-@param {string} name (<code>binding</code>): The node name.
-@param {string} published (<code>binding</code>): The node published state.
+@param {array} items (<code>binding</code>): The items for the table.
+@param {array} itemProperties (<code>binding</code>): The properties for the items to use in table.
+@param {boolean} allowSelectAll (<code>binding</code>): Specify whether to allow select all.
 @param {function} onSelect (<code>expression</code>): Callback function when the row is selected.
 @param {function} onClick (<code>expression</code>): Callback function when the "Name" column link is clicked.
 @param {function} onSelectAll (<code>expression</code>): Callback function when selecting all items.
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtextarea.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtextarea.directive.js
new file mode 100644
index 0000000000..8b584b873c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtextarea.directive.js
@@ -0,0 +1,59 @@
+(function () {
+    'use strict';
+
+    function umbTextarea($document) {
+
+        function autogrow(scope, element, attributes) {
+            if (!element.hasClass("autogrow")) {
+                // no autogrow for you today
+                return;
+            }
+
+            // get possible minimum height style
+            var minHeight = parseInt(window.getComputedStyle(element[0]).getPropertyValue("min-height")) || 0;
+
+            // prevent newlines in textbox
+            element.on("keydown", function (evt) {
+                if (evt.which === 13) {
+                    //evt.preventDefault();
+                }
+            });
+
+            element.on("input", function (evt) {
+                element.css({
+                    height: 'auto',
+                    minHeight: 0
+                });
+
+                var contentHeight = this.scrollHeight;
+                var borderHeight = 1;
+                var paddingHeight = 4;
+
+                element.css({
+                    minHeight: null, // remove property
+                    height: contentHeight + borderHeight + paddingHeight + "px" // because we're using border-box
+                });
+            });
+
+            // watch model changes from the outside to adjust height
+            scope.$watch(attributes.ngModel, trigger);
+
+            // set initial size
+            trigger();
+
+            function trigger() {
+                setTimeout(element.triggerHandler.bind(element, "input"), 1);
+            }
+        }
+
+        var directive = {
+            restrict: 'E',
+            link: autogrow
+        };
+
+        return directive;
+    }
+
+    angular.module('umbraco.directives').directive('textarea', umbTextarea);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtooltip.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtooltip.directive.js
index ef7006be2c..ce1885a7cf 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtooltip.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtooltip.directive.js
@@ -77,13 +77,17 @@ Use this directive to render a tooltip.
          scope.tooltipStyles.left = 0;
          scope.tooltipStyles.top = 0;
 
-         function setTooltipPosition(event) {
+          function setTooltipPosition(event) {
 
-            var container = $("#contentwrapper");
-            var containerLeft = container[0].offsetLeft;
-            var containerRight = containerLeft + container[0].offsetWidth;
-            var containerTop = container[0].offsetTop;
-            var containerBottom = containerTop + container[0].offsetHeight;
+            var overlay = $(event.target).closest('.umb-overlay');
+            var container = overlay.length > 0 ? overlay : $("#contentwrapper");
+
+            let rect = container[0].getBoundingClientRect();
+
+            var containerLeft = rect.left;
+            var containerRight = containerLeft + rect.width;
+            var containerTop = rect.top;
+            var containerBottom = containerTop + rect.height;
 
             var elementHeight = null;
             var elementWidth = null;
@@ -102,39 +106,43 @@ Use this directive to render a tooltip.
             position.left = event.pageX - (elementWidth / 2);
             position.top = event.pageY;
 
-            // check to see if element is outside screen
-            // outside right
-            if (position.left + elementWidth > containerRight) {
-               position.right = 10;
-               position.left = "inherit";
+            if (overlay.length > 0) {
+                position.left = event.pageX - rect.left - (elementWidth / 2);
+                position.top = event.pageY - rect.top;
             }
+            else {
+                // check to see if element is outside screen
+                // outside right
+                if (position.left + elementWidth > containerRight) {
+                    position.right = 10;
+                    position.left = "inherit";
+                }
 
-            // outside bottom
-            if (position.top + elementHeight > containerBottom) {
-               position.bottom = 10;
-               position.top = "inherit";
-            }
+                // outside bottom
+                if (position.top + elementHeight > containerBottom) {
+                    position.bottom = 10;
+                    position.top = "inherit";
+                }
 
-            // outside left
-            if (position.left < containerLeft) {
-               position.left = containerLeft + 10;
-               position.right = "inherit";
-            }
+                // outside left
+                if (position.left < containerLeft) {
+                    position.left = containerLeft + 10;
+                    position.right = "inherit";
+                }
 
-            // outside top
-            if (position.top < containerTop) {
-               position.top = 10;
-               position.bottom = "inherit";
+                // outside top
+                if (position.top < containerTop) {
+                    position.top = 10;
+                    position.bottom = "inherit";
+                }
             }
 
             scope.tooltipStyles = position;
 
             el.css(position);
-
          }
 
          setTooltipPosition(scope.event);
-
       }
 
       var directive = {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js
index 6a8ffa7969..3581aed9e0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js
@@ -19,6 +19,17 @@ function umbFileUpload() {
                 //clear the element value - this allows us to pick the same file again and again
                 el.val('');
             });
+
+            el.on('drag dragstart dragend dragover dragenter dragleave drop', function (e) {
+                e.preventDefault();
+                e.stopPropagation();
+            })
+            .on('dragover dragenter', function () {
+                scope.$emit("isDragover", { value: true });
+            })
+            .on('dragleave dragend drop', function () {
+                scope.$emit("isDragover", { value: false });
+            });
         }
     };
 }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js
index 653b4f427c..db1e38adc6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js
@@ -78,6 +78,8 @@
         /** Called when the component initializes */
         function onInit() {
             $scope.$on("filesSelected", onFilesSelected);
+            $scope.$on("isDragover", isDragover);
+
             initialize();
         }
 
@@ -118,7 +120,9 @@
                         isImage: mediaHelper.detectIfImageByExtension(file),
                         extension: getExtension(file)
                     };
+
                     f.fileSrc = getThumbnail(f);
+
                     return f;
                 });
 
@@ -228,19 +232,22 @@
                 var index = i; //capture
 
                 var isImage = mediaHelper.detectIfImageByExtension(files[i].name);
+                var extension = getExtension(files[i].name);
 
-                //save the file object to the files collection
-                vm.files.push({
+                var f = {
                     isImage: isImage,
-                    extension: getExtension(files[i].name),
+                    extension: extension,
                     fileName: files[i].name,
                     isClientSide: true
-                });
+                };
+
+                // Save the file object to the files collection
+                vm.files.push(f);
 
                 //special check for a comma in the name
                 newVal += files[i].name.split(',').join('-') + ",";
 
-                if (isImage) {
+                if (isImage || extension === "svg") {
 
                     var deferred = $q.defer();
 
@@ -293,6 +300,11 @@
             }
         }
 
+        function isDragover(e, args) {
+            vm.dragover = args.value;
+            angularHelper.safeApply($scope);
+        }
+
     };
 
     var umbPropertyFileUploadComponent = {
@@ -303,6 +315,7 @@
             propertyAlias: "@",
             value: "<",
             hideSelection: "<",
+            dragover: "<",
             /**
              * Called when a file is selected on this instance
              */
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/umbkeyboardlist.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/umbkeyboardlist.directive.js
index 20572fdf16..0b743d0f10 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/util/umbkeyboardlist.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/util/umbkeyboardlist.directive.js
@@ -10,12 +10,12 @@
 <pre>
     <div>
         <ul umb-keyboard-list>
-            <li><a href="">Item 1</a></li>
-            <li><a href="">Item 2</a></li>
-            <li><a href="">Item 3</a></li>
-            <li><a href="">Item 4</a></li>
-            <li><a href="">Item 5</a></li>
-            <li><a href="">Item 6</a></li>
+            <li><button type="button" class="btn-reset">Item 1</button></li>
+            <li><button type="button" class="btn-reset">Item 2</button></li>
+            <li><button type="button" class="btn-reset">Item 3</button></li>
+            <li><button type="button" class="btn-reset">Item 4</button></li>
+            <li><button type="button" class="btn-reset">Item 5</button></li>
+            <li><button type="button" class="btn-reset">Item 6</button></li>
         </ul>
     </div>
 </pre>
@@ -33,11 +33,11 @@ angular.module('umbraco.directives')
         return {
             restrict: 'A',
             link: function (scope, element, attr) {
-                
+
                 var listItems = [];
                 var currentIndex = 0;
                 var focusSet = false;
-            
+
                 $timeout(function(){
                     // get list of all links in the list
                     listItems = element.find("li :tabbable");
@@ -82,7 +82,7 @@ angular.module('umbraco.directives')
 
                 function arrowDown() {
                     if (currentIndex < listItems.length - 1) {
-                        // only bump the current index if the focus is already 
+                        // only bump the current index if the focus is already
                         // set else we just want to focus the first element
                         if (focusSet) {
                             currentIndex++;
@@ -112,4 +112,4 @@ angular.module('umbraco.directives')
 
             }
         };
-    }]);
\ No newline at end of file
+    }]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/showvalidationonsubmit.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/showvalidationonsubmit.directive.js
index 78dd00e64b..ad646748b7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/showvalidationonsubmit.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/showvalidationonsubmit.directive.js
@@ -11,6 +11,7 @@
             link: function (scope, element, attr, ctrl) {
 
                 var formMgr = ctrl.length > 1 ? ctrl[1] : null;
+                const hiddenClass = 'ng-hide';
 
                 //We can either get the form submitted status by the parent directive valFormManager
                 //or we can check upwards in the DOM for the css class... lets try both :)
@@ -18,17 +19,17 @@
                 //reset the status.
                 var submitted = element.closest(".show-validation").length > 0 || (formMgr && formMgr.showValidation);
                 if (!submitted) {
-                    element.hide();
+                    element[0].classList.add(hiddenClass);
                 }
 
                 var unsubscribe = [];
 
                 unsubscribe.push(scope.$on("formSubmitting", function (ev, args) {
-                    element.show();
+                    element[0].classList.remove(hiddenClass);
                 }));
 
                 unsubscribe.push(scope.$on("formSubmitted", function (ev, args) {
-                    element.hide();
+                    element[0].classList.add(hiddenClass);
                 }));
 
                 //no isolate scope to listen to element destroy
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js
index 6638ed4e6d..c7894da171 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js
@@ -12,48 +12,88 @@
 * Another thing this directive does is to ensure that any .control-group that contains form elements that are invalid will
 * be marked with the 'error' css class. This ensures that labels included in that control group are styled correctly.
 **/
-function valFormManager(serverValidationManager, $rootScope, $timeout, $location, overlayService, eventsService, $routeParams, navigationService, editorService, localizationService) {
+function valFormManager(serverValidationManager, $rootScope, $timeout, $location, overlayService, eventsService, $routeParams, navigationService, editorService, localizationService, angularHelper) {
 
     var SHOW_VALIDATION_CLASS_NAME = "show-validation";
     var SAVING_EVENT_NAME = "formSubmitting";
     var SAVED_EVENT_NAME = "formSubmitted";
 
+    function notify(scope) {
+        scope.$broadcast("valStatusChanged", { form: scope.formCtrl });
+    }
+
+    function ValFormManagerController($scope) {
+        //This exposes an API for direct use with this directive
+
+        // We need this as a way to reference this directive in the scope chain. Since this directive isn't a component and 
+        // because it's an attribute instead of an element, we can't use controllerAs or anything like that. Plus since this is
+        // an attribute an isolated scope doesn't work so it's a bit weird. By doing this we are able to lookup the parent valFormManager
+        // in the scope hierarchy even if the DOM hierarchy doesn't match (i.e. in infinite editing)
+        $scope.valFormManager = this;
+
+        var unsubscribe = [];
+        var self = this;
+
+        //This is basically the same as a directive subscribing to an event but maybe a little
+        // nicer since the other directive can use this directive's API instead of a magical event
+        this.onValidationStatusChanged = function (cb) {
+            unsubscribe.push($scope.$on("valStatusChanged", function (evt, args) {
+                cb.apply(self, [evt, args]);
+            }));
+        };
+
+        this.isShowingValidation = () => $scope.showValidation === true;
+
+        this.notify = function () {
+            notify($scope);
+        }
+
+        this.isValid = function () {
+            return !$scope.formCtrl.$invalid;
+        }
+
+        //Ensure to remove the event handlers when this instance is destroyted
+        $scope.$on('$destroy', function () {
+            for (var u in unsubscribe) {
+                unsubscribe[u]();
+            }
+        });
+    }
+
+    /**
+     * Find's the valFormManager in the scope/DOM hierarchy
+     * @param {any} scope
+     * @param {any} ctrls
+     * @param {any} index
+     */
+    function getAncestorValFormManager(scope, ctrls, index) {
+
+        // first check the normal directive inheritance which relies on DOM inheritance
+        var found = ctrls[index];
+        if (found) {
+            return found;
+        }
+
+        // not found, then fallback to searching the scope chain, this may be needed when DOM inheritance isn't maintained but scope
+        // inheritance is (i.e.infinite editing)
+        var found = angularHelper.traverseScopeChain(scope, s => s && s.valFormManager && s.valFormManager.constructor.name === "ValFormManagerController");
+        return found ? found.valFormManager : null;
+    }
+
     return {
         require: ["form", "^^?valFormManager", "^^?valSubView"],
         restrict: "A",
-        controller: function($scope) {
-            //This exposes an API for direct use with this directive
-
-            var unsubscribe = [];
-            var self = this;
-
-            //This is basically the same as a directive subscribing to an event but maybe a little
-            // nicer since the other directive can use this directive's API instead of a magical event
-            this.onValidationStatusChanged = function (cb) {
-                unsubscribe.push($scope.$on("valStatusChanged", function(evt, args) {
-                    cb.apply(self, [evt, args]);
-                }));
-            };
-
-            this.showValidation = $scope.showValidation === true;
-
-            //Ensure to remove the event handlers when this instance is destroyted
-            $scope.$on('$destroy', function () {
-                for (var u in unsubscribe) {
-                    unsubscribe[u]();
-                }
-            });
-        },
+        controller: ValFormManagerController,
         link: function (scope, element, attr, ctrls) {
 
             function notifySubView() {
-                if (subView){
+                if (subView) {
                     subView.valStatusChanged({ form: formCtrl, showValidation: scope.showValidation });
                 }
             }
 
-            var formCtrl = ctrls[0];
-            var parentFormMgr = ctrls.length > 0 ? ctrls[1] : null;
+            var formCtrl = scope.formCtrl = ctrls[0];
+            var parentFormMgr = scope.parentFormMgr = getAncestorValFormManager(scope, ctrls, 1);
             var subView = ctrls.length > 1 ? ctrls[2] : null;
             var labels = {};
 
@@ -72,45 +112,22 @@ function valFormManager(serverValidationManager, $rootScope, $timeout, $location
             });
 
             //watch the list of validation errors to notify the application of any validation changes
-            scope.$watch(function () {
-                //the validators are in the $error collection: https://docs.angularjs.org/api/ng/type/form.FormController#$error
-                //since each key is the validator name (i.e. 'required') we can't just watch the number of keys, we need to watch
-                //the sum of the items inside of each key
+            scope.$watch(() => angularHelper.countAllFormErrors(formCtrl),
+                function (e) {
+
+                    notify(scope);
+
+                    notifySubView();
+
+                    //find all invalid elements' .control-group's and apply the error class
+                    var inError = element.find(".control-group .ng-invalid").closest(".control-group");
+                    inError.addClass("error");
+
+                    //find all control group's that have no error and ensure the class is removed
+                    var noInError = element.find(".control-group .ng-valid").closest(".control-group").not(inError);
+                    noInError.removeClass("error");
 
-                //get the lengths of each array for each key in the $error collection
-                var validatorLengths = _.map(formCtrl.$error, function (val, key) {
-                    // if there are child ng-forms, include the $error collections in those as well
-                    var innerErrorCount = _.reduce(
-                            _.map(val, v =>
-                                _.reduce(
-                                    _.map(v.$error, e => e.length),
-                                    (m, n) => m + n
-                                )
-                            ),
-                            (memo, num) => memo + num
-                        );
-                    return val.length + innerErrorCount;
                 });
-                //sum up all numbers in the resulting array
-                var sum = _.reduce(validatorLengths, function (memo, num) {
-                    return memo + num;
-                }, 0);
-                //this is the value we watch to notify of any validation changes on the form
-                return sum;
-            }, function (e) {
-                scope.$broadcast("valStatusChanged", { form: formCtrl });
-
-                notifySubView();
-
-                //find all invalid elements' .control-group's and apply the error class
-                var inError = element.find(".control-group .ng-invalid").closest(".control-group");
-                inError.addClass("error");
-
-                //find all control group's that have no error and ensure the class is removed
-                var noInError = element.find(".control-group .ng-valid").closest(".control-group").not(inError);
-                noInError.removeClass("error");
-
-            });
 
             //This tracks if the user is currently saving a new item, we use this to determine
             // if we should display the warning dialog that they are leaving the page - if a new item
@@ -119,7 +136,7 @@ function valFormManager(serverValidationManager, $rootScope, $timeout, $location
             var isSavingNewItem = false;
 
             //we should show validation if there are any msgs in the server validation collection
-            if (serverValidationManager.items.length > 0 || (parentFormMgr && parentFormMgr.showValidation)) {
+            if (serverValidationManager.items.length > 0 || (parentFormMgr && parentFormMgr.isShowingValidation())) {
                 element.addClass(SHOW_VALIDATION_CLASS_NAME);
                 scope.showValidation = true;
                 notifySubView();
@@ -128,7 +145,7 @@ function valFormManager(serverValidationManager, $rootScope, $timeout, $location
             var unsubscribe = [];
 
             //listen for the forms saving event
-            unsubscribe.push(scope.$on(SAVING_EVENT_NAME, function(ev, args) {
+            unsubscribe.push(scope.$on(SAVING_EVENT_NAME, function (ev, args) {
                 element.addClass(SHOW_VALIDATION_CLASS_NAME);
                 scope.showValidation = true;
                 notifySubView();
@@ -137,21 +154,18 @@ function valFormManager(serverValidationManager, $rootScope, $timeout, $location
             }));
 
             //listen for the forms saved event
-            unsubscribe.push(scope.$on(SAVED_EVENT_NAME, function(ev, args) {
+            unsubscribe.push(scope.$on(SAVED_EVENT_NAME, function (ev, args) {
                 //remove validation class
                 element.removeClass(SHOW_VALIDATION_CLASS_NAME);
                 scope.showValidation = false;
                 notifySubView();
-                //clear form state as at this point we retrieve new data from the server
-                //and all validation will have cleared at this point
-                formCtrl.$setPristine();
             }));
 
             var confirmed = false;
 
             //This handles the 'unsaved changes' dialog which is triggered when a route is attempting to be changed but
             // the form has pending changes
-            var locationEvent = $rootScope.$on('$locationChangeStart', function(event, nextLocation, currentLocation) {
+            var locationEvent = $rootScope.$on('$locationChangeStart', function (event, nextLocation, currentLocation) {
 
                 var infiniteEditors = editorService.getEditors();
 
@@ -178,10 +192,10 @@ function valFormManager(serverValidationManager, $rootScope, $timeout, $location
                             "disableEscKey": true,
                             "submitButtonLabel": labels.stayButton,
                             "closeButtonLabel": labels.discardChangesButton,
-                            submit: function() {
+                            submit: function () {
                                 overlayService.close();
                             },
-                            close: function() {
+                            close: function () {
                                 // close all editors
                                 editorService.closeAll();
                                 // allow redirection
@@ -190,7 +204,7 @@ function valFormManager(serverValidationManager, $rootScope, $timeout, $location
                                 var parts = nextPath.split("?");
                                 var query = {};
                                 if (parts.length > 1) {
-                                    _.each(parts[1].split("&"), function(q) {
+                                    parts[1].split("&").forEach(q => {
                                         var keyVal = q.split("=");
                                         query[keyVal[0]] = keyVal[1];
                                     });
@@ -215,13 +229,15 @@ function valFormManager(serverValidationManager, $rootScope, $timeout, $location
             unsubscribe.push(locationEvent);
 
             //Ensure to remove the event handler when this instance is destroyted
-            scope.$on('$destroy', function() {
+            scope.$on('$destroy', function () {
                 for (var u in unsubscribe) {
                     unsubscribe[u]();
                 }
             });
 
-            $timeout(function(){
+            // TODO: I'm unsure why this exists, i believe this may be a hack for something like tinymce which might automatically
+            // change a form value on load but we need it to be $pristine?
+            $timeout(function () {
                 formCtrl.$setPristine();
             }, 1000);
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
index 30d3530efb..26c0403f85 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
@@ -8,24 +8,26 @@
 * We will listen for server side validation changes
 * and when an error is detected for this property we'll show the error message.
 * In order for this directive to work, the valFormManager directive must be placed on the containing form.
+* We don't set the validity of this validator to false when client side validation fails, only when server side
+* validation fails however we do respond to the client side validation changes to display error and adjust UI state.
 **/
-function valPropertyMsg(serverValidationManager, localizationService) {
+function valPropertyMsg(serverValidationManager, localizationService, angularHelper) {
 
     return {
-        require: ['^^form', '^^valFormManager', '^^umbProperty', '?^^umbVariantContent'],
+        require: ['^^form', '^^valFormManager', '^^umbProperty', '?^^umbVariantContent', '?^^valPropertyMsg'],
         replace: true,
         restrict: "E",
         template: "<div ng-show=\"errorMsg != ''\" class='alert alert-error property-error' >{{errorMsg}}</div>",
         scope: {},
         link: function (scope, element, attrs, ctrl) {
-            
+
             var unsubscribe = [];
             var watcher = null;
-            var hasError = false;
+            var hasError = false; // tracks if there is a child error or an explicit error
 
             //create properties on our custom scope so we can use it in our template
-            scope.errorMsg = "";            
-            
+            scope.errorMsg = "";
+
             //the property form controller api
             var formCtrl = ctrl[0];
             //the valFormManager controller api
@@ -33,21 +35,19 @@ function valPropertyMsg(serverValidationManager, localizationService) {
             //the property controller api
             var umbPropCtrl = ctrl[2];
             //the variants controller api
-            var umbVariantCtrl = ctrl[3];            
-            
+            var umbVariantCtrl = ctrl[3];
+
             var currentProperty = umbPropCtrl.property;
             scope.currentProperty = currentProperty;
 
             var currentCulture = currentProperty.culture;
-            var currentSegment = currentProperty.segment;     
-            
+            var currentSegment = currentProperty.segment;
+
             // validation object won't exist when editor loads outside the content form (ie in settings section when modifying a content type)
             var isMandatory = currentProperty.validation ? currentProperty.validation.mandatory : undefined;
 
             var labels = {};
-            localizationService.localize("errors_propertyHasErrors").then(function (data) {
-                labels.propertyHasErrors = data;
-            });
+            var showValidation = false;
 
             if (umbVariantCtrl) {
                 //if we are inside of an umbVariantContent directive
@@ -61,17 +61,16 @@ function valPropertyMsg(serverValidationManager, localizationService) {
                     return;
                 }
             }
-            
+
             // if we have reached this part, and there is no culture, then lets fallback to invariant. To get the validation feedback for invariant language.
             currentCulture = currentCulture || "invariant";
-            
 
             // Gets the error message to display
             function getErrorMsg() {
                 //this can be null if no property was assigned
                 if (scope.currentProperty) {
                     //first try to get the error msg from the server collection
-                    var err = serverValidationManager.getPropertyError(scope.currentProperty.alias, null, "", null);
+                    var err = serverValidationManager.getPropertyError(umbPropCtrl.getValidationPath(), null, "", null);
                     //if there's an error message use it
                     if (err && err.errorMsg) {
                         return err.errorMsg;
@@ -84,43 +83,108 @@ function valPropertyMsg(serverValidationManager, localizationService) {
                 return labels.propertyHasErrors;
             }
 
-            // We need to subscribe to any changes to our model (based on user input)
-            // This is required because when we have a server error we actually invalidate 
-            // the form which means it cannot be resubmitted. 
-            // So once a field is changed that has a server error assigned to it
-            // we need to re-validate it for the server side validator so the user can resubmit
-            // the form. Of course normal client-side validators will continue to execute. 
+            // check the current errors in the form (and recursive sub forms), if there is 1 or 2 errors
+            // we can check if those are valPropertyMsg or valServer and can clear our error in those cases.
+            function checkAndClearError() {
+
+                var errCount = angularHelper.countAllFormErrors(formCtrl);
+
+                if (errCount === 0) {
+                    return true;
+                }
+
+                if (errCount > 2) {
+                    return false;
+                }
+
+                var hasValServer = Utilities.isArray(formCtrl.$error.valServer);
+                if (errCount === 1 && hasValServer) {
+                    return true;
+                }
+
+                var hasOwnErr = hasExplicitError();
+                if ((errCount === 1 && hasOwnErr) || (errCount === 2 && hasOwnErr && hasValServer)) {
+
+                    var propertyValidationPath = umbPropCtrl.getValidationPath();
+                    // check if we can clear it based on child server errors, if we are the only explicit one remaining we can clear ourselves
+                    if (isLastServerError(propertyValidationPath)) {
+                        serverValidationManager.removePropertyError(propertyValidationPath, currentCulture, "", currentSegment);
+                        return true;
+                    }
+                    return false;
+                }
+
+                return false;
+            }
+
+            // returns true if there is an explicit valPropertyMsg validation error on the form
+            function hasExplicitError() {
+                return Utilities.isArray(formCtrl.$error.valPropertyMsg);
+            }
+
+            // returns true if there is only a single server validation error for this property validation key in it's validation path
+            function isLastServerError(propertyValidationPath) {
+                var nestedErrs = serverValidationManager.getPropertyErrorsByValidationPath(
+                    propertyValidationPath,
+                    currentCulture,
+                    currentSegment,
+                    { matchType: "prefix" });
+                if (nestedErrs.length === 0 || (nestedErrs.length === 1 && nestedErrs[0].propertyAlias === propertyValidationPath)) {
+
+                    return true;
+                }
+                return false;
+            }
+
+            // a custom $validator function called on when each child ngModelController changes a value.
+            function resetServerValidityValidator(fieldController) {
+                const storedFieldController = fieldController; // pin a reference to this
+                return (modelValue, viewValue) => {
+                    // if the ngModelController value has changed, then we can check and clear the error
+                    if (storedFieldController.$dirty) {
+                        if (checkAndClearError()) {
+                            resetError();
+                        }
+                    }
+                    return true; // this validator is always 'valid'
+                };
+            }
+
+            // collect all ng-model controllers recursively within the umbProperty form 
+            // until it reaches the next nested umbProperty form
+            function collectAllNgModelControllersRecursively(controls, ngModels) {
+                controls.forEach(ctrl => {
+                    if (angularHelper.isForm(ctrl)) {
+                        // if it's not another umbProperty form then recurse
+                        if (ctrl.$name !== formCtrl.$name) {
+                            collectAllNgModelControllersRecursively(ctrl.$getControls(), ngModels);
+                        }
+                    }
+                    else if (ctrl.hasOwnProperty('$modelValue') && Utilities.isObject(ctrl.$validators)) {
+                        ngModels.push(ctrl);
+                    }
+                });
+            }
+
+            // We start the watch when there's server validation errors detected.
+            // We watch on the current form's properties and on first watch or if they are dynamically changed
+            // we find all ngModel controls recursively on this form (but stop recursing before we get to the next)
+            // umbProperty form). Then for each ngModelController we assign a new $validator. This $validator 
+            // will execute whenever the value is changed which allows us to check and reset the server validator
             function startWatch() {
-                //if there's not already a watch
                 if (!watcher) {
-                    watcher = scope.$watch("currentProperty.value",
-                        function (newValue, oldValue) {
-                            if (angular.equals(newValue, oldValue)) {
-                                return;
-                            }
 
-                            var errCount = 0;
-
-                            for (var e in formCtrl.$error) {
-                                if (Utilities.isArray(formCtrl.$error[e])) {
-                                    errCount++;
+                    watcher = scope.$watchCollection(
+                        () => formCtrl,
+                        function (updatedFormController) {
+                            var ngModels = [];
+                            collectAllNgModelControllersRecursively(updatedFormController.$getControls(), ngModels);
+                            ngModels.forEach(x => {
+                                if (!x.$validators.serverValidityResetter) {
+                                    x.$validators.serverValidityResetter = resetServerValidityValidator(x);
                                 }
-                            }         
-
-                            //we are explicitly checking for valServer errors here, since we shouldn't auto clear
-                            // based on other errors. We'll also check if there's no other validation errors apart from valPropertyMsg, if valPropertyMsg
-                            // is the only one, then we'll clear.
-
-                            if (errCount === 0 
-                                || (errCount === 1 && Utilities.isArray(formCtrl.$error.valPropertyMsg)) 
-                                || (formCtrl.$invalid && Utilities.isArray(formCtrl.$error.valServer))) {
-                                scope.errorMsg = "";
-                                formCtrl.$setValidity('valPropertyMsg', true);
-                            } else if (showValidation && scope.errorMsg === "") {
-                                formCtrl.$setValidity('valPropertyMsg', false);
-                                scope.errorMsg = getErrorMsg();
-                            }
-                        }, true);
+                            });
+                        });
                 }
             }
 
@@ -132,22 +196,31 @@ function valPropertyMsg(serverValidationManager, localizationService) {
                 }
             }
 
+            function resetError() {
+                stopWatch();
+                hasError = false;
+                formCtrl.$setValidity('valPropertyMsg', true);
+                scope.errorMsg = "";
+                
+            }
+
+            // This deals with client side validation changes and is executed anytime validators change on the containing 
+            // valFormManager. This allows us to know when to display or clear the property error data for non-server side errors.
             function checkValidationStatus() {
                 if (formCtrl.$invalid) {
                     //first we need to check if the valPropertyMsg validity is invalid
                     if (formCtrl.$error.valPropertyMsg && formCtrl.$error.valPropertyMsg.length > 0) {
                         //since we already have an error we'll just return since this means we've already set the 
-                        // hasError and errorMsg properties which occurs below in the serverValidationManager.subscribe
+                        //hasError and errorMsg properties which occurs below in the serverValidationManager.subscribe
                         return;
                     }
                     //if there are any errors in the current property form that are not valPropertyMsg
                     else if (_.without(_.keys(formCtrl.$error), "valPropertyMsg").length > 0) {
-                        
+
                         // errors exist, but if the property is NOT mandatory and has no value, the errors should be cleared
                         if (isMandatory !== undefined && isMandatory === false && !currentProperty.value) {
-                            hasError = false;
-                            showValidation = false;
-                            scope.errorMsg = "";
+
+                            resetError();
 
                             // if there's no value, the controls can be reset, which clears the error state on formCtrl
                             for (let control of formCtrl.$getControls()) {
@@ -164,99 +237,115 @@ function valPropertyMsg(serverValidationManager, localizationService) {
                         }
                     }
                     else {
-                        hasError = false;
-                        scope.errorMsg = "";
+                        resetError();
                     }
                 }
                 else {
-                    hasError = false;
-                    scope.errorMsg = "";
+                    resetError();
                 }
             }
 
-            //if there's any remaining errors in the server validation service then we should show them.
-            var showValidation = serverValidationManager.items.length > 0;
-            if (!showValidation) {
-                //We can either get the form submitted status by the parent directive valFormManager (if we add a property to it)
-                //or we can just check upwards in the DOM for the css class (easier for now).
-                //The initial hidden state can't always be hidden because when we switch variants in the content editor we cannot
-                //reset the status.
-                showValidation = element.closest(".show-validation").length > 0;
-            }
+            function onInit() {
 
+                localizationService.localize("errors_propertyHasErrors").then(function (data) {
 
-            //listen for form validation changes.
-            //The alternative is to add a watch to formCtrl.$invalid but that would lead to many more watches then
-            // subscribing to this single watch.
-            valFormManager.onValidationStatusChanged(function (evt, args) {
-                checkValidationStatus();
-            });
+                    labels.propertyHasErrors = data;
 
-            //listen for the forms saving event
-            unsubscribe.push(scope.$on("formSubmitting", function (ev, args) {
-                showValidation = true;
-                if (hasError && scope.errorMsg === "") {
-                    scope.errorMsg = getErrorMsg();
-                    startWatch();
-                }
-                else if (!hasError) {
-                    scope.errorMsg = "";
-                    stopWatch();
-                }
-            }));
-
-            //listen for the forms saved event
-            unsubscribe.push(scope.$on("formSubmitted", function (ev, args) {
-                showValidation = false;
-                scope.errorMsg = "";
-                formCtrl.$setValidity('valPropertyMsg', true);
-                stopWatch();
-            }));
-
-            //listen for server validation changes
-            // NOTE: we pass in "" in order to listen for all validation changes to the content property, not for
-            // validation changes to fields in the property this is because some server side validators may not
-            // return the field name for which the error belongs too, just the property for which it belongs.
-            // It's important to note that we need to subscribe to server validation changes here because we always must
-            // indicate that a content property is invalid at the property level since developers may not actually implement
-            // the correct field validation in their property editors.
-
-            if (scope.currentProperty) { //this can be null if no property was assigned
-
-                function serverValidationManagerCallback(isValid, propertyErrors, allErrors) {
-                    hasError = !isValid;
-                    if (hasError) {
-                        //set the error message to the server message
-                        scope.errorMsg = propertyErrors[0].errorMsg;
-                        //flag that the current validator is invalid
-                        formCtrl.$setValidity('valPropertyMsg', false);
-                        startWatch();
+                    //if there's any remaining errors in the server validation service then we should show them.
+                    showValidation = serverValidationManager.items.length > 0;
+                    if (!showValidation) {
+                        //We can either get the form submitted status by the parent directive valFormManager (if we add a property to it)
+                        //or we can just check upwards in the DOM for the css class (easier for now).
+                        //The initial hidden state can't always be hidden because when we switch variants in the content editor we cannot
+                        //reset the status.
+                        showValidation = element.closest(".show-validation").length > 0;
                     }
-                    else {
-                        scope.errorMsg = "";
-                        //flag that the current validator is valid
-                        formCtrl.$setValidity('valPropertyMsg', true);
-                        stopWatch();
+
+                    //listen for form validation changes.
+                    //The alternative is to add a watch to formCtrl.$invalid but that would lead to many more watches then
+                    // subscribing to this single watch.
+                    valFormManager.onValidationStatusChanged(function (evt, args) {
+                        checkValidationStatus();
+                    });
+
+                    //listen for the forms saving event
+                    unsubscribe.push(scope.$on("formSubmitting", function (ev, args) {
+                        showValidation = true;
+                        if (hasError && scope.errorMsg === "") {
+                            scope.errorMsg = getErrorMsg();
+                            startWatch();
+                        }
+                        else if (!hasError) {
+                            resetError();
+                        }
+                    }));
+
+                    //listen for the forms saved event
+                    unsubscribe.push(scope.$on("formSubmitted", function (ev, args) {
+                        showValidation = false;
+                        resetError();
+                    }));
+
+                    if (scope.currentProperty) { //this can be null if no property was assigned
+
+                        // listen for server validation changes for property validation path prefix.
+                        // We pass in "" in order to listen for all validation changes to the content property, not for
+                        // validation changes to fields in the property this is because some server side validators may not
+                        // return the field name for which the error belongs too, just the property for which it belongs.
+                        // It's important to note that we need to subscribe to server validation changes here because we always must
+                        // indicate that a content property is invalid at the property level since developers may not actually implement
+                        // the correct field validation in their property editors.
+
+                        function serverValidationManagerCallback(isValid, propertyErrors, allErrors) {
+                            var hadError = hasError;
+                            hasError = !isValid;
+                            if (hasError) {
+                                //set the error message to the server message
+                                scope.errorMsg = propertyErrors.length > 1 ? labels.propertyHasErrors : propertyErrors[0].errorMsg || labels.propertyHasErrors;
+                                //flag that the current validator is invalid
+                                formCtrl.$setValidity('valPropertyMsg', false);
+                                startWatch();
+
+                                // This check is required in order to be able to reset ourselves and is typically for complex editor
+                                // scenarios where the umb-property itself doesn't contain any ng-model controls which means that the
+                                // above serverValidityResetter technique will not work to clear valPropertyMsg errors.
+                                // In order for this to work we rely on the current form controller's $pristine state. This means that anytime
+                                // the form is submitted whether there are validation errors or not the state must be reset... this is automatically
+                                // taken care of with the formHelper.resetForm method that should be used in all cases. $pristine is required because it's
+                                // a value that is cascaded to all form controls based on the hierarchy of child ng-model controls. This allows us to easily
+                                // know if a value has changed. The alternative is what we used to do which was to put a deep $watch on the entire complex value
+                                // which is hugely inefficient. 
+                                if (propertyErrors.length === 1 && hadError && !formCtrl.$pristine) {
+                                    var propertyValidationPath = umbPropCtrl.getValidationPath();
+                                    serverValidationManager.removePropertyError(propertyValidationPath, currentCulture, "", currentSegment);
+                                    resetError();
+                                }
+                            }
+                            else {
+                                resetError();
+                            }
+                        }
+
+                        unsubscribe.push(serverValidationManager.subscribe(
+                            umbPropCtrl.getValidationPath(),
+                            currentCulture,
+                            "",
+                            serverValidationManagerCallback,
+                            currentSegment,
+                            { matchType: "prefix" } // match property validation path prefix
+                        ));
                     }
-                }
-
-                unsubscribe.push(serverValidationManager.subscribe(scope.currentProperty.alias,
-                    currentCulture,
-                    "",
-                    serverValidationManagerCallback,
-                    currentSegment
-                    )
-                );
 
+                });
             }
 
             //when the scope is disposed we need to unsubscribe
             scope.$on('$destroy', function () {
                 stopWatch();
-                for (var u in unsubscribe) {
-                    unsubscribe[u]();
-                }
+                unsubscribe.forEach(u => u());
             });
+
+            onInit();
         }
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertyvalidator.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertyvalidator.directive.js
index 37303d22ad..d66e4bd2af 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertyvalidator.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertyvalidator.directive.js
@@ -28,9 +28,9 @@ function valPropertyValidator(serverValidationManager) {
 
             var modelCtrl = ctrls[0];
             var propCtrl = ctrls.length > 1 ? ctrls[1] : null;
-            
-            // Check whether the scope has a valPropertyValidator method 
-            if (!scope.valPropertyValidator || !angular.isFunction(scope.valPropertyValidator)) {
+
+            // Check whether the scope has a valPropertyValidator method
+            if (!scope.valPropertyValidator || !Utilities.isFunction(scope.valPropertyValidator)) {
                 throw new Error('val-property-validator directive must specify a function to call');
             }
             
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserver.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserver.directive.js
index 3fa9220f7b..4180457792 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserver.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserver.directive.js
@@ -13,14 +13,14 @@ function valServer(serverValidationManager) {
         link: function (scope, element, attr, ctrls) {
 
             var modelCtrl = ctrls[0];
-            var umbPropCtrl = ctrls.length > 1 ? ctrls[1] : null;
+            var umbPropCtrl = ctrls[1];
             if (!umbPropCtrl) {
                 //we cannot proceed, this validator will be disabled
                 return;
             }
             
             // optional reference to the varaint-content-controller, needed to avoid validation when the field is invariant on non-default languages.
-            var umbVariantCtrl = ctrls.length > 2 ? ctrls[2] : null;
+            var umbVariantCtrl = ctrls[2];
 
             var currentProperty = umbPropCtrl.property;
             var currentCulture = currentProperty.culture;
@@ -55,8 +55,11 @@ function valServer(serverValidationManager) {
                 }
             }
 
-            //Need to watch the value model for it to change, previously we had  subscribed to 
-            //modelCtrl.$viewChangeListeners but this is not good enough if you have an editor that
+            // Get the property validation path if there is one, this is how wiring up any nested/virtual property validation works
+            var propertyValidationPath = umbPropCtrl ? umbPropCtrl.getValidationPath() : currentProperty.alias;
+
+            // Need to watch the value model for it to change, previously we had  subscribed to 
+            // modelCtrl.$viewChangeListeners but this is not good enough if you have an editor that
             // doesn't specifically have a 2 way ng binding. This is required because when we
             // have a server error we actually invalidate the form which means it cannot be 
             // resubmitted. So once a field is changed that has a server error assigned to it
@@ -69,14 +72,16 @@ function valServer(serverValidationManager) {
                         return modelCtrl.$modelValue;
                     }, function (newValue, oldValue) {
 
-                        if (!newValue || angular.equals(newValue, oldValue)) {
+                        if (!newValue || Utilities.equals(newValue, oldValue)) {
                             return;
                         }
 
                         if (modelCtrl.$invalid) {
                             modelCtrl.$setValidity('valServer', true);
+                            
                             //clear the server validation entry
-                            serverValidationManager.removePropertyError(currentProperty.alias, currentCulture, fieldName, currentSegment);
+                            serverValidationManager.removePropertyError(propertyValidationPath, currentCulture, fieldName, currentSegment);
+
                             stopWatch();
                         }
                     }, true);
@@ -105,7 +110,9 @@ function valServer(serverValidationManager) {
                     stopWatch();
                 }
             }
-            unsubscribe.push(serverValidationManager.subscribe(currentProperty.alias,
+
+            unsubscribe.push(serverValidationManager.subscribe(
+                propertyValidationPath,
                 currentCulture,
                 fieldName,
                 serverValidationManagerCallback,
@@ -114,9 +121,7 @@ function valServer(serverValidationManager) {
 
             scope.$on('$destroy', function () {
                 stopWatch();
-                for (var u in unsubscribe) {
-                    unsubscribe[u]();
-                }
+                unsubscribe.forEach(u => u());
             });
         }
     };
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valservermatch.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valservermatch.directive.js
new file mode 100644
index 0000000000..5f8600c8c0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valservermatch.directive.js
@@ -0,0 +1,125 @@
+/**
+ * @ngdoc directive
+ * @name umbraco.directives.directive:valServerMatch
+ * @restrict A
+ * @description A custom validator applied to a form/ng-form within an umbProperty that validates server side validation data 
+ * contained within the serverValidationManager. The data can be matched on "exact", "prefix", "suffix" or "contains" matches against 
+ * a property validation key. The attribute value can be in multiple value types:
+ * - STRING = The property validation key to have an exact match on. If matched, then the form will have a valServerMatch validator applied.
+ * - OBJECT = A dictionary where the key is the match type: "contains", "prefix", "suffix" and the value is either:
+ *     - ARRAY = A list of property validation keys to match on. If any are matched then the form will have a valServerMatch validator applied.
+ *     - OBJECT = A dictionary where the key is the validator error name applied to the form and the value is the STRING of the property validation key to match on
+**/
+function valServerMatch(serverValidationManager) {
+
+    return {
+        require: ['form', '^^umbProperty', '?^^umbVariantContent'],
+        restrict: "A",
+        scope: {
+            valServerMatch: "="
+        },
+        link: function (scope, element, attr, ctrls) {
+
+            var formCtrl = ctrls[0];
+            var umbPropCtrl = ctrls[1];
+            if (!umbPropCtrl) {
+                //we cannot proceed, this validator will be disabled
+                return;
+            }
+
+            // optional reference to the varaint-content-controller, needed to avoid validation when the field is invariant on non-default languages.
+            var umbVariantCtrl = ctrls[2];
+
+            var currentProperty = umbPropCtrl.property;
+            var currentCulture = currentProperty.culture;
+            var currentSegment = currentProperty.segment;
+
+            if (umbVariantCtrl) {
+                //if we are inside of an umbVariantContent directive
+
+                var currentVariant = umbVariantCtrl.editor.content;
+
+                // Lets check if we have variants and we are on the default language then ...
+                if (umbVariantCtrl.content.variants.length > 1 && (!currentVariant.language || !currentVariant.language.isDefault) && !currentCulture && !currentSegment && !currentProperty.unlockInvariantValue) {
+                    //This property is locked cause its a invariant property shown on a non-default language.
+                    //Therefor do not validate this field.
+                    return;
+                }
+            }
+
+            // if we have reached this part, and there is no culture, then lets fallback to invariant. To get the validation feedback for invariant language.
+            currentCulture = currentCulture || "invariant";
+
+            var unsubscribe = [];
+
+            function bindCallback(validationKey, matchVal, matchType) {
+
+                if (!matchVal) return;
+
+                if (Utilities.isString(matchVal)) {
+                    matchVal = [matchVal]; // normalize to an array since the value can also natively be an array
+                }
+
+                // match for each string in the array
+                matchVal.forEach(m => {
+                    unsubscribe.push(serverValidationManager.subscribe(
+                        m,
+                        currentCulture,
+                        "",
+                        // the callback
+                        function (isValid, propertyErrors, allErrors) {
+                            if (!isValid) {
+                                formCtrl.$setValidity(validationKey, false);
+                            }
+                            else {
+                                formCtrl.$setValidity(validationKey, true);
+                            }
+                        },
+                        currentSegment,
+                        matchType ? { matchType: matchType } : null // specify the match type
+                    ));
+                });
+
+            }
+
+            if (Utilities.isObject(scope.valServerMatch)) {
+                var allowedKeys = ["contains", "prefix", "suffix"];
+                Object.keys(scope.valServerMatch).forEach(matchType => {
+                    if (allowedKeys.indexOf(matchType) === -1) {
+                        throw "valServerMatch dictionary keys must be one of " + allowedKeys.join();
+                    }
+
+                    var matchVal = scope.valServerMatch[matchType];
+
+                    if (Utilities.isObject(matchVal)) {
+
+                        // as an object, the key will be the validation error instead of the default "valServerMatch"
+                        Object.keys(matchVal).forEach(valKey => {
+
+                            // matchVal[valKey] can be an ARRAY or a STRING
+                            bindCallback(valKey, matchVal[valKey], matchType);
+                        });
+                    }
+                    else {
+
+                        // matchVal can be an ARRAY or a STRING
+                        bindCallback("valServerMatch", matchVal, matchType);
+                    }
+                });
+            }
+            else if (Utilities.isString(scope.valServerMatch)) {
+
+                // a STRING match which will be an exact match on the string supplied as the property validation key
+                bindCallback("valServerMatch", scope.valServerMatch, null);
+            }
+            else {
+                throw "valServerMatch value must be a string or a dictionary";
+            }
+
+            scope.$on('$destroy', function () {
+                unsubscribe.forEach(u => u());
+            });
+        }
+    };
+}
+angular.module('umbraco.directives.validation').directive("valServerMatch", valServerMatch);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
index 1f5aaaa1c2..97d11879e9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
@@ -1,36 +1,49 @@
 /**
-* @ngdoc directive
-* @name umbraco.directives.directive:valSubView
-* @restrict A
-* @description Used to show validation warnings for a editor sub view to indicate that the section content has validation errors in its data.
-* In order for this directive to work, the valFormManager directive must be placed on the containing form.
+ * @ngdoc directive
+ * @name umbraco.directives.directive:valSubView
+ * @restrict A
+ * @description Used to show validation warnings for a editor sub view (used in conjunction with:
+ * umb-editor-sub-view or umb-editor-sub-views) to indicate that the section content has validation errors in its data.
+ * In order for this directive to work, the valFormManager directive must be placed on the containing form.
+ * When applied to 
 **/
 (function () {
     'use strict';
 
+    // Since this is a directive applied as an attribute, the value of that attribtue is the 'model' object property 
+    // of the current inherited scope that the hasError/errorClass properties will apply to. 
+    // This directive cannot have it's own scope because it's an attribute applied to another scoped directive.
+    // Due to backwards compatibility we can't really change this, ideally this would have it's own scope/properties.
+
     function valSubViewDirective() {
 
-        function controller($scope, $element) {
+        function controller($scope, $element, $attrs) {
+
+            var model = $scope.model; // this is the default and required for backwards compat
+            if ($attrs && $attrs.valSubView) {
+                // get the property to use
+                model = $scope[$attrs.valSubView];
+            }
+
             //expose api
             return {
                 valStatusChanged: function (args) {
 
-                    // TODO: Verify this is correct, does $scope.model ever exist?
-                    if ($scope.model) {
+                    if (model) {
                         if (!args.form.$valid) {
                             var subViewContent = $element.find(".ng-invalid");
 
                             if (subViewContent.length > 0) {
-                                $scope.model.hasError = true;
-                                $scope.model.errorClass = args.showValidation ? 'show-validation' : null;
+                                model.hasError = true;
+                                model.errorClass = args.showValidation ? 'show-validation' : null;
                             } else {
-                                $scope.model.hasError = false;
-                                $scope.model.errorClass = null;
+                                model.hasError = false;
+                                model.errorClass = null;
                             }
                         }
                         else {
-                            $scope.model.hasError = false;
-                            $scope.model.errorClass = null;
+                            model.hasError = false;
+                            model.errorClass = null;
                         }
                     }
                 }
@@ -40,12 +53,18 @@
         function link(scope, el, attr, ctrl) {
 
             //if there are no containing form or valFormManager controllers, then we do nothing
-            if (!ctrl || !Utilities.isArray(ctrl) || ctrl.length !== 2 || !ctrl[0] || !ctrl[1]) {
+            if (!ctrl[1]) {
                 return;
             }
 
+            var model = scope.model; // this is the default and required for backwards compat
+            if (attr && attr.valSubView) {
+                // get the property to use
+                model = scope[attr.valSubView];
+            }
+
             var valFormManager = ctrl[1];
-            scope.model.hasError = false;
+            model.hasError = false;
 
             //listen for form validation changes
             valFormManager.onValidationStatusChanged(function (evt, args) {
@@ -54,14 +73,14 @@
                     var subViewContent = el.find(".ng-invalid");
 
                     if (subViewContent.length > 0) {
-                        scope.model.hasError = true;
+                        model.hasError = true;
                     } else {
-                        scope.model.hasError = false;
+                        model.hasError = false;
                     }
 
                 }
                 else {
-                    scope.model.hasError = false;
+                    model.hasError = false;
                 }
             });
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/compareArrays.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/compareArrays.filter.js
index 13f603260d..0cbf3077e6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/filters/compareArrays.filter.js
+++ b/src/Umbraco.Web.UI.Client/src/common/filters/compareArrays.filter.js
@@ -2,13 +2,17 @@ angular.module("umbraco.filters")
     .filter('compareArrays', function() {
         return function inArray(array, compareArray, compareProperty) {
 
+            if (!compareArray || !compareArray.length) {
+                return [...array];
+            }
+
             var result = [];
 
-            angular.forEach(array, function(arrayItem){
+            array.forEach(function(arrayItem){
 
                 var exists = false;
 
-                angular.forEach(compareArray, function(compareItem){
+                compareArray.forEach(function(compareItem){
                     if( arrayItem[compareProperty] === compareItem[compareProperty]) {
                         exists = true;
                     }
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsJoinArray.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsJoinArray.filter.js
index a519f81054..870e497541 100644
--- a/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsJoinArray.filter.js
+++ b/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsJoinArray.filter.js
@@ -13,7 +13,7 @@
  */
 angular.module("umbraco.filters").filter('umbCmsJoinArray', function () {
     return function join(array, separator, prop) {
-        return (!angular.isUndefined(prop) ? array.map(function (item) {
+        return (!Utilities.isUndefined(prop) ? array.map(function (item) {
             return item[prop];
         }) : array).join(separator || '');
     };
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/umbwordlimit.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/umbwordlimit.filter.js
index 93f0bddc96..bd597b21d0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/filters/umbwordlimit.filter.js
+++ b/src/Umbraco.Web.UI.Client/src/common/filters/umbwordlimit.filter.js
@@ -17,7 +17,7 @@
                 return collection;
             }
 
-            if (angular.isUndefined(property)) {
+            if (Utilities.isUndefined(property)) {
                 return collection;
             }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
index 69a4fe35c9..6b2d993fd5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
+++ b/src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
@@ -6,6 +6,7 @@ angular.module('umbraco.interceptors', [])
 
         $httpProvider.interceptors.push('securityInterceptor');
         $httpProvider.interceptors.push('debugRequestInterceptor');
+        $httpProvider.interceptors.push('requiredHeadersInterceptor');
         $httpProvider.interceptors.push('doNotPostDollarVariablesOnPostRequestInterceptor');
         $httpProvider.interceptors.push('cultureRequestInterceptor');
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/requiredheaders.interceptor.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/requiredheaders.interceptor.js
new file mode 100644
index 0000000000..3d96b86acd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/interceptors/requiredheaders.interceptor.js
@@ -0,0 +1,28 @@
+(function () {
+    'use strict';
+
+    /**
+     * Used to set required headers on all requests where necessary
+     * @param {any} $q
+     * @param {any} urlHelper
+     */
+    function requiredHeadersInterceptor($q, urlHelper) {
+        return {
+            //dealing with requests:
+            'request': function (config) {
+
+                // This is a standard header that should be sent for all ajax requests and is required for 
+                // how the server handles auth rejections, etc... see
+                // https://github.com/aspnet/AspNetKatana/blob/e2b18ec84ceab7ffa29d80d89429c9988ab40144/src/Microsoft.Owin.Security.Cookies/Provider/DefaultBehavior.cs
+                // https://brockallen.com/2013/10/27/using-cookie-authentication-middleware-with-web-api-and-401-response-codes/
+                config.headers["X-Requested-With"] = "XMLHttpRequest";
+
+                return config;
+            }
+        };
+    }
+
+    angular.module('umbraco.interceptors').factory('requiredHeadersInterceptor', requiredHeadersInterceptor);
+
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
index f07a2a441c..8293443dd4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
@@ -1,5 +1,5 @@
 angular.module('umbraco.mocks').
-    factory('mocksUtils', ['$cookies', function ($cookies) {
+    factory('mocksUtils', ['$cookies', 'udiService', function ($cookies, udiService) {
         'use strict';
          
         //by default we will perform authorization
@@ -40,13 +40,17 @@ angular.module('umbraco.mocks').
             },
 
             /** Creats a mock content object */
-            getMockContent: function(id) {
+            getMockContent: function (id, key, udi) {
+                key = key || String.CreateGuid();
+                var udi = udi || udiService.build("content", key);
                 var node = {
                     name: "My content with id: " + id,
                     updateDate: new Date().toIsoDateTimeString(),
                     publishDate: new Date().toIsoDateTimeString(),
                     createDate: new Date().toIsoDateTimeString(),
                     id: id,
+                    key: key,
+                    udi: udi,
                     parentId: 1234,
                     icon: "icon-umb-content",
                     owner: { name: "Administrator", id: 0 },
@@ -280,6 +284,182 @@ angular.module('umbraco.mocks').
                 return node;
             },
 
+
+            /** Creats a mock variant content object */
+            getMockVariantContent: function(id, key, udi) {
+                key = key || String.CreateGuid();
+                var udi = udi || udiService.build("content", key);
+                var node = {
+                    name: "My content with id: " + id,
+                    updateDate: new Date().toIsoDateTimeString(),
+                    publishDate: new Date().toIsoDateTimeString(),
+                    createDate: new Date().toIsoDateTimeString(),
+                    id: id,
+                    key: key,
+                    udi: udi,
+                    parentId: 1234,
+                    icon: "icon-umb-content",
+                    owner: { name: "Administrator", id: 0 },
+                    updater: { name: "Per Ploug Krogslund", id: 1 },
+                    path: "-1,1234,2455",
+                    allowedActions: ["U", "H", "A"],
+                    contentTypeAlias: "testAlias", 
+                    contentTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB", 
+                    apps: [],
+                    variants: [
+                        {
+                            name: "",
+                            language: null,
+                            segment: null,
+                            state: "NotCreated",
+                            updateDate: "0001-01-01 00:00:00",
+                            createDate: "0001-01-01 00:00:00",
+                            publishDate: null,
+                            releaseDate: null,
+                            expireDate: null,
+                            notifications: [],
+                            tabs: [
+                                {
+                                    label: "Content",
+                                    id: 2,
+                                    properties: [
+                                        { alias: "testproperty", label: "Test property", view: "textbox", value: "asdfghjk" },
+                                        { alias: "valTest", label: "Validation test", view: "validationtest", value: "asdfasdf" },
+                                        { alias: "bodyText", label: "Body Text", description: "Here you enter the primary article contents", view: "rte", value: "<p>askjdkasj lasjd</p>", config: {} },
+                                        { alias: "textarea", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } },
+                                        { alias: "media", label: "Media picker", view: "mediapicker", value: "1234,23242,23232,23231", config: {multiPicker: 1} }
+                                    ]
+                                },
+                                {
+                                    label: "Sample Editor",
+                                    id: 3,
+                                    properties: [
+                                        { alias: "datepicker", label: "Datepicker", view: "datepicker", config: { pickTime: false, format: "yyyy-MM-dd" } },
+                                        { alias: "tags", label: "Tags", view: "tags", value: "" }
+                                    ]
+                                },
+                                {
+                                    label: "This",
+                                    id: 4,
+                                    properties: [
+                                        { alias: "valTest4", label: "Validation test", view: "validationtest", value: "asdfasdf" },
+                                        { alias: "bodyText4", label: "Body Text", description: "Here you enter the primary article contents", view: "rte", value: "<p>askjdkasj lasjd</p>", config: {} },
+                                        { alias: "textarea4", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } },
+                                        { alias: "content4", label: "Content picker", view: "contentpicker", value: "1234,23242,23232,23231" }
+                                    ]
+                                },
+                                {
+                                    label: "Is",
+                                    id: 5,
+                                    properties: [
+                                        { alias: "valTest5", label: "Validation test", view: "validationtest", value: "asdfasdf" },
+                                        { alias: "bodyText5", label: "Body Text", description: "Here you enter the primary article contents", view: "rte", value: "<p>askjdkasj lasjd</p>", config: {} },
+                                        { alias: "textarea5", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } },
+                                        { alias: "content5", label: "Content picker", view: "contentpicker", value: "1234,23242,23232,23231" }
+                                    ]
+                                },
+                                {
+                                    label: "Overflown",
+                                    id: 6,
+                                    properties: [
+                                        { alias: "valTest6", label: "Validation test", view: "validationtest", value: "asdfasdf" },
+                                        { alias: "bodyText6", label: "Body Text", description: "Here you enter the primary article contents", view: "rte", value: "<p>askjdkasj lasjd</p>", config: {} },
+                                        { alias: "textarea6", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } },
+                                        { alias: "content6", label: "Content picker", view: "contentpicker", value: "1234,23242,23232,23231" }
+                                    ]
+                                },
+                                {
+                                    label: "Generic Properties",
+                                    id: 0,
+                                    properties: [
+                                        {
+                                            label: 'Id',
+                                            value: 1234,
+                                            view: "readonlyvalue",
+                                            alias: "_umb_id"
+                                        },
+                                        {
+                                            label: 'Created by',
+                                            description: 'Original author',
+                                            value: "Administrator",
+                                            view: "readonlyvalue",
+                                            alias: "_umb_createdby"
+                                        },
+                                        {
+                                            label: 'Created',
+                                            description: 'Date/time this document was created',
+                                            value: new Date().toIsoDateTimeString(),
+                                            view: "readonlyvalue",
+                                            alias: "_umb_createdate"
+                                        },
+                                        {
+                                            label: 'Updated',
+                                            description: 'Date/time this document was created',
+                                            value: new Date().toIsoDateTimeString(),
+                                            view: "readonlyvalue",
+                                            alias: "_umb_updatedate"
+                                        },                            
+                                        {
+                                            label: 'Document Type',
+                                            value: "Home page",
+                                            view: "readonlyvalue",
+                                            alias: "_umb_doctype" 
+                                        },
+                                        {
+                                            label: 'Publish at',
+                                            description: 'Date/time to publish this document',
+                                            value: new Date().toIsoDateTimeString(),
+                                            view: "datepicker",
+                                            alias: "_umb_releasedate"
+                                        },
+                                        { 
+                                            label: 'Unpublish at',
+                                            description: 'Date/time to un-publish this document',
+                                            value: new Date().toIsoDateTimeString(),
+                                            view: "datepicker",
+                                            alias: "_umb_expiredate"
+                                        },
+                                        {
+                                            label: 'Template', 
+                                            value: "myTemplate",
+                                            view: "dropdown",
+                                            alias: "_umb_template",
+                                            config: {
+                                                items: {
+                                                    "" : "-- Choose template --",
+                                                    "myTemplate" : "My Templates",
+                                                    "home" : "Home Page",
+                                                    "news" : "News Page"
+                                                }
+                                            }
+                                        },
+                                        {
+                                            label: 'Link to document',
+                                            value: ["/testing" + id, "http://localhost/testing" + id, "http://mydomain.com/testing" + id].join(),
+                                            view: "urllist",
+                                            alias: "_umb_urllist"
+                                        },
+                                        {
+                                            alias: "test", label: "Stuff", view: "test", value: "",
+                                            config: {
+                                                fields: [
+                                                            { alias: "embedded", label: "Embbeded", view: "textstring", value: "" },
+                                                            { alias: "embedded2", label: "Embbeded 2", view: "contentpicker", value: "" },
+                                                            { alias: "embedded3", label: "Embbeded 3", view: "textarea", value: "" },
+                                                            { alias: "embedded4", label: "Embbeded 4", view: "datepicker", value: "" }
+                                                ]
+                                            }
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                };
+
+                return node;
+            },
+
             getMockEntity : function(id){
                 return {name: "hello", id: id, icon: "icon-file"};
             },
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js
index 3b58c127a7..aeb6229360 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js
@@ -8,12 +8,12 @@ angular.module('umbraco.mocks').
       }
 
       function returnNodebyIds(status, data, headers) {
-        var ids = mocksUtils.getParameterByName(data, "ids") || "1234,1234,4234";
+        var ids = mocksUtils.getParameterByName(data, "ids") || ['1234','1234','4234'];
         var items = [];
         
-        _.each(ids, function(id){
-          items.push(_getNode( parseInt( id, 10 )) );
-        });
+        for (var i = 0; i < ids.length; i += 1) {
+          items.push(_getNode(parseInt(ids[i], 10)));
+        }
 
         return [200, items, null];
       }
@@ -26,8 +26,6 @@ angular.module('umbraco.mocks').
 
           var id = mocksUtils.getParameterByName(data, "id") || 1234;
           id = parseInt(id, 10);
-
-
           
           return [200, _getNode(id), null];
       }
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/variantcontent.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/variantcontent.mocks.js
new file mode 100644
index 0000000000..3a434bdadc
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/variantcontent.mocks.js
@@ -0,0 +1,56 @@
+angular.module('umbraco.mocks').
+    factory('variantContentMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
+    'use strict';
+
+    function returnEmptyVariantNode(status, data, headers) {
+
+        if (!mocksUtils.checkAuth()) {
+            return [401, null, null];
+        }
+
+        var response = returnVariantNodebyId(200, "", null);
+        var node = response[1];
+        var parentId = mocksUtils.getParameterByName(data, "parentId") || 1234;
+
+        node.name = "";
+        node.id = 0;
+        node.parentId = parentId;
+
+        node.tabs.forEach(function(tab) {
+            tab.properties.forEach(function(property) {
+                property.value = "";
+            });
+        });
+
+        return response;
+    }
+
+    function returnVariantNodebyId(status, data, headers) {
+
+        if (!mocksUtils.checkAuth()) {
+            return [401, null, null];
+        }
+
+        var id = mocksUtils.getParameterByName(data, "id") || "1234";
+        id = parseInt(id, 10);
+
+        var node = mocksUtils.getMockVariantContent(id);
+
+        return [200, node, null];
+    }
+
+
+    return {
+        register: function () {
+
+            $httpBackend
+                .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Content/GetById?'))
+                .respond(returnVariantNodebyId);
+
+            $httpBackend
+                .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Content/GetEmpty'))
+                .respond(returnEmptyVariantNode);
+
+        }
+    };
+}]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js
index da6f78a6a5..868bc4c6d5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js
@@ -19,7 +19,8 @@ Umbraco.Sys.ServerVariables = {
         "dashboardApiBaseUrl": "/umbraco/UmbracoApi/Dashboard/",
         "updateCheckApiBaseUrl": "/umbraco/Api/UpdateCheck/",
         "relationApiBaseUrl": "/umbraco/UmbracoApi/Relation/",
-        "rteApiBaseUrl": "/umbraco/UmbracoApi/RichTextPreValue/"
+        "rteApiBaseUrl": "/umbraco/UmbracoApi/RichTextPreValue/",
+        "iconApiBaseUrl": "/umbraco/UmbracoApi/Icon/"
     },
     umbracoSettings: {
         "umbracoPath": "/umbraco",
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
index 936f69e738..e26ac26f7c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
@@ -12,7 +12,24 @@
 function authResource($q, $http, umbRequestHelper, angularHelper) {
 
   return {
-
+     /**
+     * @ngdoc method
+     * @name umbraco.resources.authResource#get2FAProviders
+     * @methodOf umbraco.resources.authResource
+     *
+     * @description
+     * Logs the Umbraco backoffice user in if the credentials are good
+     *
+     * ##usage
+     * <pre>
+     * authResource.get2FAProviders()
+     *    .then(function(data) {
+     *        //Do stuff ...
+     *    });
+     * </pre>
+     * @returns {Promise} resourcePromise object
+     * 
+     */
     get2FAProviders: function () {
 
       return umbRequestHelper.resourcePromise(
@@ -23,6 +40,25 @@ function authResource($q, $http, umbRequestHelper, angularHelper) {
         'Could not retrive two factor provider info');
     },
 
+    /**
+    * @ngdoc method
+    * @name umbraco.resources.authResource#get2FAProviders
+    * @methodOf umbraco.resources.authResource
+    *
+    * @description
+    * Generate the two-factor authentication code for the provider and send it to the user
+    *
+    * ##usage
+    * <pre>
+    * authResource.send2FACode(provider)
+    *    .then(function(data) {
+    *        //Do stuff ...
+    *    });
+    * </pre>
+    * @param {string} provider Name of the provider
+    * @returns {Promise} resourcePromise object
+    *
+    */
     send2FACode: function (provider) {
 
       return umbRequestHelper.resourcePromise(
@@ -34,6 +70,26 @@ function authResource($q, $http, umbRequestHelper, angularHelper) {
         'Could not send code');
     },
 
+    /**
+    * @ngdoc method
+    * @name umbraco.resources.authResource#get2FAProviders
+    * @methodOf umbraco.resources.authResource
+    *
+    * @description
+    * Verify the two-factor authentication code entered by the user against the provider
+    *
+    * ##usage
+    * <pre>
+    * authResource.verify2FACode(provider, code)
+    *    .then(function(data) {
+    *        //Do stuff ...
+    *    });
+    * </pre>
+    * @param {string} provider Name of the provider
+    * @param {string} code The two-factor authentication code
+    * @returns {Promise} resourcePromise object
+    *
+    */
     verify2FACode: function (provider, code) {
 
       return umbRequestHelper.resourcePromise(
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
index 7bc2a9d2c8..368eab2339 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
@@ -42,6 +42,25 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
 
     return {
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentResource#allowsCultureVariation
+        * @methodOf umbraco.resources.contentResource
+        *
+        * @description
+        * Check whether any content types have culture variant enabled
+        *
+        * ##usage
+        * <pre>
+        * contentResource.allowsCultureVariation()
+        *    .then(function() {
+        *       Do stuff...
+        *    });
+        * </pre>
+        * 
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         allowsCultureVariation: function () {
             return umbRequestHelper.resourcePromise(
                 $http.get(
@@ -51,6 +70,26 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
                 'Failed to retrieve variant content types');
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentResource#savePermissions
+        * @methodOf umbraco.resources.contentResource
+        *
+        * @description
+        * Save user group permissions for the content
+        *
+        * ##usage
+        * <pre>
+        * contentResource.savePermissions(saveModel)
+        *    .then(function() {
+        *       Do stuff...
+        *    });
+        * </pre>
+        *
+        * @param {object} The object which contains the user group permissions for the content
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         savePermissions: function (saveModel) {
             if (!saveModel) {
                 throw "saveModel cannot be null";
@@ -68,7 +107,25 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
                 'Failed to save permissions');
         },
 
-
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentResource#getRecycleBin
+        * @methodOf umbraco.resources.contentResource
+        *
+        * @description
+        * Get the recycle bin
+        *
+        * ##usage
+        * <pre>
+        * contentResource.getRecycleBin()
+        *    .then(function() {
+        *       Do stuff...
+        *    });
+        * </pre>
+        *
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         getRecycleBin: function () {
             return umbRequestHelper.resourcePromise(
                 $http.get(
@@ -337,6 +394,26 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
                 'Failed to delete item ' + id);
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentResource#deleteBlueprint
+        * @methodOf umbraco.resources.contentResource
+        *
+        * @description
+        * Deletes a content blueprint item with a given id
+        *
+        * ##usage
+        * <pre>
+        * contentResource.deleteBlueprint(1234)
+        *    .then(function() {
+        *        alert('its gone!');
+        *    });
+        * </pre>
+        *
+        * @param {Int} id id of content blueprint item to delete
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         deleteBlueprint: function (id) {
             return umbRequestHelper.resourcePromise(
                 $http.post(
@@ -382,29 +459,90 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
                 });
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentResource#getBlueprintById
+        * @methodOf umbraco.resources.contentResource
+        *
+        * @description
+        * Gets a content blueprint item with a given id
+        *
+        * ##usage
+        * <pre>
+        * contentResource.getBlueprintById(1234)
+        *    .then(function() {
+        *       Do stuff...
+        *    });
+        * </pre>
+        *
+        * @param {Int} id id of content blueprint item to retrieve
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         getBlueprintById: function (id) {
             return umbRequestHelper.resourcePromise(
                 $http.get(
                     umbRequestHelper.getApiUrl(
                         "contentApiBaseUrl",
                         "GetBlueprintById",
-                        [{ id: id }])),
+                        { id: id })),
                 'Failed to retrieve data for content id ' + id)
                 .then(function (result) {
                     return $q.when(umbDataFormatter.formatContentGetData(result));
                 });
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentResource#getNotifySettingsById
+        * @methodOf umbraco.resources.contentResource
+        *
+        * @description
+        * Gets notification options for a content item with a given id for the current user
+        *
+        * ##usage
+        * <pre>
+        * contentResource.getNotifySettingsById(1234)
+        *    .then(function() {
+        *       Do stuff...
+        *    });
+        * </pre>
+        *
+        * @param {Int} id id of content item
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         getNotifySettingsById: function (id) {
             return umbRequestHelper.resourcePromise(
                 $http.get(
                     umbRequestHelper.getApiUrl(
                         "contentApiBaseUrl",
                         "GetNotificationOptions",
-                        [{ contentId: id }])),
+                        { contentId: id })),
                 'Failed to retrieve data for content id ' + id);
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentResource#getNotifySettingsById
+        * @methodOf umbraco.resources.contentResource
+        *
+        * @description
+        * Sets notification settings for a content item with a given id for the current user
+        *
+        * ##usage
+        * <pre>
+        * contentResource.setNotifySettingsById(1234,["D", "F", "H"])
+        *    .then(function() {
+        *       Do stuff...
+        *    });
+        * </pre>
+        *
+        * @param {Int} id id of content item
+        * @param {Array} options the notification options to set for the content item
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         setNotifySettingsById: function (id, options) {
             if (!id) {
                 throw "contentId cannot be null";
@@ -442,9 +580,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         getByIds: function (ids) {
 
             var idQuery = "";
-            _.each(ids, function (item) {
-                idQuery += "ids=" + item + "&";
-            });
+            ids.forEach(id => idQuery += `ids=${id}&`);
 
             return umbRequestHelper.resourcePromise(
                 $http.get(
@@ -455,9 +591,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
                 'Failed to retrieve data for content with multiple ids')
                 .then(function (result) {
                     //each item needs to be re-formatted
-                    _.each(result, function (r) {
-                        umbDataFormatter.formatContentGetData(r)
-                    });
+                    result.forEach(r => umbDataFormatter.formatContentGetData(r));
                     return $q.when(result);
                 });
         },
@@ -502,12 +636,57 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
                     umbRequestHelper.getApiUrl(
                         "contentApiBaseUrl",
                         "GetEmpty",
-                        [{ contentTypeAlias: alias }, { parentId: parentId }])),
+                        { contentTypeAlias: alias, parentId: parentId })),
                 'Failed to retrieve data for empty content item type ' + alias)
                 .then(function (result) {
                     return $q.when(umbDataFormatter.formatContentGetData(result));
                 });
         },
+        /**
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#getScaffoldByKey
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
+         * Returns a scaffold of an empty content item, given the id of the content item to place it underneath and the content type alias.
+          *
+         * - Parent Id must be provided so umbraco knows where to store the content
+          * - Content Type Id must be provided so umbraco knows which properties to put on the content scaffold
+          *
+         * The scaffold is used to build editors for content that has not yet been populated with data.
+          *
+         * ##usage
+         * <pre>
+         * contentResource.getScaffoldByKey(1234, '...')
+         *    .then(function(scaffold) {
+         *        var myDoc = scaffold;
+          *        myDoc.name = "My new document";
+         *
+         *        contentResource.publish(myDoc, true)
+         *            .then(function(content){
+         *                alert("Retrieved, updated and published again");
+         *            });
+         *    });
+          * </pre>
+          *
+         * @param {Int} parentId id of content item to return
+          * @param {String} contentTypeGuid contenttype guid to base the scaffold on
+         * @returns {Promise} resourcePromise object containing the content scaffold.
+         *
+         */
+        getScaffoldByKey: function (parentId, contentTypeKey) {
+
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "contentApiBaseUrl",
+                        "GetEmptyByKey",
+                        { contentTypeKey: contentTypeKey, parentId: parentId })),
+                'Failed to retrieve data for empty content item id ' + contentTypeKey)
+                .then(function (result) {
+                    return $q.when(umbDataFormatter.formatContentGetData(result));
+                });
+        },
 
         getBlueprintScaffold: function (parentId, blueprintId) {
 
@@ -516,7 +695,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
                     umbRequestHelper.getApiUrl(
                         "contentApiBaseUrl",
                         "GetEmpty",
-                        [{ blueprintId: blueprintId }, { parentId: parentId }])),
+                        { blueprintId: blueprintId, parentId: parentId })),
                 'Failed to retrieve blueprint for id ' + blueprintId)
                 .then(function (result) {
                     return $q.when(umbDataFormatter.formatContentGetData(result));
@@ -656,7 +835,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
          * @methodOf umbraco.resources.contentResource
          *
          * @description
-         * Saves changes made to a content item to its current version, if the content item is new, the isNew paramater must be passed to force creation
+         * Saves changes made to a content item to its current version, if the content item is new, the isNew parameter must be passed to force creation
           * if the content item needs to have files attached, they must be provided as the files param and passed separately
           *
           *
@@ -686,6 +865,34 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
             return saveContentItem(content, "save" + (isNew ? "New" : ""), files, endpoint, showNotifications);
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentResource#saveBlueprint
+        * @methodOf umbraco.resources.contentResource
+        *
+        * @description
+        * Saves changes made to a content blueprint item to its current version, if the content blueprint item is new, the isNew parameter must be passed to force creation
+        * if the content item needs to have files attached, they must be provided as the files param and passed separately
+        *
+        * ##usage
+        * <pre>
+        * contentResource.getById(1234)
+        *    .then(function(content) {
+        *          content.name = "I want a new name!";
+        *          contentResource.saveBlueprint(content, false)
+        *            .then(function(content){
+        *                alert("Retrieved, updated and saved again");
+        *            });
+        *    });
+        * </pre>
+        *
+        * @param {Object} content The content blueprint item object with changes applied
+        * @param {Bool} isNew set to true to create a new item or to update an existing
+        * @param {Array} files collection of files for the document
+        * @param {Bool} showNotifications an option to disable/show notifications (default is true)
+        * @returns {Promise} resourcePromise object containing the saved content item.
+        *
+        */
         saveBlueprint: function (content, isNew, files, showNotifications) {
             var endpoint = umbRequestHelper.getApiUrl(
                 "contentApiBaseUrl",
@@ -699,7 +906,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
          * @methodOf umbraco.resources.contentResource
          *
          * @description
-         * Saves and publishes changes made to a content item to a new version, if the content item is new, the isNew paramater must be passed to force creation
+         * Saves and publishes changes made to a content item to a new version, if the content item is new, the isNew parameter must be passed to force creation
           * if the content item needs to have files attached, they must be provided as the files param and passed separately
           *
           *
@@ -729,6 +936,35 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
             return saveContentItem(content, "publish" + (isNew ? "New" : ""), files, endpoint, showNotifications);
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentResource#publish
+        * @methodOf umbraco.resources.contentResource
+        *
+        * @description
+        * Saves and publishes changes made to a content item and its descendants to a new version, if the content item is new, the isNew parameter must be passed to force creation
+        * if the content items needs to have files attached, they must be provided as the files param and passed separately
+        *
+        *
+        * ##usage
+        * <pre>
+        * contentResource.getById(1234)
+        *    .then(function(content) {
+        *          content.name = "I want a new name, and be published!";
+        *          contentResource.publishWithDescendants(content, false)
+        *            .then(function(content){
+        *                alert("Retrieved, updated and published again");
+        *            });
+        *    });
+        * </pre>
+        *
+        * @param {Object} content The content item object with changes applied
+        * @param {Bool} isNew set to true to create a new item or to update an existing
+        * @param {Array} files collection of files for the document
+        * @param {Bool} showNotifications an option to disable/show notifications (default is true)
+        * @returns {Promise} resourcePromise object containing the saved content item.
+        *
+        */
         publishWithDescendants: function (content, isNew, force, files, showNotifications) {
             var endpoint = umbRequestHelper.getApiUrl(
                 "contentApiBaseUrl",
@@ -832,6 +1068,27 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
 
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentResource#createBlueprintFromContent
+        * @methodOf umbraco.resources.contentResource
+        *
+        * @description
+        * Creates a content blueprint with a given name from a given content id
+        *
+        * ##usage
+        * <pre>
+        * contentResource.createBlueprintFromContent(1234,"name")
+        *    .then(function(content) {
+        *        alert("created");
+        *    });
+            * </pre>
+            *
+        * @param {Int} id The ID of the content to create the content blueprint from
+        * @param {string} id The name of the content blueprint
+        * @returns {Promise} resourcePromise object
+        *
+        */
         createBlueprintFromContent: function (contentId, name) {
             return umbRequestHelper.resourcePromise(
                 $http.post(
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
index 97bebef062..6acf702546 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
@@ -7,6 +7,25 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
 
     return {
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentTypeResource#getCount
+        * @methodOf umbraco.resources.contentTypeResource
+        *
+        * @description
+        * Gets the count of content types
+        *
+        * ##usage
+        * <pre>
+        * contentTypeResource.getCount()
+        *    .then(function(data) {
+        *        console.log(data);
+        *    });
+        * </pre>
+        * 
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         getCount: function () {
             return umbRequestHelper.resourcePromise(
                 $http.get(
@@ -16,6 +35,29 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
                 'Failed to retrieve count');
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentTypeResource#getAvailableCompositeContentTypes
+        * @methodOf umbraco.resources.contentTypeResource
+        *
+        * @description
+        * Gets the compositions for a content type
+        *
+        * ##usage
+        * <pre>
+        * contentTypeResource.getAvailableCompositeContentTypes()
+        *    .then(function(data) {
+        *        console.log(data);
+        *    });
+        * </pre>
+        *
+        * @param {Int} contentTypeId id of the content type to retrieve the list of the compositions
+        * @param {Array} filterContentTypes array of content types to filter out 
+        * @param {Array} filterPropertyTypes array of property aliases to filter out. If specified any content types with the property aliases will be filtered out
+        * @param {Boolean} isElement whether the composite content types should be applicable for an element type
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         getAvailableCompositeContentTypes: function (contentTypeId, filterContentTypes, filterPropertyTypes, isElement) {
             if (!filterContentTypes) {
                 filterContentTypes = [];
@@ -86,6 +128,7 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
          *        $scope.type = type;
          *    });
          * </pre>
+         * 
          * @param {Int} contentTypeId id of the content item to retrive allowed child types for
          * @returns {Promise} resourcePromise object.
          *
@@ -110,6 +153,14 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
          * @description
          * Returns a list of defined property type aliases
          *
+         * ##usage
+         * <pre>
+         * contentTypeResource.getAllPropertyTypeAliases()
+         *    .then(function(array) {
+         *       Do stuff...
+         *    });
+         * </pre>
+         *
          * @returns {Promise} resourcePromise object.
          *
          */
@@ -123,6 +174,25 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
                 'Failed to retrieve property type aliases');
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentTypeResource#getAllStandardFields
+        * @methodOf umbraco.resources.contentTypeResource
+        *
+        * @description
+        * Returns a list of standard property type aliases
+        *
+        * ##usage
+        * <pre>
+        * contentTypeResource.getAllStandardFields()
+        *    .then(function(array) {
+        *       Do stuff...
+        *    });
+        * </pre>
+        *
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         getAllStandardFields: function () {
 
             return umbRequestHelper.resourcePromise(
@@ -133,6 +203,26 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
                 'Failed to retrieve standard fields');
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentTypeResource#getPropertyTypeScaffold
+        * @methodOf umbraco.resources.contentTypeResource
+        *
+        * @description
+        * Returns the property display for a given datatype id
+        *
+        * ##usage
+        * <pre>
+        * contentTypeResource.getPropertyTypeScaffold(1234)
+        *    .then(function(array) {
+        *       Do stuff...
+        *    });
+        * </pre>
+        *
+        * @param {Int} id the id of the datatype
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         getPropertyTypeScaffold: function (id) {
             return umbRequestHelper.resourcePromise(
                 $http.get(
@@ -143,6 +233,26 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
                 'Failed to retrieve property type scaffold');
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentTypeResource#getById
+        * @methodOf umbraco.resources.contentTypeResource
+        *
+        * @description
+        * Get the content type with a given id
+        *
+        * ##usage
+        * <pre>
+        * contentTypeResource.getById("64058D0F-4911-4AB7-B3BA-000D89F00A26")
+        *    .then(function(array) {
+        *       Do stuff...
+        *    });
+        * </pre>
+        *
+        * @param {String} id the guid id of the content type
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         getById: function (id) {
 
             return umbRequestHelper.resourcePromise(
@@ -154,6 +264,26 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
                 'Failed to retrieve content type');
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentTypeResource#deleteById
+        * @methodOf umbraco.resources.contentTypeResource
+        *
+        * @description
+        * Delete the content type of a given id
+        *
+        * ##usage
+        * <pre>
+        * contentTypeResource.deleteById(1234)
+        *    .then(function(array) {
+        *       Do stuff...
+        *    });
+        * </pre>
+        *
+        * @param {Int} id the id of the content type
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         deleteById: function (id) {
 
             return umbRequestHelper.resourcePromise(
@@ -165,6 +295,26 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
                 'Failed to delete content type');
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentTypeResource#deleteContainerById
+        * @methodOf umbraco.resources.contentTypeResource
+        *
+        * @description
+        * Delete the content type container of a given id
+        *
+        * ##usage
+        * <pre>
+        * contentTypeResource.deleteContainerById(1234)
+        *    .then(function(array) {
+        *       Do stuff...
+        *    });
+        * </pre>
+        *
+        * @param {Int} id the id of the content type container
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         deleteContainerById: function (id) {
 
             return umbRequestHelper.resourcePromise(
@@ -177,16 +327,16 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
         },
 
         /**
-         * @ngdoc method
-         * @name umbraco.resources.contentTypeResource#getAll
-         * @methodOf umbraco.resources.contentTypeResource
-         *
-         * @description
-         * Returns a list of all content types
-         *
-         * @returns {Promise} resourcePromise object.
-         *
-         */
+        * @ngdoc method
+        * @name umbraco.resources.contentTypeResource#getAll
+        * @methodOf umbraco.resources.contentTypeResource
+        *
+        * @description
+        * Returns a list of all content types
+        *
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         getAll: function () {
 
             return umbRequestHelper.resourcePromise(
@@ -197,6 +347,26 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
                 'Failed to retrieve all content types');
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentTypeResource#getScaffold
+        * @methodOf umbraco.resources.contentTypeResource
+        *
+        * @description
+        * Returns an empty content type for use as a scaffold when creating a new content type
+        *
+        * ##usage
+        * <pre>
+        * contentTypeResource.getScaffold(1234)
+        *    .then(function(array) {
+        *       Do stuff...
+        *    });
+        * </pre>
+        *
+        * @param {Int} id the parent id
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         getScaffold: function (parentId) {
 
             return umbRequestHelper.resourcePromise(
@@ -240,14 +410,14 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
          * <pre>
          * contentTypeResource.move({ parentId: 1244, id: 123 })
          *    .then(function() {
-         *        alert("node was moved");
+         *        alert("content type was moved");
          *    }, function(err){
-         *      alert("node didnt move:" + err.data.Message);
+         *      alert("content type didnt move:" + err.data.Message);
          *    });
          * </pre>
          * @param {Object} args arguments object
-         * @param {Int} args.idd the ID of the node to move
-         * @param {Int} args.parentId the ID of the parent node to move to
+         * @param {Int} args.id the ID of the content type to move
+         * @param {Int} args.parentId the ID of the parent content type to move to
          * @returns {Promise} resourcePromise object.
          *
          */
@@ -271,6 +441,29 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
                 'Failed to move content');
         },
 
+        /**
+         * @ngdoc method
+         * @name umbraco.resources.contentTypeResource#copy
+         * @methodOf umbraco.resources.contentTypeResource
+         *
+         * @description
+         * Copied a content type underneath a new parentId
+         *
+         * ##usage
+         * <pre>
+         * contentTypeResource.copy({ parentId: 1244, id: 123 })
+         *    .then(function() {
+         *        alert("content type was copied");
+         *    }, function(err){
+         *      alert("content type didnt copy:" + err.data.Message);
+         *    });
+         * </pre>
+         * @param {Object} args arguments object
+         * @param {Int} args.id the ID of the content type to copy
+         * @param {Int} args.parentId the ID of the parent content type to copy to
+         * @returns {Promise} resourcePromise object.
+         *
+         */
         copy: function (args) {
             if (!args) {
                 throw "args cannot be null";
@@ -291,22 +484,57 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
                 'Failed to copy content');
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentTypeResource#createContainer
+        * @methodOf umbraco.resources.contentTypeResource
+        *
+        * @description
+        * Create a new content type container of a given name underneath a given parent item
+        *
+        * ##usage
+        * <pre>
+        * contentTypeResource.createContainer(1244,"testcontainer")
+        *    .then(function() {
+        *       Do stuff..
+        *    });
+        * </pre>
+        * 
+        * @param {Int} parentId the ID of the parent content type underneath which to create the container
+        * @param {String} name the name of the container
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         createContainer: function (parentId, name) {
 
             return umbRequestHelper.resourcePromise(
                 $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostCreateContainer", { parentId: parentId, name: encodeURIComponent(name) })),
                 'Failed to create a folder under parent id ' + parentId);
 
-        },
 
-        createCollection: function (parentId, collectionName, collectionCreateTemplate, collectionItemName, collectionItemCreateTemplate, collectionIcon, collectionItemIcon) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostCreateCollection", { parentId: parentId, collectionName: collectionName, collectionCreateTemplate: collectionCreateTemplate, collectionItemName: collectionItemName, collectionItemCreateTemplate: collectionItemCreateTemplate, collectionIcon: collectionIcon, collectionItemIcon: collectionItemIcon})),
-                'Failed to create collection under ' + parentId);
-
-        },
+        }, 
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentTypeResource#renameContainer
+        * @methodOf umbraco.resources.contentTypeResource
+        *
+        * @description
+        * Rename a container of a given id
+        *
+        * ##usage
+        * <pre>
+        * contentTypeResource.renameContainer( 1244,"testcontainer")
+        *    .then(function() {
+        *       Do stuff..
+        *    });
+        * </pre>
+        *
+        * @param {Int} id the ID of the container to rename
+        * @param {String} name the new name of the container
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         renameContainer: function (id, name) {
 
             return umbRequestHelper.resourcePromise(
@@ -318,6 +546,27 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
 
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentTypeResource#export
+        * @methodOf umbraco.resources.contentTypeResource
+        *
+        * @description
+        * Export a content type of a given id.
+        *
+        * ##usage
+        * <pre>
+        * contentTypeResource.export(1234){
+        *    .then(function() {
+        *       Do stuff..
+        *    });
+        * </pre>
+        *
+        * @param {Int} id the ID of the container to rename
+        * @param {String} name the new name of the container
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         export: function (id) {
             if (!id) {
                 throw "id cannot be null";
@@ -336,6 +585,26 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
             });
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentTypeResource#import
+        * @methodOf umbraco.resources.contentTypeResource
+        *
+        * @description
+        * Import a content type from a file
+        *
+        * ##usage
+        * <pre>
+        * contentTypeResource.import("path to file"){
+        *    .then(function() {
+        *       Do stuff..
+        *    });
+        * </pre>
+        *
+        * @param {String} file path of the file to import
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         import: function (file) {
             if (!file) {
                 throw "file cannot be null";
@@ -347,12 +616,52 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
             );
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentTypeResource#createDefaultTemplate
+        * @methodOf umbraco.resources.contentTypeResource
+        *
+        * @description
+        * Create a default template for a content type with a given id
+        *
+        * ##usage
+        * <pre>
+        * contentTypeResource.createDefaultTemplate(1234){
+        *    .then(function() {
+        *       Do stuff..
+        *    });
+        * </pre>
+        *
+        * @param {Int} id the id of the content type for which to create the default template
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         createDefaultTemplate: function (id) {
             return umbRequestHelper.resourcePromise(
                 $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostCreateDefaultTemplate", { id: id })),
                 'Failed to create default template for content type with id ' + id);
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.contentTypeResource#hasContentNodes
+        * @methodOf umbraco.resources.contentTypeResource
+        *
+        * @description
+        * Returns whether a content type has content nodes
+        *
+        * ##usage
+        * <pre>
+        * contentTypeResource.hasContentNodes(1234){
+        *    .then(function() {
+        *       Do stuff..
+        *    });
+        * </pre>
+        *
+        * @param {Int} id the id of the content type
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         hasContentNodes: function (id) {
             return umbRequestHelper.resourcePromise(
                 $http.get(
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/elementtype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/elementtype.resource.js
new file mode 100644
index 0000000000..b097a65447
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/elementtype.resource.js
@@ -0,0 +1,43 @@
+/**
+    * @ngdoc service
+    * @name umbraco.resources.elementTypeResource
+    * @description Loads in data for element types
+    **/
+function elementTypeResource($q, $http, umbRequestHelper) {
+
+    return {
+
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.elementTypeResource#getAll
+        * @methodOf umbraco.resources.elementTypeResource
+        *
+        * @description
+        * Gets a list of all element types
+        *
+        * ##usage
+        * <pre>
+        * elementTypeResource.getAll()
+        *    .then(function() {
+        *        alert('Found it!');
+        *    });
+        * </pre>
+        *
+        * @returns {Promise} resourcePromise object.
+        *
+        **/
+        getAll: function () {
+            
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "elementTypeApiBaseUrl",
+                        "GetAll")),
+                "Failed to retrieve element types");
+            
+        }
+
+    };
+}
+
+angular.module("umbraco.resources").factory("elementTypeResource", elementTypeResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 61d646afc0..838e8f1b80 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -207,7 +207,7 @@ function entityResource($q, $http, umbRequestHelper) {
         getAnchors: function (rteContent) {
 
             if (!rteContent || rteContent.length === 0) {
-                return [];
+                return $q.when([]);
             }
 
             return umbRequestHelper.resourcePromise(
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
index e24f4786eb..06eb2ed4d2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
@@ -226,9 +226,7 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
         getByIds: function (ids) {
 
             var idQuery = "";
-            _.each(ids, function (item) {
-                idQuery += "ids=" + item + "&";
-            });
+            ids.forEach(id => idQuery += `ids=${id}&`);
 
             return umbRequestHelper.resourcePromise(
                 $http.get(
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/membergroup.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/membergroup.resource.js
index c83a31e47c..f9b9da9944 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/membergroup.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/membergroup.resource.js
@@ -32,9 +32,7 @@ function memberGroupResource($q, $http, umbRequestHelper) {
         getByIds: function (ids) {
 
             var idQuery = "";
-            _.each(ids, function (item) {
-                idQuery += "ids=" + item + "&";
-            });
+            ids.forEach(id => idQuery += `ids=${id}&`);
 
             return umbRequestHelper.resourcePromise(
                 $http.get(
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js
index 6c15b89c0e..2314fa6d6c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js
@@ -16,16 +16,15 @@ function memberTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
             }
 
             var query = "";
-            _.each(filterContentTypes, function (item) {
-                query += "filterContentTypes=" + item + "&";
-            });
+            filterContentTypes.forEach(fct => query += `filterContentTypes=${fct}&`);
+
             // if filterContentTypes array is empty we need a empty variable in the querystring otherwise the service returns a error
             if (filterContentTypes.length === 0) {
                 query += "filterContentTypes=&";
             }
-            _.each(filterPropertyTypes, function (item) {
-                query += "filterPropertyTypes=" + item + "&";
-            });
+
+            filterPropertyTypes.forEach(fpt => query += `filterPropertyTypes=${fpt}&`);
+
             // if filterPropertyTypes array is empty we need a empty variable in the querystring otherwise the service returns a error
             if (filterPropertyTypes.length === 0) {
                 query += "filterPropertyTypes=&";
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/modelsbuildermanagement.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/modelsbuildermanagement.resource.js
index ee3cd80c71..8352ca07e6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/modelsbuildermanagement.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/modelsbuildermanagement.resource.js
@@ -1,18 +1,82 @@
+
+/**
+* @ngdoc service
+* @name umbraco.resources.modelsBuilderManagementResource
+* @description Resources to get information on modelsbuilder status and build models
+**/
 function modelsBuilderManagementResource($q, $http, umbRequestHelper) {
 
     return {
+
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.modelsBuilderManagementResource#getModelsOutOfDateStatus
+        * @methodOf umbraco.resources.modelsBuilderManagementResource
+        *
+        * @description
+        * Gets the status of modelsbuilder 
+        *
+        * ##usage
+        * <pre>
+        * modelsBuilderManagementResource.getModelsOutOfDateStatus()
+        *  .then(function() {
+        *        Do stuff...*
+        * });
+        * </pre>
+        * 
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         getModelsOutOfDateStatus: function () {
             return umbRequestHelper.resourcePromise(
                 $http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetModelsOutOfDateStatus")),
                 "Failed to get models out-of-date status");
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.modelsBuilderManagementResource#buildModels
+        * @methodOf umbraco.resources.modelsBuilderManagementResource
+        *
+        * @description
+        * Builds the models
+        *
+        * ##usage
+        * <pre>
+        * modelsBuilderManagementResource.buildModels()
+        *  .then(function() {
+        *        Do stuff...*
+        * });
+        * </pre>
+        *
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         buildModels: function () {
             return umbRequestHelper.resourcePromise(
                 $http.post(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "BuildModels")),
                 "Failed to build models");
         },
 
+        /**
+        * @ngdoc method
+        * @name umbraco.resources.modelsBuilderManagementResource#getDashboard
+        * @methodOf umbraco.resources.modelsBuilderManagementResource
+        *
+        * @description
+        * Gets the modelsbuilder dashboard
+        *
+        * ##usage
+        * <pre>
+        * modelsBuilderManagementResource.getDashboard()
+        *  .then(function() {
+        *        Do stuff...*
+        * });
+        * </pre>
+        *
+        * @returns {Promise} resourcePromise object.
+        *
+        */
         getDashboard: function () {
             return umbRequestHelper.resourcePromise(
                 $http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetDashboard")),
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js
index 2b9e0c0fd5..91f00a36e3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js
@@ -295,6 +295,38 @@
                 "Failed to retrieve data for user " + userId);
         }
 
+
+        /**
+          * @ngdoc method
+          * @name umbraco.resources.usersResource#getUsers
+          * @methodOf umbraco.resources.usersResource
+          *
+          * @description
+          * Gets users from ids
+          *
+          * ##usage
+          * <pre>
+          * usersResource.getUsers([1,2,3])
+          *    .then(function(data) {
+          *        alert("It's here");
+          *    });
+          * </pre>
+          * 
+          * @param {Array} userIds user ids.
+          * @returns {Promise} resourcePromise object containing the users array.
+          *
+          */
+        function getUsers(userIds) {
+
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "userApiBaseUrl",
+                        "GetByIds",
+                        { ids: userIds })),
+                "Failed to retrieve data for users " + userIds);
+        }
+
         /**
           * @ngdoc method
           * @name umbraco.resources.usersResource#createUser
@@ -481,6 +513,7 @@
             setUserGroupsOnUsers: setUserGroupsOnUsers,
             getPagedResults: getPagedResults,
             getUser: getUser,
+            getUsers: getUsers,
             createUser: createUser,
             inviteUser: inviteUser,
             saveUser: saveUser,
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
index f2ff711ac9..c4fd431a12 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
@@ -7,17 +7,102 @@
  * Some angular helper/extension methods
  */
 function angularHelper($q) {
+
+    var requiredFormProps = ["$error", "$name", "$dirty", "$pristine", "$valid", "$submitted", "$pending"];
+
+    function collectAllFormErrorsRecursively(formCtrl, allErrors) {
+        // skip if the control is already added to the array
+        if (allErrors.indexOf(formCtrl) !== -1) {
+            return;
+        }
+
+        // loop over the error dictionary (see https://docs.angularjs.org/api/ng/type/form.FormController#$error)
+        var keys = Object.keys(formCtrl.$error);
+        if (keys.length === 0) {
+            return;
+        }
+        keys.forEach(validationKey => {
+            var ctrls = formCtrl.$error[validationKey];
+            ctrls.forEach(ctrl => {
+                if (!ctrl) {
+                    // this happens when $setValidity('err', true) is called on a form controller without specifying the 3rd parameter for the control/form
+                    // which just means that this is an error on the formCtrl itself
+                    allErrors.push(formCtrl); // add the error
+                }
+                else if (isForm(ctrl)) {
+                    // sometimes the control in error is the same form so we cannot recurse else we'll cause an infinite loop
+                    // and in this case it means the error is assigned directly to the form, not a control
+                    if (ctrl === formCtrl) {
+                        allErrors.push(ctrl); // add the error
+                        return;
+                    }
+
+                    // recurse with the sub form
+                    collectAllFormErrorsRecursively(ctrl, allErrors);
+                }
+                else {
+                    // it's a normal control
+                    allErrors.push(ctrl); // add the error
+                }
+            });
+        });
+    }
+
+    function isForm(obj) {
+
+        // a method to check that the collection of object prop names contains the property name expected
+        function allPropertiesExist(objectPropNames) {
+            //ensure that every required property name exists on the current object
+            return _.every(requiredFormProps, function (item) {
+                return _.contains(objectPropNames, item);
+            });
+        }
+
+        //get the keys of the property names for the current object
+        var props = _.keys(obj);
+        //if the length isn't correct, try the next prop
+        if (props.length < requiredFormProps.length) {
+            return false;
+        }
+
+        //ensure that every required property name exists on the current scope property
+        return allPropertiesExist(props);
+    }
+
     return {
 
+        countAllFormErrors: function (formCtrl) {
+            var allErrors = [];
+            collectAllFormErrorsRecursively(formCtrl, allErrors);
+            return allErrors.length;
+        },
+
+        /**
+         * Will traverse up the $scope chain to all ancestors until the predicate matches for the current scope or until it's at the root.
+         * @param {any} scope
+         * @param {any} predicate
+         */
+        traverseScopeChain: function (scope, predicate) {
+            var s = scope.$parent;
+            while (s) {
+                var result = predicate(s);
+                if (result === true) {
+                    return s;
+                }
+                s = s.$parent;
+            }
+            return null;
+        },
+
         /**
          * Method used to re-run the $parsers for a given ngModel
-         * @param {} scope 
-         * @param {} ngModel 
-         * @returns {} 
+         * @param {} scope
+         * @param {} ngModel
+         * @returns {}
          */
         revalidateNgModel: function (scope, ngModel) {
             this.safeApply(scope, function() {
-                angular.forEach(ngModel.$parsers, function (parser) {
+                ngModel.$parsers.forEach(function (parser) {
                     parser(ngModel.$viewValue);
                 });
             });
@@ -25,8 +110,8 @@ function angularHelper($q) {
 
         /**
          * Execute a list of promises sequentially. Unlike $q.all which executes all promises at once, this will execute them in sequence.
-         * @param {} promises 
-         * @returns {} 
+         * @param {} promises
+         * @returns {}
          */
         executeSequentialPromises: function (promises) {
 
@@ -69,12 +154,12 @@ function angularHelper($q) {
          */
         safeApply: function (scope, fn) {
             if (scope.$$phase || (scope.$root && scope.$root.$$phase)) {
-                if (angular.isFunction(fn)) {
+                if (Utilities.isFunction(fn)) {
                     fn();
                 }
             }
             else {
-                if (angular.isFunction(fn)) {
+                if (Utilities.isFunction(fn)) {
                     scope.$apply(fn);
                 }
                 else {
@@ -83,6 +168,9 @@ function angularHelper($q) {
             }
         },
 
+
+        isForm: isForm,
+
         /**
          * @ngdoc function
          * @name getCurrentForm
@@ -97,38 +185,17 @@ function angularHelper($q) {
             //NOTE: There isn't a way in angular to get a reference to the current form object since the form object
             // is just defined as a property of the scope when it is named but you'll always need to know the name which
             // isn't very convenient. If we want to watch for validation changes we need to get a form reference.
-            // The way that we detect the form object is a bit hackerific in that we detect all of the required properties 
+            // The way that we detect the form object is a bit hackerific in that we detect all of the required properties
             // that exist on a form object.
             //
             //The other way to do it in a directive is to require "^form", but in a controller the only other way to do it
             // is to inject the $element object and use: $element.inheritedData('$formController');
 
             var form = null;
-            var requiredFormProps = ["$error", "$name", "$dirty", "$pristine", "$valid", "$submitted", "$pending"];
-
-            // a method to check that the collection of object prop names contains the property name expected
-            function propertyExists(objectPropNames) {
-                //ensure that every required property name exists on the current scope property
-                return _.every(requiredFormProps, function (item) {
-
-                    return _.contains(objectPropNames, item);
-                });
-            }
 
             for (var p in scope) {
-
                 if (_.isObject(scope[p]) && p !== "this" && p.substr(0, 1) !== "$") {
-                    //get the keys of the property names for the current property
-                    var props = _.keys(scope[p]);
-                    //if the length isn't correct, try the next prop
-                    if (props.length < requiredFormProps.length) {
-                        continue;
-                    }
-
-                    //ensure that every required property name exists on the current scope property
-                    var containProperty = propertyExists(props);
-
-                    if (containProperty) {
+                    if (this.isForm(scope[p])) {
                         form = scope[p];
                         break;
                     }
@@ -179,7 +246,7 @@ function angularHelper($q) {
                 $submitted: false,
                 $pending: undefined,
                 $addControl: Utilities.noop,
-                $removeControl: Utilities.noop, 
+                $removeControl: Utilities.noop,
                 $setValidity: Utilities.noop,
                 $setDirty: Utilities.noop,
                 $setPristine: Utilities.noop,
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js b/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
index 30e59e9a88..b474b66174 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
@@ -276,7 +276,7 @@ angular.module('umbraco.services')
                 //blocking
                 var promises = [];
                 var assets = [];
-                _.each(nonEmpty, function (path) {
+                nonEmpty.forEach(path => {
                     path = convertVirtualPath(path);
                     var asset = service._getAssetPromise(path);
                     //if not previously loaded, add to list of promises
@@ -325,19 +325,17 @@ angular.module('umbraco.services')
                         scope = $rootScope;
                     }
                     angularHelper.safeApply(scope,
-                        function () {
-                            asset.deferred.resolve(true);
-                        });
+                        () => asset.deferred.resolve(true));
                 }
 
                 if (cssAssets.length > 0) {
-                    var cssPaths = _.map(cssAssets, function (asset) { return appendRnd(asset.path) });
-                    LazyLoad.css(cssPaths, function () { _.each(cssAssets, assetLoaded); });
+                    var cssPaths = cssAssets.map(css => appendRnd(css.path));
+                    LazyLoad.css(cssPaths, () => cssAssets.forEach(assetLoaded));
                 }
 
                 if (jsAssets.length > 0) {
-                    var jsPaths = _.map(jsAssets, function (asset) { return appendRnd(asset.path) });
-                    LazyLoad.js(jsPaths, function () { _.each(jsAssets, assetLoaded); });
+                    var jsPaths = jsAssets.map(js => appendRnd(js.path));
+                    LazyLoad.js(jsPaths, () => jsAssets.forEach(assetLoaded));
                 }
 
                 return promise;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
new file mode 100644
index 0000000000..122d430165
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
@@ -0,0 +1,173 @@
+/**
+ * @ngdoc service
+ * @name umbraco.services.blockEditorService
+ *
+ * @description
+ * <b>Added in Umbraco 8.7</b>. Service for dealing with Block Editors.
+ *
+ * Block Editor Service provides the basic features for a block editor.
+ * The main feature is the ability to create a Model Object which takes care of your data for your Block Editor.
+ *
+ *
+ * ##Samples
+ *
+ * ####Instantiate a Model Object for your property editor:
+ *
+ * <pre>
+ *     modelObject = blockEditorService.createModelObject(vm.model.value, vm.model.editor, vm.model.config.blocks, $scope);
+ *     modelObject.load().then(onLoaded);
+ * </pre>
+ *
+ *
+ * See {@link umbraco.services.blockEditorModelObject BlockEditorModelObject} for more samples.
+ *
+ */
+(function () {
+    'use strict';
+
+
+
+    /**
+     * When performing a runtime copy of Block Editors entries, we copy the ElementType Data Model and inner IDs are kept identical, to ensure new IDs are changed on paste we need to provide a resolver for the ClipboardService.
+     */
+    angular.module('umbraco').run(['clipboardService', 'udiService', function (clipboardService, udiService) {
+
+        function replaceUdi(obj, key, dataObject) {
+            var udi = obj[key];
+            var newUdi = udiService.create("element");
+            obj[key] = newUdi;
+            dataObject.forEach((data) => {
+                if (data.udi === udi) {
+                    data.udi = newUdi;
+                }
+            });
+        }
+        function replaceUdisOfObject(obj, propValue) {
+            for (var k in obj) {
+                if(k === "contentUdi") {
+                    replaceUdi(obj, k, propValue.contentData);
+                } else if(k === "settingsUdi") {
+                    replaceUdi(obj, k, propValue.settingsData);
+                } else {
+                    // lets crawl through all properties of layout to make sure get captured all `contentUdi` and `settingsUdi` properties.
+                    var propType = typeof obj[k];
+                    if(propType != null && (propType === "object" || propType === "array")) {
+                        replaceUdisOfObject(obj[k], propValue)
+                    }
+                }
+            }
+        }
+        function removeBlockReferences(obj) {
+            for (var k in obj) {
+                if(k === "contentUdi") {
+                    delete obj[k];
+                } else if(k === "settingsUdi") {
+                    delete obj[k];
+                } else {
+                    // lets crawl through all properties of layout to make sure get captured all `contentUdi` and `settingsUdi` properties.
+                    var propType = typeof obj[k];
+                    if(propType != null && (propType === "object" || propType === "array")) {
+                        removeBlockReferences(obj[k])
+                    }
+                }
+            }
+        }
+
+
+        function elementTypeBlockResolver(obj, propPasteResolverMethod) {
+            // we could filter for specific Property Editor Aliases, but as the Block Editor structure can be used by many Property Editor we do not in this code know a good way to detect that this is a Block Editor and will therefor leave it to the value structure to determin this.
+            rawBlockResolver(obj.value, propPasteResolverMethod);
+        }
+
+        clipboardService.registerPastePropertyResolver(elementTypeBlockResolver, clipboardService.TYPES.ELEMENT_TYPE);
+
+
+        function rawBlockResolver(value, propPasteResolverMethod) {
+            if (value != null && typeof value === "object") {
+
+                // we got an object, and it has these three props then we are most likely dealing with a Block Editor.
+                if ((value.layout !== undefined && value.contentData !== undefined && value.settingsData !== undefined)) {
+
+                    replaceUdisOfObject(value.layout, value);
+
+                    // run resolvers for inner properties of this Blocks content data.
+                    if(value.contentData.length > 0) {
+                        value.contentData.forEach((item) => {
+                            for (var k in item) {
+                                propPasteResolverMethod(item[k], clipboardService.TYPES.RAW);
+                            }
+                        });
+                    }
+                    // run resolvers for inner properties of this Blocks settings data.
+                    if(value.settingsData.length > 0) {
+                        value.settingsData.forEach((item) => {
+                            for (var k in item) {
+                                propPasteResolverMethod(item[k], clipboardService.TYPES.RAW);
+                            }
+                        });
+                    }
+
+                }
+            }
+        }
+
+        clipboardService.registerPastePropertyResolver(rawBlockResolver, clipboardService.TYPES.RAW);
+
+
+        function provideNewUdisForBlockResolver(block, propPasteResolverMethod) {
+
+            if(block.layout) {
+                // We do not support layout child blocks currently, these should be stripped out as we only will be copying a single entry.
+                removeBlockReferences(block.layout);
+            }
+
+            if(block.data) {
+                // Make new UDI for content-element
+                block.data.udi = block.layout.contentUdi = udiService.create("element");
+            }
+
+            if(block.settingsData) {
+                // Make new UDI for settings-element
+                block.settingsData.udi = block.layout.settingsUdi = udiService.create("element");
+            }
+
+        }
+
+        clipboardService.registerPastePropertyResolver(provideNewUdisForBlockResolver, clipboardService.TYPES.BLOCK);
+
+    }]);
+
+
+
+
+    function blockEditorService(blockEditorModelObject) {
+
+        /**
+         * @ngdocs function
+         * @name createModelObject
+         * @methodOf umbraco.services.blockEditorService
+         *
+         * @description
+         * Create a new Block Editor Model Object.
+         * See {@link umbraco.services.blockEditorModelObject blockEditorModelObject}
+         *
+         * @see umbraco.services.blockEditorModelObject
+         * @param {object} propertyModelValue data object of the property editor, usually model.value.
+         * @param {string} propertyEditorAlias alias of the property.
+         * @param {object} blockConfigurations block configurations.
+         * @param {angular-scope} scopeOfExistance A local angularJS scope that exists as long as the data exists.
+         * @param {angular-scope} propertyEditorScope A local angularJS scope that represents the property editors scope.
+         * @return {blockEditorModelObject} A instance of the BlockEditorModelObject class.
+         */
+        function createModelObject(propertyModelValue, propertyEditorAlias, blockConfigurations, scopeOfExistance, propertyEditorScope) {
+            return new blockEditorModelObject(propertyModelValue, propertyEditorAlias, blockConfigurations, scopeOfExistance, propertyEditorScope);
+        }
+
+        return {
+            createModelObject: createModelObject
+        }
+    }
+
+    angular.module('umbraco.services').service('blockEditorService', blockEditorService);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
new file mode 100644
index 0000000000..2ee7d513ca
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
@@ -0,0 +1,900 @@
+/**
+ * @ngdoc service
+ * @name umbraco.services.blockEditorModelObject
+ *
+ * @description
+ * <b>Added in Umbraco 8.7</b>. Model Object for dealing with data of Block Editors.
+ *
+ * Block Editor Model Object provides the basic features for editing data of a block editor.<br/>
+ * Use the Block Editor Service to instantiate the Model Object.<br/>
+ * See {@link umbraco.services.blockEditorService blockEditorService}
+ *
+ */
+(function () {
+    'use strict';
+
+    function blockEditorModelObjectFactory($interpolate, $q, udiService, contentResource, localizationService, umbRequestHelper, clipboardService, notificationsService) {
+
+        /**
+         * Simple mapping from property model content entry to editing model,
+         * needs to stay simple to avoid deep watching.
+         */
+        function mapToElementModel(elementModel, dataModel) {
+
+            if (!elementModel || !elementModel.variants || !elementModel.variants.length) { return; }
+
+            var variant = elementModel.variants[0];
+
+            for (var t = 0; t < variant.tabs.length; t++) {
+                var tab = variant.tabs[t];
+
+                for (var p = 0; p < tab.properties.length; p++) {
+                    var prop = tab.properties[p];
+                    if (dataModel[prop.alias]) {
+                        prop.value = dataModel[prop.alias];
+                    }
+                }
+            }
+
+        }
+
+        /**
+         * Simple mapping from elementModel to property model content entry,
+         * needs to stay simple to avoid deep watching.
+         */
+        function mapToPropertyModel(elementModel, dataModel) {
+
+            if (!elementModel || !elementModel.variants || !elementModel.variants.length) { return; }
+
+            var variant = elementModel.variants[0];
+
+            for (var t = 0; t < variant.tabs.length; t++) {
+                var tab = variant.tabs[t];
+
+                for (var p = 0; p < tab.properties.length; p++) {
+                    var prop = tab.properties[p];
+                    if (prop.value) {
+                        dataModel[prop.alias] = prop.value;
+                    }
+                }
+            }
+
+        }
+
+        /**
+         * Map property values from an ElementModel to another ElementModel.
+         * Used to tricker watchers for synchronization.
+         * @param {Object} fromModel ElementModel to recive property values from.
+         * @param {Object} toModel ElementModel to recive property values from.
+         */
+        function mapElementValues(fromModel, toModel) {
+            if (!fromModel || !fromModel.variants) {
+                toModel.variants = null;
+                return;
+            }
+            if (!fromModel.variants.length) {
+                toModel.variants = [];
+                return;
+            }
+
+            var fromVariant = fromModel.variants[0];
+            if (!fromVariant) {
+                toModel.variants = [null];
+                return;
+            }
+
+            var toVariant = toModel.variants[0];
+
+            for (var t = 0; t < fromVariant.tabs.length; t++) {
+                var fromTab = fromVariant.tabs[t];
+                var toTab = toVariant.tabs[t];
+
+                for (var p = 0; p < fromTab.properties.length; p++) {
+                    var fromProp = fromTab.properties[p];
+                    var toProp = toTab.properties[p];
+                    toProp.value = fromProp.value;
+                }
+            }
+        }
+
+
+        /**
+         * Generate label for Block, uses either the labelInterpolator or falls back to the contentTypeName.
+         * @param {Object} blockObject BlockObject to recive data values from.
+         */
+        function getBlockLabel(blockObject) {
+            if (blockObject.labelInterpolator !== undefined) {
+                var labelVars = Object.assign({"$settings": blockObject.settingsData || {}, "$layout": blockObject.layout || {}, "$index": (blockObject.index || 0)+1 }, blockObject.data);
+                return blockObject.labelInterpolator(labelVars);
+            }
+            return blockObject.content.contentTypeName;
+        }
+
+
+        /**
+         * Used to add watchers on all properties in a content or settings model
+         */
+        function addWatchers(blockObject, isolatedScope, forSettings) {
+            var model = forSettings ? blockObject.settings : blockObject.content;
+            if (!model || !model.variants || !model.variants.length) { return; }
+
+            // Start watching each property value.
+            var variant = model.variants[0];
+            var field = forSettings ? "settings" : "content";
+            var watcherCreator = forSettings ? createSettingsModelPropWatcher : createContentModelPropWatcher;
+            for (var t = 0; t < variant.tabs.length; t++) {
+                var tab = variant.tabs[t];
+                for (var p = 0; p < tab.properties.length; p++) {
+                    var prop = tab.properties[p];
+
+                    // Watch value of property since this is the only value we want to keep synced.
+                    // Do notice that it is not performing a deep watch, meaning that we are only watching primitive and changes directly to the object of property-value.
+                    // But we like to sync non-primitive values as well! Yes, and this does happen, just not through this code, but through the nature of JavaScript.
+                    // Non-primitive values act as references to the same data and are therefor synced.
+                    blockObject.__watchers.push(isolatedScope.$watch("blockObjects._" + blockObject.key + "." + field + ".variants[0].tabs[" + t + "].properties[" + p + "].value", watcherCreator(blockObject, prop)));
+
+                    // We also like to watch our data model to be able to capture changes coming from other places.
+                    if (forSettings === true) {
+                        blockObject.__watchers.push(isolatedScope.$watch("blockObjects._" + blockObject.key + "." + "settingsData" + "." + prop.alias, createLayoutSettingsModelWatcher(blockObject, prop)));
+                    } else {
+                        blockObject.__watchers.push(isolatedScope.$watch("blockObjects._" + blockObject.key + "." + "data" + "." + prop.alias, createDataModelWatcher(blockObject, prop)));
+                    }
+                }
+            }
+            if (blockObject.__watchers.length === 0) {
+                // If no watcher where created, it means we have no properties to watch. This means that nothing will activate our generate the label, since its only triggered by watchers.
+                blockObject.updateLabel();
+            }
+        }
+
+        /**
+         * Used to create a prop watcher for the data in the property editor data model.
+         */
+        function createDataModelWatcher(blockObject, prop) {
+            return function () {
+                if (prop.value !== blockObject.data[prop.alias]) {
+
+                    // sync data:
+                    prop.value = blockObject.data[prop.alias];
+
+                    blockObject.updateLabel();
+                }
+            }
+        }
+
+        /**
+         * Used to create a prop watcher for the settings in the property editor data model.
+         */
+        function createLayoutSettingsModelWatcher(blockObject, prop) {
+            return function () {
+                if (prop.value !== blockObject.settingsData[prop.alias]) {
+                    // sync data:
+                    prop.value = blockObject.settingsData[prop.alias];
+                }
+            }
+        }
+
+        /**
+         * Used to create a scoped watcher for a content property on a blockObject.
+         */
+        function createContentModelPropWatcher(blockObject, prop) {
+            return function () {
+                if (blockObject.data[prop.alias] !== prop.value) {
+                    // sync data:
+                    blockObject.data[prop.alias] = prop.value;
+                }
+
+                blockObject.updateLabel();
+            }
+        }
+
+        /**
+         * Used to create a scoped watcher for a settings property on a blockObject.
+         */
+        function createSettingsModelPropWatcher(blockObject, prop) {
+            return function () {
+                if (blockObject.settingsData[prop.alias] !== prop.value) {
+                    // sync data:
+                    blockObject.settingsData[prop.alias] = prop.value;
+                }
+            }
+        }
+
+        function createDataEntry(elementTypeKey, dataItems) {
+            var data = {
+                contentTypeKey: elementTypeKey,
+                udi: udiService.create("element")
+            };
+            dataItems.push(data);
+            return data.udi;
+        }
+
+        function getDataByUdi(udi, dataItems) {
+            return dataItems.find(entry => entry.udi === udi) || null;
+        }
+
+        /**
+         * Set the udi and key property for the content item
+         * @param {any} contentData
+         * @param {any} udi
+         */
+        function ensureUdiAndKey(contentData, udi) {
+            contentData.udi = udi;
+            // Change the content.key to the GUID part of the udi, else it's just random which we don't want, it must be consistent
+            contentData.key = udiService.getKey(udi);
+        }
+
+        /**
+         * Used to highlight unsupported properties for the user, changes unsupported properties into a unsupported-property.
+         */
+        var notSupportedProperties = [
+            "Umbraco.Tags",
+            "Umbraco.UploadField",
+            "Umbraco.ImageCropper",
+            "Umbraco.NestedContent"
+        ];
+
+
+        /**
+         * Formats the content apps and ensures unsupported property's have the notsupported view
+         * @param {any} scaffold
+         */
+        function formatScaffoldData(scaffold) {
+
+            // deal with not supported props
+            scaffold.variants.forEach((variant) => {
+                variant.tabs.forEach((tab) => {
+                    tab.properties.forEach((property) => {
+                        if (notSupportedProperties.indexOf(property.editor) !== -1) {
+                            property.view = "notsupported";
+                        }
+                    });
+                });
+            });
+
+            // could be empty in tests
+            if (!scaffold.apps) {
+                console.warn("No content apps found in scaffold");
+                return scaffold;
+            }
+
+            // replace view of content app
+
+            var contentApp = scaffold.apps.find(entry => entry.alias === "umbContent");
+            if (contentApp) {
+                contentApp.view = "views/common/infiniteeditors/blockeditor/blockeditor.content.html";
+            }
+
+            // remove info app
+            var infoAppIndex = scaffold.apps.findIndex(entry => entry.alias === "umbInfo");
+            if (infoAppIndex >= 0) {
+                scaffold.apps.splice(infoAppIndex, 1);
+            }
+
+            return scaffold;
+        }
+
+        /**
+         * Creates a settings content app, we only want to do this if settings is present on the specific block.
+         * @param {any} contentModel
+         */
+        function appendSettingsContentApp(contentModel, settingsName) {
+            if (!contentModel.apps) {
+                return
+            }
+
+            // add the settings app
+            var settingsTab = {
+                "name": settingsName,
+                "alias": "settings",
+                "icon": "icon-settings",
+                "view": "views/common/infiniteeditors/blockeditor/blockeditor.settings.html",
+                "hasError": false
+            };
+            contentModel.apps.push(settingsTab);
+        }
+
+        /**
+         * @ngdoc method
+         * @name constructor
+         * @methodOf umbraco.services.blockEditorModelObject
+         * @description Constructor of the model object used to handle Block Editor data.
+         * @param {object} propertyModelValue data object of the property editor, usually model.value.
+         * @param {string} propertyEditorAlias alias of the property.
+         * @param {object} blockConfigurations block configurations.
+         * @param {angular-scope} scopeOfExistance A local angularJS scope that exists as long as the data exists.
+         * @param {angular-scope} propertyEditorScope A local angularJS scope that represents the property editors scope.
+         * @returns {BlockEditorModelObject} A instance of BlockEditorModelObject.
+         */
+        function BlockEditorModelObject(propertyModelValue, propertyEditorAlias, blockConfigurations, scopeOfExistance, propertyEditorScope) {
+
+            if (!propertyModelValue) {
+                throw new Error("propertyModelValue cannot be undefined, to ensure we keep the binding to the angular model we need minimum an empty object.");
+            }
+
+            this.__watchers = [];
+
+            this.__labels = {};
+
+            // ensure basic part of data-structure is in place:
+            this.value = propertyModelValue;
+            this.value.layout = this.value.layout || {};
+            this.value.contentData = this.value.contentData || [];
+            this.value.settingsData = this.value.settingsData || [];
+
+            this.propertyEditorAlias = propertyEditorAlias;
+            this.blockConfigurations = blockConfigurations;
+
+            this.blockConfigurations.forEach(blockConfiguration => {
+                if (blockConfiguration.view != null && blockConfiguration.view !== "") {
+                    blockConfiguration.view = umbRequestHelper.convertVirtualToAbsolutePath(blockConfiguration.view);
+                }
+                if (blockConfiguration.stylesheet != null && blockConfiguration.stylesheet !== "") {
+                    blockConfiguration.stylesheet = umbRequestHelper.convertVirtualToAbsolutePath(blockConfiguration.stylesheet);
+                }
+                if (blockConfiguration.thumbnail != null && blockConfiguration.thumbnail !== "") {
+                    blockConfiguration.thumbnail = umbRequestHelper.convertVirtualToAbsolutePath(blockConfiguration.thumbnail);
+                }
+            });
+
+            this.scaffolds = [];
+
+            this.isolatedScope = scopeOfExistance.$new(true);
+            this.isolatedScope.blockObjects = {};
+
+            this.__watchers.push(this.isolatedScope.$on("$destroy", this.destroy.bind(this)));
+            this.__watchers.push(propertyEditorScope.$on("formSubmittingFinalPhase", this.sync.bind(this)));
+
+        };
+
+        BlockEditorModelObject.prototype = {
+
+            update: function (propertyModelValue, propertyEditorScope) {
+                // clear watchers
+                this.__watchers.forEach(w => { w(); });
+                delete this.__watchers;
+
+                // clear block objects
+                for (const key in this.isolatedScope.blockObjects) {
+                    this.destroyBlockObject(this.isolatedScope.blockObjects[key]);
+                }
+                this.isolatedScope.blockObjects = {};
+
+                // update our values
+                this.value = propertyModelValue;
+                this.value.layout = this.value.layout || {};
+                this.value.contentData = this.value.contentData || [];
+                this.value.settingsData = this.value.settingsData || [];
+
+                // re-create the watchers
+                this.__watchers = [];
+                this.__watchers.push(this.isolatedScope.$on("$destroy", this.destroy.bind(this)));
+                this.__watchers.push(propertyEditorScope.$on("formSubmittingFinalPhase", this.sync.bind(this)));
+            },
+
+            /**
+             * @ngdoc method
+             * @name getBlockConfiguration
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Get block configuration object for a given contentElementTypeKey.
+             * @param {string} key contentElementTypeKey to recive the configuration model for.
+             * @returns {Object | null} Configuration model for the that specific block. Or ´null´ if the contentElementTypeKey isnt available in the current block configurations.
+             */
+            getBlockConfiguration: function (key) {
+                return this.blockConfigurations.find(bc => bc.contentElementTypeKey === key) || null;
+            },
+
+            /**
+             * @ngdoc method
+             * @name load
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Load the scaffolding models for the given configuration, these are needed to provide useful models for each block.
+             * @param {Object} blockObject BlockObject to receive data values from.
+             * @returns {Promise} A Promise object which resolves when all scaffold models are loaded.
+             */
+            load: function () {
+
+                var self = this;
+
+                var tasks = [];
+
+                tasks.push(localizationService.localize("blockEditor_tabBlockSettings").then(
+                    function (settingsName) {
+                        // self.__labels might not exists anymore, this happens if this instance has been destroyed before the load is complete.
+                        if(self.__labels) {
+                            self.__labels.settingsName = settingsName;
+                        }
+                    }
+                ));
+
+                var scaffoldKeys = [];
+
+                this.blockConfigurations.forEach(blockConfiguration => {
+                    scaffoldKeys.push(blockConfiguration.contentElementTypeKey);
+                    if (blockConfiguration.settingsElementTypeKey != null) {
+                        scaffoldKeys.push(blockConfiguration.settingsElementTypeKey);
+                    }
+                });
+
+                // removing duplicates.
+                scaffoldKeys = scaffoldKeys.filter((value, index, self) => self.indexOf(value) === index);
+
+                scaffoldKeys.forEach(contentTypeKey => {
+                    tasks.push(contentResource.getScaffoldByKey(-20, contentTypeKey).then(scaffold => {
+                        // self.scaffolds might not exists anymore, this happens if this instance has been destroyed before the load is complete.
+                        if (self.scaffolds) {
+                            self.scaffolds.push(formatScaffoldData(scaffold));
+                        }
+                    }).catch(
+                        () => {
+                            // Do nothing if we get an error.
+                        }
+                    ));
+                });
+
+                return $q.all(tasks);
+            },
+
+            /**
+             * @ngdoc method
+             * @name getAvailableAliasesForBlockContent
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Retrive a list of aliases that are available for content of blocks in this property editor, does not contain aliases of block settings.
+             * @return {Array} array of strings representing alias.
+             */
+            getAvailableAliasesForBlockContent: function () {
+                return this.blockConfigurations.map(
+                    (blockConfiguration) => {
+                        var scaffold = this.getScaffoldFromKey(blockConfiguration.contentElementTypeKey);
+                        if (scaffold) {
+                            return scaffold.contentTypeAlias;
+                        }
+                    }
+                );
+            },
+
+            /**
+             * @ngdoc method
+             * @name getAvailableBlocksForBlockPicker
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Retrive a list of available blocks, the list containing object with the confirugation model(blockConfigModel) and the element type model(elementTypeModel).
+             * The purpose of this data is to provide it for the Block Picker.
+             * @return {Array} array of objects representing available blocks, each object containing properties blockConfigModel and elementTypeModel.
+             */
+            getAvailableBlocksForBlockPicker: function () {
+
+                var blocks = [];
+
+                this.blockConfigurations.forEach(blockConfiguration => {
+                    var scaffold = this.getScaffoldFromKey(blockConfiguration.contentElementTypeKey);
+                    if (scaffold) {
+                        blocks.push({
+                            blockConfigModel: blockConfiguration,
+                            elementTypeModel: scaffold.documentType
+                        });
+                    }
+                });
+
+                return blocks;
+            },
+
+            /**
+             * @ngdoc method
+             * @name getScaffoldFromKey
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Get scaffold model for a given contentTypeKey.
+             * @param {string} key contentTypeKey to recive the scaffold model for.
+             * @returns {Object | null} Scaffold model for the that content type. Or null if the scaffolding model dosnt exist in this context.
+             */
+            getScaffoldFromKey: function (contentTypeKey) {
+                return this.scaffolds.find(o => o.contentTypeKey === contentTypeKey);
+            },
+
+            /**
+             * @ngdoc method
+             * @name getScaffoldFromAlias
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Get scaffold model for a given contentTypeAlias, used by clipboardService.
+             * @param {string} alias contentTypeAlias to recive the scaffold model for.
+             * @returns {Object | null} Scaffold model for the that content type. Or null if the scaffolding model dosnt exist in this context.
+             */
+            getScaffoldFromAlias: function (contentTypeAlias) {
+                return this.scaffolds.find(o => o.contentTypeAlias === contentTypeAlias);
+            },
+
+            /**
+             * @ngdoc method
+             * @name getBlockObject
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Retrieve a Block Object for the given layout entry.
+             * The Block Object offers the necessary data to display and edit a block.
+             * The Block Object setups live syncronization of content and settings models back to the data of your Property Editor model.
+             * The returned object, named ´BlockObject´, contains several usefull models to make editing of this block happen.
+             * The ´BlockObject´ contains the following properties:
+             * - key {string}: runtime generated key, usefull for tracking of this object
+             * - content {Object}: Content model, the content data in a ElementType model.
+             * - settings {Object}: Settings model, the settings data in a ElementType model.
+             * - config {Object}: A local deep copy of the block configuration model.
+             * - label {string}: The label for this block.
+             * - updateLabel {Method}: Method to trigger an update of the label for this block.
+             * - data {Object}: A reference to the content data object from your property editor model.
+             * - settingsData {Object}: A reference to the settings data object from your property editor model.
+             * - layout {Object}: A refernce to the layout entry from your property editor model.
+             * @param {Object} layoutEntry the layout entry object to build the block model from.
+             * @return {Object | null} The BlockObject for the given layout entry. Or null if data or configuration wasnt found for this block.
+             */
+            getBlockObject: function (layoutEntry) {
+
+                var contentUdi = layoutEntry.contentUdi;
+
+                var dataModel = getDataByUdi(contentUdi, this.value.contentData);
+
+                if (dataModel === null) {
+                    console.error("Couldn't find content data of " + contentUdi)
+                    return null;
+                }
+
+                var blockConfiguration = this.getBlockConfiguration(dataModel.contentTypeKey);
+                var contentScaffold = null;
+
+                if (blockConfiguration === null) {
+                    console.warn("The block of " + contentUdi + " is not being initialized because its contentTypeKey('" + dataModel.contentTypeKey + "') is not allowed for this PropertyEditor");
+                } else {
+                    contentScaffold = this.getScaffoldFromKey(blockConfiguration.contentElementTypeKey);
+                    if (contentScaffold === null) {
+                        console.error("The block of " + contentUdi + " is not begin initialized cause its Element Type was not loaded.");
+                    }
+                }
+
+                if (blockConfiguration === null || contentScaffold === null) {
+
+                    blockConfiguration = {
+                        label: "Unsupported",
+                        unsupported: true
+                    };
+                }
+
+                var blockObject = {};
+                // Set an angularJS cloneNode method, to avoid this object begin cloned.
+                blockObject.cloneNode = function () {
+                    return null;// angularJS accept this as a cloned value as long as the
+                }
+                blockObject.key = String.CreateGuid().replace(/-/g, "");
+                blockObject.config = Utilities.copy(blockConfiguration);
+                if (blockObject.config.label && blockObject.config.label !== "") {
+                    blockObject.labelInterpolator = $interpolate(blockObject.config.label);
+                }
+                blockObject.__scope = this.isolatedScope;
+                blockObject.updateLabel = _.debounce(
+                    function () {
+                        // Check wether scope still exists, maybe object was destoyed in these seconds.
+                        if (this.__scope) {
+                            this.label = getBlockLabel(this);
+                            this.__scope.$evalAsync();
+                        }
+                    }.bind(blockObject)
+                    , 10);
+
+                // make basics from scaffold
+                if(contentScaffold !== null) {// We might not have contentScaffold
+                    blockObject.content = Utilities.copy(contentScaffold);
+                    ensureUdiAndKey(blockObject.content, contentUdi);
+
+                    mapToElementModel(blockObject.content, dataModel);
+                } else {
+                    blockObject.content = null;
+                }
+
+                blockObject.data = dataModel;
+                blockObject.layout = layoutEntry;
+                blockObject.__watchers = [];
+
+                if (blockConfiguration.settingsElementTypeKey) {
+                    var settingsScaffold = this.getScaffoldFromKey(blockConfiguration.settingsElementTypeKey);
+                    if (settingsScaffold !== null) {
+
+                        if (!layoutEntry.settingsUdi) {
+                            // if this block does not have settings data, then create it. This could happen because settings model has been added later than this content was created.
+                            layoutEntry.settingsUdi = createDataEntry(blockConfiguration.settingsElementTypeKey, this.value.settingsData);
+                        }
+
+                        var settingsUdi = layoutEntry.settingsUdi;
+
+                        var settingsData = getDataByUdi(settingsUdi, this.value.settingsData);
+                        if (settingsData === null) {
+                            console.error("Couldnt find settings data of " + settingsUdi)
+                            return null;
+                        }
+
+                        blockObject.settingsData = settingsData;
+
+                        // make basics from scaffold
+                        blockObject.settings = Utilities.copy(settingsScaffold);
+                        ensureUdiAndKey(blockObject.settings, settingsUdi);
+
+                        mapToElementModel(blockObject.settings, settingsData);
+
+                        // add settings content-app
+                        appendSettingsContentApp(blockObject.content, this.__labels.settingsName);
+                    }
+                }
+
+                blockObject.retrieveValuesFrom = function (content, settings) {
+                    if (this.content !== null) {
+                        mapElementValues(content, this.content);
+                    }
+                    if (this.config.settingsElementTypeKey !== null) {
+                        mapElementValues(settings, this.settings);
+                    }
+                };
+
+                blockObject.sync = function () {
+                    if (this.content !== null) {
+                        mapToPropertyModel(this.content, this.data);
+                    }
+                    if (this.config.settingsElementTypeKey !== null) {
+                        mapToPropertyModel(this.settings, this.settingsData);
+                    }
+                };
+
+                // first time instant update of label.
+                blockObject.label = getBlockLabel(blockObject);
+
+                // Add blockObject to our isolated scope to enable watching its values:
+                this.isolatedScope.blockObjects["_" + blockObject.key] = blockObject;
+                addWatchers(blockObject, this.isolatedScope);
+                addWatchers(blockObject, this.isolatedScope, true);
+
+                blockObject.destroy = function () {
+                    // remove property value watchers:
+                    this.__watchers.forEach(w => { w(); });
+                    delete this.__watchers;
+
+                    // help carbage collector:
+                    delete this.config;
+
+                    delete this.layout;
+                    delete this.data;
+                    delete this.settingsData;
+                    delete this.content;
+                    delete this.settings;
+
+                    // remove model from isolatedScope.
+                    delete this.__scope.blockObjects["_" + this.key];
+                    // NOTE: It seems like we should call this.__scope.$destroy(); since that is the only way to remove a scope from it's parent,
+                    // however that is not the case since __scope is actually this.isolatedScope which gets cleaned up when the outer scope is
+                    // destroyed. If we do that here it breaks the scope chain and validation.
+                    delete this.__scope;
+
+                    // removes this method, making it impossible to destroy again.
+                    delete this.destroy;
+
+                    // lets remove the key to make things blow up if this is still referenced:
+                    delete this.key;
+                }
+
+                return blockObject;
+            },
+
+            /**
+             * @ngdoc method
+             * @name removeDataAndDestroyModel
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Removes the data and destroys the Block Model.
+             * Notice this method does not remove the block from your layout, this will need to be handlede by the Property Editor since this services donst know about your layout structure.
+             * @param {Object} blockObject The BlockObject to be removed and destroyed.
+             */
+            removeDataAndDestroyModel: function (blockObject) {
+                var udi = blockObject.layout.contentUdi;
+                var settingsUdi = blockObject.layout.settingsUdi || null;
+                this.destroyBlockObject(blockObject);
+                this.removeDataByUdi(udi);
+                if (settingsUdi) {
+                    this.removeSettingsByUdi(settingsUdi);
+                }
+            },
+
+            /**
+             * @ngdoc method
+             * @name destroyBlockObject
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Destroys the Block Model, but all data is kept.
+             * @param {Object} blockObject The BlockObject to be destroyed.
+             */
+            destroyBlockObject: function (blockObject) {
+                blockObject.destroy();
+            },
+
+            /**
+             * @ngdoc method
+             * @name getLayout
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Retrieve the layout object from this specific property editor model.
+             * @param {object} defaultStructure if no data exist the layout of your poerty editor will be set to this object.
+             * @return {Object} Layout object, structure depends on the model of your property editor.
+             */
+            getLayout: function (defaultStructure) {
+                if (!this.value.layout[this.propertyEditorAlias]) {
+                    this.value.layout[this.propertyEditorAlias] = defaultStructure;
+                }
+                return this.value.layout[this.propertyEditorAlias];
+            },
+
+            /**
+             * @ngdoc method
+             * @name create
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Create a empty layout entry, notice the layout entry is not added to the property editors model layout object, since the layout sturcture depends on the property editor.
+             * @param {string} contentElementTypeKey the contentElementTypeKey of the block you wish to create, if contentElementTypeKey is not avaiable in the block configuration then ´null´ will be returned.
+             * @return {Object | null} Layout entry object, to be inserted at a decired location in the layout object. Or null if contentElementTypeKey is unavaiaible.
+             */
+            create: function (contentElementTypeKey) {
+
+                var blockConfiguration = this.getBlockConfiguration(contentElementTypeKey);
+                if (blockConfiguration === null) {
+                    return null;
+                }
+
+                var entry = {
+                    contentUdi: createDataEntry(contentElementTypeKey, this.value.contentData)
+                }
+
+                if (blockConfiguration.settingsElementTypeKey != null) {
+                    entry.settingsUdi = createDataEntry(blockConfiguration.settingsElementTypeKey, this.value.settingsData)
+                }
+
+                return entry;
+            },
+
+            /**
+             * @ngdoc method
+             * @name createFromElementType
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Insert data from ElementType Model
+             * @return {Object | null} Layout entry object, to be inserted at a decired location in the layout object. Or ´null´ if the given ElementType isnt supported by the block configuration.
+             */
+            createFromElementType: function (elementTypeDataModel) {
+
+                elementTypeDataModel = clipboardService.parseContentForPaste(elementTypeDataModel, clipboardService.TYPES.ELEMENT_TYPE);
+
+                var contentElementTypeKey = elementTypeDataModel.contentTypeKey;
+
+                var layoutEntry = this.create(contentElementTypeKey);
+                if (layoutEntry === null) {
+                    return null;
+                }
+
+                var dataModel = getDataByUdi(layoutEntry.contentUdi, this.value.contentData);
+                if (dataModel === null) {
+                    return null;
+                }
+
+                mapToPropertyModel(elementTypeDataModel, dataModel);
+
+                return layoutEntry;
+
+            },
+            /**
+             * @ngdoc method
+             * @name createFromBlockData
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Insert data from raw models
+             * @return {Object | null} Layout entry object, to be inserted at a decired location in the layout object. Or ´null´ if the given ElementType isnt supported by the block configuration.
+             */
+            createFromBlockData: function (blockData) {
+
+                blockData = clipboardService.parseContentForPaste(blockData, clipboardService.TYPES.BLOCK);
+
+                // As the blockData is a cloned object we can use its layout part for our layout entry.
+                var layoutEntry = blockData.layout;
+                if (layoutEntry === null) {
+                    return null;
+                }
+
+                var blockConfiguration;
+
+                if (blockData.data) {
+                    // Ensure that we support the alias:
+                    blockConfiguration = this.getBlockConfiguration(blockData.data.contentTypeKey);
+                    if(blockConfiguration === null) {
+                        return null;
+                    }
+
+                    this.value.contentData.push(blockData.data);
+                } else {
+                    // We do not have data, this cannot be succesful paste.
+                    return null;
+                }
+
+                if (blockData.settingsData) {
+                    // Ensure that we support the alias:
+                    if(blockConfiguration.settingsElementTypeKey) {
+                        // If we have settings for this Block Configuration, we need to check that they align, if we dont we do not want to fail.
+                        if(blockConfiguration.settingsElementTypeKey === blockData.settingsData.contentTypeKey) {
+                            this.value.settingsData.push(blockData.settingsData);
+                        } else {
+                            notificationsService.error("Clipboard", "Couldn't paste because settings-data is not compatible.");
+                            return null;
+                        }
+                    } else {
+                        // We do not have settings currently, so lets get rid of the settings part and move on with the paste.
+                        delete layoutEntry.settingUdi;
+                    }
+                }
+
+                return layoutEntry;
+
+            },
+
+            /**
+             * @ngdoc method
+             * @name sync
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Force immidiate update of the blockobject models to the property model.
+             */
+            sync: function () {
+                for (const key in this.isolatedScope.blockObjects) {
+                    this.isolatedScope.blockObjects[key].sync();
+                }
+            },
+
+            /**
+             * @ngdoc method
+             * @name removeDataByUdi
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Removes the content data of a given UDI.
+             * Notice this method does not remove the block from your layout, this will need to be handled by the Property Editor since this services don't know about your layout structure.
+             * @param {string} udi The UDI of the content data to be removed.
+             */
+            removeDataByUdi: function (udi) {
+                const index = this.value.contentData.findIndex(o => o.udi === udi);
+                if (index !== -1) {
+                    this.value.contentData.splice(index, 1);
+                }
+            },
+
+            /**
+             * @ngdoc method
+             * @name removeSettingsByUdi
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Removes the settings data of a given UDI.
+             * Notice this method does not remove the settingsUdi from your layout, this will need to be handled by the Property Editor since this services don't know about your layout structure.
+             * @param {string} udi The UDI of the settings data to be removed.
+             */
+            removeSettingsByUdi: function (udi) {
+                const index = this.value.settingsData.findIndex(o => o.udi === udi);
+                if (index !== -1) {
+                    this.value.settingsData.splice(index, 1);
+                }
+            },
+
+            /**
+             * @ngdoc method
+             * @name destroy
+             * @methodOf umbraco.services.blockEditorModelObject
+             * @description Notice you should not need to destroy the BlockEditorModelObject since it will automaticly be destroyed when the scope of existance gets destroyed.
+             */
+            destroy: function () {
+
+                this.__watchers.forEach(w => { w(); });
+                for (const key in this.isolatedScope.blockObjects) {
+                    this.destroyBlockObject(this.isolatedScope.blockObjects[key]);
+                }
+
+                delete this.__watchers;
+                delete this.value;
+                delete this.propertyEditorAlias;
+                delete this.blockConfigurations;
+                delete this.scaffolds;
+                this.isolatedScope.$destroy();
+                delete this.isolatedScope;
+                delete this.destroy;
+            }
+        }
+
+        return BlockEditorModelObject;
+    }
+
+    angular.module('umbraco.services').service('blockEditorModelObject', blockEditorModelObjectFactory);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
index d7d6ec862c..83fd3d08c2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
@@ -10,14 +10,69 @@
  * The service has a set way for defining a data-set by a entryType and alias, which later will be used to retrive the posible entries for a paste scenario.
  *
  */
-function clipboardService(notificationsService, eventsService, localStorageService, iconHelper) {
-    
+function clipboardService($window, notificationsService, eventsService, localStorageService, iconHelper) {
 
-    var clearPropertyResolvers = [];
 
-    
+    const TYPES = {};
+    TYPES.ELEMENT_TYPE = "elementType";
+    TYPES.BLOCK = "block";
+    TYPES.RAW = "raw";
+
+    var clearPropertyResolvers = {};
+    var pastePropertyResolvers = {};
+    var clipboardTypeResolvers = {};
+
+    clipboardTypeResolvers[TYPES.ELEMENT_TYPE] = function(element, propMethod) {
+        for (var t = 0; t < element.variants[0].tabs.length; t++) {
+            var tab = element.variants[0].tabs[t];
+            for (var p = 0; p < tab.properties.length; p++) {
+                var prop = tab.properties[p];
+                propMethod(prop, TYPES.ELEMENT_TYPE);
+            }
+        }
+    }
+    clipboardTypeResolvers[TYPES.BLOCK] = function (block, propMethod) {
+
+        propMethod(block, TYPES.BLOCK);
+
+        if(block.data) {
+            Object.keys(block.data).forEach( key => {
+                if(key === 'udi' || key === 'contentTypeKey') {
+                    return;
+                }
+                propMethod(block.data[key], TYPES.RAW);
+            });
+        }
+
+        if(block.settingsData) {
+            Object.keys(block.settingsData).forEach( key => {
+                if(key === 'udi' || key === 'contentTypeKey') {
+                    return;
+                }
+                propMethod(block.settingsData[key], TYPES.RAW);
+            });
+        }
+
+        /*
+        // Concept for supporting Block that contains other Blocks.
+        // Missing clarifications:
+        // How do we ensure that the inner blocks of a block is supported in the new scenario. Not that likely but still relevant, so considerations should be made.
+        if(block.references) {
+            // A Block clipboard entry can contain other Block Clipboard Entries, here we will make sure to resolve those identical to the main entry.
+            for (var r = 0; r < block.references.length; r++) {
+                clipboardTypeResolvers[TYPES.BLOCK](block.references[r], propMethod);
+            }
+        }
+        */
+    }
+    clipboardTypeResolvers[TYPES.RAW] = function(data, propMethod) {
+        for (var p = 0; p < data.length; p++) {
+            propMethod(data[p], TYPES.RAW);
+        }
+    }
+
     var STORAGE_KEY = "umbClipboardService";
-    
+
     var retriveStorage = function() {
         if (localStorageService.isSupported === false) {
             return null;
@@ -27,58 +82,62 @@ function clipboardService(notificationsService, eventsService, localStorageServi
         if (dataString != null) {
             dataJSON = JSON.parse(dataString);
         }
-        
+
         if(dataJSON == null) {
             dataJSON = new Object();
         }
-        
+
         if(dataJSON.entries === undefined) {
             dataJSON.entries = [];
         }
-        
+
         return dataJSON;
     }
-    
+
     var saveStorage = function(storage) {
         var storageString = JSON.stringify(storage);
-        
+
         try {
+            // Check that we can parse the JSON:
             var storageJSON = JSON.parse(storageString);
+
+            // Store the string:
             localStorageService.set(STORAGE_KEY, storageString);
-            
+
             eventsService.emit("clipboardService.storageUpdate");
-            
+
             return true;
         } catch(e) {
             return false;
         }
-        
+
         return false;
     }
 
 
-    function clearPropertyForStorage(prop) {
+    function resolvePropertyForStorage(prop, type) {
 
-        for (var i=0; i<clearPropertyResolvers.length; i++) {
-            clearPropertyResolvers[i](prop, clearPropertyForStorage);
+        type = type || "raw";
+        var resolvers = clearPropertyResolvers[type];
+        if (resolvers) {
+            for (var i=0; i<resolvers.length; i++) {
+                resolvers[i](prop, resolvePropertyForStorage);
+            }
         }
-
     }
 
-    var prepareEntryForStorage = function(entryData, firstLevelClearupMethod) {
+    var prepareEntryForStorage = function(type, entryData, firstLevelClearupMethod) {
 
         var cloneData = Utilities.copy(entryData);
         if (firstLevelClearupMethod != undefined) {
             firstLevelClearupMethod(cloneData);
         }
 
-        // remove keys from sub-entries
-        for (var t = 0; t < cloneData.variants[0].tabs.length; t++) {
-            var tab = cloneData.variants[0].tabs[t];
-            for (var p = 0; p < tab.properties.length; p++) {
-                var prop = tab.properties[p];
-                clearPropertyForStorage(prop);
-            }
+        var typeResolver = clipboardTypeResolvers[type];
+        if(typeResolver) {
+            typeResolver(cloneData, resolvePropertyForStorage);
+        } else {
+            console.warn("Umbraco.service.clipboardService has no type resolver for '" + type + "'.");
         }
 
         return cloneData;
@@ -86,17 +145,62 @@ function clipboardService(notificationsService, eventsService, localStorageServi
 
     var isEntryCompatible = function(entry, type, allowedAliases) {
         return entry.type === type
-        && 
+        &&
         (
             (entry.alias && allowedAliases.filter(allowedAlias => allowedAlias === entry.alias).length > 0)
-            || 
+            ||
             (entry.aliases && entry.aliases.filter(entryAlias => allowedAliases.filter(allowedAlias => allowedAlias === entryAlias).length > 0).length === entry.aliases.length)
         );
     }
-    
-    
+
+
+
+
+    function resolvePropertyForPaste(prop, type) {
+
+        type = type || "raw";
+        var resolvers = pastePropertyResolvers[type];
+        if (resolvers) {
+            for (var i=0; i<resolvers.length; i++) {
+                resolvers[i](prop, resolvePropertyForPaste);
+            }
+        }
+    }
+
+
+
     var service = {};
-    
+
+    /**
+     * Default types to store in clipboard.
+     */
+    service.TYPES = TYPES;
+
+
+    /**
+    * @ngdoc method
+    * @name umbraco.services.clipboardService#parseContentForPaste
+    * @methodOf umbraco.services.clipboardService
+    *
+    * @param {object} function The content entry to be cloned and resolved.
+    *
+    * @description
+    * Executed registered property resolvers for inner properties, to be done on pasting a clipbaord content entry.
+    *
+    */
+    service.parseContentForPaste = function(pasteEntryData, type) {
+        var cloneData = Utilities.copy(pasteEntryData);
+
+        var typeResolver = clipboardTypeResolvers[type];
+        if (typeResolver) {
+            typeResolver(cloneData, resolvePropertyForPaste);
+        } else {
+            console.warn("Umbraco.service.clipboardService has no type resolver for '" + type + "'.");
+        }
+
+        return cloneData;
+    }
+
 
     /**
     * @ngdoc method
@@ -104,14 +208,15 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * @methodOf umbraco.services.clipboardService
     *
     * @param {string} function A method executed for every property and inner properties copied.
+    * @param {string} string A string representing the property type format for this resolver to execute for.
     *
     * @description
-    * Executed for all properties including inner properties when performing a copy action.
+    * Executed for all properties of given type when performing a copy action.
     *
     * @deprecated Incorrect spelling please use 'registerClearPropertyResolver'
     */
-    service.registrerClearPropertyResolver = function(resolver) {
-        this.registerClearPropertyResolver(resolver);
+    service.registrerClearPropertyResolver = function(resolver, type) {
+        this.registerClearPropertyResolver(resolver, type);
     };
 
     /**
@@ -119,13 +224,56 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * @name umbraco.services.clipboardService#registerClearPropertyResolver
     * @methodOf umbraco.services.clipboardService
     *
-    * @param {string} function A method executed for every property and inner properties copied.
+    * @param {method} function A method executed for every property and inner properties copied. Notice the method both needs to deal with retriving a property object {alias:..editor:..value:... ,...} and the raw property value as if the property is an inner property of a nested property.
+    * @param {string} string A string representing the property type format for this resolver to execute for.
     *
     * @description
-    * Executed for all properties including inner properties when performing a copy action.
+    * Executed for all properties of given type when performing a copy action.
     */
-    service.registerClearPropertyResolver = function(resolver) {
-        clearPropertyResolvers.push(resolver);
+    service.registerClearPropertyResolver = function(resolver, type) {
+        type = type || "raw";
+        if(!clearPropertyResolvers[type]) {
+            clearPropertyResolvers[type] = [];
+        }
+        clearPropertyResolvers[type].push(resolver);
+    };
+
+    /**
+    * @ngdoc method
+    * @name umbraco.services.clipboardService#registerPastePropertyResolver
+    * @methodOf umbraco.services.clipboardService
+    *
+    * @param {method} function A method executed for every property and inner properties copied. Notice the method both needs to deal with retriving a property object {alias:..editor:..value:... ,...} and the raw property value as if the property is an inner property of a nested property.
+    * @param {string} string A string representing the property type format for this resolver to execute for.
+    *
+    * @description
+    * Executed for all properties of given type when performing a paste action.
+    */
+    service.registerPastePropertyResolver = function(resolver, type) {
+        type = type || "raw";
+        if(!pastePropertyResolvers[type]) {
+            pastePropertyResolvers[type] = [];
+        }
+        pastePropertyResolvers[type].push(resolver);
+    };
+
+
+    /**
+    * @ngdoc method
+    * @name umbraco.services.clipboardService#registrerTypeResolvers
+    * @methodOf umbraco.services.clipboardService
+    *
+    * @param {method} function A method for to execute resolvers for each properties of the specific type.
+    * @param {string} string A string representing the content type format for this resolver to execute for.
+    *
+    * @description
+    * Executed for all properties including inner properties when performing a paste action.
+    */
+    service.registrerTypeResolvers = function(resolver, type) {
+        if(!clipboardTypeResolvers[type]) {
+            clipboardTypeResolvers[type] = [];
+        }
+        clipboardTypeResolvers[type].push(resolver);
     };
 
 
@@ -145,29 +293,29 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * Saves a single JS-object with a type and alias to the clipboard.
     */
     service.copy = function(type, alias, data, displayLabel, displayIcon, uniqueKey, firstLevelClearupMethod) {
-        
+
         var storage = retriveStorage();
 
         displayLabel = displayLabel || data.name;
         displayIcon = displayIcon || iconHelper.convertFromLegacyIcon(data.icon);
         uniqueKey = uniqueKey || data.key || console.error("missing unique key for this content");
-        
+
         // remove previous copies of this entry:
         storage.entries = storage.entries.filter(
             (entry) => {
                 return entry.unique !== uniqueKey;
             }
         );
-        
-        var entry = {unique:uniqueKey, type:type, alias:alias, data:prepareEntryForStorage(data, firstLevelClearupMethod), label:displayLabel, icon:displayIcon};
+
+        var entry = {unique:uniqueKey, type:type, alias:alias, data:prepareEntryForStorage(type, data, firstLevelClearupMethod), label:displayLabel, icon:displayIcon, date:Date.now()};
         storage.entries.push(entry);
-        
+
         if (saveStorage(storage) === true) {
             notificationsService.success("Clipboard", "Copied to clipboard.");
         } else {
             notificationsService.error("Clipboard", "Couldnt copy this data to clipboard.");
         }
-        
+
     };
 
 
@@ -188,32 +336,35 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * Saves a single JS-object with a type and alias to the clipboard.
     */
     service.copyArray = function(type, aliases, datas, displayLabel, displayIcon, uniqueKey, firstLevelClearupMethod) {
-        
+
+        if (type === "elementTypeArray") {
+            type = "elementType";
+        }
+
         var storage = retriveStorage();
-        
+
         // Clean up each entry
-        var copiedDatas = datas.map(data => prepareEntryForStorage(data, firstLevelClearupMethod));
-        
+        var copiedDatas = datas.map(data => prepareEntryForStorage(type, data, firstLevelClearupMethod));
+
         // remove previous copies of this entry:
         storage.entries = storage.entries.filter(
             (entry) => {
                 return entry.unique !== uniqueKey;
             }
         );
-        
-        var entry = {unique:uniqueKey, type:type, aliases:aliases, data:copiedDatas, label:displayLabel, icon:displayIcon};
 
+        var entry = {unique:uniqueKey, type:type, aliases:aliases, data:copiedDatas, label:displayLabel, icon:displayIcon, date:Date.now()};
         storage.entries.push(entry);
-        
+
         if (saveStorage(storage) === true) {
             notificationsService.success("Clipboard", "Copied to clipboard.");
         } else {
             notificationsService.error("Clipboard", "Couldnt copy this data to clipboard.");
         }
-        
+
     };
-    
-    
+
+
     /**
     * @ngdoc method
     * @name umbraco.services.supportsCopy#supported
@@ -225,7 +376,7 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     service.isSupported = function() {
         return localStorageService.isSupported;
     };
-    
+
     /**
     * @ngdoc method
     * @name umbraco.services.supportsCopy#hasEntriesOfType
@@ -238,14 +389,14 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * Determines whether the current clipboard has entries that match a given type and one of the aliases.
     */
     service.hasEntriesOfType = function(type, aliases) {
-        
+
         if(service.retriveEntriesOfType(type, aliases).length > 0) {
             return true;
         }
-        
+
         return false;
     };
-    
+
     /**
     * @ngdoc method
     * @name umbraco.services.supportsCopy#retriveEntriesOfType
@@ -253,24 +404,24 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     *
     * @param {string} type A string defining the type of data to recive.
     * @param {string} aliases A array of strings providing the alias of the data you want to recive.
-    * 
+    *
     * @description
     * Returns an array of entries matching the given type and one of the provided aliases.
     */
     service.retriveEntriesOfType = function(type, allowedAliases) {
-        
+
         var storage = retriveStorage();
-        
+
         // Find entries that are fulfilling the criteria for this nodeType and nodeTypesAliases.
         var filteretEntries = storage.entries.filter(
             (entry) => {
                 return isEntryCompatible(entry, type, allowedAliases);
             }
         );
-        
+
         return filteretEntries;
     };
-    
+
     /**
     * @ngdoc method
     * @name umbraco.services.supportsCopy#retriveEntriesOfType
@@ -278,14 +429,14 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     *
     * @param {string} type A string defining the type of data to recive.
     * @param {string} aliases A array of strings providing the alias of the data you want to recive.
-    * 
+    *
     * @description
     * Returns an array of data of entries matching the given type and one of the provided aliases.
     */
     service.retriveDataOfType = function(type, aliases) {
         return service.retriveEntriesOfType(type, aliases).map((x) => x.data);
     };
-    
+
     /**
     * @ngdoc method
     * @name umbraco.services.supportsCopy#retriveEntriesOfType
@@ -293,12 +444,12 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     *
     * @param {string} type A string defining the type of data to remove.
     * @param {string} aliases A array of strings providing the alias of the data you want to remove.
-    * 
+    *
     * @description
     * Removes entries matching the given type and one of the provided aliases.
     */
     service.clearEntriesOfType = function(type, allowedAliases) {
-        
+
         var storage = retriveStorage();
 
         // Find entries that are NOT fulfilling the criteria for this nodeType and nodeTypesAliases.
@@ -307,17 +458,24 @@ function clipboardService(notificationsService, eventsService, localStorageServi
                 return !isEntryCompatible(entry, type, allowedAliases);
             }
         );
-        
+
         storage.entries = filteretEntries;
 
         saveStorage(storage);
     };
-    
-    
-    
+
+
+    var emitClipboardStorageUpdate = _.debounce(function(e) {
+        eventsService.emit("clipboardService.storageUpdate");
+    }, 1000);
+
+    // Fires if LocalStorage was changed from another tab than this one.
+    $window.addEventListener("storage", emitClipboardStorageUpdate);
+
+
+
     return service;
 }
 
 
 angular.module("umbraco.services").factory("clipboardService", clipboardService);
-
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contentapphelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contentapphelper.service.js
new file mode 100644
index 0000000000..0b3dc2c6e0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/services/contentapphelper.service.js
@@ -0,0 +1,35 @@
+
+/**
+* @ngdoc service
+* @name umbraco.services.contentAppHelper
+* @description A helper service for content app related functions.
+**/
+function contentAppHelper() {
+
+    var service = {};
+
+    /**
+     * Default known content based apps.
+     */
+    service.CONTENT_BASED_APPS = [ "umbContent", "umbInfo", "umbListView" ];
+
+    /**
+    * @ngdoc method
+    * @name umbraco.services.contentAppHelper#isContentBasedApp
+    * @methodOf umbraco.services.contentAppHelper
+    *
+    * @param {object} app A content app to check
+    *
+    * @description
+    * Determines whether the supplied content app is a known content based app
+    *
+    */
+    service.isContentBasedApp = function (app) {
+        return service.CONTENT_BASED_APPS.indexOf(app.alias) !== -1;
+    }
+
+    return service;
+
+}
+
+angular.module('umbraco.services').factory('contentAppHelper', contentAppHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
index bfcc0d536e..b301960eab 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
@@ -32,6 +32,26 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
         return true;
     }
 
+    function showNotificationsForModelsState(ms) {
+        for (const [key, value] of Object.entries(ms)) {
+
+            var errorMsg = value[0];
+            // if the error message is json it's a complex editor validation response that we need to parse
+            if ((Utilities.isString(errorMsg) && errorMsg.startsWith("[")) || Utilities.isArray(errorMsg)) {
+                // flatten the json structure, create validation paths for each property and add each as a property error
+                var idsToErrors = serverValidationManager.parseComplexEditorError(errorMsg, "");
+                idsToErrors.forEach(x => {
+                    if (x.modelState) {
+                        showNotificationsForModelsState(x.modelState);
+                    }
+                });
+            }
+            else if (value[0]) {
+                notificationsService.error("Validation", value[0]);
+            }
+        }
+    }
+
     return {
 
         //TODO: We need to move some of this to formHelper for saving, too many editors use this method for saving when this entire
@@ -64,7 +84,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
                 //when true, the url will change but it won't actually re-route
                 //this is merely here for compatibility, if only the content/media/members used this service we'd prob be ok but tons of editors
                 //use this service unfortunately and probably packages too.
-                args.softRedirect = false; 
+                args.softRedirect = false;
             }
 
 
@@ -97,12 +117,18 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
                         return $q.resolve(data);
 
                     }, function (err) {
+
+                        formHelper.resetForm({ scope: args.scope, hasErrors: true });
+
                         self.handleSaveError({
                             showNotifications: args.showNotifications,
                             softRedirect: args.softRedirect,
                             err: err,
                             rebindCallback: function () {
-                                rebindCallback.apply(self, [args.content, err.data]);
+                                // if the error contains data, we want to map that back as we want to continue editing this save. Especially important when the content is new as the returned data will contain ID etc.
+                                if(err.data) {
+                                    rebindCallback.apply(self, [args.content, err.data]);
+                                }
                             }
                         });
 
@@ -131,7 +157,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
             // first check if tab is already added
             var foundInfoTab = false;
 
-            angular.forEach(tabs, function (tab) {
+            tabs.forEach(function (tab) {
                 if (tab.id === infoTab.id && tab.alias === infoTab.alias) {
                     foundInfoTab = true;
                 }
@@ -278,7 +304,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
                 }
 
                 // if publishing is allowed also allow schedule publish
-                // we add this manually becuase it doesn't have a permission so it wont 
+                // we add this manually becuase it doesn't have a permission so it wont
                 // get picked up by the loop through permissions
                 if (_.contains(args.content.allowedActions, "U")) {
                     buttons.subButtons.push(createButtonDefinition("SCHEDULE"));
@@ -569,7 +595,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
                         //instead of having a property editor $watch their expression to check if it has
                         // been updated, instead we'll check for the existence of a special method on their model
                         // and just call it.
-                        if (angular.isFunction(origProp.onValueChanged)) {
+                        if (Utilities.isFunction(origProp.onValueChanged)) {
                             //send the newVal + oldVal
                             origProp.onValueChanged(origProp.value, origVal);
                         }
@@ -602,7 +628,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
             if (!args.err) {
                 throw "args.err cannot be null";
             }
-            
+
             //When the status is a 400 status with a custom header: X-Status-Reason: Validation failed, we have validation errors.
             //Otherwise the error is probably due to invalid data (i.e. someone mucking around with the ids or something).
             //Or, some strange server error
@@ -615,17 +641,15 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
 
                     //add model state errors to notifications
                     if (args.showNotifications) {
-                        for (var e in args.err.data.ModelState) {
-                            notificationsService.error("Validation", args.err.data.ModelState[e][0]);
-                        }
+                        showNotificationsForModelsState(args.err.data.ModelState);
                     }
 
                     if (!this.redirectToCreatedContent(args.err.data.id, args.softRedirect) || args.softRedirect) {
                         // If we are not redirecting it's because this is not newly created content, else in some cases we are
-                        // soft-redirecting which means the URL will change but the route wont (i.e. creating content). 
+                        // soft-redirecting which means the URL will change but the route wont (i.e. creating content).
 
                         // In this case we need to detect what properties have changed and re-bind them with the server data.
-                        if (args.rebindCallback && angular.isFunction(args.rebindCallback)) {
+                        if (args.rebindCallback && Utilities.isFunction(args.rebindCallback)) {
                             args.rebindCallback();
                         }
 
@@ -669,10 +693,10 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
             if (!this.redirectToCreatedContent(args.redirectId ? args.redirectId : args.savedContent.id, args.softRedirect) || args.softRedirect) {
 
                 // If we are not redirecting it's because this is not newly created content, else in some cases we are
-                // soft-redirecting which means the URL will change but the route wont (i.e. creating content). 
+                // soft-redirecting which means the URL will change but the route wont (i.e. creating content).
 
                 // In this case we need to detect what properties have changed and re-bind them with the server data.
-                if (args.rebindCallback && angular.isFunction(args.rebindCallback)) {
+                if (args.rebindCallback && Utilities.isFunction(args.rebindCallback)) {
                     args.rebindCallback();
                 }
             }
@@ -705,7 +729,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
                     navigationService.setSoftRedirect();
                 }
                 //change to new path
-                $location.path("/" + $routeParams.section + "/" + $routeParams.tree + "/" + $routeParams.method + "/" + id);                
+                $location.path("/" + $routeParams.section + "/" + $routeParams.tree + "/" + $routeParams.method + "/" + id);
                 //don't add a browser history for this
                 $location.replace();
                 return true;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
index 1be66cc68f..9cec15d519 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
@@ -11,7 +11,7 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
 
             var newArray = [];
 
-            angular.forEach(array, function (arrayItem) {
+            array.forEach(function (arrayItem) {
 
                 if (Utilities.isObject(arrayItem)) {
                     newArray.push(arrayItem.id);
@@ -116,13 +116,12 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
                 throw new Error("Cannot add this composition, these properties already exist on the content type: " + overlappingAliases.join());
             }
 
-            angular.forEach(compositeContentType.groups, function (compositionGroup) {
-
+            compositeContentType.groups.forEach(function (compositionGroup) {
                 // order composition groups based on sort order
                 compositionGroup.properties = $filter('orderBy')(compositionGroup.properties, 'sortOrder');
 
                 // get data type details
-                angular.forEach(compositionGroup.properties, function (property) {
+                compositionGroup.properties.forEach(function (property) {
                     dataTypeResource.getById(property.dataTypeId)
                         .then(function (dataType) {
                             property.dataTypeIcon = dataType.icon;
@@ -134,7 +133,7 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
                 compositionGroup.inherited = true;
 
                 // set inherited state on properties
-                angular.forEach(compositionGroup.properties, function (compositionProperty) {
+                compositionGroup.properties.forEach(function (compositionProperty) {
                     compositionProperty.inherited = true;
                 });
 
@@ -142,7 +141,7 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
                 compositionGroup.tabState = "inActive";
 
                 // if groups are named the same - merge the groups
-                angular.forEach(contentType.groups, function (contentTypeGroup) {
+                contentType.groups.forEach(function (contentTypeGroup) {
 
                     if (contentTypeGroup.name === compositionGroup.name) {
 
@@ -224,7 +223,7 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
 
             var groups = [];
 
-            angular.forEach(contentType.groups, function (contentTypeGroup) {
+            contentType.groups.forEach(function (contentTypeGroup) {
 
                 if (contentTypeGroup.tabState !== "init") {
 
@@ -238,7 +237,7 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
                         var properties = [];
 
                         // remove all properties from composite content type
-                        angular.forEach(contentTypeGroup.properties, function (property) {
+                        contentTypeGroup.properties.forEach(function (property) {
                             if (property.contentTypeId !== compositeContentType.id) {
                                 properties.push(property);
                             }
@@ -283,7 +282,7 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
 
             var sortOrder = 0;
 
-            angular.forEach(properties, function (property) {
+            properties.forEach(function (property) {
                 if (!property.inherited && property.propertyState !== "init") {
                     property.sortOrder = sortOrder;
                 }
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index 538bd41ce0..326123f797 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -179,8 +179,7 @@ When building a custom infinite editor view you can use the same components as a
             } else {
                 focus();
             }
-        });
-
+        });      
 
         /**
          * @ngdoc method
@@ -248,11 +247,11 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Method to open a new editor in infinite editing
+         * Method to open a new editor in infinite editing.
          *
-         * @param {Object} editor rendering options
-         * @param {String} editor.view Path to view
-         * @param {String} editor.size Sets the size of the editor ("small" || "medium"). If nothing is set it will use full width.
+         * @param {object} editor rendering options.
+         * @param {string} editor.view Path to view.
+         * @param {string} editor.size Sets the size of the editor ("small" || "medium"). If nothing is set it will use full width.
          */
         function open(editor) {
 
@@ -342,18 +341,18 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens a content editor in infinite editing, the submit callback returns the updated content item
-         * @param {Object} editor rendering options
-         * @param {String} editor.id The id of the content item
-         * @param {Boolean} editor.create Create new content item
-         * @param {Function} editor.submit Callback function when the publish and close button is clicked. Returns the editor model object
-         * @param {Function} editor.close Callback function when the close button is clicked.
-         * @param {String} editor.parentId If editor.create is true, provide parentId for the creation of the content item
-         * @param {String} editor.documentTypeAlias If editor.create is true, provide document type alias for the creation of the content item
-         * @param {Boolean} editor.allowSaveAndClose If editor is being used in infinite editing allows the editor to close when the save action is performed
-         * @param {Boolean} editor.allowPublishAndClose If editor is being used in infinite editing allows the editor to close when the publish action is performed
+         * Opens a content editor in infinite editing, the submit callback returns the updated content item.
+         * @param {object} editor rendering options.
+         * @param {string} editor.id The id of the content item.
+         * @param {boolean} editor.create Create new content item.
+         * @param {function} editor.submit Callback function when the publish and close button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
+         * @param {string} editor.parentId If editor.create is true, provide parentId for the creation of the content item.
+         * @param {string} editor.documentTypeAlias If editor.create is true, provide document type alias for the creation of the content item.
+         * @param {boolean} editor.allowSaveAndClose If editor is being used in infinite editing allows the editor to close when the save action is performed.
+         * @param {boolean} editor.allowPublishAndClose If editor is being used in infinite editing allows the editor to close when the publish action is performed.
          * 
-         * @returns {Object} editor object
+         * @returns {object} editor object
          */
         function contentEditor(editor) {
             editor.view = "views/content/edit.html";
@@ -366,15 +365,15 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens a content picker in infinite editing, the submit callback returns an array of selected items
+         * Opens a content picker in infinite editing, the submit callback returns an array of selected items.
          *
-         * @param {Object} editor rendering options
-         * @param {Boolean} editor.multiPicker Pick one or multiple items
-         * @param {Int} editor.startNodeId Set the startnode of the picker (optional)
-         * @param {Function} editor.submit Callback function when the submit button is clicked. Returns the editor model object
-         * @param {Function} editor.close Callback function when the close button is clicked.
+         * @param {object} editor rendering options.
+         * @param {boolean} editor.multiPicker Pick one or multiple items.
+         * @param {number} editor.startNodeId Set the startnode of the picker (optional).
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          *
-         * @returns {Object} editor object
+         * @returns {object} editor object.
          */
         function contentPicker(editor) {
             editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
@@ -392,12 +391,12 @@ When building a custom infinite editor view you can use the same components as a
          * @description
          * Opens a content type picker in infinite editing, the submit callback returns an array of selected items
          *
-         * @param {Object} editor rendering options
-         * @param {Boolean} editor.multiPicker Pick one or multiple items
-         * @param {Function} editor.submit Callback function when the submit button is clicked. Returns the editor model object
-         * @param {Function} editor.close Callback function when the close button is clicked.
+         * @param {object} editor rendering options.
+         * @param {boolean} editor.multiPicker Pick one or multiple items.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          *
-         * @returns {Object} editor object
+         * @returns {object} editor object
          */
         function contentTypePicker(editor) {
             editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
@@ -413,14 +412,14 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens a media type picker in infinite editing, the submit callback returns an array of selected items
+         * Opens a media type picker in infinite editing, the submit callback returns an array of selected items.
          *
-         * @param {Object} editor rendering options
-         * @param {Boolean} editor.multiPicker Pick one or multiple items
-         * @param {Function} editor.submit Callback function when the submit button is clicked. Returns the editor model object
-         * @param {Function} editor.close Callback function when the close button is clicked.
+         * @param {object} editor rendering options.
+         * @param {boolean} editor.multiPicker Pick one or multiple items.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          *
-         * @returns {Object} editor object
+         * @returns {object} editor object.
          */
         function mediaTypePicker(editor) {
             editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
@@ -436,14 +435,14 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens a member type picker in infinite editing, the submit callback returns an array of selected items
+         * Opens a member type picker in infinite editing, the submit callback returns an array of selected items.
          *
-         * @param {Object} editor rendering options
-         * @param {Boolean} editor.multiPicker Pick one or multiple items
-         * @param {Function} editor.submit Callback function when the submit button is clicked. Returns the editor model object
-         * @param {Function} editor.close Callback function when the close button is clicked.
+         * @param {object} editor rendering options.
+         * @param {boolean} editor.multiPicker Pick one or multiple items.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
          *
-         * @returns {Object} editor object
+         * @returns {object} editor object.
          */
         function memberTypePicker(editor) {
             editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
@@ -458,12 +457,12 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens a copy editor in infinite editing, the submit callback returns an array of selected items
-         * @param {String} editor.section The node entity type
-         * @param {String} editor.currentNode The current node id
-         * @param {Callback} editor.submit Saves, submits, and closes the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * Opens a copy editor in infinite editing, the submit callback returns an array of selected items.
+         * @param {string} editor.section The node entity type.
+         * @param {string} editor.currentNode The current node id.
+         * @param {function} editor.submit Saves, submits, and closes the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
 
         function copy(editor) {
@@ -479,11 +478,11 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens a move editor in infinite editing.
-         * @param {String} editor.section The node entity type
-         * @param {String} editor.currentNode The current node id
-         * @param {Callback} editor.submit Saves, submits, and closes the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * @param {string} editor.section The node entity type.
+         * @param {string} editor.currentNode The current node id.
+         * @param {function} editor.submit Saves, submits, and closes the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
 
         function move(editor) {
@@ -499,9 +498,9 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens an embed editor in infinite editing.
-         * @param {Callback} editor.submit Saves, submits, and closes the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * @param {function} editor.submit Saves, submits, and closes the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
 
         function embed(editor) {
@@ -517,10 +516,10 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens a rollback editor in infinite editing.
-         * @param {String} editor.node The node to rollback
-         * @param {Callback} editor.submit Saves, submits, and closes the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * @param {string} editor.node The node to rollback.
+         * @param {function} editor.submit Saves, submits, and closes the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
 
         function rollback(editor) {
@@ -536,12 +535,12 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens an embed editor in infinite editing.
-         * @param {Object} editor rendering options
-         * @param {String} editor.icon The icon class
-         * @param {String} editor.color The color class
-         * @param {Callback} editor.submit Saves, submits, and closes the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * @param {object} editor rendering options.
+         * @param {string} editor.icon The icon class.
+         * @param {string} editor.color The color class.
+         * @param {function} editor.submit Saves, submits, and closes the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function linkPicker(editor) {
             editor.view = "views/common/infiniteeditors/linkpicker/linkpicker.html";
@@ -555,13 +554,13 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens a media editor in infinite editing, the submit callback returns the updated media item
-         * @param {Object} editor rendering options
-         * @param {String} editor.id The id of the media item
-         * @param {Boolean} editor.create Create new media item
-         * @param {Callback} editor.submit Saves, submits, and closes the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * Opens a media editor in infinite editing, the submit callback returns the updated media item.
+         * @param {object} editor rendering options.
+         * @param {string} editor.id The id of the media item.
+         * @param {boolean} editor.create Create new media item.
+         * @param {function} editor.submit Saves, submits, and closes the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function mediaEditor(editor) {
             editor.view = "views/media/edit.html";
@@ -574,17 +573,17 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens a media picker in infinite editing, the submit callback returns an array of selected media items
-         * @param {Object} editor rendering options
-         * @param {Int} editor.startNodeId Set the startnode of the picker (optional)
-         * @param {Boolean} editor.multiPicker Pick one or multiple items
-         * @param {Boolean} editor.onlyImages Only display files that have an image file-extension
-         * @param {Boolean} editor.disableFolderSelect Disable folder selection
-         * @param {Boolean} editor.disableFocalPoint Disable focal point editor for selected media
-         * @param {Array} editor.updatedMediaNodes A list of ids for media items that have been updated through the media picker
-         * @param {Callback} editor.submit Submits the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * Opens a media picker in infinite editing, the submit callback returns an array of selected media items.
+         * @param {object} editor rendering options.
+         * @param {number} editor.startNodeId Set the startnode of the picker (optional).
+         * @param {boolean} editor.multiPicker Pick one or multiple items.
+         * @param {boolean} editor.onlyImages Only display files that have an image file-extension.
+         * @param {boolean} editor.disableFolderSelect Disable folder selection.
+         * @param {boolean} editor.disableFocalPoint Disable focal point editor for selected media.
+         * @param {array} editor.updatedMediaNodes A list of ids for media items that have been updated through the media picker.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function mediaPicker(editor) {
             editor.view = "views/common/infiniteeditors/mediapicker/mediapicker.html";
@@ -593,19 +592,36 @@ When building a custom infinite editor view you can use the same components as a
             open(editor);
         }
 
+        /**
+         * @ngdoc method
+         * @name umbraco.services.editorService#mediaCropDetails
+         * @methodOf umbraco.services.editorService
+         *
+         * @description
+         * Opens the media crop details editor in infinite editing, the submit callback returns the updated media object.
+         * @param {object} editor rendering options.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object
+         */
+        function mediaCropDetails(editor) {
+            editor.view = "views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html";
+            open(editor);
+        }
+
         /**
          * @ngdoc method
          * @name umbraco.services.editorService#iconPicker
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens an icon picker in infinite editing, the submit callback returns the selected icon
-         * @param {Object} editor rendering options
-         * @param {String} editor.icon The CSS class representing the icon - eg. "icon-autofill".
-         * @param {String} editor.color The CSS class representing the color - eg. "color-red".
-         * @param {Callback} editor.submit Submits the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * Opens an icon picker in infinite editing, the submit callback returns the selected icon.
+         * @param {object} editor rendering options.
+         * @param {string} editor.icon The CSS class representing the icon - eg. "icon-autofill".
+         * @param {string} editor.color The CSS class representing the color - eg. "color-red".
+         * @param {callback} editor.submit Submits the editor.
+         * @param {callback} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function iconPicker(editor) {
             editor.view = "views/common/infiniteeditors/iconpicker/iconpicker.html";
@@ -620,15 +636,15 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens the document type editor in infinite editing, the submit callback returns the alias of the saved document type.
-         * @param {Object} editor rendering options
-         * @param {Number} editor.id Indicates the ID of the document type to be edited. Alternatively the ID may be set to `-1` in combination with `create` being set to `true` to open the document type editor for creating a new document type.
-         * @param {Boolean} editor.create Set to `true` to open the document type editor for creating a new document type.
-         * @param {Boolean} editor.noTemplate If `true` and in combination with `create` being set to `true`, the document type editor will not create a corresponding template by default. This is similar to selecting the "Document Type without a template" in the Create dialog.
-         * @param {Boolean} editor.isElement If `true` and in combination with `create` being set to `true`, the "Is an Element type" option will be selected by default in the document type editor.
-         * @param {Boolean} editor.allowVaryByCulture If `true` and in combination with `create`, the "Allow varying by culture" option will be selected by default in the document type editor.
-         * @param {Callback} editor.submit Submits the editor.
-         * @param {Callback} editor.close Closes the editor.
-         * @returns {Object} editor object
+         * @param {object} editor rendering options.
+         * @param {number} editor.id Indicates the ID of the document type to be edited. Alternatively the ID may be set to `-1` in combination with `create` being set to `true` to open the document type editor for creating a new document type.
+         * @param {boolean} editor.create Set to `true` to open the document type editor for creating a new document type.
+         * @param {boolean} editor.noTemplate If `true` and in combination with `create` being set to `true`, the document type editor will not create a corresponding template by default. This is similar to selecting the "Document Type without a template" in the Create dialog.
+         * @param {boolean} editor.isElement If `true` and in combination with `create` being set to `true`, the "Is an Element type" option will be selected by default in the document type editor.
+         * @param {boolean} editor.allowVaryByCulture If `true` and in combination with `create`, the "Allow varying by culture" option will be selected by default in the document type editor.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function documentTypeEditor(editor) {
             editor.view = "views/documenttypes/edit.html";
@@ -641,11 +657,11 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens the media type editor in infinite editing, the submit callback returns the saved media type
-         * @param {Object} editor rendering options
-         * @param {Callback} editor.submit Submits the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * Opens the media type editor in infinite editing, the submit callback returns the saved media type.
+         * @param {object} editor rendering options.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object
          */
         function mediaTypeEditor(editor) {
             editor.view = "views/mediatypes/edit.html";
@@ -658,28 +674,11 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens the member type editor in infinite editing, the submit callback returns the saved member type
-         * @param {Object} editor rendering options
-         * @param {Callback} editor.submit Submits the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
-         */
-        function memberTypeEditor(editor) {
-            editor.view = "views/membertypes/edit.html";
-            open(editor);
-        }
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.editorService#memberTypeEditor
-         * @methodOf umbraco.services.editorService
-         *
-         * @description
-         * Opens the member type editor in infinite editing, the submit callback returns the saved member type
-         * @param {Object} editor rendering options
-         * @param {Callback} editor.submit Submits the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * Opens the member type editor in infinite editing, the submit callback returns the saved member type.
+         * @param {object} editor rendering options.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function memberTypeEditor(editor) {
             editor.view = "views/membertypes/edit.html";
@@ -692,11 +691,11 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens the query builder in infinite editing, the submit callback returns the generted query
-         * @param {Object} editor rendering options
-         * @param {Callback} editor.submit Submits the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * Opens the query builder in infinite editing, the submit callback returns the generated query.
+         * @param {object} editor rendering options.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function queryBuilder(editor) {
             editor.view = "views/common/infiniteeditors/querybuilder/querybuilder.html";
@@ -709,14 +708,14 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens the query builder in infinite editing, the submit callback returns the generted query
-         * @param {Object} editor rendering options
-         * @param {String} options.section tree section to display
-         * @param {String} options.treeAlias specific tree to display
-         * @param {Boolean} options.multiPicker should the tree pick one or multiple items before returning
-         * @param {Callback} editor.submit Submits the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * Opens the query builder in infinite editing, the submit callback returns the generted query.
+         * @param {object} editor rendering options.
+         * @param {string} options.section tree section to display.
+         * @param {string} options.treeAlias specific tree to display.
+         * @param {boolean} options.multiPicker should the tree pick one or multiple items before returning.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function treePicker(editor) {
             editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
@@ -731,10 +730,10 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Opens the an editor to set node permissions.
-         * @param {Object} editor rendering options
-         * @param {Callback} editor.submit Submits the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * @param {object} editor rendering options.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function nodePermissions(editor) {
             editor.view = "views/common/infiniteeditors/nodepermissions/nodepermissions.html";
@@ -748,11 +747,11 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Open an editor to insert code snippets into the code editor
-         * @param {Object} editor rendering options
-         * @param {Callback} editor.submit Submits the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * Open an editor to insert code snippets into the code editor.
+         * @param {object} editor rendering options.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function insertCodeSnippet(editor) {
             editor.view = "views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html";
@@ -766,11 +765,11 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens the user group picker in infinite editing, the submit callback returns an array of the selected user groups
-         * @param {Object} editor rendering options
-         * @param {Callback} editor.submit Submits the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * Opens the user group picker in infinite editing, the submit callback returns an array of the selected user groups.
+         * @param {object} editor rendering options.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function userGroupPicker(editor) {
             editor.view = "views/common/infiniteeditors/usergrouppicker/usergrouppicker.html";
@@ -778,18 +777,35 @@ When building a custom infinite editor view you can use the same components as a
             open(editor);
         }
 
+        /**
+         * @ngdoc method
+         * @name umbraco.services.editorService#userGroupEditor
+         * @methodOf umbraco.services.editorService
+         *
+         * @description
+         * Opens the user group picker in infinite editing, the submit callback returns the saved user group
+         * @param {object} editor rendering options.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
+         */
+        function userGroupEditor(editor) {
+            editor.view = "views/users/group.html";
+            open(editor);
+        }
+
         /**
          * @ngdoc method
          * @name umbraco.services.editorService#templateEditor
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens the template editor in infinite editing, the submit callback returns the saved template
-         * @param {Object} editor rendering options
-         * @param {String} editor.id The template id
-         * @param {Callback} editor.submit Submits the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * Opens the template editor in infinite editing, the submit callback returns the saved template.
+         * @param {object} editor rendering options.
+         * @param {string} editor.id The template id.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function templateEditor(editor) {
             editor.view = "views/templates/edit.html";
@@ -802,11 +818,11 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens the section picker in infinite editing, the submit callback returns an array of the selected sections¨
-         * @param {Object} editor rendering options
-         * @param {Callback} editor.submit Submits the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * Opens the section picker in infinite editing, the submit callback returns an array of the selected sections.
+         * @param {object} editor rendering options.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function sectionPicker(editor) {
             editor.view = "views/common/infiniteeditors/sectionpicker/sectionpicker.html";
@@ -820,11 +836,11 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens the insert field editor in infinite editing, the submit callback returns the code snippet
-         * @param {Object} editor rendering options
-         * @param {Callback} editor.submit Submits the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * Opens the insert field editor in infinite editing, the submit callback returns the code snippet.
+         * @param {object} editor rendering options.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function insertField(editor) {
             editor.view = "views/common/infiniteeditors/insertfield/insertfield.html";
@@ -838,11 +854,11 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens the template sections editor in infinite editing, the submit callback returns the type to insert
-         * @param {Object} editor rendering options
-         * @param {Callback} editor.submit Submits the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * Opens the template sections editor in infinite editing, the submit callback returns the type to insert.
+         * @param {object} editor rendering options.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function templateSections(editor) {
             editor.view = "views/common/infiniteeditors/templatesections/templatesections.html";
@@ -856,11 +872,11 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens the section picker in infinite editing, the submit callback returns an array of the selected users
-         * @param {Object} editor rendering options
-         * @param {Callback} editor.submit Submits the editor
-         * @param {Callback} editor.close Closes the editor
-         * @returns {Object} editor object
+         * Opens the section picker in infinite editing, the submit callback returns an array of the selected users.
+         * @param {object} editor rendering options.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function userPicker(editor) {
             editor.view = "views/common/infiniteeditors/userpicker/userpicker.html";
@@ -874,15 +890,15 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens the section picker in infinite editing, the submit callback returns an array of the selected items
+         * Opens the section picker in infinite editing, the submit callback returns an array of the selected items.
          *
-         * @param {Object} editor rendering options
-         * @param {Array} editor.availableItems Array of available items.
-         * @param {Array} editor.selectedItems Array of selected items. When passed in the selected items will be filtered from the available items.
-         * @param {Boolean} editor.filter Set to false to hide the filter.
-         * @param {Callback} editor.submit Submits the editor.
-         * @param {Callback} editor.close Closes the editor.
-         * @returns {Object} editor object
+         * @param {object} editor rendering options.
+         * @param {array} editor.availableItems Array of available items.
+         * @param {array} editor.selectedItems Array of selected items. When passed in the selected items will be filtered from the available items.
+         * @param {boolean} editor.filter Set to false to hide the filter.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function itemPicker(editor) {
             editor.view = "views/common/infiniteeditors/itempicker/itempicker.html";
@@ -896,11 +912,11 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens a macro picker in infinite editing, the submit callback returns an array of the selected items
+         * Opens a macro picker in infinite editing, the submit callback returns an array of the selected items.
          *
-         * @param {Callback} editor.submit Submits the editor.
-         * @param {Callback} editor.close Closes the editor.
-         * @returns {Object} editor object
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function macroPicker(editor) {
             editor.view = "views/common/infiniteeditors/macropicker/macropicker.html";
@@ -916,11 +932,11 @@ When building a custom infinite editor view you can use the same components as a
          * @description
          * Opens a member group picker in infinite editing.
          *
-         * @param {Object} editor rendering options
-         * @param {Object} editor.multiPicker Pick one or multiple items.
-         * @param {Callback} editor.submit Submits the editor.
-         * @param {Callback} editor.close Closes the editor.
-         * @returns {Object} editor object
+         * @param {object} editor rendering options.
+         * @param {object} editor.multiPicker Pick one or multiple items.
+         * @param {function} editor.submit Submits the editor.
+         * @param {function} editor.close Closes the editor.
+         * @returns {object} editor object.
          */
         function memberGroupPicker(editor) {
             editor.view = "views/common/infiniteeditors/membergrouppicker/membergrouppicker.html";
@@ -934,14 +950,14 @@ When building a custom infinite editor view you can use the same components as a
         * @methodOf umbraco.services.editorService
         *
         * @description
-        * Opens a member picker in infinite editing, the submit callback returns an array of selected items
+        * Opens a member picker in infinite editing, the submit callback returns an array of selected items.
         * 
-        * @param {Object} editor rendering options
-        * @param {Boolean} editor.multiPicker Pick one or multiple items
-        * @param {Function} editor.submit Callback function when the submit button is clicked. Returns the editor model object
-        * @param {Function} editor.close Callback function when the close button is clicked.
+        * @param {object} editor rendering options.
+        * @param {boolean} editor.multiPicker Pick one or multiple items.
+        * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+        * @param {function} editor.close Callback function when the close button is clicked.
         * 
-        * @returns {Object} editor object
+        * @returns {object} editor object.
         */
         function memberPicker(editor) {
             editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
@@ -957,15 +973,15 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens a member editor in infinite editing, the submit callback returns the updated member
-         * @param {Object} editor rendering options
-         * @param {String} editor.id The id (GUID) of the member
-         * @param {Boolean} editor.create Create new member
-         * @param {Function} editor.submit Callback function when the submit button is clicked. Returns the editor model object
-         * @param {Function} editor.close Callback function when the close button is clicked.
-         * @param {String} editor.doctype If editor.create is true, provide member type for the creation of the member
+         * Opens a member editor in infinite editing, the submit callback returns the updated member.
+         * @param {object} editor rendering options.
+         * @param {string} editor.id The id (GUID) of the member.
+         * @param {boolean} editor.create Create new member.
+         * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
+         * @param {function} editor.close Callback function when the close button is clicked.
+         * @param {string} editor.doctype If editor.create is true, provide member type for the creation of the member.
          * 
-         * @returns {Object} editor object
+         * @returns {object} editor object.
          */
         function memberEditor(editor) {
             editor.view = "views/member/edit.html";
@@ -981,7 +997,7 @@ When building a custom infinite editor view you can use the same components as a
          *
          * @description
          * Internal method to keep track of keyboard shortcuts registered
-         * to each editor so they can be rebound when an editor closes
+         * to each editor so they can be rebound when an editor closes.
          *
          */
         function unbindKeyboardShortcuts() {
@@ -1001,7 +1017,7 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Internal method to rebind keyboard shortcuts for the editor in focus
+         * Internal method to rebind keyboard shortcuts for the editor in focus.
          *
          */
         function rebindKeyboardShortcuts() {
@@ -1045,6 +1061,7 @@ When building a custom infinite editor view you can use the same components as a
             nodePermissions: nodePermissions,
             insertCodeSnippet: insertCodeSnippet,
             userGroupPicker: userGroupPicker,
+            userGroupEditor: userGroupEditor,
             templateEditor: templateEditor,
             sectionPicker: sectionPicker,
             insertField: insertField,
@@ -1054,7 +1071,8 @@ When building a custom infinite editor view you can use the same components as a
             macroPicker: macroPicker,
             memberGroupPicker: memberGroupPicker,
             memberPicker: memberPicker,
-            memberEditor: memberEditor
+            memberEditor: memberEditor,
+            mediaCropDetails
         };
 
         return service;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/events.service.js b/src/Umbraco.Web.UI.Client/src/common/services/events.service.js
index 965ac3d635..c7ef5bd28f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/events.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/events.service.js
@@ -34,7 +34,7 @@ function eventsService($q, $rootScope) {
 		
         /** pass in the result of 'on' to this method, or just call the method returned from 'on' to unsubscribe */
 		unsubscribe: function(handle) {
-		    if (angular.isFunction(handle)) {
+		    if (Utilities.isFunction(handle)) {
 		        handle();
 		    }		    
 		}
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/externallogininfo.service.js b/src/Umbraco.Web.UI.Client/src/common/services/externallogininfo.service.js
new file mode 100644
index 0000000000..31914f4e58
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/services/externallogininfo.service.js
@@ -0,0 +1,67 @@
+/**
+ * @ngdoc service
+ * @name umbraco.services.externalLoginInfoService
+ * @description A service for working with external login providers
+ **/
+function externalLoginInfoService(externalLoginInfo, umbRequestHelper) {
+
+    function getLoginProvider(provider) {
+        if (provider) {
+            var found = _.find(externalLoginInfo.providers, x => x.authType == provider);
+            return found;
+        }
+        return null;
+    }
+
+    function getLoginProviderView(provider) {
+        if (provider && provider.properties && provider.properties.UmbracoBackOfficeExternalLoginOptions && provider.properties.UmbracoBackOfficeExternalLoginOptions.CustomBackOfficeView) {
+            return umbRequestHelper.convertVirtualToAbsolutePath(provider.properties.UmbracoBackOfficeExternalLoginOptions.CustomBackOfficeView);
+        }
+        return null;
+    }
+
+    /**
+     * Returns true if any provider denies local login if `provider` is null, else whether the passed 
+     * @param {any} provider
+     */
+    function hasDenyLocalLogin(provider) {
+        if (!provider) {
+            return _.some(externalLoginInfo.providers, x => x.properties && x.properties.UmbracoBackOfficeExternalLoginOptions && (x.properties.UmbracoBackOfficeExternalLoginOptions.DenyLocalLogin === true));
+        }
+        else {
+            return provider && provider.properties && provider.properties.UmbracoBackOfficeExternalLoginOptions && (provider.properties.UmbracoBackOfficeExternalLoginOptions.DenyLocalLogin === true);
+        }
+    }
+
+    /**
+     * Returns all login providers    
+     */
+    function getLoginProviders() {
+        return externalLoginInfo.providers;
+    }
+
+    /** Returns all logins providers that have options that the user can interact with */
+    function getLoginProvidersWithOptions() {
+        // only include providers that allow manual linking or ones that provide a custom view
+        var providers = _.filter(externalLoginInfo.providers, x => {
+            // transform the data and also include the custom view as a nicer property
+            x.customView = getLoginProviderView(x);
+            if (x.customView) {                
+                return true;
+            }
+            else {
+                return x.properties.ExternalSignInAutoLinkOptions.AllowManualLinking;
+            }
+        });        
+        return providers;
+    }
+
+    return {
+        hasDenyLocalLogin: hasDenyLocalLogin,
+        getLoginProvider: getLoginProvider,
+        getLoginProviders: getLoginProviders,
+        getLoginProvidersWithOptions: getLoginProvidersWithOptions,
+        getLoginProviderView: getLoginProviderView
+    };
+}
+angular.module('umbraco.services').factory('externalLoginInfoService', externalLoginInfoService);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/focuslock.service.js b/src/Umbraco.Web.UI.Client/src/common/services/focuslock.service.js
new file mode 100644
index 0000000000..54acaf6426
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/services/focuslock.service.js
@@ -0,0 +1,30 @@
+(function () {
+    "use strict";
+
+    function focusLockService($document) {
+        var elementToInert = $document[0].querySelector('#mainwrapper');
+
+        function addInertAttribute() {
+            if (elementToInert) {
+                elementToInert.setAttribute('inert', true);
+            }
+        }
+
+        function removeInertAttribute() {
+            if (elementToInert) {
+                elementToInert.removeAttribute('inert');
+            }
+        }
+
+        var service = {
+            addInertAttribute: addInertAttribute,
+            removeInertAttribute: removeInertAttribute
+        }
+
+        return service;
+
+    }
+
+    angular.module("umbraco.services").factory("focusLockService", focusLockService);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
index 90fbd76ec9..773aa85f6f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
@@ -17,16 +17,102 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
          * @function
          *
          * @description
-         * Called by controllers when submitting a form - this ensures that all client validation is checked, 
+         * Called by controllers when submitting a form - this ensures that all client validation is checked,
          * server validation is cleared, that the correct events execute and status messages are displayed.
          * This returns true if the form is valid, otherwise false if form submission cannot continue.
-         * 
+         *
          * @param {object} args An object containing arguments for form submission
          */
         submitForm: function (args) {
 
             var currentForm;
 
+            if (!args) {
+                throw "args cannot be null";
+            }
+            if (!args.scope) {
+                throw "args.scope cannot be null";
+            }
+
+            if (!args.formCtrl) {
+                //try to get the closest form controller
+                currentForm = angularHelper.getRequiredCurrentForm(args.scope);
+            }
+            else {
+                currentForm = args.formCtrl;
+            }
+
+            //the first thing any form must do is broadcast the formSubmitting event
+            args.scope.$broadcast("formSubmitting", { scope: args.scope, action: args.action });
+
+            this.focusOnFirstError(currentForm);
+
+            // Some property editors need to perform an action after all property editors have reacted to the formSubmitting.
+            args.scope.$broadcast("formSubmittingFinalPhase", { scope: args.scope, action: args.action });
+
+            // Set the form state to submitted
+            currentForm.$setSubmitted();
+
+            //then check if the form is valid
+            if (!args.skipValidation) {
+                if (currentForm.$invalid) {
+
+                    return false;
+                }
+            }
+
+            //reset the server validations if required (default is true), otherwise notify existing ones of changes
+            if (!args.keepServerValidation) {
+                serverValidationManager.reset();
+            }
+            else {
+                serverValidationManager.notify();
+            }
+
+            return true;
+        },
+
+         /**
+         * @ngdoc function
+         * @name umbraco.services.formHelper#focusOnFirstError
+         * @methodOf umbraco.services.formHelper
+         * @function
+         *
+         * @description
+         * Called by submitForm when a form has been submitted, it will fire a focus on the first found invalid umb-property it finds in the form..
+         *
+         * @param {object} form Pass in a form object.
+         */
+        focusOnFirstError: function(form) {
+            var invalidNgForms = form.$$element.find(`.umb-property ng-form.ng-invalid, .umb-property-editor ng-form.ng-invalid-required`);
+            var firstInvalidNgForm = invalidNgForms.first();
+
+            if(firstInvalidNgForm.length !== 0) {
+                var focusableFields = [...firstInvalidNgForm.find("umb-range-slider .noUi-handle,input,textarea,select,button")];
+                if(focusableFields.length !== 0) {
+                    var firstErrorEl = focusableFields.find(el => el.type !== "hidden" && el.hasAttribute("readonly") === false);
+                    if(firstErrorEl !== undefined) {
+                        firstErrorEl.focus();
+                    }
+                }
+            }
+        },
+
+        /**
+         * @ngdoc function
+         * @name umbraco.services.formHelper#submitForm
+         * @methodOf umbraco.services.formHelper
+         * @function
+         *
+         * @description
+         * Called by controllers when a form has been successfully submitted, this ensures the correct events are raised.
+         *
+         * @param {object} args An object containing arguments for form submission
+         */
+        resetForm: function (args) {
+
+            var currentForm;
+
             if (!args) {
                 throw "args cannot be null";
             }
@@ -41,42 +127,11 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
                 currentForm = args.formCtrl;
             }
 
-            //the first thing any form must do is broadcast the formSubmitting event
-            args.scope.$broadcast("formSubmitting", { scope: args.scope, action: args.action });
+            // Set the form state to pristine
+            currentForm.$setPristine();
+            currentForm.$setUntouched();
 
-            //then check if the form is valid
-            if (!args.skipValidation) {
-                if (currentForm.$invalid) {
-                    return false;
-                }
-            }
-
-            //reset the server validations
-            serverValidationManager.reset();
-
-            return true;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.formHelper#submitForm
-         * @methodOf umbraco.services.formHelper
-         * @function
-         *
-         * @description
-         * Called by controllers when a form has been successfully submitted, this ensures the correct events are raised.
-         * 
-         * @param {object} args An object containing arguments for form submission
-         */
-        resetForm: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.scope) {
-                throw "args.scope cannot be null";
-            }
-
-            args.scope.$broadcast("formSubmitted", { scope: args.scope });
+            args.scope.$broadcast(args.hasErrors ? "formSubmittedValidationFailed" : "formSubmitted", { scope: args.scope });
         },
 
         showNotifications: function (args) {
@@ -101,7 +156,7 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
          * @description
          * Needs to be called when a form submission fails, this will wire up all server validation errors in ModelState and
          * add the correct messages to the notifications. If a server error has occurred this will show a ysod.
-         * 
+         *
          * @param {object} err The error object returned from the http promise
          */
         handleError: function (err) {
@@ -140,77 +195,11 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
          *
          * @description
          * This wires up all of the server validation model state so that valServer and valServerField directives work
-         * 
+         *
          * @param {object} err The error object returned from the http promise
          */
         handleServerValidation: function (modelState) {
-            for (var e in modelState) {
-
-                //This is where things get interesting....
-                // We need to support validation for all editor types such as both the content and content type editors.
-                // The Content editor ModelState is quite specific with the way that Properties are validated especially considering
-                // that each property is a User Developer property editor.
-                // The way that Content Type Editor ModelState is created is simply based on the ASP.Net validation data-annotations 
-                // system. 
-                // So, to do this there's some special ModelState syntax we need to know about.
-                // For Content Properties, which are user defined, we know that they will exist with a prefixed
-                // ModelState of "_Properties.", so if we detect this, then we know it's for a content Property.
-
-                //the alias in model state can be in dot notation which indicates
-                // * the first part is the content property alias
-                // * the second part is the field to which the valiation msg is associated with
-                //There will always be at least 4 parts for content properties since all model errors for properties are prefixed with "_Properties"
-                //If it is not prefixed with "_Properties" that means the error is for a field of the object directly.
-
-                // Example: "_Properties.headerImage.en-US.mySegment.myField"
-                // * it's for a property since it has a _Properties prefix
-                // * it's for the headerImage property type
-                // * it's for the en-US culture
-                // * it's for the mySegment segment
-                // * it's for the myField html field (optional)
-
-                var parts = e.split(".");
-
-                //Check if this is for content properties - specific to content/media/member editors because those are special 
-                // user defined properties with custom controls.
-                if (parts.length > 1 && parts[0] === "_Properties") {
-
-                    var propertyAlias = parts[1];
-
-                    var culture = null;
-                    if (parts.length > 2) {
-                        culture = parts[2];
-                        //special check in case the string is formatted this way
-                        if (culture === "null") {
-                            culture = null;
-                        }
-                    }
-
-                    var segment = null;
-                    if (parts.length > 3) {
-                        segment = parts[3];
-                        //special check in case the string is formatted this way
-                        if (segment === "null") {
-                            segment = null;
-                        }
-                    }
-
-                    var htmlFieldReference = "";
-                    if (parts.length > 4) {
-                        htmlFieldReference = parts[4] || "";
-                    }
-
-                    // add a generic error for the property
-                    serverValidationManager.addPropertyError(propertyAlias, culture, htmlFieldReference, modelState[e][0], segment);
-
-                } else {
-
-                    //Everthing else is just a 'Field'... the field name could contain any level of 'parts' though, for example:
-                    // Groups[0].Properties[2].Alias
-                    serverValidationManager.addFieldError(e, modelState[e][0]);
-                }
-
-            }
+            serverValidationManager.addErrorsForModelState(modelState);
         }
     };
 }
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
index 0fa2d0df1a..f26763bd14 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
@@ -3,7 +3,7 @@
 * @name umbraco.services.iconHelper
 * @description A helper service for dealing with icons, mostly dealing with legacy tree icons
 **/
-function iconHelper($q, $timeout) {
+function iconHelper($http, $q, $sce, $timeout, umbRequestHelper) {
 
     var converter = [
         { oldIcon: ".sprNew", newIcon: "add" },
@@ -31,7 +31,7 @@ function iconHelper($q, $timeout) {
         { oldIcon: ".sprToPublish", newIcon: "mail-forward" },
         { oldIcon: ".sprTranslate", newIcon: "comments" },
         { oldIcon: ".sprUpdate", newIcon: "save" },
-        
+
         { oldIcon: ".sprTreeSettingDomain", newIcon: "icon-home" },
         { oldIcon: ".sprTreeDoc", newIcon: "icon-document" },
         { oldIcon: ".sprTreeDoc2", newIcon: "icon-diploma-alt" },
@@ -39,21 +39,21 @@ function iconHelper($q, $timeout) {
         { oldIcon: ".sprTreeDoc4", newIcon: "icon-newspaper-alt" },
         { oldIcon: ".sprTreeDoc5", newIcon: "icon-notepad-alt" },
 
-        { oldIcon: ".sprTreeDocPic", newIcon: "icon-picture" },        
+        { oldIcon: ".sprTreeDocPic", newIcon: "icon-picture" },
         { oldIcon: ".sprTreeFolder", newIcon: "icon-folder" },
         { oldIcon: ".sprTreeFolder_o", newIcon: "icon-folder" },
         { oldIcon: ".sprTreeMediaFile", newIcon: "icon-music" },
         { oldIcon: ".sprTreeMediaMovie", newIcon: "icon-movie" },
         { oldIcon: ".sprTreeMediaPhoto", newIcon: "icon-picture" },
-        
+
         { oldIcon: ".sprTreeMember", newIcon: "icon-user" },
         { oldIcon: ".sprTreeMemberGroup", newIcon: "icon-users" },
         { oldIcon: ".sprTreeMemberType", newIcon: "icon-users" },
-        
+
         { oldIcon: ".sprTreeNewsletter", newIcon: "icon-file-text-alt" },
         { oldIcon: ".sprTreePackage", newIcon: "icon-box" },
         { oldIcon: ".sprTreeRepository", newIcon: "icon-server-alt" },
-        
+
         { oldIcon: ".sprTreeSettingDataType", newIcon: "icon-autofill" },
 
         // TODO: Something needs to be done with the old tree icons that are commented out.
@@ -61,7 +61,7 @@ function iconHelper($q, $timeout) {
         { oldIcon: ".sprTreeSettingAgent", newIcon: "" },
         { oldIcon: ".sprTreeSettingCss", newIcon: "" },
         { oldIcon: ".sprTreeSettingCssItem", newIcon: "" },
-        
+
         { oldIcon: ".sprTreeSettingDataTypeChild", newIcon: "" },
         { oldIcon: ".sprTreeSettingDomain", newIcon: "" },
         { oldIcon: ".sprTreeSettingLanguage", newIcon: "" },
@@ -85,14 +85,18 @@ function iconHelper($q, $timeout) {
         { oldIcon: ".sprTreeDeveloperPython", newIcon: "icon-linux" }
     ];
 
+    var collectedIcons;
+
     var imageConverter = [
             {oldImage: "contour.png", newIcon: "icon-umb-contour"}
             ];
 
-    var collectedIcons;
-            
+    var iconCache = [];
+    var liveRequests = [];
+    var allIconsRequested = false;
+
     return {
-        
+
         /** Used by the create dialogs for content/media types to format the data so that the thumbnails are styled properly */
         formatContentTypeThumbnails: function (contentTypes) {
             for (var i = 0; i < contentTypes.length; i++) {
@@ -154,54 +158,6 @@ function iconHelper($q, $timeout) {
             return false;
         },
 
-        /** Return a list of icons, optionally filter them */
-        /** It fetches them directly from the active stylesheets in the browser */
-        getIcons: function(){
-            var deferred = $q.defer();
-            $timeout(function(){
-                if(collectedIcons){
-                    deferred.resolve(collectedIcons);
-                }else{
-                    collectedIcons = [];
-                    var c = ".icon-";
-
-                    for (var i = document.styleSheets.length - 1; i >= 0; i--) {
-                        var classes = null;
-                        try {
-                            classes = document.styleSheets[i].rules || document.styleSheets[i].cssRules;
-                        } catch (e) {
-                            console.warn("Can't read the css rules of: " + document.styleSheets[i].href, e);
-                            continue;
-                        }
-                        
-                        if (classes !== null) {
-                            for(var x=0;x<classes.length;x++) {
-                                var cur = classes[x];
-                                if(cur.selectorText && cur.selectorText.indexOf(c) === 0) {
-                                    var s = cur.selectorText.substring(1);
-                                    var hasSpace = s.indexOf(" ");
-                                    if(hasSpace>0){
-                                        s = s.substring(0, hasSpace);
-                                    }
-                                    var hasPseudo = s.indexOf(":");
-                                    if(hasPseudo>0){
-                                        s = s.substring(0, hasPseudo);
-                                    }
-
-                                    if(collectedIcons.indexOf(s) < 0){
-                                        collectedIcons.push(s);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    deferred.resolve(collectedIcons);
-                }
-            }, 100);
-            
-            return deferred.promise;
-        },
-
         /** Converts the icon from legacy to a new one if an old one is detected */
         convertFromLegacyIcon: function (icon) {
             if (this.isLegacyIcon(icon)) {
@@ -227,6 +183,137 @@ function iconHelper($q, $timeout) {
                 return this.convertFromLegacyIcon(treeNode.icon);
             }
             return treeNode.icon;
+        },
+
+        /** Gets a single IconModel */
+        getIcon: function(iconName) {
+            return $q((resolve, reject) => {
+                var icon = this._getIconFromCache(iconName);
+
+                 if(icon !== undefined) {
+                    resolve(icon);
+                } else {
+                    var iconRequestPath = Umbraco.Sys.ServerVariables.umbracoUrls.iconApiBaseUrl +  'GetIcon?iconName=' + iconName;
+
+                     // If the current icon is being requested, wait a bit so that we don't have to make another http request and can instead get the icon from the cache.
+                    // This is a bit rough and ready and could probably be improved used an event based system
+                    if(liveRequests.indexOf(iconRequestPath) >= 0) {
+                        setTimeout(() => {
+                            resolve(this.getIcon(iconName));
+                        }, 10);
+                    } else {
+                        liveRequests.push(iconRequestPath);
+                        // TODO - fix bug where Umbraco.Sys.ServerVariables.umbracoUrls.iconApiBaseUrl is undefinied when help icon
+                        umbRequestHelper.resourcePromise(
+                            $http.get(iconRequestPath)
+                            ,'Failed to retrieve icon: ' + iconName)
+                        .then(icon => {
+                            if(icon) {
+                                var trustedIcon = this.defineIcon(icon.Name, icon.SvgString);
+
+                                liveRequests = _.filter(liveRequests, iconRequestPath);
+
+                                resolve(trustedIcon);
+                            }
+                        })
+                        .catch(err => {
+                            console.warn(err);
+                        });
+                    };
+
+                 }
+            });
+        },
+
+        /** Gets all the available icons in the backoffice icon folder and returns them as an array of IconModels */
+         getAllIcons: function() {
+            return $q((resolve, reject) => {
+                if(allIconsRequested === false) {
+                    allIconsRequested = true;
+
+                     umbRequestHelper.resourcePromise(
+                        $http.get(Umbraco.Sys.ServerVariables.umbracoUrls.iconApiBaseUrl + 'GetAllIcons')
+                        ,'Failed to retrieve icons')
+                    .then(icons => {
+                        icons.forEach(icon => {
+                            this.defineIcon(icon.Name, icon.SvgString);
+                        });
+
+                        resolve(iconCache);
+                    })
+                    .catch(err => {
+                        console.warn(err);
+                    });;
+                } else {
+                    resolve(iconCache);
+                }
+            });
+        },
+
+        /** LEGACY - Return a list of icons from icon fonts, optionally filter them */
+        /** It fetches them directly from the active stylesheets in the browser */
+        getIcons: function(){
+            var deferred = $q.defer();
+            $timeout(function(){
+                if(collectedIcons){
+                    deferred.resolve(collectedIcons);
+                }else{
+                    collectedIcons = [];
+                    var c = ".icon-";
+
+                    for (var i = document.styleSheets.length - 1; i >= 0; i--) {
+                        var classes = null;
+                        try {
+                            classes = document.styleSheets[i].rules || document.styleSheets[i].cssRules;
+                        } catch (e) {
+                            console.warn("Can't read the css rules of: " + document.styleSheets[i].href, e);
+                            continue;
+                        }
+
+                        if (classes !== null) {
+                            for(var x=0;x<classes.length;x++) {
+                                var cur = classes[x];
+                                if(cur.selectorText && cur.selectorText.indexOf(c) === 0) {
+                                    var s = cur.selectorText.substring(1);
+                                    var hasSpace = s.indexOf(" ");
+                                    if(hasSpace>0){
+                                        s = s.substring(0, hasSpace);
+                                    }
+                                    var hasPseudo = s.indexOf(":");
+                                    if(hasPseudo>0){
+                                        s = s.substring(0, hasPseudo);
+                                    }
+
+                                    if(collectedIcons.indexOf(s) < 0){
+                                        collectedIcons.push(s);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    deferred.resolve(collectedIcons);
+                }
+            }, 100);
+
+            return deferred.promise;
+        },
+
+        /** Creates a icon object, and caches it in a runtime cache */
+        defineIcon: function(name, svg) {
+            var icon = iconCache.find(x => x.name === name);
+            if(icon === undefined) {
+                icon = {
+                    name: name,
+                    svgString: $sce.trustAsHtml(svg)
+                };
+                iconCache.push(icon);
+            }
+            return icon;
+        },
+
+         /** Returns the cached icon or undefined */
+        _getIconFromCache: function(iconName) {
+            return _.find(iconCache, {name: iconName});
         }
     };
 }
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
index 28156e70c3..14643dc9cd 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
@@ -45,8 +45,7 @@
 (function () {
     'use strict';
 
-    function listViewHelper($location, localStorageService, urlHelper) {
-
+    function listViewHelper($location, $rootScope, localStorageService, urlHelper, editorService) {
         var firstSelectedIndex = 0;
         var localStorageKey = "umblistViewLayout";
 
@@ -286,6 +285,7 @@
 
                 selection.push(obj);
                 item.selected = true;
+                $rootScope.$broadcast("listView.itemsChanged", { items: selection });
             }
         }
 
@@ -308,6 +308,7 @@
                 if ((item.id !== 2147483647 && item.id === selectedItem.id) || (item.key && item.key === selectedItem.key)) {
                     selection.splice(i, 1);
                     item.selected = false;
+                    $rootScope.$broadcast("listView.itemsChanged", { items: selection });
                 }
             }
         }
@@ -339,12 +340,13 @@
                 }
             }
 
-         if(Utilities.isArray(folders)) {
+            if (Utilities.isArray(folders)) {
                 for (i = 0; folders.length > i; i++) {
                     var folder = folders[i];
                     folder.selected = false;
                 }
             }
+            $rootScope.$broadcast("listView.itemsChanged", { items: selection });
         }
 
         /**
@@ -395,10 +397,11 @@
             if (clearSelection) {
                 selection.length = 0;
             }
+            $rootScope.$broadcast("listView.itemsChanged", { items: selection });
 
         }
-        
-        
+
+
         /**
         * @ngdoc method
         * @name umbraco.services.listViewHelper#selectAllItemsToggle
@@ -410,29 +413,29 @@
         * @param {Array} items Items to toggle selection on, should be $scope.items
         * @param {Array} selection Listview selection, available as $scope.selection
         */
-        
+
         function selectAllItemsToggle(items, selection) {
-            
+
             if (!Utilities.isArray(items)) {
                 return;
             }
-            
+
             if (isSelectedAll(items, selection)) {
                 // unselect all items
-                angular.forEach(items, function (item) {
+                items.forEach(function (item) {
                     item.selected = false;
                 });
-                
+
                 // reset selection without loosing reference.
                 selection.length = 0;
-                
+
             } else {
-                
+
                 // reset selection without loosing reference.
                 selection.length = 0;
-                
+
                 // select all items
-                angular.forEach(items, function (item) {
+                items.forEach(function (item) {
                     var obj = {
                         id: item.id
                     };
@@ -443,6 +446,7 @@
                     selection.push(obj);
                 });
             }
+            $rootScope.$broadcast("listView.itemsChanged", { items: selection });
 
         }
 
@@ -558,7 +562,7 @@
             };
         }
 
-        
+
         /**
         * @ngdoc method
         * @name umbraco.services.listViewHelper#editItem
@@ -569,22 +573,57 @@
         *
         * @param {Object} item The item to edit
         */
-        function editItem(item) {
+        function editItem(item, scope) {
             if (!item.editPath) {
                 return;
             }
+
+            if (scope.options.useInfiniteEditor)
+            {
+                var editorModel = {
+                    id: item.id,
+                    submit: function(model) {
+                        editorService.close();
+                        scope.getContent(scope.contentId);
+                    },
+                    close: function() {
+                        editorService.close();
+                        scope.getContent(scope.contentId);
+                    }
+                };
+
+                if (item.editPath.indexOf("/content/") == 0)
+                {
+                    editorService.contentEditor(editorModel);
+                    return;
+                }
+
+                if (item.editPath.indexOf("/media/") == 0)
+                {
+                    editorService.mediaEditor(editorModel);
+                    return;
+                }
+
+                if (item.editPath.indexOf("/member/") == 0)
+                {
+                    editorModel.id = item.key;
+                    editorService.memberEditor(editorModel);
+                    return;
+                }
+            }
+            
             var parts = item.editPath.split("?");
             var path = parts[0];
             var params = parts[1]
-                ? urlHelper.getQueryStringParams("?" + parts[1])
-                : {};
-
+            ? urlHelper.getQueryStringParams("?" + parts[1])
+            : {};
+            
             $location.path(path);
             for (var p in params) {
                 $location.search(p, params[p]);
             }
         }
-        
+
         function isMatchingLayout(id, layout) {
             // legacy format uses "nodeId", be sure to look for both
             return layout.id === id || layout.nodeId === id;
@@ -592,21 +631,21 @@
 
         var service = {
 
-          getLayout: getLayout,
-          getFirstAllowedLayout: getFirstAllowedLayout,
-          setLayout: setLayout,
-          saveLayoutInLocalStorage: saveLayoutInLocalStorage,
-          selectHandler: selectHandler,
-          selectItem: selectItem,
-          deselectItem: deselectItem,
-          clearSelection: clearSelection,
-          selectAllItems: selectAllItems,
-          selectAllItemsToggle: selectAllItemsToggle,
-          isSelectedAll: isSelectedAll,
-          setSortingDirection: setSortingDirection,
-          setSorting: setSorting,
-          getButtonPermissions: getButtonPermissions,
-          editItem: editItem
+            getLayout: getLayout,
+            getFirstAllowedLayout: getFirstAllowedLayout,
+            setLayout: setLayout,
+            saveLayoutInLocalStorage: saveLayoutInLocalStorage,
+            selectHandler: selectHandler,
+            selectItem: selectItem,
+            deselectItem: deselectItem,
+            clearSelection: clearSelection,
+            selectAllItems: selectAllItems,
+            selectAllItemsToggle: selectAllItemsToggle,
+            isSelectedAll: isSelectedAll,
+            setSortingDirection: setSortingDirection,
+            setSorting: setSorting,
+            getButtonPermissions: getButtonPermissions,
+            editItem: editItem
 
         };
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js b/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
index 6081cbd9ad..99162eaf53 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
@@ -67,6 +67,9 @@ angular.module('umbraco.services')
 
         // loads the language resource file from the server
         initLocalizedResources: function () {
+
+            // TODO: This promise handling is super ugly, we should just be returnning the promise from $http and returning inner values. 
+
             var deferred = $q.defer();
 
             if (resourceFileLoadStatus === "loaded") {
@@ -179,7 +182,7 @@ angular.module('umbraco.services')
          */
         localize: function (value, tokens, fallbackValue) {
             return service.initLocalizedResources().then(function (dic) {
-                return _lookup(value, tokens, dic, fallbackValue);
+                    return _lookup(value, tokens, dic, fallbackValue);
             });
         },
 
@@ -327,6 +330,7 @@ angular.module('umbraco.services')
         resourceFileLoadStatus = "none";
         resourceLoadingPromise = [];
     });
+    
 
     // return the local instance when called
     return service;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index f903c44ad5..c628e3a5b1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -30,6 +30,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
         var element = $(args.element);
         element.addClass('above-backdrop');
     });
+    
 
     //A list of query strings defined that when changed will not cause a reload of the route
     var nonRoutingQueryStrings = ["mculture", "cculture", "csegment", "lq", "sr"];
@@ -127,6 +128,13 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
         }
     }
 
+    function showBackdrop() {
+        var backDropOptions = {
+            'element': $('#leftcolumn')[0]
+        };
+        backdropService.open(backDropOptions);
+    }
+
     var service = {
 
         /**
@@ -169,7 +177,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
             //if the routing parameter keys are the same, we'll compare their values to see if any have changed and if so then the routing will be allowed.
             if (diff1.length === 0 && diff2.length === 0) {
                 var partsChanged = 0;
-                _.each(currRoutingKeys, function (k) {
+                currRoutingKeys.forEach(k => {
                     if (currUrlParams[k] != nextUrlParams[k]) {
                         partsChanged++;
                     }
@@ -206,7 +214,8 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
             var toRetain = _.union(retainedQueryStrings, toRetain);
             var currentSearch = $location.search();
             $location.search('');
-            _.each(toRetain, function (k) {
+
+            toRetain.forEach(k => {
                 if (currentSearch[k]) {
                     $location.search(k, currentSearch[k]);
                 }
@@ -240,7 +249,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
             var toRetain = Utilities.copy(nextRouteParams);
             var updated = false;
 
-            _.each(retainedQueryStrings, function (r) {
+            retainedQueryStrings.forEach(r => {
                 // if mculture is set to null in nextRouteParams, the value will be undefined and we will not retain any query string that has a value of "null"
                 if (currRouteParams[r] && nextRouteParams[r] !== undefined && !nextRouteParams[r]) {
                     toRetain[r] = currRouteParams[r];
@@ -426,13 +435,9 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
         showMenu: function (args) {
             var self = this;
 
-            var backDropOptions = {
-                'element': $('#leftcolumn')[0]
-            };
-
             return treeService.getMenu({ treeNode: args.node })
                 .then(function (data) {
-                    backdropService.open(backDropOptions);
+                    showBackdrop();
                     //check for a default
                     //NOTE: event will be undefined when a call to hideDialog is made so it won't re-load the default again.
                     // but perhaps there's a better way to deal with with an additional parameter in the args ? it works though.
@@ -543,6 +548,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
                 }
             }
             else {
+                showBackdrop();
                 service.showDialog({
                     node: node,
                     action: action,
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js b/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js
index 196e0e3baa..000ba05f1e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js
@@ -52,6 +52,7 @@ angular.module('umbraco.services')
 		* @param {String} item.message longer text for the notication, trimmed after 200 characters, which can then be exanded
 		* @param {String} item.type Notification type, can be: "success","warning","error" or "info" 
 		* @param {String} item.url url to open when notification is clicked
+		* @param {String} item.target the target used together with `url`. Empty if not specified.
 		* @param {String} item.view path to custom view to load into the notification box
 		* @param {Array} item.actions Collection of button actions to append (label, func, cssClass)
 		* @param {Boolean} item.sticky if set to true, the notification will not auto-close
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js b/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js
index 119f40e114..ea05dad4e7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js
@@ -8,14 +8,14 @@
 (function () {
     "use strict";
 
-    function overlayService(eventsService, backdropService) {
+    function overlayService(eventsService, backdropService, focusLockService) {
 
         var currentOverlay = null;
 
         function open(newOverlay) {
 
             // prevent two open overlays at the same time
-            if(currentOverlay) {
+            if (currentOverlay) {
                 close();
             }
 
@@ -23,32 +23,34 @@
             var overlay = newOverlay;
 
             // set the default overlay position to center
-            if(!overlay.position) {
+            if (!overlay.position) {
                 overlay.position = "center";
             }
 
             // set the default overlay size to small
-            if(!overlay.size) {
+            if (!overlay.size) {
                 overlay.size = "small";
             }
 
             // use a default empty view if nothing is set
-            if(!overlay.view) {
+            if (!overlay.view) {
                 overlay.view = "views/common/overlays/default/default.html";
             }
 
             // option to disable backdrop clicks
-            if(overlay.disableBackdropClick) {
+            if (overlay.disableBackdropClick) {
                 backdropOptions.disableEventsOnClick = true;
             }
 
             overlay.show = true;
+            focusLockService.addInertAttribute();
             backdropService.open(backdropOptions);
             currentOverlay = overlay;
             eventsService.emit("appState.overlay", overlay);
         }
 
         function close() {
+            focusLockService.removeInertAttribute();
             backdropService.close();
             currentOverlay = null;
             eventsService.emit("appState.overlay", null);
@@ -76,7 +78,12 @@
                 case "delete":
                     if (!overlay.confirmMessageStyle) overlay.confirmMessageStyle = "danger";
                     if (!overlay.submitButtonStyle) overlay.submitButtonStyle = "danger";
-                    if (!overlay.submitButtonLabelKey) overlay.submitButtonLabelKey = "contentTypeEditor_yesDelete";
+                    if (!overlay.submitButtonLabelKey) overlay.submitButtonLabelKey = "actions_delete";
+                    break;
+
+                case "remove":
+                    if (!overlay.submitButtonStyle) overlay.submitButtonStyle = "primary";
+                    if (!overlay.submitButtonLabelKey) overlay.submitButtonLabelKey = "actions_remove";
                     break;
                 
                 default:
@@ -85,7 +92,6 @@
             }
 
             open(overlay);
-
         }
 
         function confirmDelete(overlay) {
@@ -93,12 +99,18 @@
             confirm(overlay);
         }
 
+        function confirmRemove(overlay) {
+            overlay.confirmType = "remove";
+            confirm(overlay);
+        }
+
         var service = {
             open: open,
             close: close,
             ysod: ysod,
             confirm: confirm,
-            confirmDelete: confirmDelete
+            confirmDelete: confirmDelete,
+            confirmRemove: confirmRemove
         };
 
         return service;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
index fef286ec7e..eda36a5fce 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
@@ -12,7 +12,7 @@
  *
  * <pre>
  *      searchService.searchMembers({term: 'bob'}).then(function(results){
- *          angular.forEach(results, function(result){
+ *          results.forEach(function(result){
  *                  //returns:
  *                  {name: "name", id: 1234, menuUrl: "url", editorPath: "url", metaData: {}, subtitle: "/path/etc" }
  *           })
@@ -21,8 +21,8 @@
  * </pre>
  */
 angular.module('umbraco.services')
-    .factory('searchService', function ($q, $log, entityResource, contentResource, umbRequestHelper, $injector, searchResultFormatter) {
-
+    .factory('searchService', function (entityResource, $injector, searchResultFormatter) {
+        
         return {
 
             /**
@@ -42,12 +42,11 @@ angular.module('umbraco.services')
                     throw "args.term is required";
                 }
 
-                return entityResource.search(args.term, "Member", args.searchFrom).then(function (data) {
-                    _.each(data, function (item) {
-                        searchResultFormatter.configureMemberResult(item);
+                return entityResource.search(args.term, "Member", args.searchFrom)
+                    .then(data => {
+                        data.forEach(item => searchResultFormatter.configureMemberResult(item));
+                        return data;
                     });
-                    return data;
-                });
             },
 
             /**
@@ -67,12 +66,12 @@ angular.module('umbraco.services')
                     throw "args.term is required";
                 }
 
-                return entityResource.search(args.term, "Document", args.searchFrom, args.canceler, args.dataTypeKey).then(function (data) {
-                    _.each(data, function (item) {
-                        searchResultFormatter.configureContentResult(item);
+                return entityResource.search(args.term, "Document", args.searchFrom, args.canceler, args.dataTypeKey)
+                    .then(data => {
+                        data.forEach(item => searchResultFormatter.configureContentResult(item));
+                        return data;
                     });
-                    return data;
-                });
+                
             },
 
             /**
@@ -92,12 +91,11 @@ angular.module('umbraco.services')
                     throw "args.term is required";
                 }
 
-                return entityResource.search(args.term, "Media", args.searchFrom, args.canceler, args.dataTypeKey).then(function (data) {
-                    _.each(data, function (item) {
-                        searchResultFormatter.configureMediaResult(item);
+                return entityResource.search(args.term, "Media", args.searchFrom, args.canceler, args.dataTypeKey)
+                    .then(data => {
+                        data.forEach(item => searchResultFormatter.configureMediaResult(item));
+                        return data;
                     });
-                    return data;
-                });
             },
 
             /**
@@ -117,10 +115,8 @@ angular.module('umbraco.services')
                     throw "args.term is required";
                 }
 
-                return entityResource.searchAll(args.term, args.canceler).then(function (data) {
-
-                    _.each(data, function (resultByType) {
-
+                return entityResource.searchAll(args.term, args.canceler).then(data => {
+                    Object.values(data).forEach(resultByType => {
                         //we need to format the search result data to include things like the subtitle, urls, etc...
                         // this is done with registered angular services as part of the SearchableTreeAttribute, if that
                         // is not found, than we format with the default formatter
@@ -140,7 +136,7 @@ angular.module('umbraco.services')
                             }
                         }
                         //now apply the formatter for each result
-                        _.each(resultByType.results, function (item) {
+                        resultByType.results.forEach(item => {
                             formatterMethod.apply(this, [item, resultByType.treeAlias, resultByType.appAlias]);
                         });
 
@@ -148,12 +144,10 @@ angular.module('umbraco.services')
 
                     return data;
                 });
-
             },
 
             // TODO: This doesn't do anything!
             setCurrent: function (sectionAlias) {
-
                 var currentSection = sectionAlias;
             }
         };
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js b/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js
index 718e44d66e..8df5a9ce8c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js
@@ -7,37 +7,80 @@
  * Used to handle server side validation and wires up the UI with the messages. There are 2 types of validation messages, one
  * is for user defined properties (called Properties) and the other is for field properties which are attached to the native 
  * model objects (not user defined). The methods below are named according to these rules: Properties vs Fields.
+ * 
+ * For a more indepth explanation of how server side validation works with the angular app, see this GitHub PR: 
+ * https://github.com/umbraco/Umbraco-CMS/pull/8339
+ * 
  */
 function serverValidationManager($timeout) {
 
+    // The array of callback objects, each object is:
+    // - propertyAlias (this is the property's 'path' if it's a nested error)
+    // - culture
+    // - fieldName
+    // - segment
+    // - callback (function)
+    // - id (unique identifier, auto-generated, used internally for unsubscribing the callback)
+    // - options (used for complex properties, can contain options.matchType which can be either "suffix" or "prefix" or "contains")
     var callbacks = [];
-    
-    /** calls the callback specified with the errors specified, used internally */
-    function executeCallback(self, errorsForCallback, callback, culture, segment) {
 
-        callback.apply(self, [
-                false,                 // pass in a value indicating it is invalid
+    // The array of error message objects, each object 'key' is:    
+    // - propertyAlias (this is the property's 'path' if it's a nested error)
+    // - culture
+    // - fieldName
+    // - segment
+    // The object also contains:
+    // - errorMsg
+    var errorMsgItems = [];
+
+    var defaultMatchOptions = {
+        matchType: null
+    }
+
+    /** calls the callback specified with the errors specified, used internally */
+    function executeCallback(errorsForCallback, callback, culture, segment, isValid) {
+
+        callback.apply(instance, [
+                isValid,               // pass in a value indicating it is invalid
                 errorsForCallback,     // pass in the errors for this item
-                self.items,            // pass in all errors in total
+                errorMsgItems,         // pass in all errors in total
                 culture,               // pass the culture that we are listing for.
                 segment                // pass the segment that we are listing for.
             ]
         );
     }
 
-    function getFieldErrors(self, fieldName) {
+    /**
+     * @ngdoc function
+     * @name notify
+     * @methodOf umbraco.services.serverValidationManager
+     * @function
+     *
+     * @description
+     * Notifies all subscriptions again. Called when there are changes to subscriptions or errors. 
+     */
+    function notify() {
+
+        $timeout(function () {
+            for (var i = 0; i < errorMsgItems.length; i++) {
+                var item = errorMsgItems[i];
+            }
+            notifyCallbacks();
+        });
+    }
+
+    function getFieldErrors(fieldName) {
         if (!Utilities.isString(fieldName)) {
             throw "fieldName must be a string";
         }
 
         //find errors for this field name
-        return _.filter(self.items, function (item) {
+        return _.filter(errorMsgItems, function (item) {
             return (item.propertyAlias === null && item.culture === "invariant" && item.fieldName === fieldName);
         });
     }
     
-
-    function getPropertyErrors(self, propertyAlias, culture, segment, fieldName) {
+    function getPropertyErrors(propertyAlias, culture, segment, fieldName, options) {
         if (!Utilities.isString(propertyAlias)) {
             throw "propertyAlias must be a string";
         }
@@ -52,13 +95,50 @@ function serverValidationManager($timeout) {
             segment = null;
         }
 
+        if (!options) {
+            options = defaultMatchOptions;
+        }
+
         //find all errors for this property
-        return _.filter(self.items, function (item) {
-            return (item.propertyAlias === propertyAlias && item.culture === culture && item.segment === segment && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
+        return _.filter(errorMsgItems, function (errMsgItem) {
+
+            if (!errMsgItem.propertyAlias) {
+                return false;
+            }
+
+            var matchProp = matchErrMsgItemProperty(errMsgItem, propertyAlias, options);
+
+            return matchProp
+                && errMsgItem.culture === culture
+                && errMsgItem.segment === segment
+                // ignore field matching if match options are used
+                && (options.matchType || (errMsgItem.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
         });
     }
-    
-    function getVariantErrors(self, culture, segment) {
+
+    /**
+     * Returns true if the error message item's data matches the property validation key with a match type provided by the options
+     * @param {any} errMsgItem The error message item
+     * @param {any} propertyValidationKey The property validation key) 
+     * @param {any} options The match type options
+     */
+    function matchErrMsgItemProperty(errMsgItem, propertyValidationKey, options) {
+        if (errMsgItem.propertyAlias === propertyValidationKey) {
+            return true;
+        }
+        if (options.matchType === "prefix" && errMsgItem.propertyAlias.startsWith(propertyValidationKey + '/')) {
+            return true;
+        }
+        if (options.matchType === "suffix" && errMsgItem.propertyAlias.endsWith('/' + propertyValidationKey)) {
+            return true;
+        }
+        if (options.matchType === "contains" && errMsgItem.propertyAlias.includes('/' + propertyValidationKey + '/')) {
+            return true;
+        }
+        return false;
+    }
+
+    function getVariantErrors(culture, segment) {
         
         if (!culture) {
             culture = "invariant";
@@ -68,39 +148,453 @@ function serverValidationManager($timeout) {
         }
         
         //find all errors for this property
-        return _.filter(self.items, function (item) {
+        return _.filter(errorMsgItems, function (item) {
             return (item.culture === culture && item.segment === segment);
         });
     }
 
-    function notifyCallbacks(self) {
-        for (var cb in callbacks) {
-            if (callbacks[cb].propertyAlias === null && callbacks[cb].fieldName !== null) {
-                //its a field error callback
-                var fieldErrors = getFieldErrors(self, callbacks[cb].fieldName);
-                if (fieldErrors.length > 0) {
-                    executeCallback(self, fieldErrors, callbacks[cb].callback, callbacks[cb].culture, callbacks[cb].segment);
-                }
+    function notifyCallback(cb) {
+        if (cb.propertyAlias === null && cb.fieldName !== null) {
+            //its a field error callback
+            const fieldErrors = getFieldErrors(cb.fieldName);
+            const valid = fieldErrors.length === 0;
+            executeCallback(fieldErrors, cb.callback, cb.culture, cb.segment, valid);
+        }
+        else if (cb.propertyAlias != null) {
+            //its a property error
+            const propErrors = getPropertyErrors(cb.propertyAlias, cb.culture, cb.segment, cb.fieldName, cb.options);
+            const valid = propErrors.length === 0;
+            executeCallback(propErrors, cb.callback, cb.culture, cb.segment, valid);
+        }
+        else {
+            //its a variant error
+            const variantErrors = getVariantErrors(cb.culture, cb.segment);
+            const valid = variantErrors.length === 0;
+            executeCallback(variantErrors, cb.callback, cb.culture, cb.segment, valid);
+        }
+    }
+
+    /** Call all registered callbacks indicating if the data they are subscribed to is valid or invalid */
+    function notifyCallbacks() {
+
+        // nothing to call
+        if (errorMsgItems.length === 0) {
+            return;
+        }
+
+        callbacks.forEach(cb => notifyCallback(cb));
+    }
+
+    /**
+     * Flattens the complex errror result json into an array of the block's id/parent id and it's corresponding validation ModelState
+     * @param {any} errorMsg
+     * @param {any} parentPropertyAlias The parent property alias for the json error 
+     */
+    function parseComplexEditorError(errorMsg, parentPropertyAlias) {
+
+        var json = Utilities.isArray(errorMsg) ? errorMsg : JSON.parse(errorMsg);
+
+        var result = [];
+
+        function extractModelState(validation, parentPath) {
+            if (validation.$id && validation.ModelState) {
+                var ms = {
+                    validationPath: `${parentPath}/${validation.$id}`,
+                    modelState: validation.ModelState
+                };
+                result.push(ms);
+                return ms;
             }
-            else if (callbacks[cb].propertyAlias != null) {
-                //its a property error
-                var propErrors = getPropertyErrors(self, callbacks[cb].propertyAlias, callbacks[cb].culture, callbacks[cb].segment, callbacks[cb].fieldName);
-                if (propErrors.length > 0) {
-                    executeCallback(self, propErrors, callbacks[cb].callback, callbacks[cb].culture, callbacks[cb].segment);
+            return null;
+        }
+
+        function iterateErrorBlocks(blocks, parentPath) {
+            for (var i = 0; i < blocks.length; i++) {
+                var validation = blocks[i];
+                var ms = extractModelState(validation, parentPath);
+                if (!ms) {
+                    continue;
                 }
-            }
-            else {
-                //its a variant error
-                var variantErrors = getVariantErrors(self, callbacks[cb].culture, callbacks[cb].segment);
-                if (variantErrors.length > 0) {
-                    executeCallback(self, variantErrors, callbacks[cb].callback, callbacks[cb].culture, callbacks[cb].segment);
+                var nested = _.omit(validation, "$id", "$elementTypeAlias", "ModelState");                
+                for (const [key, value] of Object.entries(nested)) {
+                    if (Array.isArray(value)) {
+                        iterateErrorBlocks(value, `${ms.validationPath}/${key}`); // recurse
+                    }
                 }
             }
         }
+
+        iterateErrorBlocks(json, parentPropertyAlias);
+
+        return result;
     }
-    
-    return {
-        
+
+    /**
+     * @ngdoc function
+     * @name getPropertyCallbacks
+     * @methodOf umbraco.services.serverValidationManager
+     * @function
+     *
+     * @description
+     * Gets all callbacks that has been registered using the subscribe method for the propertyAlias + fieldName combo.
+     * This will always return any callbacks registered for just the property (i.e. field name is empty) and for ones with an
+     * explicit field name set.
+     */
+    function getPropertyCallbacks(propertyAlias, culture, fieldName, segment) {
+
+        //normalize culture to "invariant"
+        if (!culture) {
+            culture = "invariant";
+        }
+        //normalize segment to null
+        if (!segment) {
+            segment = null;
+        }
+
+        var found = _.filter(callbacks, function (cb) {
+
+            if (!cb.options) {
+                cb.options = defaultMatchOptions;
+            }
+
+            var matchProp = matchCallbackItemProperty(cb, propertyAlias);
+
+            //returns any callback that have been registered directly against the field and for only the property
+            return matchProp
+                && cb.culture === culture
+                && cb.segment === segment
+                // ignore field matching if match options are used
+                && (cb.options.matchType || (cb.fieldName === fieldName || (cb.fieldName === undefined || cb.fieldName === "")));
+        });
+        return found;
+    }
+
+    /**
+     * Returns true if the callback item's data and match options matches the property validation key 
+     * @param {any} cb
+     * @param {any} propertyValidationKey
+     */
+    function matchCallbackItemProperty(cb, propertyValidationKey) {
+        if (cb.propertyAlias === propertyValidationKey) {
+            return true;
+        }
+        if (cb.options.matchType === "prefix" && propertyValidationKey.startsWith(cb.propertyAlias + '/')) {
+            return true;
+        }
+        if (cb.options.matchType === "suffix" && propertyValidationKey.endsWith('/' + cb.propertyAlias)) {
+            return true;
+        }
+        if (cb.options.matchType === "contains" && propertyValidationKey.includes('/' + cb.propertyAlias + '/')) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @ngdoc function
+     * @name getFieldCallbacks
+     * @methodOf umbraco.services.serverValidationManager
+     * @function
+     *
+     * @description
+     * Gets all callbacks that has been registered using the subscribe method for the field.
+     */
+    function getFieldCallbacks(fieldName) {
+        var found = _.filter(callbacks, function (item) {
+            //returns any callback that have been registered directly against the field
+            return (item.propertyAlias === null && item.culture === "invariant" && item.segment === null && item.fieldName === fieldName);
+        });
+        return found;
+    }
+
+    /**
+     * @ngdoc function
+     * @name getVariantCallbacks
+     * @methodOf umbraco.services.serverValidationManager
+     * @function
+     *
+     * @description
+     * Gets all callbacks that has been registered using the subscribe method for the culture and segment.
+     */
+    function getVariantCallbacks(culture, segment) {
+        var found = _.filter(callbacks, function (item) {
+            //returns any callback that have been registered directly against the given culture and given segment.
+            return (item.culture === culture && item.segment === segment && item.propertyAlias === null && item.fieldName === null);
+        });
+        return found;
+    }
+
+    /**
+     * @ngdoc function
+     * @name addFieldError
+     * @methodOf umbraco.services.serverValidationManager
+     * @function
+     *
+     * @description
+     * Adds an error message for a native content item field (not a user defined property, for Example, 'Name')
+     */
+    function addFieldError(fieldName, errorMsg) {
+        if (!fieldName) {
+            return;
+        }
+
+        //only add the item if it doesn't exist                
+        if (!hasFieldError(fieldName)) {
+            errorMsgItems.push({
+                propertyAlias: null,
+                culture: "invariant",
+                segment: null,
+                fieldName: fieldName,
+                errorMsg: errorMsg
+            });
+        }
+
+        //find all errors for this item
+        var errorsForCallback = getFieldErrors(fieldName);
+        //we should now call all of the call backs registered for this error
+        var cbs = getFieldCallbacks(fieldName);
+        //call each callback for this error
+        for (var cb in cbs) {
+            executeCallback(errorsForCallback, cbs[cb].callback, null, null, false);
+        }
+    }
+
+    /**
+     * @ngdoc function
+     * @name addPropertyError
+     * @methodOf umbraco.services.serverValidationManager
+     * @function
+     *
+     * @description
+     * Adds an error message for the content property
+     */
+    function addPropertyError(propertyAlias, culture, fieldName, errorMsg, segment) {
+
+        if (!propertyAlias) {
+            return;
+        }
+
+        //normalize culture to "invariant"
+        if (!culture) {
+            culture = "invariant";
+        }
+        //normalize segment to null
+        if (!segment) {
+            segment = null;
+        }
+        //normalize errorMsg to empty
+        if (!errorMsg) {
+            errorMsg = "";
+        }
+
+        // remove all non printable chars and whitespace from the string
+        // (this can be a json string for complex errors and in some test cases contains odd whitespace)
+        if (Utilities.isString(errorMsg)) {
+            errorMsg = errorMsg.trimStartSpecial().trim();
+        }
+
+        // if the error message is json it's a complex editor validation response that we need to parse
+        if ((Utilities.isString(errorMsg) && errorMsg.startsWith("[")) || Utilities.isArray(errorMsg)) {
+
+            // flatten the json structure, create validation paths for each property and add each as a property error
+            var idsToErrors = parseComplexEditorError(errorMsg, propertyAlias);
+            idsToErrors.forEach(x => addErrorsForModelState(x.modelState, x.validationPath));
+
+            // We need to clear the error message else it will show up as a giant json block against the property
+             errorMsg = "";
+        }
+
+        //only add the item if it doesn't exist                
+        if (!hasPropertyError(propertyAlias, culture, fieldName, segment)) {
+            errorMsgItems.push({
+                propertyAlias: propertyAlias,
+                culture: culture,
+                segment: segment,
+                fieldName: fieldName,
+                errorMsg: errorMsg
+            });
+        }        
+    }
+
+    /**
+     * @ngdoc function
+     * @name hasPropertyError
+     * @methodOf umbraco.services.serverValidationManager
+     * @function
+     *
+     * @description
+     * Checks if the content property + culture + field name combo has an error
+     */
+    function hasPropertyError(propertyAlias, culture, fieldName, segment) {
+
+        //normalize culture to null
+        if (!culture) {
+            culture = "invariant";
+        }
+        //normalize segment to null
+        if (!segment) {
+            segment = null;
+        }
+
+        var err = _.find(errorMsgItems, function (item) {
+            //return true if the property alias matches and if an empty field name is specified or the field name matches
+            return (item.propertyAlias === propertyAlias && item.culture === culture && item.segment === segment && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
+        });
+        return err ? true : false;
+    }
+
+    /**
+     * @ngdoc function
+     * @name hasFieldError
+     * @methodOf umbraco.services.serverValidationManager
+     * @function
+     *
+     * @description
+     * Checks if a content field has an error
+     */
+    function hasFieldError(fieldName) {
+        var err = _.find(errorMsgItems, function (item) {
+            //return true if the property alias matches and if an empty field name is specified or the field name matches
+            return (item.propertyAlias === null && item.culture === "invariant" && item.segment === null && item.fieldName === fieldName);
+        });
+        return err ? true : false;
+    }
+
+    /**
+     * @ngdoc function
+     * @name addErrorsForModelState
+     * @methodOf umbraco.services.serverValidationManager
+     * @param {any} modelState the modelState object
+     * @param {any} parentValidationPath optional parameter specifying a nested element's UDI for which this property belongs (for complex editors)
+     * @description
+     * This wires up all of the server validation model state so that valServer and valServerField directives work
+     */    
+    function addErrorsForModelState(modelState, parentValidationPath) {
+
+        if (!Utilities.isObject(modelState)) {
+            throw "modelState is not an object";
+        }
+
+        for (const [key, value] of Object.entries(modelState)) {
+
+            //This is where things get interesting....
+            // We need to support validation for all editor types such as both the content and content type editors.
+            // The Content editor ModelState is quite specific with the way that Properties are validated especially considering
+            // that each property is a User Developer property editor.
+            // The way that Content Type Editor ModelState is created is simply based on the ASP.Net validation data-annotations 
+            // system. 
+            // So, to do this there's some special ModelState syntax we need to know about.
+            // For Content Properties, which are user defined, we know that they will exist with a prefixed
+            // ModelState of "_Properties.", so if we detect this, then we know it's for a content Property.
+
+            //the alias in model state can be in dot notation which indicates
+            // * the first part is the content property alias
+            // * the second part is the field to which the valiation msg is associated with
+            //There will always be at least 4 parts for content properties since all model errors for properties are prefixed with "_Properties"
+            //If it is not prefixed with "_Properties" that means the error is for a field of the object directly.
+
+            // Example: "_Properties.headerImage.en-US.mySegment.myField"
+            // * it's for a property since it has a _Properties prefix
+            // * it's for the headerImage property type
+            // * it's for the en-US culture
+            // * it's for the mySegment segment
+            // * it's for the myField html field (optional)
+
+            var parts = key.split(".");
+
+            //Check if this is for content properties - specific to content/media/member editors because those are special 
+            // user defined properties with custom controls.
+            if (parts.length > 1 && parts[0] === "_Properties") {
+
+                // create the validation key, might just be the prop alias but if it's nested will be validation path
+                // like "myBlockEditor/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/7170A4DD-2441-4B1B-A8D3-437D75C4CBC9/city"
+                var propertyValidationKey = createPropertyValidationKey(parts[1], parentValidationPath);
+
+                var culture = null;
+                if (parts.length > 2) {
+                    culture = parts[2];
+                    //special check in case the string is formatted this way
+                    if (culture === "null") {
+                        culture = null;
+                    }
+                }
+
+                var segment = null;
+                if (parts.length > 3) {
+                    segment = parts[3];
+                    //special check in case the string is formatted this way
+                    if (segment === "null") {
+                        segment = null;
+                    }
+                }
+
+                var htmlFieldReference = "";
+                if (parts.length > 4) {
+                    htmlFieldReference = parts[4] || "";
+                }
+
+                // add a generic error for the property
+                addPropertyError(propertyValidationKey, culture, htmlFieldReference, value && Array.isArray(value) && value.length > 0 ? value[0] : null, segment);
+            }
+            else {
+
+                //Everthing else is just a 'Field'... the field name could contain any level of 'parts' though, for example:
+                // Groups[0].Properties[2].Alias
+                addFieldError(key, value[0]);
+            }
+        }
+
+        if (hasPropertyError) {
+            // ensure all callbacks are called after property errors are added
+            notifyCallbacks(); 
+        }
+    }
+
+    function createPropertyValidationKey(propertyAlias, parentValidationPath) {
+        return parentValidationPath ? (parentValidationPath + "/" + propertyAlias) : propertyAlias;
+    }
+
+    /**
+     * @ngdoc function
+     * @name reset
+     * @methodOf umbraco.services.serverValidationManager
+     * @function
+     *
+     * @description
+     * Clears all errors and notifies all callbacks that all server errros are now valid - used when submitting a form
+     */
+    function reset() {
+        clear();
+        for (var cb in callbacks) {
+            callbacks[cb].callback.apply(instance, [
+                true,       //pass in a value indicating it is VALID
+                [],         //pass in empty collection
+                [],
+                null,
+                null]
+            );
+        }
+    }
+
+    /**
+     * @ngdoc function
+     * @name clear
+     * @methodOf umbraco.services.serverValidationManager
+     * @function
+     *
+     * @description
+     * Clears all errors
+     */
+    function clear() {
+        errorMsgItems = [];
+    }
+
+    var instance = {
+
+        addErrorsForModelState: addErrorsForModelState,
+        parseComplexEditorError: parseComplexEditorError,
+        createPropertyValidationKey: createPropertyValidationKey,
+
         /**
          * @ngdoc function
          * @name notifyAndClearAllSubscriptions
@@ -108,42 +602,27 @@ function serverValidationManager($timeout) {
          * @function
          *
          * @description
-         *  This method needs to be called once all field and property errors are wired up. 
+         *  This method can be called once all field and property errors are wired up. 
          * 
          *  In some scenarios where the error collection needs to be persisted over a route change 
          *   (i.e. when a content item (or any item) is created and the route redirects to the editor) 
          *   the controller should call this method once the data is bound to the scope
          *   so that any persisted validation errors are re-bound to their controls. Once they are re-binded this then clears the validation
          *   colleciton so that if another route change occurs, the previously persisted validation errors are not re-bound to the new item.
+         *   
+         *  In the case of content with complex editors, variants and different views, those editors don't call this method and instead 
+         *  manage the server validation manually by calling notify when necessary and clear/reset when necessary.
          */
         notifyAndClearAllSubscriptions: function() {
 
-            var self = this;
-
             $timeout(function () {
-                notifyCallbacks(self);
+                notifyCallbacks();
                 //now that they are all executed, we're gonna clear all of the errors we have
-                self.clear();
+                clear();
             });
         },
 
-        /**
-         * @ngdoc function
-         * @name notify
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * This method isn't used very often but can be used if all subscriptions need to be notified again. This can be
-         * handy if a view needs to be reloaded/rebuild like when switching variants in the content editor.
-         */
-        notify: function() {
-            var self = this;
-
-            $timeout(function () {
-                notifyCallbacks(self);
-            });
-        },
+        notify: notify,
 
         /**
          * @ngdoc function
@@ -158,7 +637,7 @@ function serverValidationManager($timeout) {
          *  field alias to listen for.
          *  If propertyAlias is null, then this subscription is for a field property (not a user defined property).
          */
-        subscribe: function (propertyAlias, culture, fieldName, callback, segment) {
+        subscribe: function (propertyAlias, culture, fieldName, callback, segment, options) {
             if (!callback) {
                 return;
             }
@@ -173,30 +652,34 @@ function serverValidationManager($timeout) {
             if (!segment) {
                 segment = null;
             }
-            
+
+            let cb = null;
+
             if (propertyAlias === null) {
-                callbacks.push({
+                cb = {
                     propertyAlias: null,
                     culture: culture,
                     segment: segment,
                     fieldName: fieldName,
                     callback: callback,
                     id: id
-                });
+                };
             }
             else if (propertyAlias !== undefined) {
-                //normalize culture to null
-                
-                callbacks.push({
+                                
+                cb = {
                     propertyAlias: propertyAlias,
-                    culture: culture, 
+                    culture: culture,
                     segment: segment,
                     fieldName: fieldName,
                     callback: callback,
-                    id: id
-                });
+                    id: id,
+                    options: options
+                };
             }
 
+            callbacks.push(cb);
+
             function unsubscribeId() {
                 //remove all callbacks for the content field
                 callbacks = _.reject(callbacks, function (item) {
@@ -204,6 +687,9 @@ function serverValidationManager($timeout) {
                 });
             }
 
+            // Notify the new callback            
+            notifyCallback(cb);
+
             //return a function to unsubscribe this subscription by uniqueId
             return unsubscribeId;
         },
@@ -244,52 +730,8 @@ function serverValidationManager($timeout) {
             }
         },
         
-        
-        /**
-         * @ngdoc function
-         * @name getPropertyCallbacks
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * Gets all callbacks that has been registered using the subscribe method for the propertyAlias + fieldName combo.
-         * This will always return any callbacks registered for just the property (i.e. field name is empty) and for ones with an 
-         * explicit field name set.
-         */
-        getPropertyCallbacks: function (propertyAlias, culture, fieldName, segment) {
-
-            //normalize culture to "invariant"
-            if (!culture) {
-                culture = "invariant";
-            }
-            //normalize segment to null
-            if (!segment) {
-                segment = null;
-            }
-
-            var found = _.filter(callbacks, function (item) {
-                //returns any callback that have been registered directly against the field and for only the property
-                return (item.propertyAlias === propertyAlias && item.culture === culture && item.segment === segment && (item.fieldName === fieldName || (item.fieldName === undefined || item.fieldName === "")));
-            });
-            return found;
-        },
-        
-        /**
-         * @ngdoc function
-         * @name getFieldCallbacks
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * Gets all callbacks that has been registered using the subscribe method for the field.         
-         */
-        getFieldCallbacks: function (fieldName) {
-            var found = _.filter(callbacks, function (item) {
-                //returns any callback that have been registered directly against the field
-                return (item.propertyAlias === null && item.culture === "invariant" && item.segment === null && item.fieldName === fieldName);
-            });
-            return found;
-        },
+        getPropertyCallbacks: getPropertyCallbacks,        
+        getFieldCallbacks: getFieldCallbacks,
         
         /**
          * @ngdoc function
@@ -308,107 +750,12 @@ function serverValidationManager($timeout) {
             return found;
         },
 
-        /**
-         * @ngdoc function
-         * @name getVariantCallbacks
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * Gets all callbacks that has been registered using the subscribe method for the culture and segment.         
-         */
-        getVariantCallbacks: function (culture, segment) {
-            var found = _.filter(callbacks, function (item) {
-                //returns any callback that have been registered directly against the given culture and given segment.
-                return (item.culture === culture && item.segment === segment && item.propertyAlias === null && item.fieldName === null);
-            });
-            return found;
-        },
-        
-        /**
-         * @ngdoc function
-         * @name addFieldError
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * Adds an error message for a native content item field (not a user defined property, for Example, 'Name')
-         */
-        addFieldError: function(fieldName, errorMsg) {
-            if (!fieldName) {
-                return;
-            }
-            
-            //only add the item if it doesn't exist                
-            if (!this.hasFieldError(fieldName)) {
-                this.items.push({
-                    propertyAlias: null,
-                    culture: "invariant",
-                    segment: null,
-                    fieldName: fieldName,
-                    errorMsg: errorMsg
-                });
-            }
-            
-            //find all errors for this item
-            var errorsForCallback = getFieldErrors(this, fieldName);
-            //we should now call all of the call backs registered for this error
-            var cbs = this.getFieldCallbacks(fieldName);
-            //call each callback for this error
-            for (var cb in cbs) {
-                executeCallback(this, errorsForCallback, cbs[cb].callback, null, null);
-            }
-        },
+        getVariantCallbacks: getVariantCallbacks,
+        addFieldError: addFieldError,        
 
-        /**
-         * @ngdoc function
-         * @name addPropertyError
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * Adds an error message for the content property
-         */
         addPropertyError: function (propertyAlias, culture, fieldName, errorMsg, segment) {
-            if (!propertyAlias) {
-                return;
-            }
-
-            //normalize culture to "invariant"
-            if (!culture) {
-                culture = "invariant";
-            }
-            //normalize segment to null
-            if (!segment) {
-                segment = null;
-            }
-
-            //only add the item if it doesn't exist                
-            if (!this.hasPropertyError(propertyAlias, culture, fieldName, segment)) {
-                this.items.push({
-                    propertyAlias: propertyAlias,
-                    culture: culture,
-                    segment: segment,
-                    fieldName: fieldName,
-                    errorMsg: errorMsg
-                });
-            }
-            
-            //find all errors for this item
-            var errorsForCallback = getPropertyErrors(this, propertyAlias, culture, segment, fieldName);
-            //we should now call all of the call backs registered for this error
-            var cbs = this.getPropertyCallbacks(propertyAlias, culture, fieldName, segment);
-            //call each callback for this error
-            for (var cb in cbs) {
-                executeCallback(this, errorsForCallback, cbs[cb].callback, culture, segment);
-            }
-
-            //execute variant specific callbacks here too when a propery error is added
-            var variantCbs = this.getVariantCallbacks(culture, segment);
-            //call each callback for this error
-            for (var cb in variantCbs) {
-                executeCallback(this, errorsForCallback, variantCbs[cb].callback, culture, segment);
-            }
+            addPropertyError(propertyAlias, culture, fieldName, errorMsg, segment);
+            notifyCallbacks(); // ensure all callbacks are called
         },      
         
         /**
@@ -420,61 +767,19 @@ function serverValidationManager($timeout) {
          * @description
          * Removes an error message for the content property
          */
-        removePropertyError: function (propertyAlias, culture, fieldName, segment) {
+        removePropertyError: function (propertyAlias, culture, fieldName, segment, options) {
 
-            if (!propertyAlias) {
-                return;
-            }
+            var errors = getPropertyErrors(propertyAlias, culture, segment, fieldName, options);
+            errorMsgItems = errorMsgItems.filter(v => errors.indexOf(v) === -1);
 
-            //normalize culture to null
-            if (!culture) {
-                culture = "invariant";
-            }
-            //normalize segment to null
-            if (!segment) {
-                segment = null;
-            }
-
-            //remove the item
-            this.items = _.reject(this.items, function (item) {
-                return (item.propertyAlias === propertyAlias && item.culture === culture && item.segment === segment && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
-            });
-        },
-        
-        /**
-         * @ngdoc function
-         * @name reset
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * Clears all errors and notifies all callbacks that all server errros are now valid - used when submitting a form
-         */
-        reset: function () {
-            this.clear();
-            for (var cb in callbacks) {
-                callbacks[cb].callback.apply(this, [
-                        true,       //pass in a value indicating it is VALID
-                        [],         //pass in empty collection
-                        [],
-                        null,
-                        null]
-                    );
+            if (errors.length > 0) {
+                // removal was successful, re-notify all subscribers
+                notifyCallbacks();
             }
         },
         
-        /**
-         * @ngdoc function
-         * @name clear
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * Clears all errors
-         */
-        clear: function() {
-            this.items = [];
-        },
+        reset: reset,
+        clear: clear,
         
         /**
          * @ngdoc function
@@ -486,23 +791,17 @@ function serverValidationManager($timeout) {
          * Gets the error message for the content property
          */
         getPropertyError: function (propertyAlias, culture, fieldName, segment) {
-
-            //normalize culture to "invariant"
-            if (!culture) {
-                culture = "invariant";
+            var errors = getPropertyErrors(propertyAlias, culture, segment, fieldName);
+            if (errors.length > 0) { // should only ever contain one
+                return errors[0];
             }
-            //normalize segment to null
-            if (!segment) {
-                segment = null;
-            }
-
-            var err = _.find(this.items, function (item) {
-                //return true if the property alias matches and if an empty field name is specified or the field name matches
-                return (item.propertyAlias === propertyAlias && item.culture === culture && item.segment === segment && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
-            });
-            return err;
+            return undefined;
         },
-        
+
+        getPropertyErrorsByValidationPath: function (propertyValidationPath, culture, segment, options) {
+            return getPropertyErrors(propertyValidationPath, culture, segment, "", options);
+        },
+
         /**
          * @ngdoc function
          * @name getFieldError
@@ -513,56 +812,15 @@ function serverValidationManager($timeout) {
          * Gets the error message for a content field
          */
         getFieldError: function (fieldName) {
-            var err = _.find(this.items, function (item) {
+            var err = _.find(errorMsgItems, function (item) {
                 //return true if the property alias matches and if an empty field name is specified or the field name matches
                 return (item.propertyAlias === null && item.culture === "invariant" && item.segment === null && item.fieldName === fieldName);
             });
             return err;
         },
         
-        /**
-         * @ngdoc function
-         * @name hasPropertyError
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * Checks if the content property + culture + field name combo has an error
-         */
-        hasPropertyError: function (propertyAlias, culture, fieldName, segment) {
-
-            //normalize culture to null
-            if (!culture) {
-                culture = "invariant";
-            }
-            //normalize segment to null
-            if (!segment) {
-                segment = null;
-            }
-
-            var err = _.find(this.items, function (item) {
-                //return true if the property alias matches and if an empty field name is specified or the field name matches
-                return (item.propertyAlias === propertyAlias && item.culture === culture && item.segment === segment && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
-            });
-            return err ? true : false;
-        },
-        
-        /**
-         * @ngdoc function
-         * @name hasFieldError
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * Checks if a content field has an error
-         */
-        hasFieldError: function (fieldName) {
-            var err = _.find(this.items, function (item) {
-                //return true if the property alias matches and if an empty field name is specified or the field name matches
-                return (item.propertyAlias === null && item.culture === "invariant" && item.segment === null && item.fieldName === fieldName);
-            });
-            return err ? true : false;
-        },
+        hasPropertyError: hasPropertyError,        
+        hasFieldError: hasFieldError,
         
         /**
          * @ngdoc function
@@ -580,7 +838,7 @@ function serverValidationManager($timeout) {
                 culture = "invariant";
             }
 
-            var err = _.find(this.items, function (item) {
+            var err = _.find(errorMsgItems, function (item) {
                 return (item.culture === culture && item.segment === null);
             });
             return err ? true : false;
@@ -606,14 +864,25 @@ function serverValidationManager($timeout) {
                 segment = null;
             }
             
-            var err = _.find(this.items, function (item) {
+            var err = _.find(errorMsgItems, function (item) {
                 return (item.culture === culture && item.segment === segment);
             });
             return err ? true : false;
-        },
-        /** The array of error messages */
-        items: []
+        }
+
     };
+
+    // Used to return the 'items' array as a reference/getter
+    Object.defineProperty(instance, "items", {
+        get: function () {
+            return errorMsgItems;
+        },
+        set: function (value) {
+            throw "Cannot set the items array";
+        }
+    });
+
+    return instance;
 }
 
 angular.module('umbraco.services').factory('serverValidationManager', serverValidationManager);
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 41f240d3af..1d7154288f 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
@@ -107,7 +107,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
 
         //queue rules loading
         if (configuredStylesheets) {
-            angular.forEach(configuredStylesheets, function (val, key) {
+            configuredStylesheets.forEach(function (val, key) {
 
                 if (val.indexOf(Umbraco.Sys.ServerVariables.umbracoSettings.cssPath + "/") === 0) {
                     // current format (full path to stylesheet)
@@ -119,7 +119,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
                 }
 
                 promises.push(stylesheetResource.getRulesByName(val).then(function (rules) {
-                    angular.forEach(rules, function (rule) {
+                    rules.forEach(function (rule) {
                         var r = {};
                         r.title = rule.name;
                         if (rule.selector[0] == ".") {
@@ -1367,6 +1367,9 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             //    throw "args.model.value is required";
             //}
 
+            // force TinyMCE to load plugins/themes from minified files (see http://archive.tinymce.com/wiki.php/api4:property.tinymce.suffix.static)
+            args.editor.suffix = ".min";
+
             var unwatch = null;
 
             //Starts a watch on the model value so that we can update TinyMCE if the model changes behind the scenes or from the server
@@ -1504,6 +1507,8 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             });
 
             args.editor.on('Dirty', function (e) {
+            	syncContent(); // Set model.value to the RTE's content
+
                 //make the form dirty manually so that the track changes works, setting our model doesn't trigger
                 // the angular bits because tinymce replaces the textarea.
                 if (args.currentForm) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
index 0d6216f7cc..9970995a28 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
@@ -54,7 +54,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
             //take the last child
             var childPath = this.getPath(node.children[node.children.length - 1]).join(",");
             //check if this already exists, if so exit
-            if (expandedPaths.indexOf(childPath) !== -1) {
+            if (expandedPaths.includes(childPath)) {
                 return;
             }
 
@@ -65,18 +65,18 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
 
             var clonedPaths = expandedPaths.slice(0); //make a copy to iterate over so we can modify the original in the iteration
 
-            _.each(clonedPaths, function (p) {
+            clonedPaths.forEach(p => {
                 if (childPath.startsWith(p + ",")) {
                     //this means that the node's path supercedes this path stored so we can remove the current 'p' and replace it with node.path
                     expandedPaths.splice(expandedPaths.indexOf(p), 1); //remove it
-                    if (expandedPaths.indexOf(childPath) === -1) {
+                    if (expandedPaths.includes(childPath) === false) {
                         expandedPaths.push(childPath); //replace it
                     }
                 }
                 else if (p.startsWith(childPath + ",")) {
                     //this means we've already tracked a deeper node so we shouldn't track this one
                 }
-                else if (expandedPaths.indexOf(childPath) === -1) {
+                else if (expandedPaths.includes(childPath) === false) {
                     expandedPaths.push(childPath); //track it
                 }
             });
@@ -135,7 +135,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
                 if (treeNode.iconIsClass === undefined || treeNode.iconIsClass) {
                     var converted = iconHelper.convertFromLegacyTreeNodeIcon(treeNode);
                     treeNode.cssClass = standardCssClass + " " + converted;
-                    if (converted.startsWith('.')) {
+                    if (converted && converted.startsWith('.')) {
                         //its legacy so add some width/height
                         treeNode.style = "height:16px;width:16px;";
                     }
@@ -235,7 +235,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
                         }
                     });
                 }
-                else if (args.filter && angular.isFunction(args.filter)) {
+                else if (args.filter && Utilities.isFunction(args.filter)) {
                     //if a filter is supplied a cacheKey must be supplied as well
                     if (!args.cacheKey) {
                         throw "args.cacheKey is required if args.filter is supplied";
@@ -315,7 +315,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
                         args.node.hasChildren = true;
 
                         //Since we've removed the children &  reloaded them, we need to refresh the UI now because the tree node UI doesn't operate on normal angular $watch since that will be pretty slow
-                        if (angular.isFunction(args.node.updateNodeData)) {
+                        if (Utilities.isFunction(args.node.updateNodeData)) {
                             args.node.updateNodeData(args.node);
                         }
                     }
@@ -349,7 +349,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
          * @param {object} treeNode the node to remove
          */
         removeNode: function (treeNode) {
-            if (!angular.isFunction(treeNode.parent)) {
+            if (!Utilities.isFunction(treeNode.parent)) {
                 return;
             }
 
@@ -509,7 +509,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
                 if (current.metaData && current.metaData["treeAlias"]) {
                     root = current;
                 }
-                else if (angular.isFunction(current.parent)) {
+                else if (Utilities.isFunction(current.parent)) {
                     //we can only continue if there is a parent() method which means this
                     // tree node was loaded in as part of a real tree, not just as a single tree
                     // node from the server.
@@ -706,7 +706,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
                     //to fire, instead we're just going to replace all the properties of this node.
 
                     //there should always be a method assigned but we'll check anyways
-                    if (angular.isFunction(node.parent().children[index].updateNodeData)) {
+                    if (Utilities.isFunction(node.parent().children[index].updateNodeData)) {
                         node.parent().children[index].updateNodeData(found);
                     }
                     else {
@@ -741,7 +741,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
             if (!node) {
                 throw "node cannot be null";
             }
-            if (!angular.isFunction(node.parent)) {
+            if (!Utilities.isFunction(node.parent)) {
                 throw "node.parent is not a function, the path cannot be resolved";
             }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/udi.service.js b/src/Umbraco.Web.UI.Client/src/common/services/udi.service.js
new file mode 100644
index 0000000000..7b08c68e4e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/services/udi.service.js
@@ -0,0 +1,51 @@
+(function () {
+    "use strict";
+
+    /**
+    * @ngdoc service
+    * @name umbraco.services.udiService
+    * @description A service for UDIs
+    **/
+    function udiService() {
+        return {
+
+            /**
+             * @ngdoc method
+             * @name umbraco.services.udiService#create
+             * @methodOf umbraco.services.udiService
+             * @function
+             *
+             * @description
+             * Generates a Udi string with a new ID
+             *
+             * @param {string} entityType The entityType as a string.
+             * @returns {string} The generated UDI
+             */
+            create: function(entityType) {
+                return this.build(entityType, String.CreateGuid());
+            },
+
+            build: function (entityType, guid) {
+                return "umb://" + entityType + "/" + (guid.replace(/-/g, ""));
+            },
+
+            getKey: function (udi) {
+                if (!Utilities.isString(udi)) {
+                    throw "udi is not a string";
+                }
+                if (!udi.startsWith("umb://")) {
+                    throw "udi does not start with umb://";
+                }
+                var withoutScheme = udi.substr("umb://".length);
+                var withoutHost = withoutScheme.substr(withoutScheme.indexOf("/") + 1).trim();
+                if (withoutHost.length !== 32) {
+                    throw "udi is not 32 chars";
+                }
+                return `${withoutHost.substr(0, 8)}-${withoutHost.substr(8, 4)}-${withoutHost.substr(12, 4)}-${withoutHost.substr(16, 4)}-${withoutHost.substr(20)}`;
+            }
+        }
+    }
+
+    angular.module("umbraco.services").factory("udiService", udiService);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
index 109fff0919..c646c4833f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
@@ -83,7 +83,7 @@
                     });
 
                     var saveProperties = _.map(realProperties, function (p) {
-                        var saveProperty = _.pick(p, 'id', 'alias', 'description', 'validation', 'label', 'sortOrder', 'dataTypeId', 'groupId', 'memberCanEdit', 'showOnMemberProfile', 'isSensitiveData', 'allowCultureVariant', 'allowSegmentVariant');
+                        var saveProperty = _.pick(p, 'id', 'alias', 'description', 'validation', 'label', 'sortOrder', 'dataTypeId', 'groupId', 'memberCanEdit', 'showOnMemberProfile', 'isSensitiveData', 'allowCultureVariant', 'allowSegmentVariant', 'labelOnTop');
                         return saveProperty;
                     });
 
@@ -404,7 +404,7 @@
                 if (displayModel.variants && displayModel.variants.length > 1) {
                     // Collect all invariant properties from the variants that are either the
                     // default language variant or the default segment variant.
-                    var defaultVariants = _.filter(displayModel.variants, function (variant) {                      
+                    var defaultVariants = _.filter(displayModel.variants, function (variant) {
                         var isDefaultLanguage = variant.language && variant.language.isDefault;
                         var isDefaultSegment = variant.segment == null;
 
@@ -433,7 +433,7 @@
                                 return variant !== defaultVariant;
                             });
 
-                            // now assign this same invariant property instance to the same index of the other variants property array                            
+                            // now assign this same invariant property instance to the same index of the other variants property array
                             _.each(otherVariants, function (variant) {
                                 _.each(invariantProps, function (invProp) {
                                     var tab = variant.tabs[invProp.tabIndex];
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
index 4cbc5e567a..0a4009264d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
@@ -15,10 +15,10 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
          *
          * @description
          * This will convert a virtual path (i.e. ~/App_Plugins/Blah/Test.html ) to an absolute path
-         * 
+         *
          * @param {string} a virtual path, if this is already an absolute path it will just be returned, if this is a relative path an exception will be thrown
          */
-        convertVirtualToAbsolutePath: function(virtualPath) {
+        convertVirtualToAbsolutePath: function (virtualPath) {
             if (virtualPath.startsWith("/")) {
                 return virtualPath;
             }
@@ -31,6 +31,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
             return Umbraco.Sys.ServerVariables.application.applicationPath + virtualPath.trimStart("~/");
         },
 
+
         /**
          * @ngdoc method
          * @name umbraco.services.umbRequestHelper#dictionaryToQueryString
@@ -39,7 +40,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
          *
          * @description
          * This will turn an array of key/value pairs or a standard dictionary into a query string
-         * 
+         *
          * @param {Array} queryStrings An array of key/value pairs
          */
         dictionaryToQueryString: function (queryStrings) {
@@ -76,9 +77,9 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
          *
          * @description
          * This will return the webapi Url for the requested key based on the servervariables collection
-         * 
+         *
          * @param {string} apiName The webapi name that is found in the servervariables["umbracoUrls"] dictionary
-         * @param {string} actionName The webapi action name 
+         * @param {string} actionName The webapi action name
          * @param {object} queryStrings Can be either a string or an array containing key/value pairs
          */
         getApiUrl: function (apiName, actionName, queryStrings) {
@@ -103,7 +104,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
          *
          * @description
          * This returns a promise with an underlying http call, it is a helper method to reduce
-         *  the amount of duplicate code needed to query http resources and automatically handle any 
+         *  the amount of duplicate code needed to query http resources and automatically handle any
          *  Http errors. See /docs/source/using-promises-resources.md
          *
          * @param {object} opts A mixed object which can either be a string representing the error message to be
@@ -117,7 +118,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
          *   The error callback must return an object containing: {errorMsg: errorMessage, data: originalData, status: status }
          */
         resourcePromise: function (httpPromise, opts) {
-            
+
             /** The default success callback used if one is not supplied in the opts */
             function defaultSuccess(data, status, headers, config) {
                 //when it's successful, just return the data
@@ -135,7 +136,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
                 };
 
                 // if "opts" is a promise, we set "err.errorMsg" to be that promise
-                if (typeof(opts) == "object" && typeof(opts.then) == "function") {
+                if (typeof (opts) == "object" && typeof (opts.then) == "function") {
                     err.errorMsg = opts;
                 }
 
@@ -151,7 +152,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
 
             return httpPromise.then(function (response) {
 
-                //invoke the callback 
+                //invoke the callback
                 var result = callbacks.success.apply(this, [response.data, response.status, response.headers, response.config]);
 
                 formHelper.showNotifications(response.data);
@@ -165,11 +166,9 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
                     return; //sometimes oddly this happens, nothing we can do
                 }
 
-                if (!response.status && response.message && response.stack) {
-                    //this is a JS/angular error that we should deal with
-                    return $q.reject({
-                        errorMsg: response.message
-                    });
+                if (!response.status) {
+                    //this is a JS/angular error
+                    return $q.reject(response);
                 }
 
                 //invoke the callback
@@ -180,12 +179,12 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
 
                     //show a ysod dialog
                     if (Umbraco.Sys.ServerVariables["isDebuggingEnabled"] === true) {
-                        const error = { errorMsg: 'An error occured', data: response.data };
+                        const error = { errorMsg: 'An error occurred', data: response.data };
                         // TODO: All YSOD handling should be done with an interceptor
                         overlayService.ysod(error);
                     }
                     else {
-                        //show a simple error notification                         
+                        //show a simple error notification
                         notificationsService.error("Server error", "Contact administrator, see log for full details.<br/><i>" + result.errorMsg + "</i>");
                     }
 
@@ -211,7 +210,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
          *
          * @description
          * Used for saving content/media/members specifically
-         * 
+         *
          * @param {Object} args arguments object
          * @returns {Promise} http promise object.
          */
@@ -235,7 +234,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
             if (args.showNotifications === null || args.showNotifications === undefined) {
                 args.showNotifications = true;
             }
-            
+
             //save the active tab id so we can set it when the data is returned.
             var activeTab = _.find(args.content.tabs, function (item) {
                 return item.active;
@@ -265,9 +264,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
 
                     //reset the tabs and set the active one
                     if (response.data.tabs && response.data.tabs.length > 0) {
-                        _.each(response.data.tabs, function (item) {
-                            item.active = false;
-                        });
+                        response.data.tabs.forEach(item => item.active = false);
                         response.data.tabs[activeTabIndex].active = true;
                     }
 
@@ -280,7 +277,11 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
                     //the data returned is the up-to-date data so the UI will refresh
                     return $q.resolve(response.data);
                 }, function (response) {
-                    //failure callback
+
+                    if (!response.status) {
+                        //this is a JS/angular error
+                        return $q.reject(response);
+                    }
 
                     //when there's a 500 (unhandled) error show a YSOD overlay if debugging is enabled.
                     if (response.status >= 500 && response.status < 600) {
@@ -293,12 +294,12 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
                         }
                         else if (Umbraco.Sys.ServerVariables["isDebuggingEnabled"] === true) {
                             //show a ysod dialog
-                            const error = { errorMsg: 'An error occured', data: response.data };
+                            const error = { errorMsg: 'An error occurred', data: response.data };
                             // TODO: All YSOD handling should be done with an interceptor
                             overlayService.ysod(error);
                         }
                         else {
-                            //show a simple error notification                         
+                            //show a simple error notification
                             notificationsService.error("Server error", "Contact administrator, see log for full details.<br/><i>" + response.data.ExceptionMessage + "</i>");
                         }
 
@@ -324,12 +325,12 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
             if (!jsonData) { throw "jsonData cannot be null"; }
 
             if (Utilities.isArray(jsonData)) {
-                _.each(jsonData, function (item) {
+                jsonData.forEach(item => {
                     if (!item.key || !item.value) { throw "jsonData array item must have both a key and a value property"; }
                 });
             }
             else if (!jsonData.key || !jsonData.value) { throw "jsonData object must have both a key and a value property"; }
-            
+
             return $http({
                 method: 'POST',
                 url: url,
@@ -338,11 +339,11 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
                 // and setting the Content-type manually will not set this boundary parameter. For whatever reason, setting the Content-type to 'undefined'
                 // will force the request to automatically populate the headers properly including the boundary parameter.
                 headers: { 'Content-Type': undefined },
-                transformRequest: function(data) {
+                transformRequest: function (data) {
                     var formData = new FormData();
                     //add the json data
                     if (Utilities.isArray(data)) {
-                        _.each(data, function(item) {
+                        data.forEach(item => {
                             formData.append(item.key, !Utilities.isString(item.value) ? Utilities.toJson(item.value) : item.value);
                         });
                     }
@@ -358,13 +359,13 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
                     return formData;
                 },
                 data: jsonData
-            }).then(function(response) {
+            }).then(function (response) {
                 return $q.resolve(response);
-            }, function(response) {
+            }, function (response) {
                 return $q.reject(response);
             });
         },
-        
+
         /**
          * @ngdoc method
          * @name umbraco.resources.contentResource#downloadFile
@@ -372,11 +373,11 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
          *
          * @description
          * Downloads a file to the client using AJAX/XHR
-         * 
+         *
          * @param {string} httpPath the path (url) to the resource being downloaded
          * @returns {Promise} http promise object.
          */
-        downloadFile : function (httpPath) {
+        downloadFile: function (httpPath) {
 
             /**
              * Based on an implementation here: web.student.tuwien.ac.at/~e0427417/jsdownload.html
@@ -386,7 +387,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
             // Use an arraybuffer
             return $http.get(httpPath, { responseType: 'arraybuffer' })
                 .then(function (response) {
-                    
+
                     var octetStreamMime = 'application/octet-stream';
                     var success = false;
 
@@ -470,7 +471,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
                         window.open(httpPath, '_blank', '');
                     }
 
-                    return $q.resolve();
+                    return $q.resolve(response);
 
                 }, function (response) {
 
@@ -483,4 +484,5 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
         }
     };
 }
+
 angular.module('umbraco.services').factory('umbRequestHelper', umbRequestHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
index de6fbaf782..00871caab1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
@@ -1,5 +1,5 @@
 angular.module('umbraco.services')
-    .factory('userService', function ($rootScope, eventsService, $q, $location, requestRetryQueue, authResource, emailMarketingResource, $timeout, angularHelper) {
+    .factory('userService', function ($rootScope, eventsService, $q, $location, $window, requestRetryQueue, authResource, emailMarketingResource, $timeout, angularHelper) {
 
         var currentUser = null;
         var lastUserId = null;
@@ -166,7 +166,7 @@ angular.module('umbraco.services')
             },
 
             /** Internal method to retry all request after sucessfull login */
-            _retryRequestQueue: function(success) {
+            _retryRequestQueue: function (success) {
                 retryRequestQueue(success)
             },
 
@@ -185,18 +185,22 @@ angular.module('umbraco.services')
             authenticate: function (login, password) {
 
                 return authResource.performLogin(login, password)
-                    .then(function(data) {
+                    .then(function (data) {
 
                         // Check if user has a start node set.
-                        if(data.startContentIds.length === 0 && data.startMediaIds.length === 0){
+                        if (data.startContentIds.length === 0 && data.startMediaIds.length === 0) {
                             var errorMsg = "User has no start-nodes";
                             var result = { errorMsg: errorMsg, user: data, authenticated: false, lastUserId: lastUserId, loginType: "credentials" };
                             eventsService.emit("app.notAuthenticated", result);
+                            // TODO: How does this make sense? How can you throw from a promise? Does this get caught by the rejection?
+                            // If so then return $q.reject should be used.
                             throw result;
                         }
-                        
+
                         return data;
-                        
+
+                    }, function (err) {
+                        return $q.reject(err);
                     }).then(this.setAuthenticationSuccessful);
             },
             setAuthenticationSuccessful: function (data) {
@@ -218,8 +222,14 @@ angular.module('umbraco.services')
                 return authResource.performLogout()
                     .then(function (data) {
                         userAuthExpired();
-                        //done!
-                        return null;
+
+                        if (data && data.signOutRedirectUrl) {
+                            $window.location.replace(data.signOutRedirectUrl);
+                        }
+                        else {
+                            //done!
+                            return null;
+                        }
                     });
             },
 
@@ -235,9 +245,9 @@ angular.module('umbraco.services')
                         setCurrentUser(data);
 
                         deferred.resolve(currentUser);
-                    }, function () {
+                    }, function (err) {
                         //it failed, so they are not logged in
-                        deferred.reject();
+                        deferred.reject(err);
                     });
 
                 return deferred.promise;
@@ -245,7 +255,7 @@ angular.module('umbraco.services')
 
             /** Returns the current user object in a promise  */
             getCurrentUser: function (args) {
-                
+
                 if (!currentUser) {
                     return authResource.getCurrentUser()
                         .then(function (data) {
@@ -260,9 +270,9 @@ angular.module('umbraco.services')
                             setCurrentUser(data);
 
                             return $q.when(currentUser);
-                        }, function () {
+                        }, function (err) {
                             //it failed, so they are not logged in
-                            return $q.reject(currentUser);
+                            return $q.reject(err);
                         });
 
                 }
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js
index 1bda86c3b3..e6450798fb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js
@@ -12,36 +12,23 @@
             { "value": 4, "name": "Inactive", "key": "Inactive", "color": "warning" }
         ];
 
-        localizationService.localizeMany(_.map(userStates, function (userState) {
-            return "user_state" + userState.key;
-        })).then(function (data) {
-            var reg = /^\[[\S\s]*]$/g;
-            _.each(data, function (value, index) {
-                if (!reg.test(value)) {
-                    // Only translate if key exists
-                    userStates[index].name = value;
-                }
+        localizationService.localizeMany(userStates.map(userState => "user_state" + userState.key))
+            .then(data => {
+                var reg = /^\[[\S\s]*]$/g;
+                data.forEach((value, index) => {
+                    if (!reg.test(value)) {
+                        // Only translate if key exists
+                        userStates[index].name = value;
+                    }
+                });
             });
-        });
 
-        function getUserStateFromValue(value) {
-            var foundUserState;
-            angular.forEach(userStates, function (userState) {
-                if(userState.value === value) {
-                    foundUserState = userState;
-                }
-            });
-            return foundUserState;
+        function getUserStateFromValue(value) {        
+            return userStates.find(userState => userState.value === value);
         }
 
         function getUserStateByKey(key) {
-            var foundUserState;
-            angular.forEach(userStates, function (userState) {
-                if(userState.key === key) {
-                    foundUserState = userState;
-                }
-            });
-            return foundUserState;
+            return userStates.find(userState => userState.key === key);           
         }
 
         function getUserStatesFilter(userStatesObject) {
@@ -49,7 +36,7 @@
             var userStatesFilter = [];
 
             for (var key in userStatesObject) {
-                if (userStatesObject.hasOwnProperty(key)) {
+                if (hasOwnProperty.call(userStatesObject, key)) {
                     var userState = getUserStateByKey(key);
                     if(userState) {
                         userState.count = userStatesObject[key];
@@ -59,7 +46,6 @@
             }
 
             return userStatesFilter;
-
         }
 
         ////////////
@@ -71,10 +57,7 @@
         };
 
         return service;
-
     }
 
     angular.module('umbraco.services').factory('usersHelper', usersHelperService);
-
-
 })();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
index 82353df744..1fb5884d4c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
@@ -173,9 +173,9 @@ function umbModelMapper() {
         /** This converts the source model to a basic entity model, it will throw an exception if there isn't enough data to create the model */
         convertToEntityBasic: function (source) {
             var required = ["id", "name", "icon", "parentId", "path"];
-            _.each(required, function (k) {
-                if (!_.has(source, k)) {
-                    throw "The source object does not contain the property " + k;
+            required.forEach(k => {
+                if (!hasOwnProperty.call(source, k)) {
+                    throw `The source object does not contain the property ${k}`;
                 }
             });
             var optional = ["metaData", "key", "alias"];
diff --git a/src/Umbraco.Web.UI.Client/src/install.loader.js b/src/Umbraco.Web.UI.Client/src/install.loader.js
index 997c8cbe84..8c17b8cd64 100644
--- a/src/Umbraco.Web.UI.Client/src/install.loader.js
+++ b/src/Umbraco.Web.UI.Client/src/install.loader.js
@@ -1,6 +1,6 @@
 LazyLoad.js([
     'lib/jquery/jquery.min.js',
-    
+
     'lib/angular/angular.js',
     'lib/angular-cookies/angular-cookies.js',
     'lib/angular-touch/angular-touch.js',
@@ -8,10 +8,14 @@ LazyLoad.js([
     'lib/angular-messages/angular-messages.js',
     'lib/angular-aria/angular-aria.min.js',
     'lib/underscore/underscore-min.js',
-    'lib/angular-ui-sortable/sortable.js', 
+    'lib/angular-ui-sortable/sortable.js',
+
+    'js/utilities.js',
+
     'js/installer.app.js',
     'js/umbraco.directives.js',
     'js/umbraco.installer.js'
+
 ], function () {
     jQuery(document).ready(function () {
         angular.bootstrap(document, ['umbraco']);
diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
index 05c391c3e7..74858d652e 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
@@ -85,12 +85,12 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
     /** Have put this here because we are not referencing our other modules */
 	function safeApply (scope, fn) {
 	    if (scope.$$phase || scope.$root.$$phase) {
-	        if (angular.isFunction(fn)) {
+	        if (Utilities.isFunction(fn)) {
 	            fn();
 	        }
 	    }
 	    else {
-	        if (angular.isFunction(fn)) {
+	        if (Utilities.isFunction(fn)) {
 	            scope.$apply(fn);
 	        }
 	        else {
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js b/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
index 687fce95ae..cbd2bb9242 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
@@ -10,7 +10,7 @@ angular.module("umbraco.install").controller("Umbraco.Installer.DataBaseControll
 		{ name: 'Custom connection string', id: -1 }
 	];
 
-    if (angular.isUndefined(installerService.status.current.model.dbType) || installerService.status.current.model.dbType === null) {
+    if (Utilities.isUndefined(installerService.status.current.model.dbType) || installerService.status.current.model.dbType === null) {
 		installerService.status.current.model.dbType = 0;
 	}
 	
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/database.html b/src/Umbraco.Web.UI.Client/src/installer/steps/database.html
index fc870858cf..ebffc4cf97 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/database.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/database.html
@@ -1,118 +1,121 @@
 <div ng-controller="Umbraco.Installer.DataBaseController">
 
-	<h1>Configure your database</h1>
-	<p>
-		Enter connection and authentication details for the database you want to install Umbraco on
-	</p>
+    <h1>Configure your database</h1>
+    <p>
+        Enter connection and authentication details for the database you want to install Umbraco on
+    </p>
 
-	<form name="myForm" class="form-horizontal" novalidate ng-submit="validateAndForward();">
-		<div class="control-group">
-			<legend>What type of database do you use?</legend>
-			<label class="control-label" for="dbType">Database type</label>
-			<div class="controls">
-                <select id="dbType" name="dbType" ng-options="db.id as db.name for db in dbs" ng-model="installer.current.model.dbType" required></select>
-			</div>
-		</div>
+    <form name="myForm" class="form-horizontal" novalidate ng-submit="validateAndForward();">
+        <div class="control-group">
+            <legend>What type of database do you use?</legend>
+            <label class="control-label" for="dbType">Database type</label>
+            <div class="controls">
+                <select id="dbType" name="dbType"
+                        ng-options="db.id as db.name for db in dbs"
+                        required ng-model="installer.current.model.dbType">
+                </select>
+            </div>
+        </div>
 
-		<div class="controls" ng-if="installer.current.model.dbType == 0">
+        <div class="controls" ng-if="installer.current.model.dbType == 0">
             <p>Great! No need to configure anything, you can simply click the <strong>continue</strong> button below to continue to the next step</p>
-		</div>
+        </div>
 
-		<div ng-if="installer.current.model.dbType < 0">
-			<legend>What is the exact connection string we should use?</legend>
-			<div class="control-group">
-				<label class="control-label" for="server">Connection string</label>
-				  <div class="controls">
-
-					<textarea class="input-block-level" required ng-model="installer.current.model.connectionString" rows="5">
-					</textarea>
-					<small class="inline-help">Enter a valid database connection string.</small>
-				</div>
-			</div>
-		</div>
-
-		<div ng-if="installer.current.model.dbType > 0">
-				<div class="row">
-					<legend>Where do we find your database?</legend>
-					<div class="span6">
-						<div class="control-group">
-							<label class="control-label" for="server">Server</label>
-							<div class="controls">
-								<input type="text" id="server" name="server" placeholder="127.0.0.1\SQLEXPRESS" required ng-model="installer.current.model.server" />
-								<small class="inline-help">Enter server domain or IP</small>
-							</div>
-						</div>
-					</div>
-
-					<div class="span6">
-						<div class="control-group">
-							<label class="control-label" for="databaseName">Database name</label>
-							<div class="controls">
-								<input type="text" id="databaseName" name="installer.current.model.databaseName"
-									placeholder="umbraco-cms"
-									required ng-model="installer.current.model.databaseName"  />
-								<small class="inline-help">Enter the name of the database</small>
-							</div>
-						</div>
-					</div>
-				</div>
-
-				<div class="row">
-					<legend>What credentials are used to access the database?</legend>
-					<div class="span6">
-						<div class="control-group" ng-if="!installer.current.model.integratedAuth">
-							<label class="control-label" for="login">Login</label>
-							<div class="controls">
-								<input type="text" id="login" name="login"
-									placeholder="umbraco-database-user"
-									required ng-model="installer.current.model.login"  />
-								<small class="inline-help">Enter the database user name</small>
-							</div>
-						</div>
-					</div>
-
-					<div class="span6">
-						<div class="control-group" ng-if="!installer.current.model.integratedAuth">
-						<label class="control-label" for="password">Password</label>
-							<div class="controls">
-							<input type="password" id="password" name="password"
-								placeholder="umbraco-cms"
-								required ng-model="installer.current.model.password"  />
-								<small class="inline-help">Enter the database password</small>
-							</div>
-						</div>
-					</div>
-
-					<div class="span12 control-group" ng-if="installer.current.model.dbType == 1">
-						<div class="controls">
-						<label class="checkbox">
-                            <input type="checkbox" id="integratedAuth" name="integratedAuth"
-                                   placeholder="umbraco-cms"
-                                   ng-model="installer.current.model.integratedAuth" /> Use integrated authentication</label>
-						</div>
-					</div>
-			  </div>
-		</div>
-
-		<div class="row">
-			<div class="control-group">
-				<div class="controls">
-                    <input type="submit" ng-disabled="myForm.$invalid || checking" ng-class="{disabled:myForm.$invalid}"
-                           value="Continue" class="btn btn-success" />
-
-						<button class="btn btn-info" ng-click="restart()">Go back</button>
-                    
-					    <span class="inline-help" ng-if="checking" ng-animate="'fade'">
-	                    	Validating your database connection...
-	                    </span>
-
-						<span class="inline-help error" ng-if="invalidDbDns" ng-animate="'fade'">
-							Could not connect to database
-						</span>
+        <div ng-if="installer.current.model.dbType < 0">
+            <legend>What is the exact connection string we should use?</legend>
+            <div class="control-group">
+                <label class="control-label" for="server">Connection string</label>
+                  <div class="controls">
+                    <textarea class="input-block-level" required ng-model="installer.current.model.connectionString" rows="5"></textarea>
+                    <small class="inline-help">Enter a valid database connection string.</small>
                 </div>
-			</div>
-		</div>
+            </div>
+        </div>
 
+        <div ng-if="installer.current.model.dbType > 0">
+            <div class="row">
+                <legend>Where do we find your database?</legend>
+                <div class="span6">
+                    <div class="control-group">
+                        <label class="control-label" for="server">Server</label>
+                        <div class="controls">
+                            <input type="text" id="server" name="server"
+                                   placeholder="{{ installer.current.model.dbType == 3 ? 'umbraco-database.database.windows.net' : '127.0.0.1\\SQLEXPRESS'}}"
+                                   required ng-model="installer.current.model.server" />
+                            <small class="inline-help">Enter server domain or IP</small>
+                        </div>
+                    </div>
+                </div>
 
-	</form>
+                <div class="span6">
+                    <div class="control-group">
+                        <label class="control-label" for="databaseName">Database name</label>
+                        <div class="controls">
+                            <input type="text" id="databaseName" name="installer.current.model.databaseName"
+                                   placeholder="umbraco-cms"
+                                   required ng-model="installer.current.model.databaseName" />
+                            <small class="inline-help">Enter the name of the database</small>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <legend>What credentials are used to access the database?</legend>
+                <div class="span6">
+                    <div class="control-group" ng-if="!installer.current.model.integratedAuth">
+                        <label class="control-label" for="login">Login</label>
+                        <div class="controls">
+                            <input type="text" id="login" name="login"
+                                   placeholder="umbraco-db-user"
+                                   required ng-model="installer.current.model.login" />
+                            <small class="inline-help">Enter the database user name</small>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="span6">
+                    <div class="control-group" ng-if="!installer.current.model.integratedAuth">
+                    <label class="control-label" for="password">Password</label>
+                        <div class="controls">
+                            <input type="password" id="password" name="password"
+                                   placeholder="umbraco-db-password"
+                                   required ng-model="installer.current.model.password" />
+                            <small class="inline-help">Enter the database password</small>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="span12 control-group" ng-if="installer.current.model.dbType == 1">
+                    <div class="controls">
+                        <label class="checkbox">
+                            <input type="checkbox" id="integratedAuth" name="integratedAuth"
+                                   ng-model="installer.current.model.integratedAuth" />
+                            Use integrated authentication
+                        </label>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="control-group">
+                <div class="controls">
+                    <input type="submit" value="Continue" class="btn btn-success"
+                           ng-disabled="myForm.$invalid || checking"
+                           ng-class="{disabled:myForm.$invalid}" />
+
+                    <button class="btn btn-info" ng-click="restart()">Go back</button>
+                
+                    <span class="inline-help" ng-if="checking" ng-animate="'fade'">
+                        Validating your database connection...
+                    </span>
+
+                    <span class="inline-help error" ng-if="invalidDbDns" ng-animate="'fade'">
+                        Could not connect to database
+                    </span>
+                </div>
+            </div>
+        </div>
+    </form>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
index 92f5cc8d9d..d7c21dc4a9 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
@@ -10,13 +10,13 @@
 
     <ul class="thumbnails">
         <li class="span3" ng-repeat="pck in packages">
-            <a ng-click="setPackageAndContinue(pck.id)" class="thumbnail">
+            <button type="button" ng-click="setPackageAndContinue(pck.id)" class="btn-reset thumbnail">
                 <img ng-src="https://our.umbraco.com{{
                         pck.thumbnail
                     }}?width=170"
                      alt="{{ pck.name }}" />
                 <small>Install starter website</small>
-            </a>
+            </button>
         </li>
     </ul>
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/alerts.less b/src/Umbraco.Web.UI.Client/src/less/alerts.less
index 3907b59f58..3539e21064 100644
--- a/src/Umbraco.Web.UI.Client/src/less/alerts.less
+++ b/src/Umbraco.Web.UI.Client/src/less/alerts.less
@@ -7,6 +7,7 @@
 // -------------------------
 
 .alert {
+  position: relative;
   padding: 8px 35px 8px 14px;
   margin-bottom: @baseLineHeight;
   background-color: @warningBackground;
@@ -98,3 +99,29 @@
 .alert-block p + p {
   margin-top: 5px;
 }
+
+
+// Property error alerts
+// -------------------------
+.alert.property-error {
+
+    display: inline-block;
+    font-size: 14px;
+    padding: 6px 16px 6px 12px;
+    margin-bottom: 6px;
+
+    &::after {
+        content:'';
+        position: absolute;
+        bottom:-6px;
+        left: 6px;
+        width: 0;
+        height: 0;
+        border-left: 6px solid transparent;
+        border-right: 6px solid transparent;
+        border-top: 6px solid;
+    }
+    &.alert-error::after {
+        border-top-color: @errorBackground;
+    }
+}
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 9e91da4792..68160923c8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/application/grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/application/grid.less
@@ -171,13 +171,13 @@ body.umb-drawer-is-visible #mainwrapper{
 }
 
 @media (min-width: 1101px) {
-  #contentwrapper, #speechbubble {left: 360px;}
-  .emptySection #contentwrapper {left:0px;}
+  #contentwrapper, #speechbubble { left: 360px; } 
+  .emptySection #contentwrapper { left: 0 !important; }
 }
 
 //empty section modification
-.emptySection #speechbubble {left: 0;}
-.emptySection #navigation {display: none}
+.emptySection #speechbubble { left: 0; }
+.emptySection #navigation { display: none }
 
 .login-only #speechbubble {
     z-index: 10000;
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index f0d7c6f1e1..359c3dd427 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -77,7 +77,6 @@
 @import "main.less";
 @import "listview.less";
 @import "gridview.less";
-@import "filter-toggle.less";
 
 @import "forms/umb-validation-label.less";
 
@@ -144,9 +143,11 @@
 @import "components/umb-property-editor.less";
 @import "components/umb-property-actions.less";
 @import "components/umb-code-snippet.less";
+@import "components/umb-color-picker.less";
 @import "components/umb-color-swatches.less";
 @import "components/check-circle.less";
 @import "components/umb-file-icon.less";
+@import "components/umb-icon.less";
 @import "components/umb-iconpicker.less";
 @import "components/umb-insert-code-box.less";
 @import "components/umb-packages.less";
@@ -172,13 +173,17 @@
 @import "components/umb-textstring.less";
 @import "components/umb-textarea.less";
 @import "components/umb-dropdown.less";
+@import "components/umb-filter.less";
 @import "components/umb-range-slider.less";
 @import "components/umb-number.less";
+@import "components/umb-tags-editor.less";
+@import "components/umb-search-filter.less";
 
 @import "components/buttons/umb-button.less";
 @import "components/buttons/umb-button-group.less";
 @import "components/buttons/umb-toggle.less";
 @import "components/buttons/umb-toggle-group.less";
+@import "components/buttons/umb-button-ellipsis.less";
 
 @import "components/notifications/umb-notifications.less";
 @import "components/umb-file-dropzone.less";
@@ -199,6 +204,19 @@
 @import "components/umbemailmarketing.less";
 
 
+// Property Editors
+@import "../views/components/blockcard/umb-block-card-grid.less";
+@import "../views/components/blockcard/umb-block-card.less";
+@import "../views/components/umb-property-info-button/umb-property-info-button.less";
+@import "../views/propertyeditors/blocklist/umb-block-list-property-editor.less";
+@import "../views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.less";
+@import "../views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.less";
+@import "../views/propertyeditors/notsupported/notsupported.less";
+@import "../views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.less";
+@import "../views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less";
+@import "../views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less";
+
+
 // Utilities
 @import "utilities/layout/_display.less";
 @import "utilities/theme/_opacity.less";
@@ -221,6 +239,7 @@
 
 // Used for prevalue editors
 @import "components/prevalues/multivalues.less";
+@import "../views/prevalueeditors/numberrange.less";
 
 // Dashboards
 @import "dashboards/getstarted.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index 2b50b60ae8..c446a02424 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -336,20 +336,17 @@ input[type="submit"].btn {
 // This is lifted from umb-group-builder.less
 
 .btn-icon {
-    border: none;
-        
+    border: none;      
     font-size: 18px;
     position: relative;
     cursor: pointer;
     color: @ui-icon;
-
     margin: 0;
-    padding: 5px 10px;
+    padding: 3px 5px;
     width: auto;
     overflow: visible;
     background: transparent;
     line-height: normal;
-    outline: 0;
     -webkit-appearance: none;
 
     &:hover {
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 7135692ae8..24d03d01a1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
@@ -192,6 +192,7 @@ body {
 
 #demo-iframe-wrapper {
     transition: all 240ms cubic-bezier(0.165, 0.84, 0.44, 1);
+    flex-shrink:0;
 }
 
 .fullsize {
diff --git a/src/Umbraco.Web.UI.Client/src/less/colors.less b/src/Umbraco.Web.UI.Client/src/less/colors.less
index 4cb70cdf5e..ba4909c997 100644
--- a/src/Umbraco.Web.UI.Client/src/less/colors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/colors.less
@@ -24,7 +24,7 @@
 
 /* Colors based on https://zavoloklom.github.io/material-design-color-palette/colors.html */
 .btn-color-black {background-color: @black;}
-.color-black i { color: @black;}
+.color-black, .color-black i { color: @black !important;}
 
 .btn-color-blue-grey {background-color: @blueGrey;}
 .color-blue-grey, .color-blue-grey i { color: @blueGrey !important;}
@@ -78,4 +78,4 @@
 .color-deep-purple, .color-deep-purple i { color: @deepPurpleIcon !important; }
 
 .btn-color-indigo{background-color: @indigoIcon;}
-.color-indigo, .color-indigo i { color: @indigoIcon !important; }
\ No newline at end of file
+.color-indigo, .color-indigo i { color: @indigoIcon !important; }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
index 4e3741905f..34a339b4c9 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
@@ -24,6 +24,7 @@
 
 .umb-language-picker__expand {
     font-size: 14px;
+    pointer-events: none;
 }
 
 .umb-language-picker__toggle:hover {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-ellipsis.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-ellipsis.less
new file mode 100644
index 0000000000..7104e6478f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-ellipsis.less
@@ -0,0 +1,81 @@
+.umb-button-ellipsis{
+    padding: 0 5px;
+    text-align: center;
+    margin: 0 auto;
+    cursor: pointer;
+    border-radius: @baseBorderRadius;
+    color: @ui-action-discreet-type;
+    position: relative;
+    opacity: 0.8;
+    transition: opacity 120ms, color 120ms;
+
+    &--absolute {
+        position: absolute;
+    }
+
+    &--small {
+        height: 15px;
+    }
+
+    &.show-text {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: center;
+    }
+
+    &:hover {
+        color: @ui-action-discreet-type-hover;
+    }
+
+    .umb-button-ellipsis--tab,
+    .umb-tour-is-visible .umb-tree &,
+    &:hover,
+    &:focus{
+        opacity: 1;
+    }
+
+    &--hidden{
+        opacity: 0;
+
+        &:hover,
+        &:focus {
+            opacity: 1;
+        }
+    }
+
+    &__content {
+        display: flex;
+        flex-wrap: wrap;
+    }
+
+    &__icon {
+        color: inherit;
+        flex-basis: 100%;
+        font-size: 12px;
+
+        .umb-button-ellipsis--tab & {
+            margin: 0 0 7px;
+         }
+
+        .umb-button-ellipsis--small & {
+            font-size: 8px;
+            position: relative;
+            top: -2px;
+        }
+    }
+
+    &__text {
+        color: inherit;
+        font-size: 12px;
+        line-height: 1em;
+        flex-basis: 100%;
+
+        .umb-button-ellipsis--tab & {
+            position: absolute;
+            right: 0;
+            left: 0;
+            bottom: 13px;
+            margin: 0 auto;
+        }
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less
index 02b67460f6..24800c1142 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less
@@ -14,7 +14,7 @@
     display: flex;
 }
 
-.umb-button-group {
+.umb-button-group.-with-button-group-toggle {
 
     .umb-button__button {
         border-radius: @baseBorderRadius 0 0 @baseBorderRadius;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less
index 4127c2201c..b6800aba65 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less
@@ -31,6 +31,11 @@
    margin-left: 5px;
 }
 
+.umb-button__button[disabled] .umb-button__caret {
+    border-top-color: @gray-7;
+    border-bottom-color: @gray-7;
+}
+
 .umb-button__progress {
    position: absolute;
    left: 50%;
@@ -58,6 +63,11 @@
    border-left-color: @white;
 }
 
+.umb-button__progress.-black {
+   border-color: rgba(255, 255, 255, 0.4);
+   border-left-color: @black;
+}
+
 .umb-button__success,
 .umb-button__error {
    position: absolute;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle-group.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle-group.less
index df60c8aed1..83dcc258a4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle-group.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle-group.less
@@ -20,6 +20,12 @@
         justify-content: center;
         flex: 1 1 auto;
         cursor: pointer;
+
+        label {
+          padding: unset;
+          margin: unset;
+          pointer-events: none;
+        }
     }
 
     .umb-toggle-group-item--disabled .umb-toggle-group-item__toggle,
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
index ff4122b258..701af849cc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
@@ -41,9 +41,6 @@
     }
 }
 
-
-
-
 .umb-toggle__handler {
     position: absolute;
     top: 1px;
@@ -59,10 +56,8 @@
         transform: translateX(20px);
         background-color: @white;
     }
-
 }
 
-
 /* Icons */
 
 .umb-toggle__icon {
@@ -78,9 +73,7 @@
     color:@white;
     transition: opacity 120ms;
     opacity: 0;
-    // .umb-toggle:hover & {
-    //     color: @ui-btn-hover;
-    // }
+
     .umb-toggle--checked & {
         opacity: 1;
     }
@@ -93,6 +86,7 @@
     right: 5px;
     color: @ui-btn;
     transition: opacity 120ms;
+
     .umb-toggle--checked & {
         opacity: 0;
     }
@@ -101,23 +95,41 @@
     }
 }
 
-
-
-.umb-toggle.umb-toggle--disabled.umb-toggle--checked,
 .umb-toggle.umb-toggle--disabled {
     .umb-toggle__toggle {
         cursor: not-allowed;
-        background-color: @gray-9;
-        border-color: @gray-9;
     }
-    .umb-toggle__icon--left {
-        color: @gray-6;
+
+    &, &.umb-toggle--checked {
+
+        .umb-toggle__toggle {
+            .umb-toggle__handler {
+                background-color: @gray-10;
+            }
+        }
     }
-    .umb-toggle__icon--right {
-        color: @gray-6;
+
+    &:not(.umb-toggle--checked) {
+        .umb-toggle__toggle {
+            background-color: @gray-8;
+            border-color: @gray-8;
+        }
+
+        .umb-toggle__icon--left,
+        .umb-toggle__icon--right {
+            color: @gray-6;
+        }
     }
-    .umb-toggle__handler {
-        background-color: @gray-10;
+
+    &.umb-toggle--checked {
+        .umb-toggle__toggle {
+            background-color: lighten(@ui-btn, 50%);
+            border-color: lighten(@ui-btn, 50%);
+        }
+        .umb-toggle__icon--left,
+        .umb-toggle__icon--right {
+            color: @gray-9;
+        }
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/card.less b/src/Umbraco.Web.UI.Client/src/less/components/card.less
index 68854e3c53..7174c0f290 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/card.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/card.less
@@ -104,19 +104,18 @@
 	margin: 0 auto;
 	list-style: none;
     width: 100%;
-
 	display: flex;
 	flex-flow: row wrap;
 	justify-content: flex-start;
 }
 
 .umb-card-grid li {
-	overflow: hidden;
 	font-size: 12px;
 	text-align: center;
 	box-sizing: border-box;
 	position: relative;
     width: 100px;
+    margin-bottom: 5px;
 }
 
 .umb-card-grid.-six-in-row li {
@@ -142,32 +141,47 @@
 .umb-card-grid .umb-card-grid-item {
     position: relative;
 	display: block;
-	width: 100%;
-	//height: 100%;
-    padding-top: 100%;
+    width: 100%;
+    height: 100%;
+    padding: 10px 5px;
     border-radius: @baseBorderRadius * 2;
     transition: background-color 120ms;
+    font-size: 13px;
+    line-height: 1.3em;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: flex-start;
 
     > span {
-        position: absolute;
-        top: 10px;
-        bottom: 10px;
-        left: 10px;
-        right: 10px;
+        position: relative;
         display: flex;
         align-items: center;
         justify-content: center;
         flex-direction: column;
         background-color: transparent;
+        word-break: break-word;
     }
 }
 
 
-.umb-card-grid .umb-card-grid-item:hover,
-.umb-card-grid .umb-card-grid-item:focus {
+.umb-card-grid .umb-card-grid-item:hover {
 	background-color: @ui-option-hover;
 	color: @ui-option-type-hover;
 }
+.umb-card-grid .umb-card-grid-item:focus {
+	color: @ui-option-type-hover;
+}
+
+.umb-card-grid .umb-card-grid-item.--creator {
+    > span {
+        border: 2px dashed @ui-action-discreet-border;
+        border-radius: @baseBorderRadius;
+        &:hover {
+            border-color: @ui-action-discreet-border-hover;
+        }
+    }
+}
 
 .umb-card-grid .umb-card-grid-item-slot {
     position: relative;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index ac55c6ffb1..d4069cdd2b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -73,6 +73,11 @@
     height: @editorHeaderHeight;
 }
 
+.umb-editor-header .umb-button__button[disabled] {
+    // do not dim down the background color of disabled buttons in the header
+    background-color: unset;
+}
+
 .umb-editor-header__back {
     background: transparent;
     border: 0;
@@ -135,22 +140,19 @@ input.umb-editor-header__name-input:disabled {
 	margin-left: auto;
 }
 
-a.umb-editor-header__close-split-view {
-    
+.umb-editor-header__close-split-view {
     display: flex;
     justify-content: center;
     align-items: center;
     position: relative;
     height: 69px;
     width: 69px;
-    
-	font-size: 20px;
-	color: @gray-6;
-	text-decoration: none !important;
-}
+    font-size: 20px;
+    color: @gray-6;
 
-a.umb-editor-header__close-split-view:hover {
-	color: @black;
+    &:hover {
+        color: @black;
+    }
 }
 
 .umb-editor-header {
@@ -162,9 +164,7 @@ a.umb-editor-header__close-split-view:hover {
     }
 }
 
-
 // container
-
 .umb-editor-container {
 	position: absolute;
 	top: @editorHeaderHeight;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
index e81df77772..19d6a1306e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
@@ -12,6 +12,7 @@
     .absolute();
     background: @brownGrayLight;
     z-index: @zIndexEditor;
+    max-width: 100%;
 
     &--infiniteMode {
         transform: none;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less
index 8dbc070856..95625d9e73 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less
@@ -50,6 +50,19 @@ button.umb-variant-switcher__toggle {
             font-weight: bold;
             background-color: @errorBackground;
             color: @errorText;
+
+            animation-duration: 1.4s;
+            animation-iteration-count: infinite;
+            animation-name: umb-variant-switcher__toggle--badge-bounce;
+            animation-timing-function: ease;
+            @keyframes umb-variant-switcher__toggle--badge-bounce {
+                0%   { transform: translateY(0); }
+                20%  { transform: translateY(-6px); }
+                40%  { transform: translateY(0); }
+                55%  { transform: translateY(-3px); }
+                70%  { transform: translateY(0); }
+                100% { transform: translateY(0); }
+            }
         }
     }
 }
@@ -77,6 +90,7 @@ button.umb-variant-switcher__toggle {
 	align-items: center;
 	border-bottom: 1px solid @gray-9;
     position: relative;
+
     .umb-variant-switcher__name-wrapper:hover {
         .umb-variant-switcher__name {
             color: @blueMid;
@@ -86,6 +100,11 @@ button.umb-variant-switcher__toggle {
         }
     }
 }
+
+.umb-variant-switcher__item.--not-allowed:not(.--current) .umb-variant-switcher__name-wrapper:hover {
+    cursor: default;
+}
+
 .umb-variant-switcher__item.--state-notCreated:not(.--active) {
     .umb-variant-switcher__name-wrapper::before {
         content: "+";
@@ -93,38 +112,44 @@ button.umb-variant-switcher__toggle {
         float: left;
         font-size: 15px;
         font-weight: 900;
-        padding: 8px 16px 8px 6px;
+        padding: 8px 12px 8px 0;
         color: @gray-5;
     }
+
     .umb-variant-switcher__item-expand-button + .umb-variant-switcher__name-wrapper::before {
         padding: 8px 16px 8px 20px;
     }
+
     .umb-variant-switcher__name {
         color: @gray-5;
     }
+
     .umb-variant-switcher__state {
         color: @gray-6;
     }
+
     .umb-variant-switcher__name-wrapper::after {
         content: "";
         position: absolute;
         z-index: 1;
-        border: 1px dashed @gray-9;
-        top: 7px;
-        bottom: 7px;
-        left: 7px;
-        right: 7px;
-        border-radius: 3px;
+        border: 2px dashed @gray-9;
+        margin: 2px;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
         pointer-events: none;
     }
-    
+
     .umb-variant-switcher__name-wrapper:hover {
         &::before {
             color: @blueMid;
         }
+
         .umb-variant-switcher__name {
             color: @blueMid;
         }
+
         .umb-variant-switcher__state {
             color: @blueMid;
         }
@@ -170,8 +195,11 @@ button.umb-variant-switcher__toggle {
 }
 
 .umb-variant-switcher__item.--current {
-    //color: @ui-light-active-type;
+    color: @ui-light-active-type;
     //background-color: @pinkExtraLight;
+    .umb-variant-switcher__name-wrapper {
+        border-left: 4px solid @ui-active;
+    }
     .umb-variant-switcher__name {
         //color: @ui-light-active-type;
         font-weight: 700;
@@ -203,7 +231,7 @@ button.umb-variant-switcher__toggle {
 .umb-variant-switcher__item:focus-within .umb-variant-switcher__split-view,
 .umb-variant-switcher__item:hover .umb-variant-switcher__split-view,
 .umb-variant-switcher__split-view:focus {
-	display: block;
+	display: flex;
 	cursor: pointer;
 }
 
@@ -226,6 +254,19 @@ button.umb-variant-switcher__toggle {
             font-weight: bold;
             background-color: @errorBackground;
             color: @errorText;
+            
+            animation-duration: 1.4s;
+            animation-iteration-count: infinite;
+            animation-name: umb-variant-switcher__name--badge-bounce;
+            animation-timing-function: ease;
+            @keyframes umb-variant-switcher__name--badge-bounce {
+                0%   { transform: translateY(0); }
+                20%  { transform: translateY(-6px); }
+                40%  { transform: translateY(0); }
+                55%  { transform: translateY(-3px); }
+                70%  { transform: translateY(0); }
+                100% { transform: translateY(0); }
+            }
         }
     }
 }
@@ -237,7 +278,10 @@ button.umb-variant-switcher__toggle {
 	cursor: pointer;
     background-color: transparent;
     border: none;
+	padding-top: 6px !important;
+    padding-bottom: 6px !important;
 }
+
 .dropdown-menu>li {
     > .umb-variant-switcher__name-wrapper {
         padding-top: 10px;
@@ -264,7 +308,7 @@ button.umb-variant-switcher__toggle {
 .umb-variant-switcher__split-view {
     font-size: 12px;
     display: none;
-    padding: 20px 20px;
+    padding: 16px 20px;
     position: absolute;
     right: 0;
     top: 0;
@@ -277,7 +321,6 @@ button.umb-variant-switcher__toggle {
     }
 }
 
-
 .umb-variant-switcher__sub-variants {
 
     position: relative;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
index 2a8137e5f9..ea08794c23 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
@@ -10,11 +10,12 @@
     font-weight: bold;
     display: flex;
     align-items: center;
-    cursor: pointer;
     justify-content: space-between;
     color: @black;
+    width: 100%;
 
-    &:hover .umb-expansion-panel__expand {
+    &:hover .umb-expansion-panel__expand,
+    &:focus .umb-expansion-panel__expand {
         color: @gray-6;
     }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-group-panel.less b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-group-panel.less
index 15f85e1c77..76c0c55fca 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-group-panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-group-panel.less
@@ -8,11 +8,11 @@
 .umb-group-panel__header {
     padding: 12px 20px;
     font-weight: bold;
-    font-size: 16px;
+    font-size: 14px;
     display: flex;
     align-items: center;
     justify-content: space-between;
-    color: @grayDark;
+    color: @grayDarker;
     border-bottom: 1px solid @gray-9;
 }
 
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 381157c8bc..035bf02f91 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
@@ -106,7 +106,6 @@
     height: auto;
     top: 50%;
     left: 50%;
-    transform: translate(-50%, 0);
     transform: translate(-50%, -50%);
     border-radius: @baseBorderRadius;
 }
@@ -128,10 +127,15 @@
     width: 400px;
     max-height: 100vh;
     box-sizing: border-box;
+    visibility: hidden;
     border-radius: @baseBorderRadius;
 
+    &.umb-overlay--small {
+        width: 420px;
+    }
+
     &.umb-overlay--medium {
-        width: 480px;
+        width: 520px;
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less b/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less
index 7036d60a63..6cdc5b1c99 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less
@@ -6,7 +6,7 @@
         width: 500px;
     }
 
-    p{
+    p {
         margin: 7px 0;
     }
 }
@@ -23,21 +23,18 @@
     align-items: center;
 }
 
-.umb-prevalues-multivalues__add  {
+.umb-prevalues-multivalues__add {
     display: flex;
-}
 
-.umb-prevalues-multivalues__add input {
-    width: 320px;
-}
+    input {
+        display: flex;
+        width: 320px;
+    }
 
-.umb-prevalues-multivalues__add input {
-    display: flex;
-}
-
-.umb-prevalues-multivalues__add button {
-    margin: 0 6px 0 0;
-    margin-left: auto;
+    button {
+        margin: 0 6px 0 0;
+        margin-left: auto;
+    }
 }
 
 .umb-prevalues-multivalues__listitem {
@@ -45,20 +42,26 @@
     padding: 6px;
     margin: 10px 0px !important;
     background: @gray-10;
-    cursor: move;
-}
 
-.umb-prevalues-multivalues__listitem i {
-    display: flex;
-    align-items: center;
-    margin-right: 5px
-}
+    &.ui-sortable-handle,
+    .ui-sortable-handle,
+    .handle
+    {
+        cursor: move;
+    }
 
-.umb-prevalues-multivalues__listitem a {
-    cursor: pointer;
-    margin-left: auto;
-}
+    i {
+        display: flex;
+        align-items: center;
+        margin-right: 5px
+    }
 
-.umb-prevalues-multivalues__listitem input {
-    width: 295px;
+    a {
+        cursor: pointer;
+        margin-left: auto;
+    }
+
+    input {
+        width: 295px;
+    }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
index 4a483ce3f0..97caf66497 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
@@ -17,8 +17,9 @@
 .umb-tree-item__arrow {
     position: relative;
     margin-left: -16px;
-    width: 16px;
-    height: 16px;
+    margin-right: 4px;
+    width: 12px;
+    height: 12px;
     visibility: hidden;
     text-decoration: none;
     font-size: 12px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-root.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-root.less
index a3529d5504..ba33883b08 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-root.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-root.less
@@ -1,5 +1,7 @@
-.umb-tree-root {    
+.umb-tree-root {
     
+    border: 2px solid transparent;
+
     &-link {
         display: flex;
         align-items: center;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index 839e61c5f9..a39a38fbde 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -15,6 +15,16 @@
         text-decoration: none;
     }
 
+    .umb-tree-item__arrow {
+        visibility: hidden;
+        text-decoration: none;
+        font-size: 12px;
+        transition: color 120ms;
+
+        &:hover {
+            color: @ui-option-type-hover;
+        }
+    }
     i.noSpr {
         display: inline-block;
         margin-top: 1px;
@@ -38,6 +48,8 @@
         color: @gray-7;
         display: block;
         padding-left: 35px;
+        white-space: initial;
+        text-align: left;
     }
 }
 
@@ -75,8 +87,8 @@ body.touch .umb-tree {
     
     &:hover {
         background: @ui-option-hover;
-        
         color: @ui-option-type-hover;
+
         a {
             color: @ui-option-type-hover;
         }
@@ -85,12 +97,14 @@ body.touch .umb-tree {
             position: relative;
             width: auto;
             height: auto;
-            margin: 0 10px 0 auto;
-            padding: 9px 5px;
             overflow: visible;
             clip: auto;
         }
-        
+
+        .umb-button-ellipsis--hidden {
+            opacity: 1;
+        }
+         
         .umb-tree-icon {
             color: @ui-option-type-hover;
         }
@@ -119,7 +133,6 @@ body.touch .umb-tree {
 .umb-tree .umb-search-group {
     position: inherit;
     display: inherit;
-
     list-style: none;
 
     h6 {
@@ -142,6 +155,18 @@ body.touch .umb-tree {
 
         &-link {
             display: block;
+            width: 100%;
+            text-align: left;
+        }
+
+        &-name {
+            display: flex;
+
+            &__text { 
+                margin: 1px 0 0;
+                overflow:hidden;
+                text-overflow: ellipsis;
+            }
         }
     }
 
@@ -156,7 +181,9 @@ body.touch .umb-tree {
 .umb-tree .umb-tree-node-checked > .umb-tree-item__inner > i[class^="icon-"],
 .umb-tree .umb-tree-node-checked > .umb-tree-item__inner > i[class*=" icon-"],
 .umb-tree .umb-tree-node-checked .umb-search-group-item-name > i[class^="icon-"],
-.umb-tree .umb-tree-node-checked .umb-search-group-item-name > i[class*=" icon-"] {
+.umb-tree .umb-tree-node-checked .umb-search-group-item-name > i[class*=" icon-"], 
+.umb-tree .umb-tree-node-checked > i[class^="icon-"],
+.umb-tree .umb-tree-node-checked > i[class*="icon-"] {
     font-family: 'icomoon' !important;
     color: @green !important;
 
@@ -171,11 +198,15 @@ body.touch .umb-tree {
     display: flex;
     flex: 0 0 auto;
     justify-content: flex-end;
-    padding: 9px 5px;
     text-align: center;
     margin: 0 10px 0 auto;
     cursor: pointer;
     border-radius: @baseBorderRadius;
+    transition: background-color 120ms;
+
+    .umb-button-ellipsis {
+        padding: 3px 5px;
+    }
 
     i {
         height: 5px !important;
@@ -184,18 +215,20 @@ body.touch .umb-tree {
         display: inline-block;
         margin: 0 2px 0 0;
         background: @ui-active-type;
-        
+
         &:last-child {
             margin: 0;
         }
     }
+
     &:hover {
-        background: rgba(255, 255, 255, .5);
+        background-color: rgba(255, 255, 255, .8);
+
         i {
             background: @ui-active-type-hover;
         }
     }
-    
+
     // NOTE - We're having to repeat ourselves here due to an .sr-only class appearing in umbraco/lib/font-awesome/css/font-awesome.min.css
     &.sr-only--hoverable:hover,
     &.sr-only--focusable:focus {
@@ -203,9 +236,9 @@ body.touch .umb-tree {
         display: flex;
         flex: 0 0 auto;
         justify-content: flex-end;
-        padding: 9px 5px;
+        padding: 7px 5px;
         text-align: center;
-        margin: 0 10px 0 auto;
+        margin: 0 auto;
         cursor: pointer;
         border-radius: 3px;
     }
@@ -229,6 +262,7 @@ body.touch .umb-tree {
     > .umb-tree-item__inner > i.icon,
     > .umb-tree-item__inner > a {
         cursor: not-allowed;
+        opacity: 0.4;
     }
 }
 
@@ -306,9 +340,13 @@ body.touch .umb-tree {
 .umb-tree-icon { 
     vertical-align: middle;
     margin: 0 13px 0 0;
-    //color: @gray-1;
     color: @ui-option-type;
-    font-size: 20px;   
+    font-size: 20px;
+
+    &.-hidden {
+        display: none;
+        visibility: hidden;
+    }
     
     &.blue {
         color: @blue;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less
index 9a18bef2de..18294f9e59 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less
@@ -8,35 +8,88 @@
     border-radius: 100px;
 }
 
+.umb-badge__count {
+    display: flex;
+    width: 1rem;
+    height: 1rem;
+    line-height: 1;
+    justify-content: center;
+    align-items: center;
+    border-radius: 50%;
+    font-size: 12px;
+}
+
 // Colors
 .umb-badge--primary {
     background-color: @blueDark;
     color: @white;
+
+    .umb-badge__count {
+        background-color: darken(@blueDark, 5%);
+    }
 }
 
 .umb-badge--secondary {
     background-color: @blueExtraDark;
     color: @white;
+
+    .umb-badge__count {
+        background-color: darken(@blueExtraDark, 8%);
+    }
 }
 
 .umb-badge--gray {
     background-color: @sand-2;
     color: @blueDark;
+
+    .umb-badge__count {
+        background-color: darken(@sand-2, 8%);
+    }
 }
 
 .umb-badge--danger {
     background-color: @red;
     color: @white;
+
+    .umb-badge__count {
+        background-color: darken(@red, 8%);
+    }
+}
+
+.umb-badge--info {
+    background-color: @blue;
+    color: @white;
+
+    .umb-badge__count {
+        background-color: darken(@blue, 8%);
+    }
 }
 
 .umb-badge--warning {
     background-color: @orange;
     color: @white;
+
+    .umb-badge__count {
+        background-color: darken(@orange, 8%);
+    }
 }
 
 .umb-badge--success {
     background-color: @green;
     color: @white;
+
+    .umb-badge__count {
+        background-color: darken(@green, 8%);
+    }
+}
+
+.umb-badge--dark {
+    background-color: @grayDark;
+    color: @white;
+
+    .umb-badge__count {
+        background-color: darken(@grayDark, 8%);
+    }
 }
 
 // Size
@@ -46,7 +99,8 @@
 }
 
 .umb-badge--xs {
-    font-size: 13px;
+    font-size: 12px;
+    font-weight: 600;
     padding: 1px 10px;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-checkbox-list.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-checkbox-list.less
index 11194eeb43..c9f47a66df 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-checkbox-list.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-checkbox-list.less
@@ -37,6 +37,7 @@
   align-items: center;
   flex: 0 0 30px;
   margin-right: 5px;
+  position: relative;
 }
 
 .umb-checkbox-list__item-icon {
@@ -44,6 +45,17 @@
   font-size: 16px;
 }
 
+.umb-checkbox-list__item-icon-wrapper {
+  position: relative;
+
+  .umb-button__progress {
+    width: 10px;
+    height: 10px;
+    margin-left: -10px;
+    margin-top: -8px;
+  }
+}
+
 .umb-checkbox-list__item-text {
   font-size: 14px;
   margin-bottom: 0;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-checkmark.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-checkmark.less
index f82e47bf88..6ab6169eec 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-checkmark.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-checkmark.less
@@ -17,10 +17,21 @@
     }
 }
 
+.umb-checkmark__action {
+    &:hover,
+    &:focus {
+        .umb-checkmark {
+            border-color:@ui-action-discreet-border-hover;
+            color: @ui-selected-type-hover;
+        }
+    }
+}
+
 .umb-checkmark--checked {
     background: @ui-selected-border;
     border-color: @ui-selected-border;
     color: @white;
+
     &:hover {
         background: @ui-selected-border-hover;
         border-color: @ui-selected-border-hover;
@@ -28,6 +39,17 @@
     }
 }
 
+.umb-checkmark__action {
+    &:hover,
+    &:focus {
+        .umb-checkmark--checked {
+            background: @ui-selected-border-hover;
+            border-color: @ui-selected-border-hover;
+            color: @white;
+        }
+    }
+}
+
 .umb-checkmark--xs {
     width: 20px;
     height: 20px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-code-snippet.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-code-snippet.less
index b372841910..96b4fc08c8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-code-snippet.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-code-snippet.less
@@ -18,6 +18,7 @@
             justify-content: flex-start;
             flex-grow: 1;
             padding: 2px 10px;
+            text-transform: uppercase;
         }
 
         button {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-color-picker.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-color-picker.less
new file mode 100644
index 0000000000..21439efeca
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-color-picker.less
@@ -0,0 +1,21 @@
+.umb-color-picker {
+
+    .sp-replacer {
+        display: inline-flex;
+        margin-right: 18px;
+        height: 32px;
+
+        &.sp-light {
+            background-color: @white; 
+        }
+
+        .sp-preview {
+            margin: 5px;
+            height: auto;
+        }
+
+        .sp-dd {
+            line-height: 2rem;
+        }
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
index f972633bf4..112194f012 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
@@ -13,19 +13,6 @@
     left: 0;
     animation: fadeInUp 0.2s;
     flex-direction: column;
-
-    .umb_confirm-action__overlay-action {
-        margin-bottom: 5px;
-    }
-
-    .umb_confirm-action__overlay-action.-confirm {
-        order: 1;
-    }
-
-    .umb_confirm-action__overlay-action.-cancel {
-        order: 2;
-    }
-
 }
 
 .umb_confirm-action__overlay.-right {
@@ -35,18 +22,6 @@
     left: auto;
     animation: fadeInLeft 0.2s;
     flex-direction: row;
-
-    .umb_confirm-action__overlay-action {
-        margin-left: 5px;
-    }
-
-    .umb_confirm-action__overlay-action.-confirm {
-        order: 2;
-    }
-
-    .umb_confirm-action__overlay-action.-cancel {
-        order: 1;
-    }
 }
 
 .umb_confirm-action__overlay.-bottom {
@@ -56,18 +31,6 @@
     left: 0;
     animation: fadeInDown 0.2s;
     flex-direction: column;
-
-    .umb_confirm-action__overlay-action {
-        margin-top: 5px;
-    }
-
-    .umb_confirm-action__overlay-action.-confirm {
-        order: 2;
-    }
-
-    .umb_confirm-action__overlay-action.-cancel {
-        order: 1;
-    }
 }
 
 .umb_confirm-action__overlay.-left {
@@ -77,55 +40,59 @@
     left: -50px;
     animation: fadeInRight 0.2s;
     flex-direction: row;
+}
+
+.umb_confirm-action__overlay {
 
     .umb_confirm-action__overlay-action {
         margin-right: 5px;
+
+        &.-confirm {
+            order: 1;
+        }
+
+        &.-cancel {
+            order: 2;
+        }
     }
 
-    .umb_confirm-action__overlay-action.-confirm {
-        order: 1;
-    }
+    // BUTTONS
+    .umb_confirm-action__overlay-action {
+        width: 20px;
+        height: 20px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: @white;
+        border-radius: 40px;
+        box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26);
+        font-size: 18px;
+        cursor: pointer;
+        user-select: none;
 
-    .umb_confirm-action__overlay-action.-cancel {
-        order: 2;
+        &:hover {
+            text-decoration: none;
+            color: @white;
+        }
+
+        // confirm button
+        &.-confirm {
+            background: @white;
+            color: @green !important;
+
+            &:hover {
+                color: @green !important;
+            }
+        }
+
+        // cancel button
+        &.-cancel {
+            background: @white;
+            color: @red !important;
+
+            &:hover {
+                color: @red !important;
+            }
+        }
     }
 }
-
-// BUTTONS
-.umb_confirm-action__overlay-action {
-  width: 20px;
-  height: 20px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: @white;
-  border-radius: 40px;
-  box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26);
-  font-size: 18px;
-  cursor: pointer;
-}
-
-.umb_confirm-action__overlay-action:hover {
-  text-decoration: none;
-  color: @white;
-}
-
-// confirm button
-.umb_confirm-action__overlay-action.-confirm {
-  background: @white;
-  color: @green !important;
-}
-
-.umb_confirm-action__overlay-action.-confirm:hover {
-    color: @green !important;
-}
-
-// cancel button
-.umb_confirm-action__overlay-action.-cancel {
-  background: @white;
-  color: @red !important;
-}
-
-.umb_confirm-action__overlay-action.-cancel:hover {
-    color: @red !important;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-date-time-picker.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-date-time-picker.less
index 5bcfdd1c71..b8084bc435 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-date-time-picker.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-date-time-picker.less
@@ -3,23 +3,28 @@
     box-shadow: 0 5px 10px 0 rgba(0,0,0,0.16);
 }
 
-span.flatpickr-day {
+.flatpickr-day {
     border-radius: @baseBorderRadius;
     border: none;
 
     &.today:not(.active) {
         border: 1px solid;
     }
-}
 
-span.flatpickr-day:hover {
-    background-color: @gray-10;
-}
+    &:hover {
+        background-color: @gray-10;
+    }
 
-span.flatpickr-day.selected {
-    background-color: @ui-selected;
-}
+    &.selected, &.startRange, &.endRange {
+        background-color: @ui-selected-type !important;
+        border-color: @ui-selected-type !important;
 
-span.flatpickr-day.selected:hover {
-    background-color: @ui-selected-hover;
+        &:hover {
+            background-color: @ui-selected-type-hover !important;
+        }
+
+        &.startRange + .endRange:not(:nth-child(7n+1)) {
+            box-shadow: -10px 0 0 @ui-selected-type !important;
+        }
+    }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
index f3c41dbc33..5e9772fb26 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
@@ -20,12 +20,18 @@
         justify-content: center;
         height: calc(~'@{editorHeaderHeight}'- ~'1px'); // need to offset the 1px border-bottom on .umb-editor-header - avoids overflowing top of the container
         color: @ui-active-type;
+        user-select: none;
 
         &:hover {
             color: @ui-active-type-hover  !important;
             text-decoration: none;
         }
 
+        &:disabled {
+            pointer-events: none;
+            color: @gray-6;
+        }
+
         &::before {
             content: "";
             position: absolute;
@@ -40,13 +46,46 @@
         }
 
         &.is-active {
-            color: @ui-light-active-type;
+            color: @ui-light-active-type !important;
 
             &::before {
                 opacity: 1;
                 height: 4px;
             }
         }
+
+        // Validation
+        .show-validation &.-has-error {
+            color: @red;
+
+            &:hover {
+                color: @red !important;
+            }
+
+            &::before {
+                background-color: @red;
+            }
+
+            &:not(.is-active) {
+                .badge {
+                    animation-duration: 1.4s;
+                    animation-iteration-count: infinite;
+                    animation-name: umb-sub-views-nav-item--badge-bounce;
+                    animation-timing-function: ease;
+                    @keyframes umb-sub-views-nav-item--badge-bounce {
+                        0%   { transform: translateY(0); }
+                        20%  { transform: translateY(-6px); }
+                        40%  { transform: translateY(0); }
+                        55%  { transform: translateY(-3px); }
+                        70%  { transform: translateY(0); }
+                        100% { transform: translateY(0); }
+                    }
+                }
+                .badge.--error-badge {
+                    display: block;
+                }
+            }
+        }
     }
 
     &__action:active,
@@ -54,8 +93,8 @@
         .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
     }
 
-    &:focus-within &__anchor_dropdown,
-    &:hover &__anchor_dropdown {
+    & > &__anchor_dropdown.is-expanded,
+    &:hover > &__anchor_dropdown {
         visibility: visible;
         opacity: 1;
         transition: opacity 20ms 0;
@@ -95,6 +134,10 @@
             height: 12px;
             min-width: 12px;
         }
+        &.--error-badge {
+            display: none;
+            font-weight: 900;
+        }
     }
 
     &-text {
@@ -176,13 +219,3 @@
         }
     }
 }
-
-// Validation
-.show-validation .umb-sub-views-nav-item__action.-has-error,
-.show-validation .umb-sub-views-nav-item > a.-has-error {
-    color: @red;
-
-    &::before {
-        background-color: @red;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-filter.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-filter.less
new file mode 100644
index 0000000000..7432555472
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-filter.less
@@ -0,0 +1,13 @@
+.umb-filter {
+    position: relative;
+}
+
+.umb-filter .umb-filter__toggle {
+    display: flex;
+}
+
+.umb-filter .umb-filter__label {
+    margin-left: 5px;
+    margin-right: 3px;
+    max-width: 150px;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
index 8a24d948ac..a96c59de84 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
@@ -1,25 +1,18 @@
 @checkboxWidth: 18px;
 @checkboxHeight: 18px;
-label.umb-form-check--checkbox{
-    margin:3px 0;
-}
 
 .umb-form-check {
     display: flex;
+    align-items: center;
     position: relative;
-    padding-left: 0px;
-    margin: 0;
-    min-height: 22px;
+    padding-left: 0;
+    margin: 5px 0;
+    min-height: 20px;
     cursor: pointer !important;
 
-    .umb-form-check__symbol {
-        margin-top: 4px;
-        margin-right: 10px;
-    }
     .umb-form-check__info {
-        margin-left:20px;
+        margin-left: 30px;
         position: relative;
-        top: 3px;
     }
     
 
@@ -84,7 +77,6 @@ label.umb-form-check--checkbox{
     }
 
     .tabbing-active &.umb-form-check--radiobutton &__input:focus ~ .umb-form-check__state .umb-form-check__check {
-        //outline: 2px solid @inputBorderTabFocus;
         border: 2px solid @inputBorderTabFocus;
         margin: -1px;
     }
@@ -102,13 +94,14 @@ label.umb-form-check--checkbox{
 
     &__state {
         display: flex;
-        height: 18px;
+        height: 20px;
+        width: 20px;
         position: absolute;
-        margin-top: 2px;
         top: 0;
-        left: -1px;
+
     }
 
+
     &__check {
         display: flex;
         position: relative;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
index 26d61412ae..3b084c9905 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -392,7 +392,7 @@
 // EDITOR PLACEHOLDER
 // -------------------------
 .umb-grid .umb-editor-placeholder {
-    min-height: 65px;
+    min-height: 110px;
     padding: 20px;
     padding-bottom: 30px;
     position: relative;
@@ -400,7 +400,7 @@
     border: 4px dashed @gray-8;
     text-align: center;
     text-align: -moz-center;
-    cursor: pointer;
+    width: 100%;
 }
 
 .umb-grid .umb-editor-placeholder i {
@@ -413,6 +413,7 @@
 
 .umb-grid .umb-editor-preview {
     position: relative;
+    width: 100%;
 
     .umb-editor-preview-overlay {
         cursor: pointer;
@@ -474,9 +475,19 @@
     }
 }
 
+// Control states 
+.umb-grid-media--controls {
+    display:none;
+    position: absolute;
+    top:0.5rem;
+    right:0.5rem;    
+}
 
-
-
+.umb-grid .umb-row .umb-control.-active {
+    .umb-grid-media--controls {
+        display:flex;
+    }
+}
 
 // Title bar and tools
 .umb-grid .umb-row-title-bar {
@@ -596,9 +607,10 @@
 }
 
 .umb-grid .iconBox i {
-    font-size: 16px !important;
-    color: @gray-3 ;
+    color: @gray-3;
     display: block;
+    font-size: 16px;
+    line-height: inherit;
 }
 
 .umb-grid .help-text {
@@ -609,8 +621,6 @@
     clear: both;
 }
 
-
-
 // TINYMCE EDITOR
 // -------------------------
 
@@ -751,9 +761,19 @@
     margin-right: 5px;
     position: relative;
     cursor: pointer;
-    display:inline-block;
+    display: inline-block;
 }
 
+.umb-grid .cell-tools,
+.umb-grid .umb-control-tool {
+    .btn-icon {
+        padding: 0;
+    }
+}
+
+.umb-grid .umb-control-tool .btn-icon {
+    color: @white;
+}
 
 
 // Template
@@ -820,7 +840,6 @@
             position: absolute;
             width: 100%;
             left: 0;
-            bottom: -25px;
             padding-top: 15px;
         }
 
@@ -1007,8 +1026,6 @@
     display: block;
 }
 
-
-
 // Configuration specific styles
 // -------------------------
 .umb-grid-configuration .umb-templates {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
index 6eded29b8b..87e46f5d85 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
@@ -347,23 +347,20 @@ input.umb-group-builder__group-title-input:disabled:hover {
 .umb-group-builder__property-actions {
     flex: 0 0 44px;
     display: flex;
-    align-items: center;
+    align-items: flex-start;
     justify-content: flex-end;
 }
 
 .umb-group-builder__property-action {
-    
     position: relative;
     margin: 5px 0;
     
-    > button {
+    button.btn-icon {
         border: none;
-        
         font-size: 18px;
         position: relative;
         cursor: pointer;
         color: @ui-icon;
-        
         margin: 0;
         padding: 5px 10px;
         width: auto;
@@ -399,18 +396,21 @@ input.umb-group-builder__group-title-input:disabled:hover {
     padding: 0 4px;
     display: flex;
     border-radius: 3px;
-}
+    align-items: center;
 
-.umb-group-builder__property-tag:first-child {
-    margin-left: 0;
-}
+    &:first-child {
+        margin-left: 0;
+    }
 
-.umb-group-builder__property-tag.-white {
-    background-color: @white;
+    &.-white {
+        background-color: @white;
+    }
 }
 
 .umb-group-builder__property-tag-icon {
     margin-right: 3px;
+    display: flex;
+    align-items: center;
 }
 
 /* ---------- SORTABLE ---------- */
@@ -513,17 +513,14 @@ input.umb-group-builder__group-sort-value {
         display: flex;
         align-items: center;
         align-content: stretch;
-
         min-height: 80px;
-
         border: 1px solid @gray-9;
         color: @ui-action-discreet-type;
         border-radius: @baseBorderRadius;
-
     }
 
     .editor-info {
-        flex: 1 0 auto;
+        flex: 1 1 auto;
         text-align: left;
         display: flex;
         align-items: center;
@@ -537,6 +534,9 @@ input.umb-group-builder__group-sort-value {
     }
 
     .editor-icon-wrapper {
+        display: flex;
+        justify-content: center;
+        align-items: center;
         width: 60px;
         height: 60px;
         text-align: center;
@@ -548,12 +548,12 @@ input.umb-group-builder__group-sort-value {
             font-size: 32px;
         }
     }
-    
+
     .editor-details {
         flex: 1 1 auto;
         margin-top: 10px;
         margin-bottom: 10px;
-        
+
         .editor-name {
             display: block;
             font-weight: bold;
@@ -570,9 +570,9 @@ input.umb-group-builder__group-sort-value {
         width: 48px;
         height: 48px;
         font-size: 18px;
-        
         min-height: 80px;
         color: @ui-action-discreet-type;
+
         &:hover {
             color: @ui-action-discreet-type-hover;
             background-color: @ui-action-discreet-hover;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-icon.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-icon.less
new file mode 100644
index 0000000000..318ce0a563
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-icon.less
@@ -0,0 +1,33 @@
+.umb-icon {
+    display: inline-block;
+    width: 1em;
+    height: 1em;
+    flex-shrink: 0;
+
+    svg {
+        width: 100%;
+        height: 100%;
+        fill: currentColor;
+    }
+
+    &.large{
+        width: 32px; 
+        height: 32px;
+    }
+    &.medium{
+        width: 24px;
+        height: 24px;
+    }
+    &.small{
+        width: 14px;
+        height: 14px;
+    }
+
+    &:before, &:after {
+        content: none !important;
+    }
+
+    > i {
+        font-family: inherit;
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less
index 98b2b1d72d..5062aae660 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less
@@ -26,6 +26,11 @@
     padding: 15px 0;
     text-decoration: none;
     border-radius: 3px;
+    background: none;
+    background: none;
+	border: none;
+    cursor: pointer;
+    color: currentColor;
 }
 
 .umb-iconpicker-item button:hover,
@@ -41,6 +46,13 @@
     box-sizing: border-box;
 }
 
+.umb-iconpicker-svg svg {
+    display: block;
+    width: 30px;
+    height: 30px;
+    fill: currentColor;
+}
+
 .umb-iconpicker-item button:active {
     background: @gray-10;
 }
@@ -49,26 +61,25 @@
     font-size: 30px;
 }
 
-
 // Color swatch
  .button {
-        border: none;
-        color: @white;
-        padding: 5px;
-        text-align: center;
-        text-decoration: none;
-        display: inline-block;
-        margin: 5px;
-        border-radius: 3px;
-    }
+    border: none;
+    color: @white;
+    padding: 5px;
+    text-align: center;
+    text-decoration: none;
+    display: inline-block;
+    margin: 5px;
+    border-radius: 3px;
+}
 
-    // Circle behind the checkmark
-    i.small.active{
-        font-size: 14px;
-        display: inline-block;
-        width: 20px;
-        height: 20px;
-        border-radius: 50%;
-        background-color: rgba(0,0,0,.15);
-        float: right;
-    }
+// Circle behind the checkmark
+i.small.active{
+    font-size: 14px;
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    border-radius: 50%;
+    background-color: rgba(0,0,0,.15);
+    float: right;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-insert-code-box.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-insert-code-box.less
index f3b53f4def..006dae09dc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-insert-code-box.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-insert-code-box.less
@@ -8,20 +8,20 @@
     padding: 15px 20px;
     margin-bottom: 10px;
     border-radius: 3px;
-    cursor: pointer;
+    text-align: left;
 }
 
 .umb-insert-code-box:hover,
 .umb-insert-code-box.-selected {
     background-color: @ui-option-hover;
     color: @ui-action-type-hover;
-    //border-color: @ui-action-border-hover;
 }
 
 .umb-insert-code-box__title {
     font-size: 15px;
     margin-bottom: 5px;
     font-weight: bold;
+    line-height: 1;
 }
 
 .umb-insert-code-box__description {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-list.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-list.less
index 44955e8f8e..57ba73305a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-list.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-list.less
@@ -40,7 +40,7 @@ a.umb-list-item:focus {
 }
 
 .umb-list-item__description--checkbox{
-    margin: 0 0 0 26px;
+    margin: 0 0 0 30px;
 }
 
 .umb-list-checkbox {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-logviewer.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-logviewer.less
index 8beff55b7c..32dcccb8da 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-logviewer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-logviewer.less
@@ -78,19 +78,22 @@
                 padding-right: 160px;
             }
 
-            .icon-rate {
+            .save-search,
+            .filter-search {
                 position: absolute;
                 top: 0;
-                line-height: 32px;
+                display: flex;
+                align-items: center;;
+                height: 32px;
+            }
+
+            .save-search {
                 right: 140px;
                 color: @yellow-d1;
                 cursor: pointer;
             }
 
-            .icon-wrong {
-                position: absolute;
-                top: 0;
-                line-height: 32px;
+            .filter-search {
                 right: 120px;
                 color: @gray-7;
                 cursor: pointer;
@@ -119,6 +122,11 @@
         .table {
             table-layout: fixed;
 
+            table {
+                display: table;
+                width: 100%;
+            }
+
             thead th:first-child, thead th:nth-child(3) {
                 width: 20%;
             }
@@ -127,9 +135,16 @@
                 width: 15%;
             }
 
+
             tr td:nth-child(3) {
                 word-break: break-word;
             }
+
+            button {
+                white-space: normal;
+                word-break: break-word;
+                text-align-last: left;
+            }
         }
 
         .exception {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
index 5d6b7ad962..5f79d65de1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
@@ -19,11 +19,19 @@
     align-items: center;
     align-self: stretch;
 
+    border-radius: @baseBorderRadius;
+
     margin: 10px;
     position: relative;
     user-select: none;
     box-shadow: 0 1px 1px 0 rgba(0,0,0,.2);
     transition: box-shadow 150ms ease-in-out;
+
+    > div {
+        overflow: hidden;
+        border-radius: @baseBorderRadius;
+    }
+
 }
 
 .umb-media-grid__item.-unselectable {
@@ -35,7 +43,8 @@
         left: 0;
         right: 0;
         bottom: 0;
-        background-color: rgba(230, 230, 230, .5);
+        border-radius: @baseBorderRadius;
+        background-color: rgba(230, 230, 230, .8);
         pointer-events: none;
     }
 }
@@ -138,6 +147,7 @@
 
 .umb-media-grid__item-overlay {
    display: flex;
+   align-items: center;
    width: 100%;
    opacity: 0;
    position: absolute;
@@ -217,3 +227,23 @@
     text-decoration: none;
     box-shadow: 0 1px 2px rgba(0,0,0,.2);
 }
+
+/*for the listview*/
+
+.umb-media-grid__list-item.selected, .umb-media-grid__list-item.selected:hover, .umb-media-grid__list-item.selected:focus {
+    border: 2px solid #f5c1bc !important;
+}
+
+.umb-media-grid__list-view .umb-table-cell.umb-table__name {
+    flex: 1 1 25%;
+    max-width: none;
+    white-space: normal;
+}
+
+.umb-media-grid__list-view .umb-table-cell.umb-table__name .item-name {
+    white-space:normal;
+}
+.umb-media-grid__list-view .umb-table-cell.umb-table__name ins {
+    text-decoration: none;
+    margin-top: 3px;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less
index 8cd08f5045..ecb1ad1904 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less
@@ -44,6 +44,10 @@
     color: @black;
 }
 
+.umb-minilistview {
+    overflow: hidden;
+}
+
 /* Animations */
 .umb-mini-list-view.ng-animate {
     transition: 120ms cubic-bezier(0.250, 0.250, 0.750, 0.750) all;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-multiple-textbox.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-multiple-textbox.less
index 30a32b8123..39eb7e92e4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-multiple-textbox.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-multiple-textbox.less
@@ -1,9 +1,11 @@
-.umb-multiple-textbox{
-    &__confirm{
+.umb-multiple-textbox {
+    .umb-property-editor--limit-width();
+
+    &__confirm {
         position: relative;
         display: inline-block;
 
-        &-action{
+        &-action {
             margin: -2px 0 0 0;
             padding: 2px;
             background: transparent;
@@ -12,10 +14,6 @@
     }
 }
 
-.umb-multiple-textbox .icon-wrapper {
-    width: 50px;
-}
-
 .umb-multiple-textbox .textbox-wrapper {
     align-items: center;
     margin-bottom: 15px;
@@ -30,15 +28,10 @@
 }
 
 .umb-multiple-textbox .textbox-wrapper i.handle {
-    margin-left: 5px;
+    margin-left: 10px;
     cursor: move;
 }
 
-.umb-multiple-textbox .textbox-wrapper a.remove {
-    margin-left: 5px;
-    text-decoration: none;
-}
-
 .umb-multiple-textbox .add-link {
     &:extend(.umb-node-preview-add);
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
index 716693c778..bd787e2329 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
@@ -4,6 +4,7 @@
 
 .umb-nested-content-property-container {
     position: relative;
+
     &:not(:last-child){
         margin-bottom: 12px;
     }
@@ -19,7 +20,7 @@
         yeah so this is a pain, but we must be super specific in targeting the mandatory property labels,
         otherwise all properties within a reqired, nested, nested content property will all appear mandatory
     */
-    > ng-form > .control-group > .umb-el-wrap > .control-header label:after {
+    .umb-property > ng-form > .control-group > .umb-el-wrap > .control-header label:after {
         content: '*';
         color: @red;
     }
@@ -38,6 +39,15 @@
     position: relative;
     text-align: left;
     background: @white;
+    border: 1px solid @gray-9;
+    border-radius: @baseBorderRadius;
+    transition: border-color 120ms;
+    margin-bottom: 4px;
+    margin-top: 4px;
+
+    &.--error {
+        border-color: @formErrorBorder !important;
+    }
 }
 
 .umb-nested-content__item.ui-sortable-placeholder {
@@ -45,19 +55,19 @@
     visibility: visible !important;
 }
 
-.umb-nested-content__item--single > .umb-nested-content__content {
+.umb-nested-content__item--single {
     border: 0;
-}
 
-.umb-nested-content__item--single > .umb-nested-content__content > .umb-pane {
-    margin: 0;
+    > .umb-nested-content__content {
+        > .umb-pane {
+            margin: 0;
+        }
+    }
 }
 
 .umb-nested-content__header-bar {
-    border-bottom: 1px solid @gray-9;
     cursor: pointer;
     background-color: @white;
-
     -moz-user-select: none;
     -khtml-user-select: none;
     -webkit-user-select: none;
@@ -69,24 +79,21 @@
             padding-right: 60px;
         }
     }
-
 }
 
 .umb-nested-content__heading {
+    display: flex;
+    padding: 15px;
     line-height: 20px;
-    position: relative;
-    margin-top:1px;
-    padding: 15px 5px;
-    color:@ui-option-type;
-    border-radius: 3px 3px 0 0;
+    color: @ui-option-type;
 
     &:hover {
-        color:@ui-option-type-hover;
+        color: @ui-option-type-hover;
     }
 
-    i {
-        position: absolute;
-        margin-top: -1px;
+    .umb-nested-content__item-icon {
+        margin-top: -3px;
+        font-size: 22px;
     }
 
     .umb-nested-content__item-name {
@@ -98,10 +105,9 @@
         padding-left: 5px;
 
         &.--has-icon {
-            padding-left: 30px;
+            padding-left: 10px;
         }
     }
-
 }
 
 .umb-nested-content__icons {
@@ -109,7 +115,7 @@
     transition: opacity 120ms ease-in-out;
     position: absolute;
     right: 0;
-    top: 3px;
+    top: 5px;
     padding: 5px;
     background-color: @white;
 }
@@ -117,13 +123,16 @@
 .umb-nested-content__item--active > .umb-nested-content__header-bar {
     .umb-nested-content__heading {
         background-color: @ui-active;
+
         &:hover {
-            color:@ui-option-type;
+            color: @ui-option-type;
         }
+
         .umb-nested-content__item-name {
             padding-right: 60px;
         }
     }
+
     .umb-nested-content__icons {
         background-color: @ui-active;
         &:before {
@@ -132,8 +141,6 @@
     }
 }
 
-
-
 .umb-nested-content__header-bar:hover .umb-nested-content__icons,
 .umb-nested-content__header-bar:focus .umb-nested-content__icons,
 .umb-nested-content__header-bar:focus-within .umb-nested-content__icons,
@@ -141,8 +148,6 @@
     opacity: 1;
 }
 
-
-
 .umb-nested-content__icon {
     background: transparent;
     border: 0 none;
@@ -160,7 +165,7 @@
 
 .umb-nested-content__icon .icon {
     display: block;
-    font-size: 16px !important;
+    font-size: 18px !important;
 }
 
 .umb-nested-content__icon--disabled {
@@ -172,9 +177,6 @@
     }
 }
 
-
-
-
 .umb-nested-content__footer-bar {
     margin-top: 20px;
 }
@@ -201,15 +203,14 @@
 .umb-nested-content__add-content.--disabled:hover {
     color: @gray-7;
     border-color: @gray-7;
-    cursor: default;
+    cursor: not-allowed;
 }
 
-
 .umb-nested-content__content {
     border-top: 1px solid transparent;
-    border-bottom: 1px solid @gray-9;
-    border-left: 1px solid @gray-9;
-    border-right: 1px solid @gray-9;
+    border-bottom: 1px solid transparent;
+    border-left: 1px solid transparent;
+    border-right: 1px solid transparent;
     border-radius: 0 0 3px 3px;
 }
 
@@ -232,17 +233,17 @@
 }
 
 .umb-nested-content__doctypepicker table td.icon-navigation,
-.umb-nested-content__doctypepicker i.umb-nested-content__help-icon {
+.umb-nested-content__doctypepicker .umb-nested-content__help-icon {
     vertical-align: middle;
     color: @gray-7;
 }
 
 .umb-nested-content__doctypepicker table td.icon-navigation:hover,
-.umb-nested-content__doctypepicker i.umb-nested-content__help-icon:hover {
+.umb-nested-content__doctypepicker .umb-nested-content__help-icon:hover {
     color: @gray-2;
 }
 
-.umb-nested-content__doctypepicker i.umb-nested-content__help-icon {
+.umb-nested-content__doctypepicker .umb-nested-content__help-action {
     margin-left: 10px;
 }
 
@@ -291,4 +292,4 @@
     .umb-textarea, .umb-textstring {
         width:100%;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
index 939fd79826..ac7277109a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
@@ -28,8 +28,6 @@
 
 .umb-node-preview__icon {
     display: flex;
-    width: 25px;
-    min-height: 25px;
     height: 100%;
     justify-content: center;
     align-items: center;
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 b808e6574a..0045bed140 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
@@ -59,15 +59,12 @@
 
 .umb-package-link {
     display: block;
-    flex-wrap: wrap;
-    flex-direction: column;
-    justify-content: center;
     position: relative;
     box-sizing: border-box;
     height: 100%;
     width: 100%;
     border-radius: 3px;
-    border: 0 none;
+    border: 1px solid transparent;
     text-decoration: none !important;
     transition: border-color 100ms ease;
     background-color: @white;
@@ -78,8 +75,6 @@
     }
 }
 
-
-
 // Icon
 .umb-package-icon {
     display: flex;
@@ -94,22 +89,20 @@
     border-top-right-radius: 3px;
     border-top-left-radius: 3px;
     min-height: 60px;
-}
 
-.umb-package-icon img {
-    max-width: 70px;
-    width: 70px;
-    height: auto;
+    img {
+        max-width: 70px;
+        width: 70px;
+        height: auto;
+    }
 }
 
-
 // Info
 .umb-package-info {
     padding: 15px;
     text-align: center;
 }
 
-
 // Name
 .umb-package-name {
     font-size: 14px;
@@ -285,7 +278,7 @@
     flex: 1 1 auto;
     margin-right: 20px;
     width: calc(~'100%' - ~'@{sidebarwidth}' - ~'20px'); // Make sure that the main content area doesn't gets affected by inline styling
-    min-width: 500px;
+    min-width: 480px;
 }
 
 .umb-package-details__sidebar {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-pagination.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-pagination.less
index 8d3d563cab..f44aa645c4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-pagination.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-pagination.less
@@ -1,3 +1,5 @@
-.umb-pagination ul {
-    box-shadow: none;
-}
\ No newline at end of file
+.umb-pagination {
+    ul {
+        box-shadow: none;
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
index 17c4bf1a55..6b7d22d0b7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
@@ -1,9 +1,4 @@
-.umb-property-actions {
-    display: inline;
-}
-
-.umb-property-actions__toggle,
-.umb-property-actions__menu-open-toggle {
+.umb-property-actions__toggle {
     position: relative;
     display: flex;
     flex: 0 0 auto;
@@ -11,7 +6,6 @@
     text-align: center;
     cursor: pointer;
     border-radius: 3px;
-
     background-color: @ui-action-hover;
 
     i {
@@ -32,27 +26,20 @@
         }
     }
 }
-.umb-property-actions__menu-open-toggle {
-    position: absolute;
-    z-index:1;
-    outline: none;// this is not acceccible by keyboard, since we use the .umb-property-actions__toggle for that.
 
-    top: -15px;
-    border-radius: 3px 3px 0 0;
-
-    border-top-left-radius: 3px;
-    border-top-right-radius: 3px;
-
-    border: 1px solid @dropdownBorder;
-
-    border-bottom: 1px solid @gray-9;
-
-    .box-shadow(0 5px 20px rgba(0,0,0,.3));
-
-    background-color: @white;
+.umb-property-actions {
+    display: inline;
 
+    &.-open {
+        .umb-property-actions__toggle {
+            background-color: @white;
+            border-radius: 3px 3px 0 0;
+            border: 1px solid @dropdownBorder;
+            border-bottom: 1px solid @gray-9;
+            .box-shadow(0 5px 20px rgba(0,0,0,.3));
+        }
+    }
 }
-
 .umb-property .umb-property-actions {
     float: left;
 }
@@ -66,32 +53,22 @@
 .umb-property .umb-property-actions__toggle:focus {
     opacity: 1;
 }
+
 // Revert-style-hack that ensures that we only show property-actions on properties that are directly begin hovered.
 .umb-property:hover .umb-property:not(:hover) .umb-property-actions__toggle {
     opacity: 0;
 }
 
 .umb-property-actions__menu {
-
     position: absolute;
     z-index: 1000;
-
     display: block;
-
     float: left;
     min-width: 160px;
     list-style: none;
 
     .umb-contextmenu {
-
         border-top-left-radius: 0;
-        margin-top:1px;
-
-    }
-
-    .umb-contextmenu-item > button {
-
-        z-index:2;// need to stay on top of menu-toggle-open shadow.
-
+        margin-top: 0;
     }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less
index 39b2f4002e..83774e2dae 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less
@@ -14,6 +14,12 @@
             color: @gray-8;
         }
 
+        &:focus-within {
+            .tabbing-active & {
+                box-shadow: 0 0 2px @ui-outline, inset 0 0 2px 1px @ui-outline;
+            }
+        }
+
         i.icon {
             font-size: 55px;
             line-height: 70px
@@ -26,4 +32,10 @@
             width: 100%;
         }
     }
+
+    .drag-over {
+        .umb-upload-button-big {
+            border-color: @gray-1;
+        }
+    }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-search-filter.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-search-filter.less
new file mode 100644
index 0000000000..b96d3e8569
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-search-filter.less
@@ -0,0 +1,31 @@
+html .umb-search-filter {
+    position: relative;
+    height: 30px;
+    width: 190px;
+
+    &.w-100 {
+        width: 100%;
+    }
+
+    &.mb-15 {
+        margin-bottom: 15px;
+    }
+
+    &__input {
+        padding-left: 30px;
+        padding-right: 6px;
+        width: inherit;
+        margin: 0;
+    }
+
+    // "icon-search" class it kept for backward compatibility
+    .umb-icon, 
+    .icon-search {
+        color: #d8d7d9;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 10px;
+        margin: auto 0;
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-stylesheet.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-stylesheet.less
index 38ceba2a59..36d9913d66 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-stylesheet.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-stylesheet.less
@@ -41,6 +41,7 @@ textarea.umb-stylesheet-rule-styles {
     width: 300px;
     height: 100px;
     resize: none;
+    font-family: @monoFontFamily;
 }
 
 .umb-stylesheet-rule-preview {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
index 202c488bb4..d0427cad0a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
@@ -164,7 +164,7 @@ input.umb-table__input {
     }
 }
 
-.umb-table-body__icon {
+.umb-table-body .umb-table-body__icon {
     margin: 0 auto;
     font-size: 20px;
     line-height: 20px;
@@ -173,7 +173,7 @@ input.umb-table__input {
     text-decoration: none;
 }
 
-.umb-table-body__checkicon {
+.umb-table-body .umb-table-body__icon.umb-table-body__checkicon {
     display: none;
     font-size: 18px;
     line-height: 20px;
@@ -218,15 +218,15 @@ input.umb-table__input {
 }
 
 // Show checkmark when checked, hide file icon
-.umb-table-row.-selected {
-    
-    .umb-table-body__fileicon {
-        display: none;
-    }
-    .umb-table-body__checkicon {
-        display: inline-block;
-    }
-    
+.umb-table-body .umb-table-row.-selected {
+    .umb-table-body__icon {
+        &.umb-table-body__fileicon {
+            display: none;
+        }
+        &.umb-table-body__checkicon {
+            display: inline-block;
+        }
+    }    
 }
 
 // Table Row Styles
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-tags-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-tags-editor.less
new file mode 100644
index 0000000000..213807e685
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-tags-editor.less
@@ -0,0 +1,52 @@
+.umb-tags-editor {
+    border: @inputBorder solid 1px;
+    padding: 5px;
+    min-height: 54px;
+    font-size: 13px;
+    text-shadow: none;
+    box-sizing: border-box;
+
+    .tag {
+        cursor: default;
+        margin: 10px;
+        padding: 10px 15px;
+        background: @blueExtraDark;
+        position: relative;
+        user-select: all;
+
+        .umb_confirm-action {
+
+            > .btn-icon {
+                color: @white;
+                padding: 0;
+                position: relative;
+                cursor: pointer;
+                padding-left: 2px;
+                font-size: 15px;
+                right: -5px;
+                bottom: -1px;
+                user-select: none;
+            }
+
+            .umb_confirm-action__overlay.-left {
+                top: 8px;
+                left: auto;
+                right: 15px;
+            }
+        }
+    }
+
+    .twitter-typeahead {
+        margin: 10px;
+        margin-top: 16px;
+        vertical-align: top;
+        max-width: calc(100% - 20px);
+
+        input {
+            border: none;
+            background: @white;
+            padding-left: 0;
+            max-width: 100%;
+        }
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-picker-list.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-picker-list.less
index 2e0d79e803..4a343f780a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-picker-list.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-picker-list.less
@@ -8,6 +8,8 @@
     margin-bottom: 5px;
     padding: 10px;
     align-items: center;
+    width: 100%;
+    text-align: left;
 }
 
 .umb-user-picker-list-item:active,
@@ -39,4 +41,4 @@
 .umb-user-picker-list-item__name {
     font-size: 15px;
     font-weight: bold;
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-preview.less
index f62f3afd37..d0dca54403 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-preview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-preview.less
@@ -4,6 +4,11 @@
     display: flex;
     box-sizing: border-box;
     border-bottom: 1px solid @gray-9;
+    flex-wrap: wrap;
+}
+
+.umb-editor-wrapper .umb-user-preview {
+    .umb-property-editor--limit-width();
 }
 
 .umb-user-preview:last-of-type {
@@ -29,22 +34,26 @@
     flex: 0 0 auto;
     display: flex;
     align-items: center;
+    margin-left: auto;
 }
 
 .umb-user-preview__action {
+    background: transparent;
+    padding: 0;
+    border: 0 none;
     margin-left: 5px;
     margin-right: 5px;
     font-size: 13px;
     font-weight: bold;
-    color: @gray-5;
+    color: @ui-action-type;
 }
 
 .umb-user-preview__action:hover {
-    color: @turquoise;
+    color: @ui-action-type-hover;
     text-decoration: none;
     opacity: 1;
 }
 
 .umb-user-preview__action--red:hover {
     color: @red;
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/filter-toggle.less b/src/Umbraco.Web.UI.Client/src/less/filter-toggle.less
deleted file mode 100644
index 82f9f3f553..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/filter-toggle.less
+++ /dev/null
@@ -1,20 +0,0 @@
-.filter-toggle{
-    margin: 0;
-    padding: 0 8px 0 0;
-    position: relative;
-}
-
-.filter-toggle__level{
-    display: inline-block;
-    font-weight: 700;
-    margin: 0 5px;
-    max-width: 150px;
-}
-
-.filter-toggle__icon{
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    right: 0;
-    margin: auto 0;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/fonts.less b/src/Umbraco.Web.UI.Client/src/less/fonts.less
index 73bc36037f..e9a84656f9 100644
--- a/src/Umbraco.Web.UI.Client/src/less/fonts.less
+++ b/src/Umbraco.Web.UI.Client/src/less/fonts.less
@@ -15,8 +15,7 @@
     font-family: 'Lato';
     src: local('LatoLatin Black'),
          local('LatoLatin-Black'),
-         url('@{latoPath}/LatoLatin-Black.woff2') format('woff2'), /* Super Modern Browsers */
-         url('@{latoPath}/LatoLatin-Black.woff') format('woff'); /* Modern Browsers */
+         url('@{latoPath}/LatoLatin-Black.woff2') format('woff2');
     font-style: normal;
     font-display: swap;
     font-weight: 900;
@@ -28,8 +27,7 @@
     font-family: 'Lato';
     src: local('LatoLatin BlackItalic'),
          local('LatoLatin-BlackItalic'),
-         url('@{latoPath}/LatoLatin-BlackItalic.woff2') format('woff2'), /* Super Modern Browsers */
-         url('@{latoPath}/LatoLatin-BlackItalic.woff') format('woff'); /* Modern Browsers */
+         url('@{latoPath}/LatoLatin-BlackItalic.woff2') format('woff2');
     font-style: italic;
     font-weight: 900;
     font-display: swap;
@@ -41,8 +39,7 @@
     font-family: 'Lato';
     src: local('LatoLatin Bold'),
          local('LatoLatin-Bold'),
-         url('@{latoPath}/LatoLatin-Bold.woff2') format('woff2'), /* Super Modern Browsers */
-         url('@{latoPath}/LatoLatin-Bold.woff') format('woff'); /* Modern Browsers */
+         url('@{latoPath}/LatoLatin-Bold.woff2') format('woff2');
     font-style: normal;
     font-weight: 700;
     font-display: swap;
@@ -54,8 +51,7 @@
     font-family: 'Lato';
     src: local('LatoLatin BoldItalic'),
          local('LatoLatin-BoldItalic'),
-         url('@{latoPath}/LatoLatin-BoldItalic.woff2') format('woff2'), /* Super Modern Browsers */
-         url('@{latoPath}/LatoLatin-BoldItalic.woff') format('woff'); /* Modern Browsers */
+         url('@{latoPath}/LatoLatin-BoldItalic.woff2') format('woff2');
     font-style: italic;
     font-weight: 700;
     font-display: swap;
@@ -67,8 +63,7 @@
     font-family: 'Lato';
     src: local('LatoLatin Italic'),
          local('LatoLatin-Italic'),
-         url('@{latoPath}/LatoLatin-Italic.woff2') format('woff2'), /* Super Modern Browsers */
-         url('@{latoPath}/LatoLatin-Italic.woff') format('woff'); /* Modern Browsers */
+         url('@{latoPath}/LatoLatin-Italic.woff2') format('woff2');
     font-style: italic;
     font-weight: 400;
     font-display: swap;
@@ -80,8 +75,7 @@
     font-family: 'Lato';
     src: local('LatoLatin Regular'),
          local('LatoLatin-Regular'),
-         url('@{latoPath}/LatoLatin-Regular.woff2') format('woff2'), /* Super Modern Browsers */
-         url('@{latoPath}/LatoLatin-Regular.woff') format('woff'); /* Modern Browsers */
+         url('@{latoPath}/LatoLatin-Regular.woff2') format('woff2');
     font-style: normal;
     font-weight: 400;
     font-display: swap;
@@ -93,8 +87,7 @@
     font-family: 'Lato';
     src: local('LatoLatin Light'),
          local('LatoLatin-Light'),
-         url('@{latoPath}/LatoLatin-Light.woff2') format('woff2'), /* Super Modern Browsers */
-         url('@{latoPath}/LatoLatin-Light.woff') format('woff'); /* Modern Browsers */
+         url('@{latoPath}/LatoLatin-Light.woff2') format('woff2');
     font-style: normal;
     font-weight: 300;
     font-display: swap;
@@ -106,8 +99,7 @@
     font-family: 'Lato';
     src: local('LatoLatin LightItalic'),
          local('LatoLatin-LightItalic'),
-         url('@{latoPath}/LatoLatin-LightItalic.woff2') format('woff2'), /* Super Modern Browsers */
-         url('@{latoPath}/LatoLatin-LightItalic.woff') format('woff'); /* Modern Browsers */
+         url('@{latoPath}/LatoLatin-LightItalic.woff2') format('woff2');
     font-style: italic;
     font-weight: 300;
     font-display: swap;
diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index ffc0626981..90b2dbe37e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -29,7 +29,7 @@ label.control-label, .control-label {
   }
 
 
-.controls-row label{padding: 0 10px 0 10px; vertical-align: middle;}
+.controls-row label:not(.umb-form-check){padding: 0 10px 0 10px; vertical-align: middle;}
 
 
 
@@ -68,8 +68,9 @@ label.control-label, .control-label {
 .form-search .icon, .form-search .icon-search {
   position: absolute;
   z-index: 1;
-  top: 6px;
+  top: 50%;
   left: 6px;
+  transform: translateY(-50%);
   color: @gray-8;
 }
 
@@ -113,6 +114,13 @@ label.control-label, .control-label {
     }
 }
 
+.form-search .umb-search-field {
+    width: 100%;
+}
+
+.macro-select .form-search {
+    margin: 0 0 10px;
+}
 
 // GENERAL STYLES
 // --------------
@@ -810,6 +818,7 @@ legend + .control-group {
   // Labels on own row
   .form-horizontal .control-label {
     float:none;
+    text-align: inherit;
     width: 100%;
   }
   .form-horizontal .controls {
diff --git a/src/Umbraco.Web.UI.Client/src/less/gridview.less b/src/Umbraco.Web.UI.Client/src/less/gridview.less
index 11ba7b2795..80f13fbf1f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/gridview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/gridview.less
@@ -21,7 +21,7 @@
      overflow: hidden;
      padding: 5px;
      border-radius:5px;
-     box-shadow: 3px 3px 12px 0px rgba(50, 50, 50, 0.45);
+     box-shadow: 3px 3px 12px 0 rgba(50, 50, 50, 0.45);
  }
 
  .usky-grid .ui-sortable-helper *{
@@ -150,7 +150,7 @@
 .usky-grid  .cell-tools-add {
     position: absolute;
     text-align: center;
-    bottom: 0px;
+    bottom: 0;
     left: 0;
     right: 0;
     margin: 0 45px 1px 0;
@@ -160,14 +160,14 @@
     }
 }
 
-.usky-grid  .usky-control:hover .cell-tools-add{
+.usky-grid .usky-control:hover .cell-tools-add{
     opacity: 1;
 }
 
-.usky-grid  .cell-tools-remove {
+.usky-grid .cell-tools-remove {
     display:inline-block;
     position: absolute;
-    top: 0px;
+    top: 0;
     right: 5px;
     text-align: right;
     z-index: 500;
@@ -221,7 +221,7 @@
     top: -22px;
     left: -1px;
     text-decoration: none;
-    padding: 0px 7px;
+    padding: 0 7px;
     display:none;
     font-size:0.8em;
     background-color: @white;
@@ -234,7 +234,7 @@
 
 .usky-grid .usky-row-inner > ins.item-label{
     top: -20px;
-    left: 0px;
+    left: 0;
 }
 
 .usky-grid .usky-control-inner.selectedControl , .usky-grid .usky-row-inner.selectedRow{
@@ -408,7 +408,7 @@
  .usky-grid  ul li {
      display: inline-block;
      width: 120px;
-     margin: 8px 8px 0px 8px;
+     margin: 8px 8px 0 8px;
  }
 
 
@@ -435,7 +435,7 @@
      padding: -1px;
      position: absolute;
      margin: -1px -1px 0 -1px;
-     box-shadow: 2px 2px 10px 0px rgba(50, 50, 50, 0.14);
+     box-shadow: 2px 2px 10px 0 rgba(50, 50, 50, 0.14);
      z-index: 9999999;
  }
 
@@ -558,7 +558,8 @@
      margin: 20px;
  }
 
- .usky-grid .uSky-templates-template a.tb:hover {
+ .usky-grid .uSky-templates-template button.tb:hover,
+ .usky-grid .uSky-templates-template button.tb:focus {
      border:5px solid @blueMid;
  }
 
@@ -587,7 +588,9 @@
      border-right: 1px dashed @gray-8 !important;
  }
 
- .usky-grid a.uSky-templates-column:hover, .usky-grid a.uSky-templates-column.selected{
+ .usky-grid button.uSky-templates-column:hover, 
+ .usky-grid button.uSky-templates-column:focus, 
+ .usky-grid button.uSky-templates-column.selected{
     background-color: @blueMid;
  }
 
@@ -628,13 +631,13 @@
 		transition: border 200ms linear;
 
         &.prevalues-rows {
-            margin: 0px 20px 20px 0px;
+            margin: 0 20px 20px 0;
             width: 80px;
             float:left;
         }
 
         &.prevalues-templates {
-            margin: 0px 20px 20px 0px;
+            margin: 0 20px 20px 0;
             float:left;
 
         }
@@ -803,7 +806,7 @@
 .usky-grid-configuration .uSky-templates .uSky-templates-template .tb{
     max-height: 50px;
     border-width: 2px !important;
-    padding: 0px;
+    padding: 0;
     border-spacing:2px;
     overflow: hidden;
 }
@@ -844,13 +847,13 @@
 }
 
 .usky-grid-configuration .uSky-templates-rows .uSky-templates-row{
-    margin: 0px 50px 20px 0px;
+    margin: 0 50px 20px 0;
     width: 60px;
 }
 
 .usky-grid-configuration .uSky-templates-rows .uSky-templates-row .tb{
     border-width: 2px !important;
-    padding: 0px;
+    padding: 0;
     border-spacing:2px;
 }
 
@@ -858,4 +861,6 @@
     height: 10px !important;
 }
 
-.usky-grid-configuration a.uSky-templates-column{height: 70px !important;}
+.usky-grid-configuration button.uSky-templates-column {
+    height: 70px !important;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/helveticons.less b/src/Umbraco.Web.UI.Client/src/less/helveticons.less
index 82663270e9..cded6b8269 100644
--- a/src/Umbraco.Web.UI.Client/src/less/helveticons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/helveticons.less
@@ -8,35 +8,29 @@
 	font-style: normal;
 }
 
+
 [class^="icon-"],
-[class*=" icon-"] {
-  font-family: icomoon;
-  font-weight: normal;
-  font-style: normal;
-  text-decoration: inherit;
-  -webkit-font-smoothing: antialiased;
-  *margin-right: .3em;
+[class*=" icon-"]{
+    font-family: 'icomoon';
+    speak: none;
+    font-style: normal;
+    font-weight: normal;
+    font-variant: normal;
+    text-transform: none;
+    line-height: 1;
+
+    /* Better Font Rendering =========== */
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 }
 
 [class^="icon-"]:before,
 [class*=" icon-"]:before {
-  text-decoration: inherit;
-  display: inline-block;
-  speak: none;
+    text-decoration: inherit;
+    display: inline-block;
+    speak: none;
 }
 
-/*
-[class^="icon-"]:before, [class*=" icon-"]:before {
-	font-family: 'icomoon';
-	speak: none;
-	font-weight: normal;
-  	font-style: normal;
-  	display: inline-block;
-  	text-decoration: inherit;
-  	font-size: 14px;
-  	-webkit-font-smoothing: antialiased;
-}*/
-
 i.large{
 	font-size: 32px;
 }
@@ -164,22 +158,22 @@ i.small{
 .icon-umb-deploy:before {
 	content: "\e027";
 }
-.icon-umb-contour:before, .traycontour:before, {
+.icon-umb-contour:before, .traycontour:before {
 	content: "\e028";
 }
-.icon-umb-settings:before, .traysettings:before, {
+.icon-umb-settings:before, .traysettings:before {
 	content: "\e029";
 }
 .icon-umb-users:before, .trayuser:before, .trayusers:before{
 	content: "\e02a";
 }
-.icon-umb-media:before, .traymedia:before, {
+.icon-umb-media:before, .traymedia:before {
 	content: "\e02b";
 }
 .icon-umb-content:before, .traycontent:before{
 	content: "\e02c";
 }
-.icon-umb-developer:before, .traydeveloper:before, {
+.icon-umb-developer:before, .traydeveloper:before {
 	content: "\e02d";
 }
 .icon-umb-members:before, .traymember:before {
@@ -711,7 +705,7 @@ i.small{
 .icon-paper-bag:before {
 	content: "\e0da";
 }
-.icon-name-badge:before {
+.icon-badge:before {
 	content: "\e0db";
 }
 .icon-medicine:before {
diff --git a/src/Umbraco.Web.UI.Client/src/less/installer.less b/src/Umbraco.Web.UI.Client/src/less/installer.less
index 4e24161e59..9ce519186a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/installer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/installer.less
@@ -57,7 +57,8 @@ body {
 #installer {
     margin: auto;
     background: @white;
-    width: 750px;
+    width: 80%;
+    max-width: 750px;
     height: 600px;
     text-align: left;
     padding: 30px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less
index fe8af6dbc4..582da12804 100644
--- a/src/Umbraco.Web.UI.Client/src/less/listview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/listview.less
@@ -32,7 +32,10 @@
             position: absolute;
             padding: 5px 8px;
             pointer-events: none;
-            top: 2px;
+
+            &i {
+                top: 2px;
+            }
         }
 
         input[type="text"] {
@@ -256,20 +259,21 @@
    margin-right: 15px;
 }
 
+.list-view-layout__icon-wrapper {
+    margin-right: 10px;
+}
+
 .list-view-layout__icon {
    font-size: 18px;
-   margin-right: 10px;
    vertical-align: middle;
    border: 1px solid @gray-8;
    background: @white;
-   padding: 6px 8px;
-   display: block;
-}
-
-.list-view-layout__icon:hover,
-.list-view-layout__icon:focus,
-.list-view-layout__icon:active {
-   text-decoration: none;
+   padding: 0;
+   display: flex;
+   align-items: center;
+   justify-content: center;
+   width: 30px;
+   height: 30px;
 }
 
 .list-view-layout__remove {
@@ -278,20 +282,9 @@
 }
 
 .list-view-add-layout {
-   width:100%; 
-   background:0 0;
-   margin-top: 10px;
-   color: @ui-action-discreet-type;
-   border: 1px dashed @ui-action-discreet-border;
-   display: flex;
-   align-items: center;
-   justify-content: center;
-   padding: 5px 0;
-   box-sizing: border-box;
+    &:extend(.umb-node-preview-add);
 }
 
 .list-view-add-layout:hover {
-   text-decoration: none;
-   color: @ui-action-discreet-type-hover;
-   border-color: @ui-action-discreet-border-hover;
+    &:extend(.umb-node-preview-add:hover);
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 57d867ccd5..31bb8484c4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -151,7 +151,7 @@ h6.-black {
     }
 }
 
-.umb-property:last-of-type .umb-control-group {
+umb-property:last-of-type .umb-control-group {
     &::after {
         margin-top: 0px;
         height: 0;
@@ -208,6 +208,13 @@ h6.-black {
     .control-description {
         display: block;
         clear: both;
+        overflow-wrap: break-word;
+    }
+
+    &::after {
+        content: '';
+        display: block;
+        clear: both;
     }
 }
 
@@ -221,6 +228,7 @@ h6.-black {
     padding-top: 5px;
     padding-bottom: 0;
     text-align: left;
+    margin-bottom: 5px;
 
     .control-label {
         width: auto;
@@ -230,7 +238,7 @@ h6.-black {
 
     .control-description {
         max-width:480px;// avoiding description becoming too wide when its placed on top of property.
-        margin-bottom: 10px;
+        margin-bottom: 5px;
     }
 }
 @media (max-width: 767px) {
@@ -238,9 +246,27 @@ h6.-black {
     .form-horizontal .umb-control-group .control-header {
         float: none;
         width: 100%;
+        &::after {
+            content: "";
+            display: table;
+            clear: both;
+        }
     }
     
-
+}
+.form-horizontal .umb-control-group.--label-on-top > .umb-el-wrap {
+    & > .control-header {
+        float: none;
+        width: 100%;
+        &::after {
+            content: "";
+            display: table;
+            clear: both;
+        }
+    }
+    & > .controls {
+        margin-left: 0;
+    }
 }
 
 /* LABELS*/
@@ -272,6 +298,7 @@ label:not([for]) {
 /* CONTROL VALIDATION */
 .umb-control-required {
     color: @controlRequiredColor;
+    font-weight: 900;
 }
 
 .controls-row {
@@ -283,7 +310,7 @@ label:not([for]) {
     margin-left: 0;
 }
 
-.controls-row label {
+.controls-row label:not(.umb-form-check) {
   display: inline-block;
 }
 
@@ -579,6 +606,9 @@ table thead button:focus{
 	display: inline;
 }
 
+.relative {
+  position:relative;
+}
 
 // Input label styles
 // @Simon: not sure where to put this part yet
@@ -639,3 +669,8 @@ input[type=checkbox]:checked + .input-label--small {
   background-color: @green-l3;
   text-decoration: none;
 }
+
+.language-icon {
+    color: #BBBABF;
+    margin-right: 5px;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/mixins.less b/src/Umbraco.Web.UI.Client/src/less/mixins.less
index a87080a326..9739a90dae 100644
--- a/src/Umbraco.Web.UI.Client/src/less/mixins.less
+++ b/src/Umbraco.Web.UI.Client/src/less/mixins.less
@@ -138,7 +138,9 @@
 // additional targetting of the ng-invalid class.
 .formFieldState(@textColor: @gray-4, @borderColor: @gray-7, @backgroundColor: @gray-10) {
   // Set the text color
-  .control-label,
+  > .control-label,
+  > .umb-el-wrap > .control-label,
+  > .umb-el-wrap > .control-header > .control-label,
   .help-block,
   .help-inline {
     color: @textColor;
diff --git a/src/Umbraco.Web.UI.Client/src/less/modals.less b/src/Umbraco.Web.UI.Client/src/less/modals.less
index 4ce907d06f..a23756f412 100644
--- a/src/Umbraco.Web.UI.Client/src/less/modals.less
+++ b/src/Umbraco.Web.UI.Client/src/less/modals.less
@@ -24,18 +24,18 @@
 }
 
 .umb-modalcolumn-body {
-	padding: 0px;
+	padding: 0;
 	background: @white;
 	top: @editorHeaderHeight;
 	position: absolute;
-	left: 0px;
-	right: 0px;
-	bottom: 0px;
+	left: 0;
+	right: 0;
+	bottom: 0;
 	overflow: auto;
 }
 
 .no-padding .umb-modalcolumn-body {
-	padding: 0px
+	padding: 0;
 }
 
 .umb-modalcolumn .umb-modalcolumn-header .btn {
@@ -46,12 +46,12 @@
 
 .umb-modalcolumn iframe.auto-expand, .umb-modal iframe.auto-expand {
 	border: none;
-	padding: 0px;
-	margin: 0px;
-	top: 0px;
-	bottom: 0px;
-	left: 0px;
-	right: 0px;
+	padding: 0;
+	margin: 0;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
 	position: absolute;
 }
 
@@ -79,12 +79,12 @@
 /* umb.dialog is used for the dialogs on the conent tree*/
 .umb-dialog {
 	outline: none;
-	top: 0px;
-	left: 0px;
-	right: 0px;
-	bottom: 0px;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
 	position: absolute;
-	padding: 0px;
+	padding: 0;
   	background: @white;
 }
 
@@ -100,9 +100,9 @@
 .umb-dialog-body{
 	position: absolute;
     overflow:auto;
-    top: 0px;
-    left: 0px;
-    right: 0px;
+    top: 0;
+    left: 0;
+    right: 0;
     bottom: 49px;
 }
 .umb-dialog-body .umb-pane{margin-top: 15px;}
@@ -112,9 +112,9 @@
 	overflow:auto;
 	text-align: right;
 	height: 32px;
-	left: 0px;
-	right: 0px;
-	bottom: 0px;
+	left: 0;
+	right: 0;
+	bottom: 0;
     padding: 8px;
     margin: 0;
 
@@ -129,13 +129,13 @@
 	height: auto !Important;
     padding: 20px;
 }
-.umbracoDialog .umb-pane{margin-left: 0px; margin-right: 0px; margin-top: 0px;}
+.umbracoDialog .umb-pane{margin-left: 0; margin-right: 0; margin-top: 0;}
 .umbracoDialog .umb-dialog-body .umb-pane{margin-left: 20px; margin-right: 20px; margin-top: 20px;}
 .umbracoDialog form{height: 100%;}
 
 /*ensures dialogs doesnt have side-by-side labels*/
 .umbracoDialog .controls-row,
-.umb-modal .controls-row{margin-left: 0px !important;}
+.umb-modal .controls-row{margin-left: 0 !important;}
 
 /* modal and umb-modal are used for right.hand dialogs */
 .modal {
@@ -185,7 +185,7 @@
   height: auto;
 }
 .umb-modal .umb-panel-body{
-	padding: 0px 20px 0px 20px;
+	padding: 0 20px 0 20px;
 }
 
 .umb-modal.fade.in.wide {
diff --git a/src/Umbraco.Web.UI.Client/src/less/navs.less b/src/Umbraco.Web.UI.Client/src/less/navs.less
index c347404619..6dab771c94 100644
--- a/src/Umbraco.Web.UI.Client/src/less/navs.less
+++ b/src/Umbraco.Web.UI.Client/src/less/navs.less
@@ -12,7 +12,10 @@
   padding-right: 7px;
 }
 
-.icon.handle{color: @gray-8;}
+.umb-icon.handle,
+.icon.handle {
+  color: @gray-8;
+}
 
 
 // BASE CLASS
@@ -168,8 +171,7 @@
 
 // Active state
 .nav-pills > .active > a,
-.nav-pills > .active > a:hover,
-.nav-pills > .active > a:focus {
+.nav-pills > .active > a:hover {
   color: @white;
   background-color: @linkColor;
 }
@@ -184,7 +186,14 @@
   float: none;
 }
 .nav-stacked > li > a {
+  position: relative;
   margin-right: 0; // no need for the gap between nav items
+  color: @ui-action-discreet-type;
+  border-radius: 3px;
+}
+.nav-stacked > li > a:hover {
+  color: @ui-action-discreet-type-hover;
+  background-color: @ui-action-discreet-hover;
 }
 
 // Tabs
diff --git a/src/Umbraco.Web.UI.Client/src/less/pages/login.less b/src/Umbraco.Web.UI.Client/src/less/pages/login.less
index 818b1d84d1..cf49af526b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/pages/login.less
+++ b/src/Umbraco.Web.UI.Client/src/less/pages/login.less
@@ -125,9 +125,8 @@
     user-select: none;
     margin-left: auto;
 
-    a {
+    button {
         opacity: .5;
-        cursor: pointer;
         display: inline-block;
         z-index: 1;
         -webkit-tap-highlight-color: transparent;
@@ -135,7 +134,7 @@
         .password-text {
             background-repeat: no-repeat;
             background-size: 18px;
-            background-position: 0px 1px;
+            background-position: 0 1px;
             padding-left: 24px;
 
             &.show {
diff --git a/src/Umbraco.Web.UI.Client/src/less/pages/welcome-dashboard.less b/src/Umbraco.Web.UI.Client/src/less/pages/welcome-dashboard.less
index 59c58c914e..426ffcb5e2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/pages/welcome-dashboard.less
+++ b/src/Umbraco.Web.UI.Client/src/less/pages/welcome-dashboard.less
@@ -39,21 +39,20 @@
     text-decoration: none;
     display: block;
     margin: 10px;
-}
 
-.welcome-dashboard__info-box:hover {
-    border: 2px solid @turquoise;
-    cursor: pointer;
-    transition: border-color 150ms ease-in-out;
-    text-decoration: none;
-}
+    &:hover {
+        border: 2px solid @turquoise;
+        cursor: pointer;
+        transition: border-color 150ms ease-in-out;
+        text-decoration: none;
+    }
 
-.welcome-dashboard__info-box:active,
-.welcome-dashboard__info-box:focus {
-    text-decoration: none;
+    &:active,
+    &:focus {
+        text-decoration: none;
+    }
 }
 
-
 .welcome-dashboard__info-box-title {
     color: @turquoise-d1;
     font-size: 16px;
@@ -74,7 +73,7 @@
 }
 
 .welcome-dashboard__card {
-    background-color: @gray-10;
+    background-color: @grayLighter;
     border-radius: 3px;
     margin: 10px;
     display: flex;
@@ -113,6 +112,6 @@
 }
 
 .welcome-dashboard__card-teaser {
-    font-size: 14px;
+    font-size: 13px;
     margin-bottom: 15px;
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less
index 40c70f5331..a036267c85 100644
--- a/src/Umbraco.Web.UI.Client/src/less/panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/panel.less
@@ -48,6 +48,10 @@
     .form-search {
         flex: 1;
 
+        .icon-search {
+            top: 16px;
+        }
+
         &__toggle {
             margin: 10px 0;
             display: flex;
@@ -259,9 +263,14 @@
 
 .umb-dialog a.muted:hover,
 .umb-dialog a.muted:focus,
+.umb-dialog button.muted:hover,
+.umb-dialog button.muted:focus,
 .umb-panel a.muted:hover,
-.umb-panel a.muted:focus {
+.umb-panel a.muted:focus,
+.umb-panel button.muted:hover,
+.umb-panel button.muted:focus {
     color: darken(@gray-5, 10%);
+    text-decoration: underline;
 }
 
 .umb-dialog .text-warning,
@@ -392,6 +401,7 @@
     font-size: 30px;
     color: @gray-7;
     transition: opacity 120ms;
+    line-height: 1;
 }
 
 .umb-panel-header-icon-text {
@@ -408,6 +418,8 @@ input.umb-panel-header-name-input.name-is-empty {
 .umb-panel-header-name {
    font-size: 16px;
    font-weight: bold;
+   margin: 0;
+   line-height: 1.2;
 }
 
 
@@ -428,7 +440,7 @@ input.umb-panel-header-description {
 
 .umb-panel-header-locked-description {
     font-size: 12px;
-    margin-top: 2px;
+    margin: 2px 0 0 0;
     height: 22px;
     line-height: 22px;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/properties.less b/src/Umbraco.Web.UI.Client/src/less/properties.less
index 9e951feb1a..7960aae2c9 100644
--- a/src/Umbraco.Web.UI.Client/src/less/properties.less
+++ b/src/Umbraco.Web.UI.Client/src/less/properties.less
@@ -16,8 +16,8 @@
     border-left: 1px solid @gray-10;
 }
 
-.date-wrapper__date .flatpickr-input > a {
-    
+.date-wrapper__date .flatpickr-input > a,
+.date-wrapper__date .flatpickr-input > button {
     display: flex;
     align-items: center;
     justify-content: center;
@@ -25,16 +25,15 @@
     padding: 4px 15px;
     box-sizing: border-box;
     min-width: 200px;
-    
     color: @ui-action-discreet-type;
     border: 1px dashed @ui-action-discreet-border;
     border-radius: 3px;
-    
+
     &:hover, &:focus {
         text-decoration: none;
         color: @ui-action-discreet-type-hover;
         border-color: @ui-action-discreet-border-hover;
-        
+
         localize {
             text-decoration: none;
         }
@@ -120,7 +119,9 @@
 }
 
 .history-item__date {
-    font-size: 13px;
+    font-size: 12px;
+    margin-top: -4px;
+    display: block;
     color: @gray-5;
 }
 
@@ -132,7 +133,10 @@
 }
 
 .history-item__badge {
-    margin-right: 5px;
+    margin-right: 10px;
+}
+.history-item__description {
+    color: @gray-5;
 }
 
 /*  RESPONSIVE  */
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index a3bdbb0996..0d8f270f1b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -104,6 +104,20 @@
 // --------------------------------------------------
 
 /* pre-value editor */
+.umb-prevalues-multivalues.umb-colors {
+    max-width: 600px;
+    width: 100%;
+    min-width: 66.6%;
+
+    @media (min-width: 1101px) and (max-width: 1300px), (max-width: 930px) {
+        max-width: none;
+    }
+
+    .umb-overlay__form & {
+        width: 100%;
+    }
+}
+
 .control-group.color-picker-preval {
     .thumbnail {
         width: 34px;
@@ -131,7 +145,7 @@
 
         pre {
             display: inline-flex;
-            font-family: monospace;
+            font-family: @monoFontFamily;
             margin-left: 15px;
             margin-right: 15px;
             white-space: nowrap;
@@ -160,15 +174,10 @@
         width: auto;
     }
 
-    .sp-replacer {
-        display: inline-flex;
-        margin-right: 18px;
-    }
-
     label {
         border: 1px solid @white;
         padding: 6px 10px;
-        font-family: monospace;
+        font-family: @monoFontFamily;
         border: 1px solid @gray-8;
         background: @gray-11;
         margin: 0 15px 0 3px;
@@ -320,6 +329,11 @@
   box-shadow:none !important;
 }
 
+.umb-sortable-thumbnails-container {
+    display: flex;
+    flex-wrap: wrap;
+    background-color: @white;
+}
 
 .umb-sortable-thumbnails {
     list-style-type: none;
@@ -707,8 +721,9 @@
             margin-top: 0;
         }
     }
+
 //
-// folder-browser
+// Folder browser
 // --------------------------------------------------
 .umb-folderbrowser .add-link {
   display: inline-block;
@@ -806,55 +821,18 @@
 }
 
 
+//
+// Slider
+// --------------------------------------------------
+.umb-slider {
+    .umb-property-editor--limit-width();
+}
+
 //
 // Tags
 // --------------------------------------------------
 .umb-tags {
-    border: @inputBorder solid 1px;
-    padding: 5px;
-    min-height: 54px;
-    font-size: 13px;
-    text-shadow: none;
-    box-sizing: border-box;
     .umb-property-editor--limit-width();
-
-    .tag {
-        cursor: default;
-        margin: 10px;
-        padding: 10px 15px;
-        background: @blueExtraDark;
-        position: relative;
-        user-select: all;
-
-        .icon-trash {
-            position: relative;
-            cursor: pointer;
-            padding-left: 2px;
-            font-size: 15px;
-            right: -5px;
-            bottom: -1px;
-        }
-
-        .umb_confirm-action__overlay.-left{
-            top: 6px;
-            left: auto;
-            right: 15px;
-        }
-    }
-
-    input {
-        border: none;
-        background: @white;
-    }
-
-    .twitter-typeahead {
-        margin: 10px;
-        margin-top: 16px;
-        vertical-align: top;
-        input {
-            padding-left: 0;
-        }
-    }
 }
 
 //
diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less
index 0e43f428ae..0eab4b346b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/rte.less
+++ b/src/Umbraco.Web.UI.Client/src/less/rte.less
@@ -35,6 +35,11 @@
     box-sizing: border-box;
 }
 
+.umb-rte .mce-top-part {
+	position: sticky;
+	top: 0;
+}
+
 /* make sure the menu wraps */
 .umb-rte .mce-top-part.mce-container div {
     white-space: normal;
diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/_spacing.less b/src/Umbraco.Web.UI.Client/src/less/utilities/_spacing.less
index 787e50f204..d2968696dc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/_spacing.less
+++ b/src/Umbraco.Web.UI.Client/src/less/utilities/_spacing.less
@@ -35,10 +35,13 @@
    7 = 7th step in spacing scale
 */
 
-.m-center {
-    margin-left: auto;
+.m-center,
+.mx-auto {
+    margin-left: auto; 
     margin-right: auto;
 }
+.ml-auto { margin-left: auto; }
+.mr-auto { margin-right: auto; }
 
 .mt0 { margin-top: @spacing-none; }
 .mt1 { margin-top: @spacing-extra-small; }
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index d94e4e1fb1..cab0745a42 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -156,11 +156,11 @@
 @ui-active-type-hover:  @blueMid;
 
 @ui-selected:           @sand-5;
-@ui-selected-hover:     ligthen(@sand-5, 10);
+@ui-selected-hover:     ligthen(@sand-5, 10%);
 @ui-selected-type:           @blueExtraDark;
 @ui-selected-type-hover:     @blueMid;
 @ui-selected-border:           @blueDark;
-@ui-selected-border-hover:     darken(@blueDark, 10);
+@ui-selected-border-hover:     darken(@blueDark, 10%);
 
 @ui-light-border:           @pinkLight;
 @ui-light-type:             @gray-4;
@@ -199,11 +199,13 @@
 @ui-btn-positive-type:          @white;
 
 @ui-btn-negative:               @red;
+@ui-btn-negative-type:          @white;
 @ui-btn-negative-hover:         @red;
 
 @ui-icon:             @blueNight;
 @ui-icon-hover:       @blueMid;
 
+@ui-drop-area-color: @blueMidLight;
 
 
 // Scaffolding
@@ -254,6 +256,7 @@
 
 // Disabled this to keep consistency throughout the backoffice UI. Untill a better solution is thought up, this will do.
 @baseBorderRadius:      3px; // 2px;
+@doubleBorderRadius:    6px;
 @borderRadiusLarge:     3px; // 6px;
 @borderRadiusSmall:     3px; // 3px;
 
@@ -271,8 +274,8 @@
 @btnBackgroundHighlight:            @gray-10;
 @btnBorder:                         @gray-9;
 
-@btnPrimaryBackground:              @ui-btn-positive;
-@btnPrimaryBackgroundHighlight:     @ui-btn-positive-hover;
+@btnPrimaryBackground:              @ui-btn;
+@btnPrimaryBackgroundHighlight:     @ui-btn-hover;
 
 @btnInfoType:                       @ui-btn-type;// updated 2019
 @btnInfoTypeHover:                  @ui-btn-type;// updated 2019
@@ -478,7 +481,7 @@
 
 @formErrorText:               @errorBackground;
 @formErrorBackground:         lighten(@errorBackground, 55%);
-@formErrorBorder:             darken(spin(@errorBackground, -10), 3%);
+@formErrorBorder:             @red;
 
 @formSuccessText:             @successBackground;
 @formSuccessBackground:       lighten(@successBackground, 48%);
@@ -515,7 +518,7 @@
 // -------------------------
 @gridColumns:             12;
 @gridColumnWidth:         60px;
-@gridGutterWidth:         0px;
+@gridGutterWidth:         0;
 @gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
 
 // 1200px min
diff --git a/src/Umbraco.Web.UI.Client/src/main.controller.js b/src/Umbraco.Web.UI.Client/src/main.controller.js
index 297d93f4bc..d21331f106 100644
--- a/src/Umbraco.Web.UI.Client/src/main.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/main.controller.js
@@ -31,13 +31,17 @@ function MainController($scope, $location, appState, treeService, notificationsS
     // For more information about this approach, see https://hackernoon.com/removing-that-ugly-focus-ring-and-keeping-it-too-6c8727fefcd2
     function handleFirstTab(evt) {
         if (evt.keyCode === 9) {
-            $scope.tabbingActive = true;
-            $scope.$digest();
-            window.removeEventListener('keydown', handleFirstTab);
-            window.addEventListener('mousedown', disableTabbingActive);
+            enableTabbingActive();
         }
     }
     
+    function enableTabbingActive() {
+        $scope.tabbingActive = true;
+        $scope.$digest();
+        window.addEventListener('mousedown', disableTabbingActive);
+        window.removeEventListener("keydown", handleFirstTab);
+    }
+
     function disableTabbingActive(evt) {
         $scope.tabbingActive = false;
         $scope.$digest();
@@ -47,6 +51,12 @@ function MainController($scope, $location, appState, treeService, notificationsS
 
     window.addEventListener("keydown", handleFirstTab);
 
+    $scope.$on("showFocusOutline", function() {
+        $scope.tabbingActive = true;
+        window.addEventListener('mousedown', disableTabbingActive);
+        window.removeEventListener("keydown", handleFirstTab);
+    });
+
 
     $scope.removeNotification = function (index) {
         notificationsService.remove(index);
diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
index 5ff8dd3633..703082eb53 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -5,13 +5,13 @@
 
 var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.services'])
 
-    .controller("previewController", function ($scope, $window, $location) {
+    .controller("previewController", function ($scope, $window, $location, $http) {
 
         $scope.currentCulture = { iso: '', title: '...', icon: 'icon-loading' }
         var cultures = [];
 
         $scope.tabbingActive = false;
-        // There are a number of ways to detect when a focus state should be shown when using the tab key and this seems to be the simplest solution. 
+        // There are a number of ways to detect when a focus state should be shown when using the tab key and this seems to be the simplest solution.
         // For more information about this approach, see https://hackernoon.com/removing-that-ugly-focus-ring-and-keeping-it-too-6c8727fefcd2
         function handleFirstTab(evt) {
             if (evt.keyCode === 9) {
@@ -29,7 +29,28 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
             window.addEventListener("keydown", handleFirstTab);
         }
 
+        var iframeWrapper = angular.element("#demo-iframe-wrapper");
+        var canvasDesignerPanel = angular.element("#canvasdesignerPanel");
+        
         window.addEventListener("keydown", handleFirstTab);
+        window.addEventListener("resize", scaleIframeWrapper);
+        iframeWrapper.on("transitionend", scaleIframeWrapper);
+
+        function scaleIframeWrapper() {
+            if ($scope.previewDevice.name == "fullsize") { // dont scale fullsize preview
+                iframeWrapper.css({"transform": ""});
+            }
+            else {
+                var wrapWidth = canvasDesignerPanel.width(); // width of the wrapper
+                var wrapHeight = canvasDesignerPanel.height();
+                var childWidth = iframeWrapper.width() + 30; // width of child iframe plus some space
+                var childHeight = iframeWrapper.height() + 30; // child height plus some space
+                var wScale = wrapWidth / childWidth;
+                var hScale = wrapHeight / childHeight;
+                var scale = Math.min(wScale,hScale,1);  // get the lowest ratio, but not higher than 1
+                iframeWrapper.css({"transform": "scale("+scale+")" });  // set scale
+            }
+        }
 
 
         //gets a real query string value
@@ -85,11 +106,18 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
                 .fail(function () { console.log("Could not connect to SignalR preview hub."); });
         }
 
+        function fixExternalLinks(iframe) {
+            // Make sure external links don't open inside the iframe
+            Array.from(iframe.contentDocument.getElementsByTagName("a"))
+                .filter(a => a.hostname !== location.hostname && !a.target)
+                .forEach(a => a.target = "_top");
+        }
+
         var isInit = getParameterByName("init");
         if (isInit === "true") {
             //do not continue, this is the first load of this new window, if this is passed in it means it's been
             //initialized by the content editor and then the content editor will actually re-load this window without
-            //this flag. This is a required trick to get around chrome popup mgr. 
+            //this flag. This is a required trick to get around chrome popup mgr.
             return;
         }
 
@@ -100,7 +128,7 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
 
         $scope.valueAreLoaded = false;
         $scope.devices = [
-            { name: "fullsize", css: "fullsize", icon: "icon-application-window-alt", title: "Browser" },
+            { name: "fullsize", css: "fullsize", icon: "icon-application-window-alt", title: "Fit browser" },
             { name: "desktop", css: "desktop shadow", icon: "icon-display", title: "Desktop" },
             { name: "laptop - 1366px", css: "laptop shadow", icon: "icon-laptop", title: "Laptop" },
             { name: "iPad portrait - 768px", css: "iPad-portrait shadow", icon: "icon-ipad", title: "Tablet portrait" },
@@ -136,17 +164,33 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
         $scope.windowClickHandler = function () {
             closeOthers();
         }
+
         function windowBlurHandler() {
             closeOthers();
             $scope.$digest();
         }
+        window.addEventListener("blur", windowBlurHandler);
 
-        var win = $($window);
+        function windowVisibilityHandler(e) {
 
-        win.on("blur", windowBlurHandler);
+            var amountOfPreviewSessions = localStorage.getItem('UmbPreviewSessionAmount');
+
+            // When tab is visible again:
+            if(document.hidden === false) {
+                checkPreviewState();
+            }
+        }
+        document.addEventListener("visibilitychange", windowVisibilityHandler);
+
+        function beforeUnloadHandler(e) {
+            endPreviewSession();
+        }
+        window.addEventListener("beforeunload", beforeUnloadHandler, false);
 
         $scope.$on("$destroy", function () {
-            win.off("blur", handleBlwindowBlurHandlerur);
+            window.removeEventListener("blur", windowBlurHandler);
+            document.removeEventListener("visibilitychange", windowVisibilityHandler);
+            window.removeEventListener("beforeunload", beforeUnloadHandler);
         });
 
 
@@ -162,6 +206,208 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
                 $scope.pageUrl = "frame?" + query;
             }
         }
+        function getCookie(cname) {
+            var name = cname + "=";
+            var ca = document.cookie.split(";");
+            for(var i = 0; i < ca.length; i++) {
+                var c = ca[i];
+                while (c.charAt(0) == " ") {
+                    c = c.substring(1);
+                }
+                if (c.indexOf(name) == 0) {
+                    return c.substring(name.length, c.length);
+                }
+            }
+            return null;
+        }
+        function setCookie(cname, cvalue, exminutes) {
+            var d = new Date();
+            d.setTime(d.getTime() + (exminutes * 60 * 1000));
+            document.cookie = cname + "=" + cvalue + ";expires="+d.toUTCString() + ";path=/";
+        }
+        var hasPreviewDialog = false;
+        function checkPreviewState() {
+            if (getCookie("UMB_PREVIEW") === null) {
+
+                if(hasPreviewDialog === true) return;
+                hasPreviewDialog = true;
+
+                // Ask to re-enter preview mode?
+
+                const localizeVarsFallback = {
+                    "returnToPreviewHeadline": "Preview website?",
+                    "returnToPreviewDescription":"You have ended preview mode, do you want to enable it again to view the latest saved version of your website?",
+                    "returnToPreviewAcceptButton":"Preview latest version",
+                    "returnToPreviewDeclineButton":"View published version"
+                };
+                const umbLocalizedVars = Object.assign(localizeVarsFallback, $window.umbLocalizedVars);
+
+
+                // This modal is also used in websitepreview.js
+                var modelStyles = `
+
+                    /* Webfont: LatoLatin-Bold */
+                    @font-face {
+                        font-family: 'Lato';
+                        src: url('https://fonts.googleapis.com/css2?family=Lato:wght@700&display=swap');
+                        font-style: normal;
+                        font-weight: 700;
+                        font-display: swap;
+                        text-rendering: optimizeLegibility;
+                    }
+
+                    .umbraco-preview-dialog {
+                        position: fixed;
+                        display: flex;
+                        align-items: center;
+                        justify-content: center;
+                        z-index: 99999999;
+                        top:0;
+                        bottom:0;
+                        left:0;
+                        right:0;
+                        overflow: auto;
+                        background-color: rgba(0,0,0,0.6);
+                    }
+
+                    .umbraco-preview-dialog__modal {
+                        background-color: #fff;
+                        border-radius: 6px;
+                        box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+                        margin: auto;
+                        padding: 30px 40px;
+                        width: 100%;
+                        max-width: 540px;
+                        font-family: Lato,Helvetica Neue,Helvetica,Arial,sans-serif;
+                        font-size: 15px;
+                    }
+
+                    .umbraco-preview-dialog__headline {
+                        font-weight: 700;
+                        font-size: 22px;
+                        color: #1b264f;
+                        margin-top:10px;
+                        margin-bottom:20px;
+                    }
+                    .umbraco-preview-dialog__question {
+                        margin-bottom:30px;
+                    }
+                    .umbraco-preview-dialog__modal > button {
+                        display: inline-block;
+                        cursor: pointer;
+                        padding: 8px 18px;
+                        text-align: center;
+                        vertical-align: middle;
+                        border-radius: 3px;
+                        border:none;
+                        font-family: inherit;
+                        font-weight: 700;
+                        font-size: 15px;
+                        float:right;
+                        margin-left:10px;
+
+                        color: #1b264f;
+                        background-color: #f6f1ef;
+                    }
+                    .umbraco-preview-dialog__modal > button:hover {
+                        color: #2152a3;
+                        background-color: #f6f1ef;
+                    }
+                    .umbraco-preview-dialog__modal > button.umbraco-preview-dialog__continue {
+                        color: #fff;
+                        background-color: #2bc37c;
+                    }
+                    .umbraco-preview-dialog__modal > button.umbraco-preview-dialog__continue:hover {
+                        background-color: #39d38b;
+                    }
+                `;
+
+                var bodyEl = document.getElementsByTagName("BODY")[0];
+
+                var fragment = document.createElement("div");
+                var shadowRoot = fragment.attachShadow({ mode: 'open' });
+
+                var style = document.createElement("style");
+                style.innerHTML = modelStyles;
+                shadowRoot.appendChild(style);
+
+                var con = document.createElement("div");
+                con.className = "umbraco-preview-dialog";
+                shadowRoot.appendChild(con);
+
+                var modal = document.createElement("div");
+                modal.className = "umbraco-preview-dialog__modal";
+                modal.innerHTML = `<div class="umbraco-preview-dialog__headline">${umbLocalizedVars.returnToPreviewHeadline}</div>
+                    <div class="umbraco-preview-dialog__question">${umbLocalizedVars.returnToPreviewDescription}</div>`;
+                con.appendChild(modal);
+
+                var declineButton = document.createElement("button");
+                declineButton.type = "button";
+                declineButton.innerHTML = umbLocalizedVars.returnToPreviewDeclineButton;
+                declineButton.addEventListener("click", () => {
+                    bodyEl.removeChild(fragment);
+                    $scope.exitPreview();
+                    hasPreviewDialog = false;
+                });
+                modal.appendChild(declineButton);
+
+                var continueButton = document.createElement("button");
+                continueButton.type = "button";
+                continueButton.className = "umbraco-preview-dialog__continue";
+                continueButton.innerHTML = umbLocalizedVars.returnToPreviewAcceptButton;
+                continueButton.addEventListener("click", () => {
+                    bodyEl.removeChild(fragment);
+                    reenterPreviewMode();
+                    hasPreviewDialog = false;
+                });
+                modal.appendChild(continueButton);
+
+                bodyEl.appendChild(fragment);
+                continueButton.focus();
+
+            }
+        }
+        function reenterPreviewMode() {
+            //Re-enter Preview Mode
+            $http({
+                method: 'POST',
+                url: '../preview/enterPreview',
+                params: {
+                    id: $scope.pageId
+                }
+            })
+            startPreviewSession();
+        }
+        function getPageURL() {
+            var culture = $location.search().culture || getParameterByName("culture");
+            var relativeUrl = "/" + $scope.pageId;
+            if (culture) {
+                relativeUrl += '?culture=' + culture;
+            }
+            return relativeUrl;
+        }
+
+        function startPreviewSession() {
+            // lets registrer this preview session.
+        var amountOfPreviewSessions = Math.max(localStorage.getItem('UmbPreviewSessionAmount') || 0, 0);
+            amountOfPreviewSessions++;
+            localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
+        }
+        function resetPreviewSessions() {
+            localStorage.setItem('UmbPreviewSessionAmount', 0);
+        }
+        function endPreviewSession() {
+            var amountOfPreviewSessions = localStorage.getItem('UmbPreviewSessionAmount') || 0;
+            amountOfPreviewSessions--;
+            localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
+
+            if(amountOfPreviewSessions <= 0) {
+                // We are good to end preview mode.
+                navigator.sendBeacon("../preview/end");
+            }
+        }
+        startPreviewSession();
+
         /*****************************************************************************/
         /* Preview devices */
         /*****************************************************************************/
@@ -171,23 +417,29 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
             $scope.previewDevice = device;
         };
 
+        /*****************************************************************************/
+        /* Open website in preview mode */
+        /*****************************************************************************/
+
+        $scope.openInBrowser = function () {
+            setCookie("UMB-WEBSITE-PREVIEW-ACCEPT", "true", 5);
+            window.open(getPageURL(), "_blank");
+        };
+
         /*****************************************************************************/
         /* Exit Preview */
         /*****************************************************************************/
 
         $scope.exitPreview = function () {
-
-            var culture = $location.search().culture || getParameterByName("culture");
-            var relativeUrl = "/" + $scope.pageId;
-            if (culture) {
-                relativeUrl += '?culture=' + culture;
-            }
-            window.top.location.href = "../preview/end?redir=" + encodeURIComponent(relativeUrl);
+            resetPreviewSessions();
+            window.top.location.href = "../preview/end?redir=" + encodeURIComponent(getPageURL());
         };
 
         $scope.onFrameLoaded = function (iframe) {
+
             $scope.frameLoaded = true;
             configureSignalR(iframe);
+            fixExternalLinks(iframe);
 
             $scope.currentCultureIso = $location.search().culture || null;
         };
@@ -239,8 +491,8 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
             var vm = this;
 
             vm.$postLink = function () {
-                var resultFrame = $element.find("#resultFrame");
-                resultFrame.on("load", iframeReady);
+                var resultFrame = $element.find("#resultFrame").get(0);
+                resultFrame.addEventListener("load", iframeReady);
             };
 
             function iframeReady() {
diff --git a/src/Umbraco.Web.UI.Client/src/utilities.js b/src/Umbraco.Web.UI.Client/src/utilities.js
index 9121ba0e25..64884b589b 100644
--- a/src/Umbraco.Web.UI.Client/src/utilities.js
+++ b/src/Umbraco.Web.UI.Client/src/utilities.js
@@ -18,7 +18,7 @@
     /**
      * Facade to angular.copy
      */
-    const copy = val => angular.copy(val);
+    const copy = (src, dst) => angular.copy(src, dst);
 
     /**
      * Equivalent to angular.isArray
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js
index 268bfb3a8c..c212a08951 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js
@@ -157,8 +157,8 @@
         }
 
         function openTourGroup(tourAlias) {
-            angular.forEach(vm.tours, function (group) {
-                angular.forEach(group, function (tour) {
+            vm.tours.forEach(function (group) {
+                group.tours.forEach(function (tour) {
                     if (tour.alias === tourAlias) {
                         group.open = true;
                     }
@@ -168,9 +168,9 @@
 
         function getTourGroupCompletedPercentage() {
             // Finding out, how many tours are completed for the progress circle
-            angular.forEach(vm.tours, function(group){
+            vm.tours.forEach(function(group){
                 var completedTours = 0;
-                angular.forEach(group.tours, function(tour){
+                group.tours.forEach(function(tour){
                     if(tour.completed) {
                         completedTours++;
                     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
index aa6126e73e..4f6b283fd8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
@@ -2,8 +2,8 @@
     <umb-drawer-view>
 
         <umb-drawer-header
-            title="{{ vm.title }}"
-            description="{{ vm.subtitle }}">
+            title="{{vm.title}}"
+            description="{{vm.subtitle}}">
         </umb-drawer-header>
 
         <umb-drawer-content>
@@ -14,20 +14,19 @@
 
                 <div class="umb-help-list">
 
-
                     <div ng-repeat="tour in vm.docTypeTours | orderBy:'groupOrder'">
                         <div data-element="tour-{{tour.alias}}" class="umb-help-list-item">
                             <div class="umb-help-list-item__content justify-between">
-                                <div class="flex items-center">                                   
+                                <div class="flex items-center">
                                     <span class="umb-help-list-item__title">{{ tour.name }}</span>
                                 </div>
                                 <div>
-                                    <umb-button  button-style="primary" size="xxs" type="button" label="Start" action="vm.startTour(tour)"></umb-button>                                   
+                                    <umb-button button-style="primary" size="xxs" type="button" label="Start" action="vm.startTour(tour)"></umb-button>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </div>           
+                </div>
             </div>
 
             <!-- Tours -->
@@ -98,58 +97,58 @@
                 </h5>
                 <ul class="umb-help-list">
                     <li class="umb-help-list-item" ng-repeat="topic in vm.topics track by $index">
-                        <a class="umb-help-list-item__content" data-element="help-article-{{topic.name}}" target="_blank" ng-href="{{topic.url}}?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=tv">
+                        <a class="umb-help-list-item__content" data-element="help-article-{{topic.name}}" href="#" ng-href="{{topic.url}}?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=tv" target="_blank" rel="noopener">
                             <span>
                                 <span class="umb-help-list-item__title">
                                     <span class="bold">{{topic.name}}</span>
-                                    <span class="umb-help-list-item__open-icon icon-out"></span>
+                                    <umb-icon icon="icon-out" class="umb-help-list-item__open-icon icon-out"></umb-icon>
                                 </span>
                                 <span class="umb-help-list-item__description">{{topic.description}}</span>
-                            </span>                            
-                    </a>
-                </li>
-            </ul>
-        </div>
+                            </span>
+                        </a>
+                    </li>
+                </ul>
+            </div>
 
-        <!--  Umbraco tv content -->
-        <div class="umb-help-section" data-element="help-videos" ng-if="vm.hasAccessToSettings">
-            <h5 class="umb-help-section__title" ng-if="vm.videos.length > 0">
-                <localize key="general_videos">Videos</localize>
-            </h5>
-            <ul class="umb-help-list">
-                <li class="umb-help-list-item" ng-repeat="video in vm.videos track by $index">
-                <a class="umb-help-list-item__content" data-element="help-article-{{video.title}}" target="_blank" ng-href="{{video.link}}?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=tv">
-                        <i class="umb-help-list-item__icon icon-tv-old" aria-hidden="true"></i>
-                        <span class="umb-help-list-item__title">{{video.title}}</span>
-                        <i class="umb-help-list-item__open-icon icon-out" aria-hidden="true"></i>
-                    </a>
-                </li>
-            </ul>
-        </div>
+            <!-- Umbraco tv content -->
+            <div class="umb-help-section" data-element="help-videos" ng-if="vm.hasAccessToSettings">
+                <h5 class="umb-help-section__title" ng-if="vm.videos.length > 0">
+                    <localize key="general_videos">Videos</localize>
+                </h5>
+                <ul class="umb-help-list">
+                    <li class="umb-help-list-item" ng-repeat="video in vm.videos track by $index">
+                        <a class="umb-help-list-item__content" data-element="help-article-{{video.title}}" href="#" ng-href="{{video.link}}?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=tv" target="_blank" rel="noopener">
+                            <i class="umb-help-list-item__icon icon-tv-old" aria-hidden="true"></i>
+                            <span class="umb-help-list-item__title">{{video.title}}</span>
+                            <i class="umb-help-list-item__open-icon icon-out" aria-hidden="true"></i>
+                        </a>
+                    </li>
+                </ul>
+            </div>
 
-        <!--  Links -->
-        <div class="umb-help-section" data-element="help-links" ng-if="vm.hasAccessToSettings">
-            <a data-element="help-link-umbraco-tv" class="umb-help-badge" target="_blank" href="https://umbraco.tv?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=tv">
-                <i class="umb-help-badge__icon icon-tv-old" aria-hidden="true"></i>
-                <div class="umb-help-badge__title">
-                    <localize key="help_umbracoTv">Visit umbraco.tv</localize>
-                </div>
-                <small>
-                    <localize key="help_theBestUmbracoVideoTutorials">The best Umbraco video tutorials</localize>
-                </small>
-            </a>
+            <!-- Links -->
+            <div class="umb-help-section" data-element="help-links" ng-if="vm.hasAccessToSettings">
+                <a data-element="help-link-umbraco-tv" class="umb-help-badge" href="https://umbraco.tv?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=tv" target="_blank" rel="noopener">
+                    <i class="umb-help-badge__icon icon-tv-old" aria-hidden="true"></i>
+                    <div class="umb-help-badge__title">
+                        <localize key="help_umbracoTv">Visit umbraco.tv</localize>
+                    </div>
+                    <small>
+                        <localize key="help_theBestUmbracoVideoTutorials">The best Umbraco video tutorials</localize>
+                    </small>
+                </a>
 
-            <a data-element="help-link-our-umbraco" class="umb-help-badge" target="_blank" href="https://our.umbraco.com?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=our">
-                <i class="umb-help-badge__icon icon-favorite" aria-hidden="true"></i>
+                <a data-element="help-link-our-umbraco" class="umb-help-badge" href="https://our.umbraco.com?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=our" target="_blank" rel="noopener">
+                    <i class="umb-help-badge__icon icon-favorite" aria-hidden="true"></i>
 
-                <div class="umb-help-badge__title">
-                    <localize key="help_umbracoForum">Visit our.umbraco.com</localize>
-                </div>
-                <small>
-                    <localize key="defaultdialogs_theFriendliestCommunity">The friendliest community</localize>
-                </small>
-            </a>
-        </div>
+                    <div class="umb-help-badge__title">
+                        <localize key="help_umbracoForum">Visit our.umbraco.com</localize>
+                    </div>
+                    <small>
+                        <localize key="defaultdialogs_theFriendliestCommunity">The friendliest community</localize>
+                    </small>
+                </a>
+            </div>
 
         </umb-drawer-content>
 
@@ -159,6 +158,7 @@
                 <umb-button
                     alias="close"
                     type="button"
+                    shortcut="esc"
                     button-style="link"
                     label-key="general_close"
                     action="vm.closeDrawer()">
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.content.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.content.html
new file mode 100644
index 0000000000..15c3b9594f
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.content.html
@@ -0,0 +1 @@
+<umb-element-editor-content model="model.content"></umb-element-editor-content>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js
new file mode 100644
index 0000000000..88cda027a8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js
@@ -0,0 +1,99 @@
+angular.module("umbraco")
+    .controller("Umbraco.Editors.BlockEditorController",
+        function ($scope, localizationService, formHelper, overlayService) {
+            var vm = this;
+
+            vm.model = $scope.model;
+            vm.tabs = [];
+
+            localizationService.localizeMany([
+                vm.model.createFlow ? "general_cancel" : (vm.model.liveEditing ? "prompt_discardChanges" : "general_close"),
+                vm.model.createFlow ? "general_create" : (vm.model.liveEditing ? "buttons_confirmActionConfirm" : "buttons_submitChanges")
+            ]).then(function (data) {
+                vm.closeLabel = data[0];
+                vm.submitLabel = data[1];
+            });
+
+            if (vm.model.content && vm.model.content.variants) {
+
+                var apps = vm.model.content.apps;
+
+                // configure the content app based on settings
+                var contentApp = apps.find(entry => entry.alias === "umbContent");
+                if (contentApp) {
+                    if (vm.model.hideContent) {
+                        apps.splice(apps.indexOf(contentApp), 1);
+                    }
+                    contentApp.active = (vm.model.openSettings !== true);
+                }
+
+                if (vm.model.settings && vm.model.settings.variants) {
+                    var settingsApp = apps.find(entry => entry.alias === "settings");
+                    if (settingsApp) {
+                        settingsApp.active = (vm.model.openSettings === true);
+                    }
+                }
+
+                vm.tabs = apps;
+            }
+
+            vm.submitAndClose = function () {
+                if (vm.model && vm.model.submit) {
+
+                    // always keep server validations since this will be a nested editor and server validations are global
+                    if (formHelper.submitForm({
+                        scope: $scope,
+                        formCtrl: vm.blockForm,
+                        keepServerValidation: true
+                    })) {
+                        vm.model.submit(vm.model);
+                        vm.saveButtonState = "success";
+                    } else {
+                        vm.saveButtonState = "error";
+                    }
+                }
+            }
+
+            vm.close = function () {
+                if (vm.model && vm.model.close) {
+                    // TODO: At this stage there could very well have been server errors that have been cleared
+                    // but if we 'close' we are basically cancelling the value changes which means we'd want to cancel
+                    // all of the server errors just cleared. It would be possible to do that but also quite annoying.
+                    // The rudimentary way would be to:
+                    // * Track all cleared server errors here by subscribing to the prefix validation of controls contained here
+                    // * If this is closed, re-add all of those server validation errors
+                    // A more robust way to do this would be to:
+                    // * Add functionality to the serverValidationManager whereby we can remove validation errors and it will
+                    //      maintain a copy of the original errors
+                    // * It would have a 'commit' method to commit the removed errors - which we would call in the formHelper.submitForm when it's successful
+                    // * It would have a 'rollback' method to reset the removed errors - which we would call here
+
+                    if (vm.model.createFlow === true || vm.blockForm.$dirty === true) {
+                        var labels = vm.model.createFlow === true ? ["blockEditor_confirmCancelBlockCreationHeadline", "blockEditor_confirmCancelBlockCreationMessage"] : ["prompt_discardChanges", "blockEditor_blockHasChanges"];
+                        localizationService.localizeMany(labels).then(function (localizations) {
+                            const confirm = {
+                                title: localizations[0],
+                                view: "default",
+                                content: localizations[1],
+                                submitButtonLabelKey: "general_discard",
+                                submitButtonStyle: "danger",
+                                closeButtonLabelKey: "prompt_stay",
+                                submit: function () {
+                                    overlayService.close();
+                                    vm.model.close(vm.model);
+                                },
+                                close: function () {
+                                    overlayService.close();
+                                }
+                            };
+                            overlayService.open(confirm);
+                        });
+                    } else {
+                        vm.model.close(vm.model);
+                    }
+
+                }
+            }
+
+        }
+    );
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.html
new file mode 100644
index 0000000000..2367771804
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.html
@@ -0,0 +1,59 @@
+<div class="umb-block-editor"  ng-controller="Umbraco.Editors.BlockEditorController as vm">
+
+    <ng-form name="vm.blockForm" val-form-manager>
+
+        <umb-editor-view umb-tabs ng-if="!page.loading">
+
+            <umb-editor-header
+                name="vm.model.title"
+                name-required="false"
+                name-locked="true"
+                navigation="vm.tabs"
+                hide-alias="true"
+                hide-icon="true"
+                hide-description="true">
+            </umb-editor-header>
+
+            <div class="umb-editor-container umb-panel-body umb-scrollable row-fluid">
+
+                <!-- Missing Deleted Message Bar (Displayed when viewing node in recycle bin), but Blocks dosnt go into trash-bin jet...
+                    <div ng-show="vm.content.trashed" class="umb-editor--trashed-message">
+                        <i class="icon icon-trash"></i> <localize key="content_nodeIsInTrash">This item is in the Recycle Bin</localize>
+                    </div>
+                -->
+
+                <div class="umb-pane">
+                    <umb-editor-sub-views sub-views="vm.tabs" model="vm.model">
+                    </umb-editor-sub-views>
+                </div>
+
+            </div>
+
+            <umb-editor-footer>
+
+                <!-- Missing breadcrumbs -->
+
+                <umb-editor-footer-content-right>
+
+                    <umb-button
+                        action="vm.close()"
+                        shortcut="esc"
+                        button-style="link"
+                        label="{{vm.closeLabel}}"
+                        type="button">
+                    </umb-button>
+
+                    <umb-button
+                        action="vm.submitAndClose()"
+                        button-style="primary"
+                        state="vm.saveButtonState"
+                        label="{{vm.submitLabel}}"
+                        type="button">
+                    </umb-button>
+
+                </umb-editor-footer-content-right>
+
+            </umb-editor-footer>
+        </umb-editor-view>
+    </ng-form>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.settings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.settings.html
new file mode 100644
index 0000000000..df69e2e648
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.settings.html
@@ -0,0 +1 @@
+<umb-element-editor-content model="model.settings"></umb-element-editor-content>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.controller.js
new file mode 100644
index 0000000000..2894e0bef4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.controller.js
@@ -0,0 +1,60 @@
+angular.module("umbraco")
+.controller("Umbraco.Editors.BlockPickerController",
+    function ($scope, localizationService) {
+        var vm = this;
+
+
+        vm.navigation = [];
+
+
+        localizationService.localizeMany(["blockEditor_tabCreateEmpty", "blockEditor_tabClipboard"]).then(
+            function (data) {
+
+                vm.navigation = [{
+                    "alias": "empty",
+                    "name": data[0],
+                    "icon": "icon-add",
+                    "active": true,
+                    "view": ""
+                },
+                {
+                    "alias": "clipboard",
+                    "name": data[1],
+                    "icon": "icon-paste-in",
+                    "view": "",
+                    "disabled": vm.model.clipboardItems.length === 0
+                }];
+
+                vm.activeTab = vm.navigation[0];
+            }
+        );
+
+        
+        vm.onNavigationChanged = function(tab) {
+            vm.activeTab.active = false;
+            vm.activeTab = tab;
+            vm.activeTab.active = true;
+        }
+
+        vm.clickClearClipboard = function() {
+            vm.onNavigationChanged(vm.navigation[0]);
+            vm.navigation[1].disabled = true;// disabled ws determined when creating the navigation, so we need to update it here.
+            vm.model.clipboardItems = [];// This dialog is not connected via the clipboardService events, so we need to update manually.
+            vm.model.clickClearClipboard();
+        }
+
+        vm.model = $scope.model;
+
+        vm.selectItem = function(item, $event) {
+            vm.model.selectedItem = item;
+            vm.model.submit($scope.model, $event);
+        }
+
+        vm.close = function() {
+            if ($scope.model && $scope.model.close) {
+                $scope.model.close($scope.model);
+            }
+        }
+
+    }
+);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.html
new file mode 100644
index 0000000000..4b08d4e5fc
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.html
@@ -0,0 +1,83 @@
+<div class="umb-block-editor" ng-controller="Umbraco.Editors.BlockPickerController as vm">
+
+    <umb-editor-view ng-if="!page.loading">
+
+        <umb-editor-header
+            name="vm.model.title"
+            navigation="vm.navigation"
+            on-select-navigation-item="vm.onNavigationChanged(item)"
+            name-locked="true"
+            hide-alias="true"
+            hide-icon="true"
+            hide-description="true">
+        </umb-editor-header>
+
+        <div class="umb-editor-container umb-panel-body umb-scrollable row-fluid">
+
+            <div class="umb-pane" ng-if="vm.activeTab.alias === 'empty'">
+
+                <div class="form-search" ng-if="vm.model.filter === true" style="margin-bottom: 20px;">
+                    <i class="icon-search"></i>
+                    <input type="text"
+                           ng-model="searchTerm"
+                           class="umb-search-field search-query input-block-level -full-width-input"
+                           localize="placeholder"
+                           placeholder="@placeholders_filter"
+                           umb-auto-focus
+                           no-dirty-check />
+                </div>
+
+                <div class="umb-block-card-grid">
+
+                    <umb-block-card
+                        class="umb-outline"
+                        umb-auto-focus="vm.model.filter === false && $index === 0"
+                        ng-repeat="block in vm.model.availableItems | filter:searchTerm"
+                        block-config-model="block.blockConfigModel"
+                        element-type-model="block.elementTypeModel"
+                        ng-click="vm.selectItem(block, $event)">
+                    </umb-block-card>
+                </div>
+            </div>
+
+            <div class="umb-pane" ng-if="vm.activeTab.alias === 'clipboard'">
+                <div style="margin-bottom:20px; text-align: right;">
+                    <umb-button
+                        type="button"
+                        icon="icon-trash"
+                        button-style="link"
+                        label-key="clipboard_labelForClearClipboard"
+                        action="vm.clickClearClipboard()">
+                    </umb-button>
+                </div>
+
+                <div class="umb-block-card-grid">
+
+                    <umb-block-card
+                        block-config-model="block.blockConfigModel"
+                        element-type-model="block.elementTypeModel"
+                        ng-repeat="block in vm.model.clipboardItems"
+                        ng-click="vm.model.clickPasteItem(block, $event)">
+                    </umb-block-card>
+                </div>
+            </div>
+
+        </div>
+
+        <umb-editor-footer>
+
+            <umb-editor-footer-content-right>
+
+                <umb-button
+                    action="vm.close()"
+                    shortcut="esc"
+                    button-style="link"
+                    label-key="general_cancel"
+                    type="button">
+                </umb-button>
+
+            </umb-editor-footer-content-right>
+
+        </umb-editor-footer>
+    </umb-editor-view>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
index aa0cd54dff..526d2d4dfa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
@@ -1,15 +1,17 @@
 (function () {
     "use strict";
 
-    function CompositionsController($scope, $location, $filter, overlayService, localizationService) {
+    function CompositionsController($scope, $location, $filter, $timeout, overlayService, localizationService) {
 
         var vm = this;
         var oldModel = null;
 
         vm.showConfirmSubmit = false;
+        vm.loadingAlias = null;
 
         vm.isSelected = isSelected;
         vm.openContentType = openContentType;
+        vm.selectCompositeContentType = selectCompositeContentType;
         vm.submit = submit;
         vm.close = close;
 
@@ -23,10 +25,13 @@
                 $scope.model.title = "Compositions";
             }
 
-            // group the content types by their container paths
+            // Group the content types by their container paths
             vm.availableGroups = $filter("orderBy")(
                 _.map(
                     _.groupBy($scope.model.availableCompositeContentTypes, function (compositeContentType) {
+                        
+                        compositeContentType.selected = isSelected(compositeContentType.contentType.alias);
+
                         return compositeContentType.contentType.metaData.containerPath;
                     }), function (group) {
                         return {
@@ -39,12 +44,12 @@
                 });
         }
 
-
-
+        
         function isSelected(alias) {
             if ($scope.model.contentType.compositeContentTypes.indexOf(alias) !== -1) {
                 return true;
             }
+            return false;
         }
 
         function openContentType(contentType, section) {
@@ -52,6 +57,25 @@
             $location.path(url);
         }
 
+        function selectCompositeContentType(compositeContentType) {
+            vm.loadingAlias = compositeContentType.contentType.alias
+            
+            var contentType = compositeContentType.contentType;
+
+            $scope.model.selectCompositeContentType(contentType).then(function (response) {
+                vm.loadingAlias = null;
+            });
+
+            // Check if the template is already selected.
+            var index = $scope.model.contentType.compositeContentTypes.indexOf(contentType.alias);
+
+            if (index === -1) {
+                $scope.model.contentType.compositeContentTypes.push(contentType.alias);
+            } else {
+                $scope.model.contentType.compositeContentTypes.splice(index, 1);
+            }
+        }
+
         function submit() {
             if ($scope.model && $scope.model.submit) {
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
index 4096192081..98db2b0336 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
@@ -17,32 +17,28 @@
                 <umb-box-content>
 
                     <div class="umb-control-group">
-                        <div class="form-search">
-                            <i class="icon-search"></i>
-                            <input 
-                                type="text"
-                                style="width: 100%"
-                                ng-model="searchTerm"
-                                class="umb-search-field search-query input-block-level"
-                                localize="placeholder"
-                                placeholder="@placeholders_filter"
-                                umb-auto-focus
-                                no-dirty-check />
-                        </div>
+
+                        <umb-search-filter
+                            input-id="composition-search"
+                            model="searchTerm"
+                            label-key="placeholders_filter"
+                            text="Type to filter..."
+                            css-class="w-100"
+                            auto-focus="true">
+                        </umb-search-filter>
+
                     </div>
-                        
+
                     <div class="umb-control-group">
                         <localize key="contentTypeEditor_compositionsDescription"></localize>
                     </div>
-                        
-                    <umb-empty-state 
-                        ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes <= 1"
-                        position="center">
+
+                    <umb-empty-state ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes <= 1"
+                                     position="center">
                         <localize key="contentTypeEditor_noAvailableCompositions"></localize>
                     </umb-empty-state>
 
-                    <umb-empty-state
-                        ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes > 1">
+                    <umb-empty-state ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes > 1">
                         <localize key="contentTypeEditor_compositionInUse"></localize>
                     </umb-empty-state>
 
@@ -50,7 +46,7 @@
                         <h5><localize key="contentTypeEditor_compositionUsageHeading"></localize></h5>
                         <p><localize key="contentTypeEditor_compositionUsageSpecification"></localize></p>
                         <ul class="umb-checkbox-list">
-                            <li class="umb-checkbox-list__item" 
+                            <li class="umb-checkbox-list__item"
                                 ng-repeat="contentTypeEntity in model.whereCompositionUsed">
                                 <a ng-click="vm.openContentType(contentTypeEntity.contentType, model.section)">
                                     <i class="{{contentTypeEntity.contentType.icon}}"></i>
@@ -68,21 +64,21 @@
                             </li>
                             <li class="umb-checkbox-list__item"
                                 ng-repeat="compositeContentType in group.compositeContentTypes | orderBy:'contentType.name' | filter:searchTerm"
-                                ng-class="{'-disabled': compositeContentType.allowed===false || compositeContentType.inherited, '-selected': vm.isSelected(compositeContentType.contentType.alias)}">
-
-                                <div class="umb-checkbox-list__item-checkbox"
-                                     ng-class="{ '-selected': model.compositeContentTypes.indexOf(compositeContentType.contentType.alias)+1 }">
-                                    <input type="checkbox"
-                                           id="umb-overlay-comp-{{compositeContentType.contentType.key}}"
-                                           checklist-model="model.compositeContentTypes"
-                                           checklist-value="compositeContentType.contentType.alias"
-                                           ng-change="model.selectCompositeContentType(compositeContentType.contentType)"
-                                           ng-disabled="compositeContentType.allowed===false || compositeContentType.inherited" />                                  
+                                ng-class="{'-disabled': (compositeContentType.allowed === false && !compositeContentType.selected) || compositeContentType.inherited, '-selected': compositeContentType.selected}">
 
+                                <div class="umb-checkbox-list__item-checkbox" ng-class="{'-selected': compositeContentType.selected }">
+                                    <umb-checkbox input-id="umb-overlay-comp-{{compositeContentType.contentType.key}}"
+                                                  model="compositeContentType.selected"
+                                                  on-change="vm.selectCompositeContentType(compositeContentType)"
+                                                  disabled="(compositeContentType.allowed === false && !compositeContentType.selected) || compositeContentType.inherited || vm.loadingAlias">
+                                    </umb-checkbox>
                                 </div>
 
-                                <label for="umb-overlay-comp-{{compositeContentType.contentType.key}}" class="umb-checkbox-list__item-text" ng-class="{'-faded': compositeContentType.allowed===false}">
-                                    <i class="{{ compositeContentType.contentType.icon }} umb-checkbox-list__item-icon"></i>
+                                <label for="umb-overlay-comp-{{compositeContentType.contentType.key}}" class="umb-checkbox-list__item-text" ng-class="{'-faded': compositeContentType.allowed === false && !compositeContentType.selected}">
+                                    <div class="umb-checkbox-list__item-icon-wrapper">
+                                        <i class="{{ compositeContentType.contentType.icon }} umb-checkbox-list__item-icon" ng-class="{'o-0': compositeContentType.contentType.alias === vm.loadingAlias}"></i>
+                                        <div ng-if="compositeContentType.contentType.alias === vm.loadingAlias" class="umb-button__progress -black umb-checkbox-list__item-checkbox-progress"></div>
+                                    </div>
                                     {{ compositeContentType.contentType.name }}
                                     <span class="umb-checkbox-list__item-caption" ng-if="compositeContentType.inherited">(inherited)</span>
                                 </label>
@@ -115,7 +111,7 @@
         </umb-editor-footer>
 
         </form>
-        
+
     </umb-editor-view>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypeconfigurationpicker/datatypeconfigurationpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypeconfigurationpicker/datatypeconfigurationpicker.controller.js
index 9ee80488af..dc68771ed0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypeconfigurationpicker/datatypeconfigurationpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypeconfigurationpicker/datatypeconfigurationpicker.controller.js
@@ -42,15 +42,14 @@
                 
                 var filteredConfigs = [];
                 
-                _.each(configs, function(configGroup) {
-                        for(var i = 0; i<configGroup.length; i++) {
-                            if (configGroup[i].alias === $scope.model.editor.alias) {
-                                filteredConfigs.push(configGroup[i]);
-                            }
+                Object.values(configs).forEach(configGroup => {
+                    for(var i = 0; i < configGroup.length; i++) {
+                        if (configGroup[i].alias === $scope.model.editor.alias) {
+                            filteredConfigs.push(configGroup[i]);
                         }
                     }
-                );
-                
+                });
+            
                 vm.configs = filteredConfigs;
                 vm.loading = false;
             });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
index d6e2d8133d..3d8e1d4d0b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
@@ -15,20 +15,16 @@
             <umb-box>
                 <umb-box-content>
 
-                    <div class="umb-control-group -no-border">
-                        <div class="form-search">
-                            <i class="icon-search"></i>
-                            <input type="text"
-                                    style="width: 100%"
-                                    ng-change="vm.searchTermChanged()"
-                                    ng-model="vm.searchTerm"
-                                    class="umb-search-field search-query search-input input-block-level"
-                                    localize="placeholder"
-                                    placeholder="@placeholders_search"
-                                    umb-auto-focus
-                                    no-dirty-check />
-                        </div>
-                    </div>
+                    <umb-search-filter
+                        input-id="datatype-search"
+                        model="vm.searchTerm"
+                        label-key="placeholders_search"
+                        text="Type to search"
+                        on-change="vm.searchTermChanged()"
+                        css-class="w-100"
+                        auto-focus="true"
+                    >
+                    </umb-search-filter>
 
                     <umb-load-indicator ng-if="vm.loading === true"></umb-load-indicator>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
index 515f54e3d7..c3d1312109 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
@@ -22,7 +22,7 @@
         };
 
         if ($scope.model.modify) {
-            angular.extend($scope.model.embed, $scope.model.modify);
+            Utilities.extend($scope.model.embed, $scope.model.modify);
 
             showPreview();
         }
@@ -34,7 +34,7 @@
         vm.close = close;
 
         function onInit() {
-            if(!$scope.model.title) {
+            if (!$scope.model.title) {
                 localizationService.localize("general_embed").then(function(value){
                     $scope.model.title = value;
                 });
@@ -122,7 +122,6 @@
            if ($scope.model.embed.url !== "") {
                showPreview();
            }
-
        }
 
        function toggleConstrain() {
@@ -130,19 +129,18 @@
        }
 
        function submit() {
-            if($scope.model && $scope.model.submit) {
+            if ($scope.model && $scope.model.submit) {
                 $scope.model.submit($scope.model);
             }
         }
 
         function close() {
-            if($scope.model && $scope.model.close) {
+            if ($scope.model && $scope.model.close) {
                 $scope.model.close();
             }
         }
 
         onInit();
-
    }
 
    angular.module("umbraco").controller("Umbraco.Editors.EmbedController", EmbedController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
index 5862ca7059..19cf9b2278 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
@@ -16,7 +16,7 @@
                     <umb-box-content>
 
                         <umb-control-group label="@general_url">
-                            <input id="url" class="umb-property-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" focus-when="{{true}}" required />
+                            <input type="text" id="url" class="umb-property-editor input-block-level" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" focus-when="{{true}}" required />
                             <umb-button
                                 type="button"
                                 action="vm.showPreview()"
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
index 5bfee22c4e..59a9aed4bb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
@@ -6,7 +6,7 @@
  * @description
  * The controller for the content type editor icon picker
  */
-function IconPickerController($scope, iconHelper, localizationService) {
+function IconPickerController($scope, localizationService, iconHelper) {
 
     var vm = this;
 
@@ -42,15 +42,30 @@ function IconPickerController($scope, iconHelper, localizationService) {
         vm.loading = true;
 
         setTitle();
-    
-        iconHelper.getIcons().then(function (icons) {
-            vm.icons = icons;
-            vm.loading = false;
-        });
+
+        iconHelper.getAllIcons()
+            .then(icons => {
+                vm.icons = icons;
+
+                // Get's legacy icons, removes duplicates then maps them to IconModel
+                iconHelper.getIcons()
+                    .then(icons => {
+                        if (icons && icons.length > 0) {
+                            let legacyIcons = icons
+                                .filter(icon => !vm.icons.find(x => x.name == icon))
+                                .map(icon => { return { name: icon, svgString: null }; });
+
+                            vm.icons = legacyIcons.concat(vm.icons);
+                        }
+
+                        vm.loading = false;
+                    });
+            });
 
         // set a default color if nothing is passed in
         vm.color = $scope.model.color ? findColor($scope.model.color) : vm.colors.find(x => x.default);
 
+
         // if an icon is passed in - preselect it
         vm.icon = $scope.model.icon ? $scope.model.icon : undefined;
     }
@@ -87,7 +102,7 @@ function IconPickerController($scope, iconHelper, localizationService) {
     }
 
     function submit() {
-        if ($scope.model && $scope.model.submit) {            
+        if ($scope.model && $scope.model.submit) {
             $scope.model.submit($scope.model);
         }
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
index c2b0d0e458..7368d2f39b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
@@ -18,17 +18,14 @@
             <umb-box-content>
 
                 <div class="umb-control-group">
-                    <div class="form-search">
-                        <i class="icon-search"></i>
-                        <input type="text"
-                                style="width: 100%"
-                                ng-model="searchTerm"
-                                class="umb-search-field search-query input-block-level"
-                                localize="placeholder"
-                                placeholder="@placeholders_filter"
-                                umb-auto-focus
-                                no-dirty-check />
-                    </div>
+                    <umb-search-filter
+                        input-id="icon-search"
+                        model="searchTerm"
+                        label-key="placeholders_filter"
+                        text="Type to filter..."
+                        css-class="w-100"
+                        auto-focus="true">
+                    </umb-search-filter>
                 </div>
 
                 <div class="umb-control-group">
@@ -45,10 +42,10 @@
 
                 <div class="umb-control-group" ng-show="!vm.loading && filtered.length > 0 ">
                     <ul class="umb-iconpicker" ng-class="vm.color.value" ng-show="vm.icons">
-                        <li class="umb-iconpicker-item" ng-class="{'-selected': icon == model.icon}" ng-repeat="icon in filtered = (vm.icons | filter: searchTerm) track by $id(icon)">
-                            <button type="button" title="{{icon}}" ng-click="vm.selectIcon(icon, vm.color.value)" prevent-default>
-                                <i class="{{icon}} large" aria-hidden="true"></i>
-                                <span class="sr-only"><localize key="buttons_select">Select</localize> {{icon}}</span>
+                        <li class="umb-iconpicker-item" ng-class="{'-selected': icon.name == model.icon}" ng-repeat="icon in filtered = (vm.icons | filter: searchTerm | orderBy:'name') track by $id(icon)">
+                            <button type="button" title="{{icon.name}}" ng-click="vm.selectIcon(icon.name, vm.color.value)">
+                                <umb-icon class="umb-iconpicker-svg {{icon.name}} large" icon="{{icon.name}}"></umb-icon>
+                                <span class="sr-only"><localize key="buttons_select">Select</localize> {{icon.name}}</span>
                             </button>
                         </li>
                     </ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html
index ea247c77e5..2ce7af8d9d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html
@@ -9,32 +9,32 @@
             hide-icon="true"
             hide-description="true">
         </umb-editor-header>
-        
+
         <umb-editor-container>
 
             <umb-box>
                 <umb-box-content>
                     <div class="umb-insert-code-boxes">
-                        <div ng-if="model.allowedTypes.umbracoField" class="umb-insert-code-box" ng-click="vm.openPageFieldOverlay()">
-                            <div class="umb-insert-code-box__title"><localize key="template_insertPageField" />...</div>
-                            <div class="umb-insert-code-box__description"><localize key="template_insertPageFieldDesc" /></div>
-                        </div>
-                        <div ng-if="model.allowedTypes.partial" class="umb-insert-code-box" ng-click="vm.openPartialOverlay()">
-                            <div class="umb-insert-code-box__title"><localize key="template_insertPartialView" />...</div>
-                            <div class="umb-insert-code-box__description">
-                                <localize key="template_insertPartialViewDesc" />
-                            </div>
-                        </div>
-                        <div ng-if="model.allowedTypes.macro" class="umb-insert-code-box" ng-click="vm.openMacroPicker()">
-                            <div class="umb-insert-code-box__title"><localize key="template_insertMacro" />...</div>
-                            <div class="umb-insert-code-box__description">
-                                <localize key="template_insertMacroDesc" />
-                            </div>
-                        </div>
-                        <div ng-if="model.allowedTypes.dictionary" class="umb-insert-code-box" ng-click="vm.openDictionaryItemOverlay()">
-                            <div class="umb-insert-code-box__title"><localize key="template_insertDictionaryItem" />...</div>
-                            <div class="umb-insert-code-box__description"><localize key="template_insertDictionaryItemDesc" /></div>
-                        </div>
+                        <button type="button" ng-if="model.allowedTypes.umbracoField" class="btn-reset umb-insert-code-box" ng-click="vm.openPageFieldOverlay()">
+                            <h2 class="umb-insert-code-box__title"><localize key="template_insertPageField">Value</localize></h2>
+                            <p class="umb-insert-code-box__description"><localize key="template_insertPageFieldDesc">Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values.</localize></p>
+                        </button>
+                        <button type="button" ng-if="model.allowedTypes.partial" class="btn-reset umb-insert-code-box" ng-click="vm.openPartialOverlay()">
+                            <h2 class="umb-insert-code-box__title"><localize key="template_insertPartialView">Partial view</localize></h2>
+                            <p class="umb-insert-code-box__description">
+                                <localize key="template_insertPartialViewDesc">A partial view is a separate template file which can be rendered inside another template, it's great for reusing markup or for separating complex templates into separate files.</localize>
+                            </p>
+                        </button>
+                        <button type="button" ng-if="model.allowedTypes.macro" class="btn-reset umb-insert-code-box" ng-click="vm.openMacroPicker()">
+                            <h2 class="umb-insert-code-box__title"><localize key="template_insertMacro">Macro</localize></h2>
+                            <p class="umb-insert-code-box__description">
+                                <localize key="template_insertMacroDesc">A Macro is a configurable component which is great for reusable parts of your design, where you need the option to provide parameters, such as galleries, forms and lists.</localize>
+                            </p>
+                        </button>
+                        <button type="button" ng-if="model.allowedTypes.dictionary" class="btn-reset umb-insert-code-box" ng-click="vm.openDictionaryItemOverlay()">
+                            <h2 class="umb-insert-code-box__title"><localize key="template_insertDictionaryItem">Dictionary item</localize></h2>
+                            <p class="umb-insert-code-box__description"><localize key="template_insertDictionaryItemDesc">A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites.</localize></p>
+                        </button>
                     </div>
                 </umb-box-content>
             </umb-box>
@@ -54,5 +54,5 @@
         </umb-editor-footer>
 
     </umb-editor-view>
-    
+
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.html
index bbb2e8c798..00b18565f7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.html
@@ -71,7 +71,7 @@
                         <div class="umb-el-wrap">
                             <div class="controls">
                                 <label class="control-label"><localize key="templateEditor_outputSample">Output sample</localize></label>
-                                <pre>{{ vm.generateOutputSample() }}</pre>
+                                <umb-code-snippet language="'cshtml'">{{ vm.generateOutputSample() }}</umb-code-snippet>
                             </div>
                         </div>
                     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
index 18d0c40b6a..c563394ab3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
@@ -13,7 +13,7 @@
         <umb-editor-container>
             <umb-box>
                 <umb-box-content>
-                    <div class="form-search" ng-hide="model.filter === false" style="margin-bottom: 15px;">
+                    <div class="form-search" ng-if="model.filter" style="margin-bottom: 15px;">
                         <i class="icon-search"></i>
                         <input type="text"
                                 ng-model="searchTerm"
@@ -25,14 +25,13 @@
                     </div>
 
                     <ul class="umb-card-grid -three-in-row">
-                        <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:'name' | filter:searchTerm"
-                            ng-click="vm.selectItem(availableItem)">
-                            <a class="umb-card-grid-item" href="" title="{{ availableItem.name }}">
+                        <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:'name' | filter:searchTerm">
+                            <button type="button" class="btn-reset umb-card-grid-item" title="{{ availableItem.name }}" ng-click="vm.selectItem(availableItem)">
                                 <span>
-                                    <i class="{{ availableItem.icon }}"></i>
+                                    <i class="{{ availableItem.icon }}" aria-hidden="true"></i>
                                     {{ availableItem.name }}
                                 </span>
-                            </a>
+                            </button>
                         </li>
                     </ul>
                 </umb-box-content>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
index a9803b70f9..4106f7d096 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
@@ -147,7 +147,7 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
                 });
             }
 
-            if (!angular.isUndefined($scope.model.target.isMedia)) {
+            if (!Utilities.isUndefined($scope.model.target.isMedia)) {
                 delete $scope.model.target.isMedia;
             }
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
index ad0aaab57c..093e69b5ed 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
@@ -76,7 +76,8 @@
                             <umb-tree-search-results
                                 ng-if="searchInfo.showSearch"
                                 results="searchInfo.results"
-                                select-result-callback="selectResult">
+                                select-result-callback="selectResult"
+                                empty-search-result-position="default">
                             </umb-tree-search-results>
 
                             <div ng-hide="searchInfo.showSearch">
@@ -106,9 +107,9 @@
 
                     <div class="umb-control-group">
                         <h5><localize key="defaultdialogs_linkToMedia">Link to media</localize></h5>
-                        <a href ng-click="switchToMediaPicker()" class="btn">
+                        <button type="button" ng-click="switchToMediaPicker()" class="btn">
                             <localize key="defaultdialogs_selectMedia">Select media</localize>
-                        </a>
+                        </button>
                     </div>
 
                 </umb-box-content>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.controller.js
index 5b81cb947d..81e3e6bb34 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.controller.js
@@ -103,9 +103,6 @@
 
         function pickParameterEditor(selectedParameterEditor) {
 
-            console.log("pickParameterEditor", selectedParameterEditor);
-            console.log("$scope.model", $scope.model);
-
             $scope.model.parameter.editor = selectedParameterEditor.alias;
             $scope.model.parameter.dataTypeName = selectedParameterEditor.name;
             $scope.model.parameter.dataTypeIcon = selectedParameterEditor.icon;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.html
index 9f2b56401d..760c5331b7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.html
@@ -17,20 +17,16 @@
                 <umb-box-content>
 
                     <!-- FILTER -->
-                    <div class="umb-control-group -no-border">
-                        <div class="form-search">
-                            <i class="icon-search"></i>
-                            <input type="text"
-                                   style="width: 100%"
-                                   ng-change="vm.filterItems()"
-                                   ng-model="vm.searchTerm"
-                                   class="umb-search-field search-query search-input input-block-level"
-                                   localize="placeholder"
-                                   placeholder="@placeholders_filter"
-                                   umb-auto-focus
-                                   no-dirty-check />
-                        </div>
-                    </div>
+                    <umb-search-filter
+                        input-id="macroparameter-search"
+                        model="vm.searchTerm"
+                        label-key="placeholders_filter"
+                        text="Type to filter..."
+                        css-class="w-100"
+                        on-change="vm.filterItems()"
+                        auto-focus="true"
+                    >
+                    </umb-search-filter>
 
                     <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
 
@@ -39,15 +35,18 @@
                             <h5>{{key}}</h5>
                             <ul class="umb-card-grid -four-in-row" ng-mouseleave="vm.hideDetailsOverlay()">
                                 <li ng-repeat="parameterEditor in value | orderBy:'name'"
-                                    data-element="editor-{{parameterEditor.name}}"
-                                    ng-mouseover="vm.showDetailsOverlay(parameterEditor)"
-                                    ng-click="vm.pickParameterEditor(parameterEditor)">
-                                    <a class="umb-card-grid-item" href="" title="{{parameterEditor.name}}">
+                                    data-element="editor-{{parameterEditor.name}}">
+                                    <button
+                                        type="button"
+                                        ng-mouseover="vm.showDetailsOverlay(parameterEditor)"
+                                        ng-click="vm.pickParameterEditor(parameterEditor)"
+                                        class="btn-reset umb-card-grid-item"
+                                        title="{{parameterEditor.name}}">
                                         <span>
-                                            <i class="{{parameterEditor.icon}}" ng-class="{'icon-autofill': parameterEditor.icon == null}"></i>
+                                            <i class="{{parameterEditor.icon}}" ng-class="{'icon-autofill': parameterEditor.icon == null}" aria-hidden="true"></i>
                                             {{parameterEditor.name}}
                                         </span>
-                                    </a>
+                                    </button>
                                 </li>
                             </ul>
                         </div>
@@ -60,15 +59,18 @@
                                 <div ng-if="result.parameterEditors.length > 0">
                                     <h5>{{result.group}}</h5>
                                     <ul class="umb-card-grid -four-in-row" ng-mouseleave="vm.hideDetailsOverlay()">
-                                        <li ng-repeat="parameterEditor in result.parameterEditors | orderBy:'name'"
-                                            ng-mouseover="vm.showDetailsOverlay(parameterEditor)"
-                                            ng-click="vm.pickParameterEditor(parameterEditor)">
+                                        <li ng-repeat="parameterEditor in result.parameterEditors | orderBy:'name'">
                                             <div ng-if="parameterEditor.loading" class="umb-card-grid-item__loading">
                                                 <div class="umb-button__progress"></div>
                                             </div>
-                                            <a class="umb-card-grid-item" href="" title="{{parameterEditor.name}}">
+                                            <button
+                                                type="button"
+                                                ng-mouseover="vm.showDetailsOverlay(parameterEditor)"
+                                                ng-click="vm.pickParameterEditor(parameterEditor)"
+                                                class="btn-reset umb-card-grid-item"
+                                                title="{{parameterEditor.name}}">
                                                 <span>
-                                                    <i class="{{parameterEditor.icon}}" ng-class="{'icon-autofill': parameterEditor.icon == null}"></i>
+                                                    <i class="{{parameterEditor.icon}}" ng-class="{'icon-autofill': parameterEditor.icon == null}" aria-hidden="true"></i>
                                                     {{parameterEditor.name}}
                                                 </span>
                                             </a>
@@ -79,7 +81,7 @@
                         </div>
 
                         <umb-empty-state position="center" ng-if="vm.filterResult.totalResults === 0">
-                            <localize key="general_searchNoResult"></localize>
+                            <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
                         </umb-empty-state>
                     </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
index fc1bec4ec1..33d7a471a5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
@@ -15,29 +15,25 @@
                 <umb-box-content class="block-form">
                     <div ng-switch="wizardStep">
 
-                        <div ng-switch-when="macroSelect">
+                        <div ng-switch-when="macroSelect" class="macro-select">
 
-                            <div class="form-search">
-                                <i class="icon-search"></i>
-                                <input type="text"
-                                        style="width: 100%"
-                                        ng-model="searchTerm"
-                                        class="umb-search-field search-query input-block-level"
-                                        localize="placeholder"
-                                        placeholder="@placeholders_filter"
-                                        umb-auto-focus
-                                        no-dirty-check />
-                            </div>
+                            <umb-search-filter
+                                input-id="macro-search"
+                                model="searchTerm"
+                                label-key="placeholders_filter"
+                                text="Type to filter..."
+                                css-class="w-100 mb-15"
+                                auto-focus="true">
+                            </umb-search-filter>
 
                             <ul class="umb-card-grid -three-in-row">
-                                <li ng-repeat="availableItem in macros | orderBy:'name' | filter:searchTerm"
-                                    ng-click="selectMacro(availableItem)">
-                                    <a class="umb-card-grid-item" href="" title="{{availableItem.name}}">
+                                <li ng-repeat="availableItem in macros | orderBy:'name' | filter:searchTerm">
+                                    <button class="btn-reset umb-card-grid-item" title="{{availableItem.name}}" ng-click="selectMacro(availableItem)">
                                         <span>
-                                            <i class="icon-settings-alt"></i>
+                                            <i class="icon-settings-alt" aria-hidden="true"></i>
                                             {{availableItem.name}}
                                         </span>
-                                    </a>
+                                    </button>
                                 </li>
                             </ul>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 7a4db7cbc5..6f9ce6ee34 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
 //used for the media picker dialog
 angular.module("umbraco")
     .controller("Umbraco.Editors.MediaPickerController",
-        function ($scope, $timeout, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService, umbSessionStorage) {
+        function ($scope, $timeout, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService, umbSessionStorage, notificationsService) {
 
             var vm = this;
 
@@ -23,7 +23,9 @@ angular.module("umbraco")
             vm.clickHandler = clickHandler;
             vm.clickItemName = clickItemName;
             vm.gotoFolder = gotoFolder;
-            vm.shouldShowUrl = shouldShowUrl;
+            vm.toggleListView = toggleListView;
+            vm.selectLayout = selectLayout;
+            vm.showMediaList = false;
 
             var dialogOptions = $scope.model;
 
@@ -51,11 +53,11 @@ angular.module("umbraco")
             if ($scope.onlyImages) {
                 vm.acceptedFileTypes = mediaHelper.formatFileTypes(umbracoSettings.imageFileTypes);
             } else {
-                // Use whitelist of allowed file types if provided
+                // Use list of allowed file types if provided
                 if (allowedUploadFiles !== '') {
                     vm.acceptedFileTypes = allowedUploadFiles;
                 } else {
-                    // If no whitelist, we pass in a blacklist by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
+                    // If no allowed list, we pass in a disallowed list by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
                     vm.acceptedFileTypes = !mediaHelper.formatFileTypes(umbracoSettings.disallowedUploadFiles);
                 }
             }
@@ -83,6 +85,11 @@ angular.module("umbraco")
                 filter: '',
                 dataTypeKey: dataTypeKey
             };
+            vm.layout = {
+                layouts: [{ name: "Grid", icon: "icon-thumbnails-small", path: "gridpath", selected: true },
+                { name: "List", icon: "icon-list", path: "listpath", selected: true }],
+                activeLayout: { name: "Grid", icon: "icon-thumbnails-small", path: "gridpath", selected: true }
+            };
 
             // preload selected item
             $scope.target = null;
@@ -131,6 +138,7 @@ angular.module("umbraco")
                 } else {
                     // if a target is specified, go look it up - generally this target will just contain ids not the actual full
                     // media object so we need to look it up
+                    var originalTarget = $scope.target;
                     var id = $scope.target.udi ? $scope.target.udi : $scope.target.id;
                     var altText = $scope.target.altText;
 
@@ -140,13 +148,16 @@ angular.module("umbraco")
                         entityResource.getById(id, "Media")
                             .then(function (node) {
                                 $scope.target = node;
-                                if (ensureWithinStartNode(node)) {
+                                // Moving directly to existing node's folder
+                                gotoFolder({ id: node.parentId }).then(function() {
                                     selectMedia(node);
                                     $scope.target.url = mediaHelper.resolveFileFromEntity(node);
                                     $scope.target.thumbnail = mediaHelper.resolveFileFromEntity(node, true);
                                     $scope.target.altText = altText;
+                                    $scope.target.focalPoint = originalTarget.focalPoint;
+                                    $scope.target.coordinates = originalTarget.coordinates;
                                     openDetailsDialog();
-                                }
+                                });
                             }, gotoStartNode);
                     } else {
                         // No ID set - then this is going to be a tmpimg that has not been uploaded
@@ -156,8 +167,14 @@ angular.module("umbraco")
                 }
             }
 
-            function upload() {
-                $(".umb-file-dropzone .file-select").trigger("click");
+            function upload(v) {
+                var fileSelect = $(".umb-file-dropzone .file-select");
+                if (fileSelect.length === 0){
+                    localizationService.localize('media_uploadNotAllowed').then(function (message) { notificationsService.warning(message); });
+                }
+                else{
+                    fileSelect.trigger("click");
+                }
             }
 
             function dragLeave() {
@@ -213,15 +230,11 @@ angular.module("umbraco")
                                     return f.path.indexOf($scope.startNodeId) !== -1;
                                 });
                         });
-
-                    mediaTypeHelper.getAllowedImagetypes(folder.id)
-                        .then(function (types) {
-                            vm.acceptedMediatypes = types;
-                        });
                 } else {
                     $scope.path = [];
                 }
 
+                mediaTypeHelper.getAllowedImagetypes(folder.id).then(function (types) { vm.acceptedMediatypes = types; });
                 $scope.lockedFolder = (folder.id === -1 && $scope.model.startNodeIsVirtual) || hasFolderAccess(folder) === false;
                 $scope.currentFolder = folder;
 
@@ -230,6 +243,20 @@ angular.module("umbraco")
                 return getChildren(folder.id);
             }
 
+            function toggleListView() {
+                vm.showMediaList = !vm.showMediaList;
+            }
+
+            function selectLayout(layout) {
+                //this somehow doesn't set the 'active=true' property for the chosen layout
+                vm.layout.activeLayout = layout;
+                //workaround
+                vm.layout.layouts.forEach(element => element.active = false);
+                layout.active = true;
+                //set whether to toggle the list
+                vm.showMediaList = (layout.name === "List");
+            }
+
             function clickHandler(media, event, index) {
 
                 if (media.isFolder) {
@@ -262,7 +289,7 @@ angular.module("umbraco")
                     gotoFolder(item);
                 }
                 else {
-                    $scope.clickHandler(item, event, index);
+                    clickHandler(item, event, index);
                 }
             };
 
@@ -301,9 +328,7 @@ angular.module("umbraco")
                     $timeout(function () {
                         if ($scope.multiPicker) {
                             var images = _.rest($scope.images, $scope.images.length - files.length);
-                            _.each(images, function (image) {
-                                selectMedia(image);
-                            });
+                            images.forEach(image => selectMedia(image));
                         } else {
                             var image = $scope.images[$scope.images.length - 1];
                             clickHandler(image);
@@ -346,25 +371,27 @@ angular.module("umbraco")
             }
 
             function openDetailsDialog() {
-                localizationService.localize("defaultdialogs_editSelectedMedia").then(function (data) {
-                    vm.mediaPickerDetailsOverlay = {
-                        show: true,
-                        title: data,
-                        disableFocalPoint: $scope.disableFocalPoint,
-                        submit: function (model) {
-                            $scope.model.selection.push($scope.target);
-                            $scope.model.submit($scope.model);
 
-                            vm.mediaPickerDetailsOverlay.show = false;
-                            vm.mediaPickerDetailsOverlay = null;
-                        },
-                        close: function (oldModel) {
-                            vm.mediaPickerDetailsOverlay.show = false;
-                            vm.mediaPickerDetailsOverlay = null;
+                const dialog = {
+                    size: "small",
+                    cropSize: $scope.cropSize,
+                    target: $scope.target,
+                    disableFocalPoint: $scope.disableFocalPoint,
+                    submit: function () {
 
-                            close();
-                        }
-                    };
+                        $scope.model.selection.push($scope.target);
+                        $scope.model.submit($scope.model);
+
+                        editorService.close();
+                    },
+                    close: function () {
+                        editorService.close();
+                    }
+                };
+
+                localizationService.localize("defaultdialogs_editSelectedMedia").then(value => {
+                    dialog.title = value;
+                    editorService.mediaCropDetails(dialog);
                 });
             };
 
@@ -437,7 +464,6 @@ angular.module("umbraco")
                 // set thumbnail and src
                 mediaItem.thumbnail = mediaHelper.resolveFileFromEntity(mediaItem, true);
                 mediaItem.image = mediaHelper.resolveFileFromEntity(mediaItem, false);
-
                 // set properties to match a media object
                 if (mediaItem.metaData) {
                     mediaItem.properties = [];
@@ -465,6 +491,9 @@ angular.module("umbraco")
                             }
                         );
                     }
+                    if (mediaItem.metaData.UpdateDate !== null) {
+                        mediaItem.updateDate = mediaItem.metaData.UpdateDate;
+                    }
                 }
             }
 
@@ -479,7 +508,9 @@ angular.module("umbraco")
                             data[i].thumbnail = mediaHelper.resolveFileFromEntity(data[i], true);
                             data[i].image = mediaHelper.resolveFileFromEntity(data[i], false);
                         }
-
+                        if (data[i].metaData.UpdateDate !== null){
+                            data[i].updateDate = data[i].metaData.UpdateDate;
+                        }
                         data[i].filtered = allowedTypes && allowedTypes.indexOf(data[i].metaData.ContentTypeAlias) < 0;
                     }
 
@@ -515,7 +546,6 @@ angular.module("umbraco")
                 }
             }
 
-
             /**
              * Called when the umbImageGravity component updates the focal point value
              * @param {any} left
@@ -529,26 +559,6 @@ angular.module("umbraco")
                 };
             }
 
-            function setUpdatedMediaNodes(item) {
-                // add udi to list of updated media items so we easily can update them in other editors
-                if ($scope.model.updatedMediaNodes.indexOf(item.udi) === -1) {
-                    $scope.model.updatedMediaNodes.push(item.udi);
-                }
-            }
-
-            function shouldShowUrl() {
-                if (!$scope.target) {
-                    return false;
-                }
-                if ($scope.target.id) {
-                    return false;
-                }
-                if ($scope.target.url && $scope.target.url.toLower().indexOf("blob:") === 0) {
-                    return false;
-                }
-                return true;
-            }
-
             function submit() {
                 if ($scope.model && $scope.model.submit) {
                     $scope.model.submit($scope.model);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
index 51cbf0269a..df0c8e3cef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
@@ -1,5 +1,5 @@
 <div ng-controller="Umbraco.Editors.MediaPickerController as vm">
-    <umb-editor-view >
+    <umb-editor-view>
 
         <umb-editor-header
             name="model.title"
@@ -19,40 +19,53 @@
 
                         <div class="umb-mediapicker-upload">
                             <div class="form-search">
-                                <i class="icon-search" aria-hidden="true"></i>
-                                <input type="text"
-                                    class="umb-search-field search-query -full-width-input"
-                                    ng-model="vm.searchOptions.filter"
-                                    localize="placeholder"
-                                    placeholder="@placeholders_search"
-                                    ng-change="vm.changeSearch()"
-                                    umb-auto-focus
-                                    no-dirty-check />
+                                <umb-search-filter
+                                    input-id="datatype-search"
+                                    model="vm.searchOptions.filter"
+                                    label-key="placeholders_search"
+                                    text="Type to search"
+                                    on-change="vm.changeSearch()"
+                                    css-class="w-100"
+                                    auto-focus="true">
+                                </umb-search-filter>
 
                                 <div class="form-search__toggle">
-                                    <umb-checkbox
-                                        model="filterOptions.excludeSubFolders"
-                                        on-change="vm.toggle()"
-                                        text="Include subfolders in search"
-                                        label-key="general_excludeFromSubFolders">
+                                    <umb-checkbox model="filterOptions.excludeSubFolders"
+                                                  on-change="vm.toggle()"
+                                                  text="Include subfolders in search"
+                                                  label-key="general_excludeFromSubFolders">
                                     </umb-checkbox>
                                 </div>
                             </div>
 
                             <div class="upload-button">
-                                <umb-button
-                                    type="button"
-                                    label-key="general_upload"
-                                    action="vm.upload()"
-                                    disabled="lockedFolder"
-                                    button-style="action">
+                                <umb-button type="button"
+                                            label-key="general_upload"
+                                            action="vm.upload()"
+                                            disabled="lockedFolder"
+                                            button-style="action">
                                 </umb-button>
                             </div>
                         </div>
-
                     </div>
-
+                    <div class="row umb-control-group" ng-show="vm.searchOptions.filter && images.length > 0 && !vm.loading && !activeDrag">
+                        <div style="margin-left:auto;text-align:right" >
+                            <umb-layout-selector ng-show="vm.layout.layouts"
+                                                 layouts="vm.layout.layouts"
+                                                 active-layout="vm.layout.activeLayout"
+                                                 on-layout-select="vm.selectLayout(layout)">
+                            </umb-layout-selector>
+                        </div>
+                    </div>
                     <div class="row umb-control-group" ng-show="!vm.searchOptions.filter">
+                        <div class="pull-right">
+                            <umb-layout-selector ng-show="vm.layout.layouts"
+                                                 layouts="vm.layout.layouts"
+                                                 active-layout="vm.layout.activeLayout"
+                                                 on-layout-select="vm.selectLayout(layout)">
+                            </umb-layout-selector>
+                        </div>
+
                         <ul class="umb-breadcrumbs">
                             <li ng-hide="startNodeId != -1" class="umb-breadcrumbs__ancestor">
                                 <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-click="vm.gotoFolder()" ng-class="{'--current':path.length === 0}">
@@ -65,19 +78,19 @@
                                 <span class="umb-breadcrumbs__separator" aria-hidden="true">&#47;</span>
                             </li>
                             <li class="umb-breadcrumbs__ancestor" ng-show="!lockedFolder">
-                            <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-hide="model.showFolderInput" ng-click="model.showFolderInput = true">
-                                <i class="icon icon-add small" aria-hidden="true"></i>
-                                <span class="sr-only">
-                                    <localize key="visuallyHiddenTexts_createNewFolder">Create new folder</localize>
-                                </span>
-                            </button>
+                                <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-hide="model.showFolderInput" ng-click="model.showFolderInput = true">
+                                    <i class="icon icon-add small" aria-hidden="true"></i>
+                                    <span class="sr-only">
+                                        <localize key="visuallyHiddenTexts_createNewFolder">Create new folder</localize>
+                                    </span>
+                                </button>
 
-                            <input type="text"
-                                class="umb-breadcrumbs__add-ancestor"
-                                ng-show="model.showFolderInput"
-                                ng-model="model.newFolderName"
-                                ng-keydown="enterSubmitFolder($event)"
-                                ng-blur="vm.submitFolder()"
+                                <input type="text"
+                                       class="umb-breadcrumbs__add-ancestor"
+                                       ng-show="model.showFolderInput"
+                                       ng-model="model.newFolderName"
+                                       ng-keydown="enterSubmitFolder($event)"
+                                       ng-blur="vm.submitFolder()"
                                 focus-when="{{model.showFolderInput}}" />
                             </li>
                         </ul>
@@ -85,44 +98,45 @@
                     </div>
 
                     <umb-file-dropzone
-                        ng-if="vm.acceptedMediatypes.length > 0 && !vm.loading && !lockedFolder"
-                        accepted-mediatypes="vm.acceptedMediatypes"
-                        parent-id="{{currentFolder.id}}"
-                        files-uploaded="vm.onUploadComplete"
-                        files-queued="vm.onFilesQueue"
-                        accept="{{vm.acceptedFileTypes}}"
-                        max-file-size="{{vm.maxFileSize}}"
-                        hide-dropzone="{{ !activeDrag && (images.length > 0 || vm.searchOptions.filter !== '') }}"
-                        compact="{{ images.length > 0 }}">
+                                       ng-if="vm.acceptedMediatypes.length > 0 && !vm.loading && !lockedFolder"
+                                       accepted-mediatypes="vm.acceptedMediatypes"
+                                       parent-id="{{currentFolder.id}}"
+                                       files-uploaded="vm.onUploadComplete"
+                                       files-queued="vm.onFilesQueue"
+                                       accept="{{vm.acceptedFileTypes}}"
+                                       max-file-size="{{vm.maxFileSize}}"
+                                       hide-dropzone="{{ !activeDrag && (images.length > 0 || vm.searchOptions.filter !== '') }}"
+                                       compact="{{ images.length > 0 }}">
                     </umb-file-dropzone>
 
                     <umb-media-grid
-                            ng-if="!vm.loading"
-                            items="images"
-                            on-click="vm.clickHandler"
-                            on-click-name="vm.clickItemName"
-                            item-max-width="150"
-                            item-max-height="150"
-                            item-min-width="100"
-                            item-min-height="100"
-                            disable-folder-select={{disableFolderSelect}}
-                            only-images={{onlyImages}}
-                            only-folders={{onlyFolders}}
-                            include-sub-folders={{!filterOptions.excludeSubFolders}}
-                            current-folder-id="{{currentFolder.id}}">
+                                    ng-if="!vm.loading"
+                                    items="images"
+                                    on-click="vm.clickHandler"
+                                    on-click-name="vm.clickItemName"
+                                    item-max-width="150"
+                                    item-max-height="150"
+                                    item-min-width="100"
+                                    item-min-height="100"
+                                    disable-folder-select={{disableFolderSelect}}
+                                    only-images={{onlyImages}}
+                                    only-folders={{onlyFolders}}
+                                    include-sub-folders={{!filterOptions.excludeSubFolders}}
+                                    current-folder-id="{{currentFolder.id}}"
+                                    show-media-list=vm.showMediaList>
                     </umb-media-grid>
 
 
                     <umb-load-indicator
-                        ng-if="vm.loading">
+                                        ng-if="vm.loading">
                     </umb-load-indicator>
 
                     <div class="flex justify-center">
                         <umb-pagination
-                            ng-if="vm.searchOptions.totalPages > 0 && !vm.loading"
-                            page-number="vm.searchOptions.pageNumber"
-                            total-pages="vm.searchOptions.totalPages"
-                            on-change="vm.changePagination(pageNumber)">
+                                        ng-if="vm.searchOptions.totalPages > 0 && !vm.loading"
+                                        page-number="vm.searchOptions.pageNumber"
+                                        total-pages="vm.searchOptions.totalPages"
+                                        on-change="vm.changePagination(pageNumber)">
                         </umb-pagination>
                     </div>
 
@@ -132,66 +146,11 @@
 
                 </div>
 
-                <umb-overlay ng-if="vm.mediaPickerDetailsOverlay.show" model="vm.mediaPickerDetailsOverlay" position="right">
-                
-                <div class="umb-control-group" ng-if="vm.shouldShowUrl()">
-                    <h5>
-                        <localize key="@general_url"></localize>
-                    </h5>
-                    <input type="text" localize="placeholder" placeholder="@general_url" class="umb-property-editor umb-textstring" ng-model="target.url" />
-                </div>
 
-                    <div class="umb-control-group">
-                    <h5>
-                        <localize key="@content_altTextOptional"></localize>
-                    </h5>
-                    <input type="text" class="umb-property-editor umb-textstring" ng-model="target.altText" />
-                </div>
-
-                <div class="umb-control-group">
-
-                    <div ng-if="vm.mediaPickerDetailsOverlay.disableFocalPoint && target.thumbnail">
-                        <h5>
-                            <localize key="general_preview">Preview</localize>
-                        </h5>
-
-                        <img ng-src="{{target.thumbnail}}" alt="{{target.name}}" />
-                    </div>
-
-                    <div ng-if="!vm.mediaPickerDetailsOverlay.disableFocalPoint">
-                        <h5>
-                            <localize key="@general_focalPoint">Focal point</localize>
-                        </h5>
-
-                        <div ng-if="target.url">
-                            <umb-image-gravity src="target.url"
-                            center="target.focalPoint"
-							on-value-changed="vm.focalPointChanged(left, top)">
-                            </umb-image-gravity>
-                        </div>
-
-                        <div ng-if="cropSize">
-
-                            <h5>
-                                <localize key="general_preview">Preview</localize>
-                            </h5>
-
-                            <umb-image-thumbnail center="target.focalPoint"
-                                                 src="target.url"
-                                                 height="{{cropSize.height}}"
-                                                 width="{{cropSize.width}}"
-                                                 max-size="400">
-                            </umb-image-thumbnail>
-
-                        </div>
-                    </div>
-
-                    </div>
-
-                </umb-overlay>
 
             </form>
 
+
         </umb-editor-container>
 
         <umb-editor-footer>
@@ -218,4 +177,4 @@
 
     </umb-editor-view>
 
-    </div>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.controller.js
new file mode 100644
index 0000000000..c6927cbaa9
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.controller.js
@@ -0,0 +1,65 @@
+angular.module("umbraco")
+    .controller("Umbraco.Editors.MediaCropDetailsController",
+        function ($scope) {
+
+            var vm = this;
+
+            vm.submit = submit;
+            vm.close = close;
+            vm.hasCrops = cropSet() === true;
+            vm.focalPointChanged = focalPointChanged;
+            vm.disableFocalPoint = false;
+            
+            if(typeof $scope.model.disableFocalPoint === "boolean") {
+                vm.disableFocalPoint = $scope.model.disableFocalPoint
+            }
+            else {
+                vm.disableFocalPoint = ($scope.model.disableFocalPoint !== undefined && $scope.model.disableFocalPoint !== "0") ? true : false;
+            }
+
+            if (!$scope.model.target.coordinates && !$scope.model.target.focalPoint) {
+                $scope.model.target.focalPoint = { left: .5, top: .5 };
+            }
+
+            if (!$scope.model.target.image) {
+                $scope.model.target.image = $scope.model.target.url;
+            }
+
+            if (!$scope.model.target 
+                || $scope.model.target.id 
+                || ($scope.model.target.url && $scope.model.target.url.toLowerCase().startsWith("blob:"))) {
+                vm.shouldShowUrl = false;
+            } else {
+                vm.shouldShowUrl = true;
+            }         
+
+            /**
+             * Called when the umbImageGravity component updates the focal point value
+             * @param {any} left
+             * @param {any} top
+             */
+            function focalPointChanged(left, top) {
+                // update the model focalpoint value
+                $scope.model.target.focalPoint = {
+                    left: left,
+                    top: top
+                };
+            }
+
+            function submit() {
+                if ($scope.model && $scope.model.submit) {
+                    $scope.model.submit($scope.model);
+                }
+            }
+
+            function close() {
+                if ($scope.model && $scope.model.close) {
+                    $scope.model.close($scope.model);
+                }
+            }
+
+            function cropSet() {
+                var model = $scope.model;
+                return (model.cropSize || {}).width !== undefined && (model.cropSize || {}).height !== undefined;
+            }
+        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html
new file mode 100644
index 0000000000..de936da163
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html
@@ -0,0 +1,97 @@
+<div ng-controller="Umbraco.Editors.MediaCropDetailsController as vm">
+    <umb-editor-view>
+
+        <umb-editor-header name="model.title"
+                           name-locked="true"
+                           hide-alias="true"
+                           hide-icon="true"
+                           hide-description="true">
+        </umb-editor-header>
+
+        <umb-editor-container>
+
+            <div class="umb-control-group" ng-if="vm.shouldShowUrl">
+                <h5>
+                    <localize key="@general_url"></localize>
+                </h5>
+                <input type="text" localize="placeholder" placeholder="@general_url" class="umb-property-editor umb-textstring" ng-model="model.target.url" />
+            </div>
+
+            <div class="umb-control-group" ng-if="model.target">
+                <h5>
+                    <localize key="@content_altTextOptional"></localize>
+                </h5>
+                <input type="text" class="umb-property-editor umb-textstring" ng-model="model.target.altText" umb-auto-focus />
+            </div>
+
+            <div class="umb-control-group" ng-if="model.target">
+                <h5>
+                    <localize key="@content_captionTextOptional"></localize>
+                </h5>
+                <input type="text" class="umb-property-editor umb-textstring" ng-model="model.target.caption" />
+            </div>
+
+            <div class="umb-control-group" ng-if="model.target">
+                <div ng-if="vm.hasCrops === false && vm.disableFocalPoint">
+                    <h5>
+                        <localize key="general_preview">Preview</localize>
+                    </h5>
+
+                    <img ng-src="{{model.target.thumbnail}}" alt="{{model.target.name}}" />
+                </div>
+
+                <div ng-if="vm.hasCrops === false && vm.disableFocalPoint == false">
+                    <h5>
+                        <localize key="@general_focalPoint">Focal point</localize>
+                    </h5>
+
+                    <div ng-if="model.target.image">
+                        <umb-image-gravity src="model.target.image"
+                                           center="model.target.focalPoint"
+                                           on-value-changed="vm.focalPointChanged(left, top)">
+                        </umb-image-gravity>
+                    </div>
+                </div>
+
+                <div ng-if="vm.hasCrops">
+                    <h5>
+                        <localize key="@general_cropSection">Crop section</localize>
+                    </h5>
+
+                    <div>
+                        <umb-image-crop height="{{model.cropSize.height}}"
+                                        width="{{model.cropSize.width}}"
+                                        crop="model.target.coordinates"
+                                        center="model.target.focalPoint"
+                                        max-size="400"
+                                        src="model.target.image">
+                        </umb-image-crop>
+                    </div>
+                </div>
+
+            </div>
+
+        </umb-editor-container>
+
+        <umb-editor-footer>
+            <umb-editor-footer-content-right>
+
+                <umb-button action="vm.close()"
+                            button-style="link"
+                            shortcut="esc"
+                            label-key="general_close"
+                            type="button">
+                </umb-button>
+
+                <umb-button button-style="success"
+                            label-key="buttons_select"
+                            type="button"
+                            disabled="model.selection.length === 0"
+                            action="vm.submit(model)">
+                </umb-button>
+
+            </umb-editor-footer-content-right>
+        </umb-editor-footer>
+
+    </umb-editor-view>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
index a6d1383640..3c09745f15 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
@@ -35,6 +35,7 @@
         vm.toggleShowOnMemberProfile = toggleShowOnMemberProfile;
         vm.toggleMemberCanEdit = toggleMemberCanEdit;
         vm.toggleIsSensitiveData = toggleIsSensitiveData;
+        vm.toggleLabelOnTop = toggleLabelOnTop;
 
         function onInit() {
 
@@ -42,23 +43,24 @@
                 vm.showSensitiveData = user.userGroups.indexOf("sensitiveData") != -1;
             });
 
-            //make the default the same as the content type            
+            //make the default the same as the content type
             if (!$scope.model.property.dataTypeId) {
                 $scope.model.property.allowCultureVariant = $scope.model.contentTypeAllowCultureVariant;
             }
-            
+
             loadValidationTypes();
-            
+
         }
 
         function loadValidationTypes() {
 
             var labels = [
-                "validation_validateAsEmail", 
-                "validation_validateAsNumber", 
-                "validation_validateAsUrl", 
+                "validation_validateAsEmail",
+                "validation_validateAsNumber",
+                "validation_validateAsUrl",
                 "validation_enterCustomValidation",
-                "validation_fieldIsMandatory"
+                "validation_fieldIsMandatory",
+                "contentTypeEditor_displaySettingsLabelOnTop"
             ];
 
             localizationService.localizeMany(labels)
@@ -69,6 +71,7 @@
                     vm.labels.validateAsUrl = data[2];
                     vm.labels.customValidation = data[3];
                     vm.labels.fieldIsMandatory = data[4];
+                    vm.labels.displaySettingsLabelOnTop = data[5];
 
                     vm.validationTypes = [
                         {
@@ -121,7 +124,7 @@
                     $scope.model.updateSameDataTypes = model.updateSameDataTypes;
 
                     vm.focusOnMandatoryField = true;
-    
+
                     // update property
                     property.config = model.property.config;
                     property.editor = model.property.editor;
@@ -179,7 +182,7 @@
             if(event && event.keyCode === 13) {
                 submit();
             }
-        } 
+        }
 
         function submit() {
             if($scope.model.submit) {
@@ -202,7 +205,7 @@
                 var match = false;
 
                 // find and show if a match from the list has been chosen
-                angular.forEach(vm.validationTypes, function (validationType, index) {
+                vm.validationTypes.forEach(function (validationType, index) {
                     if ($scope.model.property.validation.pattern === validationType.pattern) {
                         vm.selectedValidationType = vm.validationTypes[index];
                         vm.showValidationPattern = true;
@@ -212,7 +215,7 @@
 
                 // if there is no match - choose the custom validation option.
                 if (!match) {
-                    angular.forEach(vm.validationTypes, function (validationType) {
+                    vm.validationTypes.forEach(function (validationType) {
                         if (validationType.key === "custom") {
                             vm.selectedValidationType = validationType;
                             vm.showValidationPattern = true;
@@ -245,28 +248,31 @@
             return !settingValue;
         }
 
-        function toggleAllowCultureVariants() {            
+        function toggleAllowCultureVariants() {
             $scope.model.property.allowCultureVariant = toggleValue($scope.model.property.allowCultureVariant);
         }
 
-        function toggleAllowSegmentVariants() {            
+        function toggleAllowSegmentVariants() {
             $scope.model.property.allowSegmentVariant = toggleValue($scope.model.property.allowSegmentVariant);
         }
 
         function toggleValidation() {
-            $scope.model.property.validation.mandatory = toggleValue($scope.model.property.validation.mandatory);            
+            $scope.model.property.validation.mandatory = toggleValue($scope.model.property.validation.mandatory);
         }
 
         function toggleShowOnMemberProfile() {
-            $scope.model.property.showOnMemberProfile = toggleValue($scope.model.property.showOnMemberProfile);           
+            $scope.model.property.showOnMemberProfile = toggleValue($scope.model.property.showOnMemberProfile);
         }
 
         function toggleMemberCanEdit() {
-            $scope.model.property.memberCanEdit = toggleValue($scope.model.property.memberCanEdit);            
+            $scope.model.property.memberCanEdit = toggleValue($scope.model.property.memberCanEdit);
         }
 
         function toggleIsSensitiveData() {
-            $scope.model.property.isSensitiveData = toggleValue($scope.model.property.isSensitiveData);             
+            $scope.model.property.isSensitiveData = toggleValue($scope.model.property.isSensitiveData);
+        }
+        function toggleLabelOnTop() {
+            $scope.model.property.labelOnTop = toggleValue($scope.model.property.labelOnTop);
         }
 
         onInit();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
index af9295f1ed..482345c3b3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
@@ -135,6 +135,21 @@
                                    ng-if="vm.showValidationPattern"
                                    ng-keypress="vm.submitOnEnter($event)" />
 
+                        </div>
+                        <div class="umb-control-group clearfix" ng-if="!model.property.locked">
+
+                            <h5><localize key="contentTypeEditor_displaySettingsHeadline"></localize></h5>
+
+                            <umb-toggle data-element="displaySettings_labelOnTop"
+                                        checked="model.property.labelOnTop"
+                                        on-click="vm.toggleLabelOnTop()"
+                                        label-on="{{vm.labels.displaySettingsLabelOnTop}}"
+                                        label-off="{{vm.labels.displaySettingsLabelOnTop}}"
+                                        show-labels="true"
+                                        label-position="right"
+                                        class="mb1">
+                            </umb-toggle>
+
                         </div>
                         <div class="umb-control-group clearfix -no-border" ng-if="model.contentType === 'documentType' && model.contentTypeAllowCultureVariant">
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
index 37a0d41207..b7a39261e9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
@@ -33,9 +33,9 @@
 
                                     <umb-dropdown ng-if="vm.contentTypeSelectOpen" on-close="vm.contentTypeSelectOpen = false">
                                         <umb-dropdown-item ng-repeat="contentType in vm.contentTypes">
-                                            <a href ng-click="vm.setContentType(contentType); vm.contentTypeSelectOpen = false;">
+                                            <button type="button" class="btn-reset" ng-click="vm.setContentType(contentType); vm.contentTypeSelectOpen = false;">
                                                 {{contentType.name}}
-                                            </a>
+                                            </button>
                                         </umb-dropdown-item>
                                     </umb-dropdown>
 
@@ -69,11 +69,11 @@
                                                 show-caret="true">
                                     </umb-button>
 
-                                    <umb-dropdown ng-if="vm.propertyFilterOpen[$index]" on-close="console.log(1);vm.propertyFilterOpen[$index] = false">
+                                    <umb-dropdown ng-if="vm.propertyFilterOpen[$index]" on-close="vm.propertyFilterOpen[$index] = false">
                                         <umb-dropdown-item ng-repeat="property in vm.properties">
-                                            <a href ng-click="vm.setFilterProperty(filter, property); vm.propertyFilterOpen[$parent.$parent.$index] = false;">
+                                            <button type="button" class="btn-reset" ng-click="vm.setFilterProperty(filter, property); vm.propertyFilterOpen[$parent.$parent.$index] = false;">
                                                 {{property.name}}
-                                            </a>
+                                            </button>
                                         </umb-dropdown-item>
                                     </umb-dropdown>
 
@@ -90,9 +90,9 @@
 
                                     <umb-dropdown ng-if="vm.termFilterOpen[$index]" on-close="vm.termFilterOpen[$index] = false">
                                         <umb-dropdown-item ng-repeat="term in vm.getPropertyOperators(filter.property)">
-                                            <a href ng-click="vm.setFilterTerm(filter, term); vm.termFilterOpen[$parent.$parent.$index] = false;">
+                                            <button type="button" class="btn-reset" ng-click="vm.setFilterTerm(filter, term); vm.termFilterOpen[$parent.$parent.$index] = false;">
                                                 {{term.name}}
-                                            </a>
+                                            </button>
                                         </umb-dropdown-item>
                                     </umb-dropdown>
 
@@ -112,13 +112,13 @@
 
                                 </span>
 
-                                <a href ng-click="vm.addFilter(vm.query)">
+                                <button type="button" class="btn-reset" ng-click="vm.addFilter(vm.query)">
                                     <i class="icon-add" aria-hidden="true"></i>
-                                </a>
+                                </button>
 
-                                <a href ng-click="vm.trashFilter(vm.query, filter)">
+                                <button type="button" class="btn-reset" ng-click="vm.trashFilter(vm.query, filter)">
                                     <i class="icon-trash" aria-hidden="true"></i>
-                                </a>
+                                </button>
 
                             </div>
 
@@ -137,9 +137,9 @@
 
                                     <umb-dropdown ng-if="vm.sortPropertyOpen" on-close="vm.sortPropertyOpen = false">
                                         <umb-dropdown-item ng-repeat="property in vm.properties">
-                                            <a href ng-click="vm.setSortProperty(vm.query, property); vm.sortPropertyOpen = false;">
+                                            <button type="button" class="btn-reset" ng-click="vm.setSortProperty(vm.query, property); vm.sortPropertyOpen = false;">
                                                 {{property.name}}
-                                            </a>
+                                            </button>
                                         </umb-dropdown-item>
                                     </umb-dropdown>
 
@@ -159,7 +159,7 @@
 
                         <ul class="nav unstyled">
                             <li ng-repeat="item in model.result.sampleResults">
-                                <i class="icon icon-document turquoise-d1" aria-hidden="true"></i> {{item.name}}
+                                <i class="icon {{item.icon}} turquoise-d1" aria-hidden="true"></i> {{item.name}}
                             </li>
                         </ul>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
index fb8b649b55..0d49c7dd9c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
@@ -2,7 +2,7 @@
     "use strict";
 
     function RollbackController($scope, contentResource, localizationService, assetsService, dateHelper, userService) {
-        
+
         var vm = this;
 
         vm.rollback = rollback;
@@ -56,7 +56,7 @@
                 });
 
             });
-            
+
         }
 
         function changeLanguage(language) {
@@ -103,7 +103,7 @@
                             var timestampFormatted = dateHelper.getLocalDate(version.versionDate, currentUser.locale, 'LLL');
                             version.displayValue = timestampFormatted + ' - ' + version.versionAuthorName;
                             return version;
-                        }); 
+                        });
                     });
                 });
         }
@@ -146,7 +146,7 @@
                     var diffProperty = {
                         "alias": property.alias,
                         "label": property.label,
-                        "diff": JsDiff.diffWords(property.value, oldProperty.value),
+                        "diff": (property.isObject) ? JsDiff.diffJson(property.value, oldProperty.value) : JsDiff.diffWords(property.value, oldProperty.value),
                         "isObject": (property.isObject || oldProperty.isObject) ? true : false
                     };
 
@@ -163,7 +163,7 @@
 
             const nodeId = $scope.model.node.id;
             const versionId = vm.previousVersion.versionId;
-            const culture = $scope.model.node.variants.length > 1 ? vm.currentVersion.language.culture : null;            
+            const culture = $scope.model.node.variants.length > 1 ? vm.currentVersion.language.culture : null;
 
             return contentResource.rollback(nodeId, versionId, culture)
                 .then(data => {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.controller.js
index 55d7a75000..f2a89ba7ea 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.controller.js
@@ -47,8 +47,8 @@
         }
 
         function preSelect(selection) {
-            angular.forEach(selection, function(selected){
-                angular.forEach(vm.sections, function(section){
+            selection.forEach(function(selected){
+                vm.sections.forEach(function(section){
                     if(selected.alias === section.alias) {
                         section.selected = true;
                     }
@@ -65,7 +65,7 @@
 
             } else {
 
-                angular.forEach($scope.model.selection, function(selectedSection, index){
+                $scope.model.selection.forEach(function(selectedSection, index){
                     if(selectedSection.alias === section.alias) {
                         section.selected = false;
                         $scope.model.selection.splice(index, 1);
@@ -77,7 +77,7 @@
         }
 
         function setSectionIcon(sections) {
-            angular.forEach(sections, function(section) {
+            sections.forEach(function(section) {
                 section.icon = "icon-section";
             });
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
index 33906dcd75..feb3b9ab53 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
@@ -19,12 +19,12 @@
             <umb-box ng-if="!vm.loading">
                 <umb-box-content>
                     <ul class="umb-tree">
-                        <li ng-repeat="section in vm.sections" class="umb-tree-item" ng-class="{'umb-tree-node-checked': section.selected }">
-                            <div class="umb-tree-item__inner cursor-pointer" ng-click="vm.selectSection(section)" style="padding: 5px 10px;">
-                                <i class="icon umb-tree-icon {{section.icon}}"></i>
-                                <a class="flex-auto" href="" prevent-default>
+                        <li ng-repeat="section in vm.sections" class="umb-tree-item">
+                            <div class="umb-tree-item__inner" style="padding: 5px 10px;">
+                                <button type="button" class="btn-reset text-left flex-auto" ng-click="vm.selectSection(section)" ng-class="{'umb-tree-node-checked': section.selected }">
+                                    <i class="icon umb-tree-icon {{section.icon}}" aria-hidden="true"></i>
                                     <span>{{ section.name }}</span>
-                                </a>
+                                </button>
                             </div>
                         </li>
                     </ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html
index 045a1403e2..b4e8d7fbe8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html
@@ -45,7 +45,9 @@
             
                             <div>
                                 <div class="flex">
-                                    <umb-checkbox model="model.mandatoryRenderSection" text="{{vm.labels.sectionMandatory}}" />
+                                    <umb-checkbox model="model.mandatoryRenderSection"
+                                                  text="{{vm.labels.sectionMandatory}}">
+                                    </umb-checkbox>
                                 </div>
 
                                 <div class="umb-insert-code-box__description">
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
index 387dd71da8..0c5fe9af1b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
@@ -173,7 +173,7 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
                 $scope.model.filterAdvanced = false;
 
                 //used advanced filtering
-                if (angular.isFunction($scope.model.filter)) {
+                if (Utilities.isFunction($scope.model.filter)) {
                     $scope.model.filterAdvanced = true;
                 }
                 else if (Utilities.isObject($scope.model.filter)) {
@@ -188,8 +188,17 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
                     //used advanced filtering
                     if ($scope.model.filter.startsWith("{")) {
                         $scope.model.filterAdvanced = true;
-                        //convert to object
-                        $scope.model.filter = Utilities.fromJson($scope.model.filter);
+
+                        if ($scope.model.filterByMetadata && !Utilities.isFunction($scope.model.filter))
+                        {
+                            var filter = Utilities.fromJson($scope.model.filter);
+                            $scope.model.filter = function (node){ return _.isMatch(node.metaData, filter);};
+                        }            
+                        else
+                        {
+                            //convert to object
+                            $scope.model.filter = Utilities.fromJson($scope.model.filter);
+                        }
                     }
                 }
             }
@@ -274,19 +283,14 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
             if (Utilities.isArray(args.children)) {
 
                 //iterate children
-                _.each(args.children,
-                    function (child) {
-
-                        //now we need to look in the already selected search results and
-                        // toggle the check boxes for those ones that are listed
-                        var exists = _.find(vm.searchInfo.selectedSearchResults,
-                            function (selected) {
-                                return child.id == selected.id;
-                            });
-                        if (exists) {
-                            child.selected = true;
-                        }
-                    });
+                args.children.forEach(child => {
+                    //now we need to look in the already selected search results and
+                    // toggle the check boxes for those ones that are listed
+                    var exists = vm.searchInfo.selectedSearchResults.find(selected => child.id === selected.id);
+                    if (exists) {
+                        child.selected = true;
+                    }
+                });
 
                 //check filter
                 performFiltering(args.children);
@@ -452,12 +456,11 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
             if ($scope.model.filterAdvanced) {
 
                 //filter either based on a method or an object
-                var filtered = angular.isFunction($scope.model.filter)
+                var filtered = Utilities.isFunction($scope.model.filter)
                     ? _.filter(nodes, $scope.model.filter)
                     : _.where(nodes, $scope.model.filter);
 
-                angular.forEach(filtered,
-                    function (value, key) {
+                filtered.forEach(function (value) {
                         value.filtered = true;
                         if ($scope.model.filterCssClass) {
                             if (!value.cssClasses) {
@@ -470,8 +473,7 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
             }
             else {
                 var a = $scope.model.filter.toLowerCase().replace(/\s/g, '').split(',');
-                angular.forEach(nodes,
-                    function (value, key) {
+                nodes.forEach(function (value) {
 
                         var found = a.indexOf(value.metaData.contentType.toLowerCase()) >= 0;
 
@@ -541,78 +543,66 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
                 //we need to ensure that any currently displayed nodes that get selected
                 // from the search get updated to have a check box!
                 function checkChildren(children) {
-                    _.each(children,
-                        function (child) {
-                            //check if the id is in the selection, if so ensure it's flagged as selected
-                            var exists = _.find(vm.searchInfo.selectedSearchResults,
-                                function (selected) {
-                                    return child.id == selected.id;
+                    children.forEach(child => {
+                        //check if the id is in the selection, if so ensure it's flagged as selected
+                        var exists = vm.searchInfo.selectedSearchResults.find(selected => child.id === selected.id);
+                        //if the curr node exists in selected search results, ensure it's checked
+                        if (exists) {
+                            child.selected = true;
+                        }
+                        //if the curr node does not exist in the selected search result, and the curr node is a child of a list view search result
+                        else if (child.metaData.isSearchResult) {
+                            //if this tree node is under a list view it means that the node was added
+                            // to the tree dynamically under the list view that was searched, so we actually want to remove
+                            // it all together from the tree
+                            var listView = child.parent();
+                            listView.children = _.reject(listView.children,
+                                function (c) {
+                                    return c.id == child.id;
                                 });
-                            //if the curr node exists in selected search results, ensure it's checked
-                            if (exists) {
-                                child.selected = true;
-                            }
-                            //if the curr node does not exist in the selected search result, and the curr node is a child of a list view search result
-                            else if (child.metaData.isSearchResult) {
-                                //if this tree node is under a list view it means that the node was added
-                                // to the tree dynamically under the list view that was searched, so we actually want to remove
-                                // it all together from the tree
-                                var listView = child.parent();
-                                listView.children = _.reject(listView.children,
-                                    function (c) {
-                                        return c.id == child.id;
-                                    });
-                            }
+                        }
 
-                            //check if the current node is a list view and if so, check if there's any new results
-                            // that need to be added as child nodes to it based on search results selected
-                            if (child.metaData.isContainer) {
+                        //check if the current node is a list view and if so, check if there's any new results
+                        // that need to be added as child nodes to it based on search results selected
+                        if (child.metaData.isContainer) {
 
-                                child.cssClasses = _.reject(child.cssClasses,
-                                    function (c) {
-                                        return c === 'tree-node-slide-up-hide-active';
-                                    });
+                            child.cssClasses = _.reject(child.cssClasses,
+                                function (c) {
+                                    return c === 'tree-node-slide-up-hide-active';
+                                });
 
-                                var listViewResults = _.filter(vm.searchInfo.selectedSearchResults,
-                                    function (i) {
-                                        return i.parentId == child.id;
-                                    });
-                                _.each(listViewResults,
-                                    function (item) {
-                                        var childExists = _.find(child.children,
-                                            function (c) {
-                                                return c.id == item.id;
-                                            });
-                                        if (!childExists) {
-                                            var parent = child;
-                                            child.children.unshift({
-                                                id: item.id,
-                                                name: item.name,
-                                                cssClass: "icon umb-tree-icon sprTree " + item.icon,
-                                                level: child.level + 1,
-                                                metaData: {
-                                                    isSearchResult: true
-                                                },
-                                                hasChildren: false,
-                                                parent: function () {
-                                                    return parent;
-                                                }
-                                            });
-                                        }
-                                    });
-                            }
+                            var listViewResults = vm.searchInfo.selectedSearchResults.filter(i => i.parentId === child.id);
 
-                            //recurse
-                            if (child.children && child.children.length > 0) {
-                                checkChildren(child.children);
-                            }
-                        });
+                            listViewResults.forEach(item => {
+                                var childExists = child.children.find(c => c.id === item.id);
+
+                                if (!childExists) {
+                                    var parent = child;
+                                    child.children.unshift({
+                                        id: item.id,
+                                        name: item.name,
+                                        cssClass: "icon umb-tree-icon sprTree " + item.icon,
+                                        level: child.level + 1,
+                                        metaData: {
+                                            isSearchResult: true
+                                        },
+                                        hasChildren: false,
+                                        parent: () => parent                                        
+                                    });
+                                }
+                            });
+                        }
+
+                        //recurse
+                        if (child.children && child.children.length > 0) {
+                            checkChildren(child.children);
+                        }
+                    });
                 }
 
                 checkChildren(tree.root.children);
             }
 
-
             vm.searchInfo.showSearch = false;
             vm.searchInfo.searchFromId = vm.startNodeId;
             vm.searchInfo.searchFromName = null;
@@ -625,24 +615,16 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
             performFiltering(results);
 
             //now actually remove all filtered items so they are not even displayed
-            results = _.filter(results,
-                function (item) {
-                    return !item.filtered;
-                });
-
+            results = results.filter(item => !item.filtered);          
             vm.searchInfo.results = results;
 
             //sync with the curr selected results
-            _.each(vm.searchInfo.results,
-                function (result) {
-                    var exists = _.find($scope.model.selection,
-                        function (item) {
-                            return result.id == item.id;
-                        });
-                    if (exists) {
-                        result.selected = true;
-                    }
-                });
+            vm.searchInfo.results.forEach(result => {
+                var exists = $scope.model.selection.find(item => result.id === item.id);               
+                if (exists) {
+                    result.selected = true;
+                }
+            });
 
             vm.searchInfo.showSearch = true;
         }
@@ -664,12 +646,8 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
         }
 
         function listViewItemsLoaded(items) {
-            var selectedIds = _.pluck($scope.model.selection, "id");
-            _.each(items, function (item) {
-                if (_.contains(selectedIds, item.id)) {
-                    item.selected = true;
-                }
-            });
+            var selectedIds = $scope.model.selection.map(x => x.id);
+            items.forEach(item => item.selected = selectedIds.includes(item.id));
         }
 
         function submit(model) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
index 0c10d94136..522301d76f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
@@ -19,18 +19,17 @@
                             <div ng-hide="vm.miniListView">
 
                                 <div class="umb-language-picker" ng-if="vm.showLanguageSelector && vm.languages.length > 1" on-outside-click="vm.page.languageSelectorIsOpen = false" style="padding-bottom: 5px">
-                                    <div class="umb-language-picker__toggle" ng-click="vm.toggleLanguageSelector()">
-                                        <div>{{vm.selectedLanguage.name}}</div>
-                                        <ins class="umb-language-picker__expand" ng-class="{'icon-navigation-down': !vm.languageSelectorIsOpen, 'icon-navigation-up': vm.languageSelectorIsOpen}" class="icon-navigation-right">&nbsp;</ins>
-                                    </div>
+                                    <button class="umb-language-picker__toggle btn-reset" ng-click="vm.toggleLanguageSelector()">
+                                        <span>{{vm.selectedLanguage.name}}</span>
+                                        <umb-icon icon="{{vm.languageSelectorIsOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}" class="umb-language-picker__expand icon-navigation-down"></umb-icon>
+                                    </button>
                                     <div class="umb-language-picker__dropdown" ng-if="vm.languageSelectorIsOpen">
-                                        <a ng-click="vm.selectLanguage(language)" ng-repeat="language in vm.languages" href="">{{language.name}}</a>
+                                        <button class="btn-reset" ng-click="vm.selectLanguage(language)" ng-repeat="language in vm.languages">{{language.name}}</button>
                                     </div>
                                 </div>
 
-                                <div class="umb-control-group">
+                                <div class="umb-control-group" ng-if="vm.enableSearh">
                                     <umb-tree-search-box
-                                        ng-if="vm.enableSearh"
                                         hide-search-callback="vm.hideSearch"
                                         search-callback="vm.onSearchResults"
                                         search-from-id="{{vm.searchInfo.searchFromId}}"
@@ -96,6 +95,15 @@
                         action="vm.close()">
                     </umb-button>
 
+                    <umb-button
+                        ng-if="model.extraActions"
+                        ng-repeat="action in model.extraActions track by $index"
+                        type="button"
+                        button-style="{{action.style || 'link'}}"
+                        label-key="{{action.labelKey}}"
+                        action="action.action()">
+                    </umb-button>
+
                     <umb-button
                         ng-if="vm.multiPicker"
                         type="button"
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.controller.js
index 8e075e1ab4..b11ae02e4e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.controller.js
@@ -46,9 +46,9 @@
 
         function preSelect(selection) {
 
-            angular.forEach(selection, function(selected){
-                
-                angular.forEach(vm.userGroups, function(userGroup){
+            selection.forEach(function (selected) {
+
+                vm.userGroups.forEach(function(userGroup){
                     if(selected.id === userGroup.id) {
                         userGroup.selected = true;
                     }
@@ -66,7 +66,7 @@
 
             } else {
 
-                angular.forEach($scope.model.selection, function(selectedUserGroup, index){
+                $scope.model.selection.forEach(function(selectedUserGroup, index){
                     if(selectedUserGroup.id === userGroup.id) {
                         userGroup.selected = false;
                         $scope.model.selection.splice(index, 1);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.html
index b82b919f9f..252c1b7cd5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.html
@@ -17,16 +17,14 @@
             <umb-box>
                 <umb-box-content>
 
-                    <div class="form-search" style="margin-bottom: 15px;">
-                        <i class="icon-search"></i>
-                        <input type="text"
-                                ng-model="searchTerm"
-                                class="umb-search-field search-query input-block-level -full-width-input"
-                                localize="placeholder"
-                                placeholder="@placeholders_filter"
-                                umb-auto-focus
-                                no-dirty-check />
-                    </div>
+                    <umb-search-filter
+                        input-id="composition-search"
+                        model="searchTerm"
+                        label-key="placeholders_filter"
+                        text="Type to filter..."
+                        css-class="w-100 mb-15"
+                        auto-focus="true">
+                    </umb-search-filter>
 
                     <div class="umb-user-group-picker-list">
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js
index 2bd73a5558..a7021b2867 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function UserPickerController($scope, usersResource, localizationService) {
+    function UserPickerController($scope, usersResource, localizationService, eventsService) {
         
         var vm = this;
 
@@ -15,15 +15,18 @@
         vm.submit = submit;
         vm.close = close;
 
-        //////////
+        vm.multiPicker = $scope.model.multiPicker === false ? false : true;
 
         function onInit() {
 
             vm.loading = true;
 
             // set default title
-            if(!$scope.model.title) {
-                localizationService.localize("defaultdialogs_selectUsers").then(function(value){
+            if (!$scope.model.title) {
+
+                var labelKey = vm.multiPicker ? "defaultdialogs_selectUsers" : "defaultdialogs_selectUser";
+
+                localizationService.localize(labelKey).then(function(value){
                     $scope.model.title = value;
                 });
             }
@@ -35,12 +38,11 @@
 
             // get users
             getUsers();
-            
         }
 
         function preSelect(selection, users) {
-            angular.forEach(selection, function(selected){
-                angular.forEach(users, function(user){
+            Utilities.forEach(selection, function(selected){
+                Utilities.forEach(users, function(user){
                     if(selected.id === user.id) {
                         user.selected = true;
                     }
@@ -50,22 +52,39 @@
 
         function selectUser(user) {
 
-            if(!user.selected) {
-                
+            if (!user.selected) {
                 user.selected = true;
                 $scope.model.selection.push(user);
-
             } else {
 
-                angular.forEach($scope.model.selection, function(selectedUser, index){
-                    if(selectedUser.id === user.id) {
-                        user.selected = false;
-                        $scope.model.selection.splice(index, 1);
+                if (user.selected) {
+                    Utilities.forEach($scope.model.selection, function (selectedUser, index) {
+                        if (selectedUser.id === user.id) {
+                            user.selected = false;
+                            $scope.model.selection.splice(index, 1);
+                        }
+                    });
+                } else {
+                    if (!vm.multiPicker) {
+                        deselectAllUsers($scope.model.selection);
                     }
-                });
-
+                    eventsService.emit("dialogs.userPicker.select", user);
+                    user.selected = true;
+                    $scope.model.selection.push(user);
+                }
             }
 
+            if (!vm.multiPicker) {
+                submit($scope.model);
+            }
+        }
+
+        function deselectAllUsers(users) {
+            for (var i = 0; i < users.length; i++) {
+                var user = users[i];
+                user.selected = false;
+            }
+            users.length = 0;
         }
 
         var search = _.debounce(function () {
@@ -95,7 +114,6 @@
                 preSelect($scope.model.selection, vm.users);
 
                 vm.loading = false;
-
             });
         }
 
@@ -105,14 +123,14 @@
         }
 
         function submit(model) {
-            if($scope.model.submit) {
+            if ($scope.model.submit) {
                 $scope.model.submit(model);
             }
         }
 
         function close() {
-            if($scope.model.close) {
-                $scope.model.close();
+            if ($scope.model.close) {
+               $scope.model.close();
             }
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.html
index e39d693b47..4e1c6b8e6e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.html
@@ -9,32 +9,30 @@
             hide-icon="true"
             hide-description="true">
         </umb-editor-header>
-        
+
         <umb-editor-container>
-            
+
             <umb-load-indicator
                 ng-if="vm.loading">
             </umb-load-indicator>
 
             <umb-box>
                 <umb-box-content>
-                    <div class="form-search" style="margin-bottom: 15px;">
-                        <i class="icon-search"></i>
-                        <input type="text"
-                            ng-model="vm.usersOptions.filter"
-                            ng-change="vm.searchUsers()"
-                            class="umb-search-field search-query input-block-level -full-width-input"
-                            localize="placeholder"
-                            placeholder="@placeholders_filter"
-                            umb-auto-focus
-                            revent-enter-submit
-                            no-dirty-check />
-                    </div>
+                    <umb-search-filter
+                        input-id="userpicker-search"
+                        model="vm.usersOptions.filter"
+                        label-key="placeholders_filter"
+                        text="Type to filter..."
+                        on-change="vm.searchUsers()"
+                        css-class="w-100 mb-15"
+                        auto-focus="true">
+                    </umb-search-filter>
+
                     <div class="umb-user-picker-item-list">
-                        <a href="" class="umb-user-picker-list-item" ng-repeat="user in vm.users" ng-click="vm.selectUser(user)">
+                        <button type="button" class="btn-reset umb-user-picker-list-item" ng-repeat="user in vm.users" ng-click="vm.selectUser(user)">
                             <div class="umb-user-picker-list-item__avatar">
                                 <umb-checkmark
-                                    class="umb-user-picker-list-item__checkmark" 
+                                    class="umb-user-picker-list-item__checkmark"
                                     ng-if="user.selected"
                                     checked="user.selected">
                                 </umb-checkmark>
@@ -52,9 +50,9 @@
                                     <span ng-repeat="userGroup in user.userGroups">{{ userGroup.name }}<span ng-if="!$last">, </span></span>
                                 </div>
                             </div>
-                        </a>
+                        </button>
                     </div>
-            
+
                     <div class="flex justify-center">
                         <umb-pagination
                             ng-if="vm.usersOptions.totalPages"
@@ -78,7 +76,9 @@
                     action="vm.close()">
                 </umb-button>
                 <umb-button
+                    ng-if="vm.multiPicker"
                     type="button"
+                    disabled="model.selection.length === 0"
                     button-style="success"
                     label-key="general_submit"
                     action="vm.submit(model)">
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/confirm/confirm.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/confirm/confirm.html
index 79dd6bd4f6..f35c24e96a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/confirm/confirm.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/confirm/confirm.html
@@ -1,13 +1,13 @@
 <div>
 
+    <p ng-bind-html="model.content"></p>
+
     <div ng-if="model.confirmMessage"
          class="umb-alert mb2"
          ng-class="{ 'umb-alert--warning': model.confirmMessageStyle === 'warning',
                      'umb-alert--danger': model.confirmMessageStyle === 'danger',
-                     'umb-alert--info': model.confirmMessageStyle === 'info'}">
-        {{model.confirmMessage}}
+                     'umb-alert--info': model.confirmMessageStyle === 'info'}"
+         ng-bind-html="model.confirmMessage">
     </div>
 
-    <p>{{model.content}}</p>
-
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
index 17184ae9a3..c4f60b766a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
@@ -1,5 +1,9 @@
 function ItemPickerOverlay($scope, localizationService) {
 
+    $scope.filter = {
+        searchTerm: ''
+    };
+
     function onInit() {
         $scope.model.hideSubmitButton = true;
 
@@ -24,11 +28,11 @@ function ItemPickerOverlay($scope, localizationService) {
         event: null
     };
 
-    $scope.showTooltip = function(item, $event) {
+    $scope.showTooltip = function (item, $event) {
         if (!item.tooltip) {
-            $scope.mouseLeave();
             return;
         }
+
         $scope.tooltip = {
             show: true,
             event: $event,
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
index ff2ce6379f..7074497a98 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
@@ -1,9 +1,8 @@
 <div ng-controller="Umbraco.Overlays.ItemPickerOverlay" class="umb-itempicker">
-
-    <div class="form-search" ng-hide="model.filter === false" style="margin-bottom: 15px;">
-        <i class="icon-search"></i>
+    <div class="form-search" ng-if="model.filter !== false" style="margin-bottom: 15px;">
+        <i class="icon-search" aria-hidden="true"></i>
         <input type="text"
-               ng-model="searchTerm"
+               ng-model="filter.searchTerm"
                class="umb-search-field search-query input-block-level -full-width-input"
                localize="placeholder"
                placeholder="@placeholders_filter"
@@ -11,34 +10,42 @@
                no-dirty-check />
     </div>
 
-    <div class="umb-overlay__section-header" ng-if="(model.pasteItems | filter:searchTerm).length > 0">
+    <div class="umb-overlay__section-header" ng-if="(model.pasteItems | filter:filter.searchTerm).length > 0">
         <h5><localize key="content_createFromClipboard">Paste from clipboard</localize></h5>
         <button ng-if="model.clickClearPaste" ng-click="model.clickClearPaste($event)" alt="Clear clipboard for entries accepted in this context.">
-            <i class="icon-trash"></i>
+            <i class="icon-trash" aria-hidden="true"></i>
         </button>
     </div>
 
     <ul class="umb-card-grid" ng-class="{'-three-in-row': model.availableItems.length < 7, '-four-in-row': model.availableItems.length >= 7}">
-        <li ng-repeat="pasteItem in model.pasteItems | filter:searchTerm">
-            <button class="umb-card-grid-item btn-reset" ng-click="model.clickPasteItem(pasteItem)">
+        <li ng-repeat="pasteItem in model.pasteItems | filter:filter.searchTerm">
+            <button type="button" class="umb-card-grid-item btn-reset" ng-click="model.clickPasteItem(pasteItem)">
                 <span>
-                    <i class="{{ pasteItem.icon }}"></i>
+                    <i class="{{ pasteItem.icon }}" aria-hidden="true"></i>
                     {{ pasteItem.name | truncate:true:36 }}
                 </span>
             </button>
         </li>
     </ul>
 
-    <div class="umb-overlay__section-header" ng-if="model.pasteItems.length > 0 && (model.availableItems | filter:searchTerm).length > 0">
+    <div class="umb-overlay__section-header" ng-if="model.pasteItems.length > 0 && (model.availableItems | filter:filter.searchTerm).length > 0">
         <h5><localize key="content_createEmpty">Create new</localize></h5>
     </div>
 
     <ul class="umb-card-grid" ng-class="{'-three-in-row': model.availableItems.length < 7, '-four-in-row': model.availableItems.length >= 7}">
-        <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:model.orderBy | filter:searchTerm">
-            <button class="umb-card-grid-item btn-reset" ng-click="selectItem(availableItem)">
+        <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:model.orderBy | filter:filter.searchTerm">
+            <button type="button" class="umb-card-grid-item btn-reset" ng-click="selectItem(availableItem)">
+                <span ng-mouseover="showTooltip(availableItem, $event)" ng-mouseleave="hideTooltip()">
+                    <i class="{{ availableItem.icon }}" aria-hidden="true"></i>
+                    <span>{{ availableItem.name }}</span>
+                </span>
+            </button>
+        </li>
+        <li ng-if="model.createNewItem">
+            <button class="umb-card-grid-item btn-reset --creator" ng-click="model.createNewItem.action()">
                 <span>
-                    <i class="{{ availableItem.icon }}"></i>
-                    <span ng-mouseover="showTooltip(availableItem, $event)" ng-mouseleave="hideTooltip()">{{ availableItem.name }}</span>                    
+                    <i class="{{ model.createNewItem.icon }}"></i>
+                    {{ model.createNewItem.name }}
                 </span>
             </button>
         </li>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/logviewersearch/logviewersearch.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/logviewersearch/logviewersearch.html
index 8ee9d1aa64..0079086f36 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/logviewersearch/logviewersearch.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/logviewersearch/logviewersearch.html
@@ -1,11 +1,11 @@
 <div>
     <p>
         <strong>Query:</strong><br/>
-        {{ model.query }}
+        {{model.query}}
     </p>
 
     <p>
-        <strong>Name:</strong><br/>
-        <input style="width: 100%" ng-model="model.name" type="text" name="queryName" ng-change="model.disableSubmitButton = model.name.length === 0"/>
+        <strong><localize key="general_name">Name</localize>:</strong><br />
+        <input type="text" class="-full-width-input" ng-model="model.queryName" name="queryName" ng-change="model.disableSubmitButton = model.name.length === 0" />
     </p>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediapicktypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediapicktypepicker.controller.js
deleted file mode 100644
index 8ca8fff18b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediapicktypepicker.controller.js
+++ /dev/null
@@ -1,10 +0,0 @@
-angular.module("umbraco").controller("Umbraco.Overlays.MediaTypePickerController",
-	function ($scope) {
-
-		$scope.select = function(mediatype){
-			$scope.model.selectedType = mediatype;
-			$scope.model.submit($scope.model);
-			$scope.model.show = false;
-		}
-	    
-	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediatypepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediatypepicker.html
deleted file mode 100644
index 161f0b1cf2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediatypepicker/mediatypepicker.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div ng-controller="Umbraco.Overlays.MediaTypePickerController">
-
-  	<ul class="umb-card-grid -three-in-row">
-      <li
-	  	ng-repeat="mediatype in model.acceptedMediatypes | orderBy:'name'"
-        ng-click="select(mediatype)">
-        <a class="umb-card-grid-item" href="" title="{{mediatype.name}}">
-            <span>
-                <i class="{{ mediatype.icon }}"></i>
-                {{ mediatype.name }}
-            </span>
-        </a>
-      </li>
-    </ul>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
index 8248d11863..669bd711d3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
@@ -1,5 +1,8 @@
 angular.module("umbraco")
-    .controller("Umbraco.Overlays.UserController", function ($scope, $location, $timeout, dashboardResource, userService, historyService, eventsService, externalLoginInfo, authResource, currentUserResource, formHelper, localizationService) {
+    .controller("Umbraco.Overlays.UserController", function ($scope, $location, $timeout,
+        dashboardResource, userService, historyService, eventsService,
+        externalLoginInfo, externalLoginInfoService, authResource,
+        currentUserResource, formHelper, localizationService) {
 
         $scope.history = historyService.getCurrent();
         //$scope.version = Umbraco.Sys.ServerVariables.application.version + " assembly: " + Umbraco.Sys.ServerVariables.application.assemblyVersion;
@@ -14,7 +17,12 @@ angular.module("umbraco")
             });
         }
         */
-        $scope.externalLoginProviders = externalLoginInfo.providers;
+
+        // Set flag if any have deny local login, in which case we must disable all password functionality
+        $scope.denyLocalLogin = externalLoginInfoService.hasDenyLocalLogin();
+        // Only include login providers that have editable options
+        $scope.externalLoginProviders = externalLoginInfoService.getLoginProvidersWithOptions();
+
         $scope.externalLinkLoginFormAction = Umbraco.Sys.ServerVariables.umbracoUrls.externalLinkLoginsUrl;
         var evts = [];
         evts.push(eventsService.on("historyService.add", function (e, args) {
@@ -72,10 +80,9 @@ angular.module("umbraco")
                     //updateTimeout();
 
                     authResource.getCurrentUserLinkedLogins().then(function(logins) {
+
                         //reset all to be un-linked
-                        for (var provider in $scope.externalLoginProviders) {
-                            $scope.externalLoginProviders[provider].linkedProviderKey = undefined;
-                        }
+                        $scope.externalLoginProviders.forEach(provider => provider.linkedProviderKey = undefined);
 
                         //set the linked logins
                         for (var login in logins) {
@@ -160,7 +167,7 @@ angular.module("umbraco")
                     }, 2000);
 
                 }, function (err) {
-
+                    formHelper.resetForm({ scope: $scope, hasErrors: true });
                     formHelper.handleError(err);
 
                     $scope.changePasswordButtonState = "error";
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
index 8b12d061f3..fdd2671200 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
@@ -21,6 +21,7 @@
        </umb-button>
 
         <umb-button
+            ng-if="!denyLocalLogin"
             alias="changePassword"
             type="button"
             action="togglePasswordFields()"
@@ -49,27 +50,32 @@
 
         <div ng-repeat="login in externalLoginProviders">
 
-			<form ng-submit="linkProvider($event)" ng-if="login.linkedProviderKey == undefined" method="POST" action="{{externalLinkLoginFormAction}}" name="oauthloginform" id="oauthloginform-{{login.authType}}">
-				<input type="hidden" name="provider" value="{{login.authType}}" />
-                <button class="btn btn-block btn-social"
+            <div ng-if="login.customView" ng-include="login.customView"></div>
+
+            <div ng-if="!login.customView && login.properties.ExternalSignInAutoLinkOptions.AllowManualLinking">
+                <form ng-submit="linkProvider($event)" ng-if="login.linkedProviderKey == undefined" method="POST" action="{{externalLinkLoginFormAction}}" name="oauthloginform" id="oauthloginform-{{login.authType}}">
+                    <input type="hidden" name="provider" value="{{login.authType}}" />
+                    <button class="btn btn-block btn-social"
+                            ng-class="login.properties.SocialStyle"
+                            id="{{login.authType}}">
+
+                        <i class="fa" ng-class="login.properties.SocialIcon"></i>
+                        <localize key="defaultdialogs_linkYour">Link your</localize>&nbsp;{{login.caption}}&nbsp;<localize key="defaultdialogs_account">account</localize>
+                    </button>
+                </form>
+
+                <button ng-if="login.linkedProviderKey != undefined"
+                        ng-click="unlink($event, login.authType, login.linkedProviderKey)"
+                        class="btn btn-block btn-social"
                         ng-class="login.properties.SocialStyle"
-                        id="{{login.authType}}">
-
+                        id="{{login.authType}}"
+                        name="provider"
+                        value="{{login.authType}}">
                     <i class="fa" ng-class="login.properties.SocialIcon"></i>
-                    <localize key="defaultdialogs_linkYour">Link your</localize>&nbsp;{{login.caption}}&nbsp;<localize key="defaultdialogs_account">account</localize>
+                    <localize key="defaultdialogs_unLinkYour">Un-link your</localize>&nbsp;{{login.caption}}&nbsp;<localize key="defaultdialogs_account">account</localize>
                 </button>
-			</form>
-
-            <button ng-if="login.linkedProviderKey != undefined"
-                    ng-click="unlink($event, login.authType, login.linkedProviderKey)"
-                    class="btn btn-block btn-social"
-                    ng-class="login.properties.SocialStyle"
-                    id="{{login.authType}}"
-                    name="provider"
-                    value="{{login.authType}}">
-                <i class="fa" ng-class="login.properties.SocialIcon"></i>
-                <localize key="defaultdialogs_unLinkYour">Un-link your</localize>&nbsp;{{login.caption}}&nbsp;<localize key="defaultdialogs_account">account</localize>
-            </button>
+            </div>
+			
         </div>
 
     </div>
@@ -86,7 +92,8 @@
         </ul>
     </div>
 
-    <div ng-show="showPasswordFields">
+
+    <div ng-if="showPasswordFields && !denyLocalLogin">
 
        <h5>
            <localize key="general_changePassword">Change password</localize>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
index c6c4f98e25..7271294a09 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
@@ -14,7 +14,7 @@
                         <span class="sr-only">
                             <localize key="visuallyHiddenTexts_openBackofficeSearch">Open backoffice search</localize>...
                         </span>
-                        <i class="umb-app-header__action-icon icon-search" aria-hidden="true"></i>
+                        <umb-icon icon="icon-search" class="umb-app-header__action-icon icon-search"></umb-icon>
                     </button>
                 </li>
                 <li data-element="global-help" class="umb-app-header__action">
@@ -22,7 +22,7 @@
                         <span class="sr-only">
                             <localize key="visuallyHiddenTexts_openCloseBackofficeHelp">Open/Close backoffice help</localize>...
                         </span>
-                        <i class="umb-app-header__action-icon icon-help-alt" aria-hidden="true"></i>
+                        <umb-icon icon="icon-help-alt" class="umb-app-header__action-icon icon-help-alt"></umb-icon>
                     </button>
                 </li>
                 <li data-element="global-user" class="umb-app-header__action">
@@ -45,12 +45,4 @@
 
     </div>
 
-    <umb-overlay
-        data-element="overlay-user"
-        ng-if="userDialog.show"
-        model="userDialog"
-        view="userDialog.view"
-        position="right">
-    </umb-overlay>
-
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-contextmenu.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-contextmenu.html
index 820ef4a886..0aa2e258a3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-contextmenu.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-contextmenu.html
@@ -1,16 +1,24 @@
-<div on-outside-click="outSideClick()">
-    <div class='umb-modalcolumn-header'>
-        <h1>{{menuDialogTitle}}</h1>
-    </div>
+<div id="contextMenu" class="umb-modalcolumn fill shadow" ng-animate="'slide'" umb-focus-lock role="dialog"
+    aria-labelledby="contextmenu-title" aria-describedby="contextmenu-description" on-outside-click="outSideClick()">
+    <div>
+        <div class="umb-modalcolumn-header">
+            <h1 id="contextmenu-title">{{ menuDialogTitle }}</h1>
+            <p id="contextmenu-description" class="sr-only">
+                <localize key="visuallyHiddenTexts_contextMenuDescription">Select one of the options to edit the node.</localize>
+            </p>
+        </div>
 
-    <div class='umb-modalcolumn-body'>
-        <ul class="umb-actions">
-            <li data-element="action-{{action.alias}}" class="umb-action" ng-class="{sep:action.separator, '-opens-dialog': action.opensDialog}" ng-repeat="action in menuActions">
-                <button type="button" umb-auto-focus="{{$index === 0}}" ng-click="executeMenuItem(action)" class="umb-action-link btn-reset umb-outline" prevent-default>
-                    <i class="icon icon-{{action.cssclass}}" aria-hidden="true"></i>
-                    <span class="menu-label">{{action.name}}</span>
-                </button>
-            </li>
-        </ul>
+        <div class="umb-modalcolumn-body">
+            <ul class="umb-actions">
+                <li data-element="action-{{action.alias}}" class="umb-action"
+                    ng-class="{sep:action.separator, '-opens-dialog': action.opensDialog}" ng-repeat="action in menuActions">
+                    <button type="button" ng-click="executeMenuItem(action)"
+                        class="umb-action-link btn-reset umb-outline">
+                        <i class="icon icon-{{action.cssclass}}" aria-hidden="true"></i>
+                        <span class="menu-label">{{ action.name }}</span>
+                    </button>
+                </li>
+            </ul>
+        </div>
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
index 9787c57940..1e570b4af6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
@@ -5,12 +5,12 @@
         <div class="login-overlay__background-image" ng-style="{'background-image': 'url('+vm.backgroundImage+')'}"></div>
 
         <div class="login-overlay__logo">
-            <img src="assets/img/application/umbraco_logo_white.svg">
+            <img ng-src="{{vm.logoImage}}" alt=""/>
         </div>
 
-        <div ng-show="vm.invitedUser != null" class="umb-login-container">
+        <div ng-if="!vm.denyLocalLogin" ng-show="vm.invitedUser != null" class="umb-login-container">
 
-            <form name="inviteUserPasswordForm" novalidate="" ng-submit="vm.inviteSavePassword()" val-form-manager>
+            <form name="vm.inviteUserPasswordForm" novalidate="" ng-submit="vm.inviteSavePassword()" val-form-manager>
                 <div class="form" ng-if="vm.inviteStep === 1">
                     <h1 style="margin-bottom: 10px; text-align: left;">Hi, {{vm.invitedUser.name}}</h1>
                     <p style="line-height: 1.6; margin-bottom: 25px;">
@@ -79,7 +79,7 @@
                                         size="xl"
                                         unknown-char="+"
                                         img-src="{{vm.invitedUser.avatars[3]}}"
-                                        img-srcset="{{vm.invitedUser.avatars[4]}} 2x, {{invitedUser.avatars[4]}} 3x">
+                                        img-srcset="{{vm.invitedUser.avatars[4]}} 2x, {{vm.invitedUser.avatars[4]}} 3x">
                             </umb-avatar>
                         </a>
 
@@ -100,7 +100,7 @@
             </div>
 
         </div>
-        <div ng-show="vm.invitedUser == null && vm.inviteStep === 3" ng-if="vm.inviteStep === 3" class="umb-login-container">
+        <div ng-show="vm.invitedUser == null && vm.inviteStep === 3" ng-if="!vm.denyLocalLogin && vm.inviteStep === 3" class="umb-login-container">
             <div class="form">
                 <h1 style="margin-bottom: 10px; text-align: left;">Hi there</h1>
                 <p style="line-height: 1.6; margin-bottom: 25px;">
@@ -120,29 +120,31 @@
                     </p>
 
                     <div class="external-logins" ng-if="vm.externalLoginProviders.length > 0">
+                        <div ng-repeat="login in vm.externalLoginProviders">
 
-                        <div class="text-error" ng-repeat="error in vm.externalLoginInfo.errors">
-                            <span>{{error}}</span>
-                        </div>
-
-                        <form method="POST" name="vm.externalLoginForm" action="{{vm.externalLoginFormAction}}">
-
-                            <div ng-repeat="login in vm.externalLoginProviders">
-
-                                <button type="submit" class="btn btn-block btn-social"
-                                        ng-class="login.properties.SocialStyle"
-                                        id="{{login.authType}}" name="provider" value="{{login.authType}}"
-                                        title="Log in using your {{login.caption}} account">
-                                    <i class="fa" ng-class="login.properties.SocialIcon"></i>
-                                    <localize key="login_signInWith">Sign in with</localize>&nbsp;{{login.caption}}
-                                </button>
-
+                            <div ng-if="!login.customView">
+                                <form method="POST" action="{{vm.externalLoginFormAction}}">
+                                    <button type="submit"
+                                            class="btn btn-block btn-social"
+                                            ng-class="login.properties.SocialStyle"
+                                            id="{{login.authType}}" name="provider" value="{{login.authType}}"
+                                            title="Log in using your {{login.caption}} account">
+                                        <i class="fa" ng-class="login.properties.SocialIcon"></i>
+                                        <localize key="login_signInWith">Sign in with</localize>&nbsp;{{login.caption}}
+                                    </button>
+                                </form>
+                                <div ng-if="login.errors">
+                                    <div class="text-error" ng-repeat="error in login.errors">
+                                        <span>{{error}}</span>
+                                    </div>
+                                </div>
                             </div>
-                        </form>
 
+                            <div ng-if="login.customView" ng-include="login.customView"></div>
+                        </div>
                     </div>
 
-                    <form method="POST" name="vm.loginForm" ng-submit="vm.loginSubmit()">
+                    <form ng-if="!vm.denyLocalLogin" method="POST" name="vm.loginForm" ng-submit="vm.loginSubmit()">
 
                         <div ng-messages="vm.loginForm.$error" class="control-group" aria-live="assertive">
                             <p ng-message="auth" class="text-error" role="alert" tabindex="0">{{vm.errorMsg}}</p>
@@ -156,10 +158,10 @@
                             <label for="umb-passwordTwo"><localize key="general_password">Password</localize></label>
                             <input type="password" ng-model="vm.password" name="password" id="umb-passwordTwo" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" aria-required="true" />
                             <div class="password-toggle">
-                                <a href="#" prevent-default ng-click="vm.togglePassword()">
+                                <button type="button" class="btn-reset" ng-click="vm.togglePassword()">
                                     <span class="password-text show"><localize key="login_showPassword">Show password</localize></span>
                                     <span class="password-text hide"><localize key="login_hidePassword">Hide password</localize></span>
-                                </a>
+                                </button>
                             </div>
                         </div>
 
@@ -171,14 +173,17 @@
                                         type="submit">
                             </umb-button>
                             <div ng-show="vm.allowPasswordReset">
-                                <a class="muted" style="text-decoration: underline;" href="#" prevent-default ng-click="vm.showRequestPasswordReset()"><localize key="login_forgottenPassword">Forgotten password?</localize></a>
+                                <button type="button" class="btn-reset muted" style="text-decoration: underline;"
+                                    ng-click="vm.showRequestPasswordReset()">
+                                    <localize key="login_forgottenPassword">Forgotten password?</localize>
+                                </button>
                             </div>
                         </div>
 
                     </form>
                 </div>
 
-                <div ng-show="vm.view == 'request-password-reset'">
+                <div ng-if="!vm.denyLocalLogin" ng-show="vm.view == 'request-password-reset'">
                     <p tabindex="0">
                         <localize key="login_forgottenPasswordInstruction">An email will be sent to the address specified with a link to reset your password</localize>
                     </p>
@@ -203,13 +208,15 @@
 
                         <div class="flex justify-between items-center">
                             <button type="submit" class="btn btn-success" val-trigger-change="#login .form input"><localize key="general_submit">Submit</localize></button>
-                            <a class="muted" href="#" prevent-default ng-click="vm.showLogin()" style="text-decoration: underline;"><localize key="login_returnToLogin">Return to login form</localize></a>
+                            <button type="button" class="btn-reset muted" ng-click="vm.showLogin()" style="text-decoration: underline;">
+                                <localize key="login_returnToLogin">Return to login form</localize>
+                            </button>
                         </div>
 
                     </form>
                 </div>
 
-                <div ng-show="vm.view == 'set-password'">
+                <div ng-if="!vm.denyLocalLogin" ng-show="vm.view == 'set-password'">
 
                     <p ng-hide="vm.resetComplete">
                         <localize key="login_setPasswordInstruction">Please provide a new password.</localize>
@@ -239,23 +246,27 @@
                         </div>
                         <div class="flex justify-between items-center">
                             <button ng-hide="vm.resetComplete" type="submit" class="btn btn-success" val-trigger-change="#login .form input"><localize key="general_submit">Submit</localize></button>
-                            <a class="muted" href="#" prevent-default ng-click="vm.showLogin()"><localize key="login_returnToLogin">Return to login form</localize></a>
+                            <button type="button" class="btn-reset muted" ng-click="vm.showLogin()">
+                                <localize key="login_returnToLogin">Return to login form</localize>
+                            </button>
                         </div>
 
                     </form>
                 </div>
 
-                <div ng-show="vm.view == 'password-reset-code-expired'">
+                <div ng-if="!vm.denyLocalLogin" ng-show="vm.view == 'password-reset-code-expired'">
                     <div class="text-error" ng-repeat="error in vm.resetPasswordCodeInfo.errors">
                         <p class="text-error">{{error}}</p>
                     </div>
 
                     <div class="switch-view">
-                        <a class="muted" href="#" prevent-default ng-click="vm.showLogin()"><localize key="login_returnToLogin">Return to login form</localize></a>
+                        <button type="button" class="btn-reset muted" ng-click="vm.showLogin()">
+                            <localize key="login_returnToLogin">Return to login form</localize>
+                        </button>
                     </div>
                 </div>
 
-                <div ng-show="vm.view == '2fa-login'">
+                <div ng-if="!vm.denyLocalLogin" ng-show="vm.view == '2fa-login'">
                     <div ng-include='vm.twoFactor.view'></div>
                 </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
index c133d5d38b..86e905183c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
@@ -15,7 +15,7 @@
                         </span>
                         <span>{{selectedLanguage.name}}</span>
                     </span>
-                    <i class="umb-language-picker__expand" ng-class="{'icon-navigation-down': !page.languageSelectorIsOpen, 'icon-navigation-up': page.languageSelectorIsOpen}" class="icon-navigation-right" aria-hidden="true"></i>
+                    <umb-icon icon="{{page.languageSelectorIsOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}" class="umb-language-picker__expand icon-navigation-down" aria-hidden="true">&nbsp;</umb-icon>
                 </button>
                 <div class="umb-language-picker__dropdown" ng-if="page.languageSelectorIsOpen">
                     <button
@@ -23,7 +23,7 @@
                         class="umb-language-picker__dropdown-item"
                         ng-class="{'umb-language-picker__dropdown-item--current': language.active}"
                         ng-click="selectLanguage(language)"
-                        ng-repeat="language in languages"
+                        ng-repeat="language in languages | orderBy:'name'"
                     >
                     <span class="sr-only">
                         <localize key="visuallyHiddenTexts_switchLanguage">Switch language to</localize>
@@ -45,15 +45,13 @@
 
         <div class="offset6" id="navOffset" style="z-index: 10">
 
-            <!-- The context menu -->
-            <div id='contextMenu' class="umb-modalcolumn fill shadow" ng-if="showContextMenu" ng-animate="'slide'">
-                <umb-context-menu
-                    menu-dialog-title="{{menuDialogTitle}}"
-                    current-section="{{currentSection}}"
-                    current-node="menuNode"
-                    menu-actions="menuActions">
-                </umb-context-menu>
-            </div>
+            <umb-context-menu
+                ng-if="showContextMenu"
+                menu-dialog-title="{{menuDialogTitle}}"
+                current-section="{{currentSection}}"
+                current-node="menuNode"
+                menu-actions="menuActions">
+            </umb-context-menu>
 
             <umb-context-dialog
                 ng-if="showContextMenuDialog"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-search.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-search.html
index cc1c8abb7e..76098d1308 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-search.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-search.html
@@ -1,13 +1,29 @@
 
-<div class="umb-search" on-outside-click="vm.closeSearch()" ng-keydown="vm.handleKeyDown($event)">
+<div class="umb-search" on-outside-click="vm.closeSearch()" ng-keydown="vm.handleKeyDown($event)" role="dialog"
+    aria-labelledby="search-overlay-title" aria-describedby="search-overlay-description">
+
+    <div class="sr-only">
+        <h1 id="search-overlay-title">
+            <localize key="visuallyHiddenTexts_searchOverlayTitle">Search the Umbraco backoffice</localize>
+        </h1>
+        <p id="search-overlay-description">
+            <localize key="visuallyHiddenTexts_searchOverlayDescription">Search for content nodes, media nodes etc. across the
+                backoffice.</localize>
+        </p>
+    </div>
 
     <div class="flex items-center">
         <label for="app-search" class="umb-search__label">
-            <i class="umb-search-input-icon icon-search" aria-hidden="true"></i>
+            <umb-icon icon="icon-search" class="umb-search-input-icon icon-search"></umb-icon>
             <span class="sr-only">
                 <localize key="general_search">Search...</localize>
             </span>
         </label>
+        <span class="sr-only" id="search-input-description">
+            <localize key="visuallyHiddenTexts_searchInputDescription">When autocomplete results are available, press up and
+                down arrows,
+                or use the tab key and use the enter key to select.</localize>
+        </span>
         <input
             class="umb-search-input"
             type="text"
@@ -15,26 +31,39 @@
             ng-model-options="{ debounce: 200 }"
             ng-change="vm.search(vm.searchQuery)"
             localize="placeholder"
-            placeholder="@placeholders_search" 
+            placeholder="@placeholders_search"
             id="app-search"
-            focus-when="{{vm.searchHasFocus}}" />
-        <button ng-show="vm.searchQuery.length > 0" tabindex="-1" class="umb-search-input-clear umb-animated" ng-click="vm.clearSearch()">
+            focus-when="{{vm.searchHasFocus}}"
+            aria-describedby="search-input-description"
+            aria-expanded="{{vm.hasResults}}"
+            aria-owns="search-results"
+            aria-autocomplete="list"
+        />
+        <button ng-show="vm.searchQuery.length > 0" class="umb-search-input-clear umb-animated" ng-click="vm.clearSearch()">
             <localize key="general_clear">Clear</localize>
         </button>
     </div>
 
     <div class="umb-search-results">
-        <div class="umb-search-group" ng-repeat="(key, group) in vm.searchResults">
-            <div class="umb-search-group__title">{{key}}</div>
+        <div class="umb-search-group" ng-repeat="(key, group) in vm.searchResults" id="search-results" role="listbox">
+            <div class="umb-search-group__title" aria-hidden="true">{{key}}</div>
             <ul class="umb-search-items">
                 <li class="umb-search-item" ng-repeat="result in group.results" active-result="{{result === vm.activeResult}}">
                     <a class="umb-search-result__link" ng-href="#/{{result.editorPath}}" ng-click="vm.clickItem(result)">
-                        <i class="umb-search-result__icon {{result.icon}}"></i>
+                        <umb-icon icon="{{result.icon}}" class="umb-search-result__icon {{result.icon}}"></umb-icon>
                         <span class="umb-search-result__meta">
                             <span class="umb-search-result__name">{{result.name}}</span>
-                            <span class="umb-search-result__description" ng-show="result.subTitle">{{result.subTitle}}</span>
+                            <span class="umb-search-result__description" ng-show="result.subTitle">
+                                <span class="sr-only">
+                                    <localize key="visuallyHiddenTexts_path">Path:</localize>
+                                </span>
+                                <span>{{result.subTitle}}</span>
+                            </span>
                         </span>
                     </a>
+                    <span class="sr-only">
+                        <localize key="visuallyHiddenTexts_foundIn">Found in</localize> {{key}}
+                    </span>
                 </li>
             </ul>
         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html
index f43353ede9..a58aac7b8d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html
@@ -14,9 +14,12 @@
             </li>
 
             <li data-element="section-expand" class="expand" ng-class="{ 'open': showTray === true, current: currentSectionInOverflow() }" ng-show="visibleSections < sections.length">
-                <a href="#" ng-click="trayClick()" prevent-default aria-label="More sections">
-                    <span class="section__name">&bull;&bull;&bull;</span>
-                </a>
+                <umb-button-ellipsis
+                    action="trayClick()"
+                    text="More sections"
+                    color="#ffffff"
+                    >
+                </umb-button-ellipsis>
 
                 <ul id="applications-tray" class="sections-tray shadow-depth-2" ng-if="showTray" on-outside-click="trayClick()">
                     <li ng-repeat="section in sections | limitTo: sections.length | limitTo: -(sections.length - visibleSections)" ng-class="{current: section.alias == currentSection}">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html
index 9e161d6b4e..e8c3274bc2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html
@@ -1,7 +1,8 @@
 <div class="umb-tour-step umb-tour-step--{{size}}">
 
     <div ng-if="hideClose !== true">
-        <button type="button" class="icon-wrong umb-tour-step__close" hotkey="esc" ng-click="close()">
+        <button type="button" class="umb-tour-step__close" hotkey="esc" ng-click="close()">
+            <umb-icon icon="icon-wrong" class="icon-wrong"></umb-icon>
             <span class="sr-only">
                 <localize key="general_close">Close</localize>
             </span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card-grid.less b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card-grid.less
new file mode 100644
index 0000000000..58794461df
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card-grid.less
@@ -0,0 +1,15 @@
+.umb-block-card-grid {
+    /* FlexBox Fallback */
+    display: flex;
+    flex-wrap: wrap;
+    > * {
+        flex: 1 1 240px;
+    }
+
+    /* Grid Setup */
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+    grid-auto-rows: minmax(160px, auto);
+    grid-gap: 20px;
+    
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
new file mode 100644
index 0000000000..c1656c33ff
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
@@ -0,0 +1,17 @@
+
+    <div class="__showcase"
+        ng-class="{'--error':vm.elementTypeModel === null}"
+        ng-style="{'background-color': vm.blockConfigModel ? vm.blockConfigModel.backgroundColor : '', 'background-image': vm.styleBackgroundImage}">
+        <i ng-if="vm.blockConfigModel == null || vm.blockConfigModel.thumbnail == null" class="__icon {{ vm.elementTypeModel ? vm.elementTypeModel.icon : 'icon-block' }}" ng-attr-style="{{'color:'+vm.blockConfigModel.iconColor+' !important'}}" aria-hidden="true"></i>
+    </div>
+    <div class="__info" ng-if="vm.elementTypeModel !== null">
+        <div class="__name" ng-bind="vm.elementTypeModel.name"></div>
+        <div class="__subname" ng-if="vm.elementTypeModel.description" ng-bind="vm.elementTypeModel.description"></div>
+    </div>
+    <div class="__info --error" ng-if="vm.elementTypeModel === null">
+        <div class="__name"><localize key="blockEditor_elementTypeDoesNotExistHeadline">Other</localize></div>
+        <div class="__subname"><localize key="blockEditor_elementTypeDoesNotExistDescription">Other</localize></div>
+    </div>
+
+    <ng-transclude></ng-transclude>
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less
new file mode 100644
index 0000000000..bfd72c0216
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less
@@ -0,0 +1,152 @@
+.umb-block-card, 
+umb-block-card {
+    position: relative;
+    display: inline-block;
+    width: 100%;
+    height: auto;
+    background-color: white;
+    border-radius: @doubleBorderRadius;
+    box-shadow: 0 1px 2px rgba(0,0,0,.2);
+
+    transition: box-shadow 120ms;
+
+    cursor: pointer;
+
+    .umb-outline();
+
+    &:hover {
+        box-shadow: 0 1px 3px rgba(@ui-action-type-hover, .5);
+    }
+
+    &.--isOpen {
+        &::after {
+            content: "";
+            position: absolute;
+            border: 2px solid @ui-active-border;
+            border-radius: @doubleBorderRadius;
+            top:0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+        }
+    }
+
+    &.--sortable-placeholder {
+        &::after {
+            content: "";
+            position: absolute;
+            background-color:rgba(@ui-drop-area-color, .05);
+            border: 2px solid rgba(@ui-drop-area-color, .1);
+            border-radius: @doubleBorderRadius;
+            box-shadow: 0 0 4px rgba(@ui-drop-area-color, 0.05);
+            top:0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            animation: umb-block-card--sortable-placeholder 400ms ease-in-out alternate infinite;
+            @keyframes umb-block-card--sortable-placeholder {
+                0%   { opacity: 1; }
+                100% { opacity: 0.5; }
+            }
+        }
+        box-shadow: none;
+    }
+
+    .__showcase {
+        position: relative;
+        width: 100%;
+        padding-bottom: 10/16*100%;
+        background-color: @gray-12;
+        
+        background-size: cover;
+        background-position: 50% 50%;
+        background-repeat: no-repeat;
+        
+        border-top-left-radius: @doubleBorderRadius;
+        border-top-right-radius: @doubleBorderRadius;
+
+        &.--error {
+            border: 2px solid @errorBackground;
+            border-bottom: none;
+            border-top-left-radius: 6px;
+            border-top-right-radius: 6px;
+            box-sizing: border-box;
+        }
+        
+        .__icon {
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size:42px;
+        }
+    }
+    
+    .__info {
+        width: 100%;
+        background-color: #fff;
+        padding-top: 10px;
+        padding-bottom: 11px;// 10 + 1 to compentiate for the -1 substraction in margin-bottom.
+        border-bottom-left-radius: @doubleBorderRadius;
+        border-bottom-right-radius: @doubleBorderRadius;
+
+        &.--error {
+            background-color: @errorBackground;
+            .__name, .__subname {
+                color: @errorText;
+            }
+        }
+
+        .__name {
+            font-weight: bold;
+            font-size: 14px;
+            color: @ui-action-type;
+            margin-left: 16px;
+            margin-bottom: -1px;
+        }
+        .__subname {
+            color: @gray-4;
+            font-size: 12px;
+            margin-left: 16px;
+            margin-top: 1px;
+            margin-bottom: -1px;
+            line-height: 1.5em;
+        }
+    }
+
+    &:hover {
+        .__info:not(.--error) {
+            .__name {
+                color: @ui-action-type-hover;
+            }
+        }
+    }
+
+    .__actions {
+        position: absolute;
+        top: 10px;
+        right: 0;
+        opacity: 0;
+        transition: opacity 120ms;
+        .__action {
+            display: inline-block;
+            border-radius: 50%;
+            width: 28px;
+            height: 28px;
+            margin-right: 10px;
+            background-color: white;
+            color:@ui-action-type;
+            &:hover {
+                color: @ui-action-type-hover;
+            }
+        }
+    }
+    &:hover, &:focus, &:focus-within {
+        .__actions {
+            opacity: 1;
+        }
+    }
+
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js
new file mode 100644
index 0000000000..0c75bfbee3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js
@@ -0,0 +1,52 @@
+(function () {
+    "use strict";
+
+    angular
+        .module("umbraco")
+        .component("umbBlockCard", {
+            templateUrl: "views/components/blockcard/umb-block-card.html",
+            controller: BlockCardController,
+            controllerAs: "vm",
+            transclude: true,
+            bindings: {
+                blockConfigModel: "<?",
+                elementTypeModel: "<"
+            }
+        });
+
+    function BlockCardController($scope, umbRequestHelper) {
+
+        var vm = this;
+        vm.styleBackgroundImage = "none";
+
+        var unwatch = $scope.$watch("vm.blockConfigModel.thumbnail", (newValue, oldValue) => {
+            if(newValue !== oldValue) {
+                vm.updateThumbnail();
+            }
+        });
+
+        vm.$onInit = function () {
+
+            vm.updateThumbnail();
+
+        }
+        vm.$onDestroy = function () {
+            unwatch();
+        }
+
+        vm.updateThumbnail = function () {
+            if (vm.blockConfigModel == null || vm.blockConfigModel.thumbnail == null || vm.blockConfigModel.thumbnail === "") {
+                vm.styleBackgroundImage = "none";
+                return;
+            }
+
+            var path = umbRequestHelper.convertVirtualToAbsolutePath(vm.blockConfigModel.thumbnail);
+            if (path.toLowerCase().endsWith(".svg") === false) {
+                path += "?upscale=false&width=400";
+            }
+            vm.styleBackgroundImage = 'url(\''+path+'\')';
+        }
+
+    }
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-ellipsis.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-ellipsis.html
new file mode 100644
index 0000000000..62ddafb597
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-ellipsis.html
@@ -0,0 +1,12 @@
+<button
+    type="button"
+    data-element="{{vm.element}}"
+    class="btn-reset umb-button-ellipsis {{vm.cssClass}}"
+    style="color:{{vm.color}};"
+    ng-class="{'umb-button-ellipsis--hidden': vm.state === 'hidden', 'show-text': vm.showText, 'umb-button-ellipsis--tab' : vm.mode === 'tab', 'umb-button-ellipsis--small' : vm.mode === 'small'}"
+    ng-click="vm.clickButton($event)">
+    <span class="umb-button-ellipsis__content">
+        <span class="umb-button-ellipsis__icon" aria-hidden="true">&bull;&bull;&bull;</span>
+        <span class="umb-button-ellipsis__text" ng-class="{'sr-only': vm.showText !== true}">{{vm.text}}</span>
+    </span>
+</button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
index 49827910d0..bb310441bf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
@@ -1,10 +1,12 @@
-<div class="btn-group umb-button-group" ng-class="{'dropup': direction === 'up'}">
+<div class="btn-group umb-button-group" ng-class="{ 'dropup': direction === 'up', '-with-button-group-toggle': subButtons.length > 0 }">
 
    <umb-button
       ng-if="defaultButton"
       alias="{{defaultButton.alias ? defaultButton.alias : 'groupPrimary' }}"
-      type="button"
+      type="{{defaultButton.type}}"
       action="defaultButton.handler()"
+      href="{{defaultButton.href}}"
+      href-target="{{defaultButton.hrefTarget}}"
       button-style="{{buttonStyle}}"
       state="state"
       label="{{defaultButton.labelKey}}"
@@ -16,9 +18,9 @@
       add-ellipsis={{defaultButton.addEllipsis}}>
    </umb-button>
 
-   <button data-element="button-group-toggle"
+   <button
       type="button"
-      prevent-default
+      data-element="button-group-toggle"
       class="btn btn-{{buttonStyle}} dropdown-toggle umb-button-group__toggle umb-button--{{size}}"
       ng-if="subButtons.length > 0"
       ng-click="toggleDropdown()"
@@ -32,19 +34,18 @@
    </button>
 
     <umb-dropdown
-         ng-show="subButtons.length > 0 && dropdown.isOpen"
+         ng-if="subButtons.length > 0 && dropdown.isOpen"
          class="umb-button-group__sub-buttons"
          on-close="closeDropdown()"
          deep-blur="closeDropdown()"
-         ng-class="{'-align-right': float === 'right'}"
-         >
+         ng-class="{'-align-right': float === 'right'}">
       <umb-dropdown-item ng-repeat="subButton in subButtons">
          <button
+            type="button"
             data-element="{{subButton.alias ? 'button-' + subButton.alias : 'button-group-secondary-' + $index }}"
-            type="button" ng-click="executeMenuItem(subButton)"
+            ng-click="executeMenuItem(subButton)"
             hotkey="{{subButton.hotKey}}"
-            hotkey-when-hidden="{{subButton.hotKeyWhenHidden}}"
-            prevent-default>
+            hotkey-when-hidden="{{subButton.hotKeyWhenHidden}}">
                <localize key="{{subButton.labelKey}}">{{subButton.labelKey}}</localize>
                <span ng-if="subButton.addEllipsis === 'true'">...</span>
          </button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
index be68f110a4..fceb27b6e7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
@@ -1,20 +1,21 @@
 <div class="umb-button" ng-class="{'ml0': vm.generalActions, 'umb-button--block': vm.blockElement}" data-element="{{ vm.alias ? 'button-' + vm.alias : '' }}">
 
     <div ng-if="vm.innerState">
-        <div class="icon-check umb-button__success" ng-class="{'-hidden': vm.innerState !== 'success', '-white': vm.isPrimaryButtonStyle}"></div>
-        <div class="icon-delete umb-button__error" ng-class="{'-hidden': vm.innerState !== 'error', '-white': vm.isPrimaryButtonStyle}"></div>
+        <umb-icon icon="icon-check" class="icon-check umb-button__success" ng-class="{'-hidden': vm.innerState !== 'success', '-white': vm.isPrimaryButtonStyle}"></umb-icon>
+        <umb-icon icon="icon-delete" class="icon-delete umb-button__error" ng-class="{'-hidden': vm.innerState !== 'error', '-white': vm.isPrimaryButtonStyle}"></umb-icon>
         <div class="umb-button__progress" ng-class="{'-hidden': vm.innerState !== 'busy', '-white': vm.isPrimaryButtonStyle}"></div>
         <div ng-if="vm.innerState !== 'init'" class="umb-button__overlay"></div>
     </div>
 
     <a ng-if="vm.type === 'link'"
         ng-href="{{vm.href}}"
+        ng-attr-target="{{(vm.hrefTarget) ? vm.hrefTarget : undefined}}"
         class="btn umb-button__button {{vm.style}} umb-button--{{vm.size}} umb-outline"
         ng-click="vm.clickButton($event)"
         hotkey="{{vm.shortcut}}"
         hotkey-when-hidden="{{vm.shortcutWhenHidden}}">
         <span class="umb-button__content" ng-class="{'-hidden': vm.innerState !== 'init'}">
-            <i ng-if="vm.icon" class="{{vm.icon}} umb-button__icon" aria-hidden="true"></i>
+            <umb-icon icon="{{vm.icon}}" class="{{vm.icon}} umb-button__icon" ng-if="vm.icon"></umb-icon>
             {{vm.buttonLabel}}
             <span ng-if="vm.showCaret" class="umb-button__caret caret" aria-hidden="true"></span>
         </span>
@@ -30,10 +31,9 @@
         ng-disabled="vm.disabled"
         umb-auto-focus="{{vm.autoFocus && !vm.disabled ? 'true' : 'false'}}"
         aria-haspopup="{{vm.hasPopup}}"
-        aria-expanded="{{vm.isExpanded}}"
-        >
+        aria-expanded="{{vm.isExpanded}}">
         <span class="umb-button__content" ng-class="{'-hidden': vm.innerState !== 'init'}">
-            <i ng-if="vm.icon" class="{{vm.icon}} umb-button__icon" aria-hidden="true"></i>
+            <umb-icon icon="{{vm.icon}}" class="{{vm.icon}} umb-button__icon" ng-if="vm.icon"></umb-icon>
             {{vm.buttonLabel}}
             <span ng-if="vm.showCaret" class="umb-button__caret caret" aria-hidden="true"></span>
         </span>
@@ -48,11 +48,10 @@
         ng-disabled="vm.disabled"
         umb-auto-focus="{{vm.autoFocus && !vm.disabled ? 'true' : 'false'}}">
         <span class="umb-button__content" ng-class="{'-hidden': vm.innerState !== 'init'}">
-            <i ng-if="vm.icon" class="{{vm.icon}} umb-button__icon" aria-hidden="true"></i>
+            <umb-icon icon="{{vm.icon}}" class="{{vm.icon}} umb-button__icon" ng-if="vm.icon"></umb-icon>
             {{vm.buttonLabel}}
             <span ng-if="vm.showCaret" class="umb-button__caret caret" aria-hidden="true"></span>
         </span>
     </button>
 
-
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle-group.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle-group.html
index 1a9026c7ab..4576a30418 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle-group.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle-group.html
@@ -3,10 +3,11 @@
         <umb-toggle class="umb-toggle-group-item__toggle"
                     checked="item.checked"
                     disabled="item.disabled"
+                    input-id="{{item.inputId}}"
                     on-click="change(item)">
         </umb-toggle>
         <div class="umb-toggle-group-item__content" ng-click="change(item)">
-            <div>{{ item.name }} </div>
+            <div><label for="{{item.inputId}}">{{ item.name }}</label> </div>
             <div class="umb-toggle-group-item__description">{{ item.description }}</div>
         </div>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html
index 185d852560..449c436149 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html
@@ -1,8 +1,7 @@
 <button role="checkbox" aria-checked="{{checked}}" ng-click="click()" type="button" class="umb-toggle" ng-disabled="disabled" ng-class="{'umb-toggle--checked': checked, 'umb-toggle--disabled': disabled}" id="{{inputId}}">
-
+    
     <span ng-if="!labelPosition && showLabels === 'true' || labelPosition === 'left' && showLabels === 'true'">
-        <span ng-if="!checked" class="umb-toggle__label umb-toggle__label--left">{{ displayLabelOff }}</span>
-        <span ng-if="checked" class="umb-toggle__label umb-toggle__label--left">{{ displayLabelOn }}</span>
+        <span class="umb-toggle__label umb-toggle__label--left">{{ checked ? displayLabelOn : displayLabelOff }}</span>
     </span>
 
     <div class="umb-toggle__toggle">
@@ -12,8 +11,7 @@
     </div>
 
     <span ng-if="labelPosition === 'right' && showLabels === 'true'">
-        <span ng-if="!checked" class="umb-toggle__label umb-toggle__label--right">{{ displayLabelOff }}</span>
-        <span ng-if="checked" class="umb-toggle__label umb-toggle__label--right">{{ displayLabelOn }}</span>
+        <span class="umb-toggle__label umb-toggle__label--right">{{ checked ? displayLabelOn : displayLabelOff }}</span>
     </span>
 
 </button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
index 0772dea148..ab7274df6f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
@@ -14,8 +14,7 @@
                 on-select-app="appChanged(app)"
                 on-select-app-anchor="appAnchorChanged(app, anchor)"
                 on-back="onBack()"
-                show-back="!(infiniteModel && infiniteModel.infiniteMode)"
-                >
+                show-back="!(infiniteModel && infiniteModel.infiniteMode)">
             </umb-variant-content-editors>
 
             <umb-editor-footer>
@@ -39,6 +38,7 @@
                         action="close()"
                         button-style="link"
                         label-key="general_close"
+                        shortcut="esc"
                         type="button">
                     </umb-button>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
index 9ec8ea9302..5f8967c419 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
@@ -7,20 +7,20 @@
             <umb-box-content class="block-form">
                 <ul class="nav nav-stacked mb0">
                     <li ng-repeat="url in currentUrls">
-                        <a href="{{url.text}}" target="_blank" ng-if="url.isUrl">
-                            <span ng-if="currentUrlsHaveMultipleCultures && url.culture" style="font-size: 13px; color: #cccccc; width: 50px;display: inline-block">{{url.culture}}</span>
+                        <a href="{{url.text}}" target="_blank" rel="noopener" ng-if="url.isUrl" class="umb-outline">
+                            <span ng-if="currentUrlsHaveMultipleCultures && url.culture" style="font-size: 13px; color: #cccccc; width: 55px;display: inline-block">{{url.culture}}</span>
                             <i class="icon icon-out" aria-hidden="true"></i>
                             <span>{{url.text}}</span>
                         </a>
                         <div ng-if="!url.isUrl" style="margin-top: 4px;">
-                            <span ng-if="currentUrlsHaveMultipleCultures && url.culture" style="font-size: 13px; color: #cccccc; width: 50px;display: inline-block">{{url.culture}}</span>
+                            <span ng-if="currentUrlsHaveMultipleCultures && url.culture" style="font-size: 13px; color: #cccccc; width: 55px;display: inline-block">{{url.culture}}</span>
                             <em>{{url.text}}</em>
                         </div>
                     </li>
                 </ul>
             </umb-box-content>
         </umb-box>
-        <umb-box data-element="node-info-redirects" style="display:none;" ng-cloak ng-show="!urlTrackerDisabled && hasRedirects">
+        <umb-box data-element="node-info-redirects" ng-cloak ng-show="!urlTrackerDisabled && hasRedirects">
             <umb-box-header title-key="redirectUrls_redirectUrlManagement"></umb-box-header>
             <umb-box-content class="block-form">
                 <div style="position: relative;">
@@ -30,7 +30,7 @@
                         <p><localize key="redirectUrls_panelInformation" class="ng-isolate-scope ng-scope">The following URLs redirect to this content item:</localize></p>
                         <ul class="nav nav-stacked" style="margin-bottom: 0;">
                             <li ng-repeat="redirectUrl in redirectUrls">
-                                <a href="{{redirectUrl.originalUrl}}" target="_blank">
+                                <a href="{{redirectUrl.originalUrl}}" target="_blank" rel="noopener" class="umb-outline">
                                     <i ng-class="value.icon" class="icon-out" aria-hidden="true"></i>
                                     {{redirectUrl.originalUrl}}
                                 </a>
@@ -43,10 +43,9 @@
 
         <umb-box data-element="node-info-history">
 
-            <umb-box-header title="{{historyLabel}}"> 
-                
+            <umb-box-header title-key="{{historyLabelKey}}" ng-if="historyLabelKey">
                 <umb-button
-                    ng-hide="node.trashed"
+                    ng-hide="node.trashed || node.id === 0"
                     type="button"
                     button-style="outline"
                     action="openRollback()"
@@ -101,10 +100,9 @@
                                     color="{{item.logTypeColor}}">
                                     <localize key="auditTrails_small{{ item.logType }}">{{ item.logType }}</localize>
                                 </umb-badge>
-                                <span>
+                                <span class="history-item__description">
                                     <localize key="auditTrails_{{ item.logType | lowercase }}" tokens="[item.parameters]">{{ item.comment }}</localize>
                                 </span>
-                                
                             </div>
 
                         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
index d534cd77ed..022c140a2f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
@@ -1,6 +1,6 @@
 <div>
     <ng-form name="tabbedContentForm">
-        <div class="umb-group-panel" retrive-dom-element="registerPropertyGroup(element[0], attributes.appAnchor)" data-app-anchor="{{group.id}}" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs track by group.label">
+        <div class="umb-group-panel" retrive-dom-element="registerPropertyGroup(element[0], attributes.appAnchor)" data-app-anchor="{{group.id}}" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs track by group.id">
 
             <div class="umb-group-panel__header">
                 <div id="group-{{group.id}}">{{ group.label }}</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
index 7db4f785f5..40a88ae6a6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
@@ -8,7 +8,8 @@
         <ng-form name="contentHeaderForm" ng-if="vm.content.apps.length > 0">
             <umb-editor-content-header
                 menu="vm.page.menu"
-                hide-menu="vm.page.hideActionsMenu"
+                hide-actions-menu="vm.page.hideActionsMenu"
+                disable-actions-menu="vm.disableActionsMenu"
                 name="vm.editor.content.name"
                 name-disabled="vm.nameDisabled"
                 editor="vm.editor"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
index 7e2cb4f012..687c8ef24e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
@@ -40,9 +40,9 @@
                                maxlength="255" />
                     </ng-form>
 
-                    <button type="button" ng-if="vm.hasVariants === true && hideChangeVariant !== true" class="umb-variant-switcher__toggle umb-outline" ng-click="vm.dropdownOpen = !vm.dropdownOpen" ng-class="{'--error': vm.errorsOnOtherVariants}">
+                    <button type="button" ng-if="vm.hasVariants === true && hideChangeVariant !== true" class="umb-variant-switcher__toggle umb-outline" ng-click="vm.dropdownOpen = !vm.dropdownOpen" ng-class="{'--error': vm.errorsOnOtherVariants}" aria-haspopup="true" aria-expanded="{{vm.dropdownOpen}}">
                         <span ng-bind="editor.content.displayName"></span>
-                        <ins class="umb-variant-switcher__expand" ng-class="{'icon-navigation-down': !vm.dropdownOpen, 'icon-navigation-up': vm.dropdownOpen}">&nbsp;</ins>
+                        <umb-icon icon="{{vm.dropdownOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}" class="umb-variant-switcher__expand" ng-class="{'icon-navigation-down': !vm.dropdownOpen, 'icon-navigation-up': vm.dropdownOpen}">&nbsp;</umb-icon>
                     </button>
 
                     <span ng-if="vm.hasVariants === true && hideChangeVariant" class="umb-variant-switcher__toggle">
@@ -51,15 +51,14 @@
 
                     <umb-dropdown ng-if="vm.dropdownOpen" class="umb-variant-switcher" ng-class="{'--has-sub-variants': vm.hasSubVariants === true}" on-close="vm.dropdownOpen = false" umb-keyboard-list>
                         <umb-dropdown-item
-                            ng-repeat-start="entry in vm.variantMenu track by entry.key"
+                            ng-repeat-start="entry in vm.variantMenu | orderBy:'variant.displayName' track by entry.key"
                             class="umb-variant-switcher__item"
                             ng-class="{'--current': entry.variant === editor.content, '--active': entry.variant.active && vm.dropdownOpen, '--error': entry.variant.active !== true && entry.variant.hasError, '--state-notCreated':entry.variant.state==='NotCreated' && entry.variant.name == null, '--state-draft':entry.variant.state==='Draft' || (entry.variant.state==='NotCreated' && entry.variant.name != null)}"
                         >
                             <button type="button" ng-if="entry.subVariants && entry.subVariants.length > 0" class="umb-variant-switcher__item-expand-button umb-outline" ng-click="entry.open = !entry.open">
-                                <i class="icon icon-navigation-down" ng-if="entry.open"></i>
-                                <i class="icon icon-navigation-right" ng-if="!entry.open"></i>
+                                <i class="icon {{entry.open ? 'icon-navigation-down' : 'icon-navigation-right'}}"></i>
                             </button>
-                            <button type="button" class="umb-variant-switcher__name-wrapper umb-outline" ng-click="selectVariant($event, entry.variant)" prevent-default>
+                            <button type="button" class="umb-variant-switcher__name-wrapper umb-outline" ng-click="selectVariant($event, entry.variant)">
                                 <span class="umb-variant-switcher__name" ng-bind="entry.variant.displayName"></span>
                                 <umb-variant-state variant="entry.variant" class="umb-variant-switcher__state"></umb-variant-state>
                             </button>
@@ -75,7 +74,7 @@
                                 class="umb-variant-switcher__item"
                                 ng-class="{'--current': subVariant === editor.content, '--active': subVariant.active && vm.dropdownOpen, '--error': subVariant.active !== true && subVariant.hasError, '--state-notCreated':subVariant.state==='NotCreated', '--state-draft':subVariant.state==='Draft'}"
                             >
-                                <button type="button" class="umb-variant-switcher__name-wrapper umb-outline" ng-click="selectVariant($event, subVariant)" prevent-default>
+                                <button type="button" class="umb-variant-switcher__name-wrapper umb-outline" ng-click="selectVariant($event, subVariant)">
                                     <span class="umb-variant-switcher__name" ng-bind="subVariant.segment"></span>
                                     <umb-variant-state variant="subVariant" class="umb-variant-switcher__state"></umb-variant-state>
                                 </button>
@@ -91,9 +90,9 @@
         </div>
 
         <div ng-if="splitViewOpen">
-            <a class="umb-editor-header__close-split-view" href="" ng-click="closeSplitView()">
-                <i class="icon-delete"></i>
-            </a>
+            <button type="button" class="btn-reset umb-editor-header__close-split-view" ng-click="closeSplitView()">
+                <umb-icon icon="icon-delete" class="icon-delete"></umb-icon>
+            </button>
         </div>
 
         <div ng-if="editor.variantApps && splitViewOpen !== true">
@@ -109,7 +108,8 @@
             <umb-editor-menu
                 data-element="editor-actions"
                 current-node="menu.currentNode"
-                current-section="{{menu.currentSection}}">
+                current-section="{{menu.currentSection}}"
+                is-disabled="disableActionsMenu">
             </umb-editor-menu>
         </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
index 7929f92371..1f4a47d947 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
@@ -18,7 +18,7 @@
                     ng-click="openIconPicker()"
                     ng-class="{'-placeholder': $parent.icon==='' || $parent.icon===null}"
                     title="{{$parent.icon}}">
-                        <i class="icon {{$parent.icon}}" ng-if="$parent.icon!=='' && $parent.icon!==null" aria-hidden="true"></i>
+                        <umb-icon class="icon {{$parent.icon}}" icon="{{$parent.icon}}" ng-if="$parent.icon!=='' && $parent.icon!==null"></umb-icon>
                         <span class="umb-panel-header-icon-text" ng-if="$parent.icon==='' || $parent.icon===null">
                             <localize key="settings_addIcon">Add icon</localize>
                         </span>
@@ -48,8 +48,8 @@
                                umb-auto-focus
                                focus-on-filled="true"
                                val-server-field="Name"
-                               required
-                               aria-required="true"
+                               ng-required="nameRequired != null ? nameRequired : true"
+                               aria-required="{{nameRequired != null ? nameRequired : true}}"
                                aria-invalid="{{contentForm.headerNameForm.headerName.$invalid ? true : false}}"
                                autocomplete="off"
                                maxlength="255"/>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
index ceae7c3bb9..789e8aa79e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
@@ -8,6 +8,7 @@
         show-caret="true"
         has-popup="true"
         is-expanded="dropdown.isOpen"
+        disabled="!actions || !actions.length || isDisabled"
         >
     </umb-button>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
index d743907d07..0fc84c7fb8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
@@ -1,19 +1,23 @@
 <button data-element="sub-view-{{vm.item.alias}}"
-   type="button"
-   ng-click="vm.clicked()"
-   hotkey="{{::vm.hotkey}}"
-   hotkey-when-hidden="true"
-   ng-class="{'is-active': vm.item.active, '-has-error': vm.item.hasError}"
-   class="umb-sub-views-nav-item__action umb-outline umb-outline--thin">
+        type="button"
+        ng-click="vm.clicked()"
+        hotkey="{{::vm.hotkey}}"
+        hotkey-when-hidden="true"
+        ng-class="{'is-active': vm.item.active, '-has-error': vm.item.hasError }"
+        ng-disabled="vm.item.disabled"
+        class="umb-sub-views-nav-item__action umb-outline umb-outline--thin"
+        aria-haspopup="{{ vm.item.anchors && vm.item.anchors.length > 1 }}"
+        aria-expanded="{{ vm.expanded }}">
     <i class="icon {{ vm.item.icon }}" aria-hidden="true"></i>
     <span class="umb-sub-views-nav-item-text">{{ vm.item.name }}</span>
     <div ng-show="vm.item.badge" class="badge -type-{{vm.item.badge.type}}">{{vm.item.badge.count}}</div>
+    <div ng-show="!vm.item.badge" class="badge -type-alert --error-badge">!</div>
 </button>
 
-<ul class="dropdown-menu umb-sub-views-nav-item__anchor_dropdown" ng-if="vm.item.anchors && vm.item.anchors.length > 1">
-    <li ng-repeat="anchor in vm.item.anchors" ng-class="{'is-active': vm.item.active && anchor.active}">
+<umb-dropdown on-close="vm.close()" deep-blur="vm.close()" umb-keyboard-list class="umb-sub-views-nav-item__anchor_dropdown" ng-class="{'is-expanded': vm.expanded}" ng-if="vm.item.anchors && vm.item.anchors.length > 1">
+    <umb-dropdown-item ng-repeat="anchor in vm.item.anchors" ng-class="{'is-active': vm.item.active && anchor.active}">
         <a href="#group-{{anchor.id}}" ng-click="vm.anchorClicked(anchor, $event)" prevent-default>
             <span class="sr-only"><localize key="visuallyHiddenTexts_jumpTo">Jump to</localize></span> {{anchor.label}} <span class="sr-only"><localize key="visuallyHiddenTexts_group"> group</localize></span>
         </a>
-    </li>
-</ul>
+    </umb-dropdown-item>
+</umb-dropdown>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
index df7f045cec..08858b058b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
@@ -16,13 +16,16 @@
 
         <div class="umb-sub-views-nav-item umb-sub-views-nav-item-more">
 
-            <a data-element="sub-view-{{moreButton.alias}}"
-                href=""
-                ng-click="toggleDropdown()"
-                ng-class="{'is-active': moreButton.active}">
-                <div class="umb-sub-views-nav-item-more__icon"><i></i><i></i><i></i></div>
-                <span class="umb-sub-views-nav-item-text">{{ moreButton.name }}</span>
-            </a>
+            <umb-button-ellipsis
+                element="sub-view-{{moreButton.alias}}"
+                action="toggleDropdown()"
+                color="#1b264f"
+                text="{{moreButton.name}}"
+                show-text="true"
+                mode="tab"
+                css-class="umb-sub-views-nav-item__action umb-outline umb-outline--thin {{moreButton.active ? 'is-active' : ''}}"
+                >
+            </umb-button-ellipsis>
 
             <umb-dropdown ng-show="showDropdown" on-close="hideDropdown()" class="umb-sub-views-nav-item-more__dropdown">
                 <umb-dropdown-item ng-repeat="navItem in navigation | limitTo: overflowingItems">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-view.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-view.html
index 2cddbe0967..807c8c7ebc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-view.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-view.html
@@ -1,6 +1,6 @@
 <div class="umb-editor-sub-view"
     ng-class="'sub-view-' + model.name"
-    val-sub-view>
+    val-sub-view="model">
 
     <div
         class="umb-editor-sub-view__content"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-views.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-views.html
index 4e4a7229cc..a0f56ee883 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-views.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-views.html
@@ -5,7 +5,7 @@
         class="umb-editor-sub-view"
         ng-repeat="subView in subViews track by subView.alias"
         ng-class="'sub-view-' + subView.name"
-        val-sub-view>
+        val-sub-view="subView">
 
        <div class="umb-editor-sub-view__content"
             ng-show="subView.active === true" 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html
index 2f1286b090..9bb5a6161d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html
@@ -1,26 +1,29 @@
 <div class="umb-editors">
 
-    <div class="umb-editor"
-        ng-repeat="model in editors"
-        ng-class="{'umb-editor--small': model.size === 'small',
-        'umb-editor--medium': model.size === 'medium',
-        'umb-editor--animating': model.animating,
-        'umb-editor--notInFront': model.inFront !== true,
-        'umb-editor--infiniteMode': model.infiniteMode,
-        'umb-editor--moveRight': model.moveRight,
-        'umb-editor--n0': model.styleIndex === 0,
-        'umb-editor--n1': model.styleIndex === 1,
-        'umb-editor--n2': model.styleIndex === 2,
-        'umb-editor--n3': model.styleIndex === 3,
-        'umb-editor--outOfRange': model.level === -1,
-        'umb-editor--level0': model.level === 0,
-        'umb-editor--level1': model.level === 1,
-        'umb-editor--level2': model.level === 2,
-        'umb-editor--level3': model.level === 3}"
-        >
+    <umb-editor-repeater class="umb-editor" 
+                         ng-repeat="model in editors" 
+                         ng-class="{'umb-editor--small': model.size === 'small',
+                'umb-editor--medium': model.size === 'medium',
+                'umb-editor--animating': model.animating,
+                'umb-editor--notInFront': model.inFront !== true,
+                'umb-editor--infiniteMode': model.infiniteMode,
+                'umb-editor--moveRight': model.moveRight,
+                'umb-editor--n0': model.styleIndex === 0,
+                'umb-editor--n1': model.styleIndex === 1,
+                'umb-editor--n2': model.styleIndex === 2,
+                'umb-editor--n3': model.styleIndex === 3,
+                'umb-editor--outOfRange': model.level === -1,
+                'umb-editor--level0': model.level === 0,
+                'umb-editor--level1': model.level === 1,
+                'umb-editor--level2': model.level === 2,
+                'umb-editor--level3': model.level === 3}">
+
         <div ng-if="!model.view && !model.animating" ng-transclude></div>
-        <div ng-if="model.view && !model.animating" ng-include="model.view"></div>
+
+        <div ng-if="model.view && !model.animating && !model.$parentScope" ng-include="model.view"></div>
+        <div ng-show="model.$parentScope" class="scoped-view"></div>
         <div class="umb-editor__overlay"></div>
-    </div>
+
+    </umb-editor-repeater>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
new file mode 100644
index 0000000000..ecbe880eee
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
@@ -0,0 +1,39 @@
+<div class="form-horizontal">
+    <ng-form name="elementTypeContentForm">
+        <div class="umb-group-panel"
+             data-element="group-{{group.alias}}"
+             ng-repeat="group in vm.model.variants[0].tabs track by group.id">
+
+            <div class="umb-group-panel__header">
+                <div id="group-{{group.id}}">{{ group.label }}</div>
+            </div>
+
+            <div class="umb-group-panel__content">
+                <umb-property
+                    data-element="property-{{property.alias}}"
+                    ng-repeat="property in group.properties track by property.alias"
+                    property="property"
+                    element-key="{{vm.model.key}}"
+                    show-inherit="vm.model.variants.length > 1 && !property.culture && !activeVariant.language.isDefault"
+                    inherits-from="defaultVariant.language.name">
+
+                    <div ng-class="{'o-40 cursor-not-allowed': vm.model.variants.length > 1 && !activeVariant.language.isDefault && !property.culture && !property.unlockInvariantValue}">
+                        <umb-property-editor
+                            model="property"
+                            preview="vm.model.variants.length > 1 && !activeVariant.language.isDefault && !property.culture && !property.unlockInvariantValue">
+                        </umb-property-editor>
+                    </div>
+
+                </umb-property>
+            </div>
+
+        </div>
+
+        <umb-empty-state
+            ng-if="vm.model.tabs.length === 0"
+            position="center">
+            <localize key="content_noProperties"></localize>
+        </umb-empty-state>
+
+    </ng-form>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umbelementeditorcontent.component.js b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umbelementeditorcontent.component.js
new file mode 100644
index 0000000000..b4a650a0c5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umbelementeditorcontent.component.js
@@ -0,0 +1,29 @@
+(function () {
+    'use strict';
+
+    // TODO: Add docs - this component is used to render a content item based on an Element Type as a nested editor
+
+    angular
+        .module('umbraco.directives')
+        .component('umbElementEditorContent', {
+            templateUrl: 'views/components/elementeditor/umb-element-editor-content.component.html',
+            controller: ElementEditorContentComponentController,
+            controllerAs: 'vm',
+            bindings: {
+                model: '='
+            }
+        });
+
+    function ElementEditorContentComponentController($scope) {
+
+        // We need a controller for the component to work.
+        var vm = this;
+
+        vm.getScope = getScope;// used by property editors to get a scope that is the root of split view, content apps etc.
+        function getScope() {
+            return $scope;
+        }
+
+    }
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
index 5f83d9ae53..c25541da21 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
@@ -1,5 +1,5 @@
 <label class="checkbox umb-form-check umb-form-check--checkbox {{vm.cssClass}}" ng-class="{ 'umb-form-check--disabled': vm.disabled }">
-    <div class="umb-form-check__symbol">
+    <span class="umb-form-check__symbol">
         <input ng-if="vm.disableDirtyCheck"
             type="checkbox"
             id="{{vm.inputId}}"
@@ -13,29 +13,26 @@
             ng-change="vm.change()"
             no-dirty-check />
 
-            <input ng-if="!vm.disableDirtyCheck"
-                type="checkbox"
-                id="{{vm.inputId}}"
-                name="{{vm.name}}"
-                value="{{vm.value}}"
-                class="umb-form-check__input"
-                val-server-field="{{vm.serverValidationField}}"
-                ng-model="vm.model"
-                ng-disabled="vm.disabled"
-                ng-required="vm.required"
-                ng-change="vm.change()"/>
+        <input ng-if="!vm.disableDirtyCheck"
+            type="checkbox"
+            id="{{vm.inputId}}"
+            name="{{vm.name}}"
+            value="{{vm.value}}"
+            class="umb-form-check__input"
+            val-server-field="{{vm.serverValidationField}}"
+            ng-model="vm.model"
+            ng-disabled="vm.disabled"
+            ng-required="vm.required"
+            ng-change="vm.change()"/>
 
         <span class="umb-form-check__state" aria-hidden="true">
             <span class="umb-form-check__check">
                 <i class="umb-form-check__icon icon-check"></i>
             </span>
         </span>
-    </div>
-    <div class="umb-form-check__info" ng-transclude>
-
-        <i ng-if="vm.iconClass.length" class="{{vm.iconClass}}" aria-hidden="true"></i>
-
+    </span>
+    <span class="umb-form-check__info" ng-transclude>
+        <i ng-if="vm.icon.length" class="{{vm.icon}}" aria-hidden="true"></i>
         <span ng-if="vm.text.length" class="umb-form-check__text">{{vm.text}}</span>
-
-    </div>
+    </span>
 </label>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
index a34d548ea6..067e1ca8d9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
@@ -1,10 +1,25 @@
-<label class="radio umb-form-check umb-form-check--radiobutton" ng-class="{ 'umb-form-check--disabled': vm.disabled }">
-    <div class="umb-form-check__symbol">
-        <input type="radio"
+<label class="radio umb-form-check umb-form-check--radiobutton {{vm.cssClass}}" ng-class="{ 'umb-form-check--disabled': vm.disabled }">
+    <span class="umb-form-check__symbol">
+        <input ng-if="vm.disableDirtyCheck"
+            type="radio"
             id="{{vm.inputId}}"
             name="{{vm.name}}"
             value="{{vm.value}}"
             class="umb-form-check__input"
+            val-server-field="{{vm.serverValidationField}}"
+            ng-model="vm.model"
+            ng-disabled="vm.disabled"
+            ng-required="vm.required"
+            ng-change="vm.change()"
+            no-dirty-check />
+
+        <input ng-if="!vm.disableDirtyCheck"
+            type="radio"
+            id="{{vm.inputId}}"
+            name="{{vm.name}}"
+            value="{{vm.value}}"
+            class="umb-form-check__input"
+            val-server-field="{{vm.serverValidationField}}"
             ng-model="vm.model"
             ng-disabled="vm.disabled"
             ng-required="vm.required"
@@ -13,8 +28,9 @@
         <span class="umb-form-check__state" aria-hidden="true">
             <span class="umb-form-check__check"></span>
         </span>
-    </div>
-    <div class="umb-form-check__info" ng-transclude>
-        <span class="umb-form-check__text">{{vm.text}}</span>
-    </div>
+    </span>
+    <span class="umb-form-check__info" ng-transclude>
+        <i ng-if="vm.icon.length" class="{{vm.icon}}" aria-hidden="true"></i>
+        <span ng-if="vm.text.length" class="umb-form-check__text">{{vm.text}}</span>
+    </span>
 </label>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-search-filter.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-search-filter.html
new file mode 100644
index 0000000000..d6fde29090
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-search-filter.html
@@ -0,0 +1,28 @@
+<div class="umb-control-group -no-border">
+    <div class="umb-search-filter" ng-class="vm.cssClass">
+        <label for="{{vm.inputId}}" class="sr-only">{{vm.text}}</label>
+        <umb-icon icon="icon-search" class="icon-search"></umb-icon>
+        <input
+                ng-if="vm.preventSubmitOnEnter"
+                id="{{vm.inputId}}"
+                type="text"
+                ng-change="vm.change()"
+                ng-model="vm.model"
+                class="umb-search-filter__input"
+                placeholder="{{vm.text}}"
+                umb-auto-focus="{{vm.autoFocus === true}}"
+                prevent-enter-submit
+                no-dirty-check />
+
+        <input
+                ng-if="!vm.preventSubmitOnEnter"
+                id="{{vm.inputId}}"
+                type="text"
+                ng-change="vm.change()"
+                ng-model="vm.model"
+                class="umb-search-filter__input {{vm.cssClass}}"
+                placeholder="{{vm.text}}"
+                umb-auto-focus="{{vm.autoFocus === true}}"
+                no-dirty-check />
+    </div>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-control-group.html b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-control-group.html
index f4a3d5be3b..ae9edd4143 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-control-group.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-control-group.html
@@ -8,7 +8,7 @@
                 </span>
                 <small ng-if="descriptionstring">{{descriptionstring}}</small>
             </label>
-            <div class="controls controls-row" ng-transclude></div>
+            <div class="controls" ng-transclude></div>
         </div>
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-crop.html b/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-crop.html
index 8fba4d1e3c..933551bbff 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-crop.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-crop.html
@@ -7,7 +7,7 @@
 	</div>
 
 	<div class="crop-slider-wrapper" ng-if="loaded">
-        <i class="icon-picture"></i>
+        <i class="icon-picture" aria-hidden="true"></i>
 
         <div class="crop-slider">
             <umb-range-slider
@@ -19,7 +19,7 @@
             </umb-range-slider>
         </div>
 
-        <i class="icon-picture" style="font-size: 22px"></i>
+        <i class="icon-picture" aria-hidden="true" style="font-size: 22px"></i>
     </div>
     
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
index a606aa5588..b608b3eb6e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
@@ -15,12 +15,11 @@
                     <localize key="content_noMediaLink"></localize>
                 </umb-empty-state>
 
-                <ul ng-if="nodeUrl" class="nav nav-stacked" style="margin-bottom: 0;">
+                <ul ng-if="nodeUrl" class="nav nav-stacked mb0">
                     <li>
-                        <a ng-attr-href="{{node.extension !== 'svg' ? nodeUrl : undefined}}" ng-click="node.extension === 'svg' && openSVG()" target="_blank">
-                            <i class="icon icon-out"></i>
+                        <a href="" ng-attr-href="{{node.extension !== 'svg' ? nodeUrl : undefined}}" ng-click="node.extension === 'svg' && openSVG()" target="_blank" rel="noopener" class="umb-outline">
+                            <i class="icon icon-out" aria-hidden="true"></i>
                             <span>{{nodeFileName}}</span>
-
                         </a>
                     </li>
                 </ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/member/umb-member-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/member/umb-member-node-info.html
index 62b2052771..5162caf13c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/member/umb-member-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/member/umb-member-node-info.html
@@ -1,7 +1,7 @@
 <div class="umb-package-details">
     <div class="umb-package-details__main-content">
 
-        <umb-box data-element="node-info-membership" ng-repeat="group in node.tabs| filter: {properties:{view:'readonlyvalue'}} track by group.label">
+        <umb-box data-element="node-info-membership" ng-repeat="group in node.tabs| filter: {properties:{view:'readonlyvalue'}} track by group.id">
 
             <div class="umb-group-panel__header">
                 <div>{{ group.label }}</div>
@@ -28,13 +28,13 @@
                     {{node.updateDateFormatted}}
                 </umb-control-group>
 
-                <umb-control-group data-element="node-info-document-type" label="@content_membertype">
+                <umb-control-group data-element="node-info-member-type" label="@content_membertype">
                     <umb-node-preview style="max-width: 100%; margin-bottom: 0px;"
                                       icon="node.icon"
                                       name="node.contentTypeName"
                                       alias="node.contentTypeAlias"
                                       allow-open="allowChangeMemberType"
-                                      on-open="openMemberType(node)">
+                                      on-open="openMemberType(memberType)">
                     </umb-node-preview>
                 </umb-control-group>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html b/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
index 872fdbe41f..37cd736830 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
@@ -9,7 +9,7 @@
             </div>
 
             <div ng-if="notification.headline">
-                <a ng-if="notification.url" ng-href="{{notification.url}}" href="" target="_blank">
+                <a ng-if="notification.url" ng-href="{{notification.url}}" href="" target="{{notification.target}}" rel="noreferrer">
                     <strong ng-bind="notification.headline"></strong>
                     <span ng-bind-html="notification.message"></span>
                 </a>
@@ -20,7 +20,7 @@
             </div>
 
             <button type="button" class="close -align-right" ng-click="removeNotification($index)" aria-hidden="true">
-                <span aria-hidden="true">&times;</span>
+                <span>&times;</span>
             </button>
         </li>
     </ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
index 39e0165fe8..c41caca004 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
@@ -1,4 +1,11 @@
-<div data-element="overlay" class="umb-overlay umb-overlay-{{position}} umb-overlay--{{size}}" on-outside-click="outSideClick()" role="dialog" aria-labelledby="umb-overlay-title" aria-describedby="umb-overlay-description">
+<div
+    data-element="{{name}}"
+    class="umb-overlay umb-overlay-{{position}} umb-overlay--{{size}}"
+    on-outside-click="outSideClick()"
+    umb-focus-lock
+    role="dialog"
+    aria-labelledby="umb-overlay-title"
+    aria-describedby="umb-overlay-description">
     <ng-form class="umb-overlay__form" name="overlayForm" novalidate val-form-manager>
         <div data-element="overlay-header" class="umb-overlay-header" ng-show="!model.hideHeader">
             <h1 class="umb-overlay__title" id="umb-overlay-title">{{model.title}}</h1>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umb-property-actions.html b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html
similarity index 65%
rename from src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umb-property-actions.html
rename to src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html
index ebab65d573..9593c5809f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umb-property-actions.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html
@@ -1,8 +1,13 @@
-<div class="umb-property-actions" ng-if="vm.actions.length > 0">
-    <button type="button" class="btn-reset umb-outline umb-property-actions__toggle" ng-click="vm.toggle()" localize="title" title="propertyActions_tooltipForPropertyActionsMenu"><i></i><i></i><i></i></button>
+<div class="umb-property-actions" ng-class="{ '-open': vm.isOpen }" ng-if="vm.actions.length > 0">
+
+    <umb-button-ellipsis
+        css-class="umb-outline umb-property-actions__toggle"
+        action="vm.toggle()"
+        mode="small"
+        text="{{vm.isOpen ? vm.labels.closeText : vm.labels.openText}}">
+    </umb-button-ellipsis>
 
     <div class="umb-property-actions__menu" role="menu" ng-if="vm.isOpen" on-outside-click="vm.close()" on-close="vm.close()" deep-blur="vm.close()">
-        <button class="umb-property-actions__menu-open-toggle" ng-click="vm.close()" tabindex="-1"><i></i><i></i><i></i></button>
         <ul class="umb-contextmenu">
             <li ng-repeat="action in vm.actions" role="menuitem" class="umb-contextmenu-item" ng-class="{'-opens-dialog': action.opensDialog}">
                 <button type="button" class="btn-reset umb-outline" ng-click="vm.executeAction(action)" ng-disabled="action.isDisabled === true">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
index 658b7c73ab..5b8e6d8f04 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
@@ -1,29 +1,30 @@
 <div class="umb-property">
     <ng-form name="propertyForm">
-        <div class="control-group umb-control-group" ng-class="{hidelabel:property.hideLabel, 'umb-control-group__listview': property.alias === '_umb_containerView'}">
+        <div class="control-group umb-control-group"
+             ng-class="{'hidelabel':vm.property.hideLabel, '--label-on-top':vm.property.labelOnTop, 'umb-control-group__listview': vm.property.alias === '_umb_containerView'}">
 
             <val-property-msg></val-property-msg>
 
             <div class="umb-el-wrap">
 
-                <div class="control-header" ng-hide="property.hideLabel === true">
-                    <small ng-if="showInherit" class="db" style="padding-top: 0; margin-bottom: 5px;">
-                        <localize key="contentTypeEditor_inheritedFrom"></localize> {{inheritsFrom}}
+                <div class="control-header" ng-hide="vm.property.hideLabel === true">
+                    <small ng-if="vm.showInherit" class="db" style="padding-top: 0; margin-bottom: 5px;">
+                        <localize key="contentTypeEditor_inheritedFrom"></localize> {{vm.inheritsFrom}}
                     </small>
 
-                    <label class="control-label" for="{{property.alias}}" ng-attr-title="{{controlLabelTitle}}">
+                    <label class="control-label" for="{{vm.property.alias}}" ng-attr-title="{{vm.controlLabelTitle}}">
 
-                        {{property.label}}
+                        {{vm.property.label}}
 
-                        <span ng-if="property.validation.mandatory">
+                        <span ng-if="vm.property.validation.mandatory">
                             <strong class="umb-control-required">*</strong>
                         </span>
 
                     </label>
 
-                    <umb-property-actions actions="propertyActions"></umb-property-actions>
+                    <umb-property-actions ng-if="!vm.showInherit" actions="vm.propertyActions"></umb-property-actions>
 
-                    <small class="control-description" ng-bind-html="property.description | preserveNewLineInHtml"></small>
+                    <small class="control-description" ng-if="vm.property.description" ng-bind-html="vm.property.description | preserveNewLineInHtml"></small>
                 </div>
 
                 <div class="controls" ng-transclude>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-nav.html b/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-nav.html
index 36a9271818..08d31925e3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-nav.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-nav.html
@@ -4,10 +4,14 @@
     </li>
 
     <li data-element="tab-expand" class="umb-tab umb-tab--expand" ng-class="{ 'open': vm.showTray }" ng-show="vm.needTray">
-        <button class="btn-reset umb-tab-button umb-tab-button--expand" ng-click="vm.toggleTray()" type="button">
-            <i></i><i></i><i></i>
-            <span class="sr-only"><localize key="visuallyHiddenTexts_tabExpand">View more options</localize></span>
-        </button>
+        <umb-button-ellipsis
+            action="vm.toggleTray()"
+            text="View more options"
+            label-key="visuallyHiddenTexts_tabExpand"
+            color="#68676b"
+            >
+        </umb-button-ellipsis>
+
         <umb-dropdown class="umb-tabs-tray" ng-if="vm.showTray" on-close="vm.hideTray()">
             <umb-dropdown-item ng-repeat="tab in vm.tabs | limitTo: vm.overflowingTabs" ng-class="{'umb-tabs-tray-item--active': tab.active}">
                 <button class="btn-reset umb-tab-button" ng-click="vm.clickTab($event, tab)" role="tab" aria-selected="{tab.active}" type="button">{{ tab.label }}</button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html b/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
index 48623fe7d1..6251d0eed1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
@@ -1,5 +1,6 @@
-<div>
+<div class="umb-tags-editor">
     <ng-form name="vm.tagEditorForm">
+
         <div ng-if="vm.isLoading">
             <localize key="loading">Loading</localize>...
         </div>
@@ -26,6 +27,8 @@
                    ng-model="vm.tagToAdd"
                    ng-keydown="vm.addTagOnEnter($event)"
                    ng-blur="vm.addTag()"
+                   ng-maxlength="200"
+                   maxlength="200"
                    localize="placeholder"
                    placeholder="@placeholders_enterTags" />
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
index 1d8829b4ca..89849089d7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
@@ -1,20 +1,27 @@
 <li class="umb-tree-item" data-element="tree-item-{{::node.dataElement}}" ng-class="getNodeCssClass(node)" on-right-click="altSelect(node, $event)">
     <div class="umb-tree-item__inner" ng-swipe-right="options(node, $event)" ng-dblclick="load(node)" tabindex="-1">
         <button data-element="tree-item-expand"
-             class="umb-tree-item__arrow umb-outline btn-reset"
-             ng-class="{'icon-navigation-right': !node.expanded || node.metaData.isContainer, 'icon-navigation-down': node.expanded && !node.metaData.isContainer}"
-             ng-style="{'visibility': (scope.enablelistviewexpand === 'true' || node.hasChildren && (!node.metaData.isContainer || isDialog)) ? 'visible' : 'hidden'}"
-             ng-click="load(node)">&nbsp;
-             <!-- TODO: Use localization for this text -->
+                class="umb-tree-item__arrow umb-outline btn-reset"
+                ng-style="{'visibility': (scope.enablelistviewexpand === 'true' || node.hasChildren && (!node.metaData.isContainer || isDialog)) ? 'visible' : 'hidden'}"
+                ng-click="load(node)">
+                <umb-icon icon="{{(node.expanded && !node.metaData.isContainer) ? 'icon-navigation-down' : 'icon-navigation-right'}}" ng-class="{'icon-navigation-right': !node.expanded || node.metaData.isContainer, 'icon-navigation-down': node.expanded && !node.metaData.isContainer}"></umb-icon>
+            <!-- TODO: Use localization for this text -->
             <span class="sr-only">Expand child items for {{node.name}}</span>
         </button>
 
-        <i class="icon umb-tree-icon sprTree" ng-class="::node.cssClass" title="{{::node.title}}" ng-click="select(node, $event)" ng-style="::node.style" tabindex="-1"></i>
+        <umb-icon icon="{{node.selected ? 'icon-check' : node.icon}}" class="icon umb-tree-icon sprTree" ng-class="node.cssClass" title="{{::node.title}}" ng-click="select(node, $event)" ng-style="::node.style" tabindex="-1"></umb-icon>
         <span class="umb-tree-item__annotation"></span>
         <a class="umb-tree-item__label" ng-href="#/{{::node.routePath}}" ng-click="select(node, $event)" title="{{::node.title}}">{{node.name}}</a>
 
-        <!-- NOTE: These are the 'option' elipses -->
-        <button data-element="tree-item-options" class="umb-options btn-reset sr-only sr-only--focusable sr-only--hoverable" ng-click="options(node, $event)" ng-if="::node.menuUrl" aria-label="{{optionsText}} {{node.name}}"><i></i><i></i><i></i></button>
+        <!-- NOTE: These are the 'option' ellipsis -->
+        <umb-button-ellipsis
+            ng-if="::node.menuUrl"
+            element="tree-item-options"
+            action="options(node, $event)"
+            text="{{optionsText}} {{node.name}}"
+            state="hidden"
+            class="umb-options">
+        </umb-button-ellipsis>
 
         <umb-loader ng-show="node.loading" position="bottom" class="umb-tree-item__loader"></umb-loader>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html
index 217489f14c..77498cd007 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html
@@ -1,10 +1,10 @@
 <div class="form-search">
-    <i class="icon icon-search" ng-if="showSearch == 'false'"></i>
-    <a class="icon icon-arrow-left" ng-if="showSearch == 'true'" title="Back" ng-click="hideSearch()"></a>
+    <umb-icon icon="icon-search" class="icon icon-search" ng-if="showSearch == 'false'"></umb-icon>
+    <button type="button" class="btn-reset icon icon-arrow-left" ng-if="showSearch == 'true'" localize="title" title="@general_back" ng-click="hideSearch()"></button>
     <input type="text"
            ng-model="term"
            class="umb-search-field search-query -full-width-input"
-           placeholder="{{searchPlaceholderText}}"           
+           placeholder="{{searchPlaceholderText}}"
            umb-auto-focus="{{autoFocus ? 'true' : 'false'}}">
     <h4 ng-if="showSearch && searchFromName">
         <small><localize key="general_search">Search</localize>:&nbsp;</small>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html
index b5eedaa24f..f472251624 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html
@@ -1,20 +1,25 @@
 <div>
-  <umb-empty-state ng-if="results.length === 0" position="center">
-    <localize key="general_searchNoResult"></localize>
+  <umb-empty-state ng-if="results.length === 0" position="{{emptySearchResultPosition}}">
+    <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
   </umb-empty-state>
 
   <ul class="umb-tree">
     <li class="root">
       <ul class="umb-search-group">
         <li class="umb-search-group-item" ng-repeat="result in results">
-          <div ng-class="{'umb-tree-node-checked' : result.selected}">
-            <a href class="umb-search-group-item-link" ng-class="{first:$first}" ng-click="selectResultCallback($event, result)">
-              <div class="umb-search-group-item-name">
-                <i class="icon umb-tree-icon sprTree {{result.icon}}"></i>
-                {{result.name}}
-              </div>
-              <small class="search-subtitle" ng-if="result.subTitle">{{result.subTitle}}</small>
-            </a>
+          <div ng-class="{ 'umb-tree-node-checked': result.selected }">
+            <button type="button"
+                    class="btn-reset umb-search-group-item-link"
+                    ng-class="{ first: $first }"
+                    ng-click="selectResultCallback($event, result)">
+                <span class="umb-search-group-item-name">
+                    <umb-icon icon="{{result.selected ? 'icon-check' : result.icon}}"
+                              class="icon umb-tree-icon sprTree {{result.selected ? 'icon-check' : result.icon}}">
+                    </umb-icon>
+                    <span class="umb-search-group-item-name__text">{{ result.name }}</span>
+                </span>
+                <small class="search-subtitle" ng-if="result.subTitle">{{ result.subTitle }}</small>
+            </button>
           </div>
         </li>
       </ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree.html
index 0141ff264f..6531114567 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree.html
@@ -4,13 +4,25 @@
         <div class="umb-tree-root" data-element="tree-root" ng-class="getNodeCssClass(tree.root)" ng-hide="hideheader === 'true'" on-right-click="altSelect(tree.root, $event)">
             <h5>
                 <a ng-href="#/{{section}}" ng-click="select(tree.root, $event)" class="umb-tree-root-link umb-outline" data-element="tree-root-link">
-                    <i ng-if="enablecheckboxes === 'true'" ng-class="selectEnabledNodeClass(tree.root)"></i>
+                    <umb-icon icon="icon-check"
+                              class="umb-tree-icon icon-check"
+                              ng-class="selectEnabledNodeClass(tree.root)"
+                              ng-if="enablecheckboxes === 'true'">
+                    </umb-icon>
                     {{tree.name}}
                 </a>
             </h5>
-            <button data-element="tree-item-options" class="umb-options btn-reset sr-only sr-only--focusable sr-only--hoverable" ng-hide="tree.root.isContainer || !tree.root.menuUrl" ng-click="options(tree.root, $event)" ng-swipe-right="options(tree.root, $event)">
-                <i></i><i></i><i></i>
-            </button>
+
+            <umb-button-ellipsis
+                element="tree-item-options"
+                action="options(tree.root, $event)"
+                text="Open context node for {{tree.name}}"
+                state="hidden"
+                class="umb-options"
+                ng-hide="tree.root.isContainer || !tree.root.menuUrl"
+                ng-swipe-right="options(tree.root, $event)">
+            </umb-button-ellipsis>
+
         </div>
         <umb-tree-item class="umb-animated"
                        ng-repeat="child in tree.root.children"
@@ -30,13 +42,24 @@
         <div class="umb-tree-root" data-element="tree-root" ng-class="getNodeCssClass(group)" ng-hide="hideheader === 'true'" on-right-click="altSelect(group, $event)">
             <h5>
                 <a ng-href="#/{{section}}" ng-click="select(group, $event)" class="umb-tree-root-link umb-outline" data-element="tree-root-link">
-                    <i ng-if="enablecheckboxes === 'true'" ng-class="selectEnabledNodeClass(group)"></i>
+                    <umb-icon icon="icon-check"
+                              class="umb-tree-icon icon-check"
+                              ng-class="selectEnabledNodeClass(group)"
+                              ng-if="enablecheckboxes === 'true'">
+                    </umb-icon>
                     {{group.name}}
                 </a>
             </h5>
-            <button data-element="tree-item-options" class="umb-options umb-outline btn-reset sr-only sr-only--focusable sr-only--hoverable" ng-hide="group.isContainer || !group.menuUrl" ng-click="options(group, $event)" ng-swipe-right="options(group, $event)">
-                <i></i><i></i><i></i>
-            </button>
+
+            <umb-button-ellipsis
+                element="tree-item-options"
+                action="options(group, $event)"
+                text="Open context node for {{group.name}}"
+                state="hidden"
+                class="umb-options"
+                ng-hide="group.isContainer || !group.menuUrl"
+                ng-swipe-right="options(group, $event)">
+            </umb-button-ellipsis>
         </div>
 
         <umb-tree-item class="umb-animated"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umbcontextdialog/umb-context-dialog.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umbcontextdialog/umb-context-dialog.html
index fa0ec487bc..00b25f68a8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umbcontextdialog/umb-context-dialog.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umbcontextdialog/umb-context-dialog.html
@@ -1,6 +1,14 @@
-<div id="dialog" class="umb-modalcolumn fill shadow" on-outside-click="outSideClick()">
+<div id="dialog"
+     class="umb-modalcolumn fill shadow"
+     on-outside-click="outSideClick()"
+     role="dialog"
+     aria-labelledby="contextdialog-title"
+     aria-describedby="contextdialog-description">
     <div class="umb-modalcolumn-header">
-        <h1>{{dialogTitle}}</h1>
+        <h1 id="contextdialog-title">{{dialogTitle}}</h1>
+        <p id="contextdialog-description" class="sr-only">
+            <localize key="visuallyHiddenTexts_contextDialogDescription" tokens="[dialogTitle,currentNode.name]">Perform action {{dialogTitle}} on the {{currentNode.name}} node</localize>
+        </p>
     </div>
     <div class="umb-modalcolumn-body" ng-include="view"></div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-avatar.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-avatar.html
index 036cf397fe..81c7d628d2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-avatar.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-avatar.html
@@ -1,7 +1,7 @@
 <div>
-    <img class="umb-avatar umb-avatar--{{size}}" ng-if="imgSrc" ng-src="{{imgSrc}}" ng-srcset="{{imgSrcset}}" />
+    <img class="umb-avatar umb-avatar--{{size}}" ng-if="imgSrc" ng-src="{{imgSrc}}" ng-srcset="{{imgSrcset}}" alt="{{avatarAlt}}"/>
     <div class="umb-avatar umb-avatar--{{size}} umb-avatar--{{color}}" ng-if="!imgSrc">
         <span ng-if="name">{{ initials }}</span>
         <span ng-if="!name">{{unknownChar}}</span>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html
index 1d88c0eb96..f038b8c4aa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html
@@ -3,7 +3,7 @@
     <div class="umb-child-selector__child -parent">
         <div class="umb-child-selector__child-description">
             <div class="umb-child-selector__child-icon-holder">
-                <i class="umb-child-selector__child-icon {{ parentIcon }}"></i>
+                <i class="umb-child-selector__child-icon {{ parentIcon }}" aria-hidden="true"></i>
             </div>
             <span class="umb-child-selector__child-name">
                 <strong>{{ parentName }}</strong>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html
index d8e4f09b8a..9895bc1510 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html
@@ -1,22 +1,20 @@
 <div>
     <p ng-hide="!caption" class="umb-abstract">{{caption}}</p>
-    <div class="umb-pane btn-toolbar umb-btn-toolbar">
-        <div class="control-group umb-control-group">
-            <umb-button ng-if="showCancel"
-                        type="button"
-                        action="onCancel()"
-                        button-style="link"
-                        disabled="confirmButtonState === 'busy'"
-                        label-key="general_cancel">
-            </umb-button>
-            <umb-button ng-if="showConfirm"
-                        type="button"
-                        action="confirm()"
-                        button-style="{{confirmButtonStyle || 'primary'}}"
-                        state="confirmButtonState"
-                        disabled="confirmDisabled === true"
-                        label-key="{{confirmLabelKey || 'general_ok'}}">
-            </umb-button>
-        </div>
-	</div>
-</div>
+    <div class="btn-toolbar umb-btn-toolbar">
+        <umb-button ng-if="showCancel"
+                    type="button"
+                    action="onCancel()"
+                    button-style="link"
+                    disabled="confirmButtonState === 'busy'"
+                    label-key="general_cancel">
+        </umb-button>
+        <umb-button ng-if="showConfirm"
+                    type="button"
+                    action="confirm()"
+                    button-style="{{confirmButtonStyle || 'primary'}}"
+                    state="confirmButtonState"
+                    disabled="confirmDisabled === true"
+                    label-key="{{confirmLabelKey || 'general_ok'}}">
+        </umb-button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-date-time-picker.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-date-time-picker.html
index 2d12673a1f..a607ebcd33 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-date-time-picker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-date-time-picker.html
@@ -1,12 +1,12 @@
 <div class="datepicker" style="position: relative;">
 
     <div ng-hide="hasTranscludedContent" class="input-append date">
-        <input data-format="{{ options.format }}" type="text" class="datepickerinput" />
-        <span class="add-on">
+        <input type="text" data-format="{{ options.format }}" class="datepickerinput" />
+        <span class="add-on" aria-hidden="true">
             <i class="icon-calendar"></i>
         </span>
     </div>
 
     <div class="js-datePicker__transcluded-content" ng-transclude></div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index c46981a6cb..2fdef77928 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -44,7 +44,7 @@
         <li ng-repeat="tab in model.groups" ng-class="{'umb-group-builder__group-sortable': sortingMode}" data-element="group-{{tab.name}}">
 
             <!-- TAB INIT STATE -->
-            <button href="" class="umb-group-builder__group -placeholder" hotkey="alt+shift+g" ng-click="addGroup(tab)" ng-if="tab.tabState=='init' && !sortingMode" data-element="group-add">
+            <button type="button" class="umb-group-builder__group -placeholder" hotkey="alt+shift+g" ng-click="addGroup(tab)" ng-if="tab.tabState=='init' && !sortingMode" data-element="group-add">
                 <localize key="contentTypeEditor_addGroup"></localize>
             </button>
 
@@ -117,7 +117,7 @@
                     <li data-element="property-{{property.alias}}" ng-class="{'umb-group-builder__property-sortable': sortingMode && !property.inherited}" ng-repeat="property in tab.properties">
 
                         <!-- Add new property -->
-                        <button href=""
+                        <button type="button"
                             data-element="property-add"
                             class="umb-group-builder__group-add-property"
                             ng-if="property.propertyState=='init' && !sortingMode"
@@ -228,13 +228,13 @@
                                 <div class="umb-group-builder__property-tags -right">
 
                                     <div class="umb-group-builder__property-tag" ng-if="property.inherited">
-                                        <i class="icon icon-merge"></i>
+                                        <umb-icon icon="icon-merge" class="icon-merge"></umb-icon>
                                         <span style="margin-right: 3px"><localize key="contentTypeEditor_inheritedFrom"></localize></span>
                                         {{property.contentTypeName}}
                                     </div>
 
                                     <div class="umb-group-builder__property-tag" ng-if="property.locked">
-                                        <i class="icon icon-lock"></i>
+                                        <umb-icon icon="icon-lock" class="icon-lock"></umb-icon>
                                         <localize key="general_locked"></localize>
                                     </div>
 
@@ -259,12 +259,16 @@
 
                                     <!-- settings for property -->
                                     <div class="umb-group-builder__property-action">
-                                        <button aria-label="Open settings"  class="icon icon-settings" ng-click="editPropertyTypeSettings(property, tab)"></button>
+                                        <button aria-label="Open settings" class="btn-icon" ng-click="editPropertyTypeSettings(property, tab)" localize="title" title="@general_edit">
+                                            <umb-icon icon="icon-settings" class="icon-settings"></umb-icon>
+                                        </button>
                                     </div>
 
                                     <!-- delete property -->
                                     <div ng-if="!property.locked" class="umb-group-builder__property-action">
-                                        <button aria-label="Delete property" class="icon-trash" ng-click="togglePrompt(property)"></button>
+                                        <button aria-label="Delete property" class="btn-icon" ng-click="togglePrompt(property)">
+                                            <umb-icon icon="icon-trash" class="icon-trash"></umb-icon>
+                                        </button>
                                         <umb-confirm-action
                                             ng-if="property.deletePrompt"
                                             direction="left"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-icon.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-icon.html
new file mode 100644
index 0000000000..9003195a75
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-icon.html
@@ -0,0 +1,4 @@
+<span aria-hidden="true" class="umb-icon">
+    <span ng-if="svgString" ng-bind-html="svgString"></span>
+    <i ng-if="!svgString && icon" class="{{icon}}"></i>
+</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
index c9bf3b3083..90a33041a8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
@@ -1,7 +1,7 @@
 <div class="umb-layout-selector" ng-show="vm.showLayoutSelector">
 
-   <button type="button" aria-expanded="{{vm.layoutDropDownIsOpen}}" class="umb-layout-selector__active-layout umb-outline" ng-click="vm.toggleLayoutDropdown()" prevent-default>
-      <i class="{{ vm.activeLayout.icon }}" aria-hidden="true"></i>
+   <button type="button" aria-expanded="{{vm.layoutDropDownIsOpen}}" class="umb-layout-selector__active-layout umb-outline" ng-click="vm.toggleLayoutDropdown()">
+      <umb-icon icon="{{vm.activeLayout.icon}}" class="{{vm.activeLayout.icon}}"></umb-icon>
       <span class="sr-only">
           <localize key="visuallyHiddenTexts_activeListLayout">Active layout:</localize>&nbsp;
           {{vm.activeLayout.name}}
@@ -13,13 +13,14 @@
         on-outside-click="vm.closeLayoutDropdown()"
         deep-blur="vm.leaveLayoutDropdown()">
 
-       <button type="button" prevent-default ng-repeat="layout in vm.layouts | filter:{selected:true} track by $id(layout)"
-            class="umb-layout-selector__dropdown-item"
-            ng-click="vm.pickLayout(layout)"
-            ng-class="{'-active': layout.active }"
-            ng-attr-title="{{layout.name}}">
+       <button type="button"
+               ng-repeat="layout in vm.layouts | filter: { selected: true } track by $id(layout)"
+               class="umb-layout-selector__dropdown-item"
+               ng-click="vm.pickLayout(layout)"
+               ng-class="{'-active': layout.active }"
+               ng-attr-title="{{layout.name}}">
 
-           <i class="{{ layout.icon }} umb-layout-selector__dropdown-item-icon" aria-hidden="true"></i>
+           <umb-icon icon="{{layout.icon}}" class="{{layout.icon}} umb-layout-selector__dropdown-item-icon"></umb-icon>
            <span class="sr-only">{{layout.name}}</span>
        </button>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings-overlay.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings-overlay.html
index 7e2b20847b..4b8891adfc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings-overlay.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings-overlay.html
@@ -23,7 +23,8 @@
             <umb-button 
                 type="button" 
                 button-style="link" 
-                label-key="general_close" 
+                label-key="general_close"
+                shortcut="esc"
                 action="model.close()">
             </umb-button>
             <umb-button
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html
index 4e2edbe2a9..a6d2491282 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html
@@ -15,21 +15,19 @@
             <i class="umb-list-view-settings__list-view-icon icon-list"></i>
             <div>
                 <div class="umb-list-view-settings__name">
-                    {{ dataType.name }} 
+                    {{dataType.name}} 
                     <em ng-if="!customListViewCreated">(<localize key="general_default">default</localize>)</em>
                 </div>
-                <button 
-                    type="button" 
-                    class="btn-link umb-list-view-settings__create-new" 
-                    ng-if="!customListViewCreated" 
-                    ng-click="createCustomListViewDataType()">
+                <button type="button"
+                        class="btn-link umb-list-view-settings__create-new"
+                        ng-if="!customListViewCreated"
+                        ng-click="createCustomListViewDataType()">
                     <localize key="editcontenttype_createListView">Create custom list view</localize>
                 </button>
-                <button 
-                   type="button" 
-                   class="btn-link umb-list-view-settings__remove-new" 
-                   ng-if="customListViewCreated" 
-                   ng-click="removeCustomListDataType()">
+                <button type="button"
+                        class="btn-link umb-list-view-settings__remove-new"
+                        ng-if="customListViewCreated"
+                        ng-click="removeCustomListDataType()">
                     <localize key="editcontenttype_removeListView">Remove custom list view</localize>
                 </button>
             </div>
@@ -38,10 +36,14 @@
     </div>    
     <div class="umb-group-builder__property-actions">
         <div class="umb-group-builder__property-action">
-            <button                 
-                class="btn-icon icon-settings"                 
-                ng-click="showSettingsOverlay()"                     
-                aria-label="Edit"></button>
+            <button type="button"
+                    class="btn-icon"
+                    ng-click="showSettingsOverlay()"
+                    aria-label="Edit"
+                    localize="title"
+                    title="@general_edit">
+                <umb-icon icon="icon-settings" class="icon-settings"></umb-icon>
+            </button>
         </div>
     </div>
   </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
index d347fecb2d..f41390bce3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
@@ -1,44 +1,96 @@
-<div data-element="media-grid" class="umb-media-grid">
-    <div data-element="media-grid-item-{{$index}}"
-        class="umb-media-grid__item umb-outline umb-outline--surrounding"
-        title="{{item.name}}"
-        ng-click="clickItem(item, $event, $index)"
-        ng-repeat="item in items | filter:filterBy"
-        ng-style="item.flexStyle"
-        ng-class="{'-selected': item.selected, '-file': !item.thumbnail, '-folder': item.isFolder, '-svg': item.extension == 'svg', '-selectable': item.selectable, '-unselectable': !item.selectable}"
-    >
-        <div>
-            <!--<i ng-show="item.selected" class="icon-check umb-media-grid__checkmark"></i>-->
-            <div data-element="media-grid-item-edit"
-                class="umb-media-grid__item-overlay umb-outline"
-                ng-class="{'-locked': item.selected || !item.file || !item.thumbnail, '-can-open': (item.isFolder ? allowOpenFolder : allowOpenFile)}"
-                ng-click="clickItemName(item, $event, $index)"
-                tabindex="{{item.isFolder && item.selectable ? '0' : '-1'}}"
-            >
-                <i ng-if="onDetailsHover" class="icon-info umb-media-grid__info" ng-mouseover="hoverItemDetails(item, $event, true)" ng-mouseleave="hoverItemDetails(item, $event, false)"></i>
-                <div class="umb-media-grid__item-name">{{item.name}}</div>
+<div class="media-list-grid">
+    <div data-element="media-grid" class="umb-media-grid" ng-show="!showMediaList">
+        <div data-element="media-grid-item-{{$index}}"
+             class="umb-media-grid__item umb-outline umb-outline--surrounding"
+             title="{{item.name}}"
+             ng-click="clickItem(item, $event, $index)"
+             ng-repeat="item in items | filter:filterBy"
+             ng-style="item.flexStyle"
+             ng-class="{'-selected': item.selected, '-file': !item.thumbnail, '-folder': item.isFolder, '-svg': item.extension == 'svg', '-selectable': item.selectable, '-unselectable': !item.selectable}">
+            <div>
+                <!--<i ng-show="item.selected" class="icon-check umb-media-grid__checkmark"></i>-->
+                <div data-element="media-grid-item-edit"
+                     class="umb-media-grid__item-overlay umb-outline"
+                     ng-class="{'-locked': item.selected || !item.file || !item.thumbnail, '-can-open': (item.isFolder ? allowOpenFolder : allowOpenFile)}"
+                     ng-click="clickItemName(item, $event, $index)"
+                     tabindex="{{item.isFolder && item.selectable ? '0' : '-1'}}">
+                    <i ng-if="onDetailsHover" class="icon-info umb-media-grid__info" ng-mouseover="hoverItemDetails(item, $event, true)" ng-mouseleave="hoverItemDetails(item, $event, false)"></i>
+                    <div class="umb-media-grid__item-name">{{item.name}}</div>
+                </div>
+
+                <!-- Check backgrund -->
+                <div class="umb-media-grid__image-background" ng-if="item.thumbnail || item.extension === 'svg'"></div>
+
+                <!-- Image thumbnail -->
+                <img umb-image-lazy-load="{{item.thumbnail}}" class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="item.thumbnail" alt="{{item.name}}" draggable="false" />
+
+                <!-- SVG -->
+                <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="!item.thumbnail && item.extension === 'svg'" ng-src="{{item.image}}" alt="{{item.name}}" draggable="false" />
+
+                <!-- Transparent image - fallback - used to keep image proportions on wrapper-->
+                <img class="umb-media-grid__item-image-placeholder" ng-if="!item.thumbnail && item.extension !== 'svg'" src="assets/img/transparent.png" alt="{{item.name}}" draggable="false" />
+
+                <!-- Icon for files -->
+                <umb-file-icon ng-if="!item.thumbnail && item.extension !== 'svg'"
+                               class="umb-media-grid__item-file-icon"
+                               extension="{{item.extension}}"
+                               icon="{{item.icon}}"
+                               size="s">
+                </umb-file-icon>
+
             </div>
-
-            <!-- Check backgrund -->
-            <div class="umb-media-grid__image-background" ng-if="item.thumbnail || item.extension === 'svg'"></div>
-
-            <!-- Image thumbnail -->
-            <img umb-image-lazy-load="{{item.thumbnail}}" class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="item.thumbnail" alt="{{item.name}}" draggable="false" />
-
-            <!-- SVG -->
-            <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="!item.thumbnail && item.extension === 'svg'" ng-src="{{item.image}}" alt="{{item.name}}" draggable="false" />
-
-            <!-- Transparent image - fallback - used to keep image proportions on wrapper-->
-            <img class="umb-media-grid__item-image-placeholder" ng-if="!item.thumbnail && item.extension !== 'svg'" src="assets/img/transparent.png" alt="{{item.name}}" draggable="false" />
-
-            <!-- Icon for files -->
-            <umb-file-icon ng-if="!item.thumbnail && item.extension !== 'svg'"
-                           class="umb-media-grid__item-file-icon"
-                           extension="{{item.extension}}"
-                           icon="{{item.icon}}"
-                           size="s">
-            </umb-file-icon>
-
         </div>
     </div>
-</div>
+    <!-- markup for the media list -->
+
+    <div class="umb-media-grid__list-view" ng-show="showMediaList">
+            <div class="umb-table umb-table--condensed">
+                <div class="umb-table-head">
+                    <div class="umb-table-row">
+                        <div class="umb-table-cell">
+                            <input class="umb-table__input" type="checkbox"
+                                   ng-show="vm.allowSelectAll"
+                                   ng-click="vm.selectAll($event)"
+                                   ng-checked="vm.isSelectedAll()">
+                        </div>
+                        <div class="umb-table-cell  umb-table__name">
+                            <button type="button"
+                                    class="umb-table-head__link sortable"
+                                    ng-click="setSort('name')"
+                                    prevent-default>
+                                <localize key="general_name">Name</localize>
+                                <i class="umb-table-head__icon icon" aria-hidden="true" ng-class="{'icon-navigation-up': isSortDirection('name', 'asc'), 'icon-navigation-down': isSortDirection('name', 'desc')}"></i>
+                            </button>
+                        </div>
+                        <div class="umb-table-cell">
+                            <button type="button"
+                                    class="umb-table-head__link sortable"
+                                    ng-click="setSort('updateDate')"
+                                    prevent-default>
+                                Last Updated
+                                <i class="umb-table-head__icon icon"  aria-hidden="true" ng-class="{'icon-navigation-up': isSortDirection('updateDate', 'asc'), 'icon-navigation-down': isSortDirection('updateDate', 'desc')}"></i>
+                            </button>
+                        </div>
+
+                    </div>
+                </div>
+                <div class="umb-table-body">
+                    <div class="umb-table-row umb-media-grid__list-item -selectable" ng-click="clickItem(item, $event, $index)" ng-repeat="item in items | filter:filterBy | orderBy:sortBy:sortReverse" ng-class="{'-selected': item.selected}">
+
+                        <div class="umb-table-cell">
+                            <i ng-show="item.selected" class="umb-table-body__icon umb-table-body__checkicon icon-check" aria-hidden="true"></i>
+                            <i class="{{item.icon}}" class="umb-table-body__icon" aria-hidden="true" ng-if="!item.thumbnail && item.extension != 'svg' && !item.selected"></i><i class="icon-picture"  aria-hidden="true" ng-if="item.thumbnail && !item.selected"></i>
+                        </div>
+                        <div class="umb-table-cell  umb-table__name">
+
+                            <ins ng-show="item.isFolder" ng-class="{'-locked': item.selected || !item.file || !item.thumbnail}" ng-click="clickItemName(item, $event, $index)" class="icon-navigation-right"></ins> <span data-src="{{item.value.src}}" class="item-name">{{item.name}}</span>
+                        </div>
+                        <div class="umb-table-cell">
+                            <span class="muted small" style="font-size:0.8em">{{item.updateDate | date:'medium'}}</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html
index d66e7f7f90..6ec8b08da6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html
@@ -11,10 +11,10 @@
 
         <div class="umb-mini-list-view__breadcrumb">
 
-            <a ng-if="showBackButton()" href="" class="umb-mini-list-view__back" ng-click="exitMiniListView()">
+            <button type="button" ng-if="showBackButton()" class="btn-reset umb-mini-list-view__back" ng-click="exitMiniListView()">
                 <i class="icon-arrow-left umb-mini-list-view__back-icon" aria-hidden="true"></i>
                 <span class="umb-mini-list-view__back-text"><localize key="general_back">Back</localize></span> /
-            </a>
+            </button>
 
             <umb-breadcrumbs
                 ng-if="breadcrumb && breadcrumb.length > 0"
@@ -66,9 +66,9 @@
                     ng-class="{'-selected':child.selected, 'not-allowed':!child.allowed}">
                     <div class="umb-table-cell umb-table-cell--auto-width" ng-class="{'umb-table-cell--faded':child.published === false}">
                         <div class="flex items-center">
-                            <ins class="icon-navigation-right umb-table__row-expand" ng-click="openNode($event, child)" ng-class="{'umb-table__row-expand--hidden': child.metaData.hasChildren !== true}">&nbsp;</ins>
-                            <i class="umb-table-body__icon umb-table-body__fileicon {{child.icon}}" aria-hidden="true"></i>
-                            <i class="umb-table-body__icon umb-table-body__checkicon icon-check" aria-hidden="true"></i>
+                            <umb-icon icon="icon-navigation-right" class="icon-navigation-right umb-table__row-expand" ng-click="openNode($event, child)" ng-class="{'umb-table__row-expand--hidden': child.metaData.hasChildren !== true}">&nbsp;</umb-icon>
+                            <umb-icon icon="{{child.icon}}" class="umb-table-body__icon umb-table-body__fileicon {{child.icon}}"></umb-icon>
+                            <umb-icon icon="icon-check" class="umb-table-body__icon umb-table-body__checkicon icon-check"></umb-icon>
                         </div>
                     </div>
                     <div class="umb-table-cell black" ng-class="{'umb-table-cell--faded':child.published === false}">{{ child.name }}</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search.html
new file mode 100644
index 0000000000..3c95dbae5b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search.html
@@ -0,0 +1,14 @@
+<ng-form class="umb-mini-search" ng-class="{'--has-value': vm.model !== null && vm.model !== ''}" novalidate>
+    <i class="icon icon-search" aria-hidden="true"></i>
+    <input type="text"
+           class="form-control search-input"
+           localize="placeholder,label"
+           label="@general_typeToSearch"
+           placeholder="@general_typeToSearch"
+           ng-model="vm.model"
+           ng-change="vm.onChange()"
+           ng-keydown="vm.onKeyDown($event)"
+           ng-blur="vm.onBlur($event)"
+           prevent-enter-submit
+           no-dirty-check>
+</ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search/umb-mini-search.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search/umb-mini-search.html
deleted file mode 100644
index d4e75908bd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search/umb-mini-search.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<ng-form class="umb-mini-search" ng-class="{'--has-value': vm.model !== null && vm.model !== ''}" novalidate>
-    <i class="icon icon-search" aria-hidden="true"></i>
-    <input
-        class="form-control search-input"
-        type="text"
-        localize="placeholder,label"
-        label="@general_typeToSearch"
-        placeholder="@general_typeToSearch"
-        ng-model="vm.model"
-        ng-change="vm.onChange()"
-        ng-keydown="vm.onKeyDown($event)"
-        ng-blur="vm.onBlur($event)"
-        prevent-enter-submit
-        no-dirty-check>
-</ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
index a3530f77b9..34fb4d7dfd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
@@ -1,85 +1,75 @@
 <div class="umb-node-preview" ng-class="{'umb-node-preview--sortable': sortable, 'umb-node-preview--unpublished': published === false }">
     <div class="flex"> <!-- div keeps icon and nodename from wrapping -->
-        <i ng-if="icon" class="umb-node-preview__icon {{ icon }}" aria-hidden="true"></i>
+        <umb-icon ng-if="icon" icon="{{icon}}" class="umb-node-preview__icon {{icon}}"></umb-icon>
+        
         <div class="umb-node-preview__content">
 
-            <div class="umb-node-preview__name" ng-attr-title="{{nodeNameTitle}}">{{ name }}</div>
-            <div class="umb-node-preview__description" ng-if="description">{{ description }}</div>
+            <div class="umb-node-preview__name" ng-attr-title="{{nodeNameTitle}}">{{name}}</div>
+            <div class="umb-node-preview__description" ng-if="description">{{description}}</div>
 
             <div class="umb-user-group-preview__permissions" ng-if="permissions">
                 <span>
                     <span class="bold"><localize key="general_rights">Permissions</localize>:</span>
-                    <span ng-repeat="permission in permissions" class="umb-user-group-preview__permission">{{ permission.name }}</span>
+                    <span ng-repeat="permission in permissions" class="umb-user-group-preview__permission">{{permission.name}}</span>
                 </span>
             </div>
         </div>
     </div>
     <div class="umb-node-preview__actions">
-        <!-- If editUrl has a value we render a link otherwise a button-->
-        <a
-            class="umb-node-preview__action"
-            title="Edit {{name}}"
-            ng-href="{{editUrl}}"
-            ng-if="allowEdit && editUrl"
-            ng-click="onEdit()"
-        >
+
+        <!-- If editUrl has a value we render a link otherwise a button -->
+        <a class="umb-node-preview__action"
+           title="Edit {{name}}"
+           ng-href="{{editUrl}}"
+           ng-if="allowEdit && editUrl"
+           ng-click="onEdit()">
             <localize key="general_edit">Edit</localize>
             <span class="sr-only">{{name}}</span>
         </a>
 
-        <button
-            type="button"
-            class="umb-node-preview__action"
-            title="Edit {{name}}"
-            ng-if="allowEdit && !editUrl"
-            ng-click="onEdit()"
-        >
+        <button type="button"
+                class="umb-node-preview__action"
+                title="Edit {{name}}"
+                ng-if="allowEdit && !editUrl"
+                ng-click="onEdit()">
             <localize key="general_edit">Edit</localize>
             <span class="sr-only">{{name}}...</span>
         </button>
 
-        <!-- If openUrl has a value we render a link otherwise a button-->
-        <a
-            class="umb-node-preview__action"
-            title="Open {{name}}"
-            ng-href="{{openUrl}}"
-            ng-if="allowOpen && openUrl"
-            ng-click="onOpen()"
-        >
+        <!-- If openUrl has a value we render a link otherwise a button -->
+        <a class="umb-node-preview__action"
+           title="Open {{name}}"
+           ng-href="{{openUrl}}"
+           ng-if="allowOpen && openUrl"
+           ng-click="onOpen()">
             <localize key="general_open">Open</localize>
             <span class="sr-only">{{name}}</span>
         </a>
 
-        <button
-            type="button"
-            class="umb-node-preview__action"
-            title="Open {{name}}"
-            ng-if="allowOpen && !openUrl"
-            ng-click="onOpen()"
-        >
+        <button type="button"
+                class="umb-node-preview__action"
+                title="Open {{name}}"
+                ng-if="allowOpen && !openUrl"
+                ng-click="onOpen()">
             <localize key="general_open">Open</localize>
             <span class="sr-only">{{name}}...</span>
         </button>
 
-        <!-- If removeUrl has a value we render a link otherwise a button-->
-        <a
-            class="umb-node-preview__action umb-node-preview__action--red"
-            title="Remove {{name}}"
-            ng-href="{{removeUrl}}"
-            ng-if="allowRemove && removeUrl"
-            ng-click="onRemove()"
-        >
+        <!-- If removeUrl has a value we render a link otherwise a button -->
+        <a class="umb-node-preview__action umb-node-preview__action--red"
+           title="Remove {{name}}"
+           ng-href="{{removeUrl}}"
+           ng-if="allowRemove && removeUrl"
+           ng-click="onRemove()">
             <localize key="general_remove">Remove</localize>
             <span class="sr-only">{{name}}</span>
         </a>
 
-        <button
-            type="button"
-            class="umb-node-preview__action umb-node-preview__action--red"
-            title="Remove {{name}}"
-            ng-if="allowRemove && !removeUrl"
-            ng-click="onRemove()"
-        >
+        <button type="button"
+                class="umb-node-preview__action umb-node-preview__action--red"
+                title="Remove {{name}}"
+                ng-if="allowRemove && !removeUrl"
+                ng-click="onRemove()">
             <localize key="general_remove">Remove</localize>
             <span class="sr-only">{{name}}</span>
         </button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-pagination.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-pagination.html
index fae431a11a..f3c6c98cf9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-pagination.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-pagination.html
@@ -2,24 +2,34 @@
     <div ng-show="pagination.length > 1">
         <ul>
             <li ng-class="{disabled:pageNumber <= 1}">
-                <a href="#" ng-click="prev()" prevent-default>
+                <button type="button"
+                        class="btn-reset"
+                        ng-disabled="pageNumber <= 1"
+                        ng-click="prev()">
                     <localize key="general_previous">Previous</localize>
-                </a>
+                </button>
             </li>
 
             <li ng-repeat="pgn in pagination track by $index"
                 ng-class="{active:pgn.isActive}">
 
-                <a href="#" ng-click="goToPage(pgn.val - 1)" prevent-default
-                   ng-bind="pgn.name ? pgn.name : pgn.val"
-                   ng-if="pgn.val != '...'"></a>
+                <button type="button"
+                        class="btn-reset"
+                        ng-click="goToPage(pgn.val - 1)"
+                        ng-bind="pgn.name ? pgn.name : pgn.val"
+                        ng-disabled="pgn.val === pageNumber"
+                        ng-if="pgn.val != '...'">
+                </button>
                 <span ng-bind="pgn.val" ng-if="pgn.val == '...'"></span>
             </li>
 
             <li ng-class="{disabled:pageNumber >= totalPages}">
-                <a href="#" ng-click="next()" prevent-default>
+                <button type="button"
+                        class="btn-reset"
+                        ng-disabled="pageNumber >= totalPages"
+                        ng-click="next()">
                     <localize key="general_next">Next</localize>
-                </a>
+                </button>
             </li>
         </ul>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.html
new file mode 100644
index 0000000000..aca2858070
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.html
@@ -0,0 +1,5 @@
+<button type="button"
+    title="{{ vm.show ? '' : vm.buttonTitle}}"
+    class="btn-reset umb-outline umb-outline--surrounding __button"
+    ng-click="vm.onMouseClick($event)" ng-bind="vm.symbol"></button>
+<div class="__tooltip" ng-if="vm.show" on-outside-click="vm.onMouseClickOutside($event)"><ng-transclude></ng-transclude></div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.less b/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.less
new file mode 100644
index 0000000000..1d8588caca
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.less
@@ -0,0 +1,103 @@
+umb-property-info-button {
+    position: relative;
+    display: inline-block;
+    vertical-align: text-bottom;
+
+    .control-label + & {
+        margin-left: -8px;
+    }
+
+    > .__button {
+        position: relative;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+
+        width: 15px;
+        height: 15px;
+        padding-top: 1px;
+        padding-left: 1px;
+        margin-top: -1px;
+        font-size: 12px;
+        font-weight: 700;
+
+        border-radius: 50%;
+        border: 1px solid @ui-option-type;
+        color: @ui-option-type;
+        &:hover {
+            border-color: @ui-option-type-hover;
+            color: @ui-option-type-hover;
+        }
+    }
+
+    > .__tooltip {
+        
+        position: absolute;
+        z-index: 1000;
+        top: 26px;
+        left: -8px;
+        font-size: 13px;
+
+        border-radius: 6px;
+        
+        min-width: 240px;
+        max-width: 320px;
+        padding: 10px 16px;
+        background-color:@blueExtraDark;
+        border: 1px solid @blueExtraDark;
+        color: white;
+        box-shadow: 0 2px 6px rgba(@blueExtraDark, .6);
+
+        a {
+            color: white;
+            text-decoration: underline;
+            &:hover {
+                color: @blueMidLight;
+            }
+        }
+
+        &::before {
+            content:'';
+            position: absolute;
+            transform: rotate(45deg);
+            background-color:@blueExtraDark;
+            top: -5px;
+            left: 10px;
+            width: 8px;
+            height: 8px;
+            border-left: 1px solid @blueExtraDark;
+            border-top: 1px solid @blueExtraDark;
+        }
+    }
+
+}
+
+// hide umb-info-button if inside umb-property
+.umb-property umb-property-info-button {
+    opacity: 0;
+}
+
+.umb-property:focus-within umb-property-info-button,
+.umb-property:hover umb-property-info-button,
+.umb-property umb-property-info-button:focus {
+    opacity: 1;
+}
+// Revert-style-hack that ensures that we only show property-actions on properties that are directly begin hovered.
+.umb-property:hover .umb-property:not(:hover) umb-property-info-button {
+    opacity: 0;
+}
+
+// hide umb-info-button if inside 
+.umb-control-group umb-property-info-button {
+    opacity: 0;
+}
+
+.umb-control-group:focus-within umb-property-info-button,
+.umb-control-group:hover umb-property-info-button,
+.umb-control-group umb-property-info-button:focus {
+    opacity: 1;
+}
+// Revert-style-hack that ensures that we only show property-actions on properties that are directly begin hovered.
+.umb-control-group:hover .umb-control-group:not(:hover) umb-property-info-button {
+    opacity: 0;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umbpropertyinfobutton.component.js b/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umbpropertyinfobutton.component.js
new file mode 100644
index 0000000000..e160071ea2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umbpropertyinfobutton.component.js
@@ -0,0 +1,35 @@
+(function () {
+    'use strict';
+
+    angular
+        .module('umbraco')
+        .component('umbPropertyInfoButton', {
+            templateUrl: 'views/components/umb-property-info-button/umb-property-info-button.html',
+            controller: UmbPropertyInfoButtonController,
+            controllerAs: 'vm',
+            transclude: true,
+            bindings: {
+                buttonTitle: "@?",
+                symbol: "@?"
+            }
+        });
+
+    function UmbPropertyInfoButtonController() {
+
+        var vm = this;
+        vm.show = false;
+
+        vm.onMouseClick = function ($event) {
+            vm.show = !vm.show;
+        };
+        vm.onMouseClickOutside = function ($event) {
+            vm.show = false;
+        };
+
+        vm.$onInit = function() {
+            vm.symbol = vm.symbol || "i";
+        };
+
+    }
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
index b079b72be4..ff2f04f35c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
@@ -1,107 +1,105 @@
 <div data-element="dropzone" class="umb-file-dropzone">
 
-<ng-form name="uploadForm" umb-isolate-form>
+    <ng-form name="uploadForm" umb-isolate-form>
 
-<!-- Drag and drop files area -->
-    <div ngf-drop
-        ng-hide="hideDropzone === 'true'"
-        ng-model="filesHolder"
-        ngf-change="handleFiles($files, $event)"
-        class="dropzone"
-        ngf-drag-over-class="'drag-over'"
-        ngf-multiple="true"
-        ngf-allow-dir="true"
-        ngf-pattern="{{ accept }}"
-        ngf-max-size="{{ maxFileSize }}"
-        ng-class="{'is-small': compact!=='false' || (done.length+queue.length) > 0 }">
+        <!-- Drag and drop files area -->
+        <div ngf-drop
+            ng-hide="hideDropzone === 'true'"
+            ng-model="filesHolder"
+            ngf-change="handleFiles($files, $event)"
+            class="dropzone"
+            ngf-drag-over-class="'drag-over'"
+            ngf-multiple="true"
+            ngf-allow-dir="true"
+            ngf-pattern="{{ accept }}"
+            ngf-max-size="{{ maxFileSize }}"
+            ng-class="{'is-small': compact !=='false' || (done.length + queue.length) > 0 }">
 
+            <div class="content" >
+                <p>
+                    <localize key="media_dragAndDropYourFilesIntoTheArea">Drag and drop your file(s) into the area</localize>
+                </p>
 
-        <div class="content" >
-            <p>
-                <localize key="media_dragAndDropYourFilesIntoTheArea">Drag and drop your file(s) into the area</localize>
-            </p>
-            <!-- Drag and drop illustration -->
-            <img class="illustration" src="assets/img/uploader/upload-illustration.svg" alt="" draggable="false" />
+                <!-- Drag and drop illustration -->
+                <img class="illustration" src="assets/img/uploader/upload-illustration.svg" alt="" draggable="false" />
 
-
-            <!-- Select files -->
-            <button
-                 type="button"
-                 prevent-default
-                 data-element="button-uploadMedia"
-                 class="file-select"
-                 ngf-select
-                 ng-model="filesHolder"
-                 ngf-change="handleFiles($newFiles, $event)"
-                 ngf-multiple="true"
-                 ngf-pattern="{{ accept }}"
-                 ngf-max-size="{{ maxFileSize }}">
-                 -&nbsp;<localize key="media_orClickHereToUpload">or click here to choose files</localize>
-            </button>
+                <!-- Select files -->
+                <button
+                     type="button"
+                     data-element="button-uploadMedia"
+                     class="file-select"
+                     ngf-select
+                     ng-model="filesHolder"
+                     ngf-change="handleFiles($newFiles, $event)"
+                     ngf-multiple="true"
+                     ngf-pattern="{{ accept }}"
+                     ngf-max-size="{{ maxFileSize }}">
+                     -&nbsp;<localize key="media_orClickHereToUpload">or click here to choose files</localize>
+                </button>
+            </div>
         </div>
-    </div>
 
-    <!-- List of uploading/uploaded files  -->
-    <ul class="file-list" ng-show="done.length > 0 || queue.length > 0 || rejected.length > 0 || filesHolder.length > 0">
+        <!-- List of uploading/uploaded files  -->
+        <ul class="file-list" ng-show="done.length > 0 || queue.length > 0 || rejected.length > 0 || filesHolder.length > 0">
 
-        <!-- make list sort order the same as photo grid. The last uploaded photo in the top -->
-        <li class="file" ng-repeat="file in done">
+            <!-- make list sort order the same as photo grid. The last uploaded photo in the top -->
+            <li class="file" ng-repeat="file in done">
 
-            <!-- file name -->
-            <div class="file-description">{{ file.name }}</div>
+                <!-- file name -->
+                <div class="file-description">{{ file.name }}</div>
 
-            <!-- upload success -->
-            <div class="file-icon" ng-if="file.uploadStatus == 'done'">
-                <i class="icon icon-check color-green"></i>
-            </div>
+                <!-- upload success -->
+                <div class="file-icon" ng-if="file.uploadStatus == 'done'">
+                    <i class="icon icon-check color-green" aria-hidden="true"></i>
+                </div>
 
-        </li>
+            </li>
 
-        <li class="file" ng-if="currentFile">
+            <li class="file" ng-if="currentFile">
 
-            <!-- file name -->
-            <div class="file-name">{{ currentFile.name }}</div>
+                <!-- file name -->
+                <div class="file-name">{{ currentFile.name }}</div>
 
-            <!-- upload progress bar -->
-            <div class="file-progress">
-                <span class="file-progress-indicator"
-                ng-style="{'width': currentFile.uploadProgress + '%'}"></span>
-            </div>
-        </li>
+                <!-- upload progress bar -->
+                <div class="file-progress">
+                    <span class="file-progress-indicator"
+                    ng-style="{'width': currentFile.uploadProgress + '%'}"></span>
+                </div>
+            </li>
 
-        <!-- make list sort order the same as photo grid. The last uploaded photo in the top -->
-        <li class="file" ng-repeat="queued in queue">
+            <!-- make list sort order the same as photo grid. The last uploaded photo in the top -->
+            <li class="file" ng-repeat="queued in queue">
 
-            <!-- file name -->
-            <div class="file-name">{{ queued.name }}</div>
-        </li>
+                <!-- file name -->
+                <div class="file-name">{{ queued.name }}</div>
+            </li>
 
-        <li class="file" ng-repeat="file in rejected">
+            <li class="file" ng-repeat="file in rejected">
 
-            <!-- file name -->
-            <div class="file-description">
+                <!-- file name -->
+                <div class="file-description">
 
-               <strong>{{ file.name }}</strong>
+                   <strong>{{ file.name }}</strong>
 
-               <span class="file-error" ng-if="file.$error">
-                  <span ng-if="file.$error === 'pattern'" class="errorMessage color-red"><localize key="media_disallowedFileType"></localize></span>
-                  <span ng-if="file.$error === 'maxSize'" class="errorMessage color-red"><localize key="media_maxFileSize"></localize> "{{maxFileSize}}"</span>
-               </span>
+                   <span class="file-error" ng-if="file.$error">
+                      <span ng-if="file.$error === 'pattern'" class="errorMessage color-red"><localize key="media_disallowedFileType"></localize></span>
+                      <span ng-if="file.$error === 'maxSize'" class="errorMessage color-red"><localize key="media_maxFileSize"></localize> "{{maxFileSize}}"</span>
+                   </span>
 
-               <span class="file-error" ng-if="file.serverErrorMessage">
-                   <span class="errorMessage color-red">{{file.serverErrorMessage}}</span>
-               </span>
+                   <span class="file-error" ng-if="file.serverErrorMessage">
+                       <span class="errorMessage color-red">{{file.serverErrorMessage}}</span>
+                   </span>
 
-            </div>
+                </div>
 
-            <!-- upload error -->
-            <div class="file-icon">
-               <i class="icon icon-delete color-red"></i>
-            </div>
+                <!-- upload error -->
+                <div class="file-icon">
+                   <i class="icon icon-delete color-red" aria-hidden="true"></i>
+                </div>
 
-        </li>
-    </ul>
+            </li>
+        </ul>
 
-</ng-form>
+    </ng-form>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
index 9b4e60a413..41e24a6cda 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
@@ -1,12 +1,10 @@
 <div class="umb-property-file-upload">
 
-    <ng-form name="vm.fileUploadForm">
+    <ng-form name="vm.fileUploadForm" ng-class="{ 'drag-over': vm.dragover }">
         <input type="hidden" ng-model="mandatoryValidator" ng-required="vm.required && !vm.files.length" />
 
-        <div class="fileinput-button umb-upload-button-big"
-             style="margin-bottom: 5px;"
-             ng-hide="vm.files.length > 0">
-            <i class="icon icon-page-up"></i>
+        <div class="fileinput-button umb-upload-button-big" ng-hide="vm.files.length > 0">
+            <i class="icon icon-page-up" aria-hidden="true"></i>
             <p><localize key="media_clickToUpload">Click to upload</localize></p>
             <umb-single-file-upload></umb-single-file-upload>
         </div>
@@ -19,8 +17,8 @@
                     <div ng-if="file.isImage || file.extension === 'svg'">
                         <div class="gravity-container">
                             <div class="viewport">
-                                <img ng-if="file.isClientSide" ng-src="{{file.fileSrc}}" style="max-width: 100%; max-height: 100%" alt="{{file.fileName}}"/>
-                                <a ng-if="!file.isClientSide" href="{{file.fileSrc}}" target="_blank">
+                                <img ng-if="file.isClientSide" ng-src="{{file.fileSrc}}" style="max-width: 100%; max-height: 100%" alt="{{file.fileName}}" />
+                                <a ng-if="!file.isClientSide" href="#" ng-href="{{file.fileSrc}}" target="_blank" rel="noopener">
                                     <img ng-src="{{file.fileSrc}}" style="max-width: 100%; max-height: 100%" alt="{{file.fileName}}" />
                                 </a>
                             </div>
@@ -28,7 +26,7 @@
                     </div>
 
                     <div ng-if="!file.isImage && file.extension !== 'svg'">
-                        <a class="span6 thumbnail tc" ng-show="!file.isClientSide" ng-href="{{file.fileName}}" target="_blank">
+                        <a class="span6 thumbnail tc" ng-show="!file.isClientSide" href="#" ng-href="{{file.fileName}}" target="_blank" rel="noopener">
                             <umb-file-icon
                                 extension="{{file.extension}}"
                                 size="m">
@@ -45,9 +43,9 @@
                     </div>
                 </div>
                 <div>
-                    <button class="btn btn-link btn-crop-delete" aria-hidden="true" ng-click="vm.clear()"><i class="icon-delete red"></i> <localize key="content_uploadClear">Remove file</localize></button>
-                    <button class="sr-only" ng-if="file.isImage" ng-click="vm.clear()"><localize key="content_uploadClearImageContext">Click here to remove the image from the media item</localize></button>
-                    <button class="sr-only" ng-if="!file.isImage" ng-click="vm.clear()"><localize key="content_uploadClearFileContext">Click here to remove the file from the media item</localize></button>
+                    <button type="button" class="btn btn-link btn-crop-delete" aria-hidden="true" ng-click="vm.clear()"><i class="icon-delete red"></i> <localize key="content_uploadClear">Remove file</localize></button>
+                    <button type="button" class="sr-only" ng-if="file.isImage" ng-click="vm.clear()"><localize key="content_uploadClearImageContext">Click here to remove the image from the media item</localize></button>
+                    <button type="button" class="sr-only" ng-if="!file.isImage" ng-click="vm.clear()"><localize key="content_uploadClearFileContext">Click here to remove the file from the media item</localize></button>
                 </div>
 
             </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
index 38ea13eebb..974f8d6b4e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
@@ -13,9 +13,11 @@
         <div ng-switch-when="true">
 
             <ng-form name="changePasswordForm">
-                <umb-control-group alias="resetPassword" label="@user_resetPassword" ng-show="vm.config.enableReset">
-                    <umb-checkbox model="vm.passwordValues.reset" server-validation-field="resetPassword"
-                                  on-change="vm.showReset = !vm.showReset" />
+                <umb-control-group alias="resetPassword" label="@user_resetPassword" ng-if="vm.config.enableReset">
+                    <umb-checkbox model="vm.passwordValues.reset"
+                                  server-validation-field="resetPassword"
+                                  on-change="vm.showReset = !vm.showReset">
+                    </umb-checkbox>
                     <span ng-messages="changePasswordForm.resetPassword.$error" show-validation-on-submit>
                         <span class="help-inline" ng-message="valServerField">{{changePasswordForm.resetPassword.errorMsg}}</span>
                     </span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html
index 014297ae51..72c3844b5e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html
@@ -14,6 +14,13 @@
     </div>
 
     <div class="umb-user-preview__actions">
-        <button type="button" class="umb-user-preview__action umb-user-preview__action--red btn-link" title="Remove" ng-if="allowRemove" ng-click="onRemove()"><localize key="general_remove">Remove</localize></button>
-    </div>
+        <button type="button"
+                class="umb-user-preview__action umb-user-preview__action--red btn-link"
+                title="Remove {{name}}"
+                ng-if="allowRemove"
+                ng-click="onRemove()">
+            <localize key="general_remove">Remove</localize>
+            <span class="sr-only">{{name}}</span>
+        </button>
+    <div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
index 487a73f948..0e6dc76725 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
@@ -2,7 +2,7 @@
  * @ngdoc controller
  * @name Umbraco.Editors.Content.CreateController
  * @function
- * 
+ *
  * @description
  * The controller for the content creation dialog
  */
@@ -22,20 +22,17 @@ function contentCreateController($scope,
     function initialize() {
         $scope.loading = true;
         $scope.allowedTypes = null;
-        
+
         var getAllowedTypes = contentTypeResource.getAllowedTypes($scope.currentNode.id).then(function (data) {
             $scope.allowedTypes = iconHelper.formatContentTypeIcons(data);
-            if ($scope.allowedTypes.length === 0) {
-                contentTypeResource.getCount().then(function(count) {
-                    $scope.countTypes = count;
-                });
-            }
         });
         var getCurrentUser = authResource.getCurrentUser().then(function (currentUser) {
-            if (currentUser.allowedSections.indexOf("settings") > -1) {
-                $scope.hasSettingsAccess = true;
+
+            $scope.hasSettingsAccess = currentUser.allowedSections.indexOf("settings") > -1;
+            if ($scope.hasSettingsAccess) {
+
                 if ($scope.currentNode.id > -1) {
-                    contentResource.getById($scope.currentNode.id).then(function (data) {
+                    return contentResource.getById($scope.currentNode.id).then(function (data) {
                         $scope.contentTypeId = data.contentTypeId;
                     });
                 }
@@ -43,6 +40,12 @@ function contentCreateController($scope,
         });
 
         $q.all([getAllowedTypes, getCurrentUser]).then(function() {
+            if ($scope.hasSettingsAccess === true && $scope.allowedTypes.length === 0) {
+                return contentTypeResource.getCount().then(function(count) {
+                    $scope.countTypes = count;
+                });
+            }
+        }).then(function() {
             $scope.loading = false;
         });
 
@@ -60,13 +63,13 @@ function contentCreateController($scope,
             .path("/content/content/edit/" + $scope.currentNode.id)
             .search("doctype", docType.alias)
             .search("create", "true")
-            /* when we create a new node we want to make sure it uses the same 
+            /* when we create a new node we want to make sure it uses the same
             language as what is selected in the tree */
             .search("cculture", mainCulture)
-            /* when we create a new node we must make sure that any previously 
+            /* when we create a new node we must make sure that any previously
             opened segments is reset */
             .search("csegment", null)
-            /* when we create a new node we must make sure that any previously 
+            /* when we create a new node we must make sure that any previously
             used blueprint is reset */
             .search("blueprintId", null);
         close();
@@ -92,8 +95,6 @@ function contentCreateController($scope,
         } else {
             createBlank(docType);
         }
-
-        navigationService.hideDialog();
     }
 
     function createFromBlueprint(blueprintId) {
@@ -127,7 +128,7 @@ function contentCreateController($scope,
     $scope.createOrSelectBlueprintIfAny = createOrSelectBlueprintIfAny;
     $scope.createFromBlueprint = createFromBlueprint;
 
-    // the current node changes behind the scenes when the context menu is clicked without closing 
+    // the current node changes behind the scenes when the context menu is clicked without closing
     // the default menu first, so we must watch the current node and re-initialize accordingly
     var unbindModelWatcher = $scope.$watch("currentNode", initialize);
     $scope.$on('$destroy', function () {
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js
index 9a2c845d49..afd844aa01 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js
@@ -1,50 +1,50 @@
 (function () {
 
-  function CreateBlueprintController(
-    $scope,
-    contentResource,
-    navigationService,
-    localizationService,
-    formHelper,
-    contentEditingHelper) {
+    function CreateBlueprintController(
+        $scope,
+        contentResource,
+        navigationService,
+        localizationService,
+        formHelper,
+        contentEditingHelper) {
 
-    $scope.message = {
-      name: $scope.currentNode.name
-    };
+        $scope.message = {
+            name: $scope.currentNode.name
+        };
 
-    localizationService.localize("blueprints_createBlueprintFrom", ["<em>" + $scope.message.name + "</em>"]).then(function (localizedVal) {
-      $scope.title = localizedVal;
-    });
+        localizationService.localize("blueprints_createBlueprintFrom", ["<em>" + $scope.message.name + "</em>"]).then(function (localizedVal) {
+            $scope.title = localizedVal;
+        });
 
-    $scope.cancel = function () {
-      navigationService.hideMenu();
-    };
+        $scope.cancel = function () {
+            navigationService.hideMenu();
+        };
 
-    $scope.create = function () {
-      if (formHelper.submitForm({
-        scope: $scope,
-        formCtrl: this.blueprintForm
-      })) {
+        $scope.create = function () {
+            if (formHelper.submitForm({
+                scope: $scope,
+                formCtrl: this.blueprintForm
+            })) {
 
-        contentResource.createBlueprintFromContent($scope.currentNode.id, $scope.message.name)
-          .then(function(data) {
+                contentResource.createBlueprintFromContent($scope.currentNode.id, $scope.message.name)
+                    .then(function (data) {
 
-              formHelper.resetForm({ scope: $scope });
+                        formHelper.resetForm({ scope: $scope });
 
-              navigationService.hideMenu();
-            },
-            function(err) {
-
-              contentEditingHelper.handleSaveError({
-                err: err
-              });
+                        navigationService.hideMenu();
+                    },
+                        function (err) {
+                            formHelper.resetForm({ scope: $scope, hasErrors: true });
+                            contentEditingHelper.handleSaveError({
+                                err: err
+                            });
 
+                        }
+                    );
             }
-          );
-      }
-    };
-  }
+        };
+    }
 
-  angular.module("umbraco").controller("Umbraco.Editors.Content.CreateBlueprintController", CreateBlueprintController);
+    angular.module("umbraco").controller("Umbraco.Editors.Content.CreateBlueprintController", CreateBlueprintController);
 
 }());
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.notify.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.notify.controller.js
index 1435b0854e..29619f2b96 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.notify.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.notify.controller.js
@@ -31,7 +31,7 @@
             vm.saveError = false;
             vm.saveSuccces = false;
             var selectedString = [];
-            angular.forEach(notifyOptions, function (option) {
+            notifyOptions.forEach(function (option) {
                     if (option.checked === true && option.notifyCode) {
                         selectedString.push(option.notifyCode);
                     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js
index 0e40fc2e6c..78521af2fe 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js
@@ -39,7 +39,7 @@
           //reset this
           vm.selectedUserGroups = [];
           vm.availableUserGroups = userGroups;
-          angular.forEach(vm.availableUserGroups, function (group) {
+          vm.availableUserGroups.forEach(function (group) {
             if (group.permissions) {
               //if there's explicit permissions assigned than it's selected
               assignGroupPermissions(group);
@@ -70,8 +70,8 @@
           group.allowedPermissions = [];
 
           // get list of checked permissions
-          angular.forEach(group.permissions, function (permissionGroup) {
-            angular.forEach(permissionGroup, function (permission) {
+          Object.values(group.permissions).forEach(function (permissionGroup) {
+            permissionGroup.forEach(function (permission) {
               if (permission.checked) {
                 //the `allowedPermissions` is what will get sent up to the server for saving
                 group.allowedPermissions.push(permission);
@@ -117,9 +117,9 @@
         }
 
         function formatSaveModel(permissionsSave, groupCollection) {
-          angular.forEach(groupCollection, function (g) {
+          groupCollection.forEach(function (g) {
             permissionsSave[g.id] = [];
-            angular.forEach(g.allowedPermissions, function (p) {
+            g.allowedPermissions.forEach(function (p) {
               permissionsSave[g.id].push(p.permissionCode);
             });
           });
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js
index f3113f5c8f..3fda4cb577 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js
@@ -11,6 +11,8 @@
         vm.saveButtonState = "init";
         vm.sortOrder = {};
         vm.sortableOptions = {
+            axis: "y",
+            containment: "parent",
             distance: 10,
             tolerance: "pointer",
             opacity: 0.7,
@@ -68,7 +70,7 @@
 
         function sort(column) {
             // reverse if it is already ordered by that column
-            if(vm.sortOrder.column === column) {
+            if (vm.sortOrder.column === column) {
                 vm.sortOrder.reverse = !vm.sortOrder.reverse
             } else {
                 vm.sortOrder.column = column;
@@ -82,7 +84,6 @@
         }
 
         onInit();
-
     }
 
     angular.module("umbraco").controller("Umbraco.Editors.Content.SortController", ContentSortController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
index decf05be5f..b924793fcd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function PublishController($scope, localizationService, contentEditingHelper) {
+    function PublishController($scope, localizationService) {
 
         var vm = this;
         vm.loading = true;
@@ -9,14 +9,14 @@
 
         vm.changeSelection = changeSelection;
 
-        /** Returns true if publish meets the requirements of mandatory languages */
+        /** 
+         * Returns true if publish meets the requirements of mandatory languages 
+         * */
         function canPublish() {
-            
+
             var hasSomethingToPublish = false;
 
-            for (var i = 0; i < vm.variants.length; i++) {
-                var variant = vm.variants[i];
-
+            vm.variants.forEach(variant => {
                 // if varaint is mandatory and not already published:
                 if (variant.publish === false && notPublishedMandatoryFilter(variant)) {
                     return false;
@@ -24,8 +24,8 @@
                 if (variant.publish === true) {
                     hasSomethingToPublish = true;
                 }
+            });
 
-            }
             return hasSomethingToPublish;
         }
 
@@ -36,60 +36,75 @@
             variant.save = variant.publish;
         }
 
-
         function hasAnyDataFilter(variant) {
 
-            if (variant.name == null || variant.name.length === 0) {
-                return false;
+            // if we have a name, then we have data.
+            if (variant.name != null && variant.name.length > 0) {
+                return true;
             }
 
             if(variant.isDirty === true) {
                 return true;
             }
 
-            for (var t=0; t < variant.tabs.length; t++){
-                for (var p=0; p < variant.tabs[t].properties.length; p++){
-                    var property = variant.tabs[t].properties[p];
+            variant.tabs.forEach(tab => {
+                tab.properties.forEach(property => {
                     if (property.value != null && property.value.length > 0) {
                         return true;
                     }
-                }
-            }
+                });
+            });
 
             return false;
         }
 
+        /**
+         * determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
+         *  * it's editor is in a $dirty state
+         *  * it has pending saves
+         *  * it is unpublished
+         * @param {*} variant 
+         */
         function dirtyVariantFilter(variant) {
-            //determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
-            // * it's editor is in a $dirty state
-            // * it has pending saves
-            // * it is unpublished
             return (variant.isDirty || variant.state === "Draft" || variant.state === "PublishedPendingChanges");
         }
 
+        /**
+         * determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
+         *  * variant is active
+         *  * it's editor is in a $dirty state
+         *  * it has pending saves
+         *  * it is unpublished
+         * @param {*} variant 
+         */
         function publishableVariantFilter(variant) {
-            //determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
-            // * variant is active
-            // * it's editor is in a $dirty state
-            // * it has pending saves
-            // * it is unpublished
+
             return (variant.active || variant.isDirty || variant.state === "Draft" || variant.state === "PublishedPendingChanges");
         }
 
         function notPublishedMandatoryFilter(variant) {
-            return variant.state !== "Published" && isMandatoryFilter(variant);
+            return variant.state !== "Published" && variant.state !== "PublishedPendingChanges" && variant.isMandatory === true;
         }
-        function isMandatoryFilter(variant) {
-            //determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
-            // * has a mandatory language
-            // * without having a segment, segments cant be mandatory at current state of code.
+
+        /**
+         * determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
+         *  * has a mandatory language
+         *  * without having a segment, segments cant be mandatory at current state of code.
+         * @param {*} variant 
+         */
+        function isMandatoryFilter(variant) {            
             return (variant.language && variant.language.isMandatory === true && variant.segment == null);
         }
+
+        /**
+         * determine a variant is needed, but not already a choice.
+         *  * publishable — aka. displayed as a publish option.
+         *  * published — its already published and everything is then fine.
+         *  * mandatory — this is needed, and thats why we highlight it.
+         * @param {*} variant 
+         */
         function notPublishableButMandatoryFilter(variant) {
-            //determine a variant is needed, but not already a choice.
-            // * publishable — aka. displayed as a publish option.
-            // * published — its already published and everything is then fine.
-            // * mandatory — this is needed, and thats why we highlight it.
+
             return !publishableVariantFilter(variant) && variant.state !== "Published" && variant.isMandatory === true;
         }
 
@@ -97,24 +112,21 @@
 
             vm.variants = $scope.model.variants;
 
-            _.each(vm.variants, (variant) => {
-                
+            // If we have a variant that's not in the state of NotCreated, 
+            // then we know we have data and it's not a new content node.
+            vm.isNew = vm.variants.some(variant => variant.state === 'NotCreated');
+
+            vm.variants.forEach(variant => {
+
                 // reset to not be published
-                variant.publish = false;
-                variant.save = false;
+                variant.publish = variant.save = false;
+
                 
                 variant.isMandatory = isMandatoryFilter(variant);
 
-                // If we have a variant thats not in the state of NotCreated, then we know we have adata and its not a new content node.
-                if(variant.state !== "NotCreated") {
-                    vm.isNew = false;
-                }
-            });
-
-            _.each(vm.variants, (variant) => {
                 
                 // if this is a new node and we have data on this variant.
-                if(vm.isNew === true && hasAnyDataFilter(variant)) {
+                if (vm.isNew === true && hasAnyDataFilter(variant)) {
                     variant.save = true;
                 }
                 
@@ -124,27 +136,27 @@
             vm.missingMandatoryVariants = vm.variants.filter(notPublishableButMandatoryFilter);
 
             // if any active varaiant that is available for publish, we set it to be published:
-            _.each(vm.availableVariants, (v) => {
+            vm.availableVariants.forEach(v => {
                 if(v.active) {
                     v.save = v.publish = true;
                 }
             });
 
             if (vm.availableVariants.length !== 0) {
-                vm.availableVariants.sort(function (a, b) {
+                vm.availableVariants.sort((a, b) => {
                     if (a.language && b.language) {
-                        if (a.language.name > b.language.name) {
+                        if (a.language.name < b.language.name) {
                             return -1;
                         }
-                        if (a.language.name < b.language.name) {
+                        if (a.language.name > b.language.name) {
                             return 1;
                         }
-                    } 
+                    }
                     if (a.segment && b.segment) {
-                        if (a.segment > b.segment) {
+                        if (a.segment < b.segment) {
                             return -1;
                         }
-                        if (a.segment < b.segment) {
+                        if (a.segment > b.segment) {
                             return 1;
                         }
                     }
@@ -152,35 +164,28 @@
                 });
             }
 
-
             $scope.model.disableSubmitButton = !canPublish();
 
-            if (vm.missingMandatoryVariants.length > 0) {
-                localizationService.localize("content_notReadyToPublish").then(function (value) {
+            const localizeKey = vm.missingMandatoryVariants.length > 0 ? 'content_notReadyToPublish' : 
+                !$scope.model.title ? 'content_readyToPublish' : '';
+
+            if (localizeKey) {
+                localizationService.localize(localizeKey).then(value => {
                     $scope.model.title = value;
                     vm.loading = false;
                 });
             } else {
-                if (!$scope.model.title) {
-                    localizationService.localize("content_readyToPublish").then(function (value) {
-                        $scope.model.title = value;
-                        vm.loading = false;
-                    });
-                } else {
-                    vm.loading = false;
-                }
+                vm.loading = false;
             }
-
         }
 
         onInit();
 
         //when this dialog is closed, reset all 'publish' flags
-        $scope.$on('$destroy', function () {
-            for (var i = 0; i < vm.variants.length; i++) {
-                vm.variants[i].publish = false;
-                vm.variants[i].save = false;
-            }
+        $scope.$on('$destroy', () => {
+            vm.variants.forEach(variant => {
+                variant.publish = variant.save = false;
+            });
         });
     }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
index 4cf4444cfe..c3e0b90f5f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
@@ -19,25 +19,23 @@
                                   name="publishVariantSelector"
                                   model="variant.publish"
                                   on-change="vm.changeSelection(variant)"
-                                  server-validation-field="{{variant.htmlId}}"
-                    >
-                        <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
-                            <span ng-bind="variant.displayName"></span>
-                            <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
-                        </span>
-                        <span class="umb-variant-selector-entry__title" ng-if="variant.segment && variant.language">
-                            <span ng-bind="variant.segment"></span>
-                            <span class="__secondarytitle"> — {{variant.language.name}}</span>
-                            <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
+                                  server-validation-field="{{variant.htmlId}}">
+
+                        <span class="umb-variant-selector-entry__title">
+                            <span ng-bind="variant.displayName" ng-if="!(variant.segment && variant.language)"></span>
+                            <span ng-bind="variant.segment" ng-if="variant.segment && variant.language"></span>
+                            <span class="__secondarytitle" ng-if="variant.segment && variant.language"> — {{variant.language.name}}</span>
+                            <strong ng-if="variant.isMandatory && variant.state !== 'Published' && variant.state !== 'PublishedPendingChanges'" class="umb-control-required">*</strong>
                         </span>
                         <span class="umb-variant-selector-entry__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                             <umb-variant-state variant="variant"></umb-variant-state>
                             <span ng-if="variant.isMandatory"> - </span>
-                            <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.publish === false) }"><localize key="languages_mandatoryLanguage"></localize></span>
+                            <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.state !== 'Published' && variant.state !== 'PublishedPendingChanges' && variant.publish === false) }"><localize key="languages_mandatoryLanguage"></localize></span>
                         </span>
                         <span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
                             <span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                         </span>
+
                     </umb-checkbox>
 
                     <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
index 095c4f3fe1..f6fd6cb3cb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
@@ -4,59 +4,65 @@
     function PublishDescendantsController($scope, localizationService) {
 
         var vm = this;
-
-        vm.includeUnpublished = false;
+        vm.includeUnpublished = $scope.model.includeUnpublished || false;
 
         vm.changeSelection = changeSelection;
         vm.toggleIncludeUnpublished = toggleIncludeUnpublished;
 
-
         function onInit() {
 
             vm.variants = $scope.model.variants;
-            vm.displayVariants = vm.variants.slice(0);// shallow copy, we dont want to share the array-object(because we will be performing a sort method) but each entry should be shared (because we need validation and notifications).
+            vm.displayVariants = vm.variants.slice(0); // shallow copy, we don't want to share the array-object (because we will be performing a sort method) but each entry should be shared (because we need validation and notifications).
             vm.labels = {};
 
+            // get localized texts for use in directives
             if (!$scope.model.title) {
-                localizationService.localize("buttons_publishDescendants").then(function (value) {
+                localizationService.localize("buttons_publishDescendants").then(value => {
                     $scope.model.title = value;
                 });
             }
+            if (!vm.labels.includeUnpublished) {
+                localizationService.localize("content_includeUnpublished").then(function (value) {
+                    vm.labels.includeUnpublished = value;
+                });
+            }
+            if (!vm.labels.includeUnpublished) {
+                localizationService.localize("content_includeUnpublished").then(value => {
+                    vm.labels.includeUnpublished = value;
+                });
+            }
 
-            _.each(vm.variants, function (variant) {
+            vm.variants.forEach(variant => {
                 variant.isMandatory = isMandatoryFilter(variant);
             });
 
             if (vm.variants.length > 1) {
 
-                vm.displayVariants.sort(function (a, b) {
+                vm.displayVariants.sort((a, b) => {
                     if (a.language && b.language) {
-                        if (a.language.name > b.language.name) {
+                        if (a.language.name < b.language.name) {
                             return -1;
                         }
-                        if (a.language.name < b.language.name) {
+                        if (a.language.name > b.language.name) {
                             return 1;
                         }
                     }
                     if (a.segment && b.segment) {
-                        if (a.segment > b.segment) {
+                        if (a.segment < b.segment) {
                             return -1;
                         }
-                        if (a.segment < b.segment) {
+                        if (a.segment > b.segment) {
                             return 1;
                         }
                     }
                     return 0;
                 });
 
-                var active = _.find(vm.variants, function (v) {
-                    return v.active;
-                });
+                var active = vm.variants.find(v => v.active);
 
                 if (active) {
                     //ensure that the current one is selected
-                    active.publish = true;
-                    active.save = true;
+                    active.publish = active.save = true;
                 }
 
                 $scope.model.disableSubmitButton = !canPublish();
@@ -67,24 +73,23 @@
                     "key": "content_publishDescendantsHelp",
                     "tokens": [vm.variants[0].name]
                 };
-            }
-            
+            }            
         }
 
         function toggleIncludeUnpublished() {
-            console.log("toggleIncludeUnpublished")
             vm.includeUnpublished = !vm.includeUnpublished;
+            // make sure this value is pushed back to the scope
+            $scope.model.includeUnpublished = vm.includeUnpublished;
         }
 
         /** Returns true if publishing is possible based on if there are un-published mandatory languages */
         function canPublish() {
             var selected = [];
-            for (var i = 0; i < vm.variants.length; i++) {
-                var variant = vm.variants[i];
+            vm.variants.forEach(variant => {
 
                 var published = !(variant.state === "NotCreated" || variant.state === "Draft");
 
-                if (variant.segment == null &&  variant.language && variant.language.isMandatory && !published && !variant.publish) {
+                if (variant.segment == null && variant.language && variant.language.isMandatory && !published && !variant.publish) {
                     //if a mandatory variant isn't published 
                     //and not flagged for saving
                     //then we cannot continue
@@ -96,7 +101,8 @@
                 if (variant.publish) {
                     selected.push(variant.publish);
                 }
-            }
+            });
+
             return selected.length > 0;
         }
 
@@ -115,11 +121,10 @@
         }
 
         //when this dialog is closed, reset all 'publish' flags
-        $scope.$on('$destroy', function () {
-            for (var i = 0; i < vm.variants.length; i++) {
-                vm.variants[i].publish = false;
-                vm.variants[i].save = false;
-            }
+        $scope.$on('$destroy', () => {
+            vm.variants.forEach(variant => {
+                variant.publish = variant.save = false;
+            });
         });
 
         onInit();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
index 92373d00ff..61fd78a035 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
@@ -6,12 +6,15 @@
         </div>
 
         <div class="flex mb3">
-            <umb-toggle
-                checked="vm.includeUnpublished"
-                on-click="vm.toggleIncludeUnpublished()"
-                class="mr2"
-            />
-            <localize key="content_includeUnpublished"></localize>
+            <umb-toggle checked="vm.includeUnpublished"
+                        on-click="vm.toggleIncludeUnpublished()"
+                        class="mr2"
+                        input-id="includeUnpublished"
+                        label-on="{{vm.labels.includeUnpublished}}"
+                        label-off="{{vm.labels.includeUnpublished}}"
+                        label-position="right"
+                        show-labels="true">
+            </umb-toggle>
         </div>
 
     </div>
@@ -23,12 +26,14 @@
         </div>
 
         <div class="flex mb3">
-            <umb-toggle
-                checked="vm.includeUnpublished"
-                on-click="vm.toggleIncludeUnpublished()"
-                class="mr2"
-            />
-            <localize key="content_includeUnpublished"></localize>
+            <umb-toggle checked="vm.includeUnpublished"
+                        on-click="vm.toggleIncludeUnpublished()"
+                        class="mr2"
+                        label-on="{{vm.labels.includeUnpublished}}"
+                        label-off="{{vm.labels.includeUnpublished}}"
+                        label-position="right"
+                        show-labels="true">
+            </umb-toggle>
         </div>
 
         <div class="umb-list umb-list--condensed">
@@ -38,11 +43,11 @@
                     <div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid}">
 
                         <umb-checkbox input-id="{{variant.htmlId}}"
-                            name="publishVariantSelector"
-                            model="variant.publish"
-                            on-change="vm.changeSelection(variant)"
-                            server-validation-field="{{variant.htmlId}}"
-                        >
+                                      name="publishVariantSelector"
+                                      model="variant.publish"
+                                      on-change="vm.changeSelection(variant)"
+                            server-validation-field="{{variant.htmlId}}">
+
                             <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
                                 <span ng-bind="variant.displayName"></span>
                                 <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
@@ -60,6 +65,7 @@
                             <span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
                                 <span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                             </span>
+
                         </umb-checkbox>
 
                         <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js
index 2d40005618..aa0d3797d4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js
@@ -58,57 +58,47 @@
         function onInit() {
             vm.variants = $scope.model.variants;
             vm.availableVariants = vm.variants.filter(saveableVariantFilter);
+            vm.isNew = vm.variants.some(variant => variant.state === 'NotCreated');
 
-            if(!$scope.model.title) {
-                localizationService.localize("content_readyToSave").then(function(value){
+            if (!$scope.model.title) {
+                localizationService.localize("content_readyToSave").then(value => {
                     $scope.model.title = value;
                 });
             }
 
-            _.each(vm.variants,
-                function (variant) {
+            vm.variants.forEach(variant => {
 
-                    //reset state:
-                    variant.save = false;
-                    variant.publish = false;
+                //reset state:
+                variant.save = variant.publish = false;
+                variant.isMandatory = isMandatoryFilter(variant);
 
-                    variant.isMandatory = isMandatoryFilter(variant);
-
-                    if(variant.state !== "NotCreated"){
-                        vm.isNew = false;
-                    }
-                });
-
-            _.each(vm.variants,
-                function (variant) {
-                    if(vm.isNew && hasAnyData(variant)){
-                        variant.save = true;
-                    }
-                });
+                if(vm.isNew && hasAnyData(variant)){
+                    variant.save = true;
+                }
+            });
 
             if (vm.variants.length !== 0) {
+                        
+                //ensure that the current one is selected
+                var active = vm.variants.find(v => v.active);
+                if (active) {
+                    active.save = true;
+                }
 
-                _.find(vm.variants, function (v) {
-                    if(v.active) {
-                        //ensure that the current one is selected
-                        v.save = true;
-                    }
-                });
-
-                vm.availableVariants.sort(function (a, b) {
+                vm.availableVariants.sort((a, b) => {
                     if (a.language && b.language) {
-                        if (a.language.name > b.language.name) {
+                        if (a.language.name < b.language.name) {
                             return -1;
                         }
-                        if (a.language.name < b.language.name) {
+                        if (a.language.name > b.language.name) {
                             return 1;
                         }
                     }
                     if (a.segment && b.segment) {
-                        if (a.segment > b.segment) {
+                        if (a.segment < b.segment) {
                             return -1;
                         }
-                        if (a.segment < b.segment) {
+                        if (a.segment > b.segment) {
                             return 1;
                         }
                     }
@@ -126,10 +116,10 @@
         onInit();
 
         //when this dialog is closed, reset all 'save' flags
-        $scope.$on('$destroy', function () {
-            for (var i = 0; i < vm.variants.length; i++) {
-                vm.variants[i].save = false;
-            }
+        $scope.$on('$destroy', () => {
+            vm.variants.forEach(variant => {
+                variant.save = false;
+            });
         });
 
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
index dd6e96df95..661dd4162e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
@@ -18,13 +18,12 @@
                 <ng-form name="saveVariantSelectorForm">
                     <div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': saveVariantSelectorForm.saveVariantSelector.$invalid}">
 
-                        <umb-checkbox
-                            input-id="{{variant.htmlId}}"
-                            name="saveVariantSelector"
-                            model="variant.save"
-                            on-change="vm.changeSelection(variant)"
-                            server-validation-field="{{variant.htmlId}}"
-                        >
+                        <umb-checkbox input-id="{{variant.htmlId}}"
+                                      name="saveVariantSelector"
+                                      model="variant.save"
+                                      on-change="vm.changeSelection(variant)"
+                                      server-validation-field="{{variant.htmlId}}">
+
                             <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
                                 <span ng-bind="variant.displayName"></span>
                                 <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
@@ -42,12 +41,12 @@
                             <span class="umb-variant-selector-entry__description" ng-messages="saveVariantSelectorForm.saveVariantSelector.$error" show-validation-on-submit>
                                 <span class="text-error" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</span>
                             </span>
+
                         </umb-checkbox>
 
                         <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
 
                     </div>
-
                 </ng-form>
             </div>
             <br/>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js
index e7f31ac707..8bf23ae6d5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
     
-    function ScheduleContentController($scope, $timeout, localizationService, dateHelper, userService, contentEditingHelper) {
+    function ScheduleContentController($scope, $timeout, localizationService, dateHelper, userService) {
 
         var vm = this;
 
@@ -25,64 +25,60 @@
             vm.variants = $scope.model.variants;
             vm.displayVariants = vm.variants.slice(0);// shallow copy, we dont want to share the array-object(because we will be performing a sort method) but each entry should be shared (because we need validation and notifications).
 
-            for (let i = 0; i < vm.variants.length; i++) {
-                origDates.push({
-                    releaseDate: vm.variants[i].releaseDate,
-                    expireDate: vm.variants[i].expireDate
-                });
-            }
-
             if(!$scope.model.title) {
-                localizationService.localize("general_scheduledPublishing").then(function(value){
+                localizationService.localize("general_scheduledPublishing").then(value => {
                     $scope.model.title = value;
                 });
             }
-           
-            _.each(vm.variants, function (variant) {
-                variant.isMandatory = isMandatoryFilter(variant);
 
+            vm.variants.forEach(variant => {
+                origDates.push({
+                    releaseDate: variant.releaseDate,
+                    expireDate: variant.expireDate
+                });
+
+                variant.isMandatory = isMandatoryFilter(variant);
             });
 
             // Check for variants: if a node is invariant it will still have the default language in variants
             // so we have to check for length > 1
             if (vm.variants.length > 1) {
 
-                vm.displayVariants.sort(function (a, b) {
+                vm.displayVariants.sort((a, b) => {
                     if (a.language && b.language) {
-                        if (a.language.name > b.language.name) {
+                        if (a.language.name < b.language.name) {
                             return -1;
                         }
-                        if (a.language.name < b.language.name) {
+                        if (a.language.name > b.language.name) {
                             return 1;
                         }
                     }
                     if (a.segment && b.segment) {
-                        if (a.segment > b.segment) {
+                        if (a.segment < b.segment) {
                             return -1;
                         }
-                        if (a.segment < b.segment) {
+                        if (a.segment > b.segment) {
                             return 1;
                         }
                     }
                     return 0;
                 });
 
-                _.each(vm.variants, function (v) {
+                vm.variants.forEach(v => {
                     if (v.active) {
                         v.save = true;
                     }
                 });
                 
-                $scope.model.disableSubmitButton = !canSchedule();
-            
+                $scope.model.disableSubmitButton = !canSchedule();            
             }
 
             // get current backoffice user and format dates
-            userService.getCurrentUser().then(function (currentUser) {
+            userService.getCurrentUser().then(currentUser => {
 
                 vm.currentUser = currentUser;
 
-                angular.forEach(vm.variants, function(variant) {
+                vm.variants.forEach(variant => {
 
                     // prevent selecting publish/unpublish date before today
                     var now = new Date();
@@ -103,9 +99,7 @@
                         formatDatesToLocal(variant);
                     }
                 });
-
             });
-
         }
 
         /**
@@ -132,7 +126,6 @@
          * @param {any} type publish or unpublish
          */
         function datePickerChange(variant, dateStr, type) {
-            console.log("datePickerChange", variant, dateStr, type)
             if (type === 'publish') {
                 setPublishDate(variant, dateStr);
             } else if (type === 'unpublish') {
@@ -179,9 +172,7 @@
          */
         function checkForBackdropClick() {
 
-            var open = _.find(vm.variants, function (variant) {
-                return variant.releaseDatePickerOpen || variant.expireDatePickerOpen;
-            });
+            var open = vm.variants.find(variant => variant.releaseDatePickerOpen || variant.expireDatePickerOpen);
 
             if(open) {
                 $scope.model.disableBackdropClick = true;
@@ -247,7 +238,6 @@
          * @param {any} variant 
          */
         function clearPublishDate(variant) {
-            console.log("clearPublishDate", variant, variant.releaseDate)
             if(variant && variant.releaseDate) {
                 variant.releaseDate = null;
                 // we don't have a publish date anymore so we can clear the min date for unpublish
@@ -263,7 +253,6 @@
          * @param {any} variant 
          */
         function clearUnpublishDate(variant) {
-            console.log("clearUnpublishDate", variant)
             if(variant && variant.expireDate) {
                 variant.expireDate = null;
                 // we don't have a unpublish date anymore so we can clear the max date for publish
@@ -358,20 +347,19 @@
         onInit();
 
         //when this dialog is closed, clean up
-        $scope.$on('$destroy', function () {
-            for (var i = 0; i < vm.variants.length; i++) {
-                vm.variants[i].save = false;
+        $scope.$on('$destroy', () => {
+            vm.variants.forEach(variant => {
+                variant.save = false;
                 // remove properties only needed for this dialog
-                delete vm.variants[i].releaseDateFormatted;
-                delete vm.variants[i].expireDateFormatted;
-                delete vm.variants[i].datePickerConfig;
-                delete vm.variants[i].releaseDatePickerInstance;
-                delete vm.variants[i].expireDatePickerInstance;
-                delete vm.variants[i].releaseDatePickerOpen;
-                delete vm.variants[i].expireDatePickerOpen;
-            } 
+                delete variant.releaseDateFormatted;
+                delete variant.expireDateFormatted;
+                delete variant.datePickerConfig;
+                delete variant.releaseDatePickerInstance;
+                delete variant.expireDatePickerInstance;
+                delete variant.releaseDatePickerOpen;
+                delete variant.expireDatePickerOpen;
+            }); 
         });
-
     }
 
     angular.module("umbraco").controller("Umbraco.Overlays.ScheduleContentController", ScheduleContentController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
index 8f515a10e4..e854f72717 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
@@ -23,25 +23,26 @@
                                    on-close="vm.datePickerClose(vm.variants[0], 'publish')">
 
                         <div>
-                            <button ng-show="vm.variants[0].releaseDate" class="btn umb-button--xs" style="outline: none;">
+                            <button type="button" ng-show="vm.variants[0].releaseDate" class="btn btn-reset umb-button--xs" style="outline: none;">
                                 {{vm.variants[0].releaseDateFormatted}}
                             </button>
 
-                            <a ng-hide="vm.variants[0].releaseDate" href="">
+                            <button type="button" class="btn-reset" ng-hide="vm.variants[0].releaseDate">
                                 <localize key="content_setDate">Set date</localize>
-                            </a>
+                            </button>
                         </div>
 
                     </umb-date-time-picker>
 
-                    <a ng-show="vm.variants[0].releaseDate" ng-click="vm.clearPublishDate(vm.variants[0])" class="btn umb-button--xs dropdown-toggle umb-button-group__toggle" style="margin-left: -2px;">
-                        <span class="icon icon-wrong"></span>
-                    </a>
+                    <button type="button" ng-show="vm.variants[0].releaseDate" ng-click="vm.clearPublishDate(vm.variants[0])" class="btn btn-reset umb-button--xs dropdown-toggle umb-button-group__toggle" style="margin-left: -2px;">
+                        <umb-icon icon="icon-wrong" class="icon icon-wrong"></umb-icon>
+                    </button>
 
                 </div>
             </div>
 
             <div class="date-wrapper__date">
+
                 <label class="bold">
                     <localize key="content_unpublishDate"></localize>
                 </label>
@@ -55,20 +56,20 @@
                                    on-close="vm.datePickerClose(vm.variants[0], 'unpublish')">
 
                         <div>
-                            <button ng-show="vm.variants[0].expireDate" class="btn umb-button--xs" style="outline: none;">
+                            <button type="button" ng-show="vm.variants[0].expireDate" class="btn btn-reset umb-button--xs" style="outline: none;">
                                 {{vm.variants[0].expireDateFormatted}}
                             </button>
 
-                            <a ng-hide="vm.variants[0].expireDate" href="">
+                            <button type="button" class="btn-reset" ng-hide="vm.variants[0].expireDate">
                                 <localize key="content_setDate">Set date</localize>
-                            </a>
+                            </button>
                         </div>
 
                     </umb-date-time-picker>
 
-                    <a ng-show="vm.variants[0].expireDate" ng-click="vm.clearUnpublishDate(vm.variants[0])" class="btn umb-button--xs dropdown-toggle umb-button-group__toggle" style="margin-left: -2px;">
-                        <span class="icon icon-wrong"></span>
-                    </a>
+                    <button type="button" ng-show="vm.variants[0].expireDate" ng-click="vm.clearUnpublishDate(vm.variants[0])" class="btn btn-reset umb-button--xs dropdown-toggle umb-button-group__toggle" style="margin-left: -2px;">
+                        <umb-icon icon="icon-wrong" class="icon icon-wrong"></umb-icon>
+                    </button>
 
                 </div>
             </div>
@@ -88,13 +89,12 @@
                 <ng-form name="scheduleSelectorForm" style="width:100%;">
                     <div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': scheduleSelectorForm.saveVariantReleaseDate.$invalid}">
 
-                        <umb-checkbox
-                            input-id="{{variant.htmlId}}"
-                            name="saveVariantSelector"
-                            model="variant.save"
-                            on-change="vm.changeSelection(variant)"
-                            server-validation-field="{{variant.htmlId}}"
-                        >
+                        <umb-checkbox input-id="{{variant.htmlId}}"
+                                      name="saveVariantSelector"
+                                      model="variant.save"
+                                      on-change="vm.changeSelection(variant)"
+                                      server-validation-field="{{variant.htmlId}}">
+
                             <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
                                 <span ng-bind="variant.displayName"></span>
                                 <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
@@ -105,16 +105,14 @@
                                 <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
                             </span>
                             <span class="umb-variant-selector-entry__description"
-                                ng-if="!scheduleSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
+                                  ng-if="!scheduleSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                                 <umb-variant-state variant="variant"></umb-variant-state>
                                 <span ng-show="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
                             </span>
+
                         </umb-checkbox>
 
                         <div>
-
-
-
                             <div class="date-wrapper-mini date-wrapper-mini--checkbox">
                                 <div class="date-wrapper-mini__date" ng-if="(variant.releaseDate || variant.save)">
 
@@ -128,17 +126,17 @@
                                                        on-open="vm.datePickerShow(variant, 'publish')"
                                                        on-close="vm.datePickerClose(variant, 'publish')">
                                             <div>
-                                                <button ng-show="variant.releaseDate" class="btn umb-button--xxs btn-outline umb-outline">
+                                                <button type="button" ng-show="variant.releaseDate" class="btn btn-reset umb-button--xxs btn-outline umb-outline">
                                                     {{variant.releaseDateFormatted}}
                                                 </button>
 
-                                                <a ng-hide="variant.releaseDate" href="">
+                                                <button type="button" class="btn-reset" ng-hide="variant.releaseDate">
                                                     <localize key="content_setDate">Set date</localize>
-                                                </a>
+                                                </button>
                                             </div>
                                         </umb-date-time-picker>
-                                        <button ng-show="variant.releaseDate" ng-click="vm.clearPublishDate(variant)" class="btn umb-button--xxs dropdown-toggle umb-button-group__toggle btn-outline umb-outline" style="margin-left: -2px;">
-                                            <span class="icon icon-wrong"></span>
+                                        <button type="button" ng-show="variant.releaseDate" ng-click="vm.clearPublishDate(variant)" class="btn umb-button--xxs dropdown-toggle umb-button-group__toggle btn-outline umb-outline" style="margin-left: -2px;">
+                                            <umb-icon icon="icon-wrong" class="icon icon-wrong"></umb-icon>
                                         </button>
                                     </div>
                                 </div>
@@ -154,18 +152,18 @@
                                                        on-open="vm.datePickerShow(variant, 'unpublish')"
                                                        on-close="vm.datePickerClose(variant, 'unpublish')">
                                             <div>
-                                                <button ng-show="variant.expireDate" class="btn umb-button--xxs btn-outline umb-outline">
+                                                <button type="button" ng-show="variant.expireDate" class="btn btm-reset umb-button--xxs btn-outline umb-outline">
                                                     {{variant.expireDateFormatted}}
                                                 </button>
 
-                                                <a ng-hide="variant.expireDate" href="">
+                                                <button type="button" class="btn-reset" ng-hide="variant.expireDate">
                                                     <localize key="content_setDate">Set date</localize>
-                                                </a>
+                                                </button>
                                             </div>
                                         </umb-date-time-picker>
-                                        <a ng-show="variant.expireDate" ng-click="vm.clearUnpublishDate(variant)" class="btn umb-button--xxs dropdown-toggle umb-button-group__toggle btn-outline umb-outline" style="margin-left: -2px;">
-                                            <span class="icon icon-wrong"></span>
-                                        </a>
+                                        <button type="button" ng-show="variant.expireDate" ng-click="vm.clearUnpublishDate(variant)" class="btn btn-reset umb-button--xxs dropdown-toggle umb-button-group__toggle btn-outline umb-outline" style="margin-left: -2px;">
+                                            <umb-icon icon="icon-wrong" class="icon icon-wrong"></umb-icon>
+                                        </button>
                                     </div>
                                 </div>
                             </div>
@@ -183,12 +181,9 @@
 
                         </div>
                     </div>
-
                 </ng-form>
             </div>
             <br />
         </div>
-
     </div>
-
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.controller.js
index f425dce4a3..d91d814886 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function SendToPublishController($scope, localizationService, contentEditingHelper) {
+    function SendToPublishController($scope, localizationService) {
 
         var vm = this;
         vm.loading = true;
@@ -19,7 +19,7 @@
                 });
             }
 
-            _.each(vm.variants, function (variant) {
+            vm.variants.forEach(variant => {
                 variant.isMandatory = isMandatoryFilter(variant);
             });
             
@@ -27,27 +27,27 @@
             
             if (vm.availableVariants.length !== 0) {
 
-                vm.availableVariants = vm.availableVariants.sort(function (a, b) {
+                vm.availableVariants.sort((a, b) => {
                     if (a.language && b.language) {
-                        if (a.language.name > b.language.name) {
+                        if (a.language.name < b.language.name) {
                             return -1;
                         }
-                        if (a.language.name < b.language.name) {
+                        if (a.language.name > b.language.name) {
                             return 1;
                         }
                     }
                     if (a.segment && b.segment) {
-                        if (a.segment > b.segment) {
+                        if (a.segment < b.segment) {
                             return -1;
                         }
-                        if (a.segment < b.segment) {
+                        if (a.segment > b.segment) {
                             return 1;
                         }
                     }
                     return 0;
                 });
 
-                _.each(vm.availableVariants, function (v) {
+                vm.availableVariants.forEach(v => {
                     if(v.active) {
                         v.save = true;
                     }
@@ -63,9 +63,7 @@
         }
 
         function changeSelection() {
-            var firstSelected = _.find(vm.variants, function (v) {
-                return v.save;
-            });
+            var firstSelected = vm.variants.find(v => v.save);
             $scope.model.disableSubmitButton = !firstSelected; //disable submit button if there is none selected
         }
 
@@ -87,9 +85,9 @@
 
         //when this dialog is closed, reset all 'save' flags
         $scope.$on('$destroy', function () {
-            for (var i = 0; i < vm.variants.length; i++) {
-                vm.variants[i].save = false;
-            }
+            vm.variants.forEach(variant => {
+                variant.save = false;
+            });
         });
 
         onInit();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
index 91fa1799fc..abf39c6542 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
@@ -15,11 +15,11 @@
                 <div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid}">
 
                     <umb-checkbox input-id="{{variant.htmlId}}"
-                        name="publishVariantSelector"
-                        model="variant.publish"
-                        on-change="vm.changeSelection(variant)"
-                        server-validation-field="{{variant.htmlId}}"
-                    >
+                                  name="publishVariantSelector"
+                                  model="variant.publish"
+                                  on-change="vm.changeSelection(variant)"
+                                  server-validation-field="{{variant.htmlId}}">
+
                         <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
                             <span ng-bind="variant.displayName"></span>
                             <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
@@ -37,6 +37,7 @@
                         <span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
                             <span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                         </span>
+
                     </umb-checkbox>
 
                     <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.controller.js
index 3db76ee49f..63c5b2da26 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function UnpublishController($scope, localizationService, contentEditingHelper) {
+    function UnpublishController($scope, localizationService) {
 
         var vm = this;
         var autoSelectedVariants = [];
@@ -15,41 +15,39 @@
 
             // set dialog title
             if (!$scope.model.title) {
-                localizationService.localize("content_unpublish").then(function (value) {
+                localizationService.localize("content_unpublish").then(value => {
                     $scope.model.title = value;
                 });
             }
 
-            _.each(vm.variants, function (variant) {
+            vm.variants.forEach(variant => {
                 variant.isMandatory = isMandatoryFilter(variant);
             });
 
             // node has variants
             if (vm.variants.length !== 1) {
                 
-                vm.unpublishableVariants.sort(function (a, b) {
+                vm.unpublishableVariants.sort((a, b) => {
                     if (a.language && b.language) {
-                        if (a.language.name > b.language.name) {
+                        if (a.language.name < b.language.name) {
                             return -1;
                         }
-                        if (a.language.name < b.language.name) {
+                        if (a.language.name > b.language.name) {
                             return 1;
                         }
                     }
                     if (a.segment && b.segment) {
-                        if (a.segment > b.segment) {
+                        if (a.segment < b.segment) {
                             return -1;
                         }
-                        if (a.segment < b.segment) {
+                        if (a.segment > b.segment) {
                             return 1;
                         }
                     }
                     return 0;
                 });
 
-                var active = _.find(vm.variants, function (v) {
-                    return v.active;
-                });
+                var active = vm.variants.find(v => v.active);
 
                 if (active && publishedVariantFilter(active)) {
                     //ensure that the current one is selected
@@ -66,10 +64,10 @@
 
             // if a mandatory variant is selected we want to select all other variants, we cant have anything published if a mandatory variants gets unpublished.
             // and disable selection for the others
-            if(selectedVariant.save && selectedVariant.segment == null && selectedVariant.language && selectedVariant.language.isMandatory) {
+            if (selectedVariant.save && selectedVariant.segment == null && selectedVariant.language && selectedVariant.language.isMandatory) {
 
-                vm.variants.forEach(function(variant) {
-                    if(!variant.save) {
+                vm.variants.forEach(variant => {
+                    if (!variant.save) {
                         // keep track of the variants we automaically select
                         // so we can remove the selection again
                         autoSelectedVariants.push(variant);
@@ -80,30 +78,29 @@
 
                 // make sure the mandatory isn't disabled so we can deselect again
                 selectedVariant.disabled = false;
-
             }
 
             // if a mandatory variant is deselected we want to deselet all the variants
             // that was automatically selected so it goes back to the state before the mandatory language was selected.
             // We also want to enable all checkboxes again
-            if(!selectedVariant.save && selectedVariant.segment == null && selectedVariant.language && selectedVariant.language.isMandatory) {
+            if (!selectedVariant.save && selectedVariant.segment == null && selectedVariant.language && selectedVariant.language.isMandatory) {
                 
-                vm.variants.forEach( function(variant){
+                vm.variants.forEach(variant => {
 
                     // check if variant was auto selected, then deselect
-                    if(_.contains(autoSelectedVariants, variant)) {
+                    let autoSelected = autoSelectedVariants.find(x => x.culture === variant.culture);
+                    if (autoSelected) {
                         variant.save = false;
-                    };
+                    }
 
                     variant.disabled = false;
                 });
+
                 autoSelectedVariants = [];
             }
 
             // disable submit button if nothing is selected
-            var firstSelected = _.find(vm.variants, function (v) {
-                return v.save;
-            });
+            var firstSelected = vm.variants.find(v => v.save);
             $scope.model.disableSubmitButton = !firstSelected; //disable submit button if there is none selected
 
         }
@@ -123,11 +120,10 @@
         }
 
         //when this dialog is closed, remove all unpublish and disabled flags
-        $scope.$on('$destroy', function () {
-            for (var i = 0; i < vm.variants.length; i++) {
-                vm.variants[i].save = false;
-                vm.variants[i].disabled = false;
-            }
+        $scope.$on('$destroy', () => {
+            vm.variants.forEach(variant => {
+                variant.save = variant.disabled = false;
+            });
         });
 
         onInit();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
index 94dd9fdac5..5ab32abf00 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
@@ -17,14 +17,13 @@
                 <ng-form name="unpublishVariantSelectorForm">
                     <div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': unpublishVariantSelectorForm.unpublishVariantSelector.$invalid}">
 
-                        <umb-checkbox
-                            input-id="{{variant.htmlId}}"
-                            name="unpublishVariantSelector"
-                            model="variant.save"
-                            on-change="vm.changeSelection(variant)"
-                            disabled="variant.disabled"
-                            server-validation-field="{{variant.htmlId}}"
-                        >
+                        <umb-checkbox input-id="{{variant.htmlId}}"
+                                      name="unpublishVariantSelector"
+                                      model="variant.save"
+                                      on-change="vm.changeSelection(variant)"
+                                      disabled="variant.disabled"
+                                      server-validation-field="{{variant.htmlId}}">
+
                             <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
                                 <span ng-bind="variant.displayName"></span>
                                 <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
@@ -42,17 +41,15 @@
                             <span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
                                 <span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                             </span>
+
                         </umb-checkbox>
 
                         <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
 
                     </div>
-
                 </ng-form>
             </div>
             <br />
         </div>
-
     </div>
-
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/protect.html b/src/Umbraco.Web.UI.Client/src/views/content/protect.html
index 6377fd7c65..544d266b3f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/protect.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/protect.html
@@ -19,7 +19,13 @@
                     </p>
 
                     <div class="pa-select-type">
-                        <umb-radiobutton input-id="protectionTypeMember" name="protectionType" value="member" model="vm.type" text="" />
+
+                        <umb-radiobutton input-id="protectionTypeMember"
+                                         name="protectionType"
+                                         value="member"
+                                         model="vm.type"
+                                         text="">
+                        </umb-radiobutton>
 
                         <label for="protectionTypeMember" class="flex flex-column flex-auto">
                             <strong class="pa-access-header bold"><localize key="publicAccess_paMembers">Specific members protection</localize></strong>
@@ -28,7 +34,12 @@
                     </div>
 
                     <div class="pa-select-type">
-                        <umb-radiobutton input-id="protectionTypeGroup" name="protectionType" value="group" model="vm.type" />
+
+                        <umb-radiobutton input-id="protectionTypeGroup"
+                                         name="protectionType"
+                                         value="group"
+                                         model="vm.type">
+                        </umb-radiobutton>
 
                         <label for="protectionTypeGroup" class="flex flex-column flex-auto">
                             <strong class="pa-access-header bold"><localize key="publicAccess_paGroups">Group based protection</localize></strong>
@@ -47,9 +58,9 @@
                                               allow-remove="true"
                                               on-remove="vm.removeMember(member)">
                             </umb-node-preview>
-                            <a href ng-click="vm.pickMember()" class="umb-node-preview-add" prevent-default>
+                            <button type="button" ng-click="vm.pickMember()" class="umb-node-preview-add">
                                 <localize key="general_add">Add</localize>
-                            </a>
+                            </button>
                         </div>
                     </div>
 
@@ -66,9 +77,9 @@
                                               allow-remove="true"
                                               on-remove="vm.removeGroup(group)">
                             </umb-node-preview>
-                            <a href ng-click="vm.pickGroup()" class="umb-node-preview-add" prevent-default>
+                            <button type="button" ng-click="vm.pickGroup()" class="umb-node-preview-add">
                                 <localize key="general_add">Add</localize>
-                            </a>
+                            </button>
                         </div>
                     </div>
 
@@ -81,15 +92,15 @@
                                         <strong><localize key="publicAccess_paLoginPage">Login Page</localize></strong>
                                         <small><localize key="publicAccess_paLoginPageHelp">Choose the page that contains the login form</localize></small>
                                     </label>
-                                    <a href ng-show="!vm.loginPage" ng-click="vm.pickLoginPage()" class="umb-node-preview-add" prevent-default>
-                                        <localize key="general_add">Add</localize>
-                                    </a>
                                     <umb-node-preview ng-show="vm.loginPage"
                                                       icon="vm.loginPage.icon"
                                                       name="vm.loginPage.name"
                                                       allow-remove="true"
                                                       on-remove="vm.loginPage = null">
                                     </umb-node-preview>
+                                    <button type="button" ng-show="!vm.loginPage" ng-click="vm.pickLoginPage()" class="umb-node-preview-add">
+                                        <localize key="general_add">Add</localize>
+                                    </button>
                                 </div>
                             </div>
                             <div class="control-group umb-control-group">
@@ -98,15 +109,15 @@
                                         <strong><localize key="publicAccess_paErrorPage">Error Page</localize></strong>
                                         <small><localize key="publicAccess_paErrorPageHelp">Used when people are logged on, but do not have access</localize></small>
                                     </label>
-                                    <a href ng-show="!vm.errorPage" ng-click="vm.pickErrorPage()" class="umb-node-preview-add" prevent-default>
-                                        <localize key="general_add">Add</localize>
-                                    </a>
                                     <umb-node-preview ng-show="vm.errorPage"
                                                       icon="vm.errorPage.icon"
                                                       name="vm.errorPage.name"
                                                       allow-remove="true"
                                                       on-remove="vm.errorPage = null">
                                     </umb-node-preview>
+                                    <button type="button" ng-show="!vm.errorPage" ng-click="vm.pickErrorPage()" class="umb-node-preview-add">
+                                        <localize key="general_add">Add</localize>
+                                    </button>
                                 </div>
                             </div>
                         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/sort.html b/src/Umbraco.Web.UI.Client/src/views/content/sort.html
index e6cc58c8be..9f8294d598 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/sort.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/sort.html
@@ -19,21 +19,19 @@
                             <tr>
                                 <th colspan="2">
                                     <button type="button" class="btn-reset" ng-click="vm.sort('name')">
-                                        <b><localize key="general_name">Name</localize></b>
+                                        <strong><localize key="general_name">Name</localize></strong>
                                         <span ng-if="vm.sortOrder.column === 'name'" aria-hidden="true">
-                                            <i ng-if="vm.sortOrder.reverse" class="icon-navigation-up"></i>
-                                            <i ng-if="!vm.sortOrder.reverse" class="icon-navigation-down"></i>
+                                            <i ng-class="{ 'icon-navigation-up': vm.sortOrder.reverse, 'icon-navigation-down': !vm.sortOrder.reverse }"></i>
                                         </span>
                                     </button>
                                 </th>
                                 <th>
                                     <button type="button" class="btn-reset" ng-click="vm.sort('createDate')">
-                                        <b><localize key="sort_sortCreationDate">Creation date</localize></b>
+                                        <strong><localize key="sort_sortCreationDate">Creation date</localize></strong>
                                         <span ng-if="vm.sortOrder.column === 'createDate'" aria-hidden="true">
-                                            <i ng-if="vm.sortOrder.reverse" class="icon-navigation-up"></i>
-                                            <i ng-if="!vm.sortOrder.reverse" class="icon-navigation-down"></i>
+                                            <i ng-class="{ 'icon-navigation-up': vm.sortOrder.reverse, 'icon-navigation-down': !vm.sortOrder.reverse }"></i>
                                         </span>
-                                    </a>
+                                    </button>
                                 </th>
                             </tr>
                         </thead>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.controller.js
index 1837a41edd..cca8a26c9b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.controller.js
@@ -107,6 +107,7 @@
                 view: "views/dashboard/content/overlays/delete.html",
                 redirect: redirect,
                 submitButtonLabelKey: "contentTypeEditor_yesDelete",
+                submitButtonStyle: "danger",
                 submit: function (model) {
                     performDelete(model.redirect);
                     overlayService.close();
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html
index f07b7f5e30..d292b3a9bf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html
@@ -30,24 +30,16 @@
 
             <umb-editor-sub-header-section ng-if="vm.dashboard.urlTrackerDisabled === false">
 
-                <ng-form class="form-search -no-margin-bottom pull-right" novalidate>
+                <ng-form novalidate>
                     <div class="inner-addon left-addon">
-                        <label for="redirect-search" class="form-search__label-icon">
-                            <i class="icon icon-search" aria-hidden="true"></i>
-                            <span class="sr-only">
-                                <localize key="visuallyHiddenTexts_redirectDashboardSearchLabel">Search the redirect dashboard</localize>
-                            </span>
-                        </label>
-                        <input
-                            class="form-control search-input"
-                            type="text"
-                            localize="placeholder"
-                            placeholder="@general_typeToSearch"
-                            ng-model="vm.dashboard.searchTerm"
-                            ng-change="vm.filter()"
-                            id="redirect-search"
-                            prevent-enter-submit
-                            no-dirty-check>
+                        <umb-search-filter
+                            input-id="redirect-search"
+                            model="vm.dashboard.searchTerm"
+                            label-key="general_typeToSearch"
+                            text="Type to search"
+                            on-change="vm.filter()"
+                            prevent-submit-on-enter="true">
+                        </umb-search-filter>
                     </div>
                 </ng-form>
 
@@ -76,7 +68,7 @@
                     {{redirect.culture ||'*'}}
                 </div>
                 <div class="umb-table-cell flx-s1 flx-g1 flx-b4">
-                    <a class="umb-table-body__link" href="{{redirect.originalUrl}}" target="_blank" title="{{redirect.originalUrl}}">{{redirect.originalUrl}}</a>
+                    <a class="umb-table-body__link" href="{{redirect.originalUrl}}" target="_blank" rel="noopener" title="{{redirect.originalUrl}}">{{redirect.originalUrl}}</a>
                 </div>
 
                 <div class="umb-table-cell flx-s0 flx-g0" style="flex-basis: 20px;">
@@ -85,7 +77,7 @@
 
                 <div class="umb-table-cell flx-s1 flx-g1 flx-b5 items-center">
                     <div class="flx-s1 flx-g1 flx-b0" style="margin-right: 20px;">
-                        <a class="umb-table-body__link" href="{{redirect.destinationUrl}}" target="_blank" title="{{redirect.destinationUrl}}">{{redirect.destinationUrl}}</a>
+                        <a class="umb-table-body__link" href="{{redirect.destinationUrl}}" target="_blank" rel="noopener" title="{{redirect.destinationUrl}}">{{redirect.destinationUrl}}</a>
                     </div>
                     <umb-button
                         type="button"
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
index cdabb05fd4..534b60c120 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
@@ -70,7 +70,7 @@ function startUpDynamicContentController($q, $timeout, $scope, dashboardResource
             {
                 title: "Umbraco.TV - Learn from the source!",
                 description: "Umbraco.TV will help you go from zero to Umbraco hero at a pace that suits you. Our easy to follow online training videos will give you the fundamental knowledge to start building awesome Umbraco websites.",
-                img: "views/dashboard/default/umbracotv.jpg",
+                img: "views/dashboard/default/umbracotv.png",
                 url: "https://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=tv",
                 altText: "Umbraco.TV - Hours of Umbraco Video Tutorials",
                 buttonText: "Visit Umbraco.TV"
@@ -78,7 +78,7 @@ function startUpDynamicContentController($q, $timeout, $scope, dashboardResource
             {
                 title: "Our Umbraco - The Friendliest Community",
                 description: "Our Umbraco - the official community site is your one stop for everything Umbraco. Whether you need a question answered or looking for cool plugins, the world's best and friendliest community is just a click away.",
-                img: "views/dashboard/default/ourumbraco.jpg",
+                img: "views/dashboard/default/ourumbraco.png",
                 url: "https://our.umbraco.com/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=our",
                 altText: "Our Umbraco",
                 buttonText: "Visit Our Umbraco"
@@ -109,19 +109,16 @@ function startUpDynamicContentController($q, $timeout, $scope, dashboardResource
             //we capture it like this, so we avoid UI errors - which automatically triggers ui based on http response code
             if (data && data.sections) {
                 vm.dashboard = data;
-            } else{
+            } else {
                 vm.showDefault = true;
             }
-
         },
-
         function (exception) {
             console.error(exception);
             vm.loading = false;
             vm.showDefault = true;
         });
 
-
     onInit();
 
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html
index 17a4dcdb65..330548bedd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html
@@ -35,7 +35,6 @@
     </div>
     <!-- grid container end -->
 
-
     <!-- Default content in case we cannot fetch content from the outside -->
     <div style="max-width: 1200px" ng-if="vm.showDefault">
 
@@ -49,27 +48,27 @@
         </div>
 
         <div class="welcome-dashboard__info-box-boxes">
-            <a ng-href="{{infoBox.url}}" target="_blank" class="welcome-dashboard__info-box" ng-repeat="infoBox in vm.defaultDashboard.infoBoxes">
-                <div class="welcome-dashboard__info-box-title">{{ infoBox.title }}</div>
-                <div class="welcome-dashboard__info-box-description">{{ infoBox.description }}</div>
+            <a ng-href="{{infoBox.url}}" href="" target="_blank" rel="noreferrer" class="welcome-dashboard__info-box" ng-repeat="infoBox in vm.defaultDashboard.infoBoxes">
+                <div class="welcome-dashboard__info-box-title">{{infoBox.title}}</div>
+                <div class="welcome-dashboard__info-box-description">{{infoBox.description}}</div>
             </a>
         </div>
 
         <div class="welcome-dashboard__cards">
             <div class="welcome-dashboard__card" ng-repeat="article in vm.defaultDashboard.articles">
                 <div class="welcome-dashboard__card-image-wrapper">
-                    <a ng-href="{{article.url}}" target="_blank">
-                        <img class="welcome-dashboard__card-image" ng-src="{{article.img}}" alt="{{ article.altText }}" />
+                    <a ng-href="{{article.url}}" href="" target="_blank" rel="noreferrer">
+                        <img class="welcome-dashboard__card-image" ng-src="{{article.img}}" alt="{{article.altText}}" />
                     </a>
                 </div>
                 <div class="welcome-dashboard__card-content">
-                    <h2 class="welcome-dashboard__card-title">{{ article.title }}</h2>
-                    <div class="welcome-dashboard__card-teaser">{{ article.description }}</div>
-                    <a class="btn btn-success" ng-href="{{article.url}}" target="_blank">{{article.buttonText}}</a>
+                    <h2 class="welcome-dashboard__card-title">{{article.title}}</h2>
+                    <div class="welcome-dashboard__card-teaser">{{article.description}}</div>
+                    <a class="button" ng-href="{{article.url}}" href="" target="_blank" rel="noreferrer">{{article.buttonText}}</a>
                 </div>
             </div>
         </div>
 
     </div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardVideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardVideos.html
index 5b42657ddd..43061b4f96 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardVideos.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardVideos.html
@@ -1,5 +1,5 @@
 <h3>Hours of Umbraco training videos are only a click away</h3>
-<p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="https://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos</p>
+<p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="https://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a> for even more Umbraco videos</p>
 
 <h4>To get you started:</h4>
 <div class="row-fluid"
@@ -9,7 +9,7 @@
 	<ul class="thumbnails">
 		<li class="span2" ng-repeat="video in videos">
 	    	<div class="thumbnail" style="margin-right: 20px">
-		    	<a target="_blank" href="{{video.link}}" title="{{video.title}}">
+		    	<a target="_blank" rel="noopener" href="{{video.link}}" title="{{video.title}}">
 		    		<img ng-src="{{video.thumbnail}}"  alt="{{video.title}}">
 		    	</a>
 	    	</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.jpg b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.jpg
deleted file mode 100644
index 5d5324e3de..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.jpg and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.png b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.png
new file mode 100644
index 0000000000..d0fb4e6235
Binary files /dev/null and b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.png differ
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.jpg b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.jpg
deleted file mode 100644
index 22ae3653e2..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.jpg and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.png b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.png
new file mode 100644
index 0000000000..173d2f36d0
Binary files /dev/null and b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.png differ
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
index 64a9c819ab..96d6a3f40a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
@@ -10,7 +10,7 @@
         <ul class="thumbnails" >
             <li class="span2" ng-repeat="video in videos">
                 <div class="thumbnail" style="margin-right: 20px">
-                    <a target="_blank" href="{{video.link}}" title="{{video.title}}">
+                    <a target="_blank" rel="noopener" href="{{video.link}}" title="{{video.title}}">
                         <img ng-src="{{video.thumbnail}}"  alt="{{video.title}}">
                     </a>
                 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
index f1388753a0..fdba8b0925 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
@@ -6,21 +6,21 @@
 		<umb-box-content>
 			<h3 class="bold"><localize key="settingsDashboardVideos_trainingHeadline">Hours of Umbraco training videos are only a click away</localize></h3>
 			<localize key="settingsDashboardVideos_trainingDescription">
-        <p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="http://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos</p>
+        <p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="http://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a> for even more Umbraco videos</p>
       </localize>
 		</umb-box-content>
 	</umb-box>
 
 	<div ng-show="videos.length">
-          <h4><localize key="settingsDashboardVideos_getStarted">To get you started</localize>:</h4>
-            <ul class="thumbnails" >
-                <li class="span2" ng-repeat="video in videos">
-                  <div class="thumbnail" style="margin-right: 20px">
-                      <a target="_blank" href="{{video.link}}" title="{{video.title}}">
-                          <img ng-src="{{video.thumbnail}}"  alt="{{video.title}}">
-                      </a>
-                  </div>
-                </li>
-            </ul>
+        <h4><localize key="settingsDashboardVideos_getStarted">To get you started</localize>:</h4>
+        <ul class="thumbnails" >
+            <li class="span2" ng-repeat="video in videos">
+                <div class="thumbnail" style="margin-right: 20px">
+                    <a target="_blank" rel="noopener" href="{{video.link}}" title="{{video.title}}">
+                        <img ng-src="{{video.thumbnail}}" alt="{{video.title}}">
+                    </a>
+                </div>
+            </li>
+        </ul>
 	</div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html
index 35962be39f..e009bd2f40 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html
@@ -118,7 +118,7 @@
 
                                                 <div class="row form-search">
                                                     <div class="inner-addon left-addon flex">
-                                                        <i class="icon icon-search"></i>
+                                                        <umb-icon icon="icon-search" class="icon icon-search"></umb-icon>
 
                                                         <input type="text" class="search-query"
                                                                placeholder="@placeholders_search"
@@ -258,8 +258,7 @@
 
                                                 <div class="row form-search">
                                                     <div class="inner-addon left-addon flex">
-                                                        <i class="icon icon-search"></i>
-
+                                                        <umb-icon icon="icon-search" class="icon icon-search"></umb-icon>
                                                         <input type="text" class="search-query"
                                                                placeholder="@placeholders_search"
                                                                localize="placeholder"
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementresults.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementresults.html
index 26fa0cb72f..1d735e540f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementresults.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementresults.html
@@ -33,6 +33,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="model.close()">
                 </umb-button>
             </umb-editor-footer-content-right>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html
index a73b5eccd7..4cd15f008c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html
@@ -7,7 +7,7 @@
                 <div class="umb-healthcheck-help-text">
                     <localize key="healthcheck_helpText">
                         <p>The health checker evaluates various areas of your site for best practice settings, configuration, potential problems, etc. You can easily fix problems by pressing a button.
-                            You can add your own health checks, have a look at <a href="https://our.umbraco.com/documentation/Extending/Healthcheck/" target="_blank" class="btn-link -underline">the documentation for more information</a> about custom health checks.</p>
+                            You can add your own health checks, have a look at <a href="https://our.umbraco.com/documentation/Extending/Healthcheck/" target="_blank" rel="noopener" class="btn-link -underline">the documentation for more information</a> about custom health checks.</p>
                     </localize>
                 </div>
                 <div class="umb-panel-group__details-status-actions">
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 0ad88b9894..4216d0a57a 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
@@ -11,19 +11,19 @@
         </h5>
         <ul>
             <li>
-                <localize key="settingsDashboard_bulletPointOne">Read more about working with the items in Settings <a class="btn-link -underline" href="https://our.umbraco.com/documentation/Getting-Started/Backoffice/Sections/" target="_blank">in the Documentation section</a> of Our Umbraco</localize>
+                <localize key="settingsDashboard_bulletPointOne">Read more about working with the items in Settings <a class="btn-link -underline" href="https://our.umbraco.com/documentation/Getting-Started/Backoffice/Sections/" target="_blank" rel="noopener">in the Documentation section</a> of Our Umbraco</localize>
             </li>
             <li>
-                <localize key="settingsDashboard_bulletPointTwo">Ask a question in the <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank">Community Forum</a></localize>
+                <localize key="settingsDashboard_bulletPointTwo">Ask a question in the <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank" rel="noopener">Community Forum</a></localize>
             </li>
             <li>
-                <localize key="settingsDashboard_bulletPointThree">Watch our <a class="btn-link -underline" href="https://umbraco.tv" target="_blank">tutorial videos</a> (some are free, some require a subscription)</localize>
+                <localize key="settingsDashboard_bulletPointThree">Watch our <a class="btn-link -underline" href="https://umbraco.tv" target="_blank" rel="noopener">tutorial videos</a> (some are free, some require a subscription)</localize>
             </li>
             <li>
-                <localize key="settingsDashboard_bulletPointFour">Find out about our <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank">productivity boosting tools and commercial support</a></localize>
+                <localize key="settingsDashboard_bulletPointFour">Find out about our <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank" rel="noopener">productivity boosting tools and commercial support</a></localize>
             </li>
             <li>
-                <localize key="settingsDashboard_bulletPointFive">Find out about real-life <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank">training and certification</a> opportunities</localize>
+                <localize key="settingsDashboard_bulletPointFive">Find out about real-life <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank" rel="noopener">training and certification</a> opportunities</localize>
             </li>
         </ul>
     </umb-box-content>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html
index 96d015f758..3e9c604215 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html
@@ -2,7 +2,7 @@
     <localize key="settingsDashboardVideos_trainingHeadline">Hours of Umbraco training videos are only a click away</localize>
 </h3>
 <localize key="settingsDashboardVideos_trainingDescription">
-    <p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="http://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos</p>
+    <p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="http://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a> for even more Umbraco videos</p>
 </localize>
 
 <div class="row-fluid" 
@@ -16,7 +16,7 @@
         <ul class="thumbnails" >
             <li class="span2" ng-repeat="video in videos">
                 <div class="thumbnail" style="margin-right: 20px">
-                    <a target="_blank" href="{{video.link}}" title="{{video.title}}">
+                    <a target="_blank" rel="noopener" href="{{video.link}}" title="{{video.title}}">
                         <img ng-src="{{video.thumbnail}}"  alt="{{video.title}}">
                     </a>
                 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js
index 15e1a9402e..11c12392f6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js
@@ -21,17 +21,18 @@ function DataTypeCreateController($scope, $location, navigationService, dataType
     }
 
     $scope.createContainer = function () {
-        if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm })) {
+        if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createFolderForm })) {
             dataTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) {
 
                 navigationService.hideMenu();
                 var currPath = node.path ? node.path : "-1";
                 navigationService.syncTree({ tree: "datatypes", path: currPath + "," + folderId, forceReload: true, activate: true });
 
-                formHelper.resetForm({ scope: $scope });
+                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm });
 
             }, function(err) {
 
+                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm, hasErrors: true });
                // TODO: Handle errors
             });
         };
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html
index 55039831ac..9440d896a5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html
@@ -1,21 +1,21 @@
 <div ng-controller="Umbraco.Editors.DataType.CreateController">
     <div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
 
-        <div class="umb-pane" ng-if="!model.creatingFolder">
+        <div class="umb-pane" ng-show="!model.creatingFolder">
             <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
 
-            <ul class="umb-actions umb-actions-child">           
+            <ul class="umb-actions umb-actions-child">
                 <li data-element="action-data-type" class="umb-action">
-                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="createDataType()" umb-auto-focus>
-                        <i class="large icon icon-autofill"></i>
+                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createDataType()" umb-auto-focus>
+                        <i class="large icon icon-autofill" aria-hidden="true"></i>
                         <span class="menu-label">
                             <localize key="create_newDataType">New data type</localize>
                         </span>
                     </button>
                 </li>
                 <li data-element="action-folder" class="umb-action">
-                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
-                        <i class="large icon icon-folder"></i>
+                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
+                        <i class="large icon icon-folder" aria-hidden="true"></i>
                         <span class="menu-label">
                             <localize key="create_newFolder">New folder</localize>...
                         </span>
@@ -24,7 +24,7 @@
             </ul>
         </div>
 
-        <div class="umb-pane" ng-if="model.creatingFolder">
+        <div class="umb-pane" ng-show="model.creatingFolder">
             <form novalidate name="createFolderForm"
                 ng-submit="createContainer()"
                 val-form-manager>
@@ -40,7 +40,7 @@
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
-        <button class="btn btn-info" ng-click="close()">
+        <button type="button" class="btn btn-info" ng-click="close()">
             <localize key="buttons_somethingElse">Do something else</localize>
         </button>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
index 66983bbc05..a2af8c8239 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
@@ -128,6 +128,7 @@ function DataTypeEditController($scope, $routeParams, appState, navigationServic
 
                 }, function(err) {
 
+                    formHelper.resetForm({ scope: $scope, hasErrors: true });
                     //NOTE: in the case of data type values we are setting the orig/new props
                     // to be the same thing since that only really matters for content/media.
                     contentEditingHelper.handleSaveError({
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
index bdce1723a0..952738dcf3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
@@ -106,17 +106,16 @@
 
                         </div>
 
-                        <umb-checkbox model="vm.confirmed" text="{{vm.labels.deleteConfirm}}">
-                        </umb-checkbox>
+                        <umb-checkbox model="vm.confirmed" text="{{vm.labels.deleteConfirm}}"></umb-checkbox>
 
                     </div>
 
 
-                <umb-confirm ng-if="vm.confirmed || vm.hasReferences === false"
-                            on-confirm="vm.performDelete"
-                            on-cancel="vm.cancel"
-                            confirm-button-style="danger"
-                            confirm-label-key="general_delete">
+                <umb-confirm confirm-disabled="!(vm.confirmed || vm.hasReferences === false)"
+                             on-confirm="vm.performDelete"
+                             on-cancel="vm.cancel"
+                             confirm-button-style="danger"
+                             confirm-label-key="general_delete">
                 </umb-confirm>
             </div>
         </ng-switch>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html
index 88a67aaf18..9e628464b2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html
@@ -1,7 +1,7 @@
 <div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.Dictionary.CreateController as vm">
   
   <div class="umb-pane">
-    <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
+    <h5 tabindex="0"><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
   </div>
   
   <div class="umb-pane">
@@ -9,8 +9,10 @@
             ng-submit="vm.createItem()"
             val-form-manager>
 
-          <umb-control-group label="@general_name" hide-label="false">
-              <input type="text" name="itemKey" ng-model="vm.itemKey" class="umb-textstring textstring input-block-level" umb-auto-focus required />
+          <umb-control-group label="@general_name" hide-label="false" alias="itemKey">
+              <input type="text" name="itemKey" id="itemKey" ng-model="vm.itemKey" class="umb-textstring textstring input-block-level"
+                     umb-auto-focus required
+                     maxlength="1000"/>
           </umb-control-group>
 
           <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js
index 82c4e6e7b5..d22738b676 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js
@@ -11,12 +11,11 @@ function DictionaryCreateController($scope, $location, dictionaryResource, navig
     var vm = this;
 
     vm.itemKey = "";
-
     vm.createItem = createItem;
-
+    $scope.$emit("$changeTitle", "");
     function createItem() {
 
-        if (formHelper.submitForm({ scope: $scope, formCtrl: this.createDictionaryForm })) {
+        if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createDictionaryForm })) {
 
             var node = $scope.currentNode;
 
@@ -28,13 +27,14 @@ function DictionaryCreateController($scope, $location, dictionaryResource, navig
                 navigationService.syncTree({ tree: "dictionary", path: currPath + "," + data, forceReload: true, activate: true });
 
                 // reset form state
-                formHelper.resetForm({ scope: $scope });
+                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createDictionaryForm });
 
                 // navigate to edit view
                 var currentSection = appState.getSectionState("currentSection");
                 $location.path("/" + currentSection + "/dictionary/edit/" + data);
 
             }, function (err) {
+                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createDictionaryForm, hasErrors: true });
                 if (err.data && err.data.message) {
                     notificationsService.error(err.data.message);
                     navigationService.hideMenu();
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.edit.controller.js
index ea1ca00b21..416d2c3a65 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.edit.controller.js
@@ -24,9 +24,11 @@ function DictionaryEditController($scope, $routeParams, $location, dictionaryRes
     vm.page.menu.currentNode = null;
     vm.description = "";
     vm.showBackButton = true;
+    vm.maxlength = 1000;
     
     vm.save = saveDictionary;
     vm.back = back;
+    vm.change = change;
   
     function loadDictionary() {
 
@@ -56,6 +58,7 @@ function DictionaryEditController($scope, $routeParams, $location, dictionaryRes
         // create data for  umb-property displaying
         for (var i = 0; i < data.translations.length; i++) {
             data.translations[i].property = createTranslationProperty(data.translations[i]);
+            change(data.translations[i]);
         }
 
         contentEditingHelper.handleSuccessfulSave({
@@ -86,7 +89,7 @@ function DictionaryEditController($scope, $routeParams, $location, dictionaryRes
             dictionaryResource.save(vm.content, vm.nameDirty)
                 .then(function (data) {
 
-                    formHelper.resetForm({ scope: $scope, notifications: data.notifications });
+                        formHelper.resetForm({ scope: $scope });
 
                         bindDictionary(data);
 
@@ -94,6 +97,8 @@ function DictionaryEditController($scope, $routeParams, $location, dictionaryRes
                     },
                     function (err) {
 
+                        formHelper.resetForm({ scope: $scope, hasErrors: true });
+
                         contentEditingHelper.handleSaveError({
                             err: err
                         });
@@ -109,6 +114,13 @@ function DictionaryEditController($scope, $routeParams, $location, dictionaryRes
         $location.path(vm.page.menu.currentSection + "/dictionary/list");
     }
 
+    function change(translation) {
+        if (translation.translation) {
+            var charsCount = translation.translation.length;
+            translation.nearMaxLimit = charsCount > Math.max(vm.maxlength * .8, vm.maxlength - 50);
+        }
+    }
+
     $scope.$watch("vm.content.name", function (newVal, oldVal) {
         //when the value changes, we need to set the name dirty
         if (newVal && (newVal !== oldVal) && typeof(oldVal) !== "undefined") {
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js
index 83daa6b243..e55dfd44a1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js
@@ -19,7 +19,7 @@ function DictionaryListController($scope, $location, dictionaryResource, localiz
         dictionaryResource.getList()
             .then(function (data) {
                 vm.items = data;
-                angular.forEach(vm.items, function(item){
+                vm.items.forEach(function(item){
                     item.style = { "paddingLeft": item.level * 10 };
                 });
                 vm.loading = false;
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
index c2b0adec6f..1577af43de 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
@@ -22,8 +22,19 @@
                 <umb-box>
                     <umb-box-content>
                         <p ng-bind-html="vm.description"></p>
-                        <umb-property ng-repeat="translation in vm.content.translations" property="translation.property">
-                            <textarea ng-model="translation.translation"></textarea>
+                        <umb-property ng-repeat="translation in vm.content.translations | orderBy:'displayName'" property="translation.property">
+                            <textarea rows="2" class="autogrow"
+                                      style="width: 100%;"
+                                      ng-model="translation.translation"
+                                      maxlength="1000"
+                                      ng-keyup="vm.change(translation)"
+                                      ng-trim="false"></textarea>
+                            <div class="help" ng-if="translation.nearMaxLimit">
+                                <p tabindex="0">
+                                    <span class="sr-only">{{ translation.displayName }} </span>
+                                    <localize key="textbox_characters_left" tokens="[vm.maxlength - translation.translation.length]" watch-tokens="true">%0% characters left.</localize>
+                                </p>
+                            </div>
                         </umb-property>
                     </umb-box-content>
                 </umb-box>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
index dfb126cc8e..de7beae0cc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
@@ -4,7 +4,7 @@
     </umb-load-indicator>
 
     <umb-editor-view ng-if="!vm.loading">
-        <umb-editor-header 
+        <umb-editor-header
             name="vm.title"
             hide-alias="true"
             hide-description="true"
@@ -24,20 +24,25 @@
             </umb-box>
 
             <table class="table table-hover" ng-if="vm.items.length > 0">
+                <caption class="sr-only"><localize key="visuallyHiddenTexts_dictionaryListCaption"></localize></caption>
                 <thead>
                     <tr>
                         <th><localize key="general_name">Name</localize></th>
-                        <th ng-repeat="column in vm.items[0].translations">{{column.displayName}}</th>
+                        <th ng-repeat="column in vm.items[0].translations | orderBy:'displayName'">{{column.displayName}}</th>
                     </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="item in vm.items track by item.id" ng-click="vm.clickItem(item.id)" style="cursor: pointer;">
-                        <td>
-                            <span class="bold" ng-style="item.style">{{item.name}}</span>
-                        </td>
+                    <tr ng-repeat="item in vm.items | orderBy:'displayName' track by item.id" style="cursor: pointer;">
+                        <th>
+                            <button type="button" ng-style="item.style" class="btn-reset bold" ng-click="vm.clickItem(item.id)">{{item.name}}</button>
+                        </th>
                         <td ng-repeat="column in item.translations">
-                            <i ng-if="column.hasTranslation" class="icon-check color-green"></i>
-                            <i ng-if="!column.hasTranslation" class="icon-alert color-red"></i>
+                            <button type="button" class="btn-reset" ng-click="vm.clickItem(item.id)">
+                                <i ng-if="column.hasTranslation" class="icon-check color-green" aria-hidden="true"></i>
+                                <span ng-if="column.hasTranslation" class="sr-only"><localize key="visuallyHiddenTexts_hasTranslation"></localize></span>
+                                <i ng-if="!column.hasTranslation" class="icon-alert color-red" aria-hidden="true"></i>
+                                <span ng-if="!column.hasTranslation" class="sr-only"><localize key="visuallyHiddenTexts_noTranslation"></localize></span>
+                            </button>
                         </td>
                     </tr>
                 </tbody>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js
index 732aa898a7..23173a404d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js
@@ -11,8 +11,7 @@ function DocumentTypesCreateController($scope, $location, navigationService, con
     $scope.model = {
         allowCreateFolder: $scope.currentNode.parentId === null || $scope.currentNode.nodeType === "container",
         folderName: "",
-        creatingFolder: false,
-        creatingDoctypeCollection: false
+        creatingFolder: false
     };
 
     var disableTemplates = Umbraco.Sys.ServerVariables.features.disabledFeatures.disableTemplates;
@@ -24,15 +23,9 @@ function DocumentTypesCreateController($scope, $location, navigationService, con
         $scope.model.creatingFolder = true;
     };
 
-    $scope.showCreateDocTypeCollection = function () {
-        $scope.model.creatingDoctypeCollection = true;
-        $scope.model.collectionCreateTemplate = !$scope.model.disableTemplates;
-        $scope.model.collectionItemCreateTemplate = !$scope.model.disableTemplates;
-    };
-
     $scope.createContainer = function () {
 
-        if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm })) {
+        if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createFolderForm })) {
 
             contentTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) {
 
@@ -47,66 +40,18 @@ function DocumentTypesCreateController($scope, $location, navigationService, con
                     activate: true
                 });
 
-                formHelper.resetForm({ scope: $scope });
+                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm });
 
                 var section = appState.getSectionState("currentSection");
 
             }, function (err) {
 
+                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm, hasErrors: true });
                 $scope.error = err;
 
             });
         }
-    };
-
-    $scope.createCollection = function () {
-
-        if (formHelper.submitForm({ scope: $scope, formCtrl: this.createDoctypeCollectionForm, statusMessage: "Creating Doctype Collection..." })) {
-
-            // see if we can find matching icons
-            var collectionIcon = "icon-folders", collectionItemIcon = "icon-document";
-            iconHelper.getIcons().then(function (icons) {
-
-                for (var i = 0; i < icons.length; i++) {
-                    // for matching we'll require a full match for collection, partial match for item
-                    if (icons[i].substring(5) == $scope.model.collectionName.toLowerCase()) {
-                        collectionIcon = icons[i];
-                    } else if (icons[i].substring(5).indexOf($scope.model.collectionItemName.toLowerCase()) > -1) {
-                        collectionItemIcon = icons[i];
-                    }
-                }
-
-                contentTypeResource.createCollection(node.id, $scope.model.collectionName, $scope.model.collectionCreateTemplate, $scope.model.collectionItemName, $scope.model.collectionItemCreateTemplate, collectionIcon, collectionItemIcon)
-                    .then(function (collectionData) {
-
-                        navigationService.hideMenu();
-                        $location.search('create', null);
-                        $location.search('notemplate', null);
-
-                        formHelper.resetForm({
-                            scope: $scope
-                        });
-
-                        var section = appState.getSectionState("currentSection");
-
-                        // redirect to the item id
-                        $location.path("/" + section + "/documenttypes/edit/" + collectionData.containerId);
-
-                    }, function (err) {
-
-                        $scope.error = err;
-
-                        //show any notifications
-                        if (Utilities.isArray(err.data.notifications)) {
-                            for (var i = 0; i < err.data.notifications.length; i++) {
-                                notificationsService.showNotification(err.data.notifications[i]);
-                            }
-                        }
-                    });
-            });
-        }
-
-    };
+    };   
 
     // Disabling logic for creating document type with template if disableTemplates is set to true
     if (!disableTemplates) {
@@ -125,6 +70,22 @@ function DocumentTypesCreateController($scope, $location, navigationService, con
         navigationService.hideMenu();
     };
 
+    $scope.createComposition = function () {
+        $location.search('create', null);
+        $location.search('notemplate', null);
+        $location.search('iscomposition', null);
+        $location.path("/settings/documenttypes/edit/" + node.id).search("create", "true").search("notemplate", "true").search("iscomposition", "true");
+        navigationService.hideMenu();
+    };
+
+    $scope.createElement = function () {
+        $location.search('create', null);
+        $location.search('notemplate', null);
+        $location.search('iselement', null);
+        $location.path("/settings/documenttypes/edit/" + node.id).search("create", "true").search("notemplate", "true").search("iselement", "true");
+        navigationService.hideMenu();
+    };
+
     $scope.close = function() {
         const showMenu = true;
         navigationService.hideDialog(showMenu);
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
index 5aba520b9b..208b4eaeda 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
@@ -1,50 +1,63 @@
 <div ng-controller="Umbraco.Editors.DocumentTypes.CreateController">
-
     <div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
-
-        <div class="umb-pane" ng-if="!model.creatingFolder && !model.creatingDoctypeCollection">
+        <div class="umb-pane" ng-show="!model.creatingFolder">
             <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
 
             <ul class="umb-actions umb-actions-child">
                 <li data-element="action-documentType" class="umb-action" ng-hide="model.disableTemplates">
-                    <button href="" ng-click="createDocType()" class="umb-action-link umb-outline btn-reset" umb-auto-focus>
-                        <i class="large icon icon-item-arrangement"></i>
+                    <button type="button" ng-click="createDocType()" class="umb-action-link umb-outline btn-reset" umb-auto-focus>
+                        <i class="large icon icon-document" aria-hidden="true"></i>
                         <span class="menu-label">
-                            <localize key="content_documentType">Document type</localize>
+                            <localize key="create_documentTypeWithTemplate">Document Type with Template</localize>
+                            <small><localize key="create_documentTypeWithTemplateDescription">The data definition for a content page that can be created by editors in the content tree and is directly accessible via a URL.</localize></small>
                         </span>
                     </button>
                 </li>
                 <li data-element="action-documentTypeWithoutTemplate" class="umb-action">
-                    <button href="" ng-click="createComponent()" class="umb-action-link umb-outline btn-reset">
-                        <i class="large icon icon-item-arrangement"></i>
+                    <button type="button" ng-click="createComponent()" class="umb-action-link umb-outline btn-reset">
+                        <i class="large icon icon-item-arrangement" aria-hidden="true"></i>
                         <span class="menu-label">
-                            <localize ng-if="model.disableTemplates === false" key="create_documentTypeWithoutTemplate"></localize>
-                            <localize ng-if="model.disableTemplates === true" key="content_documentType">Document type></localize>
+                            <localize key="create_documentType">Document Type</localize>
+                            <small><localize key="create_documentTypeDescription">The data definition for a content component that can be created by editors in the content tree and be picked on other pages but has no direct URL.</localize></small>
                         </span>
                     </button>
                 </li>
-                <li data-element="action-documentTypeCollection" class="umb-action">
-                    <button href="" ng-click="showCreateDocTypeCollection()" class="umb-action-link umb-outline btn-reset">
-                        <i class="large icon icon-thumbnail-list"></i>
+                <li data-element="action-documentTypeWithIsElementTypeChecked" class="umb-action">
+                    <button type="button" ng-click="createElement()" class="umb-action-link umb-outline btn-reset" umb-auto-focus>
+                        <i class="large icon icon-science" aria-hidden="true"></i>
                         <span class="menu-label">
-                            Document Type Collection...
-                            <!--<localize key="content_documentType_collection">Document Type Collection</localize>-->
+                            <localize key="create_elementType">Element Type</localize>
+                            <small><localize key="create_elementTypeDescription">Defines the schema for a repeating set of properties, for example, in a 'Block List' or 'Nested Content' property editor.</localize></small>
+                        </span>
+                    </button>
+                </li>
+                <li data-element="action-documentTypeWithoutTemplateForComposition" class="umb-action">
+                    <button type="button" ng-click="createComposition()" class="umb-action-link umb-outline btn-reset">
+                        <i class="large icon icon-defrag" aria-hidden="true"></i>
+                        <span class="menu-label">
+                            <localize key="create_composition">Composition</localize>
+                            <small><localize key="create_compositionDescription">Defines a re-usable set of properties that can be included in the definition of multiple other Document Types. For example, a set of 'Common Page Settings'.</localize></small>
                         </span>
                     </button>
                 </li>
                 <li data-element="action-folder" ng-if="model.allowCreateFolder" class="umb-action">
-                    <button href="" ng-click="showCreateFolder()" class="umb-action-link umb-outline btn-reset">
-                        <i class="large icon icon-folder"></i>
-                        <span class="menu-label"><localize key="general_folder"></localize>...</span>
+                    <button type="button" ng-click="showCreateFolder()" class="umb-action-link umb-outline btn-reset">
+                        <i class="large icon icon-folder" aria-hidden="true"></i>
+                        <span class="menu-label">
+                            <localize key="create_folder">Folder</localize>
+                            <small>
+                                <localize key="create_folderDescription">Used to organise the Document Types, Compositions and Element Types created in this Document Type tree.</localize>
+                            </small>
+                        </span>
                     </button>
                 </li>
             </ul>
         </div>
 
-        <div class="umb-pane" ng-if="model.creatingFolder">
+        <div class="umb-pane" ng-show="model.creatingFolder">
             <form novalidate name="createFolderForm"
-                ng-submit="createContainer()"
-                val-form-manager>
+                  ng-submit="createContainer()"
+                  val-form-manager>
 
                 <div ng-show="error">
                     <div class="alert alert-error">
@@ -61,55 +74,11 @@
             </form>
         </div>
 
-        <div class="umb-pane" ng-if="model.creatingDoctypeCollection">
-            <small>
-                A Document Type collection is a fast way to create two Document Types in one task.
-                The Item Document Type will automatically be
-                allowed under the Parent Document Type.
-            </small>
-            <p>&nbsp;</p>
-            <form novalidate name="createDoctypeCollectionForm"
-                ng-submit="createCollection()"
-                val-form-manager>
-
-                <div ng-show="error">
-                    <div class="alert alert-error">
-                        <div><strong>{{error.errorMsg}}</strong></div>
-                        <div>{{error.data.message}}</div>
-                    </div>
-                </div>
-
-                <umb-control-group>
-                    <label for="collectionName" class="control-label">Name of the Parent Document Type</label>
-                    <input type="text" name="collectionName" id="collectionName" ng-model="model.collectionName" maxlength="255" class="umb-textstring textstring input-block-level" umb-auto-focus required />
-
-                    <umb-checkbox ng-if="model.disableTemplates === false"
-                                  name="collectionCreateTemplate"
-                                  model="model.collectionCreateTemplate"
-                                  text="Create template for the Parent Document Type" />
-                </umb-control-group>
-
-                <umb-control-group>
-                    <label for="collectionItemName" class="control-label">Name of the Item Document Type</label>
-                    <input type="text" name="collectionItemName" id="collectionItemName" ng-model="model.collectionItemName" maxlength="255" class="umb-textstring textstring input-block-level" required />
-
-                    <umb-checkbox ng-if="model.disableTemplates === false"
-                                  name="collectionItemCreateTemplate"
-                                  model="model.collectionItemCreateTemplate"
-                                  text="Create template for the Item Document Type" />
-                </umb-control-group>
-
-                <div class="mt3">
-                    <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
-                </div>
-            </form>
+        <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
+            <button class="btn btn-info" ng-click="close(true)">
+                <localize key="buttons_somethingElse">Do something else</localize>
+            </button>
         </div>
-    </div>
 
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
-        <button class="btn btn-info" ng-click="close(true)">
-            <localize key="buttons_somethingElse">Do something else</localize>
-        </button>
     </div>
-
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html
index e7fdf4f96e..3aa3193069 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html
@@ -28,10 +28,9 @@
 
                 <hr />
 
-                <umb-checkbox model="confirmed" text="{{labels.deleteConfirm}}">
-                </umb-checkbox>
+                <umb-checkbox model="confirmed" text="{{labels.deleteConfirm}}"></umb-checkbox>
 
-                <umb-confirm ng-if="confirmed" on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
+                <umb-confirm confirm-disabled="!confirmed" confirm-label-key="delete" on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
                 </umb-confirm>
             </div>
         </ng-switch>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
index ad042842f5..3946d09578 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -9,7 +9,10 @@
 (function () {
     "use strict";
 
-    function DocumentTypesEditController($scope, $routeParams, contentTypeResource, dataTypeResource, editorState, contentEditingHelper, formHelper, navigationService, iconHelper, contentTypeHelper, notificationsService, $q, localizationService, overlayHelper, eventsService, angularHelper, editorService) {
+    function DocumentTypesEditController($scope, $routeParams, $q,
+        contentTypeResource, editorState, contentEditingHelper,
+        navigationService, iconHelper, contentTypeHelper, notificationsService,
+        localizationService, overlayHelper, eventsService, angularHelper, editorService) {
 
         var vm = this;
         var evts = [];
@@ -21,6 +24,7 @@
         var isElement = $routeParams.iselement;
         var allowVaryByCulture = $routeParams.culturevary;
         var infiniteMode = $scope.model && $scope.model.infiniteMode;
+        var documentTypeIcon = "";
 
         vm.save = save;
         vm.close = close;
@@ -172,7 +176,6 @@
                     hotKeyWhenHidden: true,
                     labelKey: vm.submitButtonKey,
                     letter: "S",
-                    type: "submit",
                     handler: function () { vm.save(); }
                 };
                 vm.page.subButtons = [{
@@ -354,11 +357,16 @@
                     // emit event
                     var args = { documentType: vm.contentType };
                     eventsService.emit("editors.documentType.saved", args);
+                    
+                    if (documentTypeIcon !== vm.contentType.icon) {
+                        eventsService.emit("editors.tree.icon.changed", args);
+                    }
 
                     vm.page.saveButtonState = "success";
 
                     if (infiniteMode && $scope.model.submit) {
                         $scope.model.documentTypeAlias = vm.contentType.alias;
+                        $scope.model.documentTypeKey = vm.contentType.key;
                         $scope.model.submit($scope.model);
                     }
 
@@ -386,18 +394,6 @@
 
         function init(contentType) {
 
-            // set all tab to inactive
-            if (contentType.groups.length !== 0) {
-                angular.forEach(contentType.groups, function (group) {
-
-                    angular.forEach(group.properties, function (property) {
-                        // get data type details for each property
-                        getDataTypeDetails(property);
-                    });
-
-                });
-            }
-
             // insert template on new doc types
             if (!noTemplate && contentType.id === 0) {
                 contentType.defaultTemplate = contentTypeHelper.insertDefaultTemplatePlaceholder(contentType.defaultTemplate);
@@ -414,10 +410,12 @@
             // convert icons for content type
             convertLegacyIcons(contentType);
 
-            vm.contentType = contentType;
-
             //set a shared state
-            editorState.set(vm.contentType);
+            editorState.set(contentType);
+
+            vm.contentType = contentType;
+            
+            documentTypeIcon = contentType.icon;
 
             loadButtons();
         }
@@ -431,7 +429,7 @@
                     contentType.defaultTemplate.alias = contentType.alias;
                 }
                 //sync allowed templates that had the placeholder flag
-                angular.forEach(contentType.allowedTemplates, function (allowedTemplate) {
+                contentType.allowedTemplates.forEach(function (allowedTemplate) {
                     if (allowedTemplate.placeholder) {
                         allowedTemplate.name = contentType.name;
                         allowedTemplate.alias = contentType.alias;
@@ -454,16 +452,6 @@
             contentType.icon = contentTypeArray[0].icon;
         }
 
-        function getDataTypeDetails(property) {
-            if (property.propertyState !== "init") {
-                dataTypeResource.getById(property.dataTypeId)
-                    .then(function (dataType) {
-                        property.dataTypeIcon = dataType.icon;
-                        property.dataTypeName = dataType.name;
-                    });
-            }
-        }
-
         /** Syncs the content type  to it's tree node - this occurs on first load and after saving */
         function syncTreeNode(dt, path, initialLoad) {
             const args = { tree: "documenttypes", path: path.split(","), forceReload: initialLoad !== true };
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
index da8dee8e03..b0531d0c0a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
@@ -14,12 +14,9 @@
         /* ----------- SCOPE VARIABLES ----------- */
 
         var vm = this;
-        var childNodeSelectorOverlayTitle = "";
 
         vm.contentTypes = [];
         vm.selectedChildren = [];
-
-        vm.overlayTitle = "";
         vm.showAllowSegmentationOption = Umbraco.Sys.ServerVariables.umbracoSettings.showAllowSegmentationForDocumentTypes || false;
 
         vm.addChild = addChild;
@@ -37,10 +34,6 @@
 
         function init() {
 
-            localizationService.localize("contentTypeEditor_chooseChildNode").then(function(value){
-                childNodeSelectorOverlayTitle = value;
-            });
-
             contentTypeResource.getAll().then(function(contentTypes){
                 vm.contentTypes = _.where(contentTypes, {isElement: false});
 
@@ -65,16 +58,18 @@
         }
 
         function addChild($event) {
-            var childNodeSelectorOverlay = {
+            
+            const dialog = {
                 view: "itempicker",
-                title: childNodeSelectorOverlayTitle,
                 availableItems: vm.contentTypes,
                 selectedItems: vm.selectedChildren,
                 position: "target",
                 event: $event,
-                submit: function(model) {
-                    vm.selectedChildren.push(model.selectedItem);
-                    $scope.model.allowedContentTypes.push(model.selectedItem.id);
+                submit: function (model) {
+                    if (model.selectedItem) {
+                        vm.selectedChildren.push(model.selectedItem);
+                        $scope.model.allowedContentTypes.push(model.selectedItem.id);
+                    }
                     overlayService.close();
                 },
                 close: function() {
@@ -82,8 +77,10 @@
                 }
             };
 
-            overlayService.open(childNodeSelectorOverlay);
-
+            localizationService.localize("contentTypeEditor_chooseChildNode").then(value => {
+                dialog.title = value;
+                overlayService.open(dialog);
+            });
         }
 
         function removeChild(selectedChild, index) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/errors/BootFailed.html b/src/Umbraco.Web.UI.Client/src/views/errors/BootFailed.html
new file mode 100644
index 0000000000..c08627739a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/errors/BootFailed.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Boot Failed</title>
+    <style>
+    @font-face {
+        font-family: Lato;
+        src: local("LatoLatin Regular"), local("LatoLatin-Regular"),
+            url(/umbraco/assets/fonts/lato/LatoLatin-Regular.woff2) format("woff2");
+        font-style: normal;
+        font-weight: 400;
+        font-display: swap;
+        text-rendering: optimizeLegibility;
+    }
+    @font-face {
+        font-family: Lato;
+        src: local("LatoLatin Bold"), local("LatoLatin-Bold"),
+            url(/umbraco/assets/fonts/lato/LatoLatin-Bold.woff2) format("woff2");
+        font-style: normal;
+        font-weight: 700;
+        font-display: swap;
+        text-rendering: optimizeLegibility;
+    }
+    body {
+        background-repeat: no-repeat;
+        background-size: cover;
+        background-position: 50%;
+        background-image: url(/umbraco/assets/img/login.jpg);
+        margin: 0;
+        padding: 0;
+        font-family: Lato, Helvetica Neue, Helvetica, Arial, sans-serif;
+        font-size: 15px;
+        line-height: 20px;
+        color: #000;
+        background-color: #f3f3f5;
+        -webkit-font-smoothing: antialiased;
+        font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
+    }
+    .logo {
+        position: absolute;
+        top: 22px;
+        left: 25px;
+        width: 30px;
+        height: 30px;
+        z-index: 1;
+    }
+    .error-container {
+        display: grid;
+        justify-content: center;
+        align-content: center;
+        height: 100vh;
+    }
+    .error {
+        background: #fff;
+        padding: 30px;
+        max-width: 500px;
+        margin: auto 25px;
+        border-radius: 3px;
+    }
+    .error h1 {
+        font-size: 24px;
+        font-weight: 700;
+        margin-bottom: 20px;
+    }
+    </style>
+</head>
+<body>
+<main class="error-container">
+    <img src="/umbraco/assets/img/application/umbraco_logo_white.svg" class="logo">
+    <div class="error">
+        <h1>Boot Failed</h1>
+        <p>Umbraco failed to boot, if you are the owner of the website please see the log file for more details.</p>
+    </div>
+</main>
+</body>
+</html>
diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/languages/edit.controller.js
index 96441e6101..167c5ffaf5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/languages/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/languages/edit.controller.js
@@ -13,7 +13,6 @@
         vm.labels = {};
         vm.initIsDefault = false;
         vm.showDefaultLanguageInfo = false;
-
         vm.save = save;
         vm.back = back;
         vm.goToPage = goToPage;
@@ -21,7 +20,7 @@
         vm.toggleDefault = toggleDefault;
 
         var currCulture = null;
-
+        
         function init() {
 
             // localize labels
@@ -35,7 +34,8 @@
                 "languages_noFallbackLanguageOption",
                 "languages_fallbackLanguageDescription",
                 "languages_fallbackLanguage",
-                "defaultdialogs_confirmSure"
+                "defaultdialogs_confirmSure",
+                "defaultdialogs_editlanguage"
             ];
 
             localizationService.localizeMany(labelKeys).then(function (values) {
@@ -47,6 +47,7 @@
                 vm.labels.addLanguage = values[5];
                 vm.labels.noFallbackLanguageOption = values[6];
                 vm.labels.areYouSure = values[9];
+                vm.labels.editLanguage = values[10];
 
                 $scope.properties = {
                     fallbackLanguage: {
@@ -58,6 +59,7 @@
 
                 if ($routeParams.create) {
                     vm.page.name = vm.labels.addLanguage;
+                    $scope.$emit("$changeTitle", vm.labels.addLanguage);
                 }
             });
 
@@ -68,7 +70,7 @@
             //load all culture/languages
             promises.push(languageResource.getCultures().then(function (culturesDictionary) {
                 var cultures = [];
-                angular.forEach(culturesDictionary, function (value, key) {
+                Object.entries(culturesDictionary).forEach(function ([key, value]) {
                     cultures.push({
                         name: key,
                         displayName: value
@@ -87,11 +89,11 @@
 
             if (!$routeParams.create) {
 
-                promises.push(languageResource.getById($routeParams.id).then(function (lang) {
+                promises.push(languageResource.getById($routeParams.id).then(function(lang) {
                     vm.language = lang;
 
                     vm.page.name = vm.language.name;
-
+                    $scope.$emit("$changeTitle", vm.labels.editLanguage + ": " + vm.page.name);
                     /* we need to store the initial default state so we can disable the toggle if it is the default.
                     we need to prevent from not having a default language. */
                     vm.initIsDefault = Utilities.copy(vm.language.isDefault);
@@ -161,7 +163,7 @@
 
             }, function (err) {
                 vm.page.saveButtonState = "error";
-
+                formHelper.resetForm({ scope: $scope, hasErrors: true });
                 formHelper.handleError(err);
 
             });
diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js
index 90d418cf77..a64dcc19fd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function LanguagesOverviewController($location, $timeout, navigationService, localizationService, languageResource, eventsService, overlayService) {
+    function LanguagesOverviewController($location, $timeout, navigationService, localizationService, languageResource, eventsService, overlayService,$scope) {
 
         var vm = this;
 
@@ -42,6 +42,7 @@
                 vm.labels.fallsbackTo = values[3];
                 // set page name
                 vm.page.name = vm.labels.languages;
+                $scope.$emit("$changeTitle", vm.labels.languages);
             });
 
             languageResource.getAll().then(function (languages) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/overview.html b/src/Umbraco.Web.UI.Client/src/views/languages/overview.html
index f6ae77ebc4..95cb7c535f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/languages/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/languages/overview.html
@@ -36,9 +36,9 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="language in vm.languages track by language.id" ng-click="vm.editLanguage(language)" style="cursor: pointer;">
+                    <tr ng-repeat="language in vm.languages | orderBy:'name' track by language.id" ng-click="vm.editLanguage(language)" style="cursor: pointer;">
                         <td>
-                            <i class="icon-globe" style="color: #BBBABF; margin-right: 5px;"></i>
+                           <umb-icon icon="icon-globe" class="language-icon"></umb-icon>
                             <span>{{ language.name }}</span>
                         </td>
                         <td>
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
index 0136d6ecb7..d5b4a7ba24 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.controller.js
@@ -13,16 +13,32 @@
         vm.commonLogMessagesCount = 10;
         vm.dateRangeLabel = "";
 
+        vm.config = {
+            enableTime: false,
+            dateFormat: "Y-m-d",
+            time_24hr: false,
+            mode: "range",
+            maxDate: "today",
+            conjunction: " to "
+        };
+
         // ChartJS Options - for count/overview of log distribution
         vm.logTypeLabels = ["Debug", "Info", "Warning", "Error", "Fatal"];
         vm.logTypeData = [0, 0, 0, 0, 0];
-        vm.logTypeColors = ['#eaddd5', '#2bc37c', '#3544b1', '#ff9412', '#d42054'];
+        vm.logTypeColors = ['#2e8aea', '#2bc37c', '#ff9412', '#d42054', '#343434'];
         vm.chartOptions = {
             legend: {
                 display: true,
                 position: 'left'
             }
         };
+
+        // Functions
+        vm.searchLogQuery = searchLogQuery;
+        vm.findMessageTemplate = findMessageTemplate;
+        vm.searchErrors = searchErrors;
+        vm.showMore = showMore;
+        vm.dateRangeChange = dateRangeChange;
         
         let querystring = $location.search();
         if (querystring.startDate) {
@@ -47,22 +63,16 @@
 
         vm.period = [vm.startDate, vm.endDate];
 
-        //functions
-        vm.searchLogQuery = searchLogQuery;
-        vm.findMessageTemplate = findMessageTemplate;
-        vm.searchErrors = searchErrors;
-        vm.showMore = showMore;
-
-        function preFlightCheck(){
+        function preFlightCheck() {
             vm.loading = true;
-            //Do our pre-flight check (to see if we can view logs)
-            //IE the log file is NOT too big such as 1GB & crash the site
+            // Do our pre-flight check (to see if we can view logs)
+            // IE the log file is NOT too big such as 1GB & crash the site
             logViewerResource.canViewLogs(vm.startDate, vm.endDate).then(function (result) {
                 vm.loading = false;
                 vm.canLoadLogs = result;
 
                 if (result) {
-                    //Can view logs - so initalise
+                    // Can view logs - so initialize
                     init();
                 }
             });
@@ -79,7 +89,7 @@
             var savedSearches = logViewerResource.getSavedSearches().then(function (data) {
                     vm.searches = data;
                 },
-                // fallback to some defaults if error from API response
+                // Fallback to some defaults if error from API response
                 function () {
                     vm.searches = [
                         {
@@ -134,7 +144,7 @@
                 vm.logLevelColor = index > -1 ? vm.logTypeColors[index] : '#000';
             });
 
-            //Set loading indicator to false when these 3 queries complete
+            // Set loading indicator to false when these 3 queries complete
             $q.all([savedSearches, numOfErrors, logCounts, commonMsgs, logLevel]).then(function () {
                 vm.loading = false;
             });
@@ -147,6 +157,8 @@
             });
         }
 
+        preFlightCheck();
+
         function searchLogQuery(logQuery) {
             $location.path("/settings/logViewer/search").search({
                 lq: logQuery,
@@ -164,25 +176,12 @@
             return "Log Overview for " + suffix;
         }
       
-        function searchErrors(){
+        function searchErrors() {
             var logQuery = "@Level='Fatal' or @Level='Error' or Has(@Exception)";
             searchLogQuery(logQuery);
         }
 
-        preFlightCheck();
-
-        /////////////////////
-
-        vm.config = {
-            enableTime: false,
-            dateFormat: "Y-m-d",
-            time_24hr: false,
-            mode: "range",
-            maxDate: "today",
-            conjunction: " to "
-        };
-
-        vm.dateRangeChange = function (selectedDates, dateStr, instance) {
+        function dateRangeChange(selectedDates, dateStr, instance) {
 
             if (selectedDates.length > 0) {
 
@@ -192,6 +191,13 @@
                 // is collapsed to a comma.
                 const startDate = selectedDates[0].toIsoDateString();
                 const endDate = selectedDates[selectedDates.length - 1].toIsoDateString(); // Take the last date as end
+
+                // Check if date range has changed
+                if (startDate === vm.period[0] && endDate === vm.period[1]) {
+                    // Same date range
+                    return;
+                }
+
                 $location.path("/settings/logViewer/overview").search({
                     startDate: startDate,
                     endDate: endDate
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
index b58d3c035e..3d5dd7f610 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/overview.html
@@ -7,10 +7,12 @@
             name-locked="true"
             hide-icon="true"
             hide-description="true"
-            hide-alias="true">
+            hide-alias="true"
+            setPageTitle="true">
         </umb-editor-header>
 
         <umb-editor-container>
+
             <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
 
             <!-- Warning message (if unable to view log files) -->
@@ -18,7 +20,7 @@
                 <div class="umb-logviewer__main-content">
                     <div ng-show="!vm.canLoadLogs">
                         <umb-box>
-                            <umb-box-header title="Unable to view logs"/>
+                            <umb-box-header title="Unable to view logs"></umb-box-header>
                             <umb-box-content>
                                 <p>Today's log file is too large to be viewed and would cause performance problems.</p>
                                 <p>If you need to view the log files, try opening them manually</p>
@@ -31,17 +33,20 @@
                             <umb-box-header title="Saved Searches"></umb-box-header>
                             <umb-box-content>
                                 <table>
-                                    <tr>
-                                        <td>
-                                            <a ng-click="vm.searchLogQuery()" title="View all Logs" class="btn btn-link">All Logs <i class="icon-search"></i></a>
-                                        </td>
-                                    </tr>
-                                    <!-- Fetch saved searches  -->
-                                    <tr ng-repeat="search in vm.searches">
-                                        <td>
-                                            <a ng-click="vm.searchLogQuery(search.query)" title="{{search.name}}" class="btn btn-link">{{search.name}} <i class="icon-search"></i></a>
-                                        </td>
-                                    </tr>
+                                    <caption class="sr-only">Saved Searches</caption>
+                                    <tbody>
+                                        <tr>
+                                            <td>
+                                                <button type="button" ng-click="vm.searchLogQuery()" title="View all Logs" class="btn btn-link">All Logs <i class="icon-search" aria-hidden="true"></i></button>
+                                            </td>
+                                        </tr>
+                                        <!-- Fetch saved searches  -->
+                                        <tr ng-repeat="search in vm.searches">
+                                            <td>
+                                                <button type="button" ng-click="vm.searchLogQuery(search.query)" title="{{search.name}}" class="btn btn-link">{{search.name}} <i class="icon-search" aria-hidden="true"></i></button>
+                                            </td>
+                                        </tr>
+                                    </tbody>
                                 </table>
                             </umb-box-content>
                         </umb-box>
@@ -51,18 +56,19 @@
                             <umb-box-header title="Common Log Messages"></umb-box-header>
                             <umb-box-content class="block-form">
                                 <em>Total Unique Message types</em>: {{ vm.commonLogMessages.length }}
-                                <table class="table table-hover">
-                                    <tbody>
-                                        <tr ng-repeat="template in vm.commonLogMessages | limitTo:vm.commonLogMessagesCount" ng-click="vm.findMessageTemplate(template)" style="cursor: pointer;">
-                                            <td>
-                                                {{ template.MessageTemplate }}
-                                            </td>
-                                            <td>
-                                                {{ template.Count }}
-                                            </td>
-                                        </tr>
-                                    </tbody>
-                                </table>
+                            <table class="table table-hover">
+                                <caption class="sr-only">Common Log Messages Total Unique Message types: {{ vm.commonLogMessages.length }}</caption>
+                                <tbody>
+                                    <tr ng-repeat="template in vm.commonLogMessages | limitTo:vm.commonLogMessagesCount" ng-click="vm.findMessageTemplate(template)" style="cursor: pointer;">
+                                        <td>
+                                            {{ template.MessageTemplate }}
+                                        </td>
+                                        <td>
+                                            {{ template.Count }}
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
                                 <umb-button ng-if="vm.commonLogMessagesCount < vm.commonLogMessages.length"
                                             button-style="action"
                                             type="button"
@@ -88,20 +94,20 @@
 
                     <div ng-show=" vm.canLoadLogs">
                         <div class="umb-box-row">
-                        <!-- No of Errors -->                        
+                        <!-- No of Errors -->
                             <umb-box ng-click="vm.searchErrors()" style="cursor:pointer;">
                                 <umb-box-header title="Number of Errors"></umb-box-header>
                                 <umb-box-content class="block-form" style="font-size: 40px; font-weight:900; text-align:center; color:#fe6561;">
                                     {{ vm.numberOfErrors }}
                                 </umb-box-content>
-                            </umb-box>     
-                            
+                            </umb-box>
+
                             <umb-box>
                                 <umb-box-header title="Log level"></umb-box-header>
                                 <umb-box-content class="block-form" style="font-weight:900; text-align:center; color: {{ vm.logLevelColor }}">
                                     {{ vm.logLevel }}
                                 </umb-box-content>
-                            </umb-box>                                                                            
+                            </umb-box>
                         </div>
 
                         <!-- Chart of diff log types -->
@@ -117,8 +123,8 @@
                                 </canvas>
 
                             </umb-box-content>
-                        </umb-box>                        
-                      
+                        </umb-box>
+
                     </div>
                 </div>
             </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js
index d03f292717..d8f799b18e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function LogViewerSearchController($location, logViewerResource, overlayService) {
+    function LogViewerSearchController($location, $timeout, logViewerResource, overlayService, localizationService) {
 
         var vm = this;
 
@@ -16,11 +16,11 @@
         vm.logLevels = [
             {
                 name: 'Verbose',
-                logTypeColor: ''
+                logTypeColor: 'gray'
             },
             {
                 name: 'Debug',
-                logTypeColor: 'gray'
+                logTypeColor: 'info'
             },
             {
                 name: 'Information',
@@ -28,18 +28,95 @@
             },
             {
                 name: 'Warning',
-                logTypeColor: 'primary'
-            },
-            {
-                name: 'Error',
                 logTypeColor: 'warning'
             },
             {
-                name: 'Fatal',
+                name: 'Error',
                 logTypeColor: 'danger'
+            },
+            {
+                name: 'Fatal',
+                logTypeColor: 'dark'
             }
         ];
 
+        vm.polling = {
+            enabled: false,
+            interval: 0,
+            promise: null,
+            
+            defaultButton: {
+                labelKey: "logViewer_polling",
+                handler: function() {
+                    if (vm.polling.enabled) {
+                        vm.polling.enabled = false;
+                        vm.polling.interval = 0;
+                        vm.polling.defaultButton.icon = null;
+                        vm.polling.defaultButton.labelKey = "logViewer_polling";
+                    }
+                    else {
+                        vm.polling.subButtons[0].handler();
+                    }
+                }
+            },
+            subButtons: [
+                {
+                    labelKey: "logViewer_every2",
+                    handler: function() {
+                        enablePolling(2);
+                    }
+                },
+                {
+                    labelKey: "logViewer_every5",
+                    handler: function() {
+                        enablePolling(5);
+                    }
+                },
+                {
+                    labelKey: "logViewer_every10",
+                    handler: function() {
+                        enablePolling(10);
+                    }
+                },
+                {
+                    labelKey: "logViewer_every20",
+                    handler: function() {
+                        enablePolling(20);
+                    }
+                },
+                {
+                    labelKey: "logViewer_every30",
+                    handler: function() {
+                        enablePolling(30);
+                    }
+                }
+            ]
+
+        }
+
+        function enablePolling(interval) {
+            vm.polling.enabled = true;
+            vm.polling.interval = interval;
+            vm.polling.defaultButton.icon = "icon-axis-rotation fa-spin";
+            vm.polling.defaultButton.labelKey = "logViewer_pollingEvery" + interval;
+
+            if (vm.polling.promise)
+            {
+                $timeout.cancel(vm.polling.promise);
+            }
+            vm.polling.promise = poll(interval);
+        }
+
+        function poll(interval) {
+            vm.polling.promise = $timeout(function() {
+                getLogs(true, true);
+                if (vm.polling.enabled && vm.polling.interval > 0) {
+                    poll(vm.polling.interval);
+                }
+            }, interval*1000);
+        }
+
+
         vm.searches = [];
 
         vm.logItems = {};
@@ -138,11 +215,12 @@
                         "name": "Find all logs that use a specific log message template",
                         "query": "@MessageTemplate = '[Timing {TimingId}] {EndMessage} ({TimingDuration}ms)'"
                     }
-                ]
+                ];
             });
 
             //Get all logs on init load
             getLogs();
+
         }
 
 
@@ -160,10 +238,17 @@
             getLogs();
         }
 
-        function getLogs(){
-            vm.logsLoading = true;
+        function getLogs(hideLoadingIndicator, keepOpenItems){
+            vm.logsLoading = !hideLoadingIndicator;
 
             logViewerResource.getLogs(vm.logOptions).then(function (data) {
+                if (keepOpenItems) {
+                    var openItemTimestamps = vm.logItems.items.filter(item => item.open).map(item => item.Timestamp);
+                    data.items = data.items.map(item => {
+                        item.open = openItemTimestamps.indexOf(item.Timestamp) > -1;
+                        return item;
+                    });
+                }
                 vm.logItems = data;
                 vm.logsLoading = false;
 
@@ -181,7 +266,7 @@
         function getFilterName(array) {
             var name = "All";
             var found = false;
-            angular.forEach(array, function (item) {
+            array.forEach(function (item) {
                 if (item.selected) {
                     if (!found) {
                         name = item.name
@@ -255,9 +340,8 @@
 
         function addToSavedSearches(){
 
-            var overlay = {
+            const overlay = {
                 title: "Save Search",
-                subtitle: "Enter a friendly name for your search query",
                 closeButtonLabel: "Cancel",
                 submitButtonLabel: "Save Search",
                 disableSubmitButton: true,
@@ -266,28 +350,37 @@
                 submit: function (model) {
                     //Resource call with two params (name & query)
                     //API that opens the JSON and adds it to the bottom
-                    logViewerResource.postSavedSearch(model.name, model.query).then(function(data){
+                    logViewerResource.postSavedSearch(model.queryName, model.query).then(function(data){
                         vm.searches = data;
                         overlayService.close();
                     });
                 },
-                close: function() {
-                    overlayService.close();
-                }
+                close: () => overlayService.close()
             };
 
-            overlayService.open(overlay);
+            var labelKeys = [
+                "general_cancel",
+                "logViewer_saveSearch",
+                "logViewer_saveSearchDescription"
+            ];
+
+            localizationService.localizeMany(labelKeys).then(values => {
+                overlay.title = values[1];
+                overlay.subtitle = values[2],
+                overlay.submitButtonLabel = values[1],
+                overlay.closeButtonLabel = values[0],
+
+                overlayService.open(overlay);
+            });
         }
 
         function deleteSavedSearch(searchItem) {
 
-            var overlay = {
+            const overlay = {
                 title: "Delete Saved Search",
-                subtitle: "Are you sure you wish to delete?",
                 closeButtonLabel: "Cancel",
                 submitButtonLabel: "Delete Saved Search",
                 submitButtonStyle: "danger",
-                view: "default",
                 submit: function (model) {
                     //Resource call with two params (name & query)
                     //API that opens the JSON and adds it to the bottom
@@ -296,12 +389,23 @@
                         overlayService.close();
                     });
                 },
-                close: function() {
-                    overlayService.close();
-                }
+                close: () => overlayService.close()
             };
 
-            overlayService.open(overlay);
+            var labelKeys = [
+                "general_cancel",
+                "defaultdialogs_confirmdelete",
+                "logViewer_deleteSavedSearch"
+            ];
+
+            localizationService.localizeMany(labelKeys).then(values => {
+                overlay.title = values[2];
+                overlay.subtitle = values[1];
+                overlay.submitButtonLabel = values[2];
+                overlay.closeButtonLabel = values[0];
+
+                overlayService.open(overlay);
+            });
         }
 
         function back() {
@@ -309,7 +413,6 @@
         }
 
         init();
-
     }
 
     angular.module("umbraco").controller("Umbraco.Editors.LogViewer.SearchController", LogViewerSearchController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
index b4f910fd7b..49e0f9ef2e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
+++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
@@ -2,14 +2,14 @@
 
     <umb-editor-view footer="false">
 
-        <umb-editor-header
-            name="'Log Search'"
-            name-locked="true"
-            on-back="vm.back()"
-            show-back-button="vm.showBackButton"
-            hide-icon="true"
-            hide-description="true"
-            hide-alias="true">
+        <umb-editor-header name="'Log Search'"
+                           name-locked="true"
+                           on-back="vm.back()"
+                           show-back-button="vm.showBackButton"
+                           hide-icon="true"
+                           hide-description="true"
+                           hide-alias="true"
+                           setPageTitle="true">
         </umb-editor-header>
 
         <umb-editor-container>
@@ -21,60 +21,80 @@
                 <umb-editor-sub-header>
                     <umb-editor-sub-header-content-left class="flex-auto flex-wrap">
 
-                        <!-- Log Level filter -->
-                        <div class="flex log-viewer-filter" style="position: relative;">
-                            <button 
-                                type="button" 
-                                class="btn-link dropdown-toggle flex mb2 filter-toggle" 
-                                ng-click="vm.page.showLevelFilter = !vm.page.showLevelFilter"
-                                aria-haspopup="true" 
-                                aria-expanded="{{vm.page.showLevelFilter === undefined ? false : vm.page.showLevelFilter}}"
-                                >
-                                <span>
-                                    <localize key="logViewer_logLevels">Log Levels</localize>:
-                                </span>
-                                <span class="filter-toggle__level truncate">{{ vm.getFilterName(vm.logLevels) }}</span>
-                                <span class="filter-toggle__icon caret" aria-hidden="true"></span>
-                            </button>
-                            <umb-dropdown class="pull-left" ng-if="vm.page.showLevelFilter" on-close="vm.page.showLevelFilter = false;">
-                                <umb-dropdown-item ng-repeat="level in vm.logLevels" class="dropdown-item">
-                                    <div class="flex items-center">
-                                        <umb-checkbox input-id="loglevel-{{$index}}" name="loglevel" model="level.selected" on-change="vm.setLogLevelFilter(level)" />
-                                        <label for="loglevel-{{$index}}">
-                                            <umb-badge size="s" color="{{level.logTypeColor}}">{{level.name}}</umb-badge>
-                                        </label>
-                                    </div>
-                                </umb-dropdown-item>
-                            </umb-dropdown>
-                        </div>
+                        <div class="flex mr-auto mb2">
 
+                            <!-- Log Level filter -->
+                            <div class="umb-filter">
+                                <button type="button"
+                                        class="btn btn-link dropdown-toggle umb-filter__toggle"
+                                        ng-click="vm.page.showLevelFilter = !vm.page.showLevelFilter"
+                                        aria-haspopup="true"
+                                        aria-expanded="{{vm.page.showLevelFilter === undefined ? false : vm.page.showLevelFilter}}">
+
+                                    <span><localize key="logViewer_logLevels">Log Levels</localize>:</span>
+                                    <span class="bold truncate dib umb-filter__label">{{ vm.getFilterName(vm.logLevels) }}</span>
+                                    <span class="caret" aria-hidden="true"></span>
+                                </button>
+                                <umb-dropdown class="pull-left" ng-if="vm.page.showLevelFilter" on-close="vm.page.showLevelFilter = false;">
+                                    <umb-dropdown-item ng-repeat="level in vm.logLevels" class="dropdown-item">
+                                        <div class="flex items-center">
+                                            <umb-checkbox input-id="loglevel-{{$index}}"
+                                                          name="loglevel"
+                                                          model="level.selected"
+                                                          on-change="vm.setLogLevelFilter(level)">
+                                            </umb-checkbox>
+                                            <label for="loglevel-{{$index}}">
+                                                <umb-badge size="s" color="{{level.logTypeColor}}">{{level.name}}</umb-badge>
+                                            </label>
+                                        </div>
+                                    </umb-dropdown-item>
+                                </umb-dropdown>
+                            </div>
+
+                        </div>
+                        <div class="flex">
+                            <!-- Polling Button -->
+                            <umb-button-group default-button="vm.polling.defaultButton"
+                                              sub-buttons="vm.polling.subButtons"
+                                              icon="{{ vm.polling.defaultButton.icon }}"
+                                              direction="down"
+                                              float="right">
+                            </umb-button-group>
+                        </div>
                         <div class="flex search-box">
                             <div class="flex-auto">
                                 <!-- Search/expression filter -->
                                 <input class="form-control search-input" type="text" ng-model="vm.logOptions.filterExpression" placeholder="Search logs..." />
 
                                 <!-- Save Search & Clear Search icon buttons -->
-                                <ins class="icon-rate" ng-show="vm.checkForSavedSearch()" ng-click="vm.addToSavedSearches()">&nbsp;</ins>
-                                <ins class="icon-wrong" ng-show="vm.logOptions.filterExpression" ng-click="vm.resetSearch()">&nbsp;</ins>
+                                <button type="button" class="btn-reset save-search" ng-show="vm.checkForSavedSearch()" ng-click="vm.addToSavedSearches()">
+                                    <umb-icon icon="icon-rate" class="icon-rate"></umb-icon>
+                                    <localize class="sr-only" key="logViewer_saveSearch">Save Search</localize>
+                                </button>
+                                <button type="button" class="btn-reset filter-search" ng-show="vm.logOptions.filterExpression" ng-click="vm.resetSearch()">
+                                    <umb-icon icon="icon-wrong" class="icon-wrong"></umb-icon>
+                                    <localize class="sr-only" key="logViewer_filterSearch">Filter Search</localize>
+                                </button>
 
                                 <!-- Saved Searches -->
-                                <a class="umb-variant-switcher__toggle ng-scope" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen">
-                                    <span class="ng-binding">
-                                        <localize key="logViewer_savedSearches">Saved Searches</localize>
-                                    </span>
-                                    <ins class="umb-variant-switcher__expand icon-navigation-down" ng-class="{'icon-navigation-down': !vm.dropdownOpen, 'icon-navigation-up': vm.dropdownOpen}"></ins>
-                                </a>
+                                <button type="button" class="umb-variant-switcher__toggle" ng-click="vm.dropdownOpen = !vm.dropdownOpen">
+                                    <localize key="logViewer_savedSearches">Saved Searches</localize>
+                                    <umb-icon icon="{{vm.dropdownOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}" class="umb-variant-switcher__expand {{vm.dropdownOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}"></umb-icon>
+                                </button>
 
                                 <!-- Saved Searches Dropdown -->
                                 <umb-dropdown ng-if="vm.dropdownOpen" class="saved-searches" on-close="vm.dropdownOpen = false" umb-keyboard-list>
                                     <umb-dropdown-item class="umb-variant-switcher__item" ng-class="{'umb-variant-switcher_item--current': variant.active}" ng-repeat="search in vm.searches">
-                                        <a href="" class="umb-variant-switcher__name-wrapper" ng-click="vm.selectSearch(search)" prevent-default>
+                                        <button type="button" class="umb-variant-switcher__name-wrapper" ng-click="vm.selectSearch(search)">
                                             <span class="umb-variant-switcher__name">{{search.name}}</span>
-                                            <span>{{ search.query }}</span>
-                                        </a>
-                                        <a href=""><span><i class="icon icon-trash text-error" localize="title" title="@logViewer_deleteThisSearch" ng-click="vm.deleteSavedSearch(search)"></i></span></a>										
+                                            <span>{{search.query}}</span>
+                                        </button>
+                                        <button type="button" class="btn-reset" style="width: auto;" ng-click="vm.deleteSavedSearch(search)" localize="title" title="@logViewer_deleteThisSearch">
+                                            <umb-icon icon="icon-trash" class="icon-trash text-error"></umb-icon>
+                                        </button>
                                     </umb-dropdown-item>
                                 </umb-dropdown>
+
                             </div>
 
                             <!-- Search Button -->
@@ -89,146 +109,147 @@
                 </umb-editor-sub-header>
             </form>
 
-            <div ng-if="!vm.loading" class="log-items">               
+            <div ng-if="!vm.loading" class="log-items">
 
-                    <!-- Loader for the main logs content when paging -->
-                    <umb-load-indicator ng-if="vm.logsLoading"></umb-load-indicator>
+                <!-- Loader for the main logs content when paging -->
+                <umb-load-indicator ng-if="vm.logsLoading"></umb-load-indicator>
 
-                    <!-- Empty states -->
-                    <umb-empty-state ng-if="vm.logItems.totalItems === 0" position="center">
-                        <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
-                    </umb-empty-state>
+                <!-- Empty states -->
+                <umb-empty-state ng-if="vm.logItems.totalItems === 0 && !vm.logsLoading" position="center">
+                    <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
+                </umb-empty-state>
 
-                    <!-- Main Log Table -->
-                    <umb-box data-element="node-info-history" ng-if="!vm.logsLoading && vm.logItems.totalItems > 0">
-                        <umb-box-content class="block-form">
+                <!-- Main Log Table -->
+                <umb-box data-element="node-info-history" ng-if="!vm.logsLoading && vm.logItems.totalItems > 0">
+                    <umb-box-content class="block-form">
 
-                            <div ng-if="vm.logItems.totalItems > 0">
-                                <localize key="logViewer_totalItems">Total Items</localize>: {{ vm.logItems.totalItems }}
-                            </div>
+                        <div ng-if="vm.logItems.totalItems > 0">
+                            <p> <localize key="logViewer_totalItems">Total Items</localize>: {{ vm.logItems.totalItems }}</p>
+                        </div>
 
-                            <table class="table table-hover" ng-if="vm.logItems.totalItems > 0">
-                                <thead>
-                                    <tr>
-                                        <th ng-click="vm.toggleOrderBy()">
-                                            <localize key="logViewer_timestamp">Timestamp</localize>
-                                            <ins class="icon-navigation-down" ng-class="{'icon-navigation-down': vm.logOptions.orderDirection === 'Descending', 'icon-navigation-up': vm.logOptions.orderDirection !== 'Descending'}">&nbsp;</ins>
-                                        </th>
-                                        <th><localize key="logViewer_level">Level</localize></th>
-                                        <th><localize key="logViewer_machine">Machine</localize></th>
-                                        <th><localize key="logViewer_message">Message</localize></th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr ng-repeat-start="log in vm.logItems.items" ng-click="log.open = !log.open">
-                                        <td>{{ log.Timestamp | date:'medium' }}</td>
-                                        <td><umb-badge size="s" color="{{ log.logTypeColor }}">{{ log.Level }}</umb-badge></td>
-                                        <td><small>{{ log.Properties.MachineName.Value }}</small></td>
-                                        <td>{{ log.RenderedMessage }}</td>
-                                    </tr>
+                        <table class="table table-hover" ng-if="vm.logItems.totalItems > 0">
+                            <caption class="sr-only">Logs <localize key="logViewer_totalItems">Total Items</localize>: {{ vm.logItems.totalItems }}</caption>
+                            <thead>
+                            <tr>
+                                <th ng-click="vm.toggleOrderBy()">
+                                    <localize key="logViewer_timestamp">Timestamp</localize>
+                                    <umb-icon icon="{{vm.logOptions.orderDirection === 'Descending' ? 'icon-navigation-down' : 'icon-navigation-up'}}" class="icon-navigation-down" ng-class="{'icon-navigation-down': vm.logOptions.orderDirection === 'Descending', 'icon-navigation-up': vm.logOptions.orderDirection !== 'Descending'}">&nbsp;</umb-icon>
+                                </th>
+                                <th><localize key="logViewer_level">Level</localize></th>
+                                <th><localize key="logViewer_machine">Machine</localize></th>
+                                <th><localize key="logViewer_message">Message</localize></th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr ng-repeat-start="log in vm.logItems.items" ng-click="log.open = !log.open">
+                                <td>{{ log.Timestamp | date:'medium' }}</td>
+                                <td><umb-badge size="s" color="{{ log.logTypeColor }}">{{ log.Level }}</umb-badge></td>
+                                <td><small>{{ log.Properties.MachineName.Value }}</small></td>
+                                <td>{{ log.RenderedMessage }}</td>
+                            </tr>
 
-                                    <!-- Log Details (Exception & Properties) -->
-                                    <tr ng-repeat-end ng-if="log.open">
-                                        <td colspan="4">
-                                            <div ng-if="log.Exception"class="exception">
-                                                <h3 class="text-error"><localize key="logViewer_exception">Exception</localize></h3>
-                                                <p class="exception-message">{{ log.Exception }}</p>
-                                            </div>
+                                <!-- Log Details (Exception & Properties) -->
+                                <tr ng-repeat-end ng-if="log.open">
+                                    <td colspan="4">
+                                        <div ng-if="log.Exception" class="exception">
+                                            <h3 class="text-error"><localize key="logViewer_exception">Exception</localize></h3>
+                                            <p class="exception-message">{{log.Exception}}</p>
+                                        </div>
 
-                                            <h3><localize key="logViewer_properties">Properties</localize></h3>
-                                            <table class="table">
-                                                <tbody>
-                                                    <tr>
-                                                        <th><localize key="logViewer_timestamp">Timestamp</localize></th>
-                                                        <td>{{log.Timestamp}}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <th>@MessageTemplate</th>
-                                                        <td>{{log.MessageTemplateText}}</td>
-                                                    </tr>
-                                                    <tr ng-repeat="(key, val) in log.Properties">
-                                                        <th>{{key}}</th>
-                                                        <td ng-switch on="key">
-                                                            <a ng-switch-when="HttpRequestNumber" ng-click="vm.findItem(key, val.Value)" localize="title" title="@logViewer_findLogsWithRequestId">{{val.Value}} <i class="icon-search"></i></a>
-                                                            <a ng-switch-when="SourceContext" ng-click="vm.findItem(key, val.Value)" localize="title" title="@logViewer_findLogsWithNamespace">{{val.Value}} <i class="icon-search"></i></a>
-                                                            <a ng-switch-when="MachineName" ng-click="vm.findItem(key, val.Value)" localize="title" title="@logViewer_findLogsWithMachineName">{{val.Value}} <i class="icon-search"></i></a>
-                                                            <a ng-switch-when="RequestUrl" href="{{val.Value}}" target="_blank" rel="noopener" localize="title" title="@logViewer_Open">{{val.Value}} <i class="icon-link"></i></a>																												
-                                                            <span ng-switch-default>{{val.Value}}</span>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
+                                        <h3><localize key="logViewer_properties">Properties</localize></h3>
+                                        <table class="table">
+                                            <caption class="sr-only">{{log.RenderedMessage}} Properties for {{log.Timestamp | date:'medium'}}</caption>
+                                            <tbody>
+                                                <tr>
+                                                    <th scope="row"><localize key="logViewer_timestamp">Timestamp</localize></th>
+                                                    <td>{{log.Timestamp}}</td>
+                                                </tr>
+                                                <tr>
+                                                    <th scope="row">@MessageTemplate</th>
+                                                    <td>{{log.MessageTemplateText}}</td>
+                                                </tr>
+                                                <tr ng-repeat="(key, val) in log.Properties">
+                                                    <th scope="row">{{key}}</th>
+                                                    <td ng-switch on="key">
+                                                        <button type="button" class="btn-reset" ng-switch-when="HttpRequestNumber" ng-click="vm.findItem(key, val.Value)" localize="title" title="@logViewer_findLogsWithRequestId" aria-describedby="{{key}}">{{val.Value}} <i class="icon-search" aria-hidden="true"></i> </button>
+                                                        <button type="button" class="btn-reset" ng-switch-when="SourceContext" ng-click="vm.findItem(key, val.Value)" localize="title" title="@logViewer_findLogsWithNamespace" aria-describedby="{{key}}">{{val.Value}} <i class="icon-search" aria-hidden="true"></i></button>
+                                                        <button type="button" class="btn-reset" ng-switch-when="MachineName" ng-click="vm.findItem(key, val.Value)" localize="title" title="@logViewer_findLogsWithMachineName" aria-describedby="{{key}}">{{val.Value}} <i class="icon-search" aria-hidden="true"></i></button>
+                                                        <button type="button" class="btn-reset" ng-switch-when="RequestUrl" href="{{val.Value}}" target="_blank" rel="noopener" localize="title" title="@logViewer_Open" aria-describedby="{{key}}">{{val.Value}} <i class="icon-link" aria-hidden="true"></i></button>
+                                                        <span ng-switch-default>{{val.Value}}</span>
+                                                    </td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
 
-                                            <div class="btn-group" deep-blur="log.searchDropdownOpen = !log.searchDropdownOpen">
-                                                <button 
-                                                    type="button" 
+                                        <div class="btn-group" deep-blur="log.searchDropdownOpen = !log.searchDropdownOpen">
+                                            <button type="button"
                                                     class="btn btn-info dropdown-toggle"
                                                     aria-haspopup="true"
                                                     aria-expanded="{{log.searchDropdownOpen === undefined ? false : log.searchDropdownOpen}}"
                                                     ng-click="log.searchDropdownOpen = !log.searchDropdownOpen">
-                                                        <i class="icon-search" aria-hidden="true"></i> 
-                                                        <localize key="general_search">Search</localize>
-                                                        <span class="caret" aria-hidden="true"></span>
-                                                </button>
+                                                <umb-icon icon="icon-search" class="icon-search"></umb-icon>
+                                                <localize key="general_search">Search</localize>
+                                                <span class="caret" aria-hidden="true"></span>
+                                            </button>
 
-                                                <umb-dropdown ng-if="log.searchDropdownOpen" on-close="log.searchDropdownOpen = false">
-                                                    <umb-dropdown-item>
-                                                        <a ng-href="https://www.google.com/search?q={{ log.RenderedMessage }}" target="_blank" localize="title" title="@logViewer_searchThisMessageWithGoogle">
-                                                            <img src="https://www.google.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchWithGoogle">Search With Google</localize>
-                                                        </a>
-                                                    </umb-dropdown-item>
+                                            <umb-dropdown ng-if="log.searchDropdownOpen" on-close="log.searchDropdownOpen = false">
+                                                <umb-dropdown-item>
+                                                    <a ng-href="https://www.google.com/search?q={{ log.RenderedMessage }}" href="" target="_blank" rel="noopener" localize="title" title="@logViewer_searchThisMessageWithGoogle">
+                                                        <img src="https://www.google.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchWithGoogle">Search With Google</localize>
+                                                    </a>
+                                                </umb-dropdown-item>
 
-                                                    <umb-dropdown-item>
-                                                        <a ng-href="https://www.bing.com/search?q={{ log.RenderedMessage }}" target="_blank" localize="title" title="@logViewer_searchThisMessageWithBing">
-                                                            <img src="https://www.bing.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchWithBing">Search With Bing</localize>
-                                                        </a>
-                                                    </umb-dropdown-item>
+                                                <umb-dropdown-item>
+                                                    <a ng-href="https://www.bing.com/search?q={{ log.RenderedMessage }}" href="" target="_blank" rel="noopener" localize="title" title="@logViewer_searchThisMessageWithBing">
+                                                        <img src="https://www.bing.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchWithBing">Search With Bing</localize>
+                                                    </a>
+                                                </umb-dropdown-item>
 
-                                                    <umb-dropdown-item>
-                                                        <a ng-href="https://our.umbraco.com/search?q={{ log.RenderedMessage }}&content=wiki,forum,documentation" target="_blank" localize="title" title="@logViewer_searchThisMessageOnOurUmbracoForumsAndDocs">
-                                                            <img src="https://our.umbraco.com/assets/images/app-icons/favicon.png" width="16" height="16" alt="" /> <localize key="logViewer_searchOurUmbraco">Search Our Umbraco</localize>
-                                                        </a>
-                                                    </umb-dropdown-item>
+                                                <umb-dropdown-item>
+                                                    <a ng-href="https://our.umbraco.com/search?q={{ log.RenderedMessage }}&content=wiki,forum,documentation" href="" target="_blank" rel="noopener" localize="title" title="@logViewer_searchThisMessageOnOurUmbracoForumsAndDocs">
+                                                        <img src="https://our.umbraco.com/assets/images/app-icons/favicon.png" width="16" height="16" alt="" /> <localize key="logViewer_searchOurUmbraco">Search Our Umbraco</localize>
+                                                    </a>
+                                                </umb-dropdown-item>
 
-                                                    <umb-dropdown-item>
-                                                        <a ng-href="https://www.google.co.uk/?q=site:our.umbraco.com {{ log.RenderedMessage }}&safe=off#q=site:our.umbraco.com {{ log.RenderedMessage }} {{ log.Properties['SourceContext'].Value }}&safe=off" target="_blank" localize="title" title="@logViewer_searchOurUmbracoForumsUsingGoogle">
-                                                            <img src="https://www.google.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchOurUmbracoWithGoogle">Search Our Umbraco with Google</localize>
-                                                        </a>
-                                                    </umb-dropdown-item>
+                                                <umb-dropdown-item>
+                                                    <a ng-href="https://www.google.co.uk/?q=site:our.umbraco.com {{ log.RenderedMessage }}&safe=off#q=site:our.umbraco.com {{ log.RenderedMessage }} {{ log.Properties['SourceContext'].Value }}&safe=off" href="" target="_blank" rel="noopener" localize="title" title="@logViewer_searchOurUmbracoForumsUsingGoogle">
+                                                        <img src="https://www.google.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchOurUmbracoWithGoogle">Search Our Umbraco with Google</localize>
+                                                    </a>
+                                                </umb-dropdown-item>
 
-                                                    <umb-dropdown-item>
-                                                        <a ng-href="https://github.com/umbraco/Umbraco-CMS/search?q={{ log.Properties['SourceContext'].Value }}" target="_blank" localize="title" title="@logViewer_searchWithinUmbracoSourceCodeOnGithub">
-                                                            <img src="https://www.github.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchUmbracoSource">Search Umbraco Source</localize>
-                                                        </a>
-                                                    </umb-dropdown-item>
+                                                <umb-dropdown-item>
+                                                    <a ng-href="https://github.com/umbraco/Umbraco-CMS/search?q={{ log.Properties['SourceContext'].Value }}" href="" target="_blank" rel="noopener" localize="title" title="@logViewer_searchWithinUmbracoSourceCodeOnGithub">
+                                                        <img src="https://www.github.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchUmbracoSource">Search Umbraco Source</localize>
+                                                    </a>
+                                                </umb-dropdown-item>
 
-                                                    <umb-dropdown-item>
-                                                        <a ng-href="https://github.com/umbraco/Umbraco-CMS/issues?q={{ log.Properties['SourceContext'].Value }}" target="_blank" localize="title" title="@logViewer_searchUmbracoIssuesOnGithub">
-                                                            <img src="https://www.github.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchUmbracoIssues">Search Umbraco Issues</localize>
-                                                        </a>
-                                                    </umb-dropdown-item>
-                                                </umb-dropdown>
+                                                <umb-dropdown-item>
+                                                    <a ng-href="https://github.com/umbraco/Umbraco-CMS/issues?q={{ log.Properties['SourceContext'].Value }}" href="" target="_blank" rel="noopener" localize="title" title="@logViewer_searchUmbracoIssuesOnGithub">
+                                                        <img src="https://www.github.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchUmbracoIssues">Search Umbraco Issues</localize>
+                                                    </a>
+                                                </umb-dropdown-item>
+                                            </umb-dropdown>
 
-                                            </div>
+                                        </div>
 
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
 
-                            <!-- Pagination -->
-                            <div ng-if="!vm.loading" class="flex justify-center">
-                                <umb-pagination
-                                    ng-if="vm.logItems.totalPages"
-                                    page-number="vm.logItems.pageNumber"
-                                    total-pages="vm.logItems.totalPages"
-                                    on-change="vm.changePageNumber(pageNumber)">
-                                </umb-pagination>
-                            </div>
+                        <!-- Pagination -->
+                        <div ng-if="!vm.loading" class="flex justify-center">
+                            <umb-pagination
+                                ng-if="vm.logItems.totalPages"
+                                            page-number="vm.logItems.pageNumber"
+                                            total-pages="vm.logItems.totalPages"
+                                            on-change="vm.changePageNumber(pageNumber)">
+                            </umb-pagination>
+                        </div>
+
+                    </umb-box-content>
+                </umb-box>
 
-                        </umb-box-content>
-                    </umb-box>
-                
             </div>
 
         </umb-editor-container>
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.controller.js
index 7d4df17277..6fe8c303a0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.controller.js
@@ -36,8 +36,7 @@
         }
 
         function submit() {
-            console.log("model", $scope.model);
-
+            
             if ($scope.model && $scope.model.submit && formHelper.submitForm({scope: $scope})) {
                 $scope.model.submit($scope.model);
             }
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/macros.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/macros.create.controller.js
index e2559741a2..baae8e085a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/macros.create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/macros.create.controller.js
@@ -13,7 +13,7 @@ function MacrosCreateController($scope, $location, macroResource, navigationServ
 
     function createItem() {
 
-        if (formHelper.submitForm({ scope: $scope, formCtrl: this.createMacroForm })) {
+        if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createMacroForm })) {
 
             var node = $scope.currentNode;
 
@@ -25,7 +25,7 @@ function MacrosCreateController($scope, $location, macroResource, navigationServ
                 navigationService.syncTree({ tree: "macros", path: currPath + "," + data, forceReload: true, activate: true });
 
                 // reset form state
-                formHelper.resetForm({ scope: $scope });
+                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createMacroForm });
 
                 // navigate to edit view
                 var currentSection = appState.getSectionState("currentSection");
@@ -33,6 +33,7 @@ function MacrosCreateController($scope, $location, macroResource, navigationServ
 
 
             }, function (err) {
+                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createMacroForm, hasErrors: true });
                 if (err.data && err.data.message) {
                     notificationsService.error(err.data.message);
                     navigationService.hideMenu();
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js
index 3261739d36..127f566995 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js
@@ -33,10 +33,11 @@ function MacrosEditController($scope, $q, $routeParams, macroResource, editorSta
             vm.page.saveButtonState = "busy";
             
             macroResource.saveMacro(vm.macro).then(function (data) {
-                formHelper.resetForm({ scope: $scope, notifications: data.notifications });
+                formHelper.resetForm({ scope: $scope });
                 bindMacro(data);
                 vm.page.saveButtonState = "success";
             }, function (error) {
+                formHelper.resetForm({ scope: $scope, hasErrors: true });
                 contentEditingHelper.handleSaveError({
                     err: error
                 });
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html b/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html
index eada93f497..9825a6f919 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html
@@ -38,10 +38,10 @@
         <umb-box-header title="Editor settings"></umb-box-header>
         <umb-box-content>
             <umb-control-group label="Use in rich text editor and the grid">
-                <umb-toggle checked="model.macro.useInEditor" on-click="model.toggle('useInEditor')" ></umb-toggle>
+                <umb-toggle checked="model.macro.useInEditor" on-click="model.toggle('useInEditor')"></umb-toggle>
             </umb-control-group>
             <umb-control-group label="Render in rich text editor and the grid" ng-if="model.macro.useInEditor">
-                <umb-toggle checked="model.macro.renderInEditor && model.macro.useInEditor"  on-click="model.toggle('renderInEditor')" ></umb-toggle>
+                <umb-toggle checked="model.macro.renderInEditor && model.macro.useInEditor" on-click="model.toggle('renderInEditor')"></umb-toggle>
             </umb-control-group>
         </umb-box-content>
     </umb-box>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html b/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
index 633eccdf62..816ca987f7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
@@ -1,5 +1,5 @@
 <div class="form-horizontal" ng-controller="Umbraco.Editors.Media.Apps.ContentController as vm">
-    <div class="umb-group-panel" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs | filter: { hide : '!' + true } track by group.label">
+    <div class="umb-group-panel" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs | filter: { hide : '!' + true } track by group.id">
 
         <div class="umb-group-panel__header">
             <div>{{ group.label }}</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
index a7ce67fc0b..f41f22a1a9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
@@ -6,10 +6,10 @@
  * @description
  * The controller for the media editor
  */
-function mediaEditController($scope, $routeParams, $q, appState, mediaResource, 
+function mediaEditController($scope, $routeParams, $location, $http, $q, appState, mediaResource, 
     entityResource, navigationService, notificationsService, localizationService, 
     serverValidationManager, contentEditingHelper, fileManager, formHelper, 
-    editorState, umbRequestHelper, $http, eventsService, $location) {
+    editorState, umbRequestHelper, eventsService) {
     
     var evts = [];
     var nodeId = null;
@@ -51,22 +51,24 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
 
         $scope.page.loading = true;
 
-        mediaResource.getScaffold(nodeId, $routeParams.doctype)
-            .then(function (data) {
-                $scope.content = data;
+        mediaResource.getScaffold(nodeId, $routeParams.doctype).then(function (data) {
+            $scope.content = data;
 
-                init();
+            init();
 
-                $scope.page.loading = false;
-
-            });
+            $scope.page.loading = false;
+        }, function () {
+            $scope.page.loading = false;
+        });
     }
     else {
         $scope.page.loading = true;
-        loadMedia()
-            .then(function(){
-                $scope.page.loading = false;
-            });
+
+        loadMedia().then(function(){
+            $scope.page.loading = false;
+        }, function () {
+            $scope.page.loading = false;
+        });
     }
 
     function init() {
@@ -104,12 +106,10 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
             content.apps[0].active = true;
             $scope.appChanged(content.apps[0]);
         }
-        
 
         editorState.set($scope.content);
         
         bindEvents();
-
     }
     
     function bindEvents() {
@@ -124,6 +124,8 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
                 $scope.page.loading = true;
                 loadMedia().then(function() {
                     $scope.page.loading = false;
+                }, function () {
+                    $scope.page.loading = false;
                 });
             }
         }));
@@ -206,6 +208,7 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
 
                 }, function(err) {
 
+                    formHelper.resetForm({ scope: $scope, hasErrors: true });
                     contentEditingHelper.handleSaveError({
                         err: err,
                         rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, err.data)
@@ -261,8 +264,11 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
 
                 $q.resolve($scope.content);
 
-            });
+            }, function (error) {
+                $scope.page.loading = false;
 
+                $q.reject(error);
+            });
     }
 
     $scope.close = function() {
@@ -282,7 +288,7 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
 
     $scope.showBack = function () {
         return !infiniteMode && !!$scope.page.listViewPath;
-    }
+    };
 
     /** Callback for when user clicks the back-icon */
     $scope.onBack = function() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
index 163cee9088..3c9d393c3b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
@@ -105,6 +105,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
                     });
 
                 }, function (err) {
+                    $scope.busy = false;
                     $scope.success = false;
                     $scope.error = err;
                 });
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js
index 8ff9106def..90b597b3c6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js
@@ -22,7 +22,7 @@ function MediaTypesCreateController($scope, $location, navigationService, mediaT
     $scope.createContainer = function () {
         if (formHelper.submitForm({
             scope: $scope,
-            formCtrl: this.createFolderForm
+            formCtrl: $scope.createFolderForm
         })) {
             mediaTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) {
 
@@ -30,11 +30,12 @@ function MediaTypesCreateController($scope, $location, navigationService, mediaT
                 var currPath = node.path ? node.path : "-1";
                 navigationService.syncTree({ tree: "mediatypes", path: currPath + "," + folderId, forceReload: true, activate: true });
 
-                formHelper.resetForm({ scope: $scope });
+                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm });
 
                 var section = appState.getSectionState("currentSection");
 
-            }, function(err) {
+            }, function (err) {
+                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm, hasErrors: true });
                 $scope.error = err;
             });
         };
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
index 4c0b8bb6ae..0fa5aa61c8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
@@ -2,13 +2,13 @@
 
     <div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
 
-        <div class="umb-pane" ng-if="!model.creatingFolder">
+        <div class="umb-pane" ng-show="!model.creatingFolder">
             <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
 
-            <ul class="umb-actions umb-actions-child">           
+            <ul class="umb-actions umb-actions-child">
                 <li class="umb-action">
-                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="createMediaType()" umb-auto-focus>
-                        <i class="large icon icon-item-arrangement"></i>
+                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createMediaType()" umb-auto-focus>
+                        <i class="large icon icon-item-arrangement" aria-hidden="true"></i>
                         <span class="menu-label">
                             <localize key="general_new">New</localize>
                             <localize key="content_mediatype">Media type</localize>
@@ -16,15 +16,15 @@
                     </button>
                 </li>
                 <li class="umb-action">
-                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
-                        <i class="large icon icon-folder"></i>
+                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
+                        <i class="large icon icon-folder" aria-hidden="true"></i>
                         <span class="menu-label"><localize key="general_folder"></localize>...</span>
                     </button>
                 </li>
             </ul>
         </div>
 
-        <div class="umb-pane" ng-if="model.creatingFolder">
+        <div class="umb-pane" ng-show="model.creatingFolder">
             <form novalidate name="createFolderForm"
                 ng-submit="createContainer()"
                 val-form-manager>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html
index fb0c4c3a52..89bf449fb3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html
@@ -24,10 +24,9 @@
 
                 <hr />
 
-                <umb-checkbox model="confirmed" text="{{labels.deleteConfirm}}">
-                </umb-checkbox>
+                <umb-checkbox model="confirmed" text="{{labels.deleteConfirm}}"></umb-checkbox>
 
-                <umb-confirm ng-if="confirmed" on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
+                <umb-confirm confirm-disabled="!confirmed" confirm-label-key="delete" on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
                 </umb-confirm>
             </div>
         </ng-switch>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
index f0745e7f82..ecf2aec30c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
@@ -9,16 +9,17 @@
 (function () {
     "use strict";
 
-    function MediaTypesEditController($scope, $routeParams, mediaTypeResource, 
-        dataTypeResource, editorState, contentEditingHelper, formHelper, 
-        navigationService, iconHelper, contentTypeHelper, notificationsService, 
-        $q, localizationService, overlayHelper, eventsService, angularHelper) {
+    function MediaTypesEditController($scope, $routeParams, $q,
+        mediaTypeResource, editorState, contentEditingHelper, 
+        navigationService, iconHelper, contentTypeHelper, notificationsService,
+        localizationService, overlayHelper, eventsService, angularHelper) {
 
         var vm = this;
         var evts = [];
         var mediaTypeId = $routeParams.id;
         var create = $routeParams.create;
         var infiniteMode = $scope.model && $scope.model.infiniteMode;
+        var mediaTypeIcon = "";
 
         vm.save = save;
         vm.close = close;
@@ -189,7 +190,6 @@
                     hotKeyWhenHidden: true,
                     labelKey: vm.saveButtonKey,
                     letter: "S",
-                    type: "submit",
                     handler: function () { vm.save(); }
                 };
                 vm.page.subButtons = [{
@@ -248,6 +248,7 @@
         });
 
         if (create) {
+            
             vm.page.loading = true;
 
             //we are creating so get an empty data type item
@@ -281,7 +282,7 @@
         function save() {
 
             // only save if there is no overlays open
-            if(overlayHelper.getNumberOfOverlays() === 0) {
+            if (overlayHelper.getNumberOfOverlays() === 0) {
 
                 var deferred = $q.defer();
 
@@ -338,9 +339,13 @@
                     var args = { mediaType: vm.contentType };
                     eventsService.emit("editors.mediaType.saved", args);
 
+                    if (mediaTypeIcon !== vm.contentType.icon) {
+                        eventsService.emit("editors.tree.icon.changed", args);
+                    }
+
                     vm.page.saveButtonState = "success";
 
-                    if(infiniteMode && $scope.model.submit) {
+                    if (infiniteMode && $scope.model.submit) {
                         $scope.model.submit();
                     }
 
@@ -370,18 +375,6 @@
 
         function init(contentType) {
 
-            // set all tab to inactive
-            if (contentType.groups.length !== 0) {
-                angular.forEach(contentType.groups, function (group) {
-
-                    angular.forEach(group.properties, function (property) {
-                        // get data type details for each property
-                        getDataTypeDetails(property);
-                    });
-
-                });
-            }
-
             // convert icons for content type
             convertLegacyIcons(contentType);
 
@@ -389,6 +382,8 @@
             editorState.set(contentType);
 
             vm.contentType = contentType;
+
+            mediaTypeIcon = contentType.icon;
         }
 
         function convertLegacyIcons(contentType) {
@@ -405,18 +400,6 @@
             contentType.icon = contentTypeArray[0].icon;
         }
 
-        function getDataTypeDetails(property) {
-            if (property.propertyState !== "init") {
-
-                dataTypeResource.getById(property.dataTypeId)
-                    .then(function(dataType) {
-                        property.dataTypeIcon = dataType.icon;
-                        property.dataTypeName = dataType.name;
-                    });
-            }
-        }
-
-
         /** Syncs the content type  to it's tree node - this occurs on first load and after saving */
         function syncTreeNode(dt, path, initialLoad) {
             navigationService.syncTree({ tree: "mediatypes", path: path.split(","), forceReload: initialLoad !== true }).then(function(syncArgs) {
@@ -425,7 +408,7 @@
         }
 
         function close() {
-            if(infiniteMode && $scope.model.close) {
+            if (infiniteMode && $scope.model.close) {
                 $scope.model.close();
             }
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js
index 53a098a26e..7ff4793272 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js
@@ -6,7 +6,6 @@
         /* ----------- SCOPE VARIABLES ----------- */
 
         var vm = this;
-        var childNodeSelectorOverlayTitle = "";
 
         vm.mediaTypes = [];
         vm.selectedChildren = [];
@@ -22,10 +21,6 @@
 
         function init() {
 
-            localizationService.localize("contentTypeEditor_chooseChildNode").then(function(value){
-                childNodeSelectorOverlayTitle = value;
-            });
-
             mediaTypeResource.getAll().then(function(mediaTypes){
 
                 vm.mediaTypes = mediaTypes;
@@ -44,23 +39,29 @@
         }
 
         function addChild($event) {
-            var childNodeSelectorOverlay = {
+            
+            var dialog = {
                 view: "itempicker",
-                title: childNodeSelectorOverlayTitle,
                 availableItems: vm.mediaTypes,
                 selectedItems: vm.selectedChildren,
                 position: "target",
                 event: $event,
-                submit: function(model) {
-                    vm.selectedChildren.push(model.selectedItem);
-                    $scope.model.allowedContentTypes.push(model.selectedItem.id);
+                submit: function (model) {
+                    if (model.selectedItem) {
+                        vm.selectedChildren.push(model.selectedItem);
+                        $scope.model.allowedContentTypes.push(model.selectedItem.id);
+                    }
                     overlayService.close();
                 },
                 close: function() {
                     overlayService.close();
                 }
             };
-            overlayService.open(childNodeSelectorOverlay);
+
+            localizationService.localize("contentTypeEditor_chooseChildNode").then(value => {
+                dialog.title = value;
+                overlayService.open(dialog);
+            });
         }
 
         function removeChild(selectedChild, index) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.controller.js
index 635c536816..a2b38ee9bf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.controller.js
@@ -5,6 +5,14 @@
 
         var vm = this;
 
+        vm.hideSystemProperties = function (property) {
+            // hide some specific, known properties by alias
+            if (property.alias === "_umb_id" || property.alias === "_umb_doctype") {
+                return false;
+            }
+            // hide all label properties with the alias prefix "umbracoMember" (e.g. "umbracoMemberFailedPasswordAttempts")
+            return property.view !== "readonlyvalue" || property.alias.startsWith('umbracoMember') === false;
+        }
     }
 
     angular.module("umbraco").controller("Umbraco.Editors.Member.Apps.ContentController", MemberAppContentController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html b/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html
index 29df5ba638..29051cd855 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html
@@ -1,13 +1,13 @@
 <div class="form-horizontal" ng-controller="Umbraco.Editors.Member.Apps.ContentController as vm">
 
-    <div class="umb-group-panel" ng-repeat="group in content.tabs track by group.label">
+    <div class="umb-group-panel" ng-repeat="group in content.tabs track by group.id">
 
         <div class="umb-group-panel__header">
             <div>{{ group.label }}</div>
         </div>
 
         <div class="umb-group-panel__content">
-            <umb-property data-element="property-{{group.alias}}" ng-repeat="property in group.properties | filter: {view:'!readonlyvalue'} | filter: {alias:'!_umb_id'} | filter: {alias:'!_umb_doctype'} track by property.alias" property="property">
+            <umb-property data-element="property-{{group.alias}}" ng-repeat="property in group.properties | filter:vm.hideSystemProperties track by property.alias" property="property">
                 <umb-property-editor model="property"></umb-property-editor>
             </umb-property>
         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/delete.html b/src/Umbraco.Web.UI.Client/src/views/member/delete.html
index a58b2edace..26cd2fc649 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/delete.html
@@ -5,7 +5,7 @@
         	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
         </p>
 
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel">    
+        <umb-confirm on-confirm="performDelete" on-cancel="cancel"  confirm-button-style="danger">    
         </umb-confirm>
 
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
index 3ec76deb8e..25735d5908 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
@@ -6,9 +6,15 @@
  * @description
  * The controller for the member editor
  */
-function MemberEditController($scope, $routeParams, $location, appState, memberResource, entityResource, navigationService, notificationsService, localizationService, serverValidationManager, contentEditingHelper, fileManager, formHelper, editorState, umbRequestHelper, $http) {
+function MemberEditController($scope, $routeParams, $location, $http, $q, appState, memberResource,
+    entityResource, navigationService, notificationsService, localizationService,
+    serverValidationManager, contentEditingHelper, fileManager, formHelper,
+    editorState, umbRequestHelper, eventsService) {
+
+    var evts = [];
 
     var infiniteMode = $scope.model && $scope.model.infiniteMode;
+
     var id = infiniteMode ? $scope.model.id : $routeParams.id;
     var create = infiniteMode ? $scope.model.create : $routeParams.create;
     var listName = infiniteMode ? $scope.model.listname : $routeParams.listName;
@@ -66,53 +72,11 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
 
     }
     else {
-        //so, we usually refernce all editors with the Int ID, but with members we have
-        //a different pattern, adding a route-redirect here to handle this just in case.
-        //(isNumber doesnt work here since its seen as a string)
-        //The reason this might be an INT is due to the routing used for the member list view
-        //but this is now configured to use the key, so this is just a fail safe
-
-        if (id && id.length < 9) {
-
-            entityResource.getById(id, "Member").then(function(entity) {
-                $location.path("/member/member/edit/" + entity.key);
+        $scope.page.loading = true;
+        loadMember()
+            .then(function () {
+                $scope.page.loading = false;
             });
-        }
-        else {
-
-            //we are editing so get the content item from the server
-            memberResource.getByKey(id)
-                .then(function(data) {
-
-                    $scope.content = data;
-
-                    init();
-
-                    if (!infiniteMode) {
-                        var path = buildTreePath(data);
-
-                        //sync the tree (only for ui purposes)
-                        navigationService.syncTree({ tree: "member", path: path.split(",") });
-                    }
-                    //it's the initial load of the editor, we need to get the tree node
-                    // from the server so that we can load in the actions menu.
-                    umbRequestHelper.resourcePromise(
-                        $http.get(data.treeNodeUrl),
-                        'Failed to retrieve data for child node ' + data.key).then(function (node) {
-                            $scope.page.menu.currentNode = node;
-                        });
-
-                    //in one particular special case, after we've created a new item we redirect back to the edit
-                    // route but there might be server validation errors in the collection which we need to display
-                    // after the redirect, so we will bind all subscriptions which will show the server validation errors
-                    // if there are any and then clear them so the collection no longer persists them.
-                    serverValidationManager.notifyAndClearAllSubscriptions();
-
-                    $scope.page.loading = false;
-
-                });
-        }
-
     }
 
     function init() {
@@ -157,6 +121,51 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
 
         editorState.set($scope.content);
 
+        bindEvents();
+    }
+
+    function bindEvents() {
+        //bindEvents can be called more than once and we don't want to have multiple bound events
+        for (var e in evts) {
+            eventsService.unsubscribe(evts[e]);
+        }
+
+        evts.push(eventsService.on("editors.memberType.saved", function (name, args) {
+            // if this member item uses the updated member type we need to reload the member item
+            if (args && args.memberType && args.memberType.key.replace(/-/g, '') === $scope.content.contentType.key) {
+                $scope.page.loading = true;
+                loadMember().then(function () {
+                    $scope.page.loading = false;
+                });
+            }
+        }));
+    }
+
+    /** Syncs the content item to it's tree node - this occurs on first load and after saving */
+    function syncTreeNode(content, path, initialLoad) {
+
+        if (infiniteMode) {
+            return;
+        }
+
+        if (!$scope.content.isChildOfListView) {
+            navigationService.syncTree({ tree: "member", path: path.split(","), forceReload: initialLoad !== true }).then(function (syncArgs) {
+                $scope.page.menu.currentNode = syncArgs.node;
+            });
+        }
+        else if (initialLoad === true) {
+
+            //it's a child item, just sync the ui node to the parent
+            navigationService.syncTree({ tree: "member", path: path.substring(0, path.lastIndexOf(",")).split(","), forceReload: initialLoad !== true });
+
+            //if this is a child of a list view and it's the initial load of the editor, we need to get the tree node 
+            // from the server so that we can load in the actions menu.
+            umbRequestHelper.resourcePromise(
+                $http.get(content.treeNodeUrl),
+                'Failed to retrieve data for child node ' + content.id).then(function (node) {
+                    $scope.page.menu.currentNode = node;
+                });
+        }
     }
 
     /** Just shows a simple notification that there are client side validation issues to be fixed */
@@ -191,24 +200,35 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
 
                     formHelper.resetForm({ scope: $scope });
 
-                    contentEditingHelper.handleSuccessfulSave({
-                        scope: $scope,
-                        savedContent: data,
-                        //specify a custom id to redirect to since we want to use the GUID
-                        redirectId: data.key,
-                        rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, data)
-                    });
+                    // close the editor if it's infinite mode
+                    // submit function manages rebinding changes
+                    if (infiniteMode && $scope.model.submit) {
+                        $scope.model.memberNode = $scope.content;
+                        $scope.model.submit($scope.model);
+                    } else {
+                        // if not infinite mode, rebind changed props etc
+                        contentEditingHelper.handleSuccessfulSave({
+                            scope: $scope,
+                            savedContent: data,
+                            //specify a custom id to redirect to since we want to use the GUID
+                            redirectId: data.key,
+                            rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, data)
+                        });
 
-                    editorState.set($scope.content);
-                    $scope.page.saveButtonState = "success";
+                        editorState.set($scope.content);
 
-                    var path = buildTreePath(data);
+                        var path = buildTreePath(data);
 
-                    //sync the tree (only for ui purposes)
-                    navigationService.syncTree({ tree: "member", path: path.split(","), forceReload: true });
+                        navigationService.syncTree({ tree: "member", path: path.split(",") });
+                        //syncTreeNode($scope.content, data.path);
 
-            }, function (err) {
+                        $scope.page.saveButtonState = "success";
 
+                        init();
+                    }
+
+                }, function(err) {
+                    formHelper.resetForm({ scope: $scope, hasErrors: true });
                     contentEditingHelper.handleSaveError({
                         err: err,
                         rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, err.data)
@@ -225,6 +245,69 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
 
     };
 
+    function loadMember() {
+
+        var deferred = $q.defer();
+
+        //so, we usually reference all editors with the Int ID, but with members we have
+        //a different pattern, adding a route-redirect here to handle this just in case.
+        //(isNumber doesnt work here since its seen as a string)
+        //The reason this might be an INT is due to the routing used for the member list view
+        //but this is now configured to use the key, so this is just a fail safe
+
+        if (id && id.length < 9) {
+
+            entityResource.getById(id, "Member").then(function (entity) {
+                $location.path("/member/member/edit/" + entity.key);
+
+                deferred.resolve($scope.content);
+            }, function () {
+                deferred.reject();
+            });
+        }
+        else {
+
+            //we are editing so get the content item from the server
+            memberResource.getByKey(id)
+                .then(function (data) {
+
+                    $scope.content = data;
+
+                    if (!infiniteMode) {
+                        var path = buildTreePath(data);
+
+                        navigationService.syncTree({ tree: "member", path: path.split(","), forceReload: true });
+                        //syncTreeNode($scope.content, data.path, true);
+                    }
+
+                    //it's the initial load of the editor, we need to get the tree node
+                    // from the server so that we can load in the actions menu.
+                    umbRequestHelper.resourcePromise(
+                        $http.get(data.treeNodeUrl),
+                        'Failed to retrieve data for child node ' + data.key).then(function (node) {
+                            $scope.page.menu.currentNode = node;
+                        });
+
+                    //in one particular special case, after we've created a new item we redirect back to the edit
+                    // route but there might be server validation errors in the collection which we need to display
+                    // after the redirect, so we will bind all subscriptions which will show the server validation errors
+                    // if there are any and then clear them so the collection no longer persists them.
+                    serverValidationManager.notifyAndClearAllSubscriptions();
+
+                    init();
+
+                    $scope.page.loading = false;
+
+                    deferred.resolve($scope.content);
+
+                }, function () {
+                    deferred.reject();
+                });
+        }
+
+        return deferred.promise;
+    }
+
     $scope.appChanged = function (app) {
         $scope.app = app;
 
@@ -235,8 +318,8 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
     }
 
     $scope.showBack = function () {
-        return !!listName;
-    }
+        return !infiniteMode && !!listName;
+    };
 
     /** Callback for when user clicks the back-icon */
     $scope.onBack = function () {
@@ -247,11 +330,17 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
         }
     };
 
-    $scope.export = function() {
+    $scope.export = function () {
         var memberKey = $scope.content.key;
         memberResource.exportMemberData(memberKey);
-    }
+    };
 
+    //ensure to unregister from all events!
+    $scope.$on('$destroy', function () {
+        for (var e in evts) {
+            eventsService.unsubscribe(evts[e]);
+        }
+    });
 }
 
 angular.module("umbraco").controller("Umbraco.Editors.Member.EditController", MemberEditController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.controller.js
index 00c6dfbba8..4602a5aa25 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.controller.js
@@ -88,6 +88,7 @@ function MemberGroupsEditController($scope, $routeParams, appState, navigationSe
 
                 }, function (err) {
 
+                    formHelper.resetForm({ scope: $scope, hasErrors: true });
                     contentEditingHelper.handleSaveError({
                         err: err
                     });
diff --git a/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.html b/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.html
index aafaaa3bd4..63089de20c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.html
@@ -19,7 +19,7 @@
                                setpagetitle="header.setPageTitle">
             </umb-editor-header>
 
-            <umb-editor-container class="form-horizontal">
+            <umb-editor-container>
 
                 <umb-membergroup-node-info ng-if="content"
                                            node="content">
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js
index adf6cbc8a6..d875442827 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js
@@ -31,10 +31,10 @@ function MemberTypesCreateController($scope, $location, navigationService, membe
                 var currPath = node.path ? node.path : "-1";
                 navigationService.syncTree({ tree: "membertypes", path: currPath + "," + folderId, forceReload: true, activate: true });
 
-                formHelper.resetForm({ scope: $scope });
+                formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderForm });
 
             }, function(err) {
-
+                formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderForm, hasErrors: true });
                // TODO: Handle errors
             });
         };
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
index 5964bdb75e..46b51b5f34 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
@@ -5,13 +5,13 @@
 
         <ul class="umb-actions umb-actions-child">
             <li class="umb-action">
-                <button href="" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
-                    <i class="large icon icon-folder"></i>
+                <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
+                    <i class="large icon icon-folder" aria-hidden="true"></i>
                     <span class="menu-label"><localize key="general_folder"></localize></span>
                 </button>
             </li>
             <li class="umb-action">
-                <button href="" class="umb-action-link umb-outline btn-reset" ng-click="createMemberType()">
+                <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createMemberType()">
 
                     <i class="large icon icon-item-arrangement"></i>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html
index d87b6737f4..90ed968da7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html
@@ -13,10 +13,9 @@
 
         <hr />
 
-        <umb-checkbox model="confirmed" text="{{labels.deleteConfirm}}">
-        </umb-checkbox>
+        <umb-checkbox model="confirmed" text="{{labels.deleteConfirm}}"></umb-checkbox>
 
-        <umb-confirm ng-if="confirmed" on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
+        <umb-confirm confirm-disabled="!confirmed" confirm-label-key="delete" on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
         </umb-confirm>
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js
index b2e515e187..53bb4adb9b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js
@@ -9,13 +9,17 @@
 (function () {
     "use strict";
 
-    function MemberTypesEditController($scope, $rootScope, $routeParams, $log, $filter, memberTypeResource, dataTypeResource, editorState, iconHelper, formHelper, navigationService, contentEditingHelper, notificationsService, $q, localizationService, overlayHelper, contentTypeHelper, angularHelper, eventsService) {
+    function MemberTypesEditController($scope, $routeParams, $q,
+        memberTypeResource, editorState, iconHelper,
+        navigationService, contentEditingHelper, notificationsService, localizationService,
+        overlayHelper, contentTypeHelper, angularHelper, eventsService) {
 
         var evts = [];
         var vm = this;
         var infiniteMode = $scope.model && $scope.model.infiniteMode;
-        var memberTypeId = infiniteMode ? $scope.model.id : $routeParams.id;
-        var create = infiniteMode ? $scope.model.create : $routeParams.create;
+        var memberTypeId = $routeParams.id;
+        var create = $routeParams.create;
+        var memberTypeIcon = "";
 
         vm.save = save;
         vm.close = close;
@@ -30,7 +34,20 @@
         vm.page.loading = false;
         vm.page.saveButtonState = "init";
         vm.labels = {};
-        vm.saveButtonKey = infiniteMode ? "buttons_saveAndClose" : "buttons_save";
+        vm.saveButtonKey = "buttons_save";
+        vm.generateModelsKey = "buttons_saveAndGenerateModels";
+
+        onInit();
+
+        function onInit() {
+            // get init values from model when in infinite mode
+            if (infiniteMode) {
+                memberTypeId = $scope.model.id;
+                create = $scope.model.create;
+                vm.saveButtonKey = "buttons_saveAndClose";
+                vm.generateModelsKey = "buttons_generateModelsAndClose";
+            }
+        }
 
         var labelKeys = [
             "general_design",
@@ -94,7 +111,6 @@
                     hotKeyWhenHidden: true,
                     labelKey: vm.saveButtonKey,
                     letter: "S",
-                    type: "submit",
                     handler: function () { vm.save(); }
                 };
                 vm.page.subButtons = [{
@@ -154,7 +170,7 @@
         });
 
         if (create) {
-
+            
             vm.page.loading = true;
 
             //we are creating so get an empty data type item
@@ -166,13 +182,17 @@
 				});
         }
         else {
+            loadMemberType();
+        }
+
+        function loadMemberType() {
 
             vm.page.loading = true;
 
             memberTypeResource.getById(memberTypeId).then(function (dt) {
                 init(dt);
 
-                if(!infiniteMode) {
+                if (!infiniteMode) {
                     syncTreeNode(vm.contentType, dt.path, true);
                 }
 
@@ -180,7 +200,10 @@
             });
         }
 
+        /* ---------- SAVE ---------- */
+
         function save() {
+            
             // only save if there is no overlays open
             if(overlayHelper.getNumberOfOverlays() === 0) {
 
@@ -227,10 +250,19 @@
                     }
                 }).then(function (data) {
                     //success
+
                     if(!infiniteMode) {
                         syncTreeNode(vm.contentType, data.path);
                     }
 
+                    // emit event
+                    var args = { memberType: vm.contentType };
+                    eventsService.emit("editors.memberType.saved", args);
+
+                    if (memberTypeIcon !== vm.contentType.icon) {
+                        eventsService.emit("editors.tree.icon.changed", args);
+                    }
+
                     vm.page.saveButtonState = "success";
 
                     if(infiniteMode && $scope.model.submit) {
@@ -238,6 +270,7 @@
                     }
 
                     deferred.resolve(data);
+
                 }, function (err) {
                     //error
                     if (err) {
@@ -263,18 +296,6 @@
 
         function init(contentType) {
 
-            // set all tab to inactive
-            if (contentType.groups.length !== 0) {
-                angular.forEach(contentType.groups, function (group) {
-
-                    angular.forEach(group.properties, function (property) {
-                        // get data type details for each property
-                        getDataTypeDetails(property);
-                    });
-
-                });
-            }
-
             // convert legacy icons
             convertLegacyIcons(contentType);
 
@@ -283,6 +304,7 @@
 
             vm.contentType = contentType;
 
+            memberTypeIcon = contentType.icon;
         }
 
         function convertLegacyIcons(contentType) {
@@ -298,36 +320,25 @@
 
             // set icon back on contentType
             contentType.icon = contentTypeArray[0].icon;
-
-        }
-
-        function getDataTypeDetails(property) {
-
-            if (property.propertyState !== "init") {
-
-                dataTypeResource.getById(property.dataTypeId)
-					.then(function (dataType) {
-					    property.dataTypeIcon = dataType.icon;
-					    property.dataTypeName = dataType.name;
-					});
-            }
         }
 
         /** Syncs the content type  to it's tree node - this occurs on first load and after saving */
         function syncTreeNode(dt, path, initialLoad) {
-
             navigationService.syncTree({ tree: "membertypes", path: path.split(","), forceReload: initialLoad !== true }).then(function (syncArgs) {
                 vm.currentNode = syncArgs.node;
             });
-
         }
         
         function close() {
-            if(infiniteMode && $scope.model.close) {
+            if (infiniteMode && $scope.model.close) {
                 $scope.model.close();
             }
         }
 
+        evts.push(eventsService.on("app.refreshEditor", function (name, error) {
+            loadMemberType();
+        }));
+
         evts.push(eventsService.on("editors.groupsBuilder.changed", function(name, args) {
             angularHelper.getCurrentForm($scope).$setDirty();
         }));
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
index 63750ff0f2..4a52d7b4d7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
@@ -39,6 +39,23 @@
 
         vm.versionRegex = /^(\d+\.)(\d+\.)(\*|\d+)$/;
 
+        vm.aceOption = {
+            mode: "xml",
+            theme: "chrome",
+            showPrintMargin: false,
+            advanced: {
+                fontSize: '14px',
+                enableSnippets: true,
+                enableBasicAutocompletion: true,
+                enableLiveAutocompletion: false
+            },
+            onLoad: function (_editor) {
+                vm.editor = _editor;
+
+                vm.editor.setValue(vm.package.actions);
+            }
+        };
+
         function onInit() {
 
             if (create) {
@@ -194,7 +211,7 @@
                     vm.package = updatedPackage;
                     vm.buttonState = "success";
 
-                    formHelper.resetForm({ scope: $scope });
+                    formHelper.resetForm({ scope: $scope, formCtrl: editPackageForm });
 
                     if (create) {
                         //if we are creating, then redirect to the correct url and reload
@@ -204,6 +221,7 @@
                     }
 
                 }, function (err) {
+                    formHelper.resetForm({ scope: $scope, formCtrl: editPackageForm, hasErrors: true });
                     formHelper.handleError(err);
                     vm.buttonState = "error";
                 });
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
index 9f91e1d0f7..388af6a096 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
@@ -19,10 +19,10 @@
 
                 <div class="umb-expansion-panel">
 
-                    <div class="umb-expansion-panel__header" ng-click="vm.propertiesOpen = !vm.propertiesOpen">
-                        <div><localize key="packager_packageProperties">Package Properties</localize></div>
-                        <ins class="umb-expansion-panel__expand" ng-class="{'icon-navigation-down': !vm.propertiesOpen, 'icon-navigation-up': vm.propertiesOpen}">&nbsp;</ins>
-                    </div>
+                    <button type="button" aria-expanded="{{vm.propertiesOpen}}" class="btn-reset umb-expansion-panel__header" ng-click="vm.propertiesOpen = !vm.propertiesOpen">
+                        <span><localize key="packager_packageProperties">Package Properties</localize></span>
+                        <umb-icon icon="{{vm.propertiesOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}" class="umb-expansion-panel__expand">&nbsp;</umb-icon>
+                    </button>
 
                     <div class="umb-expansion-panel__content" ng-show="vm.propertiesOpen">
 
@@ -103,10 +103,10 @@
 
                 <div class="umb-expansion-panel">
 
-                    <div class="umb-expansion-panel__header" ng-click="vm.contentOpen = !vm.contentOpen">
-                        <div><localize key="packager_packageContent">Package Content</localize></div>
-                        <ins class="umb-expansion-panel__expand" ng-class="{'icon-navigation-down': !vm.contentOpen, 'icon-navigation-up': vm.contentOpen}">&nbsp;</ins>
-                    </div>
+                    <button type="button" aria-expanded="{{vm.contentOpen}}" class="btn-reset umb-expansion-panel__header" ng-click="vm.contentOpen = !vm.contentOpen">
+                        <span><localize key="packager_packageContent">Package Content</localize></span>
+                        <umb-icon icon="{{vm.contentOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}" class="umb-expansion-panel__expand">&nbsp;</umb-icon>
+                    </button>
 
                     <div class="umb-expansion-panel__content" ng-show="vm.contentOpen">
 
@@ -122,73 +122,81 @@
                                 on-remove="vm.removeContentItem()">
                             </umb-node-preview>
 
-                            <a href=""
-                                ng-if="!vm.package.contentNodeId"
-                                style="margin-bottom: 10px;"
-                                class="umb-node-preview-add"
-                                ng-click="vm.openContentPicker()"
-                                prevent-default>
+                            <button type="button"
+                                    ng-if="!vm.package.contentNodeId"
+                                    style="margin-bottom: 10px;"
+                                    class="umb-node-preview-add"
+                                    ng-click="vm.openContentPicker()">
                                 <localize key="general_add">Add</localize>
-                            </a>
+                            </button>
 
-                                <umb-checkbox model="vm.package.contentLoadChildNodes"
+                            <umb-checkbox model="vm.package.contentLoadChildNodes"
                                                 disabled="!vm.package.contentNodeId"
-                                                text="{{vm.labels.includeAllChildNodes}}" />
+                                            text="{{vm.labels.includeAllChildNodes}}">
+                            </umb-checkbox>
+
                         </umb-control-group>
 
                         <umb-control-group label="@treeHeaders_documentTypes">
                             <div ng-repeat="doctype in ::vm.documentTypes | orderBy:'name'">
-                                    <umb-checkbox model="doctype.selected"
+                                <umb-checkbox model="doctype.selected"
                                                   on-change="vm.selectDocumentType(doctype)"
-                                                  text="{{doctype.name}}" />
+                                                text="{{doctype.name}}">
+                                </umb-checkbox>
                             </div>
                         </umb-control-group>
 
                         <umb-control-group label="@treeHeaders_templates">
                             <div ng-repeat="template in ::vm.templates | orderBy:'name'">
-                                    <umb-checkbox model="template.selected"
-                                                  on-change="vm.selectTemplate(template)"
-                                                  text="{{template.name}}" />
+                                <umb-checkbox model="template.selected"
+                                              on-change="vm.selectTemplate(template)"
+                                                  text="{{template.name}}">
+                                    </umb-checkbox>
                             </div>
                         </umb-control-group>
 
                         <umb-control-group label="@treeHeaders_stylesheets">
                             <div ng-repeat="stylesheet in ::vm.stylesheets | orderBy:'name'">
-                                    <umb-checkbox model="stylesheet.selected"
-                                                  on-change="vm.selectStyleSheet(stylesheet)"
-                                                  text="{{stylesheet.path}}" />
+                                <umb-checkbox model="stylesheet.selected"
+                                              on-change="vm.selectStyleSheet(stylesheet)"
+                                                  text="{{stylesheet.path}}">
+                                    </umb-checkbox>
                             </div>
                         </umb-control-group>
 
                         <umb-control-group label="@treeHeaders_macros">
                             <div ng-repeat="macro in ::vm.macros | orderBy:'name'">
-                                    <umb-checkbox model="macro.selected"
+                                <umb-checkbox model="macro.selected"
                                                   on-change="vm.selectMacro(macro)"
-                                                  text="{{macro.name}}" />
+                                                text="{{macro.name}}">
+                                </umb-checkbox>
                             </div>
                         </umb-control-group>
 
                         <umb-control-group label="@treeHeaders_languages">
                             <div ng-repeat="language in ::vm.languages | orderBy:'name'">
-                                    <umb-checkbox model="language.selected"
+                                <umb-checkbox model="language.selected"
                                                   on-change="vm.selectLanguage(language)"
-                                                  text="{{language.name}}" />
+                                                text="{{language.name}}">
+                                </umb-checkbox>
                             </div>
                         </umb-control-group>
 
                         <umb-control-group label="@treeHeaders_dictionary">
                             <div ng-repeat="dictionaryItem in ::vm.dictionaryItems | orderBy:'name'">
-                                    <umb-checkbox model="dictionaryItem.selected"
+                                <umb-checkbox model="dictionaryItem.selected"
                                                   on-change="vm.selectDictionaryItem(dictionaryItem)"
-                                                  text="{{dictionaryItem.name}}" />
+                                                text="{{dictionaryItem.name}}">
+                                </umb-checkbox>
                             </div>
                         </umb-control-group>
 
                         <umb-control-group label="@treeHeaders_dataTypes">
                             <div ng-repeat="dataType in ::vm.dataTypes | orderBy:'name'">
-                                    <umb-checkbox model="dataType.selected"
+                                <umb-checkbox model="dataType.selected"
                                                   on-change="vm.selectDataType(dataType)"
-                                                  text="{{dataType.name}}" />
+                                                text="{{dataType.name}}">
+                                </umb-checkbox>
                             </div>
                         </umb-control-group>
 
@@ -198,15 +206,13 @@
 
                 <div class="umb-expansion-panel">
 
-                    <div class="umb-expansion-panel__header" ng-click="vm.filesOpen = !vm.filesOpen">
-                        <div><localize key="packager_packageFiles">Package Files</localize></div>
-                        <ins class="umb-expansion-panel__expand" ng-class="{'icon-navigation-down': !vm.filesOpen, 'icon-navigation-up': vm.filesOpen}">&nbsp;</ins>
-                    </div>
+                    <button type="button" aria-expanded="{{vm.filesOpen}}" class="btn-reset umb-expansion-panel__header" ng-click="vm.filesOpen = !vm.filesOpen">
+                        <span><localize key="packager_packageFiles">Package Files</localize></span>
+                        <umb-icon icon="{{vm.filesOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}" class="umb-expansion-panel__expand">&nbsp;</umb-icon>
+                    </button>
 
                     <div class="umb-expansion-panel__content" ng-show="vm.filesOpen">
-                        <!--
-                        <p>Remember: .xslt and .ascx files for your macros will be added automaticly, but you will still need to add assemblies, images and script files manually to the list below.</p>
-                        -->
+
                         <umb-control-group
                             label="@packager_pathToFile"
                             description="@packager_pathToFileDescription">
@@ -220,12 +226,11 @@
                                 on-remove="vm.removeFile($index)">
                             </umb-node-preview>
 
-                            <a href=""
-                                class="umb-node-preview-add"
-                                ng-click="vm.openFilePicker()"
-                                prevent-default>
+                           <button type="button"
+                                   class="umb-node-preview-add"
+                                   ng-click="vm.openFilePicker()">
                                 <localize key="general_add">Add</localize>
-                            </a>
+                            </button>
 
                         </umb-control-group>
 
@@ -243,13 +248,12 @@
                                 on-remove="vm.removePackageView()">
                             </umb-node-preview>
 
-                            <a href=""
+                            <button type="button"
                                 ng-show="!vm.package.packageView"
                                 class="umb-node-preview-add"
-                                ng-click="vm.openViewPicker()"
-                                prevent-default>
+                                ng-click="vm.openViewPicker()">
                                 <localize key="general_add">Add</localize>
-                            </a>
+                            </button>
 
                         </umb-control-group>
                     </div>
@@ -257,19 +261,22 @@
                 </div>
 
                 <div class="umb-expansion-panel">
-                    <div class="umb-expansion-panel__header" ng-click="vm.actionsOpen = !vm.actionsOpen">
-                        <div><localize key="packager_packageActions">Package Actions</localize></div>
-                        <ins class="umb-expansion-panel__expand" ng-class="{'icon-navigation-down': !vm.actionsOpen, 'icon-navigation-up': vm.actionsOpen}">&nbsp;</ins>
-                    </div>
+                    <button type="button" aria-expanded="{{vm.actionsOpen}}" class="btn-reset umb-expansion-panel__header" ng-click="vm.actionsOpen = !vm.actionsOpen">
+                        <span><localize key="packager_packageActions">Package Actions</localize></span>
+                        <umb-icon icon="{{vm.actionsOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}" class="umb-expansion-panel__expand">&nbsp;</umb-icon>
+                    </button>
                     <div class="umb-expansion-panel__content" ng-show="vm.actionsOpen">
                         <umb-control-group
                             label="@packager_actions"
                             description="Here you can add custom installer / uninstaller events to perform certain tasks during installation and uninstallation.
                             All actions are formed as a xml node, containing data for the action to be performed.">
                             <div>
-                                <a target="_blank" ng-href="https://our.umbraco.com/documentation/Reference/Packaging/">Documentation</a>
+                                <a href="https://our.umbraco.com/documentation/Reference/Packaging/" target="_blank" rel="noopener">Documentation</a>
                                 <div>
-                                    <textarea class="umb-property-editor" rows="10" ng-model="vm.package.actions"></textarea>
+                                    <div data-element="package-actions"
+                                         umb-ace-editor="vm.aceOption"
+                                         model="vm.package.actions">
+                                    </div>
                                 </div>
                             </div>
                         </umb-control-group>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html
index 189b6ce482..88a2b21795 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html
@@ -5,7 +5,7 @@
         <umb-editor-sub-header-content-left>
             <umb-button
                 button-style="action"
-                type="button" 
+                type="button"
                 action="vm.createPackage()"
                 label="Create package"
                 label-key="packager_createPackage">
@@ -20,12 +20,12 @@
                 <td class="flex items-center">
                     <div class="umb-package-list__item-icon">
                         <i ng-if="!createdPackage.iconUrl" class="icon-box"></i>
-                        <img ng-if="createdPackage.iconUrl" ng-src="{{createdPackage.iconUrl}}" />
+                        <img ng-if="createdPackage.iconUrl" ng-src="{{createdPackage.iconUrl}}" alt="" />
                     </div>
                     <div class="umb-package-list__item-content">
                         <div class="umb-package-list__item-name">{{ createdPackage.name }}</div>
                         <div class="umb-package-list__item-description">
-                            {{ createdPackage.version }} | <a href="{{ createdPackage.url }}" target="_blank">{{ createdPackage.url }}</a> | {{ createdPackage.author }}
+                            {{ createdPackage.version }} | <a href="{{ createdPackage.url }}" target="_blank" rel="noopener">{{ createdPackage.url }}</a> | {{ createdPackage.author }}
                         </div>
                     </div>
                 </td>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html
index e22cfd14ab..dea6dfac43 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html
@@ -19,7 +19,6 @@
                      ngf-max-size="{{ maxFileSize }}"
                      ng-class="{'is-small': compact!=='false' || (done.length+queue.length) > 0 }">
 
-
                     <div class="content">
 
                         <!-- Drag and drop illustration -->
@@ -63,7 +62,7 @@
             <div class="flex items-center justify-center">
                 <div class="umb-info-local-items">
                     <div class="umb-package-icon">
-                        <i ng-if="!vm.localPackage.iconUrl" class="icon-box"></i>
+                        <i ng-if="!vm.localPackage.iconUrl" class="icon-box" aria-hidden="true"></i>
                     </div>
                     <div class="umb-package-info">
 
@@ -89,7 +88,7 @@
 
         <umb-editor-sub-header>
             <umb-editor-sub-header-content-left>
-                <button type="button" class="umb-package-details__back-action" href="" ng-click="vm.state = 'upload'" prevent-default><span aria-hidden="true">&larr;</span> <localize key="packager_cancelAndUploadAnother">Cancel and upload another package</localize></button>
+                <button type="button" class="umb-package-details__back-action" ng-click="vm.state = 'upload'" prevent-default><span aria-hidden="true">&larr;</span> <localize key="packager_cancelAndUploadAnother">Cancel and upload another package</localize></button>
             </umb-editor-sub-header-content-left>
         </umb-editor-sub-header>
 
@@ -101,7 +100,7 @@
 
                     <form novalidate name="localPackageForm" class="w-100">
                         <div class="umb-package-icon">
-                            <i ng-if="!vm.localPackage.iconUrl" class="icon-box"></i>
+                            <i ng-if="!vm.localPackage.iconUrl" class="icon-box" aria-hidden="true"></i>
                             <img ng-if="vm.localPackage.iconUrl" ng-src="{{vm.localPackage.iconUrl}}" alt="" />
                         </div>
 
@@ -110,7 +109,7 @@
 
                             <div class="umb-info-local-item">
                                 <strong><localize key="packager_packageAuthor">Author</localize></strong><br>
-                                <a href="{{ vm.localPackage.authorUrl }}" target="_blank">{{ vm.localPackage.author }}</a>
+                                <a href="{{ vm.localPackage.authorUrl }}" target="_blank" rel="noopener">{{ vm.localPackage.author }}</a>
                             </div>
 
                             <div class="umb-info-local-item" ng-if="vm.localPackage.contributors && vm.localPackage.contributors.length > 0">
@@ -133,7 +132,7 @@
 
                             <div class="umb-info-local-item">
                                 <strong><localize key="packager_packageLicense">License</localize></strong><br>
-                                <a href="{{ vm.localPackage.licenseUrl }}" target="_blank">{{ vm.localPackage.license }}</a>
+                                <a href="{{ vm.localPackage.licenseUrl }}" target="_blank" rel="noopener">{{ vm.localPackage.license }}</a>
                             </div>
 
                             <div class="umb-info-local-item">
@@ -142,15 +141,16 @@
                             </div>
 
                             <div class="umb-info-local-item mt4 flex items-center flex-column" ng-if="vm.installState.status == '' && vm.localPackage.isCompatible">
-                                <label for="license-accepts" class="umb-package-installer-label">
-                                    <input type="checkbox" id="license-accepts" ng-model="vm.localPackage.packageLicenseAccept" required no-dirty-check>
-                                    <strong class="label-text"><localize key="packager_accept">I accept</localize> <a href="{{ vm.localPackage.licenseUrl }}" target="_blank"><localize key="packager_termsOfUse">terms of use</localize></a></strong>
-                                </label>
+
+                                <umb-checkbox model="vm.localPackage.packageLicenseAccept" required="true">
+                                    <strong class="label-text"><localize key="packager_accept">I accept</localize> <a href="#" ng-href="{{vm.localPackage.licenseUrl}}" target="_blank" rel="noopener"><localize key="packager_termsOfUse">terms of use</localize></a></strong>
+                                </umb-checkbox>
+
                                 <umb-button class="mt3"
                                             type="button"
-                                            disabled="localPackageForm.$invalid"
                                             size="m"
                                             button-style="success"
+                                            disabled="localPackageForm.$invalid"
                                             action="vm.installPackage()"
                                             label-key="packager_packageInstall">
                                 </umb-button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html
index eea0ab88e6..4091635e3f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html
@@ -12,13 +12,13 @@
                     <tr ng-repeat="installedPackage in vm.installedPackages track by installedPackage.id">
                         <td class="flex items-center">
                             <div class="umb-package-list__item-icon">
-                                <i ng-if="!installedPackage.iconUrl" class="icon-box"></i>
+                                <umb-icon ng-if="!installedPackage.iconUrl" icon="icon-box" class="icon-box"></umb-icon>
                                 <img ng-if="installedPackage.iconUrl" ng-src="{{installedPackage.iconUrl}}" />
                             </div>
                             <div class="umb-package-list__item-content">
                                 <div class="umb-package-list__item-name">{{ installedPackage.name }}</div>
                                 <div class="umb-package-list__item-description">
-                                    {{ installedPackage.version }} | <a href="{{ installedPackage.url }}" target="_blank">{{ installedPackage.url }}</a> | {{ installedPackage.author }}
+                                    {{ installedPackage.version }} | <a href="{{ installedPackage.url }}" target="_blank" rel="noopener">{{ installedPackage.url }}</a> | {{ installedPackage.author }}
                                 </div>
                             </div>
                         </td>
@@ -67,7 +67,7 @@
 
                 <form novalidate name="uninstallForm" class="w-100">
                     <div class="umb-package-icon">
-                        <i ng-if="!vm.package.iconUrl" class="icon-box"></i>
+                        <umb-icon ng-if="!vm.package.iconUrl" icon="icon-box" class="icon-box"></umb-icon>
                         <img ng-if="vm.package.iconUrl" ng-src="{{vm.package.iconUrl}}" alt="" />
                     </div>
 
@@ -77,7 +77,7 @@
 
                         <div class="umb-info-local-item">
                             <strong><localize key="packager_packageAuthor">Author</localize></strong>
-                            <a href="{{ vm.package.authorLink }}" target="_blank">{{ vm.package.author }}</a>
+                            <a href="{{ vm.package.authorLink }}" target="_blank" rel="noopener">{{ vm.package.author }}</a>
                         </div>
 
                         <div class="umb-info-local-item">
@@ -87,7 +87,7 @@
 
                         <div class="umb-info-local-item">
                             <strong><localize key="packager_packageLicense">License</localize></strong>
-                            <a href="{{ vm.package.licenseUrl }}" target="_blank">{{ vm.package.license }}</a>
+                            <a href="{{ vm.package.licenseUrl }}" target="_blank" rel="noopener">{{ vm.package.license }}</a>
                         </div>
 
                         <div class="umb-info-local-item">
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
index 14aeaf1b58..42b538f9ad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
@@ -10,16 +10,15 @@
                 <label for="package-query" class="sr-only">
                     <localize key="packager_packageSearch">Search for packages</localize>
                 </label>
-                <input
-                    class="-full-width-input"
-                    type="text"
-                    name="query"
-                    id="package-query"
-                    localize="placeholder"
-                    placeholder="@packager_packageSearch"
-                    umb-auto-focus ng-model="vm.searchQuery"
-                    ng-change="vm.search()"
-                    no-dirty-check>
+                <input type="text"
+                       class="-full-width-input"
+                       name="query"
+                       id="package-query"
+                       localize="placeholder"
+                       placeholder="@packager_packageSearch"
+                       ng-model="vm.searchQuery"
+                       ng-change="vm.search()"
+                       no-dirty-check />
             </div>
         </div>
 
@@ -44,26 +43,29 @@
                     <div class="umb-package" ng-repeat="package in vm.popular">
                         <button type="button" class="umb-package-link" ng-click="vm.showPackageDetails(package)">
 
-                            <div class="umb-package-icon">
-                                <img ng-src="{{package.icon}}" alt="" />
-                            </div>
-
-                            <div class="umb-package-info">
-                                <div class="umb-package-name">{{package.name}}</div>
-                                <div class="umb-package-description">{{package.excerpt | limitTo: 40}}<span ng-if="package.excerpt > (package.excerpt | limitTo: 40)">...</span></div>
-
-                                <div class="umb-package-numbers">
-                                    <small class="umb-package-downloads">
-                                        <i class="icon-download-alt" aria-hidden="true"></i>
-                                        <strong>{{package.downloads}}</strong>
-                                    </small>
-                                    <small class="umb-package-likes">
-                                        <i class="icon-hearts" aria-hidden="true"></i>
-                                        <strong>{{package.likes}}</strong>
-                                    </small>
+                            <div class="flex flex-column">
+                                <div class="umb-package-icon">
+                                    <img ng-src="{{package.icon}}" alt="" />
                                 </div>
 
+                                <div class="umb-package-info">
+                                    <div class="umb-package-name">{{package.name}}</div>
+                                    <div class="umb-package-description">{{package.excerpt | limitTo: 40}}<span ng-if="package.excerpt > (package.excerpt | limitTo: 40)">...</span></div>
+
+                                    <div class="umb-package-numbers">
+                                        <small class="umb-package-downloads">
+                                            <i class="icon-download-alt" aria-hidden="true"></i>
+                                            <strong>{{package.downloads}}</strong>
+                                        </small>
+                                        <small class="umb-package-likes">
+                                            <i class="icon-hearts" aria-hidden="true"></i>
+                                            <strong>{{package.likes}}</strong>
+                                        </small>
+                                    </div>
+
+                                </div>
                             </div>
+
                         </button>
                     </div> <!-- end package -->
 
@@ -80,26 +82,29 @@
                     <div class="umb-package" ng-repeat="package in vm.packages">
                         <button type="button" class="umb-package-link" ng-click="vm.showPackageDetails(package)">
 
-                            <div class="umb-package-icon">
-                                <img ng-src="{{package.icon}}" alt="" />
-                            </div>
-
-                            <div class="umb-package-info">
-                                <div class="umb-package-name">{{ package.name }}</div>
-                                <div class="umb-package-description">{{ package.excerpt | limitTo: 40 }}<span ng-if="package.excerpt > (package.excerpt | limitTo: 40)">...</span></div>
-
-                                <div class="umb-package-numbers">
-                                    <small class="umb-package-downloads">
-                                        <i class="icon-download-alt" aria-hidden="true"></i>
-                                        <strong>{{ package.downloads }}</strong>
-                                    </small>
-                                    <small class="umb-package-likes">
-                                        <i class="icon-hearts" aria-hidden="true"></i>
-                                        <strong>{{ package.likes }}</strong>
-                                    </small>
+                            <div class="flex flex-column">
+                                <div class="umb-package-icon">
+                                    <img ng-src="{{package.icon}}" alt="" />
                                 </div>
 
+                                <div class="umb-package-info">
+                                    <div class="umb-package-name">{{ package.name }}</div>
+                                    <div class="umb-package-description">{{ package.excerpt | limitTo: 40 }}<span ng-if="package.excerpt > (package.excerpt | limitTo: 40)">...</span></div>
+
+                                    <div class="umb-package-numbers">
+                                        <small class="umb-package-downloads">
+                                            <i class="icon-download-alt" aria-hidden="true"></i>
+                                            <strong>{{ package.downloads }}</strong>
+                                        </small>
+                                        <small class="umb-package-likes">
+                                            <i class="icon-hearts" aria-hidden="true"></i>
+                                            <strong>{{ package.likes }}</strong>
+                                        </small>
+                                    </div>
+
+                                </div>
                             </div>
+                            
                         </button>
                     </div> <!-- end package -->
 
@@ -289,7 +294,7 @@
                             <div class="umb-package-details__section-title"><localize key="packager_packageExternalSources">External sources</localize></div>
                             <div>
                                 <div class="umb-package-details__information-item" ng-repeat="externalSource in vm.package.externalSources">
-                                    <a class="umb-package-details__link" target="_blank" href="{{ externalSource.url }}">
+                                    <a class="umb-package-details__link" href="{{ externalSource.url }}" target="_blank" rel="noopener noreferrer">
                                         <i class="icon-out" aria-hidden="true"></i>
                                         {{ externalSource.name }}
                                     </a>
@@ -330,7 +335,7 @@
 
                             <div class="umb-info-local-item">
                                 <strong>Author</strong>
-                                <a href="{{ vm.localPackage.authorLink }}" target="_blank">{{ vm.localPackage.author }}</a>
+                                <a href="{{ vm.localPackage.authorLink }}" target="_blank" rel="noopener noreferrer">{{ vm.localPackage.author }}</a>
                             </div>
 
                             <div class="umb-info-local-item">
@@ -340,7 +345,7 @@
 
                             <div class="umb-info-local-item">
                                 <strong><localize key="packager_packageLicense">License</localize></strong>
-                                <a href="{{ vm.localPackage.licenseUrl }}" target="_blank">{{ vm.localPackage.license }}</a>
+                                <a href="{{ vm.localPackage.licenseUrl }}" target="_blank" rel="noopener noreferrer">{{ vm.localPackage.license }}</a>
                             </div>
 
                             <div class="umb-info-local-item">
@@ -350,18 +355,19 @@
                             </div>
 
                             <div class="umb-info-local-item mt4 flex items-center flex-column" ng-if="vm.installState.status == '' && vm.localPackage.isCompatible">
-                                <label for="license-accept" class="umb-package-installer-label">
-                                    <input type="checkbox" id="license-accept" ng-model="vm.localPackage.packageLicenseAccept" required no-dirty-check>
-                                    <strong class="label-text"><localize key="packager_accept">I accept</localize> <a href="{{ vm.localPackage.licenseUrl }}" target="_blank"><localize key="packager_termsOfUse">terms of use</localize></a></strong>
-                                </label>
-                                <umb-button
-                                    ng-if="vm.installState.type !== 'error'"
-                                    class="mt3"
-                                    type="button"
-                                    button-style="success"
-                                    disabled="localPackageForm.$invalid"
-                                    action="vm.installPackage(vm.localPackage)"
-                                    label-key="packager_packageInstall">
+
+                                <umb-checkbox model="vm.localPackage.packageLicenseAccept" required="true">
+                                    <strong class="label-text"><localize key="packager_accept">I accept</localize> <a href="#" ng-href="{{vm.localPackage.licenseUrl}}" target="_blank" rel="noopener noreferrer"><localize key="packager_termsOfUse">terms of use</localize></a></strong>
+                                </umb-checkbox>
+
+                                <umb-button ng-if="vm.installState.type !== 'error'"
+                                            class="mt3"
+                                            type="button"
+                                            size="m"
+                                            button-style="success"
+                                            disabled="localPackageForm.$invalid"
+                                            action="vm.installPackage(vm.localPackage)"
+                                            label-key="packager_packageInstall">
                                 </umb-button>
                             </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
index 52b58d094d..a843f420c8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
@@ -46,12 +46,13 @@
                         activate: true
                     });
 
-                    formHelper.resetForm({ scope: $scope });
+                    formHelper.resetForm({ scope: $scope, formCtrl: form });
 
                     var section = appState.getSectionState("currentSection");
 
                 }, function (err) {
 
+                    formHelper.resetForm({ scope: $scope, formCtrl: form, hasErrors: true });
                     vm.createFolderError = err;
 
                 });
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
index bd91585d4e..f7c1280094 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
@@ -11,26 +11,26 @@
 
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action">
-                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFile()" umb-auto-focus>
-                            <i class="large icon-article"></i>
+                        <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFile()" umb-auto-focus>
+                            <i class="large icon-article" aria-hidden="true"></i>
                             <span class="menu-label"><localize key="create_newPartialViewMacro">New partial view macro</localize></span>
                         </button>
                     </li>
                     <li class="umb-action">
-                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileWithoutMacro()">
-                            <i class="large icon icon-article"></i>
+                        <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileWithoutMacro()">
+                            <i class="large icon icon-article" aria-hidden="true"></i>
                             <span class="menu-label"><localize key="create_newPartialViewMacroNoMacro">New partial view macro (without macro)</localize></span>
                         </button>
                     </li>
                     <li class="umb-action">
-                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()">
-                            <i class="large icon icon-article"></i>
+                        <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()">
+                            <i class="large icon icon-article" aria-hidden="true"></i>
                             <span class="menu-label"><localize key="create_newPartialViewMacroFromSnippet">>New partial view macro from snippet</localize>...</span>
                         </button>
                     </li>
                     <li class="umb-action">
-                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
-                            <i class="large icon icon-folder"></i>
+                        <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
+                            <i class="large icon icon-folder" aria-hidden="true"></i>
                             <span class="menu-label"><localize key="general_folder"></localize>...</span>
                         </button>
                     </li>
@@ -44,8 +44,8 @@
 
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action" ng-repeat="snippet in vm.snippets">
-                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileFromSnippet(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
-                            <i class="icon-article icon" style="font-size: 20px;"></i>
+                        <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileFromSnippet(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
+                            <i class="icon-article icon" style="font-size: 20px;" aria-hidden="true"></i>
                             <span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
                         </button>
                     </li>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
index fbde1d5a07..97aa059806 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
@@ -56,12 +56,13 @@
                         activate: true
                     });
 
-                    formHelper.resetForm({ scope: $scope });
+                    formHelper.resetForm({ scope: $scope, formCtrl: form });
 
                     var section = appState.getSectionState("currentSection");
 
                 }, function(err) {
 
+                    formHelper.resetForm({ scope: $scope, formCtrl: form, hasErrors: true });
                     vm.createFolderError = err;
                 });
             }
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
index 661bc615f6..6fbb69fa80 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
@@ -10,20 +10,20 @@
             <div ng-if="!vm.showSnippets">
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action">
-                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView()" umb-auto-focus>
-                            <i class="large icon icon-article"></i>
+                        <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView()" umb-auto-focus>
+                            <i class="large icon icon-article" aria-hidden="true"></i>
                             <span class="menu-label"><localize key="create_newEmptyPartialView">New empty partial view</localize></span>
                         </button>
                     </li>
                     <li class="umb-action">
-                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()">
-                            <i class="large icon icon-article"></i>
+                        <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()">
+                            <i class="large icon icon-article" aria-hidden="true"></i>
                             <span class="menu-label"><localize key="create_newPartialViewFromSnippet">New partial view from snippet</localize>...</span>
                         </button>
                     </li>
                     <li class="umb-action">
-                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
-                            <i class="large icon icon-folder"></i>
+                        <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
+                            <i class="large icon icon-folder" aria-hidden="true"></i>
                             <span class="menu-label"><localize key="general_folder"></localize>...</span>
                         </button>
                     </li>
@@ -34,8 +34,8 @@
             <div ng-if="vm.showSnippets">
                 <ul class="umb-actions umb-actions-child">
                     <li class="umb-action" ng-repeat="snippet in vm.snippets">
-                        <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
-                            <i class="icon-article icon" style="font-size: 20px;"></i>
+                        <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
+                            <i class="icon-article icon" aria-hidden="true" style="font-size: 20px;"></i>
                             <span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
                         </button>
                     </li>
@@ -68,7 +68,7 @@
 
     <!-- Dialog footer -->
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="vm.creatingFolder">
-        <button class="btn btn-info" ng-click="vm.close()">
+        <button type="button" class="btn btn-info" ng-click="vm.close()">
             <localize key="buttons_somethingElse">Do something else</localize>
         </button>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/checkboxlist.controller.js
new file mode 100644
index 0000000000..54ce876e73
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/checkboxlist.controller.js
@@ -0,0 +1,78 @@
+angular.module("umbraco").controller("Umbraco.PrevalueEditors.CheckboxListController",
+    function ($scope) {
+        
+        var vm = this;
+
+        vm.configItems = [];
+        vm.viewItems = [];
+        vm.change = change;
+
+        function init() {
+
+            var prevalues = ($scope.model.config ? $scope.model.config.prevalues : $scope.model.prevalues) || [];
+
+            var items = [];
+
+            for (var i = 0; i < prevalues.length; i++) {
+                var item = {};
+
+                if (Utilities.isObject(prevalues[i])) {
+                    item.value = prevalues[i].value;
+                    item.label = prevalues[i].label;
+                }
+                else {
+                    item.value = prevalues[i];
+                    item.label = prevalues[i];
+                }
+
+                items.push({ value: item.value, label: item.label });
+            }
+
+            vm.configItems = items;
+
+            if ($scope.model.value === null || $scope.model.value === undefined) {
+                $scope.model.value = [];
+            }
+
+            // update view model.
+            generateViewModel($scope.model.value);
+        }
+
+        function generateViewModel(newVal) {
+
+            vm.viewItems = [];
+
+            var iConfigItem;
+            for (var i = 0; i < vm.configItems.length; i++) {
+                iConfigItem = vm.configItems[i];
+                var isChecked = _.contains(newVal, iConfigItem.value);
+                vm.viewItems.push({
+                    checked: isChecked,
+                    value: iConfigItem.value,
+                    label: iConfigItem.label
+                });
+            }
+
+        }
+
+        function change(model, value) {
+
+            var index = $scope.model.value.indexOf(value);
+
+            if (model === true) {
+                //if it doesn't exist in the model, then add it
+                if (index < 0) {
+                    $scope.model.value.push(value);
+                }
+            } else {
+                //if it exists in the model, then remove it
+                if (index >= 0) {
+                    $scope.model.value.splice(index, 1);
+                }
+            }
+
+        }
+
+        init();
+
+    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/checkboxlist.html
new file mode 100644
index 0000000000..eb114bfea5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/checkboxlist.html
@@ -0,0 +1,9 @@
+<div class="umb-checkboxlist-preval" ng-controller="Umbraco.PrevalueEditors.CheckboxListController as vm">
+
+    <ul class="unstyled">
+        <li ng-repeat="item in vm.viewItems track by $id(item)">
+            <umb-checkbox value="{{item.value}}" model="item.checked" text="{{item.label}}" on-change="vm.change(model, value)"></umb-checkbox>
+        </li>
+    </ul>
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/colorpicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/colorpicker.html
index 7f3e6f0b05..21727b766e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/colorpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/colorpicker.html
@@ -4,10 +4,11 @@
         <localize key="colorpicker_noColors">You haven't defined any colors</localize>
     </div>
 
-    <umb-color-swatches colors="model.items"
-                        selected-color="model.value"
-                        size="s"
-                        use-label="model.config.useLabel">
+    <umb-color-swatches
+        colors="model.items"
+        selected-color="model.value"
+        size="s"
+        use-label="model.config.useLabel">
     </umb-color-swatches>
 
     <input type="hidden" name="modelValue" ng-model="model.value" />
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html
index d797501d91..9f65035c23 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html
@@ -5,18 +5,19 @@
             <img ng-src="{{model.value}}" alt="">
 
             <div class="umb-sortable-thumbnails__actions">
-                <!--<a class="umb-sortable-thumbnails__action" href="" ng-click="goToItem(image)">
-                    <i class="icon icon-edit"></i>
-                </a>-->
-                <a class="umb-sortable-thumbnails__action -red" href="" ng-click="remove()">
-                    <i class="icon icon-delete"></i>
-                </a>
+                <button type="button" aria-label="Remove" class="umb-sortable-thumbnails__action -red btn-reset" ng-click="remove()">
+                    <i class="icon icon-delete" aria-hidden="true"></i>
+                </button>
             </div>
         </li>
     </ul>
 
-    <a href="#" class="add-link umb-outline umb-outline--surrounding" ng-click="add()" ng-class="{'add-link-square': !model.value }" ng-hide="model.value" prevent-default>
-        <i class="icon icon-add large"></i>
-    </a>
+    <button type="button"
+            class="add-link umb-outline umb-outline--surrounding"
+            ng-class="{'add-link-square': !model.value }"
+            ng-click="add()"
+            ng-hide="model.value">
+        <i class="icon icon-add large" aria-hidden="true"></i>
+    </button>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.html
index 5d93c59f5e..fc6af3a3e8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.html
@@ -10,24 +10,22 @@
                 </p>
 
                 <!-- FILE -->
-                <div ng-class="{'trashed': media.trashed}" class="umb-icon-holder" ng-hide="media.thumbnail">
-                    <span class="file-icon">
-                        <i class="icon {{media.icon}}"></i>
-                        <span ng-if="media.extension">.{{media.extension}}</span>
-                    </span>
-                    <small>{{media.name}}</small>
-                </div>
+                <umb-file-icon ng-hide="media.thumbnail" ng-class="{'trashed': media.trashed}"
+                               extension="{{media.extension}}"
+                               icon="{{media.icon}}"
+                               size="s"
+                               text="{{media.name}}">
+                </umb-file-icon>
 
                 <div class="umb-sortable-thumbnails__actions" data-element="sortable-thumbnail-actions">
-
-                    <button aria-label="Remove" class="umb-sortable-thumbnails__action -red btn-reset" data-element="action-remove" ng-click="remove()">
+                    <button type="button" aria-label="Remove" class="umb-sortable-thumbnails__action -red btn-reset" data-element="action-remove" ng-click="remove()">
                         <i class="icon icon-delete" aria-hidden="true"></i>
                     </button>
                 </div>
             </li>
 
             <li style="border: none;" class="add-wrapper unsortable" ng-hide="model.value">
-                <button aria-label="Open media picker" data-element="sortable-thumbnails-add" class="add-link add-link-square btn-reset umb-outline umb-outline--surrounding" ng-click="add()" prevent-default>
+                <button type="button" aria-label="Open media picker" data-element="sortable-thumbnails-add" class="add-link add-link-square btn-reset umb-outline umb-outline--surrounding" ng-click="add()">
                     <i class="icon icon-add large" aria-hidden="true"></i>
                 </button>
             </li>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
index 03bcad9289..c00c5585f2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
@@ -15,12 +15,11 @@
 		</umb-node-preview>
 	</div>
 
-	<a ng-show="model.config.multiPicker === true || renderModel.length === 0"
-		class="umb-node-preview-add"
-		href=""
-		ng-click="openTreePicker()"
-		prevent-default>
+	<button type="button"
+            class="umb-node-preview-add"
+            ng-show="model.config.multiPicker === true || renderModel.length === 0"
+            ng-click="openTreePicker()">
 		<localize key="general_add">Add</localize>
-	</a>
+	</button>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.controller.js
index c37c382dac..93d72d2a1b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.controller.js
@@ -38,7 +38,6 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.MultiValuesControl
         $scope.add = function (evt) {
             evt.preventDefault();
             
-            
             if ($scope.newItem) {
                 if (!_.contains($scope.model.value, $scope.newItem)) {                
                     $scope.model.value.push({ value: $scope.newItem });
@@ -79,7 +78,7 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.MultiValuesControl
             if (event.keyCode == 13) {
                 $scope.add(event);
             }
-        }
+        };
 
         function getElementIndexByPrevalueText(value) {
             for (var i = 0; i < $scope.model.value.length; i++) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
index f569105083..43520b00da 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
@@ -1,10 +1,10 @@
 <div class="umb-property-editor umb-prevalues-multivalues" ng-controller="Umbraco.PrevalueEditors.MultiValuesController">
     <div class="control-group umb-prevalues-multivalues__add">
         <div class="umb-prevalues-multivalues__left">
-            <input overlay-submit-on-enter="false" name="newItem" focus-when="{{focusOnNew}}" ng-keydown="createNew($event)" type="text" ng-model="newItem" val-highlight="{{hasError}}" />
+            <input type="text" name="newItem" focus-when="{{focusOnNew}}" ng-keydown="createNew($event)" ng-model="newItem" val-highlight="{{hasError}}" overlay-submit-on-enter="false" />
         </div>
         <div class="umb-prevalues-multivalues__right">
-            <button class="btn btn-info" ng-click="add($event)"><localize key="general_add">Add</localize></button>
+            <button type="button" class="btn btn-info" ng-click="add($event)"><localize key="general_add">Add</localize></button>
         </div>
     </div>
     <div ui-sortable="sortableOptions">
@@ -14,7 +14,7 @@
                 <input type="text" ng-model="item.value" val-server="item_{{$index}}" required />
             </div>
             <div class="umb-prevalues-multivalues__right">
-                <button class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(item, $event)"><localize key="general_remove">Remove</localize></button>
+                <button type="button" class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(item, $event)"><localize key="general_remove">Remove</localize></button>
             </div>
         </div>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.html
new file mode 100644
index 0000000000..d9d8cad982
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.html
@@ -0,0 +1,24 @@
+<div class="umb-property-editor umb-prevalues-numberrange">
+    <ng-form name="prevalueNumberRangeForm">
+        <input name="numberFieldMin" class="__min-input"
+               type="number"
+               ng-model="model.value.min"
+               placeholder="0"
+               ng-max="model.value.max"
+               fix-number />
+        <span class="__enDash">–</span>
+        <input name="numberFieldMax" class="__max-input"
+               type="number"
+               ng-model="model.value.max"
+               placeholder="∞"
+               ng-min="model.value.min"
+               fix-number />
+
+        <span ng-messages="prevalueNumberRangeForm.numberFieldMin.$error" show-validation-on-submit >
+            <span class="help-inline" ng-message="number">Not a number</span>
+        </span>
+        <span ng-messages="prevalueNumberRangeForm.numberFieldMax.$error" show-validation-on-submit >
+            <span class="help-inline" ng-message="number">Not a number</span>
+        </span>
+    </ng-form>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.less b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.less
new file mode 100644
index 0000000000..e7ca2dd1cd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.less
@@ -0,0 +1,14 @@
+.umb-prevalues-numberrange {
+
+    .__min-input {
+    }
+
+    .__enDash {
+        display: inline-block;
+        vertical-align: middle;
+        margin-top: 5px;
+    }
+
+    .__max-input {
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/radiobuttonlist.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/radiobuttonlist.html
index 973d287ea8..a5df09c2a1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/radiobuttonlist.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/radiobuttonlist.html
@@ -1,15 +1,23 @@
-<ul class="unstyled" ng-if="model.prevalues">
-    <li ng-repeat="preval in model.prevalues">
-        <label class="checkbox">
-            <input type="radio" ng-model="model.value" value="{{preval.value || preval}}" /> {{preval.label || preval.value || preval}}
-        </label>
-    </li>
-</ul>
+<div class="umb-radiobuttons-preval">
 
-<ul class="unstyled" ng-if="model.config.prevalues">
-    <li ng-repeat="(key, value) in model.config.prevalues ">
-        <label class="checkbox">
-            <input type="radio" ng-model="model.value" value="{{value.value}}" /> {{value.label}}
-        </label>
-    </li>
-</ul>
+    <ul class="unstyled" ng-if="model.prevalues">
+        <li ng-repeat="preval in model.prevalues">
+
+            <umb-radiobutton model="model.value" value="{{preval.value || preval}}">
+                {{preval.label || preval.value || preval}}
+            </umb-radiobutton>
+
+        </li>
+    </ul>
+
+    <ul class="unstyled" ng-if="model.config.prevalues">
+        <li ng-repeat="(key, value) in model.config.prevalues">
+
+            <umb-radiobutton model="model.value" value="{{value.value}}">
+                {{value.label}}
+            </umb-radiobutton>
+
+        </li>
+    </ul>
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
index ab1b84db97..2fb2aab352 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
@@ -15,12 +15,11 @@
 		</umb-node-preview>
 	</div>
 
-	<a ng-show="model.config.multiPicker === true || renderModel.length === 0"
-		class="umb-node-preview-add"
-		href=""
-		ng-click="openContentPicker()"
-		prevent-default>
+	<button type="button"
+		    class="umb-node-preview-add"
+            ng-show="model.config.multiPicker === true || renderModel.length === 0"
+		    ng-click="openContentPicker()">
 		<localize key="general_add">Add</localize>
-	</a>
+	</button>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
index e693801495..c9da687f0d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
@@ -6,7 +6,6 @@
 		<option value="member">Members</option>
 	</select>
 
-
     <umb-node-preview
 		ng-show="node"
         class="mt1"
@@ -21,40 +20,36 @@
 	</umb-node-preview>
 
     <div ng-if="!node && model.value.type !== 'member'" class="mt2">
-        <span ng-hide="showSearch || model.value.query">
-            <a class="umb-node-preview-add"
-               href=""
-               ng-click="openContentPicker()"
-               prevent-default>
+        <div ng-hide="showSearch || model.value.query">
+            <button type="button" class="umb-node-preview-add"
+                    ng-click="openContentPicker()">
                 <localize key="general_choose">Choose a root node</localize>
-            </a>
+            </button>
             <div class="mt2" ng-show="model.value.type == 'content'">
-                <i class="icon icon-search"></i>
-                <a href ng-click="showSearch = true">Query for root node with xpath</a>
+                <i class="icon icon-search" aria-hidden="true"></i>
+                <button type="button" class="btn-link" ng-click="showSearch = true">Query for root node with xpath</button>
             </div>
-        </span>
+        </div>
 
-        <span ng-show="showSearch || model.value.query">
+        <div ng-show="showSearch || model.value.query">
 
             <input type="text"
                    ng-model="model.value.query"
                    class="umb-property-editor umb-textstring"
                    placeholder="Enter xpath query">
 
-            <ul class="unstyled list-icons" style="margin-top: 15px">
+            <ul class="unstyled list-icons mt3">
                 <li style="max-width: 600px">
-                    <i class="icon icon-help-alt"></i>
-                    <a href ng-click="showHelp = 1" prevent-default>
-                        Show xpath query help
-                    </a>
+                    <i class="icon icon-help-alt" aria-hidden="true"></i>
+                    <button type="button" class="btn-link" ng-click="showHelp = !showHelp">{{showHelp ? 'Hide' : 'Show'}} xpath query help</button>
 
-                    <small ng-if="showHelp">
+                    <div class="small" ng-show="showHelp">
                         <p>
                             Use Xpath query to set a root node on the tree, either based on a search from the root of the content tree, or by using a context-aware placeholder.
                         </p>
 
                         <p>
-                            Placeholders finds the nearest published ID and runs its query from there. so for instance:
+                            Placeholders finds the nearest published ID and runs its query from there, so for instance:
 
                             <pre>$parent/newsArticle</pre>
 
@@ -68,14 +63,14 @@
                             <code>$root</code>: root of the content tree<br/>
                             <code>$site</code>: Ancestor node at level 1 <br/>
                         </p>
-                    </small>
+                    </div>
                 </li>
                 <li>
-                    <i class="icon icon-delete red"></i>
-                    <a href ng-click="showSearch = false; model.value.query = ''"> Cancel and clear query</a>
+                    <i class="icon icon-delete red" aria-hidden="true"></i>
+                    <button type="button" class="btn-link" ng-click="showSearch = false; model.value.query = ''"> Cancel and clear query</button>
                 </li>
             </ul>
-        </span>
+        </div>
     </div>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
index a87377c84b..dcc9add395 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
@@ -83,8 +83,8 @@ function TreeSourceTypePickerController($scope, contentTypeResource, mediaTypeRe
         $scope.model.value = _.pluck(vm.itemTypes, "alias").join();
         angularHelper.getCurrentForm($scope).$setDirty();
     }
-
-    eventsService.on("treeSourceChanged", function (e, args) {
+    var evts = [];
+    evts.push(eventsService.on("treeSourceChanged", function (e, args) {
         // reset the model value if we changed node type (but not on the initial load)
         if (!!currentItemType && currentItemType !== args.value) {
             vm.itemTypes = [];
@@ -92,6 +92,12 @@ function TreeSourceTypePickerController($scope, contentTypeResource, mediaTypeRe
         }
         currentItemType = args.value;
         init();
+    }));
+
+    $scope.$on('$destroy', function () {
+        for (var e in evts) {
+            eventsService.unsubscribe(evts[e]);
+        }
     });
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.html
index f679b53093..cdbacfc7f3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.html
@@ -12,12 +12,11 @@
                           on-remove="vm.remove(itemType)">
         </umb-node-preview>
 
-        <a class="umb-node-preview-add"
-           href=""
-           ng-click="vm.add()"
-           prevent-default>
+        <button type="button"
+                class="umb-node-preview-add"
+                ng-click="vm.add()">
             <localize key="general_add">Add</localize>
-        </a>
+        </button>
     </div>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.html
new file mode 100644
index 0000000000..7a49783203
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.html
@@ -0,0 +1 @@
+<umb-block-list-property-editor model="model"></umb-block-list-property-editor>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.controller.js
new file mode 100644
index 0000000000..06c1424838
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.controller.js
@@ -0,0 +1,27 @@
+(function () {
+    'use strict';
+
+    function InlineBlockEditor($scope) {
+
+        const bc = this;
+
+        bc.openBlock = function(block) {
+
+            // if we are closing:
+            if (block.active === true) {
+                // boardcast the formSubmitting event to trigger syncronization or none-live property-editors
+                $scope.$broadcast("formSubmitting", { scope: $scope });
+                // Some property editors need to performe an action after all property editors have reacted to the formSubmitting.
+                $scope.$broadcast("formSubmittingFinalPhase", { scope: $scope });
+
+                block.active = false;
+            } else {
+                $scope.api.activateBlock(block);
+            }
+        }
+
+    }
+
+    angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockEditor.InlineBlockEditor", InlineBlockEditor);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.html
new file mode 100644
index 0000000000..6cf717df81
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.html
@@ -0,0 +1,14 @@
+<div class="blockelement-inlineblock-editor"
+        ng-controller="Umbraco.PropertyEditors.BlockEditor.InlineBlockEditor as vm"
+        ng-class="{ '--error': parentForm.$invalid && valFormManager.isShowingValidation() }">
+    <button type="button" class="btn-reset umb-outline blockelement__draggable-element"
+            ng-click="vm.openBlock(block)"
+            ng-focus="block.focus">
+        <span class="caret"></span>
+        <i class="icon {{block.content.icon}}" aria-hidden="true"></i>
+        <span class="name">{{block.label}}</span>
+    </button>
+    <div class="blockelement-inlineblock-editor__inner" ng-class="{'--singleGroup':block.content.variants[0].tabs.length === 1}" ng-if="block.active === true">
+        <umb-element-editor-content model="block.content"></umb-element-editor-content>
+    </div>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less
new file mode 100644
index 0000000000..45a4c08598
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less
@@ -0,0 +1,131 @@
+.blockelement-inlineblock-editor {
+    display: block;
+    margin-bottom: 4px;
+    margin-top: 4px;
+    border: 1px solid @gray-9;
+    border-radius: @baseBorderRadius;
+    transition: border-color 120ms, background-color 120ms;
+
+    .umb-block-list__block:not(.--active) &:hover {
+        border-color: @gray-8;
+    }
+
+    > button {
+        width: 100%;
+        min-height: 48px;
+        cursor: pointer;
+        color: @ui-action-discreet-type;
+        text-align: left;
+        padding-left: 10px;
+        padding-bottom: 2px;
+        user-select: none;
+        background-color: white;
+
+        .caret {
+            vertical-align: middle;
+            transform: rotate(-90deg);
+            transition: transform 80ms ease-out;
+        }
+
+        i {
+            font-size: 22px;
+            display: inline-block;
+            vertical-align: middle;
+        }
+
+        span.name {
+            position: relative;
+            display: inline-block;
+            vertical-align: middle;
+        }
+
+        &:hover {
+            color: @ui-action-discreet-type-hover;
+            border-color: @gray-8;
+        }
+    }
+
+    .umb-block-list__block.--active & {
+        border-color: @gray-8;
+        box-shadow: 0 0 2px 0px rgba(0, 0, 0, 0.05);
+
+        > button {
+            > .caret {
+                transform: rotate(0deg);
+            }
+        }
+    }
+
+    
+    ng-form.ng-invalid-val-server-match-content > .umb-block-list__block > .umb-block-list__block--content > div > & {
+        > button {
+            color: @formErrorText;
+            span.caret {
+                border-top-color: @formErrorText;
+            }
+        }
+    }
+    ng-form.ng-invalid-val-server-match-content > .umb-block-list__block:not(.--active) > .umb-block-list__block--content > div > & {
+        > button {
+            span.name {
+                &::after {
+                    content: "!";
+                    text-align: center;
+                    position: absolute;
+                    top: -6px;
+                    right: -15px;
+                    min-width: 10px;
+                    color: @white;
+                    background-color: @ui-active-type;
+                    border: 2px solid @white;
+                    border-radius: 50%;
+                    font-size: 10px;
+                    font-weight: bold;
+                    padding: 2px;
+                    line-height: 10px;
+                    background-color: @formErrorText;
+                    font-weight: 900;
+        
+                    animation-duration: 1.4s;
+                    animation-iteration-count: infinite;
+                    animation-name: blockelement-inlineblock-editor--badge-bounce;
+                    animation-timing-function: ease;
+                    @keyframes blockelement-inlineblock-editor--badge-bounce {
+                        0%   { transform: translateY(0); }
+                        20%  { transform: translateY(-4px); }
+                        40%  { transform: translateY(0); }
+                        55%  { transform: translateY(-2px); }
+                        70%  { transform: translateY(0); }
+                        100% { transform: translateY(0); }
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+.blockelement-inlineblock-editor__inner {
+    border-top: 1px solid @gray-8;
+    background-color: @gray-12;
+
+    > * > * > * > .umb-group-panel {
+        background-color: transparent;
+        box-shadow: none;
+        margin-top: 10px;
+        margin-bottom: 0;
+        > .umb-group-panel__content .umb-property {
+            margin-bottom: 20px;
+        }
+    }
+    .umb-group-panel + .umb-group-panel {
+        margin-top: 20px;
+    }
+    &.--singleGroup > * > * > * > .umb-group-panel {
+        margin-top: 0;
+        > .umb-group-panel__header {
+            display: none;
+        }
+    }
+    
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html
new file mode 100644
index 0000000000..f51ea4607c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html
@@ -0,0 +1,8 @@
+<button type="button" class="btn-reset umb-outline blockelement-labelblock-editor blockelement__draggable-element"
+        ng-click="block.edit()"
+        ng-focus="block.focus"
+        ng-class="{ '--active': block.active, '--error': parentForm.$invalid && valFormManager.isShowingValidation() }"
+        val-server-property-class="">
+    <i class="icon {{block.content.icon}}" aria-hidden="true"></i>
+    <span>{{block.label}}</span>
+</button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less
new file mode 100644
index 0000000000..613a47b926
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less
@@ -0,0 +1,81 @@
+.blockelement-labelblock-editor {
+    position: relative;
+    display: flex;
+    align-items: center;
+    margin-bottom: 4px;
+    margin-top: 4px;
+    width: 100%;
+    min-height: 48px;
+    border: 1px solid @gray-9;
+    border-radius: @baseBorderRadius;
+    cursor: pointer;
+    color: @ui-action-discreet-type;
+    background-color: white;
+    text-align: left;
+    padding: 0 20px;
+    user-select: none;
+    transition: border-color 120ms, background-color 120ms;
+
+    > i {
+        font-size: 22px;
+        margin-right: 10px;
+        display: inline-block;
+    }
+
+    > span {
+        position: relative;
+        display: inline-block;
+        padding-top:2px;
+        padding-bottom:2px;
+    }
+
+    &:hover {
+        color: @ui-action-discreet-type-hover;
+        background-color: @ui-action-hover;
+    }
+
+    &.--active {
+        color: @ui-active-type;
+        border-color: @ui-active;
+        background-color: @ui-active;
+    }
+
+    ng-form.ng-invalid-val-server-match-content > .umb-block-list__block > .umb-block-list__block--content > div > & {
+        color: @formErrorText;
+    }
+    ng-form.ng-invalid-val-server-match-content > .umb-block-list__block:not(.--active) > .umb-block-list__block--content > div > & {
+        > span {
+            &::after {
+                content: "!";
+                text-align: center;
+                position: absolute;
+                top: -6px;
+                right: -15px;
+                min-width: 10px;
+                color: @white;
+                background-color: @ui-active-type;
+                border: 2px solid @white;
+                border-radius: 50%;
+                font-size: 10px;
+                font-weight: bold;
+                padding: 2px;
+                line-height: 10px;
+                background-color: @formErrorText;
+                font-weight: 900;
+
+                animation-duration: 1.4s;
+                animation-iteration-count: infinite;
+                animation-name: blockelement-inlineblock-editor--badge-bounce;
+                animation-timing-function: ease;
+                @keyframes blockelement-inlineblock-editor--badge-bounce {
+                    0%   { transform: translateY(0); }
+                    20%  { transform: translateY(-4px); }
+                    40%  { transform: translateY(0); }
+                    55%  { transform: translateY(-2px); }
+                    70%  { transform: translateY(0); }
+                    100% { transform: translateY(0); }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html
new file mode 100644
index 0000000000..d5b0ddfd04
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html
@@ -0,0 +1,15 @@
+<div class="blockelement-unsupportedblock-editor blockelement__draggable-element" ng-focus="block.focus">
+    <div class="__header">
+        <i class="icon icon-alert" aria-hidden="true"></i>
+        <span>{{block.label}}</span>
+    </div>
+    <div class="__body">
+        This content is no longer supported in this context.<br/>
+        You might want to remove this block, or contact your developer to take actions for making this block available again.<br/><br/>
+        <!-- TODO: Add link when we have one 
+		    <a href="http://our.umbraco.com" target="_blank" rel="noopener">Learn more about this warning</a>
+		-->
+        <h5>Block data:</h5>
+        <umb-code-snippet language="'JSON'">{{block.data | json : 4 }}</umb-code-snippet>
+    </div>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.less
new file mode 100644
index 0000000000..d3eddd0815
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.less
@@ -0,0 +1,46 @@
+.blockelement-unsupportedblock-editor {
+    position: relative;
+    display: block;
+    box-sizing: border-box;
+    margin-bottom: 4px;
+    margin-top: 4px;
+    width: 100%;
+    border: 1px solid @gray-9;
+    border-radius: @baseBorderRadius;
+
+    > .__header {
+        display: flex;
+        align-items: center;
+        padding-left: 20px;
+        padding-bottom: 2px;
+        min-height: 48px;
+        border-bottom: 1px solid @gray-9;    
+        background-color: @gray-11;
+        color: @gray-6;
+        
+        i {
+            font-size: 22px;
+            margin-right: 5px;
+            display: inline-block;
+            vertical-align: middle;
+        }
+        span {
+            display: inline-block;
+            vertical-align: middle;
+        }
+    }
+
+    > .__body {
+        padding: 20px;
+        background-color: @gray-11;
+
+        a {
+            text-decoration: underline;
+            color: @ui-action-type;
+
+            &:hover {
+                color: @ui-action-type-hover;
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js
new file mode 100644
index 0000000000..5e73755593
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js
@@ -0,0 +1,236 @@
+/**
+ * @ngdoc controller
+ * @name Umbraco.Editors.BlockList.BlockConfigurationController
+ * @function
+ *
+ * @description
+ * The controller for the content type editor property settings dialog
+ */
+
+(function () {
+    "use strict";
+
+    function TransferProperties(fromObject, toObject) {
+        for (var p in fromObject) {
+            toObject[p] = fromObject[p];
+        }
+    }
+
+    function BlockConfigurationController($scope, elementTypeResource, overlayService, localizationService, editorService, eventsService, udiService) {
+
+        var unsubscribe = [];
+
+        var vm = this;
+        vm.openBlock = null;
+
+        function onInit() {
+
+            if (!$scope.model.value) {
+                $scope.model.value = [];
+            }
+
+            loadElementTypes();
+
+        }
+
+        function loadElementTypes() {
+            return elementTypeResource.getAll().then(function (elementTypes) {
+                vm.elementTypes = elementTypes;
+            });
+        }
+
+        function updateUsedElementTypes(event, args) {
+            var key = args.documentType.key;
+            for (var i = 0; i<vm.elementTypes.length; i++) {
+                if (vm.elementTypes[i].key === key) {
+                    vm.elementTypes[i] = args.documentType;
+                }
+            }
+        }
+        unsubscribe.push(eventsService.on("editors.documentType.saved", updateUsedElementTypes));
+
+        vm.requestRemoveBlockByIndex = function (index) {
+            localizationService.localizeMany(["general_delete", "blockEditor_confirmDeleteBlockTypeMessage", "blockEditor_confirmDeleteBlockTypeNotice"]).then(function (data) {
+                var contentElementType = vm.getElementTypeByKey($scope.model.value[index].contentElementTypeKey);
+                overlayService.confirmDelete({
+                    title: data[0],
+                    content: localizationService.tokenReplace(data[1], [contentElementType ? contentElementType.name : "(Unavailable ElementType)"]),
+                    confirmMessage: data[2],
+                    close: function () {
+                        overlayService.close();
+                    },
+                    submit: function () {
+                        vm.removeBlockByIndex(index);
+                        overlayService.close();
+                    }
+                });
+            });
+        }
+
+        vm.removeBlockByIndex = function (index) {
+            $scope.model.value.splice(index, 1);
+        };
+
+        vm.sortableOptions = {
+            "ui-floating": true,
+            items: "umb-block-card",
+            cursor: "grabbing",
+            placeholder: 'umb-block-card --sortable-placeholder'
+        };
+
+
+        vm.getAvailableElementTypes = function () {
+            return vm.elementTypes.filter(function (type) {
+                return !$scope.model.value.find(function (entry) {
+                    return type.key === entry.contentElementTypeKey;
+                });
+            });
+        };
+
+        vm.getElementTypeByKey = function(key) {
+            if (vm.elementTypes) {
+                return vm.elementTypes.find(function (type) {
+                    return type.key === key;
+                }) || null;
+            }
+        };
+
+        vm.openAddDialog = function () {
+
+            localizationService.localize("blockEditor_headlineCreateBlock").then(function(localizedTitle) {
+
+                const contentTypePicker = {
+                    title: localizedTitle,
+                    section: "settings",
+                    treeAlias: "documentTypes",
+                    entityType: "documentType",
+                    isDialog: true,
+                    filter: function (node) {
+                        if (node.metaData.isElement === true) {
+                            var key = udiService.getKey(node.udi);
+                            // If a Block with this ElementType as content already exists, we will emit it as a posible option.
+                            return $scope.model.value.find(function (entry) {
+                                return key === entry.contentElementTypeKey;
+                            });
+                        }
+                        return true;
+                    },
+                    filterCssClass: "not-allowed",
+                    select: function (node) {
+                        vm.addBlockFromElementTypeKey(udiService.getKey(node.udi));
+                        editorService.close();
+                    },
+                    close: function () {
+                        editorService.close();
+                    },
+                    extraActions: [
+                        {
+                            style: "primary",
+                            labelKey: "blockEditor_labelcreateNewElementType",
+                            action: function () {
+                                vm.createElementTypeAndCallback((documentTypeKey) => {
+                                    vm.addBlockFromElementTypeKey(documentTypeKey);
+
+                                    // At this point we will close the contentTypePicker.
+                                    editorService.close();
+                                });
+                            }
+                        }
+                    ]
+                };
+                editorService.treePicker(contentTypePicker);
+
+            });
+        };
+
+        vm.createElementTypeAndCallback = function(callback) {
+            const editor = {
+                create: true,
+                infiniteMode: true,
+                noTemplate: true,
+                isElement: true,
+                noTemplate: true,
+                submit: function (model) {
+                    loadElementTypes().then( function () {
+                        callback(model.documentTypeKey);
+                    });
+                    editorService.close();
+                },
+                close: function () {
+                    editorService.close();
+                }
+            };
+            editorService.documentTypeEditor(editor);
+        }
+
+        vm.addBlockFromElementTypeKey = function(key) {
+
+            var blockType = {
+                "contentElementTypeKey": key,
+                "settingsElementTypeKey": null,
+                "labelTemplate": "",
+                "view": null,
+                "stylesheet": null,
+                "editorSize": "medium",
+                "iconColor": null,
+                "backgroundColor": null,
+                "thumbnail": null
+            };
+
+            $scope.model.value.push(blockType);
+
+            vm.openBlockOverlay(blockType);
+
+        };
+
+
+
+
+
+        vm.openBlockOverlay = function (block) {
+
+            var elementType = vm.getElementTypeByKey(block.contentElementTypeKey);
+
+            if(elementType) {
+                localizationService.localize("blockEditor_blockConfigurationOverlayTitle", [elementType.name]).then(function (data) {
+
+                    var clonedBlockData = Utilities.copy(block);
+                    vm.openBlock = block;
+
+                    var overlayModel = {
+                        block: clonedBlockData,
+                        title: data,
+                        view: "views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html",
+                        size: "small",
+                        submit: function(overlayModel) {
+                            loadElementTypes()// lets load elementType again, to ensure we are up to date.
+                            TransferProperties(overlayModel.block, block);// transfer properties back to block object. (Doing this cause we dont know if block object is added to model jet, therefor we cant use index or replace the object.)
+                            overlayModel.close();
+                        },
+                        close: function() {
+                            editorService.close();
+                            vm.openBlock = null;
+                        }
+                    };
+
+                    // open property settings editor
+                    editorService.open(overlayModel);
+
+                });
+            } else {
+                alert("Cannot be edited cause ElementType does not exist.");
+            }
+
+        };
+
+        $scope.$on('$destroy', function () {
+            unsubscribe.forEach(u => { u(); });
+        });
+
+        onInit();
+
+    }
+
+    angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockList.BlockConfigurationController", BlockConfigurationController);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.html
new file mode 100644
index 0000000000..2bd4be1505
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.html
@@ -0,0 +1,30 @@
+<div
+    class="umb-block-list-block-configuration"
+    ng-controller="Umbraco.PropertyEditors.BlockList.BlockConfigurationController as vm"
+    >
+
+    <div
+        class="umb-block-card-grid"
+        ui-sortable="vm.sortableOptions"
+        ng-model="model.value"
+        >
+
+        <umb-block-card
+            block-config-model="block"
+            element-type-model="vm.getElementTypeByKey(block.contentElementTypeKey)"
+            ng-repeat="block in model.value"
+            ng-class="{'--isOpen':vm.openBlock === block}"
+            ng-click="vm.openBlockOverlay(block)">
+            <div class="__actions">
+                <button type="button" class="btn-reset __action umb-outline" ng-click="vm.requestRemoveBlockByIndex($index); $event.stopPropagation();">
+                    <i class="icon icon-trash" aria-hidden="true"></i>
+                    <localize key="general_delete" class="sr-only">Delete</localize>
+                </button>
+            </div>
+        </umb-block-card>
+
+        <button id="{{model.alias}}" type="button" class="btn-reset __add-button" ng-click="vm.openAddDialog($event)">
+            <localize key="general_add">Add</localize>
+        </button>
+    </div>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.less
new file mode 100644
index 0000000000..878f6a8ef8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.less
@@ -0,0 +1,28 @@
+.umb-block-list-block-configuration {
+
+    .__add-button {
+        position: relative;
+        display: inline-flex;
+        width: 100%;
+        height: 100%;
+        margin-right: 20px;
+        margin-bottom: 20px;
+
+        color: @ui-action-discreet-type;
+        border: 1px dashed @ui-action-discreet-border;
+        border-radius: @doubleBorderRadius;
+
+        align-items: center;
+        justify-content: center;
+
+        padding: 5px 15px;
+        box-sizing: border-box;
+        font-weight: bold;
+    }
+    
+    .__add-button:hover {
+        color: @ui-action-discreet-type-hover;
+        border-color: @ui-action-discreet-border-hover;
+    }
+
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js
new file mode 100644
index 0000000000..cfeca6330c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js
@@ -0,0 +1,326 @@
+/**
+ * @ngdoc controller
+ * @name Umbraco.Editors.BlockList.BlockConfigurationOverlayController
+ * @function
+ *
+ * @description
+ * The controller for the content type editor property settings dialog
+ */
+
+(function () {
+    "use strict";
+
+    function BlockConfigurationOverlayController($scope, overlayService, localizationService, editorService, elementTypeResource, eventsService, udiService, angularHelper) {
+
+        var unsubscribe = [];
+
+        var vm = this;
+        vm.block = $scope.model.block;
+
+        vm.colorPickerOptions = {
+            type: "color",
+            allowEmpty: true,
+            showAlpha: true
+        };
+
+        loadElementTypes();
+
+        function loadElementTypes() {
+            return elementTypeResource.getAll().then(function(elementTypes) {
+                vm.elementTypes = elementTypes;
+
+                vm.contentPreview = vm.getElementTypeByKey(vm.block.contentElementTypeKey);
+                vm.settingsPreview = vm.getElementTypeByKey(vm.block.settingsElementTypeKey);
+            });
+        }
+
+        vm.getElementTypeByKey = function(key) {
+            return vm.elementTypes.find(function (type) {
+                return type.key === key;
+            });
+        };
+
+        vm.openElementType = function(elementTypeKey) {
+            var elementType = vm.getElementTypeByKey(elementTypeKey);
+            if (elementType) {
+                var elementTypeId = elementType.id;
+                const editor = {
+                    id: elementTypeId,
+                    submit: function (model) {
+                        editorService.close();
+                    },
+                    close: function () {
+                        editorService.close();
+                    }
+                };
+                editorService.documentTypeEditor(editor);
+            }
+        };
+
+        vm.createElementTypeAndCallback = function(callback) {
+            const editor = {
+                create: true,
+                infiniteMode: true,
+                isElement: true,
+                noTemplate: true,
+                submit: function (model) {
+                    callback(model.documentTypeKey);
+                    editorService.close();
+                },
+                close: function () {
+                    editorService.close();
+                }
+            };
+            editorService.documentTypeEditor(editor);
+        };
+
+        vm.addSettingsForBlock = function($event, block) {
+
+            localizationService.localize("blockEditor_headlineAddSettingsElementType").then(function(localizedTitle) {
+
+                const settingsTypePicker = {
+                    title: localizedTitle,
+                    section: "settings",
+                    treeAlias: "documentTypes",
+                    entityType: "documentType",
+                    isDialog: true,
+                    filter: function (node) {
+                        if (node.metaData.isElement === true) {
+                            return false;
+                        }
+                        return true;
+                    },
+                    filterCssClass: "not-allowed",
+                    select: function (node) {
+                        vm.applySettingsToBlock(block, udiService.getKey(node.udi));
+                        editorService.close();
+                    },
+                    close: function () {
+                        editorService.close();
+                    },
+                    extraActions: [
+                        {
+                            style: "primary",
+                            labelKey: "blockEditor_labelcreateNewElementType",
+                            action: function () {
+                                vm.createElementTypeAndCallback((key) => {
+                                    vm.applySettingsToBlock(block, key);
+
+                                    // At this point we will close the contentTypePicker.
+                                    editorService.close();
+                                });
+                            }
+                        }
+                    ]
+                };
+                editorService.treePicker(settingsTypePicker);
+
+            });
+        };
+
+        vm.applySettingsToBlock = function(block, key) {
+            block.settingsElementTypeKey = key;
+            vm.settingsPreview = vm.getElementTypeByKey(vm.block.settingsElementTypeKey);
+        };
+
+        vm.requestRemoveSettingsForBlock = function(block) {
+            localizationService.localizeMany(["general_remove", "defaultdialogs_confirmremoveusageof"]).then(function (data) {
+
+                var settingsElementType = vm.getElementTypeByKey(block.settingsElementTypeKey);
+
+                overlayService.confirmRemove({
+                    title: data[0],
+                    content: localizationService.tokenReplace(data[1], [(settingsElementType ? settingsElementType.name : "(Unavailable ElementType)")]),
+                    close: function () {
+                        overlayService.close();
+                    },
+                    submit: function () {
+                        vm.removeSettingsForBlock(block);
+                        overlayService.close();
+                    }
+                });
+            });
+        };
+
+        vm.removeSettingsForBlock = function(block) {
+            block.settingsElementTypeKey = null;
+        };
+
+        function updateUsedElementTypes(event, args) {
+            var key = args.documentType.key;
+            for (var i = 0; i<vm.elementTypes.length; i++) {
+                if (vm.elementTypes[i].key === key) {
+                    vm.elementTypes[i] = args.documentType;
+                }
+            }
+            if (vm.contentPreview && vm.contentPreview.key === key) {
+                vm.contentPreview = args.documentType;
+                $scope.$evalAsync();
+            }
+            if (vm.settingsPreview && vm.settingsPreview.key === key) {
+                vm.settingsPreview = args.documentType;
+                $scope.$evalAsync();
+            }
+        }
+
+        unsubscribe.push(eventsService.on("editors.documentType.saved", updateUsedElementTypes));
+
+        vm.addViewForBlock = function(block) {
+            localizationService.localize("blockEditor_headlineAddCustomView").then(function (localizedTitle) {
+
+                const filePicker = {
+                    title: localizedTitle,
+                    section: "settings",
+                    treeAlias: "files",
+                    entityType: "file",
+                    isDialog: true,
+                    filter: function (i) {
+                        return !(i.name.indexOf(".html") !== -1);
+                    },
+                    filterCssClass: "not-allowed",
+                    select: function (node) {
+                        const filepath = decodeURIComponent(node.id.replace(/\+/g, " "));
+                        block.view = "~/" + filepath;
+                        editorService.close();
+                    },
+                    close: function () {
+                        editorService.close();
+                    }
+                };
+                editorService.treePicker(filePicker);
+
+            });
+        };
+
+        vm.requestRemoveViewForBlock = function(block) {
+            localizationService.localizeMany(["general_remove", "defaultdialogs_confirmremoveusageof"]).then(function (data) {
+                overlayService.confirmRemove({
+                    title: data[0],
+                    content: localizationService.tokenReplace(data[1], [block.view]),
+                    close: function () {
+                        overlayService.close();
+                    },
+                    submit: function () {
+                        vm.removeViewForBlock(block);
+                        overlayService.close();
+                    }
+                });
+            });
+        };
+
+        vm.removeViewForBlock = function(block) {
+            block.view = null;
+        };
+
+        vm.addStylesheetForBlock = function(block) {
+            localizationService.localize("blockEditor_headlineAddCustomStylesheet").then(function (localizedTitle) {
+
+                const filePicker = {
+                    title: localizedTitle,
+                    section: "settings",
+                    treeAlias: "files",
+                    entityType: "file",
+                    isDialog: true,
+                    filter: function (i) {
+                        return !(i.name.indexOf(".css") !== -1);
+                    },
+                    filterCssClass: "not-allowed",
+                    select: function (node) {
+                        const filepath = decodeURIComponent(node.id.replace(/\+/g, " "));
+                        block.stylesheet = "~/" + filepath;
+                        editorService.close();
+                    },
+                    close: function () {
+                        editorService.close();
+                    }
+                };
+                editorService.treePicker(filePicker);
+
+            });
+        };
+
+        vm.requestRemoveStylesheetForBlock = function(block) {
+            localizationService.localizeMany(["general_remove", "defaultdialogs_confirmremoveusageof"]).then(function (data) {
+                overlayService.confirmRemove({
+                    title: data[0],
+                    content: localizationService.tokenReplace(data[1], [block.stylesheet]),
+                    close: function () {
+                        overlayService.close();
+                    },
+                    submit: function () {
+                        vm.removeStylesheetForBlock(block);
+                        overlayService.close();
+                    }
+                });
+            });
+        };
+
+        vm.removeStylesheetForBlock = function(block) {
+            block.stylesheet = null;
+        };
+
+        vm.addThumbnailForBlock = function(block) {
+
+            localizationService.localize("blockEditor_headlineAddThumbnail").then(function (localizedTitle) {
+
+                const thumbnailPicker = {
+                    title: localizedTitle,
+                    section: "settings",
+                    treeAlias: "files",
+                    entityType: "file",
+                    isDialog: true,
+                    filter: function (i) {
+                        return !(i.name.indexOf(".jpg") !== -1 || i.name.indexOf(".jpeg") !== -1 || i.name.indexOf(".png") !== -1 || i.name.indexOf(".svg") !== -1 || i.name.indexOf(".webp") !== -1 || i.name.indexOf(".gif") !== -1);
+                    },
+                    filterCssClass: "not-allowed",
+                    select: function (file) {
+                        const id = decodeURIComponent(file.id.replace(/\+/g, " "));
+                        block.thumbnail = "~/" + id;
+                        editorService.close();
+                    },
+                    close: function () {
+                        editorService.close();
+                    }
+                };
+                editorService.treePicker(thumbnailPicker);
+
+            });
+        };
+
+        vm.removeThumbnailForBlock = function(entry) {
+            entry.thumbnail = null;
+        };
+
+        vm.changeIconColor = function (color) {
+            angularHelper.safeApply($scope, function () {
+                vm.block.iconColor = color ? color.toString() : null;
+            });
+        };
+
+        vm.changeBackgroundColor = function (color) {
+            angularHelper.safeApply($scope, function () {
+                vm.block.backgroundColor = color ? color.toString() : null;
+            });
+        };
+
+        vm.submit = function() {
+            if ($scope.model && $scope.model.submit) {
+                $scope.model.submit($scope.model);
+            }
+        };
+
+        vm.close = function() {
+            if ($scope.model && $scope.model.close) {
+                $scope.model.close($scope.model);
+            }
+        };
+
+        $scope.$on('$destroy', function() {
+            unsubscribe.forEach(u => { u(); });
+        });
+
+    }
+
+    angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockList.BlockConfigurationOverlayController", BlockConfigurationOverlayController);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html
new file mode 100644
index 0000000000..94d7d9810b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html
@@ -0,0 +1,258 @@
+<div class="umb-block-list-block-configuration-overlay" ng-controller="Umbraco.PropertyEditors.BlockList.BlockConfigurationOverlayController as vm">
+
+    <form novalidate name="blockListBlockConfigurationForm" val-form-manager>
+
+        <umb-editor-view ng-if="!page.loading">
+
+            <umb-editor-header
+                name="model.title"
+                name-locked="true"
+                hide-alias="true"
+                hide-icon="true"
+                hide-description="true">
+            </umb-editor-header>
+
+            <umb-editor-container>
+                <div class="form-vertical">
+
+                    <div class="umb-group-panel">
+
+                        <div class="umb-group-panel__header">
+                            <localize key="blockEditor_headlineEditorAppearance">Editor appearance</localize>
+                        </div>
+
+                        <div class="umb-group-panel__content">
+
+                            <!-- label -->
+                            <div class="control-group umb-control-group -no-border">
+                                <div class="umb-el-wrap">
+                                    <label class="control-label" for="label"><localize key="blockEditor_labelLabelTemplate">label</localize></label>
+                                    <div class="controls">
+                                        <input type="text" name="label" ng-model="vm.block.label" style="width:100%" umb-auto-focus/>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <!-- custom view -->
+                            <div class="control-group umb-control-group -no-border">
+                                <div class="umb-el-wrap">
+                                    <label class="control-label" for="iconcolor"><localize key="blockEditor_labelCustomView">Custom view</localize></label>
+                                    <umb-property-info-button button-title="@blockEditor_labelCustomViewInfoTitle" localize="button-title"><localize key="blockEditor_labelCustomViewDescription">Overwrite how this block appears in the BackOffice UI. Pick a .html file containing your presentation.</localize></umb-property-info-button>
+                                    <div class="controls">
+                                        <div class="__settings-input --hasValue" ng-if="vm.block.view !== null" >
+
+                                            <umb-node-preview icon="'icon-document'" name="vm.block.view"></umb-node-preview>
+                                            <div class="__control-actions">
+                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.requestRemoveViewForBlock(vm.block)">
+                                                    <i class="icon icon-wrong"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <button type="button" class="btn-reset __settings-input --noValue umb-outline" ng-if="vm.block.view === null" ng-click="vm.addViewForBlock(vm.block)">
+                                            <localize key="blockEditor_addCustomView">Add custom view</localize>
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <!-- custom stylesheet -->
+                            <div class="control-group umb-control-group -no-border">
+                                <div class="umb-el-wrap">
+                                    <label class="control-label" for="iconcolor"><localize key="blockEditor_labelCustomStylesheet">Custom stylesheet</localize></label>
+                                    <div class="controls">
+                                        <div class="__settings-input --hasValue" ng-if="vm.block.stylesheet !== null" >
+
+                                            <umb-node-preview icon="'icon-document'" name="vm.block.stylesheet"></umb-node-preview>
+                                            <div class="__control-actions">
+                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.requestRemoveStylesheetForBlock(vm.block)">
+                                                    <i class="icon icon-wrong"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <button type="button" class="btn-reset __settings-input --noValue umb-outline" ng-if="vm.block.stylesheet === null" ng-click="vm.addStylesheetForBlock(vm.block)">
+                                            <localize key="blockEditor_addCustomStylesheet">Add custom stylesheet</localize>
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <!-- editor overlay size -->
+                            <div class="control-group umb-control-group -no-border">
+                                <div class="umb-el-wrap">
+                                    <label class="control-label" for="editorSize"><localize key="blockEditor_labelEditorSize">Editor size</localize></label>
+                                    <div class="controls">
+                                        <select id="editorSize" ng-model="vm.block.editorSize">
+                                            <option value="small">Small</option>
+                                            <option value="medium">Medium</option>
+                                            <option value="large">Large</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
+
+                    <div class="umb-group-panel">
+
+                        <div class="umb-group-panel__header">
+                            <localize key="blockEditor_headlineDataModels">Data Models</localize>
+                        </div>
+
+                        <div class="umb-group-panel__content">
+
+                            <!-- Content Element Type -->
+                            <div class="control-group umb-control-group -no-border">
+                                <div class="umb-el-wrap">
+                                    <label class="control-label"><localize key="blockEditor_labelContentElementType">Content ElementType</localize></label>
+                                    <div class="controls">
+                                        <div class="__settings-input --hasValue" ng-if="vm.block.contentElementTypeKey !== null" >
+                                            <umb-node-preview icon="vm.contentPreview.icon" name="vm.contentPreview.name" alias="vm.contentPreview.alias"></umb-node-preview>
+                                            <div class="__control-actions">
+                                                <button type="button" class="btn-reset __control-actions-btn --open umb-outline" ng-click="vm.openElementType(vm.block.contentElementTypeKey)">
+                                                    <i class="icon icon-edit"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <!-- Settings Element Type -->
+                            <div class="control-group umb-control-group -no-border">
+                                <div class="umb-el-wrap">
+                                    <label class="control-label"><localize key="blockEditor_labelSettingsElementType">Settings Element Type</localize></label>
+                                    <div class="controls">
+                                        <div class="__settings-input --hasValue" ng-if="vm.block.settingsElementTypeKey !== null">
+                                            <umb-node-preview icon="vm.settingsPreview.icon" name="vm.settingsPreview.name" alias="vm.settingsPreview.alias"></umb-node-preview>
+                                            <div class="__control-actions">
+                                                <button type="button" class="btn-reset __control-actions-btn --open umb-outline" ng-click="vm.openElementType(vm.block.settingsElementTypeKey)">
+                                                    <i class="icon icon-edit"></i>
+                                                </button>
+                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.requestRemoveSettingsForBlock(vm.block)">
+                                                    <i class="icon icon-wrong"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <button type="button" class="btn-reset __settings-input --noValue umb-outline" ng-if="vm.block.settingsElementTypeKey === null" ng-click="vm.addSettingsForBlock($event, vm.block)">
+                                            <localize key="blockEditor_addSettingsElementType">Add settings</localize>
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="umb-group-panel">
+
+                        <div class="umb-group-panel__header">
+                            <localize key="blockEditor_headlineCatalogueAppearance">Catalogue appearance</localize>
+                        </div>
+
+                        <div class="umb-group-panel__content">
+
+                            <!-- backgroundColor -->
+                            <div class="control-group umb-control-group -no-border">
+                                <div class="umb-el-wrap">
+                                    <label class="control-label" for="backgroundColor"><localize key="blockEditor_labelBackgroundColor">Background Color</localize></label>
+                                    <div class="controls">
+                                        <umb-color-picker
+                                            ng-model="vm.block.backgroundColor"
+                                            options="vm.colorPickerOptions"
+                                            on-change="vm.changeBackgroundColor(color)">
+                                        </umb-color-picker>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <!-- iconColor -->
+                            <div class="control-group umb-control-group -no-border">
+                                <div class="umb-el-wrap">
+                                    <label class="control-label" for="iconColor"><localize key="blockEditor_labelIconColor">Icon Color</localize></label>
+                                    <div class="controls">
+                                        <umb-color-picker
+                                            ng-model="vm.block.iconColor"
+                                            options="vm.colorPickerOptions"
+                                            on-change="vm.changeIconColor(color)">
+                                        </umb-color-picker>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <!-- thumbnail -->
+                            <div class="control-group umb-control-group -no-border">
+                                <div class="umb-el-wrap">
+                                    <label class="control-label" for="iconcolor"><localize key="blockEditor_thumbnail">Thumbnail</localize></label>
+                                    <div class="controls">
+                                        <div class="__settings-input --hasValue" ng-if="vm.block.thumbnail !== null" >
+
+                                            <umb-node-preview icon="'icon-document'" name="vm.block.thumbnail"></umb-node-preview>
+                                            <div class="__control-actions">
+                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.removeThumbnailForBlock(vm.block)">
+                                                    <i class="icon icon-wrong"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <button type="button" class="btn-reset __settings-input --noValue umb-outline" ng-if="vm.block.thumbnail === null" ng-click="vm.addThumbnailForBlock(vm.block)">
+                                            <localize key="blockEditor_addThumbnail">Add thumbnail</localize>
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
+
+                    <div class="umb-group-panel">
+
+                        <div class="umb-group-panel__header">
+                            <localize key="blockEditor_headlineAdvanced">Advanced</localize>
+                        </div>
+
+                        <div class="umb-group-panel__content">
+
+                            <!-- forceHideContentEditorInOverlay -->
+                            <div class="control-group umb-control-group -no-border">
+                                <div class="umb-el-wrap">
+                                    <label class="control-label" for="forceHideContentEditorInOverlay"><localize key="blockEditor_forceHideContentEditor">Force hide content editor</localize></label>
+                                    <div class="controls">
+                                        <umb-toggle checked="vm.block.forceHideContentEditorInOverlay" on-click="vm.block.forceHideContentEditorInOverlay = vm.block.forceHideContentEditorInOverlay != true"></umb-toggle>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
+
+                </div>
+            </umb-editor-container>
+
+            <umb-editor-footer>
+
+                <umb-editor-footer-content-right>
+
+                    <umb-button
+                        action="vm.close()"
+                        shortcut="esc"
+                        button-style="link"
+                        label-key="general_close"
+                        type="button">
+                    </umb-button>
+
+                    <umb-button
+                        action="vm.submit()"
+                        button-style="primary"
+                        state="submitButtonState"
+                        label-key="buttons_submitChanges"
+                        type="button">
+                    </umb-button>
+
+                </umb-editor-footer-content-right>
+
+            </umb-editor-footer>
+        </umb-editor-view>
+    </form>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.less
new file mode 100644
index 0000000000..8d063c77fb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.less
@@ -0,0 +1,100 @@
+.umb-block-list-block-configuration-overlay {
+
+
+    .umb-node-preview {
+        flex-grow: 1;
+    }
+
+    .__control-actions {
+        position: absolute;
+        display: flex;
+        align-items: center;
+        top:0;
+        bottom: 0;
+        right: 0;
+        background-color: rgba(255, 255, 255, 0.8);
+        opacity: 0;
+        transition: opacity 120ms;
+    }
+    .control-group:hover,
+    .control-group:focus,
+    .control-group:focus-within {
+        .__control-actions {
+            opacity: 1;
+        }
+    }
+    .__control-actions-btn {
+        position: relative;
+        color: @ui-action-discreet-type;
+        height: 32px;
+        width: 26px;
+        &:hover {
+            color: @ui-action-discreet-type-hover;
+        }
+        &:last-of-type {
+            margin-right: 7px;
+        }
+    }
+    
+    .umb-node-preview {
+        border-bottom: none;
+    }
+
+    .__settings-input {
+        position: relative;
+        padding: 5px 8px;
+        margin-bottom: 10px;
+        color: @ui-action-discreet-type;
+        border: 1px dashed @ui-action-discreet-border;
+        width: 100%;
+        font-weight: bold;
+        display: inline-flex;
+        flex-flow: row nowrap;
+
+        localize {
+            width: 100%;
+        }
+
+        .umb-node-preview {
+            padding: 3px 0;
+            margin-left: 5px;
+            overflow: hidden;
+        }
+
+        &.--noValue {
+            text-align: center;
+            border-radius: @baseBorderRadius;
+            color: white;
+            transition: color 120ms;
+            &:hover, &:focus {
+                color: @ui-action-discreet-type-hover;
+                border-color: @ui-action-discreet-border-hover;
+            }
+        }
+
+        &.--hasValue {
+            border: 1px solid @inputBorder;
+            padding: 0;
+        }
+    }
+
+    .__add-button {
+        width:100%;
+        color: @ui-action-discreet-type;
+        border: 1px dashed @ui-action-discreet-border;
+        border-radius: @baseBorderRadius;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 5px 15px;
+        box-sizing: border-box;
+        margin: 20px 0;
+        font-weight: bold;
+    }
+    
+    .__add-button:hover {
+        color: @ui-action-discreet-type-hover;
+        border-color: @ui-action-discreet-border-hover;
+    }
+
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html
new file mode 100644
index 0000000000..9726daf5e6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html
@@ -0,0 +1,65 @@
+<div class="umb-block-list">
+
+    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
+
+    <div class="umb-block-list__wrapper" ng-style="vm.listWrapperStyles">
+
+        <div ui-sortable="vm.sortableOptions" ng-model="vm.layout" ng-if="vm.loading !== true">
+
+            <div ng-repeat="layout in vm.layout track by layout.$block.key">
+
+                <button type="button"
+                        class="btn-reset umb-block-list__block--create-button"
+                        ng-click="vm.showCreateDialog($index, $event)"
+                        ng-controller="Umbraco.PropertyEditors.BlockListPropertyEditor.CreateButtonController as inlineCreateButtonCtrl"
+                        ng-mousemove="inlineCreateButtonCtrl.onMouseMove($event)">
+                    <div class="__plus" ng-style="{'left':inlineCreateButtonCtrl.plusPosX}">
+                        <i class="icon icon-add" aria-hidden="true"></i>
+                    </div>
+                </button>
+
+                <umb-block-list-row block-editor-api="vm.blockEditorApi"
+                                    layout="layout"
+                                    index="$index">
+                </umb-block-list-row>
+
+            </div>
+        </div>
+
+        <button ng-if="vm.loading !== true"
+                id="{{vm.model.alias}}"
+                type="button"
+                class="btn-reset umb-block-list__create-button umb-outline"
+                ng-class="{ '--disabled': vm.availableBlockTypes.length === 0 }"
+                ng-click="vm.showCreateDialog(vm.layout.length, $event)">
+            <localize key="grid_addElement">Add content</localize>
+        </button>
+
+        <input type="hidden" name="minCount" ng-model="vm.layout" val-server="minCount" />
+        <input type="hidden" name="maxCount" ng-model="vm.layout" val-server="maxCount" />
+
+        <div ng-messages="vm.propertyForm.minCount.$error">
+            <div class="help text-error" ng-message="minCount">
+                <localize key="validation_entriesShort" tokens="[vm.validationLimit.min, vm.validationLimit.min - vm.layout.length]" watch-tokens="true">Minimum %0% entries, needs <strong>%1%</strong> more.</localize>
+            </div>
+            <span class="help-inline" ng-message="valServer" ng-bind-html="vm.propertyForm.minCount.errorMsg">></span>
+        </div>
+        <div ng-messages="vm.propertyForm.maxCount.$error">
+            <div class="help text-error" ng-message="maxCount">
+                <localize key="validation_entriesExceed" tokens="[vm.validationLimit.max, vm.layout.length - vm.validationLimit.max]" watch-tokens="true">Maximum %0% entries, <strong>%1%</strong> too many.</localize>
+            </div>
+            <span class="help-inline" ng-message="valServer" ng-bind-html="vm.propertyForm.maxCount.errorMsg"></span>
+        </div>
+
+    </div>
+
+    <umb-overlay
+        ng-if="vm.blockTypePicker.show"
+        position="target"
+        size="vm.blockTypePicker.size"
+        view="vm.blockTypePicker.view"
+        model="vm.blockTypePicker">
+    </umb-overlay>
+
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less
new file mode 100644
index 0000000000..e290c6e856
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less
@@ -0,0 +1,265 @@
+@umb-block-list__item_minimum_height: 48px;
+
+.umb-block-list {
+    padding-bottom:10px;
+}
+
+.umb-block-list .umb-load-indicator {
+    margin-bottom:20px;
+}
+
+.umb-block-list__wrapper {
+    position: relative;
+    max-width: 1024px;
+    > .ui-sortable > .ui-sortable-helper > .umb-block-list__block > .umb-block-list__block--content > * {
+        box-shadow: 0px 5px 10px 0 rgba(0,0,0,.2);
+    }
+}
+
+.umb-block-list__block {
+    position: relative;
+    width: 100%;
+
+    > .umb-block-list__block--actions {
+        opacity: 0;
+        transition: opacity 120ms;
+
+        .--error {
+            color: @formErrorBorder !important;
+        }
+    }
+
+    &:hover,
+    &:focus,
+    &:focus-within,
+    &.--active {
+
+        > .umb-block-list__block--actions {
+            opacity: 1;
+        }
+    }
+
+    &.--show-validation {
+        ng-form.ng-invalid-val-server-match-content > & {
+            border: 2px solid @formErrorText;
+            border-radius: @baseBorderRadius;
+            &::after {
+                content: "!";
+                position: absolute;
+                top: -12px;
+                right: -12px;
+                display: inline-flex;
+                align-items: center;
+                justify-content: center;
+                width: 18px;
+                height: 18px;
+                border-radius: 50%;
+                font-size: 13px;
+                text-align: center;
+                font-weight: bold;
+                background-color: @errorBackground;
+                color: @errorText;
+                border: 2px solid @white;
+                font-weight: 900;
+    
+                animation-duration: 1.4s;
+                animation-iteration-count: infinite;
+                animation-name: umb-block-list__block--content--badge-bounce;
+                animation-timing-function: ease;
+                @keyframes umb-block-list__block--content--badge-bounce {
+                    0%   { transform: translateY(0); }
+                    20%  { transform: translateY(-6px); }
+                    40%  { transform: translateY(0); }
+                    55%  { transform: translateY(-3px); }
+                    70%  { transform: translateY(0); }
+                    100% { transform: translateY(0); }
+                }
+            }
+        }
+    }
+}
+ng-form.ng-invalid-val-server-match-settings > .umb-block-list__block > .umb-block-list__block--actions {
+    opacity: 1;
+}
+.umb-block-list__block--actions {
+    position: absolute;
+    z-index:999999999;// We always want to be on top of custom view, but we need to make sure we still are behind relevant Umbraco CMS UI. ToDo: Needs further testing.
+    top: 10px;
+    right: 10px;
+    font-size: 0;
+    background-color: rgba(255, 255, 255, .96);
+    border-radius: 16px;
+    padding-left: 5px;
+    padding-right: 5px;
+    .action {
+        position: relative;
+        display: inline-block;
+        color: @ui-action-discreet-type;
+        font-size: 18px;
+        padding: 5px;
+        &:hover {
+            color: @ui-action-discreet-type-hover;
+        }
+        > .__error-badge {
+            position: absolute;
+            top: -2px;
+            right: -2px;
+            min-width: 8px;
+            color: @white;
+            background-color: @ui-active-type;
+            border: 2px solid @white;
+            border-radius: 50%;
+            font-size: 8px;
+            font-weight: bold;
+            padding: 2px;
+            line-height: 8px;
+            background-color: @red;
+            display: none;
+            font-weight: 900;
+        }
+        &.--error > .__error-badge {
+            display: block;
+
+            animation-duration: 1.4s;
+            animation-iteration-count: infinite;
+            animation-name: umb-block-list__action--badge-bounce;
+            animation-timing-function: ease;
+            @keyframes umb-block-list__action--badge-bounce {
+                0%   { transform: translateY(0); }
+                20%  { transform: translateY(-4px); }
+                40%  { transform: translateY(0); }
+                55%  { transform: translateY(-2px); }
+                70%  { transform: translateY(0); }
+                100% { transform: translateY(0); }
+            }
+
+        }
+    }
+}
+
+.umb-block-list__block--content {
+
+    > div {
+        position: relative;
+        width: 100%;
+        min-height: @umb-block-list__item_minimum_height;
+        background-color: @white;
+        border-radius: @baseBorderRadius;
+        box-sizing: border-box;
+    }
+
+}
+
+.blockelement__draggable-element {
+    cursor: grab;
+}
+
+
+.umb-block-list__block--create-button {
+    position: absolute;
+    width: 100%;
+    z-index: 1;
+    opacity: 0;
+    outline: none;
+    height: 12px;
+    margin-top: -9px;
+    padding-top: 6px;
+    margin-bottom: -6px;
+    transition: opacity 240ms;
+
+    &::before {
+        content: '';
+        position: absolute;
+        background-color: @blueMid;
+        border-top: 1px solid white;
+        border-bottom: 1px solid white;
+        border-radius: 2px;
+        top: 5px;
+        right: 0;
+        left: 0;
+        height: 2px;
+        animation: umb-block-list__block--create-button_before 400ms ease-in-out alternate infinite;
+        transform: scaleX(.99);
+        transition: transform 240ms ease-out;
+
+        @keyframes umb-block-list__block--create-button_before {
+            0%   { opacity: 1; }
+            100% { opacity: 0.5; }
+        }
+    }
+
+    > .__plus {
+        position: absolute;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        pointer-events: none; // lets stop avoiding the mouse values in JS move event.
+        box-sizing: border-box;
+        width: 28px;
+        height: 28px;
+        margin-left: -16px - 8px;
+        margin-top: -16px;
+        border-radius: 3em;
+        font-size: 14px;
+        border: 2px solid @blueMid;
+        color: @blueMid;
+        background-color: rgba(255, 255, 255, .96);
+        box-shadow: 0 0 0 2px rgba(255, 255, 255, .96);
+        transform: scale(0);
+        transition: transform 240ms ease-in;
+        
+        animation: umb-block-list__block--create-button__plus 400ms ease-in-out alternate infinite;
+
+        @keyframes umb-block-list__block--create-button__plus {
+            0%   { color: rgba(@blueMid, 1); }
+            100% { color: rgba(@blueMid, 0.8); }
+        }
+        
+    }
+
+    &:focus {
+        > .__plus {
+            border-color: @ui-outline;
+        }
+    }
+
+    &:hover, &:focus {
+        opacity: 1;
+
+        &::before {
+            transform: scaleX(1);
+        }
+        > .__plus {
+            transform: scale(1);
+            transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.275);
+            
+        }
+    }
+}
+.umb-block-list__create-button {
+    position: relative;
+    display: flex;
+    width: 100%;
+    align-items: center;
+    justify-content: center;
+    border: 1px dashed @ui-action-discreet-border;
+    color: @ui-action-discreet-type;
+    font-weight: bold;
+    margin: 2px 0;
+    padding: 5px 15px;
+    box-sizing: border-box;
+    border-radius: @baseBorderRadius;
+}
+
+.umb-block-list__create-button:hover {
+    color: @ui-action-discreet-type-hover;
+    border-color: @ui-action-discreet-border-hover;
+    text-decoration: none;
+}
+
+.umb-block-list__create-button.--disabled,
+.umb-block-list__create-button.--disabled:hover {
+    color: @gray-7;
+    border-color: @gray-7;
+    cursor: default;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html
new file mode 100644
index 0000000000..c692c81eaf
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html
@@ -0,0 +1,42 @@
+<ng-form name="vm.blockRowForm" val-server-match="{ 'contains' : { 'valServerMatchContent': vm.layout.$block.content.key, 'valServerMatchSettings': vm.layout.$block.settings.key } }">
+    <div class="umb-block-list__block" ng-class="{'--active':vm.layout.$block.active, '--show-validation': vm.layout.$block.showValidation === true}">
+
+        <umb-block-list-block stylesheet="{{::vm.layout.$block.config.stylesheet}}"
+                              class="umb-block-list__block--content"
+                              ng-class="{'blockelement__draggable-element': vm.layout.$block.config.stylesheet}"
+                              view="{{vm.layout.$block.view}}"
+                              api="vm.blockEditorApi"
+                              block="vm.layout.$block"
+                              index="vm.index"
+                              parent-form="vm.blockRowForm">
+        </umb-block-list-block>
+
+        <div class="umb-block-list__block--actions">
+            <button type="button" class="btn-reset umb-outline action --settings" localize="title" title="actions_editSettings"
+                    ng-click="vm.blockEditorApi.openSettingsForBlock(vm.layout.$block, vm.index, vm.blockRowForm);"
+                    ng-class="{ '--error': vm.blockRowForm.$error.valServerMatchSettings && vm.valFormManager.isShowingValidation() }"
+                    ng-if="vm.layout.$block.showSettings === true">
+                <i class="icon icon-settings" aria-hidden="true"></i>
+                <span class="sr-only">
+                    <localize key="general_settings">Settings</localize>
+                </span>
+                <div class="__error-badge">!</div>
+            </button>
+            <button type="button" class="btn-reset umb-outline action --copy" localize="title" title="actions_copy"
+                    ng-click="vm.blockEditorApi.copyBlock(vm.layout.$block);"
+                    ng-if="vm.layout.$block.showCopy === true">
+                <i class="icon icon-documents" aria-hidden="true"></i>
+                <span class="sr-only">
+                    <localize key="general_copy">Copy</localize>
+                </span>
+            </button>
+            <button type="button" class="btn-reset umb-outline action --delete" localize="title" title="actions_delete"
+                    ng-click="vm.blockEditorApi.requestDeleteBlock(vm.layout.$block);">
+                <i class="icon icon-trash" aria-hidden="true"></i>
+                <span class="sr-only">
+                    <localize key="general_delete">Delete</localize>
+                </span>
+            </button>
+        </div>
+    </div>
+</ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
new file mode 100644
index 0000000000..56dbc68d90
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
@@ -0,0 +1,698 @@
+(function () {
+    "use strict";
+
+
+    /**
+     * @ngdoc directive
+     * @name umbraco.directives.directive:umbBlockListPropertyEditor
+     * @function
+     *
+     * @description
+     * The component for the block list property editor.
+     */
+    angular
+        .module("umbraco")
+        .component("umbBlockListPropertyEditor", {
+            templateUrl: "views/propertyeditors/blocklist/umb-block-list-property-editor.html",
+            controller: BlockListController,
+            controllerAs: "vm",
+            bindings: {
+                model: "="
+            },
+            require: {
+                propertyForm: "^form",
+                umbProperty: "?^umbProperty",
+                umbVariantContent: '?^^umbVariantContent',
+                umbVariantContentEditors: '?^^umbVariantContentEditors',
+                umbElementEditorContent: '?^^umbElementEditorContent'
+            }
+        });
+
+    function BlockListController($scope, editorService, clipboardService, localizationService, overlayService, blockEditorService, udiService, serverValidationManager, angularHelper) {
+
+        var unsubscribe = [];
+        var modelObject;
+
+        // Property actions:
+        var copyAllBlocksAction = null;
+        var deleteAllBlocksAction = null;
+
+        var inlineEditing = false;
+        var liveEditing = true;
+
+        var vm = this;
+
+        vm.loading = true;
+        vm.currentBlockInFocus = null;
+        vm.setBlockFocus = function (block) {
+            if (vm.currentBlockInFocus !== null) {
+                vm.currentBlockInFocus.focus = false;
+            }
+            vm.currentBlockInFocus = block;
+            block.focus = true;
+        };
+
+        vm.supportCopy = clipboardService.isSupported();
+
+        vm.layout = []; // The layout object specific to this Block Editor, will be a direct reference from Property Model.
+        vm.availableBlockTypes = []; // Available block entries of this property editor.
+        vm.labels = {};
+
+        localizationService.localizeMany(["grid_addElement", "content_createEmpty"]).then(function (data) {
+            vm.labels.grid_addElement = data[0];
+            vm.labels.content_createEmpty = data[1];
+        });
+
+        vm.$onInit = function() {
+            if (vm.umbProperty && !vm.umbVariantContent) {// if we dont have vm.umbProperty, it means we are in the DocumentTypeEditor.
+                // not found, then fallback to searching the scope chain, this may be needed when DOM inheritance isn't maintained but scope
+                // inheritance is (i.e.infinite editing)
+                var found = angularHelper.traverseScopeChain($scope, s => s && s.vm && s.vm.constructor.name === "umbVariantContentController");
+                vm.umbVariantContent = found ? found.vm : null;
+                if (!vm.umbVariantContent) {
+                    throw "Could not find umbVariantContent in the $scope chain";
+                }
+            }
+
+            // set the onValueChanged callback, this will tell us if the block list model changed on the server
+            // once the data is submitted. If so we need to re-initialize
+            vm.model.onValueChanged = onServerValueChanged;
+
+            inlineEditing = vm.model.config.useInlineEditingAsDefault;
+            liveEditing = vm.model.config.useLiveEditing;
+
+            vm.validationLimit = vm.model.config.validationLimit;
+
+            vm.listWrapperStyles = {};
+
+            if (vm.model.config.maxPropertyWidth) {
+                vm.listWrapperStyles['max-width'] = vm.model.config.maxPropertyWidth;
+            }
+
+            // We need to ensure that the property model value is an object, this is needed for modelObject to recive a reference and keep that updated.
+            if(typeof vm.model.value !== 'object' || vm.model.value === null) {// testing if we have null or undefined value or if the value is set to another type than Object.
+                vm.model.value = {};
+            }
+
+            var scopeOfExistence = $scope;
+            if(vm.umbVariantContentEditors && vm.umbVariantContentEditors.getScope) {
+                scopeOfExistence = vm.umbVariantContentEditors.getScope();
+            } else if(vm.umbElementEditorContent && vm.umbElementEditorContent.getScope) {
+                scopeOfExistence = vm.umbElementEditorContent.getScope();
+            }
+
+            copyAllBlocksAction = {
+                labelKey: "clipboard_labelForCopyAllEntries",
+                labelTokens: [vm.model.label],
+                icon: "documents",
+                method: requestCopyAllBlocks,
+                isDisabled: true
+            };
+
+            deleteAllBlocksAction = {
+                labelKey: 'clipboard_labelForRemoveAllEntries',
+                labelTokens: [],
+                icon: 'trash',
+                method: requestDeleteAllBlocks,
+                isDisabled: true
+            };
+
+            var propertyActions = [
+                copyAllBlocksAction,
+                deleteAllBlocksAction
+            ];
+
+            if (vm.umbProperty) {
+                vm.umbProperty.setPropertyActions(propertyActions);
+            }
+
+            // Create Model Object, to manage our data for this Block Editor.
+            modelObject = blockEditorService.createModelObject(vm.model.value, vm.model.editor, vm.model.config.blocks, scopeOfExistence, $scope);
+            modelObject.load().then(onLoaded);
+
+        };
+
+        // Called when we save the value, the server may return an updated data and our value is re-synced
+        // we need to deal with that here so that our model values are all in sync so we basically re-initialize.
+        function onServerValueChanged(newVal, oldVal) {
+
+            // We need to ensure that the property model value is an object, this is needed for modelObject to recive a reference and keep that updated.
+            if (typeof newVal !== 'object' || newVal === null) {// testing if we have null or undefined value or if the value is set to another type than Object.
+                vm.model.value = newVal = {};
+            }
+
+            modelObject.update(vm.model.value, $scope);
+            onLoaded();
+        }
+
+        function setDirty() {
+            if (vm.propertyForm) {
+                vm.propertyForm.$setDirty();
+            }
+        }
+
+        function onLoaded() {
+
+            // Store a reference to the layout model, because we need to maintain this model.
+            vm.layout = modelObject.getLayout([]);
+
+            var invalidLayoutItems = [];
+
+            // Append the blockObjects to our layout.
+            vm.layout.forEach(entry => {
+                // $block must have the data property to be a valid BlockObject, if not its considered as a destroyed blockObject.
+                if (entry.$block === undefined || entry.$block === null || entry.$block.data === undefined) {
+                    var block = getBlockObject(entry);
+
+                    // If this entry was not supported by our property-editor it would return 'null'.
+                    if (block !== null) {
+                        entry.$block = block;
+                    }
+                    else {
+                        // then we need to filter this out and also update the underlying model. This could happen if the data
+                        // is invalid for some reason or the data structure has changed.
+                        invalidLayoutItems.push(entry);
+                    }
+                }
+            });
+
+            // remove the ones that are invalid
+            invalidLayoutItems.forEach(entry => {
+                var index = vm.layout.findIndex(x => x === entry);
+                if (index >= 0) {
+                    vm.layout.splice(index, 1);
+                }
+            });
+
+            vm.availableContentTypesAliases = modelObject.getAvailableAliasesForBlockContent();
+            vm.availableBlockTypes = modelObject.getAvailableBlocksForBlockPicker();
+
+            vm.loading = false;
+
+            $scope.$evalAsync();
+
+        }
+
+        function getDefaultViewForBlock(block) {
+
+            var defaultViewFolderPath = "views/propertyeditors/blocklist/blocklistentryeditors/";
+
+            if (block.config.unsupported === true)
+                return defaultViewFolderPath + "unsupportedblock/unsupportedblock.editor.html";
+
+            if (inlineEditing === true)
+                return defaultViewFolderPath + "inlineblock/inlineblock.editor.html";
+            return defaultViewFolderPath + "labelblock/labelblock.editor.html";
+        }
+
+        /**
+         * Ensure that the containing content variant languag and current property culture is transfered along
+         * to the scaffolded content object representing this block.
+         * This is required for validation along with ensuring that the umb-property inheritance is constently maintained.
+         * @param {any} content
+         */
+        function ensureCultureData(content) {
+
+            if (!content) return;
+
+            if (vm.umbVariantContent.editor.content.language) {
+                // set the scaffolded content's language to the language of the current editor
+                content.language = vm.umbVariantContent.editor.content.language;
+            }
+            // currently we only ever deal with invariant content for blocks so there's only one
+            content.variants[0].tabs.forEach(tab => {
+                tab.properties.forEach(prop => {
+                    // set the scaffolded property to the culture of the containing property
+                    prop.culture = vm.umbProperty.property.culture;
+                });
+            });
+        }
+
+        function getBlockObject(entry) {
+            var block = modelObject.getBlockObject(entry);
+
+            if (block === null) return null;
+
+            ensureCultureData(block.content);
+            ensureCultureData(block.settings);
+
+            block.view = (block.config.view ? block.config.view : getDefaultViewForBlock(block));
+            block.showValidation = block.config.view ? true : false;
+
+            block.hideContentInOverlay = block.config.forceHideContentEditorInOverlay === true || inlineEditing === true;
+            block.showSettings = block.config.settingsElementTypeKey != null;
+            block.showCopy = vm.supportCopy && block.config.contentElementTypeKey != null;// if we have content, otherwise it doesn't make sense to copy.
+
+
+            // Index is set by umbblocklistblock component and kept up to date by it.
+            block.index = 0;
+            block.setParentForm = function (parentForm) {
+                this._parentForm = parentForm;
+            }
+            block.activate = activateBlock.bind(null, block);
+            block.edit = function () {
+                var blockIndex = vm.layout.indexOf(this.layout);
+                editBlock(this, false, blockIndex, this._parentForm);
+            }
+            block.editSettings = function () {
+                var blockIndex = vm.layout.indexOf(this.layout);
+                editBlock(this, true, blockIndex, this._parentForm);
+            }
+            block.requestDelete = requestDeleteBlock.bind(null, block);
+            block.delete = deleteBlock.bind(null, block);
+            block.copy = copyBlock.bind(null, block);
+
+            return block;
+        }
+
+
+        function addNewBlock(index, contentElementTypeKey) {
+
+            // Create layout entry. (not added to property model jet.)
+            var layoutEntry = modelObject.create(contentElementTypeKey);
+            if (layoutEntry === null) {
+                return false;
+            }
+
+            // make block model
+            var blockObject = getBlockObject(layoutEntry);
+            if (blockObject === null) {
+                return false;
+            }
+
+            // If we reach this line, we are good to add the layoutEntry and blockObject to our models.
+
+            // Add the Block Object to our layout entry.
+            layoutEntry.$block = blockObject;
+
+            // add layout entry at the decired location in layout.
+            vm.layout.splice(index, 0, layoutEntry);
+
+            // lets move focus to this new block.
+            vm.setBlockFocus(blockObject);
+
+            return true;
+
+        }
+
+        function deleteBlock(block) {
+
+            var layoutIndex = vm.layout.findIndex(entry => entry.contentUdi === block.layout.contentUdi);
+            if (layoutIndex === -1) {
+                throw new Error("Could not find layout entry of block with udi: "+block.layout.contentUdi)
+            }
+
+            setDirty();
+
+            var removed = vm.layout.splice(layoutIndex, 1);
+            removed.forEach(x => {
+                // remove any server validation errors associated
+                var guids = [udiService.getKey(x.contentUdi), (x.settingsUdi ? udiService.getKey(x.settingsUdi) : null)];
+                guids.forEach(guid => {
+                    if (guid) {
+                        serverValidationManager.removePropertyError(guid, vm.umbProperty.property.culture, vm.umbProperty.property.segment, "", { matchType: "contains" });
+                    }
+                })
+            });
+
+            modelObject.removeDataAndDestroyModel(block);
+
+        }
+
+        function deleteAllBlocks() {
+            while(vm.layout.length) {
+                deleteBlock(vm.layout[0].$block);
+            };
+        }
+
+        function activateBlock(blockObject) {
+            blockObject.active = true;
+        }
+
+        function editBlock(blockObject, openSettings, blockIndex, parentForm, options) {
+
+            options = options || {};
+
+            // this must be set
+            if (blockIndex === undefined) {
+                throw "blockIndex was not specified on call to editBlock";
+            }
+
+            var wasNotActiveBefore = blockObject.active !== true;
+
+	        // dont open the editor overlay if block has hidden its content editor in overlays and we are requesting to open content, not settings.
+            if (openSettings !== true && blockObject.hideContentInOverlay === true) {
+                return;
+            }
+
+            // if requesting to open settings but we dont have settings then return.
+            if (openSettings === true && !blockObject.config.settingsElementTypeKey) {
+                return;
+            }
+
+            activateBlock(blockObject);
+
+            // make a clone to avoid editing model directly.
+            var blockContentClone = Utilities.copy(blockObject.content);
+            var blockSettingsClone = null;
+
+            if (blockObject.config.settingsElementTypeKey) {
+                blockSettingsClone = Utilities.copy(blockObject.settings);
+            }
+
+            var blockEditorModel = {
+                $parentScope: $scope, // pass in a $parentScope, this maintains the scope inheritance in infinite editing
+                $parentForm: parentForm || vm.propertyForm, // pass in a $parentForm, this maintains the FormController hierarchy with the infinite editing view (if it contains a form)
+                hideContent: blockObject.hideContentInOverlay,
+                openSettings: openSettings === true,
+                createFlow: options.createFlow === true,
+                liveEditing: liveEditing,
+                title: blockObject.label,
+                view: "views/common/infiniteeditors/blockeditor/blockeditor.html",
+                size: blockObject.config.editorSize || "medium",
+                submit: function(blockEditorModel) {
+
+                    if (liveEditing === false) {
+                        // transfer values when submitting in none-liveediting mode.
+                        blockObject.retrieveValuesFrom(blockEditorModel.content, blockEditorModel.settings);
+                    }
+
+                    blockObject.active = false;
+                    editorService.close();
+                },
+                close: function(blockEditorModel) {
+                    if (blockEditorModel.createFlow) {
+                        deleteBlock(blockObject);
+                    } else {
+                        if (liveEditing === true) {
+                            // revert values when closing in liveediting mode.
+                            blockObject.retrieveValuesFrom(blockContentClone, blockSettingsClone);
+                        }
+                        if (wasNotActiveBefore === true) {
+                            blockObject.active = false;
+                        }
+                    }
+                    editorService.close();
+                }
+            };
+
+            if (liveEditing === true) {
+                blockEditorModel.content = blockObject.content;
+                blockEditorModel.settings = blockObject.settings;
+            } else {
+                blockEditorModel.content = blockContentClone;
+                blockEditorModel.settings = blockSettingsClone;
+            }
+
+            // open property settings editor
+            editorService.open(blockEditorModel);
+        }
+
+        vm.showCreateDialog = showCreateDialog;
+        function showCreateDialog(createIndex, $event) {
+
+            if (vm.blockTypePicker) {
+                return;
+            }
+
+            if (vm.availableBlockTypes.length === 0) {
+                return;
+            }
+
+            var amountOfAvailableTypes = vm.availableBlockTypes.length;
+            var blockPickerModel = {
+                $parentScope: $scope, // pass in a $parentScope, this maintains the scope inheritance in infinite editing
+                $parentForm: vm.propertyForm, // pass in a $parentForm, this maintains the FormController hierarchy with the infinite editing view (if it contains a form)
+                availableItems: vm.availableBlockTypes,
+                title: vm.labels.grid_addElement,
+                orderBy: "$index",
+                view: "views/common/infiniteeditors/blockpicker/blockpicker.html",
+                size: (amountOfAvailableTypes > 8 ? "medium" : "small"),
+                filter: (amountOfAvailableTypes > 8),
+                clickPasteItem: function(item, mouseEvent) {
+                    if (Array.isArray(item.pasteData)) {
+                        var indexIncrementor = 0;
+                        item.pasteData.forEach(function (entry) {
+                            if (requestPasteFromClipboard(createIndex + indexIncrementor, entry, item.type)) {
+                                indexIncrementor++;
+                            }
+                        });
+                    } else {
+                        requestPasteFromClipboard(createIndex, item.pasteData, item.type);
+                    }
+                    if(!(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
+                        blockPickerModel.close();
+                    }
+                },
+                submit: function(blockPickerModel, mouseEvent) {
+                    var added = false;
+                    if (blockPickerModel && blockPickerModel.selectedItem) {
+                        added = addNewBlock(createIndex, blockPickerModel.selectedItem.blockConfigModel.contentElementTypeKey);
+                    }
+
+                    if(!(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
+                        editorService.close();
+                        if (added && vm.layout.length > createIndex) {
+                            if (inlineEditing === true) {
+                                activateBlock(vm.layout[createIndex].$block);
+                            } else if (inlineEditing === false && vm.layout[createIndex].$block.hideContentInOverlay !== true) {
+                                editBlock(vm.layout[createIndex].$block, false, createIndex, blockPickerModel.$parentForm, {createFlow: true});
+                            }
+                        }
+                    }
+                },
+                close: function() {
+                    // if opned by a inline creator button(index less than length), we want to move the focus away, to hide line-creator.
+                    if (createIndex < vm.layout.length) {
+                        vm.setBlockFocus(vm.layout[Math.max(createIndex-1, 0)].$block);
+                    }
+
+                    editorService.close();
+                }
+            };
+
+            blockPickerModel.clickClearClipboard = function ($event) {
+                clipboardService.clearEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, vm.availableContentTypesAliases);
+                clipboardService.clearEntriesOfType(clipboardService.TYPES.BLOCK, vm.availableContentTypesAliases);
+            };
+
+            blockPickerModel.clipboardItems = [];
+
+            var entriesForPaste = clipboardService.retriveEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, vm.availableContentTypesAliases);
+            entriesForPaste.forEach(function (entry) {
+                var pasteEntry = {
+                    type: clipboardService.TYPES.ELEMENT_TYPE,
+                    date: entry.date,
+                    pasteData: entry.data,
+                    elementTypeModel: {
+                        name: entry.label,
+                        icon: entry.icon
+                    }
+                }
+                if(Array.isArray(entry.data) === false) {
+                    var scaffold = modelObject.getScaffoldFromAlias(entry.alias);
+                    if(scaffold) {
+                        pasteEntry.blockConfigModel = modelObject.getBlockConfiguration(scaffold.contentTypeKey);
+                    }
+                }
+                blockPickerModel.clipboardItems.push(pasteEntry);
+            });
+
+            var entriesForPaste = clipboardService.retriveEntriesOfType(clipboardService.TYPES.BLOCK, vm.availableContentTypesAliases);
+            entriesForPaste.forEach(function (entry) {
+                var pasteEntry = {
+                    type: clipboardService.TYPES.BLOCK,
+                    date: entry.date,
+                    pasteData: entry.data,
+                    elementTypeModel: {
+                        name: entry.label,
+                        icon: entry.icon
+                    }
+                }
+                if(Array.isArray(entry.data) === false) {
+                    pasteEntry.blockConfigModel = modelObject.getBlockConfiguration(entry.data.data.contentTypeKey);
+                }
+                blockPickerModel.clipboardItems.push(pasteEntry);
+            });
+
+            blockPickerModel.clipboardItems.sort( (a, b) => {
+                return b.date - a.date
+            });
+
+            // open block picker overlay
+            editorService.open(blockPickerModel);
+
+        };
+
+        var requestCopyAllBlocks = function() {
+
+            var aliases = [];
+
+            var elementTypesToCopy = vm.layout.filter(entry => entry.$block.config.unsupported !== true).map(
+                (entry) => {
+
+                    aliases.push(entry.$block.content.contentTypeAlias);
+
+                    // No need to clone the data as its begin handled by the clipboardService.
+                    return {"layout": entry.$block.layout, "data": entry.$block.data, "settingsData":entry.$block.settingsData}
+                }
+            );
+
+            // remove duplicate aliases
+            aliases = aliases.filter((item, index) => aliases.indexOf(item) === index);
+
+            var contentNodeName = "?";
+            var contentNodeIcon = null;
+            if(vm.umbVariantContent) {
+                contentNodeName = vm.umbVariantContent.editor.content.name;
+                if(vm.umbVariantContentEditors) {
+                    contentNodeIcon = vm.umbVariantContentEditors.content.icon.split(" ")[0];
+                } else if (vm.umbElementEditorContent) {
+                    contentNodeIcon = vm.umbElementEditorContent.model.documentType.icon.split(" ")[0];
+                }
+            } else if (vm.umbElementEditorContent) {
+                contentNodeName = vm.umbElementEditorContent.model.documentType.name;
+                contentNodeIcon = vm.umbElementEditorContent.model.documentType.icon.split(" ")[0];
+            }
+
+            localizationService.localize("clipboard_labelForArrayOfItemsFrom", [vm.model.label, contentNodeName]).then(function(localizedLabel) {
+                clipboardService.copyArray(clipboardService.TYPES.BLOCK, aliases, elementTypesToCopy, localizedLabel, contentNodeIcon || "icon-thumbnail-list", vm.model.id);
+            });
+        }
+        function copyBlock(block) {
+            clipboardService.copy(clipboardService.TYPES.BLOCK, block.content.contentTypeAlias, {"layout": block.layout, "data": block.data, "settingsData":block.settingsData}, block.label, block.content.icon, block.content.udi);
+        }
+        function requestPasteFromClipboard(index, pasteEntry, pasteType) {
+
+            if (pasteEntry === undefined) {
+                return false;
+            }
+
+            var layoutEntry;
+            if (pasteType === clipboardService.TYPES.ELEMENT_TYPE) {
+                layoutEntry = modelObject.createFromElementType(pasteEntry);
+            } else if (pasteType === clipboardService.TYPES.BLOCK) {
+                layoutEntry = modelObject.createFromBlockData(pasteEntry);
+            } else {
+                // Not a supported paste type.
+                return false;
+            }
+
+            if (layoutEntry === null) {
+                // Pasting did not go well.
+                return false;
+            }
+
+            // make block model
+            var blockObject = getBlockObject(layoutEntry);
+            if (blockObject === null) {
+                // Initalization of the Block Object didnt go well, therefor we will fail the paste action.
+                return false;
+            }
+
+            // set the BlockObject on our layout entry.
+            layoutEntry.$block = blockObject;
+
+            // insert layout entry at the decired location in layout.
+            vm.layout.splice(index, 0, layoutEntry);
+
+            vm.currentBlockInFocus = blockObject;
+
+            return true;
+
+        }
+
+        function requestDeleteBlock(block) {
+            localizationService.localizeMany(["general_delete", "blockEditor_confirmDeleteBlockMessage", "contentTypeEditor_yesDelete"]).then(function (data) {
+                const overlay = {
+                    title: data[0],
+                    content: localizationService.tokenReplace(data[1], [block.label]),
+                    submitButtonLabel: data[2],
+                    close: function () {
+                        overlayService.close();
+                    },
+                    submit: function () {
+                        deleteBlock(block);
+                        overlayService.close();
+                    }
+                };
+
+                overlayService.confirmDelete(overlay);
+            });
+        }
+        function requestDeleteAllBlocks() {
+            localizationService.localizeMany(["content_nestedContentDeleteAllItems", "general_delete"]).then(function (data) {
+                overlayService.confirmDelete({
+                    title: data[1],
+                    content: data[0],
+                    close: function () {
+                        overlayService.close();
+                    },
+                    submit: function () {
+                        deleteAllBlocks();
+                        overlayService.close();
+                    }
+                });
+            });
+        }
+
+        function openSettingsForBlock(block, blockIndex, parentForm) {
+            editBlock(block, true, blockIndex, parentForm);
+        }
+
+        vm.blockEditorApi = {
+            activateBlock: activateBlock,
+            editBlock: editBlock,
+            copyBlock: copyBlock,
+            requestDeleteBlock: requestDeleteBlock,
+            deleteBlock: deleteBlock,
+            openSettingsForBlock: openSettingsForBlock
+        }
+
+        vm.sortableOptions = {
+            axis: "y",
+            containment: "parent",
+            cursor: "grabbing",
+            handle: ".blockelement__draggable-element",
+            cancel: "input,textarea,select,option",
+            classes: ".blockelement--dragging",
+            distance: 5,
+            tolerance: "pointer",
+            scroll: true,
+            update: function (ev, ui) {
+                setDirty();
+            }
+        };
+
+
+        function onAmountOfBlocksChanged() {
+
+            // enable/disable property actions
+            if (copyAllBlocksAction) {
+                copyAllBlocksAction.isDisabled = vm.layout.length === 0;
+            }
+            if (deleteAllBlocksAction) {
+                deleteAllBlocksAction.isDisabled = vm.layout.length === 0;
+            }
+
+            // validate limits:
+            if (vm.propertyForm && vm.validationLimit) {
+
+                var isMinRequirementGood = vm.validationLimit.min === null || vm.layout.length >= vm.validationLimit.min;
+                vm.propertyForm.minCount.$setValidity("minCount", isMinRequirementGood);
+
+                var isMaxRequirementGood = vm.validationLimit.max === null || vm.layout.length <= vm.validationLimit.max;
+                vm.propertyForm.maxCount.$setValidity("maxCount", isMaxRequirementGood);
+            }
+        }
+
+        unsubscribe.push($scope.$watch(() => vm.layout.length, onAmountOfBlocksChanged));
+
+        $scope.$on("$destroy", function () {
+            for (const subscription of unsubscribe) {
+                subscription();
+            }
+        });
+    }
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.createButton.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.createButton.controller.js
new file mode 100644
index 0000000000..98d4f4ea3a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.createButton.controller.js
@@ -0,0 +1,18 @@
+(function () {
+    "use strict";
+
+    angular
+    .module("umbraco")
+    .controller("Umbraco.PropertyEditors.BlockListPropertyEditor.CreateButtonController", 
+    function Controller($scope) {
+        
+        var vm = this;
+        vm.plusPosX = 0;
+
+        vm.onMouseMove = function($event) {
+            vm.plusPosX = $event.offsetX;
+        }
+
+    });
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js
new file mode 100644
index 0000000000..41d76475e4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js
@@ -0,0 +1,85 @@
+(function () {
+    "use strict";
+
+    /**
+     * @ngdoc directive
+     * @name umbraco.directives.directive:umbBlockListBlock
+     * @description
+     * The component to render the view for a block.
+     * If a stylesheet is used then this uses a ShadowDom to make a scoped element.
+     * This way the backoffice styling does not collide with the block style.
+     */
+
+    angular
+        .module("umbraco")
+        .component("umbBlockListBlock", {
+            controller: BlockListBlockController,
+            controllerAs: "model",
+            bindings: {
+                stylesheet: "@",
+                view: "@",
+                block: "=",
+                api: "<",
+                index: "<",
+                parentForm: "<"
+            },
+            require: {
+                valFormManager: "^^valFormManager"
+            }
+        }
+    );
+
+    function BlockListBlockController($scope, $compile, $element) {
+        var model = this;
+
+        model.$onInit = function () {
+            // This is ugly and is only necessary because we are not using components and instead
+            // relying on ng-include. It is definitely possible to compile the contents
+            // of the view into the DOM using $templateCache and $http instead of using
+            // ng - include which means that the controllerAs flows directly to the view.
+            // This would mean that any custom components would need to be updated instead of relying on $scope.
+            // Guess we'll leave it for now but means all things need to be copied to the $scope and then all
+            // primitives need to be watched.
+
+            // let the Block know about its form
+            model.block.setParentForm(model.parentForm);
+
+            // let the Block know about the current index
+            model.block.index = model.index;
+
+            $scope.block = model.block;
+            $scope.api = model.api;
+            $scope.index = model.index;
+            $scope.parentForm = model.parentForm;
+            $scope.valFormManager = model.valFormManager;
+
+            if (model.stylesheet) {
+                var shadowRoot = $element[0].attachShadow({ mode: 'open' });
+                shadowRoot.innerHTML = `
+                    <style>
+                    @import "${model.stylesheet}"
+                    </style>
+                    <div ng-include="'${model.view}'"></div>
+                `;
+                $compile(shadowRoot)($scope);
+            }
+            else {
+                $element.append($compile('<div ng-include="model.view"></div>')($scope));
+            }
+        };
+
+        // We need to watch for changes on primitive types and upate the $scope values.
+        model.$onChanges = function (changes) {
+            if (changes.index) {
+                var index = changes.index.currentValue;
+                $scope.index = index;
+
+                // let the Block know about the current index:
+                model.block.index = index;
+                model.block.updateLabel();
+            }
+        }
+    }
+
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistrow.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistrow.component.js
new file mode 100644
index 0000000000..a79ee557a2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistrow.component.js
@@ -0,0 +1,37 @@
+(function () {
+    "use strict";
+
+    /**
+     * @ngdoc directive
+     * @name umbraco.directives.directive:umbBlockListRow
+     * @description
+     * renders each row for the block list editor
+     */
+    
+    angular
+        .module("umbraco")
+        .component("umbBlockListRow", {
+            templateUrl: 'views/propertyeditors/blocklist/umb-block-list-row.html',
+            controller: BlockListRowController,
+            controllerAs: "vm",
+            bindings: {
+                blockEditorApi: "<",
+                layout: "<",
+                index: "<"
+            },
+            require: {
+                valFormManager: "^^valFormManager"
+            }
+        }
+    );
+
+    function BlockListRowController($scope) {
+
+        var vm = this;
+
+        vm.$onInit = function () {
+          
+        };
+    }   
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
index df76c2d63a..dab8d2c6f8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
@@ -1,6 +1,28 @@
 function booleanEditorController($scope, angularHelper) {
 
+    // Setup the default config
+    // This allow to overwrite the configuration when property editor is re-used 
+    // in e.g. third party packages, dashboard or content app. For example when using umb-property-editor.
+    // At the moment this use "1/0" as default for "truevalue" and "falsevalue", but allow "True/False" as well.
+    // Maybe sometime later we can make it support "Yes/No" or "On/Off" as well similar to ng-true-value and ng-false-value in Angular.
+    var config = {
+        truevalue: "1",
+        falsevalue: "0",
+        showLabels: false
+    };
+
+    if ($scope.model.config && $scope.model.config.showLabels && Object.toBoolean($scope.model.config.showLabels)) {
+        config.showLabels = true;
+    }
+
+    // Map the user config
+    Utilities.extend(config, $scope.model.config);
+
+    // Map back to the model
+    $scope.model.config = config;
+
     function setupViewModel() {
+
         $scope.renderModel = {
             value: false
         };
@@ -16,12 +38,12 @@ function booleanEditorController($scope, angularHelper) {
 
     setupViewModel();
 
-    if( $scope.model && !$scope.model.value ) {
-        $scope.model.value = ($scope.renderModel.value === true) ? '1' : '0';
+    if ($scope.model && !$scope.model.value) {
+        $scope.model.value = ($scope.renderModel.value === true) ? $scope.model.config.truevalue : $scope.model.config.falsevalue;
     }
 
-    //here we declare a special method which will be called whenever the value has changed from the server
-    //this is instead of doing a watch on the model.value = faster
+    // Here we declare a special method which will be called whenever the value has changed from the server
+    // this is instead of doing a watch on the model.value = faster
     $scope.model.onValueChanged = function (newVal, oldVal) {
         //update the display val again if it has changed from the server
         setupViewModel();
@@ -30,13 +52,13 @@ function booleanEditorController($scope, angularHelper) {
     // Update the value when the toggle is clicked
     $scope.toggle = function(){
         angularHelper.getCurrentForm($scope).$setDirty();
-        if($scope.renderModel.value){
-            $scope.model.value = "0";
+        if ($scope.renderModel.value){
+            $scope.model.value = $scope.model.config.falsevalue;
             setupViewModel();
             return;
         }
 
-        $scope.model.value = "1";
+        $scope.model.value = $scope.model.config.truevalue;
         setupViewModel();
     };
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
index 21ed753c15..75f3f5452a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
@@ -3,9 +3,9 @@
         input-id="{{model.alias}}"
         checked="renderModel.value"
         on-click="toggle()"
-        show-labels="{{model.config.labelOn ? 'true': 'false'}}"
+        show-labels="{{model.config.showLabels}}"
         label-position="right"
         label-on="{{model.config.labelOn}}"
-        label-off="{{model.config.labelOn}}">
+        label-off="{{model.config.labelOff}}">
     </umb-toggle>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
index 10668808a5..79c436f080 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
@@ -1,5 +1,5 @@
 angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListController",
-    function ($scope) {
+    function ($scope, validationMessageService) {
         
         var vm = this;
         
@@ -8,8 +8,10 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
         vm.change = change;
         
         function init() {
+
+            vm.uniqueId = String.CreateGuid();
             
-            // currently the property editor will onyl work if our input is an object.
+            // currently the property editor will only work if our input is an object.
             if (Utilities.isObject($scope.model.config.items)) {
 
                 // formatting the items in the dictionary into an array
@@ -35,6 +37,12 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
                 //watch the model.value in case it changes so that we can keep our view model in sync
                 $scope.$watchCollection("model.value", updateViewModel);
             }
+
+            // Set the message to use for when a mandatory field isn't completed.
+            // Will either use the one provided on the property type or a localised default.
+            validationMessageService.getMandatoryMessage($scope.model.validation).then(function (value) {
+                $scope.mandatoryMessage = value;
+            });  
             
         }
         
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
index 20f24728dd..4207a327ad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
@@ -1,7 +1,16 @@
 <div class="umb-property-editor umb-checkboxlist" ng-controller="Umbraco.PropertyEditors.CheckboxListController as vm">
-    <ul class="unstyled">
-        <li ng-repeat="item in vm.viewItems track by item.key">
-            <umb-checkbox name="{{::model.alias}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.change(model, value)" required="model.validation.mandatory && !model.value.length"></umb-checkbox>
-        </li>
-    </ul>
+
+    <ng-form name="checkboxListFieldForm">
+
+        <ul class="unstyled">
+            <li ng-repeat="item in vm.viewItems track by item.key">
+                <umb-checkbox name="{{::model.alias}}_{{::vm.uniqueId}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.change(model, value)" required="model.validation.mandatory && !model.value.length"></umb-checkbox>
+            </li>
+        </ul>
+
+        <div ng-messages="checkboxListFieldForm[model.alias + '_' + vm.uniqueId].$error" show-validation-on-submit>
+            <p class="help-inline" ng-message="required">{{mandatoryMessage}}</p>
+        </div>
+
+    </ng-form>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
index e2f502e463..c1b432b36e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
@@ -1,5 +1,7 @@
 function ColorPickerController($scope, $timeout) {
 
+    var vm = this;
+
     //setup the default config
     var config = {
         items: [],
@@ -18,10 +20,13 @@ function ColorPickerController($scope, $timeout) {
 
         for (var key in $scope.model.config.items) {
             if (!$scope.model.config.items[key].hasOwnProperty("value"))
-                $scope.model.config.items[key] = { value: $scope.model.config.items[key], label: $scope.model.config.items[key] };
+                $scope.model.config.items[key] = {
+                    value: $scope.model.config.items[key],
+                    label: $scope.model.config.items[key]
+                };
         }
 
-        $scope.model.useLabel = isTrue($scope.model.config.useLabel);
+        $scope.model.useLabel = Object.toBoolean($scope.model.config.useLabel);
         initActiveColor();
     }
 
@@ -54,13 +59,13 @@ function ColorPickerController($scope, $timeout) {
         $scope.model.config.items = items;
     }
 
-    $scope.selectColor = function (color) {
+    vm.selectColor = function (color) {
         // this is required to re-validate
         $timeout(function () {
             var newColor = color ? color.value : null;
             $scope.propertyForm.selectedColor.$setViewValue(newColor);
         });
-    }
+    };
 
     // Method required by the valPropertyValidator directive (returns true if the property editor has at least one color selected)
     $scope.validateMandatory = function () {
@@ -74,8 +79,7 @@ function ColorPickerController($scope, $timeout) {
             errorMsg: $scope.model.validation.mandatoryMessage || "Value cannot be empty",
             errorKey: "required"
         };
-    }
-    $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
+    };
 
     // Finds the color best matching the model's color,
     // and sets the model color to that one. This is useful when
@@ -138,11 +142,6 @@ function ColorPickerController($scope, $timeout) {
             $scope.model.value.label = foundItem.label;
         }
     }
-
-    // figures out if a value is trueish enough
-    function isTrue(bool) {
-        return !!bool && bool !== "0" && bool.toString().toLowerCase() !== "false";
-    }
 }
 
 angular.module("umbraco").controller("Umbraco.PropertyEditors.ColorPickerController", ColorPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
index 9b0bdad661..b7942b7f68 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
@@ -1,5 +1,4 @@
-<div ng-controller="Umbraco.PropertyEditors.ColorPickerController">
-
+<div ng-controller="Umbraco.PropertyEditors.ColorPickerController as vm">
 
     <div ng-if="!isConfigured">
         <localize key="colorpicker_noColors">You haven't defined any colors</localize>
@@ -10,7 +9,7 @@
         selected-color="model.value"
         size="m"
         use-label="model.useLabel"
-        on-select="selectColor(color)">
+        on-select="vm.selectColor(color)">
     </umb-color-swatches>
 
     <input type="hidden" name="selectedColor" ng-model="model.selectedColor" val-property-validator="validateMandatory" />
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
index af2dba1d7b..dc8cbf599e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
@@ -1,27 +1,37 @@
-<div class="umb-property-editor umb-prevalues-multivalues" ng-controller="Umbraco.PrevalueEditors.MultiColorPickerController">
+<div class="umb-property-editor umb-prevalues-multivalues umb-colors" ng-controller="Umbraco.PrevalueEditors.MultiColorPickerController as vm">
     <div class="control-group  umb-prevalues-multivalues__add color-picker-preval">
         <div class="umb-prevalues-multivalues__left">
-            <input name="newColor" type="hidden" />
-            <label for="newColor" val-highlight="{{hasError}}">#{{newColor}}</label>
-            <input name="newLabel" type="text" ng-model="newLabel" focus-when="{{focusOnNew}}" class="umb-property-editor color-label" placeholder="Label" ng-show="labelEnabled" />
+
+            <umb-color-picker
+                ng-model="newColor"
+                options="options"
+                on-hide="vm.hide(color)"
+                on-show="vm.show(color)"
+                on-change="vm.change(color)">
+            </umb-color-picker>
+
+            <label val-highlight="{{hasError}}">#{{newColor}}</label>
+            <input type="text" name="newLabel" ng-model="newLabel" focus-when="{{focusOnNew}}" class="umb-property-editor color-label" localize="placeholder" placeholder="@general_label" ng-show="vm.labelEnabled" />
         </div>
         <div class="umb-prevalues-multivalues__right">
-            <button class="btn btn-info add" ng-click="add($event)"><localize key="general_add">Add</localize></button>
+            <button type="button" class="btn btn-info add" ng-if="vm.editItem == null" ng-click="vm.add($event)"><localize key="general_add">Add</localize></button>
+            <button type="button" class="btn btn-info add" ng-if="vm.editItem != null" ng-click="vm.add($event)"><localize key="general_update">Update</localize></button>
+            <button type="button" class="btn btn-link" ng-if="vm.editItem != null" ng-click="vm.cancel($event)"><localize key="general_cancel">Cancel</localize></button>
         </div>
     </div>
     <div ui-sortable="sortableOptions" ng-model="model.value">
         <div class="control-group umb-prevalues-multivalues__listitem color-picker-preval" ng-repeat="item in model.value track by $id(item)">
-            <i class="icon icon-navigation handle"></i>
+            <i class="icon icon-navigation handle" aria-hidden="true"></i>
             <div class="umb-prevalues-multivalues__left">
                 <div class="thumbnail span1" hex-bg-color="{{item.value}}" hex-bg-orig="transparent"></div>
                 <div class="color-picker-prediv">
                     <pre>#{{item.value}}</pre>
-                    <span ng-bind="item.label" ng-if="!labelEnabled"></span>
-                    <input type="text" ng-if="labelEnabled" ng-model="item.label" val-server="item_{{$index}}" required />
+                    <span ng-bind="item.label" ng-if="vm.labelEnabled"></span>
                 </div>
             </div>
             <div class="umb-prevalues-multivalues__right">
-                <button type="button" class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(item, $event)"><localize key="general_remove">Remove</localize></button>
+                <button type="button" class="umb-node-preview__action umb-node-preview__action--red" ng-click="vm.edit(item, $event)"><localize key="general_edit">Edit</localize></button>
+                <button type="button" class="umb-node-preview__action umb-node-preview__action--red" ng-click="vm.remove(item, $event)"><localize key="general_remove">Remove</localize></button>
             </div>
         </div>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
index 2cbad88a43..967137b930 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
@@ -1,5 +1,20 @@
 angular.module("umbraco").controller("Umbraco.PrevalueEditors.MultiColorPickerController",
-    function ($scope, $timeout, assetsService, angularHelper, $element, localizationService, eventsService) {
+    function ($scope, angularHelper, $element, eventsService) {
+
+        var vm = this;
+
+        vm.add = add;
+        vm.remove = remove;
+        vm.edit = edit;
+        vm.cancel = cancel;
+
+        vm.show = show;
+        vm.hide = hide;
+        vm.change = change;
+
+        vm.labelEnabled = false;
+        vm.editItem = null;
+
         //NOTE: We need to make each color an object, not just a string because you cannot 2-way bind to a primitive.
         var defaultColor = "000000";
         var defaultLabel = null;
@@ -9,52 +24,39 @@
         $scope.hasError = false;
         $scope.focusOnNew = false;
 
-        $scope.labels = {};
+        $scope.options = {
+            type: "color",
+            color: defaultColor,
+            allowEmpty: false,
+            showAlpha: false
+        };
 
-        var labelKeys = [
-            "general_cancel",
-            "general_choose"
-        ];
+        function hide(color) {
+            // show the add button
+            $element.find(".btn.add").show();
+        }
 
-        $scope.labelEnabled = false;
-        eventsService.on("toggleValue", function (e, args) {
-            $scope.labelEnabled = args.value;
-        });
-        
-        localizationService.localizeMany(labelKeys).then(function (values) {
-            $scope.labels.cancel = values[0];
-            $scope.labels.choose = values[1];
-        });
+        function show(color) {
+            // hide the add button
+            $element.find(".btn.add").hide();
+        }
 
-        assetsService.load([
-            //"lib/spectrum/tinycolor.js",
-            "lib/spectrum/spectrum.js"
-        ], $scope).then(function () {
-            var elem = $element.find("input[name='newColor']");
-            elem.spectrum({
-                color: null,
-                showInitial: false,
-                chooseText: $scope.labels.choose,
-                cancelText: $scope.labels.cancel,
-                preferredFormat: "hex",
-                showInput: true,
-                clickoutFiresChange: true,
-                hide: function (color) {
-                    //show the add butotn
-                    $element.find(".btn.add").show();
-                },
-                change: function (color) {
-                    angularHelper.safeApply($scope, function () {
-                        $scope.newColor = color.toHexString().trimStart("#"); // #ff0000
-                    });
-                },
-                show: function() {
-                    //hide the add butotn
-                    $element.find(".btn.add").hide();
+        function change(color) {
+            angularHelper.safeApply($scope, function () {
+                if (color) {
+                    $scope.newColor = color.toHexString().trimStart("#");
                 }
             });
+        }
+        var evts = [];
+        evts.push(eventsService.on("toggleValue", function (e, args) {
+            vm.labelEnabled = args.value;
+        }));
+        $scope.$on('$destroy', function () {
+            for (var e in evts) {
+                eventsService.unsubscribe(evts[e]);
+            }
         });
-
         if (!Utilities.isArray($scope.model.value)) {
             //make an array from the dictionary
             var items = [];
@@ -94,7 +96,7 @@
             return label !== null && typeof label !== "undefined" && label !== "" && label.length && label.length > 0;
         }
 
-        $scope.remove = function (item, evt) {
+        function remove(item, evt) {
 
             evt.preventDefault();
 
@@ -103,21 +105,28 @@
             });
 
             angularHelper.getCurrentForm($scope).$setDirty();
-        };
+        }
 
-        $scope.add = function (evt) {
+        function add(evt) {
             evt.preventDefault();
 
             if ($scope.newColor) {
                 var newLabel = validLabel($scope.newLabel) ? $scope.newLabel : $scope.newColor;
-                var exists = _.find($scope.model.value, function(item) {
-                    return item.value.toUpperCase() === $scope.newColor.toUpperCase() || item.label.toUpperCase() === newLabel.toUpperCase();
+                var exists = _.find($scope.model.value, function (item) {
+                    return item != vm.editItem && (item.value.toUpperCase() === $scope.newColor.toUpperCase() || item.label.toUpperCase() === newLabel.toUpperCase());
                 });
                 if (!exists) {
-                    $scope.model.value.push({
-                        value: $scope.newColor,
-                        label: newLabel
-                    });
+                    if (vm.editItem == null) {
+                        $scope.model.value.push({
+                            value: $scope.newColor,
+                            label: newLabel
+                        });
+                    } else {
+                        vm.editItem.value = $scope.newColor;
+                        vm.editItem.label = newLabel;
+                        vm.editItem = null;
+                    }
+                    
                     $scope.newLabel = "";
                     $scope.hasError = false;
                     $scope.focusOnNew = true;
@@ -125,11 +134,27 @@
                     return;
                 }
 
-                //there was an error, do the highlight (will be set back by the directive)
+                // there was an error, do the highlight (will be set back by the directive)
                 $scope.hasError = true;
             }
+        }
 
-        };
+        function edit(item, evt) {
+            evt.preventDefault();
+
+            vm.editItem = item;
+
+            $scope.newColor = item.value;
+            $scope.newLabel = item.label;
+        }
+
+        function cancel(evt) {
+            evt.preventDefault();
+
+            vm.editItem = null;
+            $scope.newColor = defaultColor;
+            $scope.newLabel = defaultLabel;
+        }
 
         $scope.sortableOptions = {
             axis: 'y',
@@ -143,6 +168,4 @@
             }
         };
 
-        //load the separate css for the editor to avoid it blocking our js loading
-        assetsService.loadCss("lib/spectrum/spectrum.css", $scope);
     });
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 238872db40..0f012810ba 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,16 +3,19 @@
  * The controller that is used for a couple different Property Editors: Multi Node Tree Picker, Content Picker,
  * since this is used by MNTP and it supports content, media and members, there is code to deal with all 3 of those types
  * @param {any} $scope
+ * @param {any} $q
+ * @param {any} $routeParams
+ * @param {any} $location
  * @param {any} entityResource
  * @param {any} editorState
  * @param {any} iconHelper
- * @param {any} $routeParams
  * @param {any} angularHelper
  * @param {any} navigationService
- * @param {any} $location
  * @param {any} localizationService
+ * @param {any} editorService
+ * @param {any} userService
  */
-function contentPickerController($scope, entityResource, editorState, iconHelper, $routeParams, angularHelper, navigationService, $location, localizationService, editorService, $q) {
+function contentPickerController($scope, $q, $routeParams, $location, entityResource, editorState, iconHelper, angularHelper, navigationService, localizationService, editorService, userService, overlayService) {
 
     var vm = {
         labels: {
@@ -113,6 +116,14 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         }
     };
 
+    var removeAllEntriesAction = {
+        labelKey: 'clipboard_labelForRemoveAllEntries',
+        labelTokens: [],
+        icon: 'trash',
+        method: removeAllEntries,
+        isDisabled: true
+    };
+
     if ($scope.model.config) {
         //special case, if the `startNode` is falsy on the server config delete it entirely so the default value is merged in
         if (!$scope.model.config.startNode) {
@@ -126,6 +137,14 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         if ($scope.model.validation && $scope.model.validation.mandatory && !$scope.model.config.minNumber) {
             $scope.model.config.minNumber = 1;
         }
+        
+        if ($scope.model.config.multiPicker === true && $scope.umbProperty) {
+            var propertyActions = [
+                removeAllEntriesAction
+            ];
+
+            $scope.umbProperty.setPropertyActions(propertyActions);
+        }
     }
 
     //Umbraco persists boolean for prevalues as "0" or "1" so we need to convert that!
@@ -139,7 +158,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         : $scope.model.config.startNode.type === "media"
             ? "Media"
             : "Document";
-    $scope.allowOpenButton = entityType === "Document";
+    
+    $scope.allowOpenButton = false;
     $scope.allowEditButton = entityType === "Document";
     $scope.allowRemoveButton = true;
 
@@ -271,6 +291,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
             angularHelper.getCurrentForm($scope).$setDirty();
             $scope.model.value = currIds.join();
         }
+
+        removeAllEntriesAction.isDisabled = currIds.length === 0;
     };
 
     $scope.showNode = function (index) {
@@ -297,22 +319,33 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
             currIds.push(itemId);
             $scope.model.value = currIds.join();
         }
+
+        removeAllEntriesAction.isDisabled = false;
     };
 
     $scope.clear = function () {
         $scope.model.value = null;
+        removeAllEntriesAction.isDisabled = true;
     };
 
-    $scope.openContentEditor = function (node) {
-        var contentEditor = {
-            id: node.id,
+    $scope.openEditor = function (item) {
+        var editor = {
+            id: entityType === "Member" ? item.key : item.id,
             submit: function (model) {
+
+                var node = entityType === "Member" ? model.memberNode :
+                           entityType === "Media" ? model.mediaNode :
+                                                    model.contentNode;
+                
                 // update the node
-                node.name = model.contentNode.name;
-                node.published = model.contentNode.hasPublishedVersion;
+                item.name = node.name;
+
                 if (entityType !== "Member") {
-                    entityResource.getUrl(model.contentNode.id, entityType).then(function (data) {
-                        node.url = data;
+                    if (entityType === "Document") {
+                        item.published = node.hasPublishedVersion;
+                    }
+                    entityResource.getUrl(node.id, entityType).then(function (data) {
+                        item.url = data;
                     });
                 }
                 editorService.close();
@@ -321,7 +354,18 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
                 editorService.close();
             }
         };
-        editorService.contentEditor(contentEditor);
+
+        switch (entityType) {
+            case "Document":
+                editorService.contentEditor(editor);
+                break;
+            case "Media":
+                editorService.mediaEditor(editor);
+                break;
+            case "Member":
+                editorService.memberEditor(editor);
+                break;
+        }
     };
 
     //when the scope is destroyed we need to unsubscribe
@@ -339,6 +383,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         //sync the sortable model
         $scope.sortableModel = valueIds;
 
+        removeAllEntriesAction.isDisabled = valueIds.length === 0;
+
         //load current data if anything selected
         if (valueIds.length > 0) {
 
@@ -423,7 +469,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         if (entityType !== "Member") {
             entityResource.getUrl(entity.id, entityType).then(function (data) {
                 // update url
-                angular.forEach($scope.renderModel, function (item) {
+                $scope.renderModel.forEach(function (item) {
                     if (item.id === entity.id) {
                         if (entity.trashed) {
                             item.url = vm.labels.general_recycleBin;
@@ -466,6 +512,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
             "icon": item.icon,
             "path": item.path,
             "url": item.url,
+            "key": item.key,
             "trashed": item.trashed,
             "published": (item.metaData && item.metaData.IsPublished === false && entityType === "Document") ? false : true
             // only content supports published/unpublished content so we set everything else to published so the UI looks correct
@@ -483,7 +530,43 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         }
     }
 
+    function removeAllEntries() {
+        localizationService.localizeMany(["content_nestedContentDeleteAllItems", "general_delete"]).then(function (data) {
+            overlayService.confirmDelete({
+                title: data[1],
+                content: data[0],
+                close: function () {
+                    overlayService.close();
+                },
+                submit: function () {
+                    $scope.clear();
+                    overlayService.close();
+                }
+            });
+        });
+    }
+
     function init() {
+        
+        userService.getCurrentUser().then(function (user) {
+            switch (entityType) {
+                case "Document":
+                    var hasAccessToContent = user.allowedSections.indexOf("content") !== -1;
+                    $scope.allowOpenButton = hasAccessToContent;
+                    break;
+                case "Media":
+                    var hasAccessToMedia = user.allowedSections.indexOf("media") !== -1;
+                    $scope.allowOpenButton = hasAccessToMedia;
+                    break;
+                case "Member":
+                    var hasAccessToMember = user.allowedSections.indexOf("member") !== -1;
+                    $scope.allowOpenButton = hasAccessToMember;
+                    break;
+
+                default:
+            }
+        });
+
         localizationService.localizeMany(["general_recycleBin", "general_add"])
             .then(function(data) {
                 vm.labels.general_recycleBin = data[0];
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index ba22ca9d80..1a17ea2698 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -15,7 +15,7 @@
                               allow-remove="allowRemoveButton"
                               allow-open="model.config.showOpenButton && allowOpenButton && !dialogEditor"
                               on-remove="remove($index)"
-                              on-open="openContentEditor(node)">
+                              on-open="openEditor(node)">
             </umb-node-preview>
         </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
index 24affc6ac1..30b6fc4c8f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
@@ -55,7 +55,9 @@ function dateTimePickerController($scope, angularHelper, dateHelper, validationM
         };
 
         // Don't show calendar if date format has been set to only time
-        if ($scope.model.config.format === "HH:mm:ss" || $scope.model.config.format === "HH:mm" || $scope.model.config.format === "HH") {
+        const timeFormat = $scope.model.config.format.toLowerCase();
+        const timeFormatPattern = /^h{1,2}:m{1,2}:s{1,2}\s?a?$/gmi;
+        if (timeFormat.match(timeFormatPattern)) {            
             $scope.datePickerConfig.enableTime = true;
             $scope.datePickerConfig.noCalendar = true;
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
index b35663c3df..9501a6631b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
@@ -11,21 +11,20 @@
                 on-change="datePickerChange(dateStr)">
 
                 <div class="input-append">
-                    <input
-                        name="datepicker"
-                        id="{{model.alias}}"
-                        type="text"
-                        ng-model="model.datetimePickerValue"
-                        ng-blur="inputChanged()"
-                        ng-required="model.validation.mandatory"
-                        val-server="value"
-                        class="datepickerinput">
+                    <input type="text"
+                           name="datepicker"
+                           id="{{model.alias}}"
+                           ng-model="model.datetimePickerValue"
+                           ng-blur="inputChanged()"
+                           ng-required="model.validation.mandatory"
+                           val-server="value"
+                           class="datepickerinput" />
                     <button type="button" class="on-top" ng-click="clearDate()" ng-show="hasDatetimePickerValue === true || datePickerForm.datepicker.$error.pickerError === true">
                         <i class="icon-delete" aria-hidden="true"></i>
                         <span class="sr-only"><localize key="content_removeDate">Clear date</localize></span>
                     </button>
                     <span class="add-on" aria-hidden="true">
-                        <i class="icon-calendar"></i>
+                        <i class="icon-{{ datePickerConfig.noCalendar ? 'time' : 'calendar' }}"></i>
                     </span>
                 </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
index afbb4feb20..4064df6a24 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
@@ -15,14 +15,14 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.DropdownFlexibleCo
 
         //ensure this is a bool, old data could store zeros/ones or string versions
         $scope.model.config.multiple = Object.toBoolean($scope.model.config.multiple);
-        
+
         //ensure when form is saved that we don't store [] or [null] as string values in the database when no items are selected
         $scope.$on("formSubmitting", function () {
-            if ($scope.model.value.length === 0 || $scope.model.value[0] === null) {
+            if ($scope.model.value && ($scope.model.value.length === 0 || $scope.model.value[0] === null)) {
                 $scope.model.value = null;
             }
         });
-        
+
         function convertArrayToDictionaryArray(model){
             //now we need to format the items in the dictionary because we always want to have an array
             var newItems = [];
@@ -41,7 +41,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.DropdownFlexibleCo
             var keys = _.keys($scope.model.config.items);
 
             for (var i = 0; i < vals.length; i++) {
-                var label = vals[i].value ? vals[i].value : vals[i]; 
+                var label = vals[i].value ? vals[i].value : vals[i];
                 newItems.push({ id: keys[i], sortOrder: vals[i].sortOrder, value: label });
             }
 
@@ -65,7 +65,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.DropdownFlexibleCo
         else {
             throw "The items property must be either an array or a dictionary";
         }
-        
+
 
         //sort the values
         $scope.model.config.items.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
@@ -80,7 +80,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.DropdownFlexibleCo
                 $scope.model.value = "";
             }
         }
-        
+
         // if we run in single mode we'll store the value in a local variable
         // so we can pass an array as the model as our PropertyValueEditor expects that
         $scope.model.singleDropdownValue = "";
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html
index 6ab4fc6093..a7cabd1636 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html
@@ -13,8 +13,12 @@
         <umb-editor-container>
             <ng-form name="gridItemConfigEditor" val-form-manager>
 
-                <umb-box ng-if="model.config">
-                    <umb-box-header title-key="grid_settings" />
+                <umb-empty-state position="center" ng-if="model.config.length === 0 && model.styles.length === 0">
+                    <localize key="grid_noConfiguration">No further configuration available</localize>
+                </umb-empty-state>
+
+                <umb-box ng-if="model.config && model.config.length > 0">
+                    <umb-box-header title-key="grid_settings"></umb-box-header>
                     <umb-box-content>
                         <div>
                             <umb-property property="configValue"
@@ -25,8 +29,8 @@
                     </umb-box-content>
                 </umb-box>
 
-                <umb-box ng-if="model.styles">
-                    <umb-box-header title-key="grid_styles" />
+                <umb-box ng-if="model.styles && model.styles.length > 0">
+                    <umb-box-header title-key="grid_styles"></umb-box-header>
                     <umb-box-content>
                         <div>
                             <umb-property property="styleValue"
@@ -48,7 +52,8 @@
                             shortcut="esc"
                             action="vm.close()">
                 </umb-button>
-                <umb-button type="button"
+                <umb-button ng-if="(model.config && model.config.length > 0) || (model.styles && model.styles.length > 0)"
+                            type="button"
                             button-style="success"
                             label-key="general_submit"
                             action="vm.submit()">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js
index e56bc67a49..969f675139 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js
@@ -1,10 +1,66 @@
-function EditConfigController($scope) {
+function EditConfigController($scope, angularHelper) {
 
     var vm = this;
-
+    
     vm.submit = submit;
     vm.close = close;
 
+    vm.aceOption = {
+        mode: "json",
+        theme: "chrome",
+        showPrintMargin: false,
+        advanced: {
+            fontSize: '14px',
+            enableSnippets: true,
+            enableBasicAutocompletion: true,
+            enableLiveAutocompletion: false
+        },
+        onLoad: function (_editor) {
+            vm.editor = _editor;
+
+            vm.configJson = Utilities.toJson($scope.model.config, true);
+
+            vm.editor.setValue(vm.configJson);
+
+            vm.editor.on("blur", blurAceEditor);
+        }
+    };
+
+    function blurAceEditor(event, _editor) {
+        const code = _editor.getValue();
+
+        //var form = angularHelper.getCurrentForm($scope);
+        var form = vm.gridConfigEditor;
+        var isValid = isValidJson(code);
+
+        if (isValid) {
+            $scope.model.config = Utilities.fromJson(code);
+
+            setValid(form);
+        }
+        else {
+            setInvalid(form);
+        }
+    }
+
+    function isValidJson(model) {
+        var flag = true;
+        try {
+            Utilities.fromJson(model)
+        } catch (err) {
+            flag = false;
+        }
+        return flag;
+    }
+
+    function setValid(form) {
+        form.$setValidity('json', true);
+    }
+
+    function setInvalid(form) {
+        form.$setValidity('json', false);
+    }
+
     function submit() {
         if ($scope.model && $scope.model.submit) {
             $scope.model.submit($scope.model);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html
index 9fed19d4d9..4470c50274 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html
@@ -16,16 +16,18 @@
                 <umb-box>
                     <umb-box-content>
 
-                        <ng-form name="gridConfigEditor">
+                        <ng-form name="vm.gridConfigEditor">
 
                             <h4>{{model.name}}</h4>
                             <p>Settings will only save if the entered json configuration is valid</p>
-                            <textarea name="configSource"
-                                validate-on="'blur'"
-                                rows="20" class="umb-property-editor umb-textarea"
-                                umb-raw-model="model.config"></textarea>
 
-                            <div class="alert alert-error" ng-show="gridConfigEditor.$invalid === true">
+                            <div data-element="code-editor"
+                                 auto-scale="85"
+                                 umb-ace-editor="vm.aceOption"
+                                 model="vm.configJson">
+                            </div>
+
+                            <div class="alert alert-error mt3" ng-show="vm.gridConfigEditor.$invalid === true">
                                 This configuration is not valid json, and will not be saved.
                             </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
index 876e4cf8f3..cf201976ad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
@@ -2,17 +2,29 @@ angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.GridPrevalueEditor.LayoutConfigController",
     function ($scope, localizationService) {
 
+            var vm = this;
+
+            vm.labels = {};
         
             function init() {
-                setTitle();
+
+                var labelKeys = [
+                    "grid_addGridLayout",
+                    "grid_allowAllRowConfigurations"
+                ];
+
+                localizationService.localizeMany(labelKeys).then(function (data) {
+
+                    vm.labels.title = data[0];
+                    vm.labels.allowAllRowConfigurations = data[1];
+
+                    setTitle(vm.labels.title);
+                });
             }
 
-            function setTitle() {
+            function setTitle(value) {
                 if (!$scope.model.title) {
-                    localizationService.localize("grid_addGridLayout")
-                        .then(function(data){
-                            $scope.model.title = data;
-                        });
+                    $scope.model.title = value;
                 }
             }
 
@@ -56,13 +68,15 @@ angular.module("umbraco")
     		};
 
             $scope.toggleAllowed = function (section) {
+                section.allowAll = !section.allowAll;
+
                 if (section.allowed) {
                     delete section.allowed;
                 }
                 else {
                     section.allowed = [];
                 }
-            }
+            };
 
     		$scope.deleteSection = function(section, template) {
     			if ($scope.currentSection === section) {
@@ -71,19 +85,32 @@ angular.module("umbraco")
     			var index = template.sections.indexOf(section)
     			template.sections.splice(index, 1);
     		};
-    		
+
+            $scope.selectRow = function (section, row) {
+                section.allowed = section.allowed || [];
+
+                var index = section.allowed.indexOf(row.name);
+                if (row.allowed === true) {
+                    if (index === -1) {
+                        section.allowed.push(row.name); 
+                    }
+                }
+                else {
+                    section.allowed.splice(index, 1);
+                }
+            };
     		
             $scope.close = function() {
-                if($scope.model.close) {
+                if ($scope.model.close) {
                     $scope.model.close();
                 }
-            }
+            };
 
             $scope.submit = function () {
                 if ($scope.model.submit) {
                     $scope.model.submit($scope.currentLayout);
                 }
-            }
+            };
 
     		$scope.$watch("currentLayout", function(layout){
     		    if(layout){
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
index 06afaa6b45..6ff18e83ad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
@@ -1,166 +1,171 @@
-<div class="usky-grid usky-grid-configuration" ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.LayoutConfigController">
-
-
-
+<div class="usky-grid usky-grid-configuration"
+     ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.LayoutConfigController as vm">
 
     <umb-editor-view>
 
         <form novalidate name="LayoutConfigForm" val-form-manager>
 
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
+            <umb-editor-header
+                name="model.title"
+                name-locked="true"
+                hide-alias="true"
+                hide-icon="true"
+                hide-description="true">
+            </umb-editor-header>
 
-        <umb-editor-container>
-            <umb-box>
-                <umb-box-content>
+            <umb-editor-container>
+                <umb-box>
+                    <umb-box-content>
 
+                        <div class="umb-forms-settings form-horizontal">
 
+                            <p>
+                                <localize key="grid_addGridLayoutDetail">Adjust the layout by setting column widths and adding additional sections</localize>
+                            </p>
 
+                            <umb-control-group label="@general_name">
+                                <input type="text" ng-model="currentLayout.name"/>
+                            </umb-control-group>
 
+                            <div class="uSky-templates-template"
+                                 style="margin: 0; width: 350px; position: relative;">
 
+                                <div class="tb" style="height: 70px; border-width: 2px; padding: 2px">
+                                    <div class="tr">
 
-   <div class="umb-forms-settings form-horizontal">
+                                        <button type="button" class="btn-reset td uSky-templates-column"
+                                           ng-class="{last:$last, selected:section==currentSection}"
+                                           ng-repeat="section in currentLayout.sections"
+                                           ng-click="configureSection(section, currentLayout)"
+                                           ng-style="{width: percentage(section.grid) +'%'}">
+                                           <span class="sr-only">
+                                            <localize key="grid_editGridLayout">Edit grid layout</localize>
+                                        </span>
+                                        </button>
 
-      <p><localize key="grid_addGridLayoutDetail" /></p>
+                                        <button type="button" class="btn-reset td uSky-templates-column add" ng-if="availableLayoutSpace > 0"
+                                           ng-click="configureSection(undefined, currentLayout)"
+                                           ng-style="{width: percentage(availableLayoutSpace) + '%'}">
+                                            <i class="icon icon-add" aria-hidden="true"></i>
+                                            <span class="sr-only">
+                                                <localize key="grid_addGridLayout">Add grid layout</localize>
+                                            </span>
+                                        </a>
 
-      <umb-control-group label="@general_name">
-          <input type="text" ng-model="currentLayout.name" />
-      </umb-control-group>
+                                    </div>
+                                </div>
+                            </div>
 
-      <div class="uSky-templates-template"
-           style="margin: 0; width: 350px; position: relative;">
+                            <div ng-if="currentSection != null" style="padding-bottom: 50px;">
 
-          <div class="tb" style="height: 70px; border-width: 2px; padding: 2px">
-             <div class="tr">
+                                <umb-control-group label="@general_width">
+                                    <div class="grid-size-scaler">
+                                        <button type="button" class="btn-link" ng-click="scaleDown(currentSection)">
+                                            <i class="icon icon-remove" aria-hidden="true"></i>
+                                        </button>
+                                        <span>{{currentSection.grid}}</span>
+                                        <button type="button" class="btn-link"
+                                                ng-click="scaleUp(currentSection, availableLayoutSpace)">
+                                            <i class="icon icon-add" aria-hidden="true"></i>
+                                        </button>
+                                    </div>
+                                </umb-control-group>
 
-                  <a class="td uSky-templates-column"
-                     ng-class="{last:$last, selected:section==currentSection}"
-                     ng-repeat="section in currentLayout.sections"
-                     ng-click="configureSection(section, currentLayout)"
-                     ng-style="{width: percentage(section.grid) +'%'}">
-                  </a>
+                                <umb-control-group hide-label="true">
+                                    <i class="icon-delete red" aria-hidden="true"></i>
+                                    <button type="button" class="btn btn-small btn-link"
+                                            ng-click="deleteSection(currentSection, currentLayout)">
+                                        <localize key="general_delete" class="ng-isolate-scope ng-scope">Delete
+                                        </localize>
+                                    </button>
+                                </umb-control-group>
 
-                  <a class="td uSky-templates-column add" ng-if="availableLayoutSpace > 0"
-                     ng-click="configureSection(undefined, currentLayout)"
-                     ng-style="{width: percentage(availableLayoutSpace) + '%'}">
-                      <i class="icon icon-add"></i>
-                  </a>
+                                <umb-control-group hide-label="true">
 
-             </div>
-          </div>
-      </div>
+                                    <umb-toggle
+                                        class="umb-toggle-group-item__toggle"
+                                        checked="currentSection.allowAll"
+                                        on-click="toggleAllowed(currentSection)"
+                                        show-labels="true"
+                                        label-position="right"
+                                        label-off="Allow all row configurations"
+                                        label-on="Allow all row configurations"
+                                        style="margin-left: 18px">
+                                    </umb-toggle>
 
-      <div ng-if="currentSection != null" style="padding-bottom: 50px;">
+                                    <div ng-if="currentSection.allowAll === false">
+                                        <hr/>
 
-          <umb-control-group label="@general_width">
-             <div class="grid-size-scaler">
-                  <a href ng-click="scaleDown(currentSection)">
-                      <i class="icon icon-remove"></i>
-                  </a>
-                      {{currentSection.grid}}
-                  <a href ng-click="scaleUp(currentSection, availableLayoutSpace)">
-                      <i class="icon icon-add"></i>
-                  </a>
-             </div>
-          </umb-control-group>
+                                        <div class="control-group uSky-templates-rows">
+                                            <ul class="unstyled">
 
-		  <umb-control-group hide-label="true">
-			<i class="icon-delete red"></i>
-	  		<a class="btn btn-small btn-link" href="" ng-click="deleteSection(currentSection, currentLayout)">
-			  <localize key="general_delete" class="ng-isolate-scope ng-scope">Delete</localize>
-			</a>
-	  	</umb-control-group>
+                                                <li ng-repeat="row in rows track by $id(row)">
 
+                                                    <div class="flex">
 
-          <umb-control-group hide-label="true">
+                                                        <umb-checkbox model="row.allowed"
+                                                                      input-id="rowconfig-{{$index}}"
+                                                                      on-change="selectRow(currentSection, row)">
+                                                        </umb-checkbox>
 
-            <umb-toggle
-                class="umb-toggle-group-item__toggle"
-                checked="currentSection.allowAll"
-                on-click="currentSection.allowAll = !currentSection.allowAll"
-                show-labels="true"
-                label-position="right"
-                label-off="Allow all row configurations"
-                label-on="Allow all row configurations"
-                style="margin-left: 18px">
-            </umb-toggle>
+                                                        <button
+                                                            ng-click="row.allowed = !row.allowed; selectRow(currentSection, row)"
+                                                            class="btn-reset flex flex-auto">
 
-             <div ng-if="currentSection.allowAll === false">
-                  <hr />
+                                                            <span class="preview-rows columns" style="margin-top: auto;">
+                                                                <span class="preview-row">
+                                                                    <span class="preview-col"
+                                                                         ng-class="{last:$last}"
+                                                                         ng-repeat="area in row.areas"
+                                                                         ng-style="{width: percentage(area.grid) + '%'}">
 
-                  <div class="control-group uSky-templates-rows">
-                      <ul class="unstyled"
-                          ui-sortable
-                          ng-model="model.value.templates">
+                                                                        <span class="preview-cell"></span>
+                                                                    </span>
+                                                                </span>
+                                                            </span>
 
-                          <li ng-repeat="row in rows">
+                                                            <span>
+                                                                {{row.name}}<br/>
+                                                                <small>{{row.areas.length}} cells</small>
+                                                            </span>
+                                                        </button>
 
-                              <label style="display: block">
-                                 <input type="checkbox"
-                                     checklist-model="currentSection.allowed"
-                                     checklist-value="row.name"
-                                     style="float: left; margin-right: 10px;">
+                                                    </div>
 
-                                  <div class="preview-rows columns" style="margin-top: 5px; float:left">
-                                      <div class="preview-row">
-                                          <div class="preview-col"
-                                              ng-class="{last:$last}"
-                                              ng-repeat="area in row.areas"
-                                              ng-style="{width: percentage(area.grid) + '%'}">
+                                                    <br style="clear: both"/>
+                                                </li>
+                                            </ul>
+                                        </div>
+                                    </div>
+                                </umb-control-group>
+                            </div>
 
-                                              <div class="preview-cell"></div>
-                                          </div>
-                                      </div>
-                                  </div>
+                        </div>
 
-                                  <div>
-                                      {{row.name}}<br />
-                                      <small>{{row.areas.length}} cells</small><br />
-                                  </div>
-                              </label>
+                    </umb-box-content>
+                </umb-box>
+            </umb-editor-container>
 
-                              <br style="clear: both" />
-                          </li>
-                      </ul>
-                  </div>
-             </div>
-          </umb-control-group>
-      </div>
-
-   </div>
-
-
-
-
-                   </umb-box-content>
-               </umb-box>
-           </umb-editor-container>
-
-           <umb-editor-footer>
-               <umb-editor-footer-content-right>
-                   <umb-button
-                       type="button"
-                       button-style="link"
-                       label-key="general_close"
-                       shortcut="esc"
-                       action="close()">
-                   </umb-button>
+            <umb-editor-footer>
+                <umb-editor-footer-content-right>
+                    <umb-button
+                        type="button"
+                        button-style="link"
+                        label-key="general_close"
+                        shortcut="esc"
+                        action="close()">
+                    </umb-button>
                     <umb-button
                         type="button"
                         button-style="success"
                         label-key="general_submit"
                         action="submit()">
                     </umb-button>
-               </umb-editor-footer-content-right>
-           </umb-editor-footer>
+                </umb-editor-footer-content-right>
+            </umb-editor-footer>
 
-           </form>
+        </form>
 
-       </umb-editor-view>
+    </umb-editor-view>
 
-   </div>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
index 263e7c0d9a..83a9fd5394 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
@@ -1,22 +1,34 @@
 function RowConfigController($scope, localizationService) {
 
+    var vm = this;
+
+    vm.labels = {};
+    
     function init() {
-        setTitle();
+        
+        var labelKeys = [
+            "grid_addRowConfiguration",
+            "grid_allowAllEditors"
+        ];
+
+        localizationService.localizeMany(labelKeys).then(function (data) {
+
+            vm.labels.title = data[0];
+            vm.labels.allowAllEditors = data[1];
+
+            setTitle(vm.labels.title);
+        });
     }
 
-    function setTitle() {
+    function setTitle(value) {
         if (!$scope.model.title) {
-            localizationService.localize("grid_addRowConfiguration")
-                .then(function(data){
-                    $scope.model.title = data;
-                });
+            $scope.model.title = value;
         }
     }
     
-    
     $scope.currentRow = $scope.model.currentRow;
-    $scope.editors = $scope.model.editors;
     $scope.columns = $scope.model.columns;
+    $scope.editors = $scope.model.editors;
 
     $scope.scaleUp = function(section, max, overflow) {
         var add = 1;
@@ -44,7 +56,7 @@ function RowConfigController($scope, localizationService) {
             delete $scope.currentCell;
         }
         else {
-            if (cell === undefined) {
+            if (cell === null) {
                 var available = $scope.availableRowSpace;
                 var space = 4;
 
@@ -58,43 +70,64 @@ function RowConfigController($scope, localizationService) {
 
                 row.areas.push(cell);
             }
+
+            cell.allowed = cell.allowed || [];
+
+            $scope.editors.forEach(function (e) { e.allowed = cell.allowed.indexOf(e.alias) !== -1 });
+
             $scope.currentCell = cell;
             $scope.currentCell.allowAll = cell.allowAll || !cell.allowed || !cell.allowed.length;
         }
     };
 
     $scope.toggleAllowed = function (cell) {
+        cell.allowAll = !cell.allowAll;
+
         if (cell.allowed) {
             delete cell.allowed;
         }
         else {
             cell.allowed = [];
         }
-    }
+    };
 
     $scope.deleteArea = function (cell, row) {
     	if ($scope.currentCell === cell) {
-    		$scope.currentCell = undefined;
+    		$scope.currentCell = null;
     	}
     	var index = row.areas.indexOf(cell)
     	row.areas.splice(index, 1);
     };
 
     $scope.closeArea = function() {
-        $scope.currentCell = undefined;
+        $scope.currentCell = null;
+    };
+
+    $scope.selectEditor = function (cell, editor) {
+        cell.allowed = cell.allowed || [];
+
+        var index = cell.allowed.indexOf(editor.alias);
+        if (editor.allowed === true) {
+            if (index === -1) {
+                cell.allowed.push(editor.alias);
+            }
+        }
+        else {
+            cell.allowed.splice(index, 1);
+        }
     };
     
-    $scope.close = function() {
-        if($scope.model.close) {
+    $scope.close = function () {
+        if ($scope.model.close) {
             $scope.model.close();
         }
-    }
+    };
 
     $scope.submit = function () {
         if ($scope.model.submit) {
             $scope.model.submit($scope.currentRow);
         }
-    }
+    };
 
     $scope.nameChanged = false;
     var originalName = $scope.currentRow.name;
@@ -118,11 +151,8 @@ function RowConfigController($scope, localizationService) {
             }
         }
     }, true);
-
     
     init();
-    
-
 }
 
 angular.module("umbraco").controller("Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController", RowConfigController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
index 9e7034688b..9d105e2629 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
@@ -1,10 +1,8 @@
-<div class="usky-grid usky-grid-configuration" ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController">
+<div class="usky-grid usky-grid-configuration" ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController as vm">
 
+    <umb-editor-view>
 
-
-        <umb-editor-view>
-
-            <form novalidate name="RowConfigurationForm" val-form-manager>
+        <form novalidate name="RowConfigurationForm" val-form-manager>
 
             <umb-editor-header
                 name="model.title"
@@ -18,116 +16,117 @@
                 <umb-box>
                     <umb-box-content>
 
+                    <div class="umb-form-settings form-horizontal">
 
+                        <p><localize key="grid_addRowConfigurationDetail" /></p>
 
+                        <div class="alert alert-warn ng-scope" ng-show="nameChanged">
+                            <p>Modifying a row configuration name will result in loss of
+                            data for any existing content that is based on this configuration.</p>
+                            <p><strong>Modifying only the label will not result in data loss.</strong></p>
+                        </div>
 
+                        <umb-control-group label="@general_name">
+                            <input type="text" ng-model="currentRow.name" />
+                        </umb-control-group>
 
+                        <umb-control-group label="@general_label">
+                            <input type="text" ng-model="currentRow.label" placeholder="Overrides name" />
+                        </umb-control-group>
 
-   <div class="umb-form-settings form-horizontal">
+                        <div class="uSky-templates-template"
+                            style="margin: 0; width: 350px; position: relative;">
 
-      <p><localize key="grid_addRowConfigurationDetail" /></p>
+                            <div class="tb" style="height: auto; border: none !important; background: none">
+                                <div class="tr">
 
-      <div class="alert alert-warn ng-scope" ng-show="nameChanged">
-          <p>Modifying a row configuration name will result in loss of
-          data for any existing content that is based on this configuration.</p>
-          <p><strong>Modifying only the label will not result in data loss.</strong></p>
-      </div>
+                                    <button type="button" class="btn-reset td uSky-templates-column"
+                                        ng-class="{last:$last, selected:cell==currentCell}"
+                                        ng-repeat="cell in currentRow.areas"
+                                        ng-click="configureCell(cell, currentRow)"
+                                        ng-style="{width: percentage(cell.grid) + '%'}">
+                                        <span class="sr-only">
+                                            <span class="sr-only">
+                                                <localize key="grid_editRowConfiguration">Edit row configuration</localize>
+                                            </span>
+                                        </span>
+                                    </button>
 
-       <umb-control-group label="@general_name">
-           <input type="text" ng-model="currentRow.name" />
-       </umb-control-group>
+                                    <button type="button" class="btn-reset td uSky-templates-column add"
+                                       ng-click="configureCell(null, currentRow)"
+                                       ng-style="{width: percentage(availableRowSpace) + '%'}">
+                                        <i class="icon icon-add" aria-hidden="true"></i>
+                                        <span class="sr-only">
+                                            <localize key="grid_addRowConfiguration">Add row configuration</localize>
+                                        </span>
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
 
-       <umb-control-group label="@general_label">
-           <input type="text" ng-model="currentRow.label" placeholder="Overrides name" />
-       </umb-control-group>
+                        <div ng-if="currentCell" style="padding-bottom: 50px;">
 
-      <div class="uSky-templates-template"
-           style="margin: 0; width: 350px; position: relative;">
+                            <umb-control-group label="@general_width">
+                                <div class="grid-size-scaler">
+                                    <button type="button" class="btn-link" ng-click="scaleDown(currentCell)">
+                                        <i class="icon icon-remove" aria-hidden="true"></i>
+                                    </button>
+                                    <span>{{currentCell.grid}}</span>
+                                    <button type="button" class="btn-link" ng-click="scaleUp(currentCell, availableRowSpace, true)">
+                                        <i class="icon icon-add" aria-hidden="true"></i>
+                                    </button>
+                                </div>
+                            </umb-control-group>
 
-           <div class="tb" style="height: auto; border: none !important; background: none">
-               <div class="tr">
+                            <umb-control-group label="@grid_maxItems" description="@grid_maxItemsDescription">
+                                <input type="number" ng-model="currentCell.maxItems" class="umb-property-editor-tiny" placeholder="Max" min="0" />
+                            </umb-control-group>
 
-                   <a class="td uSky-templates-column"
-                       ng-class="{last:$last, selected:cell==currentCell}"
-                       ng-repeat="cell in currentRow.areas"
-                       ng-click="configureCell(cell, currentRow)"
-                       ng-style="{width: percentage(cell.grid) + '%'}">
-                   </a>
+                            <umb-control-group hide-label="true">
+	  		                    <i class="icon-delete red" aria-hidden="true"></i>
+	  		                    <button type="button" class="btn btn-small btn-link" ng-click="deleteArea(currentCell, currentRow)">
+	  			                    <localize key="general_delete" class="ng-isolate-scope ng-scope">Delete</localize>
+	  		                    </button>
+	  	                    </umb-control-group>
 
-                   <a class="td uSky-templates-column add"
-                       ng-click="configureCell(undefined, currentRow)"
-                       ng-style="{width: percentage(availableRowSpace) + '%'}">
-                       <i class="icon icon-add"></i>
-                   </a>
-               </div>
-           </div>
-      </div>
+                            <umb-control-group hide-label="true">
 
-      <div ng-if="currentCell" style="padding-bottom: 50px;">
+                                <umb-toggle class="umb-toggle-group-item__toggle"
+                                            checked="currentCell.allowAll"
+                                            on-click="toggleAllowed(currentCell)"
+                                            show-labels="true"
+                                            label-position="right"
+                                            label-off="{{vm.labels.allowAllEditors}}"
+                                            label-on="{{vm.labels.allowAllEditors}}"
+                                            style="margin-left: 18px">
+                                </umb-toggle>
 
-          <umb-control-group label="@general_width">
-              <div class="grid-size-scaler">
-                  <a href ng-click="scaleDown(currentCell)">
-                      <i class="icon icon-remove"></i>
-                  </a>
-                  {{currentCell.grid}}
-                  <a href ng-click="scaleUp(currentCell, availableRowSpace, true)">
-                      <i class="icon icon-add"></i>
-                  </a>
-              </div>
-          </umb-control-group>
+                                <div ng-if="currentCell.allowAll === false">
+                                    <hr />
+                                    <ul class="unstyled">
+                                        <li ng-repeat="editor in editors track by $id(editor)">
 
-          <umb-control-group label="@grid_maxItems" description="@grid_maxItemsDescription">
-              <input type="number" ng-model="currentCell.maxItems" class="umb-property-editor-tiny" placeholder="Max" min="0" />
-          </umb-control-group>
+                                            <umb-checkbox model="editor.allowed"
+                                                          input-id="editorconfig-{{$index}}"
+                                                          on-change="selectEditor(currentCell, editor)">
+                                                <i class="icon {{editor.icon}}" aria-hidden="true"></i> {{editor.name}}
+                                                <small class="input-label--small">({{editor.alias}})</small>
+                                            </umb-checkbox>
 
-          <umb-control-group hide-label="true">
-	  		  <i class="icon-delete red"></i>
-	  		  <a class="btn btn-small btn-link" href="" ng-click="deleteArea(currentCell, currentRow)">
-	  			  <localize key="general_delete" class="ng-isolate-scope ng-scope">Delete</localize>
-	  		  </a>
-	  	  </umb-control-group>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </umb-control-group>
+                        </div>
 
-          <umb-control-group hide-label="true">
-             <ul class="unstyled">
-                  <li>
-                      <label>
-                          <input type="checkbox"
-                              ng-model="currentCell.allowAll"
-                              ng-change="toggleAllowed(currentCell)" />
-                              <localize key="grid_allowAllEditors"/>
-                      </label>
-                  </li>
-             </ul>
+                    </div>
 
-             <div ng-if="currentCell.allowAll === false">
-                  <hr />
-                  <ul class="unstyled">
-                      <li ng-repeat="editor in editors">
-                          <label>
-                              <input type="checkbox"
-                                  checklist-model="currentCell.allowed"
-                                  checklist-value="editor.alias">
-                                   <i class="icon {{editor.icon}}"></i> {{editor.name}}
-                                   <small class="input-label--small">({{editor.alias}})</small>
-                          </label>
-                      </li>
-                  </ul>
-             </div>
-          </umb-control-group>
-      </div>
+                    </umb-box-content>
+                </umb-box>
+            </umb-editor-container>
 
-   </div>
-
-
-
-
-                            </umb-box-content>
-                        </umb-box>
-                    </umb-editor-container>
-
-                    <umb-editor-footer>
-                    <umb-editor-footer-content-right>
+            <umb-editor-footer>
+                <umb-editor-footer-content-right>
                     <umb-button
                         type="button"
                         button-style="link"
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowdeleteconfirm.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowdeleteconfirm.controller.js
deleted file mode 100644
index 10b5601304..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowdeleteconfirm.controller.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function DeleteRowConfirmController($scope) {
-
-    $scope.close = function() {
-        if($scope.model.close) {
-            $scope.model.close();
-        }
-    }
-    
-    $scope.submit = function() {
-        if($scope.model && $scope.model.submit) {
-            $scope.model.submit($scope.model);
-        }
-    }
-}
-
-angular.module("umbraco").controller("Umbraco.PropertyEditors.GridPrevalueEditor.DeleteRowConfirmController", DeleteRowConfirmController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowdeleteconfirm.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowdeleteconfirm.html
deleted file mode 100644
index 02b92f44f7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowdeleteconfirm.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<div class="usky-grid usky-grid-configuration" ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.DeleteRowConfirmController">
-
-    <umb-editor-view>
-        <umb-editor-container>
-            <umb-box>
-                <umb-box-content>
-                    <h3 class="alert alert-danger ng-scope"><localize key="grid_warning">Warning!</localize></h3>
-
-                    <p>
-                        <localize key="grid_youAreDeleting">You are deleting the row configuration </localize> <strong>{{model.dialogData.rowName}}</strong>
-                    </p>
-
-                    <p>
-                        <localize key="grid_deletingARow">
-                            Modifying a row configuration name will result in loss of
-                            data for any existing content that is based on this configuration.
-                        </localize>
-                    </p>
-
-                    <p>
-                        <localize key="general_areyousure">Are you sure?</localize>
-                    </p>
-
-                </umb-box-content>
-            </umb-box>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button type="button"
-                            button-style="link"
-                            label-key="general_close"
-                            shortcut="esc"
-                            action="close()">
-                </umb-button>
-                <umb-button type="button"
-                            button-style="danger"
-                            label-key="general_delete"
-                            action="submit(model)">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
index 1370550631..dbc847738c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
@@ -19,10 +19,10 @@ angular.module("umbraco")
 
         $scope.setEmbed = function () {
 
-            var original = Utilities.isObject($scope.control.value) ? $scope.control.value : null;
+            var modify = Utilities.isObject($scope.control.value) ? $scope.control.value : null;
 
             var embed = {
-                original: original,
+                modify: modify,
                 submit: function (model) {
 
                     var embed = {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
index de80b05760..14741d6ca6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
@@ -1,13 +1,13 @@
 <div ng-controller="Umbraco.PropertyEditors.Grid.EmbedController">
 
-    <div class="umb-editor-placeholder" ng-click="setEmbed()" ng-if="trustedValue === null">
+    <button type="button" class="btn-reset umb-editor-placeholder" ng-click="setEmbed()" ng-if="trustedValue === null">
         <i class="icon icon-movie-alt"></i>
-        <div class="help-text"><localize key="grid_clickToEmbed">Click to embed</localize></div>
-    </div>
+        <span class="help-text"><localize key="grid_clickToEmbed">Click to embed</localize></span>
+    </button>
 
-    <div class="umb-editor-preview" ng-if="control.value" ng-click="setEmbed()">
-        <div class="umb-editor-preview-overlay"></div>
-        <div ng-bind-html="trustedValue"></div>
-    </div>
+    <button type="button" class="btn-reset umb-editor-preview" ng-if="control.value" ng-click="setEmbed()">
+        <span class="umb-editor-preview-overlay"></span>
+        <span ng-bind-html="trustedValue"></span>
+    </button>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/error.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/error.html
index 67ef4ea112..5437c2bf85 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/error.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/error.html
@@ -1,2 +1,2 @@
 <p class="red">Something went wrong with this editor, below is the data stored:</p>
-<pre>{{control | json}}</pre>
\ No newline at end of file
+<umb-code-snippet language="'JSON'">{{control | json}}</umb-code-snippet>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html
index cc581698fc..c07d29d89c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html
@@ -1,16 +1,13 @@
 <div ng-controller="Umbraco.PropertyEditors.Grid.MacroController">
 
-	<div class="umb-editor-placeholder" ng-click="setMacro()">
-		<div ng-if="!preview">
+	<button type="button" class="btn-reset umb-editor-placeholder" ng-click="setMacro()">
+		<span ng-if="!preview">
 			<i class="icon icon-settings-alt"></i>
-			<div class="help-text">{{title}}</div>
-		</div>
-		<div ng-if="preview">
-			<div
-				ng-if="preview" style="text-align: left; pointer-events: none; cursor: default;"
-				ng-bind-html="preview">
-			</div>
-		</div>
-	</div>
-	
+			<span class="help-text">{{title}}</span>
+        </span>
+		<span ng-if="preview" style="text-align: left; pointer-events: none; cursor: default;"
+			ng-bind-html="preview">
+		</span>
+	</button>
+
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index 574aa87557..716ca405c1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -1,10 +1,8 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.Grid.MediaController",
-    function ($scope, $timeout, userService, editorService) {
-        
-        
-        $scope.thumbnailUrl = getThumbnailUrl();
+    function ($scope, userService, editorService, localizationService) {        
         
+        $scope.thumbnailUrl = getThumbnailUrl();        
         
         if (!$scope.model.config.startNodeId) {
             if ($scope.model.config.ignoreUserStartNodes === true) {
@@ -12,79 +10,118 @@ angular.module("umbraco")
                 $scope.model.config.startNodeIsVirtual = true;
 
             } else {
-                userService.getCurrentUser().then(function (userData) {
+                userService.getCurrentUser().then(userData => {
                     $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
                     $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
                 });
             }
         }
-        
-        $scope.setImage = function(){
-            var startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : undefined;
-            var startNodeIsVirtual = startNodeId ? $scope.model.config.startNodeIsVirtual : undefined;
+
+        $scope.setImage = function() {
+            var startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : null;
 
             var mediaPicker = {
                 startNodeId: startNodeId,
-                startNodeIsVirtual: startNodeIsVirtual,
-                cropSize: $scope.control.editor.config && $scope.control.editor.config.size ? $scope.control.editor.config.size : undefined,
+                startNodeIsVirtual: startNodeId ? $scope.model.config.startNodeIsVirtual : null,
+                cropSize: $scope.control.editor.config && $scope.control.editor.config.size ? $scope.control.editor.config.size : null,
                 showDetails: true,
                 disableFolderSelect: true,
                 onlyImages: true,
                 dataTypeKey: $scope.model.dataTypeKey,
-                submit: function(model) {
-                    var selectedImage = model.selection[0];
-                   
-                    $scope.control.value = {
-                        focalPoint: selectedImage.focalPoint,
-                        id: selectedImage.id,
-                        udi: selectedImage.udi,
-                        image: selectedImage.image,
-                        caption: selectedImage.altText
-                    };
-                    
+                submit: model => {
+                    updateControlValue(model.selection[0]);                    
                     editorService.close();
                 },
-                close: function() {
-                    editorService.close();
-                }
-            }
-            
+                close: () => editorService.close()                
+            };
+
             editorService.mediaPicker(mediaPicker);
         };
+
+        $scope.editImage = function() {               
+
+            const mediaCropDetailsConfig = {
+                size: 'small',
+                target: $scope.control.value,
+                submit: model => {
+                    updateControlValue(model.target);
+                    editorService.close();
+                },
+                close: () => editorService.close()                
+            };
+
+            localizationService.localize('defaultdialogs_editSelectedMedia').then(value => {
+                mediaCropDetailsConfig.title = value;
+                editorService.mediaCropDetails(mediaCropDetailsConfig);
+            });        
+        }
         
-        $scope.$watch('control.value', function(newValue, oldValue) {
-            if(angular.equals(newValue, oldValue)){
-                return; // simply skip that
-            }
-            
-            $scope.thumbnailUrl = getThumbnailUrl();
-        }, true);
-        
+        /**
+         * 
+         */
         function getThumbnailUrl() {
 
-            if($scope.control.value && $scope.control.value.image) {
+            if ($scope.control.value && $scope.control.value.image) {
                 var url = $scope.control.value.image;
 
-                if($scope.control.editor.config && $scope.control.editor.config.size){
-                    url += "?width=" + $scope.control.editor.config.size.width;
-                    url += "&height=" + $scope.control.editor.config.size.height;
-                    url += "&animationprocessmode=first";
-
-                    if($scope.control.value.focalPoint){
-                        url += "&center=" + $scope.control.value.focalPoint.top +"," + $scope.control.value.focalPoint.left;
-                        url += "&mode=crop";
+                if ($scope.control.editor.config && $scope.control.editor.config.size){
+                    if ($scope.control.value.coordinates) {
+                        // New way, crop by percent must come before width/height.
+                        var coords = $scope.control.value.coordinates;
+                        url += `?crop=${coords.x1},${coords.y1},${coords.x2},${coords.y2}&cropmode=percentage`;
+                    } else {
+                        // Here in order not to break existing content where focalPoint were used.
+                        // For some reason width/height have to come first when mode=crop.
+                        if ($scope.control.value.focalPoint) {
+                            url += `?center=${$scope.control.value.focalPoint.top},${$scope.control.value.focalPoint.left}`;
+                            url += '&mode=crop';
+                        } else {
+                            // Prevent black padding and no crop when focal point not set / changed from default
+                            url += '?center=0.5,0.5&mode=crop';
+                        }
                     }
+
+                    url += '&width=' + $scope.control.editor.config.size.width;
+                    url += '&height=' + $scope.control.editor.config.size.height;
+                    url += '&animationprocessmode=first';
                 }
 
                 // set default size if no crop present (moved from the view)
-                if (url.indexOf('?') == -1)
+                if (url.includes('?') === false)
                 {
-                    url += "?width=800&upscale=false&animationprocessmode=false"
+                    url += '?width=800&upscale=false&animationprocessmode=false'
                 }
+
                 return url;
             }
             
             return null;
-        };
+        }
 
-});
+        /**
+         * 
+         * @param {object} selectedImage 
+         */
+        function updateControlValue(selectedImage) {
+
+            const doGetThumbnail = $scope.control.value.focalPoint !== selectedImage.focalPoint 
+                || $scope.control.value.image !== selectedImage.image;
+
+            // we could apply selectedImage directly to $scope.control.value,
+            // but this allows excluding fields in future if needed
+            $scope.control.value = {
+                focalPoint: selectedImage.focalPoint,
+                coordinates: selectedImage.coordinates,
+                id: selectedImage.id,
+                udi: selectedImage.udi,
+                image: selectedImage.image,
+                caption: selectedImage.caption,
+                altText: selectedImage.altText
+            };
+
+
+            if (doGetThumbnail) {
+                $scope.thumbnailUrl = getThumbnailUrl();
+            }
+        }       
+    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
index 184f707ebf..2f73dc82ec 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
@@ -1,16 +1,28 @@
 <div ng-controller="Umbraco.PropertyEditors.Grid.MediaController">
+    <button type="button" class="btn-reset umb-editor-placeholder" ng-click="setImage()" ng-if="control.value === null">
+        <i class="icon icon-picture"></i>
+        <span ng-id="!control.$inserted" class="help-text">
+            <localize key="grid_clickToInsertImage">Click to insert image</localize>
+        </span>
+    </button>
 
-	<div class="umb-editor-placeholder" ng-click="setImage()" ng-if="control.value === null">
-		<i class="icon icon-picture"></i>
-        <div ng-id="!control.$inserted" class="help-text"><localize key="grid_clickToInsertImage">Click to insert image</localize></div>
-	</div>
-
-	<div ng-if="thumbnailUrl !== null">
-		<img
-			ng-click="setImage()"
-			ng-src="{{thumbnailUrl}}"
-			class="fullSizeImage" />
-        <input type="text" class="caption" ng-model="control.value.caption" localize="placeholder" placeholder="@grid_placeholderImageCaption" />
- 	</div>
+    <div ng-if="thumbnailUrl !== null" class="relative">
+        
+        <img ng-src="{{thumbnailUrl}}" class="fullSizeImage" alt="" />
 
+        <div class="umb-grid-media--controls">
+            <umb-button                
+                action="setImage()"
+                type="button"
+                button-style="info"
+                label-key="defaultdialogs_selectMedia">
+            </umb-button>            
+            <umb-button                
+                action="editImage()"
+                type="button"
+                button-style="info"
+                label-key="general_edit">
+            </umb-button>
+        </div>
+    </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/textstring.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/textstring.html
index 18526b0216..98e81d1d26 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/textstring.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/textstring.html
@@ -3,7 +3,7 @@
 		rows="1"
 		umb-auto-resize
 		umb-auto-focus
-		class="textstring input-block-level" id="{{control.uniqueId}}_text"
+		class="textstring input-block-level" id="{{control.$uniqueId}}_text"
 		ng-model="control.value"
 		ng-attr-style="{{control.editor.config.style}}" localize="placeholder" placeholder="@grid_placeholderWriteHere"></textarea>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index a0826f7a96..50146a4c36 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -405,14 +405,16 @@ angular.module("umbraco")
 
                 eventsService.emit("grid.rowAdded", { scope: $scope, element: $element, row: row });
 
-                // TODO: find a nicer way to do this without relying on setTimeout
-                setTimeout(function () {
-                    var newRowEl = $element.find("[data-rowid='" + row.$uniqueId + "']");
+                if (!isInit) {
+                    // TODO: find a nicer way to do this without relying on setTimeout
+                    setTimeout(function () {
+                        var newRowEl = $element.find("[data-rowid='" + row.$uniqueId + "']");
 
-                    if (newRowEl !== null) {
-                        newRowEl.focus();
-                    }
-                }, 0);
+                        if (newRowEl !== null) {
+                            newRowEl.focus();
+                        }
+                    }, 0);
+                }
 
             };
 
@@ -625,21 +627,8 @@ angular.module("umbraco")
 
             }
 
-
-            var guid = (function () {
-                function s4() {
-                    return Math.floor((1 + Math.random()) * 0x10000)
-                        .toString(16)
-                        .substring(1);
-                }
-                return function () {
-                    return s4() + s4() + "-" + s4() + "-" + s4() + "-" +
-                        s4() + "-" + s4() + s4() + s4();
-                };
-            })();
-
-            $scope.setUniqueId = function (cell, index) {
-                return guid();
+            $scope.setUniqueId = function () {
+                return String.CreateGuid();
             };
 
             $scope.addControl = function (editor, cell, index, initialize) {
@@ -953,7 +942,7 @@ angular.module("umbraco")
                 $scope.availableEditors = response.data;
 
                 //Localize the grid editor names
-                angular.forEach($scope.availableEditors, function (value, key) {
+                $scope.availableEditors.forEach(function (value) {
                     //If no translation is provided, keep using the editor name from the manifest
                     localizationService.localize("grid_" + value.alias, undefined, value.name).then(function (v) {
                         value.name = v;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 0628766638..5ceb7ded4a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -22,7 +22,7 @@
         <div class="templates-preview"
              ng-show="!model.value || model.value == ''">
 
-             <p><strong><localize key="grid_chooseLayout" /></strong></p>
+             <p><strong><localize key="grid_chooseLayout">Choose a layout</localize></strong></p>
 
             <div class="preview-rows layout"
                  ng-repeat="template in model.config.items.templates"
@@ -83,7 +83,7 @@
                                     <div class="umb-row-title">{{row.label || row.name}}</div>
 
                                     <div class="umb-grid-has-config" ng-if="row.hasConfig && !sortMode">
-                                            <localize key="grid_settingsApplied" />
+                                            <p><localize key="grid_settingsApplied">Settings applied</localize></p>
                                     </div>
                                 </div>
 
@@ -91,7 +91,12 @@
                                <div class="umb-tools row-tools" ng-show="(row === active || row === currentRowWithActiveChild) && !sortMode">
 
                                    <div class="cell-tools-edit row-tool" ng-if="hasSettings">
-                                       <i class="icon icon-settings" title="@grid_settings" localize="title" ng-click="editGridItemSettings(row, 'row')"></i>
+                                       <button type="button" class="btn-icon" ng-click="editGridItemSettings(row, 'row')" localize="title" title="@grid_settings">
+                                           <umb-icon icon="icon-settings" class="icon-settings"></umb-icon>
+                                           <span class="sr-only">
+                                               <localize key="grid_settings">Settings</localize>
+                                           </span>
+                                       </button>
                                    </div>
 
                                     <div class="cell-tools-remove row-tool">
@@ -138,24 +143,27 @@
 
                                                       <!-- disable drop overlay -->
                                                       <div class="drop-overlay -disable" ng-if="area.dropNotAllowed">
-                                                          <i class="icon-delete drop-icon"></i>
-                                                          <localize key="grid_contentNotAllowed" />
+                                                          <i class="icon-delete drop-icon" aria-hidden="true"></i>
+                                                          <p><localize key="grid_contentNotAllowed">This content is not allowed here</localize></p>
                                                       </div>
 
                                                       <!-- allow drop overlay -->
                                                       <div class="drop-overlay -allow" ng-if="area.dropOnEmpty">
-                                                          <i class="icon-download drop-icon"></i>
-                                                          <localize key="grid_contentAllowed" />
+                                                          <i class="icon-download drop-icon" aria-hidden="true"></i>
+                                                          <p><localize key="grid_contentAllowed">This content is allowed here</localize></p>
                                                       </div>
 
                                                       <div class="umb-grid-has-config" ng-if="area.hasConfig && !sortMode">
-                                                         <localize key="grid_settingsApplied" />
+                                                         <p>
+                                                            <localize key="grid_settingsApplied">Settings applied</localize>
+                                                         </p>
                                                       </div>
 
                                                       <div class="cell-tools" ng-if="(area === active || area === currentCellWithActiveChild) && !sortMode">
-                                                         <div class="cell-tool" ng-click="editGridItemSettings(area, 'cell')">
-                                                            <i class="icon-settings"></i>
-                                                         </div>
+                                                          <button type="button" aria-haspopup="true" class="btn-icon cell-tool" ng-click="editGridItemSettings(area, 'cell')">
+                                                              <umb-icon icon="icon-settings" class="icon-settings"></umb-icon>
+                                                              <span class="sr-only">Open column settings</span>
+                                                          </button>
                                                       </div>
 
                                                       <div class="umb-cell-inner" ui-sortable="sortableOptionsCell" umb-grid-hack-scope ng-model="area.controls">
@@ -163,8 +171,10 @@
                                                           <!-- Control placeholder -->
                                                           <button class="umb-cell-placeholder btn-reset" type="button" ng-if="area.controls.length === 0" ng-click="openEditorOverlay($event, area, 0, area.$uniqueId);">
                                                                <div class="cell-tools-add -center">
-                                                                   <localize ng-if="!sortMode" key="grid_addElement" />
-                                                                   <localize ng-if="sortMode" key="grid_dropElement" />
+                                                                   <p>
+                                                                        <localize ng-if="!sortMode" key="grid_addElement">Add content</localize>
+                                                                        <localize ng-if="sortMode" key="grid_dropElement">Drop element</localize>
+                                                                   </p>
                                                                </div>
                                                           </button>
 
@@ -196,7 +206,12 @@
                                                                       <div class="umb-tools" ng-if="control === active">
 
                                                                           <div class="umb-control-tool" ng-if="control.editor.config.settings">
-                                                                              <button class="umb-control-tool-icon icon-settings btn-reset" ng-click="editGridItemSettings(control, 'control')" type="button"></button>
+                                                                              <button type="button" class="umb-control-tool-icon btn-icon" ng-click="editGridItemSettings(control, 'control')">
+                                                                                  <umb-icon icon="icon-settings" class="icon-settings"></umb-icon>
+                                                                                  <span class="sr-only">
+                                                                                      <localize key="general_edit">Edit</localize>
+                                                                                  </span>
+                                                                              </button>
                                                                           </div>
 
                                                                           <div class="umb-control-tool">
@@ -226,7 +241,7 @@
 
                                                       <!-- if area is empty tools -->
                                                       <div class="umb-grid-add-more-content" ng-if="area.controls.length > 0 && !sortMode && (area.maxItems == undefined || area.maxItems == '' || area.maxItems == 0 || area.maxItems > area.controls.length)">
-                                                          <button class="cell-tools-add -bar newbtn btn-reset" type="button" ng-click="openEditorOverlay($event, area, 0, area.$uniqueId);"><localize key="grid_addElement" /></button>
+                                                          <button class="cell-tools-add -bar newbtn btn-reset" type="button" ng-click="openEditorOverlay($event, area, 0, area.$uniqueId);"><localize key="grid_addElement">Add element</localize></button>
                                                       </div>
 
                                                  </div>
@@ -249,24 +264,22 @@
 
                     <div class="umb-add-row" ng-if="!sortMode">
 
-                       <button
-                          class="iconBox btn-reset"
-                          type="button"
-                          title="{{ section.$allowedLayouts.length == 1 ? section.$allowedLayouts[0].label || section.$allowedLayouts[0].name : '' }}"
-                          ng-click="section.$allowedLayouts.length == 1 ? addRow(section, section.$allowedLayouts[0]) : toggleAddRow()"
-                          ng-if="!showRowConfigurations">
-
-                          <i class="icon icon-add" ></i>
-                          <span class="sr-only">
-                            <localize key="visuallyHiddenTexts_addNewRow">Add new row</localize>
-                          </span>
+                       <button type="button"
+                               class="iconBox btn-reset"
+                               title="{{section.$allowedLayouts.length == 1 ? section.$allowedLayouts[0].label || section.$allowedLayouts[0].name : ''}}"
+                               ng-click="section.$allowedLayouts.length == 1 ? addRow(section, section.$allowedLayouts[0]) : toggleAddRow()"
+                               ng-if="!showRowConfigurations">
+                            <i class="icon icon-add" aria-hidden="true"></i>
+                            <span class="sr-only">
+                                <localize key="visuallyHiddenTexts_addNewRow">Add new row</localize>
+                            </span>
                         </button>
 
                     </div>
 
                     <div class="templates-preview" ng-if="showRowConfigurations">
 
-                        <p ng-hide="section.rows.length > 0"><strong><localize key="grid_addRows" /></strong></p>
+                        <p ng-hide="section.rows.length > 0"><strong><localize key="grid_addRows">Add row</localize></strong></p>
 
                         <button class="preview-rows columns btn-reset"
                              ng-repeat="layout in  section.$allowedLayouts"
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
index f273ea63e6..9614eabb7e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
@@ -1,6 +1,22 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.GridPrevalueEditorController",
-        function ($scope, gridService, editorService) {
+        function ($scope, gridService, editorService, localizationService, overlayService) {
+
+            var vm = this;
+
+            vm.configureTemplate = configureTemplate;
+            vm.deleteTemplate = deleteTemplate;
+
+            vm.configureLayout = configureLayout;
+            vm.deleteLayout = deleteLayout;
+
+            vm.toggleCollection = toggleCollection;
+            vm.percentage = percentage;
+            vm.zeroWidthFilter = zeroWidthFilter;
+
+            vm.removeConfigValue = removeConfigValue;
+            vm.editConfig = editConfig;
+            vm.editStyles = editStyles;
 
             var emptyModel = {
                 styles: [
@@ -73,19 +89,17 @@ angular.module("umbraco")
             };
 
             /****************
-                template
+                Template
             *****************/
 
-            $scope.configureTemplate = function (template) {
+            function configureTemplate(template) {
 
                 var index = $scope.model.value.templates.indexOf(template);
 
                 if (template === undefined) {
                     template = {
                         name: "",
-                        sections: [
-
-                        ]
+                        sections: []
                     };
                 }
 
@@ -109,28 +123,24 @@ angular.module("umbraco")
                 };
 
                 editorService.open(layoutConfigOverlay);
+            }
 
-            };
-
-            $scope.deleteTemplate = function (index) {
+            function deleteTemplate(index) {
                 $scope.model.value.templates.splice(index, 1);
-            };
-
+            }
 
             /****************
                 Row
             *****************/
 
-            $scope.configureLayout = function (layout) {
+            function configureLayout(layout) {
 
                 var index = $scope.model.value.layouts.indexOf(layout);
 
                 if (layout === undefined) {
                     layout = {
                         name: "",
-                        areas: [
-
-                        ]
+                        areas: []
                     };
                 }
 
@@ -154,35 +164,37 @@ angular.module("umbraco")
                 };
 
                 editorService.open(rowConfigOverlay);
+            }
 
-            };
+            function deleteLayout(layout, index, event) {
 
-            //var rowDeletesPending = false;
-            $scope.deleteLayout = function (index) {
-
-                var rowDeleteOverlay = {
-                    dialogData: {
-                        rowName: $scope.model.value.layouts[index].name
-                    },
-                    view: "views/propertyEditors/grid/dialogs/rowdeleteconfirm.html",
-                    size: "small",
+                const dialog = {
+                    view: "views/propertyEditors/grid/overlays/rowdeleteconfirm.html",
+                    layout: layout,
+                    submitButtonLabelKey: "contentTypeEditor_yesDelete",
+                    submitButtonStyle: "danger",
                     submit: function (model) {
                         $scope.model.value.layouts.splice(index, 1);
-                        editorService.close();
+                        overlayService.close();
                     },
-                    close: function (model) {
-                        editorService.close();
+                    close: function () {
+                        overlayService.close();
                     }
                 };
 
-                editorService.open(rowDeleteOverlay);
-            };
+                localizationService.localize("general_delete").then(value => {
+                    dialog.title = value;
+                    overlayService.open(dialog);
+                });
 
+                event.preventDefault();
+                event.stopPropagation();
+            }
 
             /****************
-                utillities
+                Utilities
             *****************/
-            $scope.toggleCollection = function (collection, toggle) {
+            function toggleCollection(collection, toggle) {
                 if (toggle) {
                     collection = [];
                 } else {
@@ -190,21 +202,21 @@ angular.module("umbraco")
                 }
             };
 
-            $scope.percentage = function (spans) {
+            function percentage(spans) {
                 return ((spans / $scope.model.value.columns) * 100).toFixed(8);
-            };
+            }
 
-            $scope.zeroWidthFilter = function (cell) {
+            function zeroWidthFilter(cell) {
                 return cell.grid > 0;
-            };
+            }
 
             /****************
                 Config
             *****************/
 
-            $scope.removeConfigValue = function (collection, index) {
+            function removeConfigValue(collection, index) {
                 collection.splice(index, 1);
-            };
+            }
 
             var editConfigCollection = function (configValues, title, callback) {
 
@@ -225,27 +237,27 @@ angular.module("umbraco")
                 editorService.open(editConfigCollectionOverlay);
             };
 
-            $scope.editConfig = function () {
+            function editConfig() {
                 editConfigCollection($scope.model.value.config, "Settings", function (data) {
                     $scope.model.value.config = data;
                 });
-            };
+            }
 
-            $scope.editStyles = function () {
+            function editStyles() {
                 editConfigCollection($scope.model.value.styles, "Styling", function (data) {
                     $scope.model.value.styles = data;
                 });
-            };
+            }
 
             /****************
-                editors
+                Editors
             *****************/
             gridService.getGridEditors().then(function (response) {
                 $scope.editors = response.data;
             });
 
 
-            /* init grid data */
+            /* Init grid data */
             if (!$scope.model.value || $scope.model.value === "" || !$scope.model.value.templates) {
                 $scope.model.value = emptyModel;
             } else {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
index 34a59cabf1..f1f1a90ef4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.PropertyEditors.GridPrevalueEditorController" class="usky-grid usky-grid-configuration">
+<div ng-controller="Umbraco.PropertyEditors.GridPrevalueEditorController as vm" class="usky-grid usky-grid-configuration">
     <div class="grid-layout">
         <div class="control-group uSky-templates">
 
@@ -17,22 +17,21 @@
 
                 <li ng-repeat="template in model.value.templates" class="clearfix">
 
-                    <div ng-click="configureTemplate(template)"
-                         class="preview-rows layout">
+                    <button type="button" ng-click="vm.configureTemplate(template)" class="btn-reset preview-rows layout">
 
-                        <div class="preview-row">
-                            <div class="preview-col"
+                        <span class="preview-row">
+                            <span class="preview-col"
                                  ng-class="{last:$last}"
-                                 ng-repeat="section in template.sections | filter:zeroWidthFilter"
-                                 ng-style="{width: percentage(section.grid) + '%', height: '60px', 'max-width': '100%'}">
-                                <div class="preview-cell"></div>
-                            </div>
-                        </div>
-                    </div>
+                                 ng-repeat="section in template.sections | filter: vm.zeroWidthFilter"
+                                 ng-style="{width: vm.percentage(section.grid) + '%', height: '60px', 'max-width': '100%'}">
+                                <span class="preview-cell"></span>
+                            </span>
+                        </span>
+                    </button>
 
                     <div>
-                        {{template.name}} <br />
-                        <button type="button" class="btn btn-small btn-link" ng-click="deleteTemplate($index)">
+                        <p>{{template.name}}</p>
+                        <button type="button" class="btn btn-small btn-link" ng-click="vm.deleteTemplate($index)">
                             <i class="icon-delete red" aria-hidden="true"></i>
                             <localize key="general_delete">Delete</localize>
                         </button>
@@ -41,10 +40,9 @@
                 </li>
             </ul>
 
-            <button type="button" class="btn btn-small btn-info"
-                    ng-click="configureTemplate()">
+            <button type="button" class="btn btn-small btn-info" ng-click="vm.configureTemplate()">
                 <i class="icon-add" aria-hidden="true"></i>
-                <localize key="grid_addGridLayout" />
+                <localize key="grid_addGridLayout">Add Grid Layout</localize>
             </button>
         </div>
     </div>
@@ -66,25 +64,24 @@
 
                     <li ng-repeat="layout in model.value.layouts" class="clearfix">
 
-                        <div ng-click="configureLayout(layout)"
-                             class="preview-rows columns">
+                        <button type="button" ng-click="vm.configureLayout(layout)" class="btn-reset preview-rows columns">
 
-                            <div class="preview-row">
-                                <div class="preview-col"
+                            <span class="preview-row">
+                                <span class="preview-col"
                                      ng-class="{last:$last}"
-                                     ng-repeat="area in layout.areas | filter:zeroWidthFilter"
-                                     ng-style="{width: percentage(area.grid) + '%', 'max-width': '100%'}">
+                                     ng-repeat="area in layout.areas | filter: vm.zeroWidthFilter"
+                                     ng-style="{width: vm.percentage(area.grid) + '%', 'max-width': '100%'}">
 
-                                    <div class="preview-cell">
-                                        <p ng-show="area.maxItems > 0">{{area.maxItems}}</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
+                                    <span class="preview-cell">
+                                        <span ng-show="area.maxItems > 0">{{area.maxItems}}</span>
+                                    </span>
+                                </span>
+                            </span>
+                        </button>
 
                         <div>
-                            {{layout.label || layout.name}}<br />
-                            <button type="button" class="btn btn-small btn-link" ng-click="deleteLayout($index)">
+                            <p>{{layout.label || layout.name}}</p>
+                            <button type="button" class="btn btn-small btn-link" ng-click="vm.deleteLayout(layout, $index, $event)">
                                 <i class="icon-delete red" aria-hidden="true"></i>
                                 <localize key="general_delete">Delete</localize>
                             </button>
@@ -93,7 +90,7 @@
                     </li>
                 </ul>
 
-                <button type="button" class="btn btn-small" ng-click="configureLayout()">
+                <button type="button" class="btn btn-small btn-info" ng-click="vm.configureLayout()">
                     <i class="icon-add" aria-hidden="true"></i>
                     <localize key="grid_addRowConfiguration">Add row configuration</localize>
                 </button>
@@ -120,17 +117,16 @@
 
                 <li ng-repeat="configValue in model.value.config">
                     <i class="icon icon-navigation handle" aria-hidden="true"></i>
-
-                    <button type="button" class="btn-link" ng-click="removeConfigValue(model.value.config, $index)">
+                    <button type="button" class="btn-link" ng-click="vm.removeConfigValue(model.value.config, $index)">
                         <i class="icon icon-delete red" aria-hidden="true"></i>
-                        {{configValue.label}}
                     </button>
+                    <span>{{configValue.label}}</span>
                 </li>
             </ul>
 
             <ul class="unstyled list-icons">
-                <li>                    
-                    <button type="button" ng-click="editConfig()" class="btn-link">
+                <li>
+                    <button type="button" ng-click="vm.editConfig()" class="btn-link">
                         <i class="icon icon-settings-alt-2 turquoise" aria-hidden="true"></i>
                         <localize key="general_edit">Edit</localize>
                     </button>
@@ -148,18 +144,16 @@
 
                 <li ng-repeat="style in model.value.styles">
                     <i class="icon icon-navigation handle" aria-hidden="true"></i>
-
-                    <button type="button" class="btn-link" ng-click="removeConfigValue(model.value.styles, $index)">
+                    <button type="button" class="btn-link" ng-click="vm.removeConfigValue(model.value.styles, $index)">
                         <i class="icon icon-delete red" aria-hidden="true"></i>
-                        {{style.label}}
                     </button>
-
+                    <span>{{style.label}}</span>
                 </li>
             </ul>
 
             <ul class="unstyled list-icons">
-                <li>                    
-                    <button type="button" ng-click="editStyles()" class="btn-link">
+                <li>
+                    <button type="button" ng-click="vm.editStyles()" class="btn-link">
                         <i class="icon icon-settings-alt-2 turquoise" aria-hidden="true"></i>
                         <localize key="general_edit">Edit</localize>
                     </button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/overlays/rowdeleteconfirm.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/overlays/rowdeleteconfirm.html
new file mode 100644
index 0000000000..2ba56a5b88
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/overlays/rowdeleteconfirm.html
@@ -0,0 +1,16 @@
+<div>
+
+    <div ng-if="model.layout" class="umb-alert umb-alert--warning mb2">
+        <localize key="grid_youAreDeleting">You are deleting the row configuration</localize> <strong>{{model.layout.name}}</strong>.
+    </div>
+
+    <p>
+        <localize key="grid_deletingARow">
+            Modifying a row configuration name will result in loss of
+            data for any existing content that is based on this configuration.
+        </localize>
+    </p>
+
+    <localize key="defaultdialogs_confirmdelete"></localize>?
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
index 0f225d4401..91abc3be87 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
@@ -42,8 +42,8 @@
                                        on-value-changed="focalPointChanged(left, top)"
                                        on-image-loaded="imageLoaded(isCroppable, hasDimensions)">
                     </umb-image-gravity>
-                    <button class="btn btn-link btn-crop-delete" aria-hidden="true" ng-click="clear()"><i class="icon-delete red"></i> <localize key="content_uploadClear">Remove file</localize></button>
-                    <button class="sr-only" ng-click="vm.clear()"><localize key="content_uploadClearImageContext">Click here to remove the image from the media item</localize></button>
+                    <button type="button" class="btn btn-link btn-crop-delete" aria-hidden="true" ng-click="clear()"><i class="icon-delete red"></i> <localize key="content_uploadClear">Remove file</localize></button>
+                    <button type="button" class="sr-only" ng-click="vm.clear()"><localize key="content_uploadClearImageContext">Click here to remove the image from the media item</localize></button>
                 </div>
 
                 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.controller.js
index 79ed11aef8..398d01a64c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.controller.js
@@ -33,17 +33,16 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.CropSizesControlle
 
         $scope.change = function () {
             // Listen to the change event and set focus 2 false
-            if($scope.setFocus){
+            if ($scope.setFocus) {
                 $scope.setFocus = false;
                 return;
             }
-        }
+        };
 
 	    $scope.add = function (evt) {
             evt.preventDefault();
 
             $scope.editMode = false;
-
             $scope.setFocus = true;
 
 	        if ($scope.newItem && $scope.newItem.alias &&
@@ -70,7 +69,17 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.CropSizesControlle
 	        $scope.hasError = true;
         };
 
-	    $scope.sortableOptions = {
-	        axis: 'y'
-	    }
+        $scope.createNew = function (event) {
+            if (event.keyCode == 13) {
+                $scope.add(event);
+            }
+        };
+
+        $scope.sortableOptions = {
+            axis: 'y',
+            containment: 'parent',
+            cursor: 'move',
+            tolerance: 'pointer'
+        };
+
 	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
index 742f5bafa4..9589909639 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
@@ -4,55 +4,55 @@
 
         <div class="umb-cropsizes__input-wrap">
             <label for="addcropalias"><localize key="general_alias">Alias</localize></label>
-            <input
-                id="addcropalias"
-                name="newItem.alias"
-                type="text"
-                ng-model="newItem.alias"
-                class="umb-cropsizes__input"
-                val-highlight="{{hasError}}"
-                localize="placeholder"
-                placeholder="@general_alias"
-                focus-when="{{setFocus}}"
-                ng-change="change()"
-            />
+            <input type="text"
+                   id="addcropalias"
+                   name="newItem.alias"
+                   ng-model="newItem.alias"
+                   class="umb-cropsizes__input"
+                   val-highlight="{{hasError}}"
+                   localize="placeholder"
+                   placeholder="@general_alias"
+                   focus-when="{{setFocus}}"
+                   ng-change="change()"
+                   ng-keydown="createNew($event)"
+                   overlay-submit-on-enter="false" />
         </div>
 
         <div class="umb-cropsizes__input-wrap umb-cropsizes__input-wrap--narrow">
             <label for="addcropwidth"><localize key="general_width">Width</localize></label>
-            <input
-                name="newItem.width"
-                type="number"
-                localize="placeholder"
-                placeholder="@general_width"
-                ng-model="newItem.width"
-                class="umb-cropsizes__input"
-                val-highlight="{{hasError}}"
-                id="addcropwidth"
-                min="0"
-                pattern="[0-9]*"
-            />
+            <input type="number"
+                   name="newItem.width"
+                   localize="placeholder"
+                   placeholder="@general_width"
+                   ng-model="newItem.width"
+                   class="umb-cropsizes__input"
+                   val-highlight="{{hasError}}"
+                   id="addcropwidth"
+                   min="0"
+                   pattern="[0-9]*"
+                   ng-keydown="createNew($event)"
+                   overlay-submit-on-enter="false" />
         </div>
 
         <div class="umb-cropsizes__input-wrap umb-cropsizes__input-wrap--narrow">
             <label for="addcropheight"><localize key="general_height">Height</localize></label>
-            <input
-                name="newItem.height"
-                type="number"
-                localize="placeholder"
-                placeholder="@general_height"
-                ng-model="newItem.height"
-                class="umb-cropsizes__input"
-                val-highlight="{{hasError}}"
-                id="addcropheight"
-                min="0"
-                pattern="[0-9]*"
-            />
+            <input type="number"
+                   name="newItem.height"
+                   localize="placeholder"
+                   placeholder="@general_height"
+                   ng-model="newItem.height"
+                   class="umb-cropsizes__input"
+                   val-highlight="{{hasError}}"
+                   id="addcropheight"
+                   min="0"
+                   pattern="[0-9]*"
+                   ng-keydown="createNew($event)"
+                   overlay-submit-on-enter="false" />
         </div>
 
         <div class="umb-cropsizes__controls">
-            <button class="btn btn-info add" ng-hide="editMode" ng-click="add($event)"><localize key="general_add">Add</localize></button>
-            <button class="btn btn-info add" ng-show="editMode" ng-click="add($event)"><localize key="general_update">Update</localize></button>
+            <button type="button" class="btn btn-info add" ng-hide="editMode" ng-click="add($event)"><localize key="general_add">Add</localize></button>
+            <button type="button" class="btn btn-info add" ng-show="editMode" ng-click="add($event)"><localize key="general_update">Update</localize></button>
             <button type="button" class="btn btn-link" ng-show="editMode" ng-click="cancel($event)"><localize key="general_cancel">Cancel</localize></button>
         </div>
 
@@ -60,7 +60,7 @@
 
     <div ui-sortable="sortableOptions" class="umb-cropsizes__sortable" ng-model="model.value">
         <div class="control-group umb-prevalues-multivalues__listitem" ng-repeat="item in model.value">
-            <i class="icon icon-navigation handle"></i>
+            <i class="icon icon-navigation handle" aria-hidden="true"></i>
             <div class="umb-prevalues-multivalues__left">
                 <p><span>{{item.alias}}</span> <small>({{item.width}}px &times; {{item.height}}px)</small></p>
             </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/icon.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/icon.prevalues.controller.js
index 86dcfdc415..fd5c3dbf12 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/icon.prevalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/icon.prevalues.controller.js
@@ -4,17 +4,24 @@ function iconPreValsController($scope, editorService) {
         $scope.model.value = "icon-list";
     }
 
+    let valueArray = $scope.model.value.split(' ');
+    $scope.icon = valueArray[0];
+    $scope.color = valueArray[1];
+
     $scope.openIconPicker = function () {
         var iconPicker = {
-            icon: $scope.model.value.split(' ')[0],
-            color: $scope.model.value.split(' ')[1],
+            icon: $scope.icon,
+            color: $scope.color,
             submit: function (model) {
                 if (model.icon) {
                     if (model.color) {
                         $scope.model.value = model.icon + " " + model.color;
+                        $scope.color = model.color;
                     } else {
                         $scope.model.value = model.icon;
-                    }
+                    }                    
+
+                    $scope.icon = model.icon;
                     $scope.iconForm.$setDirty();
                 }
                 editorService.close();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/icon.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/icon.prevalues.html
index 2d3d4eeae2..4f6735d069 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/icon.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/icon.prevalues.html
@@ -1,11 +1,11 @@
 <div ng-controller="Umbraco.PrevalueEditors.IconPickerController">
     <ng-form data-element="editor-icon" name="iconForm">
-        <div class="umb-panel-header-icon" ng-if="!hideIcon" ng-click="openIconPicker()" ng-class="{'-placeholder': model.value==='' || model.value===null}"
+        <button type="button" class="btn-reset umb-panel-header-icon" ng-if="!hideIcon" ng-click="openIconPicker()" ng-class="{'-placeholder': model.value==='' || model.value===null}"
              title="{{model.value}}">
-            <i class="icon {{model.value}}" ng-if="model.value!=='' && model.value!==null"></i>
-            <div class="umb-panel-header-icon-text" ng-if="model.value==='' || model.value===null">
-                <localize key="settings_addIcon"></localize>
-            </div>
-        </div>
+            <umb-icon icon="{{icon}}" class="{{color}}" ng-if="model.value !== '' && model.value !== null"></umb-icon>
+            <span class="umb-panel-header-icon-text" ng-if="model.value === '' || model.value === null">
+                <localize key="settings_addIcon">Add icon</localize>
+            </span>
+        </button>
     </ng-form>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html
index 0499bea713..42597f0c82 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html
@@ -1,10 +1,12 @@
 <div class="umb-property-editor" ng-controller="Umbraco.PrevalueEditors.IncludePropertiesListViewController">
     <div class="control-group">
-
         <select ng-model="selectedField" ng-change="changeField()" val-highlight="{{hasError}}">
-            <option ng-repeat="field in systemFields" value="_system_{{field.value}}" ng-bind="field.name"></option>
-            <option class="select-dash" disabled="disabled">----</option>
-            <option ng-repeat="alias in propertyAliases" value="{{alias}}" ng-bind="alias"></option>
+            <optgroup label="System Fields">
+                <option ng-repeat="field in systemFields" value="_system_{{field.value}}" ng-bind="field.name"></option>
+            </optgroup>
+            <optgroup label="Custom Fields">
+                <option ng-repeat="alias in propertyAliases" value="{{alias}}" ng-bind="alias"></option>
+            </optgroup>
         </select>
         <button type="button" class="btn" ng-click="addField()">
             <localize key="general_add">Add</localize>
@@ -25,12 +27,11 @@
             <tbody ui-sortable="sortableOptions" ng-model="model.value">
                 <tr ng-repeat="val in model.value">
                     <td>
-                        <i class="icon icon-navigation handle"></i>
+                        <i class="icon icon-navigation handle" aria-hidden="true" aria-label="Sort"></i>
                     </td>
                     <td>
                        <div class="list-view-layout__name flex-column content-start">
-                            <span class="list-view-layout__name-text" ng-if="!val.isSystem" ng-bind="val.alias"></span>
-                            <span class="list-view-layout__name-text" ng-if="val.isSystem == 1" ng-bind="val.alias"></span>
+                            <span class="list-view-layout__name-text" ng-bind="val.alias"></span>
                             <span class="list-view-layout__system" ng-show="val.isSystem == 1">(system field)</span>
                        </div>
                     </td>
@@ -52,7 +53,9 @@
                         </ng-form>
                     </td>
                     <td>
-                        <button type="button" class="btn-icon icon-trash" ng-click="removeField(val)" aria-label="Remove"></button>
+                        <button type="button" class="btn-icon" ng-click="removeField(val)" aria-label="Remove">
+                            <i class="icon-trash" aria-hidden="true"></i>
+                        </button>
                     </td>
                 </tr>
             </tbody>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js
index a02215f452..acfb114307 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js
@@ -15,6 +15,8 @@
       vm.focusLayoutName = false;
 
       vm.layoutsSortableOptions = {
+         axis: "y",
+         containment: "parent",
          distance: 10,
          tolerance: "pointer",
          opacity: 0.7,
@@ -41,7 +43,6 @@
          };
 
          $scope.model.value.push(layout);
-
       }
 
       function showPrompt(layout) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
index 15b66d856d..4527458d16 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
@@ -1,49 +1,57 @@
 <div ng-controller="Umbraco.PrevalueEditors.ListViewLayoutsPreValsController as vm">
 
-   <div class="list-view-layouts" ui-sortable="vm.layoutsSortableOptions" ng-model="model.value">
+   <div class="list-view-layouts-container">
 
-      <div class="list-view-layout" ng-repeat="layout in model.value">
+       <div class="list-view-layouts" ui-sortable="vm.layoutsSortableOptions" ng-model="model.value">
 
-         <i class="icon-navigation list-view-layout__sort-handle" aria-label="Sort"></i>
+           <div class="list-view-layout" ng-repeat="layout in model.value">
 
-         <div>
+               <i class="icon-navigation list-view-layout__sort-handle" aria-hidden="true" aria-label="Sort"></i>
 
-            <button ng-if="layout.isSystem !== 1" type="button" ng-click="vm.openIconPicker(layout)" class="list-view-layout__icon" umb-auto-focus>
-               <i class="{{ layout.icon }}"></i>
-            </button>
+               <div class="list-view-layout__icon-wrapper">
 
-            <div ng-if="layout.isSystem === 1" class="list-view-layout__icon">
-               <i class="{{ layout.icon }}"></i>
-            </div>
+                   <button ng-if="layout.isSystem !== 1" type="button" class="btn-reset" ng-click="vm.openIconPicker(layout)" umb-auto-focus>
+                       <span class="list-view-layout__icon">
+                           <i class="{{layout.icon}}" aria-hidden="true"></i>
+                       </span>
+                   </button>
 
-         </div>
+                   <div ng-if="layout.isSystem === 1" class="list-view-layout__icon">
+                       <i class="{{layout.icon}}" aria-hidden="true"></i>
+                   </div>
 
-         <div class="list-view-layout__name">
-            <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.name" placeholder="Name..." class="-full-width-input" focus-when="{{ vm.focusLayoutName }}" />
-            <span ng-if="layout.isSystem === 1" class="list-view-layout__name-text">{{ layout.name }}</span>
-            <span ng-if="layout.isSystem === 1" class="list-view-layout__system">(system layout)</span>
-         </div>
+               </div>
 
-         <div class="list-view-layout__path">
-            <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
-         </div>
+               <div class="list-view-layout__name">
+                   <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.name" placeholder="Name..." class="-full-width-input" focus-when="{{ vm.focusLayoutName }}" />
+                   <span ng-if="layout.isSystem === 1" class="list-view-layout__name-text">{{layout.name}}</span>
+                   <span ng-if="layout.isSystem === 1" class="list-view-layout__system">(system layout)</span>
+               </div>
 
-         <div>
-           <umb-checkbox ng-if="layout.isSystem === 1" model="layout.selected" /> 
-            <div class="list-view-layout__remove" ng-if="layout.isSystem !== 1">
-                <i class="icon-trash" ng-click="vm.showPrompt(layout)"></i>
-                <umb-confirm-action
-                    ng-if="layout.deletePrompt"
-                    direction="left"
-                    on-confirm="vm.removeLayout($index, layout)"
-                    on-cancel="vm.hidePrompt(layout)">
-                </umb-confirm-action>
-            </div>
-         </div>
+               <div class="list-view-layout__path">
+                   <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
+               </div>
 
-      </div>
+               <div>
+                   <umb-checkbox ng-if="layout.isSystem === 1" model="layout.selected"></umb-checkbox>
 
-      <button type="button" class="list-view-add-layout" ng-click="vm.addLayout()">Add layout</button>
+                   <div class="list-view-layout__remove" ng-if="layout.isSystem !== 1">
+                       <button type="button" class="btn-icon" ng-click="vm.showPrompt(layout)" aria-label="Remove">
+                           <i class="icon-trash" aria-hidden="true"></i>
+                       </button>
+                       <umb-confirm-action ng-if="layout.deletePrompt"
+                                           direction="left"
+                                           on-confirm="vm.removeLayout($index, layout)"
+                                           on-cancel="vm.hidePrompt(layout)">
+                       </umb-confirm-action>
+                   </div>
+               </div>
+
+           </div>
+
+       </div>
+
+      <button type="button" class="list-view-add-layout mt2" ng-click="vm.addLayout()">Add layout</button>
 
    </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
index 9da70e38dc..1bd370ae01 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
@@ -15,10 +15,10 @@
         var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
 
         vm.nodeId = $scope.contentId;
-        // Use whitelist of allowed file types if provided
+        // Use list of allowed file types if provided
         vm.acceptedFileTypes = mediaHelper.formatFileTypes(umbracoSettings.allowedUploadFiles);
         if (vm.acceptedFileTypes === '') {
-            // If not provided, we pass in a blacklist by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
+            // If not provided, we pass in a disallowed list by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
             vm.acceptedFileTypes = !mediaHelper.formatFileTypes(umbracoSettings.disallowedUploadFiles);
         }
 
@@ -115,9 +115,9 @@
         function selectFolder(folder, $event, $index) {
             listViewHelper.selectHandler(folder, $index, $scope.folders, $scope.selection, $event);
         }
-        
+
         function goToItem(item, $event, $index) {
-            listViewHelper.editItem(item);
+            listViewHelper.editItem(item, $scope);
         }
 
         activate();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
index 4230633e96..f0a165c22f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
@@ -8,10 +8,10 @@
 
         vm.nodeId = $scope.contentId;
 
-        // Use whitelist of allowed file types if provided
+        // Use list of allowed file types if provided
         vm.acceptedFileTypes = mediaHelper.formatFileTypes(umbracoSettings.allowedUploadFiles);
         if (vm.acceptedFileTypes === '') {
-            // If not provided, we pass in a blacklist by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
+            // If not provided, we pass in a disallowed list by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
             vm.acceptedFileTypes = !mediaHelper.formatFileTypes(umbracoSettings.disallowedUploadFiles);
         }
 
@@ -19,7 +19,7 @@
         vm.activeDrag = false;
         vm.isRecycleBin = $scope.contentId === '-21' || $scope.contentId === '-20';
         vm.acceptedMediatypes = [];
-        
+
         vm.selectItem = selectItem;
         vm.clickItem = clickItem;
         vm.selectAll = selectAll;
@@ -53,7 +53,7 @@
         }
 
         function clickItem(item) {
-            listViewHelper.editItem(item);
+            listViewHelper.editItem(item, $scope);
         }
 
         function isSortDirection(col, direction) {
@@ -86,23 +86,18 @@
         }
 
         function markAsSensitive() {
-            angular.forEach($scope.options.includeProperties, function (option) {
+            $scope.options.includeProperties.forEach(function (option) {
                 option.isSensitive = false;
 
-                angular.forEach($scope.items,
-                    function (item) {
-
-                        angular.forEach(item.properties,
-                            function (property) {
-
-                                if (option.alias === property.alias) {
-                                    option.isSensitive = property.isSensitive;
-                                }
-
-                            });
-
+                if ($scope.items && $scope.items.length) {
+                    $scope.items.forEach(function (item) {
+                        item.properties.forEach(function (property) {
+                            if (option.alias === property.alias) {
+                                option.isSensitive = property.isSensitive;
+                            }
+                         });
                     });
-
+                }
             });
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index 9a86dc575a..76e6759a47 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -147,6 +147,7 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
 
     var listParamsForCurrent = $routeParams.id == $routeParams.list;
     $scope.options = {
+        useInfiniteEditor: $scope.model.config.useInfiniteEditor === true,
         pageSize: $scope.model.config.pageSize ? $scope.model.config.pageSize : 10,
         pageNumber: (listParamsForCurrent && $routeParams.page && Number($routeParams.page) != NaN && Number($routeParams.page) > 0) ? $routeParams.page : 1,
         filter: (listParamsForCurrent && $routeParams.filter ? $routeParams.filter : '').trim(),
@@ -227,26 +228,21 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
         if (err.status && err.status >= 500) {
 
             // Open ysod overlay
-            $scope.ysodOverlay = {
-                view: "ysod",
-                error: err,
-                show: true
-            };
+            overlayService.ysod(err);
         }
 
         $timeout(function () {
             $scope.bulkStatus = "";
             $scope.actionInProgress = false;
-        },
-            500);
+        }, 500);
 
-        if (successMsgPromise) {
-            localizationService.localize("bulk_done")
-                .then(function (v) {
-                    successMsgPromise.then(function (successMsg) {
-                        notificationsService.success(v, successMsg);
-                    })
-                });
+        if (successMsgPromise)
+        {
+            localizationService.localize("bulk_done").then(function (v) {
+                successMsgPromise.then(function (successMsg) {
+                    notificationsService.success(v, successMsg);
+                })
+            });
         }
     }
 
@@ -271,7 +267,6 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
     with simple values */
 
     $scope.getContent = function (contentId) {
-
         $scope.reloadView($scope.contentId, true);
     }
 
@@ -327,8 +322,6 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
         });
     };
 
-    
-
     $scope.makeSearch = function() {
         if ($scope.options.filter !== null && $scope.options.filter !== undefined) {
             $scope.options.pageNumber = 1;
@@ -408,7 +401,6 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
             dialog.title = value;
             overlayService.open(dialog);
         });
-
     };
 
     function performDelete() {
@@ -696,7 +688,7 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
 
             if (e.nameExp) {
                 var newValue = e.nameExp({ value });
-                if (newValue && (newValue = $.trim(newValue))) {
+                if (newValue && (newValue = newValue.trim())) {
                     value = newValue;
                 }
             }
@@ -704,8 +696,6 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
             // set what we've got on the result
             result[alias] = value;
         });
-
-
     }
 
     function isDate(val) {
@@ -811,6 +801,42 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
     }
 
     function createBlank(entityType, docTypeAlias) {
+        if ($scope.options.useInfiniteEditor) {
+            
+            var editorModel = {
+                create: true,
+                submit: function(model) {
+                    editorService.close();
+                    $scope.reloadView($scope.contentId);
+                },
+                close: function() {
+                    editorService.close();
+                    $scope.reloadView($scope.contentId);
+                }
+            };
+
+            if (entityType == "content")
+            {
+                editorModel.parentId = $scope.contentId;
+                editorModel.documentTypeAlias = docTypeAlias;
+                editorService.contentEditor(editorModel);
+                return;
+            }
+
+            if (entityType == "media")
+            {
+                editorService.mediaEditor(editorModel);
+                return;
+            }
+
+            if (entityType == "member")
+            {
+                editorModel.doctype = docTypeAlias;
+                editorService.memberEditor(editorModel);
+                return;
+            }
+        }
+
         $location
             .path("/" + entityType + "/" + entityType + "/edit/" + $scope.contentId)
             .search("doctype", docTypeAlias)
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index ee1847b430..e72b81b019 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -14,29 +14,28 @@
 
                     <!-- Renders when it's only possible to create one specific document type for, which no blueprint exists-->
                    <div class="btn-group" ng-show="createAllowedButtonSingle">
-                       <button type="button" class="btn btn-outline umb-outline" ng-click="createBlank(entityType,listViewAllowedTypes[0].alias)" prevent-default>
+                       <button type="button" class="btn btn-outline umb-outline" ng-click="createBlank(entityType,listViewAllowedTypes[0].alias)">
                            <localize key="actions_create">Create</localize> {{listViewAllowedTypes[0].name}}
                        </button>
                    </div>
 
                    <!-- Renders when it's only possible to create one specific document type for which a blueprint exits-->
                    <div class="btn-group" ng-show="createAllowedButtonSingleWithBlueprints" deep-blur="leaveDropdown()">
-                       <button type="button" class="btn btn-white dropdown-toggle" aria-expanded="{{page.createDropdownOpen}}" ng-click="toggleDropdown()" prevent-default>
+                       <button type="button" class="btn btn-outline umb-outline dropdown-toggle" aria-expanded="{{page.createDropdownOpen}}" ng-click="toggleDropdown()">
                            <span>
                                <localize key="actions_create">Create</localize> {{listViewAllowedTypes[0].name}}
                            </span>
                            <span class="caret" aria-hidden="true"></span>
                         </button>
 
-
                        <umb-dropdown ng-if="page.createDropdownOpen" on-close="page.createDropdownOpen = false">
                            <umb-dropdown-item ng-repeat="contentType in listViewAllowedTypes track by contentType.key | orderBy:'name':false">
-                                <button type="button" ng-click="createBlank(entityType,contentType.alias)" prevent-default>
+                                <button type="button" ng-click="createBlank(entityType,contentType.alias)">
                                     <i class="{{::contentType.icon}}" aria-hidden="true"></i>
                                     {{::contentType.name}} <span ng-show="contentType.blueprints" style="text-transform: lowercase;">(<localize key="blueprints_blankBlueprint">blank</localize>)</span>
                                 </button>
 
-                                <button type="button" ng-repeat="blueprint in contentType.blueprints track by blueprint.id | orderBy:'name':false" ng-click="createFromBlueprint(entityType, contentType.alias, blueprint.id)" prevent-default>
+                                <button type="button" ng-repeat="blueprint in contentType.blueprints track by blueprint.id | orderBy:'name':false" ng-click="createFromBlueprint(entityType, contentType.alias, blueprint.id)">
                                     &nbsp;&nbsp;<i class="{{::contentType.icon}}" aria-hidden="true"></i>
                                     {{::blueprint.name}}
                                 </button>
@@ -46,20 +45,20 @@
 
                    <!-- Renders when it's possible to create multiple document types and blueprints for one or more of the document types-->
                    <div class="btn-group" ng-show="createAllowedButtonMultiWithBlueprints" deep-blur="leaveDropdown()">
-                       <button type="button" class="btn btn-white dropdown-toggle" aria-expanded="{{page.createDropdownOpen === undefined ? false : page.createDropdownOpen}}" ng-click="toggleDropdown()">
+                       <button type="button" class="btn btn-outline umb-outline dropdown-toggle" aria-expanded="{{page.createDropdownOpen === undefined ? false : page.createDropdownOpen}}" ng-click="toggleDropdown()">
                            <localize key="actions_create">Create</localize>
                            <span class="caret" aria-hidden="true"></span>
                        </button>
 
                        <umb-dropdown ng-if="page.createDropdownOpen" on-close="page.createDropdownOpen = false">
                            <umb-dropdown-item ng-repeat="contentType in listViewAllowedTypes track by contentType.key | orderBy:'name':false">
-                               <button type="button" ng-click="createBlank(entityType,contentType.alias)" prevent-default>
+                               <button type="button" ng-click="createBlank(entityType,contentType.alias)">
                                    <i class="{{::contentType.icon}}" aria-hidden="true"></i>
                                    {{::contentType.name}} <span ng-show="contentType.blueprints" style="text-transform: lowercase;">(<localize key="blueprints_blankBlueprint">blank</localize>)</span>
                                </button>
 
 
-                               <button type="button" ng-repeat="blueprint in contentType.blueprints track by blueprint.id | orderBy:'name':false" ng-click="createFromBlueprint(entityType, contentType.alias, blueprint.id)" prevent-default>
+                               <button type="button" ng-repeat="blueprint in contentType.blueprints track by blueprint.id | orderBy:'name':false" ng-click="createFromBlueprint(entityType, contentType.alias, blueprint.id)">
                                    &nbsp;&nbsp;<i class="{{::contentType.icon}}" aria-hidden="true"></i>
                                    {{::blueprint.name}}
                                </button>
@@ -230,11 +229,4 @@
 
     </div>
 
-    <umb-overlay
-        ng-if="ysodOverlay.show"
-        model="ysodOverlay"
-        position="right"
-        view="ysodOverlay.view">
-    </umb-overlay>
-
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/orderDirection.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/orderDirection.prevalues.html
index 7ec0895936..b6028ad5bb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/orderDirection.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/orderDirection.prevalues.html
@@ -2,10 +2,20 @@
     <ng-form name="listViewOrderDirectionForm" class="flex">
         <ul class="inline">
             <li class="-no-padding-left">
-                <umb-radiobutton name="orderDirection" value="asc" model="model.value" text="Ascending [a-z]" required></umb-radiobutton>
+                <umb-radiobutton name="orderDirection"
+                                 value="asc"
+                                 model="model.value"
+                                 text="Ascending [a-z]"
+                                 required="true">
+                </umb-radiobutton>
             </li>
             <li>
-                <umb-radiobutton name="orderDirection" value="desc" model="model.value" text="Descending [z-a]" required></umb-radiobutton>
+                <umb-radiobutton name="orderDirection"
+                                 value="desc"
+                                 model="model.value"
+                                 text="Descending [z-a]"
+                                 required="true">
+                </umb-radiobutton>
             </li>
         </ul>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.html
index 027643eee1..c6f7c85c0b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.html
@@ -29,8 +29,8 @@
                             <umb-checkbox name="publishLanguageSelector"
                                           model="language.publish"
                                           on-change="vm.changeSelection(language)"
-                                          text="{{language.name}}"
-                                           />
+                                          text="{{language.name}}">
+                            </umb-checkbox>
 
                             <div>
                                 <span class="db umb-list-item__description umb-list-item__description--checkbox">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.controller.js
index df97d67f5d..650b1b8438 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.controller.js
@@ -18,7 +18,7 @@
             $scope.model.disableSubmitButton = !firstSelected;
 
             if (language.isMandatory) {
-                angular.forEach($scope.model.languages, function (lang) {
+                $scope.model.languages.forEach(function (lang) {
                     if (lang !== language) {
                         lang.unpublish = true;
                         lang.disabled = language.unpublish;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.html
index 254187bdd1..5806bb8f02 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.html
@@ -30,8 +30,8 @@
                                           model="language.unpublish"
                                           on-change="vm.changeSelection(language)"
                                           text="{{language.name}}"
-                                          disabled="language.disabled"
-                                          />
+                                          disabled="language.disabled">
+                            </umb-checkbox>
 
                             <div>
                                 <span class="db umb-list-item__description umb-list-item__description--checkbox">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index 340e6865ef..f3a57224e2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
 //this controller simply tells the dialogs service to open a mediaPicker window
 //with a specified callback, this callback will receive an object with a selection on it
 angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerController",
-    function ($scope, entityResource, mediaHelper, $timeout, userService, localizationService, editorService, angularHelper) {
+    function ($scope, entityResource, mediaHelper, $timeout, userService, localizationService, editorService, angularHelper, overlayService) {
 
         var vm = this;
 
@@ -53,18 +53,18 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                         // it's prone to someone "fixing" it at some point without knowing the effects. Rather use toString()
                         // compares and be completely sure it works.
                         var found = medias.find(m => m.udi.toString() === id.toString() || m.id.toString() === id.toString());
-                        if (found) {
-                            return found;
-                        } else {
-                            return {
-                                name: vm.labels.deletedItem,
-                                id: $scope.model.config.idType !== "udi" ? id : null,
-                                udi: $scope.model.config.idType === "udi" ? id : null,
-                                icon: "icon-picture",
-                                thumbnail: null,
-                                trashed: true
-                            };
-                        }
+                        
+                        var mediaItem = found ||
+                        {
+                            name: vm.labels.deletedItem,
+                            id: $scope.model.config.idType !== "udi" ? id : null,
+                            udi: $scope.model.config.idType === "udi" ? id : null,
+                            icon: "icon-picture",
+                            thumbnail: null,
+                            trashed: true
+                        };
+
+                        return mediaItem;
                     });
 
                     medias.forEach(media => {
@@ -198,7 +198,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                 multiPicker: multiPicker,
                 onlyImages: onlyImages,
                 disableFolderSelect: disableFolderSelect,
-
                 submit: function (model) {
 
                     editorService.close();
@@ -219,6 +218,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                         }
 
                     });
+
                     sync();
                     reloadUpdatedMediaItems(model.updatedMediaNodes);
                     setDirty();
@@ -242,10 +242,22 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
         }
 
         function removeAllEntries() {
-            $scope.mediaItems.length = 0;// AngularJS way to empty the array.
-            $scope.ids.length = 0;// AngularJS way to empty the array.
-            sync();
-            setDirty();
+            localizationService.localizeMany(["content_nestedContentDeleteAllItems", "general_delete"]).then(function (data) {
+                overlayService.confirmDelete({
+                    title: data[1],
+                    content: data[0],
+                    close: function () {
+                        overlayService.close();
+                    },
+                    submit: function () {
+                        $scope.mediaItems.length = 0;// AngularJS way to empty the array.
+                        $scope.ids.length = 0;// AngularJS way to empty the array.
+                        sync();
+                        setDirty();
+                        overlayService.close();
+                    }
+                });
+            });
         }
 
         var removeAllEntriesAction = {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index c4dba4d373..c09d7c7613 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -3,7 +3,7 @@
     <p ng-if="(mediaItems|filter:{trashed:true}).length == 1"><localize key="mediaPicker_pickedTrashedItem"></localize></p>
     <p ng-if="(mediaItems|filter:{trashed:true}).length > 1"><localize key="mediaPicker_pickedTrashedItems"></localize></p>
 
-    <div data-element="sortable-thumbnails" class="flex flex-wrap error">
+    <div data-element="sortable-thumbnails" class="umb-sortable-thumbnails-container error">
         <ul ui-sortable="sortableOptions" ng-model="mediaItems" class="umb-sortable-thumbnails">
             <li data-element="sortable-thumbnail-{{$index}}" class="umb-sortable-thumbnails__wrapper" ng-repeat="media in mediaItems track by $index">
 
@@ -31,12 +31,13 @@
                 <!-- FILE -->
                 <umb-file-icon ng-hide="media.thumbnail" ng-class="{'trashed': media.trashed}"
                                extension="{{media.extension}}"
+                               icon="{{media.icon}}"
                                size="s"
                                text="{{media.name}}">
                 </umb-file-icon>
 
                 <div class="umb-sortable-thumbnails__actions" data-element="sortable-thumbnail-actions">
-                    <button type="button" aria-label="Edit media" ng-if="allowEditMedia" class="umb-sortable-thumbnails__action btn-reset" data-element="action-edit" ng-click="vm.editItem(media)">
+                    <button type="button" aria-label="Edit media" ng-if="allowEditMedia && !media.trashed" class="umb-sortable-thumbnails__action btn-reset" data-element="action-edit" ng-click="vm.editItem(media)">
                         <i class="icon icon-edit" aria-hidden="true"></i>
                     </button>
                     <button type="button" aria-label="Remove" class="umb-sortable-thumbnails__action -red btn-reset" data-element="action-remove" ng-click="vm.remove($index)">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js
index 27fb3e1821..73def3cc65 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js
@@ -39,7 +39,6 @@ function memberGroupPicker($scope, editorService, memberGroupResource){
                     // no new groups selected
                     editorService.close();
                 }
-                editorService.close();
             },
             close: function() {
                 editorService.close();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html
index 4c53ac5d17..b1cafafb0d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html
@@ -10,13 +10,11 @@
 		</umb-node-preview>
 	</div>
 
-	<a 
-		class="umb-node-preview-add" 
-		href="#"
-		ng-click="openMemberGroupPicker()"
-		prevent-default>
+	<button type="button"
+            class="umb-node-preview-add"
+            ng-click="openMemberGroupPicker()">
 		<localize key="general_add">Add</localize>
-	</a>
+	</button>
 
     <input type="hidden" name="mandatory" ng-model="model.mandatory" ng-required="model.validation.mandatory && !renderModel.length" />
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html
index 9b59d48ab9..2715e11b15 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html
@@ -1,11 +1,15 @@
 <div ng-controller="Umbraco.PropertyEditors.MemberGroupController">
+
     <umb-node-preview ng-repeat="group in getSelected() | orderBy"
                       icon="'icon-users'"
                       name="group"
                       allow-remove="true"
                       on-remove="removeGroup(group)">
     </umb-node-preview>
-    <a href ng-click="pickGroup()" class="umb-node-preview-add" prevent-default>			  
+
+    <button type="button"
+            class="umb-node-preview-add"
+            ng-click="pickGroup()">
         <localize key="general_add">Add</localize>
-    </a>
+    </button>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js
index 95e595a97a..c3137360e2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js
@@ -56,10 +56,9 @@ function memberPickerController($scope, entityResource, iconHelper, angularHelpe
         };
 
         editorService.treePicker(memberPicker);
-
     };
 
-    $scope.remove =function(index){
+    $scope.remove = function (index) {
         $scope.renderModel.splice(index, 1);
     };
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html
index d968f08d71..99f7fffba8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html
@@ -10,13 +10,12 @@
 		</umb-node-preview>
 	</div>
 
-	<a ng-show="model.config.multiPicker === true || renderModel.length === 0" 
-		class="umb-node-preview-add" 
-		href="#"
-		ng-click="openMemberPicker()"
-		prevent-default>
+	<button type="button"
+            class="umb-node-preview-add" 
+            ng-show="model.config.multiPicker === true || renderModel.length === 0" 
+		    ng-click="openMemberPicker()">
 		<localize key="general_add">Add</localize>
-	</a>
+	</button>
 
     <input type="hidden" name="mandatory" ng-model="model.mandatory" ng-required="model.validation.mandatory && !renderModel.length" />
 
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 aaf41f3083..42ce10c519 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
@@ -17,7 +17,7 @@
         $scope.model.value = [];
     }
 
-    //add any fields that there isn't values for
+    // 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++) {
             if ((i + 1) > $scope.model.value.length) {
@@ -37,7 +37,7 @@
                 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
+                    // Focus on the newly added value
                     $scope.model.value[newItemIndex].hasFocus = true;
                 }
                 break;
@@ -47,7 +47,7 @@
                     var remainder = [];
 
                     // Used to require an extra hit on backspace for the field to be removed
-                    if(txtBoxValue.value === "") {
+                    if (txtBoxValue.value === "") {
                         backspaceHits++;
                     } else {
                         backspaceHits = 0;
@@ -64,11 +64,11 @@
 
                         var prevItemIndex = index - 1;
 
-                        //Set focus back on false as the directive only watches for true
-                        if(prevItemIndex >= 0) {
+                        // 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
+                                // Focus on the previous value
                                 $scope.model.value[prevItemIndex].hasFocus = true;
                             });
                         }
@@ -81,12 +81,13 @@
             default:
         }
         validate();
-    }
+    };
 
     $scope.add = function () {
         if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
             $scope.model.value.push({ value: "" });
-            // focus new value
+
+            // Focus new value
             var newItemIndex = $scope.model.value.length - 1;
             $scope.model.value[newItemIndex].hasFocus = true;
         }
@@ -106,7 +107,7 @@
         $scope.model.value = remainder;
     };
 
-    $scope.showPrompt = function (idx, item){
+    $scope.showPrompt = function (idx, item) {
 
         var i = $scope.model.value.indexOf(item);
 
@@ -114,11 +115,11 @@
         if (i === idx) {
             $scope.promptIsVisible = i;
         }
-    }
+    };
 
-    $scope.hidePrompt = function(){
+    $scope.hidePrompt = function () {
         $scope.promptIsVisible = "-1";
-    }
+    };
 
     function validate() {
         if ($scope.multipleTextboxForm) {
@@ -126,10 +127,22 @@
             $scope.multipleTextboxForm.mandatory.$setValidity("minCount", !invalid);
         }
     }
+
     $timeout(function () {
         validate();
     });
-    
+
+    // We always need to ensure we dont submit anything broken
+    var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
+        
+        // Filter to items with values
+        $scope.model.value = $scope.model.value.filter(el => el.value.trim() !== "") || [];
+    });
+
+    // When the scope is destroyed we need to unsubscribe
+    $scope.$on('$destroy', function () {
+        unsubscribe();
+    });
 }
 
 angular.module("umbraco").controller("Umbraco.PropertyEditors.MultipleTextBoxController", MultipleTextBoxController);
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 85221c61f7..d1c202b867 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
@@ -2,14 +2,18 @@
   <ng-form name="multipleTextboxForm">
     <div ui-sortable="sortableOptions" ng-model="model.value">
       <div class="flex flex-wrap textbox-wrapper" ng-repeat="item in model.value track by $index">
-          <input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-property-editor umb-textstring textstring flx-i"
-                 ng-keyup="addRemoveOnKeyDown($event, $index)" focus-when="{{item.hasFocus}}"/>
+          <input type="text" name="item_{{$index}}" ng-model="item.value"
+                 class="umb-property-editor umb-textstring textstring flx-i"
+                 ng-trim="false"
+                 ng-keyup="addRemoveOnKeyDown($event, $index)"
+                 focus-when="{{item.hasFocus}}" />
+
           <div class="icon-wrapper">
-              <i class="icon icon-navigation handle" localize="title" title="@general_move"></i>
+              <i class="icon icon-navigation handle" aria-hidden="true" localize="title" title="@general_move"></i>
   
               <div class="umb-multiple-textbox__confirm" ng-show="model.value.length > model.config.min">
-                  <button class="umb-multiple-textbox__confirm-action" type="button" prevet-default ng-click="showPrompt($index, item)" localize="title" title="@content_removeTextBox">
-                      <i class="icon-trash"></i>
+                  <button type="button" class="umb-multiple-textbox__confirm-action" ng-click="showPrompt($index, item)" localize="title" title="@content_removeTextBox">
+                      <i class="icon-trash" aria-hidden="true"></i>
                   </button>
   
                   <umb-confirm-action
@@ -22,11 +26,13 @@
           </div>
       </div>
     </div>
-    <a prevent-default href="" class="add-link" localize="title" title="@content_addTextBox"
+
+    <button type="button" class="add-link" localize="title" title="@content_addTextBox"
        ng-show="model.config.max <= 0 || model.value.length < model.config.max"
        ng-click="add()">
         <localize key="general_add">Add</localize>
-    </a>
+    </button>
+
     <input type="hidden" name="mandatory" ng-model="model.value" />
   </ng-form>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
index ff1969aab8..503f4aac9b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
@@ -1,6 +1,6 @@
 <div ng-controller="Umbraco.PropertyEditors.MultiUrlPickerController" class="umb-property-editor umb-contentpicker">
-    <p ng-if="(renderModel|filter:{trashed:true}).length == 1"><localize key="contentPicker_pickedTrashedItem"></localize></p>
-    <p ng-if="(renderModel|filter:{trashed:true}).length > 1"><localize key="contentPicker_pickedTrashedItems"></localize></p>
+    <p ng-if="(renderModel|filter:{trashed:true}).length == 1"><localize key="contentPicker_pickedTrashedItem">You have picked a content item currently deleted or in the recycle bin</localize></p>
+    <p ng-if="(renderModel|filter:{trashed:true}).length > 1"><localize key="contentPicker_pickedTrashedItems">You have picked content items currently deleted or in the recycle bin</localize></p>
 
     <ng-form name="multiUrlPickerForm">
         <div ui-sortable="sortableOptions" ng-model="renderModel">
@@ -17,13 +17,14 @@
             </umb-node-preview>
         </div>
 
-        <a ng-show="!model.config.maxNumber || renderModel.length < model.config.maxNumber"
-           class="umb-node-preview-add"
-           href
-           ng-click="openLinkPicker()"
-           prevent-default>
+        <button ng-show="!model.config.maxNumber || renderModel.length < model.config.maxNumber"
+            type="button"
+            class="umb-node-preview-add"
+            ng-click="openLinkPicker()">
+            <span class="sr-only">{{ model.label }}:</span>
             <localize key="general_add">Add</localize>
-        </a>
+            <span class="sr-only">url</span>
+        </button>
 
         <div class="umb-contentpicker__min-max-help">
 
@@ -40,21 +41,21 @@
             <span ng-if="model.config.minNumber && model.config.maxNumber && model.config.minNumber === model.config.maxNumber">
                 <span ng-if="renderModel.length < model.config.maxNumber">Add {{model.config.minNumber - renderModel.length}} item(s)</span>
                 <span ng-if="renderModel.length > model.config.maxNumber">
-                    <localize key="validation_maxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_itemsSelected"> items selected</localize>
+                    <localize key="validation_maxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_urlsSelected"> url(s) selected</localize>
                 </span>
             </span>
 
             <!-- Only max -->
             <span ng-if="!model.config.minNumber && model.config.maxNumber">
-                <span ng-if="renderModel.length < model.config.maxNumber">Add up to {{model.config.maxNumber}} items</span>
+                <span ng-if="renderModel.length < model.config.maxNumber"><localize key="validation_addUpTo">Add up to</localize> {{model.config.maxNumber}} <localize key="validation_urls">url(s)</localize></span>
                 <span ng-if="renderModel.length > model.config.maxNumber">
-                    <localize key="validation_maxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_itemsSelected">items selected</localize>
+                    <localize key="validation_maxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_urlsSelected">url(s) selected</localize>
                 </span>
             </span>
 
             <!-- Only min -->
             <span ng-if="model.config.minNumber && !model.config.maxNumber && renderModel.length < model.config.minNumber">
-                Add at least {{model.config.minNumber}} item(s)
+                <localize key="validation_minCount">You need to add at least</localize> {{model.config.minNumber}} <localize key="validation_urls">url(s)</localize>
             </span>
 
         </div>
@@ -65,12 +66,12 @@
 
         <div ng-messages="multiUrlPickerForm.minCount.$error" show-validation-on-submit>
             <div class="help-inline" ng-message="minCount">
-                <localize key="validation_minCount">You need to add at least</localize> {{model.config.minNumber}} <localize key="validation_items">items</localize>
+                <localize key="validation_minCount">You need to add at least</localize> {{model.config.minNumber}} <localize key="validation_urls">url(s)</localize>
             </div>
         </div>
         <div ng-messages="multiUrlPickerForm.maxCount.$error" show-validation-on-submit>
             <div class="help-inline" ng-message="maxCount">
-                <localize key="validation_maxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_itemsSelected">items selected</localize>
+                <localize key="validation_maxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_urlsSelected">url(s) selected</localize>
             </div>
         </div>
     </ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index fad68acbee..f262647a0d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -22,18 +22,18 @@
 
                     // Loop through all inner properties:
                     for (var k in obj) {
-                        propClearingMethod(obj[k]);
+                        propClearingMethod(obj[k], clipboardService.TYPES.RAW);
                     }
                 }
             }
         }
-        
-        clipboardService.registrerClearPropertyResolver(clearNestedContentPropertiesForStorage)
+
+        clipboardService.registerClearPropertyResolver(clearNestedContentPropertiesForStorage, clipboardService.TYPES.ELEMENT_TYPE)
 
 
         function clearInnerNestedContentPropertiesForStorage(prop, propClearingMethod) {
 
-            // if we got an array, and it has a entry with ncContentTypeAlias this meants that we are dealing with a NestedContent property inside a NestedContent property.
+            // if we got an array, and it has a entry with ncContentTypeAlias this meants that we are dealing with a NestedContent property data.
             if ((Array.isArray(prop) && prop.length > 0 && prop[0].ncContentTypeAlias !== undefined)) {
 
                 for (var i = 0; i < prop.length; i++) {
@@ -44,13 +44,13 @@
 
                     // Loop through all inner properties:
                     for (var k in obj) {
-                        propClearingMethod(obj[k]);
+                        propClearingMethod(obj[k], clipboardService.TYPES.RAW);
                     }
                 }
             }
         }
-        
-        clipboardService.registrerClearPropertyResolver(clearInnerNestedContentPropertiesForStorage)
+
+        clipboardService.registerClearPropertyResolver(clearInnerNestedContentPropertiesForStorage, clipboardService.TYPES.RAW)
     }]);
 
     angular
@@ -65,7 +65,7 @@
             }
         });
 
-    function NestedContentController($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper, clipboardService, eventsService, overlayService) {
+    function NestedContentController($scope, $interpolate, $filter, serverValidationManager, contentResource, localizationService, iconHelper, clipboardService, eventsService, overlayService) {
 
         var vm = this;
         var model = $scope.$parent.$parent.model;
@@ -98,6 +98,8 @@
         vm.wideMode = Object.toBoolean(model.config.hideLabel);
         vm.hasContentTypes = model.config.contentTypes.length > 0;
 
+        var cultureChanged = eventsService.on('editors.content.cultureChanged', (name, args) => updateModel());
+
         var labels = {};
         vm.labels = labels;
         localizationService.localizeMany(["grid_addElement", "content_createEmpty", "actions_copy"]).then(function (data) {
@@ -128,7 +130,7 @@
             }
 
             localizationService.localize("clipboard_labelForArrayOfItemsFrom", [model.label, nodeName]).then(function (data) {
-                clipboardService.copyArray("elementTypeArray", aliases, vm.nodes, data, "icon-thumbnail-list", model.id, clearNodeForCopy);
+                clipboardService.copyArray(clipboardService.TYPES.ELEMENT_TYPE, aliases, vm.nodes, data, "icon-thumbnail-list", model.id, clearNodeForCopy);
             });
         }
 
@@ -165,10 +167,7 @@
             icon: 'trash',
             method: removeAllEntries,
             isDisabled: true
-        }
-
-
-
+        };
         // helper to force the current form into the dirty state
         function setDirty() {
             if ($scope.$parent.$parent.propertyForm) {
@@ -187,45 +186,14 @@
         };
 
         vm.openNodeTypePicker = function ($event) {
-            if (vm.overlayMenu || vm.nodes.length >= vm.maxItems) {
+            
+            if (vm.nodes.length >= vm.maxItems) {
                 return;
             }
 
-            vm.overlayMenu = {
-                show: false,
-                style: {},
-                filter: vm.scaffolds.length > 12 ? true : false,
-                orderBy: "$index",
-                view: "itempicker",
-                event: $event,
-                clickPasteItem: function (item) {
-                    if (item.type === "elementTypeArray") {
-                        _.each(item.data, function (entry) {
-                            pasteFromClipboard(entry);
-                        });
-                    } else {
-                        pasteFromClipboard(item.data);
-                    }
-                    vm.overlayMenu.show = false;
-                    vm.overlayMenu = null;
-                },
-                submit: function (model) {
-                    if (model && model.selectedItem) {
-                        addNode(model.selectedItem.alias);
-                    }
-                    vm.overlayMenu.show = false;
-                    vm.overlayMenu = null;
-                },
-                close: function () {
-                    vm.overlayMenu.show = false;
-                    vm.overlayMenu = null;
-                }
-            };
-
-            // this could be used for future limiting on node types
-            vm.overlayMenu.availableItems = [];
+            var availableItems = [];
             _.each(vm.scaffolds, function (scaffold) {
-                vm.overlayMenu.availableItems.push({
+                availableItems.push({
                     alias: scaffold.contentTypeAlias,
                     name: scaffold.contentTypeName,
                     icon: iconHelper.convertFromLegacyIcon(scaffold.icon),
@@ -233,54 +201,78 @@
                 });
             });
 
-            if (vm.overlayMenu.availableItems.length === 0) {
-                return;
-            }
+            const dialog = {
+                view: "itempicker",
+                orderBy: "$index",
+                view: "itempicker",
+                event: $event,
+                filter: availableItems.length > 12,
+                size: availableItems.length > 6 ? "medium" : "small",
+                availableItems: availableItems,
+                clickPasteItem: function (item) {
+                    if (Array.isArray(item.data)) {
+                        _.each(item.data, function (entry) {
+                            pasteFromClipboard(entry);
+                        });
+                    } else {
+                        pasteFromClipboard(item.data);
+                    }
 
-            vm.overlayMenu.size = vm.overlayMenu.availableItems.length > 6 ? "medium" : "small";
+                    overlayService.close();
+                },
+                submit: function (model) {
+                    if (model && model.selectedItem) {
+                        addNode(model.selectedItem.alias);
+                    }
 
-            vm.overlayMenu.pasteItems = [];
-
-            var singleEntriesForPaste = clipboardService.retriveEntriesOfType("elementType", contentTypeAliases);
-            _.each(singleEntriesForPaste, function (entry) {
-                vm.overlayMenu.pasteItems.push({
-                    type: "elementType",
-                    name: entry.label,
-                    data: entry.data,
-                    icon: entry.icon
-                });
-            });
-
-            var arrayEntriesForPaste = clipboardService.retriveEntriesOfType("elementTypeArray", contentTypeAliases);
-            _.each(arrayEntriesForPaste, function (entry) {
-                vm.overlayMenu.pasteItems.push({
-                    type: "elementTypeArray",
-                    name: entry.label,
-                    data: entry.data,
-                    icon: entry.icon
-                });
-            });
-
-            vm.overlayMenu.title = labels.grid_addElement;
-            vm.overlayMenu.hideHeader = vm.overlayMenu.pasteItems.length > 0;
-
-            vm.overlayMenu.clickClearPaste = function ($event) {
-                $event.stopPropagation();
-                $event.preventDefault();
-                clipboardService.clearEntriesOfType("elementType", contentTypeAliases);
-                clipboardService.clearEntriesOfType("elementTypeArray", contentTypeAliases);
-                vm.overlayMenu.pasteItems = [];// This dialog is not connected via the clipboardService events, so we need to update manually.
-                vm.overlayMenu.hideHeader = false;
+                    overlayService.close();
+                },
+                close: function () {
+                    overlayService.close();
+                }
             };
 
-            if (vm.overlayMenu.availableItems.length === 1 && vm.overlayMenu.pasteItems.length === 0) {
-                // only one scaffold type - no need to display the picker
-                addNode(vm.scaffolds[0].contentTypeAlias);
-                vm.overlayMenu = null;
+            if (dialog.availableItems.length === 0) {
                 return;
             }
 
-            vm.overlayMenu.show = true;
+            dialog.pasteItems = [];
+
+            var entriesForPaste = clipboardService.retriveEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, contentTypeAliases);
+            _.each(entriesForPaste, function (entry) {
+                dialog.pasteItems.push({
+                    date: entry.date,
+                    name: entry.label,
+                    data: entry.data,
+                    icon: entry.icon
+                });
+            });
+
+            dialog.pasteItems.sort( (a, b) => {
+                return b.date - a.date
+            });
+
+            dialog.title = dialog.pasteItems.length > 0 ? labels.grid_addElement : labels.content_createEmpty;
+            dialog.hideHeader = dialog.pasteItems.length > 0;
+
+            dialog.clickClearPaste = function ($event) {
+                $event.stopPropagation();
+                $event.preventDefault();
+                clipboardService.clearEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, contentTypeAliases);
+                dialog.pasteItems = [];// This dialog is not connected via the clipboardService events, so we need to update manually.
+                dialog.hideHeader = false;
+            };
+
+            if (dialog.availableItems.length === 1 && dialog.pasteItems.length === 0) {
+                // only one scaffold type - no need to display the picker
+                addNode(vm.scaffolds[0].contentTypeAlias);
+
+                dialog.close();
+
+                return;
+            }
+
+            overlayService.open(dialog);
         };
 
         vm.editNode = function (idx) {
@@ -295,14 +287,22 @@
             return (vm.nodes.length > vm.minItems)
                 ? true
                 : model.config.contentTypes.length > 1;
-        }
+        };
 
         function deleteNode(idx) {
-            vm.nodes.splice(idx, 1);
+            var removed = vm.nodes.splice(idx, 1);
+
             setDirty();
+
+            removed.forEach(x => {
+                // remove any server validation errors associated
+                serverValidationManager.removePropertyError(x.key, vm.umbProperty.property.culture, vm.umbProperty.property.segment, "", { matchType: "contains" });
+            });
+
             updateModel();
             validate();
         };
+
         vm.requestDeleteNode = function (idx) {
             if (!vm.canDeleteNode(idx)) {
                 return;
@@ -352,7 +352,7 @@
                         item["$index"] = (idx + 1);
 
                         var newName = contentType.nameExp(item);
-                        if (newName && (newName = $.trim(newName))) {
+                        if (newName && (newName = newName.trim())) {
                             name = newName;
                         }
 
@@ -390,10 +390,11 @@
 
             var scaffold = getScaffold(model.value[idx].ncContentTypeAlias);
             return scaffold && scaffold.icon ? iconHelper.convertFromLegacyIcon(scaffold.icon) : "icon-folder";
-        }
+        };
 
         vm.sortableOptions = {
             axis: "y",
+            containment: "parent",
             cursor: "move",
             handle: '.umb-nested-content__header-bar',
             distance: 10,
@@ -441,6 +442,26 @@
         function clearNodeForCopy(clonedData) {
             delete clonedData.key;
             delete clonedData.$$hashKey;
+
+            var variant = clonedData.variants[0];
+            for (var t = 0; t < variant.tabs.length; t++) {
+                var tab = variant.tabs[t];
+                for (var p = 0; p < tab.properties.length; p++) {
+                    var prop = tab.properties[p];
+
+                    // If we have ncSpecific data, lets revert to standard data model.
+                    if (prop.propertyAlias) {
+                        prop.alias = prop.propertyAlias;
+                        delete prop.propertyAlias;
+                    }
+
+                    if(prop.ncMandatory !== undefined) {
+                        prop.validation.mandatory = prop.ncMandatory;
+                        delete prop.ncMandatory;
+                    }
+                }
+            }
+
         }
 
         vm.showCopy = clipboardService.isSupported();
@@ -450,7 +471,7 @@
 
             syncCurrentNode();
 
-            clipboardService.copy("elementType", node.contentTypeAlias, node, null, null, null, clearNodeForCopy);
+            clipboardService.copy(clipboardService.TYPES.ELEMENT_TYPE, node.contentTypeAlias, node, null, null, null, clearNodeForCopy);
             $event.stopPropagation();
         }
 
@@ -461,9 +482,20 @@
                 return;
             }
 
+            newNode = clipboardService.parseContentForPaste(newNode, clipboardService.TYPES.ELEMENT_TYPE);
+
             // generate a new key.
             newNode.key = String.CreateGuid();
 
+            // Ensure we have NC data in place:
+            var variant = newNode.variants[0];
+            for (var t = 0; t < variant.tabs.length; t++) {
+                var tab = variant.tabs[t];
+                for (var p = 0; p < tab.properties.length; p++) {
+                    extendPropertyWithNCData(tab.properties[p]);
+                }
+            }
+
             vm.nodes.push(newNode);
             setDirty();
             //updateModel();// done by setting current node...
@@ -472,15 +504,18 @@
         }
 
         function checkAbilityToPasteContent() {
-            vm.showPaste = clipboardService.hasEntriesOfType("elementType", contentTypeAliases) || clipboardService.hasEntriesOfType("elementTypeArray", contentTypeAliases);
+            vm.showPaste = clipboardService.hasEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, contentTypeAliases);
         }
 
-        eventsService.on("clipboardService.storageUpdate", checkAbilityToPasteContent);
-
+        var storageUpdate = eventsService.on("clipboardService.storageUpdate", checkAbilityToPasteContent);
+        $scope.$on('$destroy', function () {
+            storageUpdate();
+        });
         var notSupported = [
             "Umbraco.Tags",
             "Umbraco.UploadField",
-            "Umbraco.ImageCropper"
+            "Umbraco.ImageCropper",
+            "Umbraco.BlockList"
         ];
 
         // Initialize
@@ -499,8 +534,7 @@
                     if (tab) {
                         scaffold.variants[0].tabs.push(tab);
 
-                        angular.forEach(tab.properties,
-                            function (property) {
+                        tab.properties.forEach(function (property) {
                                 if (_.find(notSupported, function (x) { return x === property.editor; })) {
                                     property.notSupported = true;
                                     // TODO: Not supported message to be replaced with 'content_nestedContentEditorNotSupported' dictionary key. Currently not possible due to async/timing quirk.
@@ -574,6 +608,30 @@
             }
         }
 
+        function extendPropertyWithNCData(prop) {
+
+            if (prop.propertyAlias === undefined) {
+                // store the original alias before we change below, see notes
+                prop.propertyAlias = prop.alias;
+
+                // NOTE: This is super ugly, the reason it is like this is because it controls the label/html id in the umb-property component at a higher level.
+                // not pretty :/ but we can't change this now since it would require a bunch of plumbing to be able to change the id's higher up.
+                prop.alias = model.alias + "___" + prop.alias;
+            }
+
+            // TODO: Do we need to deal with this separately?
+            // Force validation to occur server side as this is the
+            // only way we can have consistency between mandatory and
+            // regex validation messages. Not ideal, but it works.
+            if(prop.ncMandatory === undefined) {
+                prop.ncMandatory = prop.validation.mandatory;
+                prop.validation = {
+                    mandatory: false,
+                    pattern: ""
+                };
+            }
+        }
+
         function createNode(scaffold, fromNcEntry) {
             var node = Utilities.copy(scaffold);
 
@@ -587,16 +645,7 @@
                 for (var p = 0; p < tab.properties.length; p++) {
                     var prop = tab.properties[p];
 
-                    prop.propertyAlias = prop.alias;
-                    prop.alias = model.alias + "___" + prop.alias;
-                    // Force validation to occur server side as this is the
-                    // only way we can have consistency between mandatory and
-                    // regex validation messages. Not ideal, but it works.
-                    prop.ncMandatory = prop.validation.mandatory;
-                    prop.validation = {
-                        mandatory: false,
-                        pattern: ""
-                    };
+                    extendPropertyWithNCData(prop);
 
                     if (fromNcEntry && fromNcEntry[prop.propertyAlias]) {
                         prop.value = fromNcEntry[prop.propertyAlias];
@@ -663,8 +712,8 @@
         ];
 
         this.$onInit = function () {
-            if (this.umbProperty) {
-                this.umbProperty.setPropertyActions(propertyActions);
+            if (vm.umbProperty) {
+                vm.umbProperty.setPropertyActions(propertyActions);
             }
         };
 
@@ -699,6 +748,7 @@
 
         $scope.$on("$destroy", function () {
             unsubscribe();
+            cultureChanged();
             watcher();
         });
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html
index f62894e043..fa146f12f0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html
@@ -3,7 +3,7 @@
         <table class="table table-striped">
             <thead>
                 <tr>
-                    <th />
+                    <th></th>
                     <th>
                         <localize key="contentTypeEditor_elementType">Element Type</localize>
                     </th>
@@ -13,20 +13,20 @@
                     <th>
                         <localize key="template_template">Template</localize>
                     </th>
-                    <th />
+                    <th></th>
                 </tr>
             </thead>
             <tbody ui-sortable="sortableOptions" ng-model="model.value">
                 <tr ng-repeat="config in model.value">
                     <td>
-                        <i class="icon icon-navigation handle"></i>
+                        <umb-icon icon="icon-navigation" class="handle"></umb-icon>
                     </td>
                     <td>
                         {{ph = placeholder(config);""}}
-                        <div class="umb-nested-content__placeholder" ng-class="{'umb-nested-content__placeholder--selected':ph}" ng-click="openElemTypeModal($event, config)">
+                        <button type="button" class="btn-reset umb-nested-content__placeholder" ng-class="{'umb-nested-content__placeholder--selected':ph}" ng-click="openElemTypeModal($event, config)">
                             <umb-node-preview ng-if="ph" icon="ph.icon" name="ph.name"></umb-node-preview>
                             <localize key="content_nestedContentAddElementType" ng-if="!ph">Add element type</localize>
-                        </div>
+                        </button>
 
                     </td>
                     <td>
@@ -49,17 +49,19 @@
             <button type="button" class="btn" ng-click="add()" ng-disabled="!canAdd()">
                 <localize key="general_add">Add</localize>
             </button>
-            <i class="icon icon-help-alt medium umb-nested-content__help-icon" ng-click="showHelpText = !showHelpText"></i>
+            <button type="button" class="btn-reset umb-nested-content__help-action" ng-click="showHelpText = !showHelpText">
+                <umb-icon icon="icon-help-alt" class="medium umb-nested-content__help-icon"></umb-icon>
+            </button>
         </div>
     </div>
     <br />
     <div class="umb-nested-content__help-text" ng-show="showHelpText">
         <p>
-            <b><localize key="general_group">Group</localize>:</b><br />
+            <strong><localize key="general_group">Group</localize>:</strong><br />
             <localize key="content_nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the element type will be used.</localize>
         </p>
         <p>
-            <b><localize key="template_template">Template</localize>:</b><br />
+            <strong><localize key="template_template">Template</localize>:</strong><br />
             <localize key="content_nestedContentTemplateHelpTextPart1">Enter an angular expression to evaluate against each item for its name. Use</localize>
             <code ng-non-bindable>{{$index}}</code>
             <localize key="content_nestedContentTemplateHelpTextPart2">to display the item index</localize>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
index a2105c5675..125e920fe6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
@@ -1,13 +1,19 @@
 <div class="umb-pane">
-  <div ng-repeat="property in tab.properties" class="umb-nested-content-property-container">
+    <div ng-repeat="property in tab.properties" class="umb-nested-content-property-container">
 
-    <umb-property property="property" ng-class="{'umb-nested-content--not-supported': property.notSupported, 'umb-nested-content--mandatory': property.ncMandatory}" data-element="property-{{property.alias}}">
-      <umb-property-editor model="property"></umb-property-editor>
-    </umb-property>
+        <umb-property property="property"
+                      property-alias="{{property.propertyAlias}}"
+                      element-key="{{model.key}}"
+                      ng-class="{'umb-nested-content--not-supported': property.notSupported, 'umb-nested-content--mandatory': property.ncMandatory}"
+                      data-element="property-{{property.alias}}">
 
-    <div ng-if="property.notSupported" class="umb-nested-content-overlay"></div>
+            <umb-property-editor model="property"></umb-property-editor>
 
-    <p ng-if="property.notSupported">{{property.notSupportedMessage}}</p>
+        </umb-property>
 
-  </div>
+        <div ng-if="property.notSupported" class="umb-nested-content-overlay"></div>
+
+        <p ng-if="property.notSupported">{{property.notSupportedMessage}}</p>
+
+    </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.propertyeditor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.propertyeditor.html
index da6e466b50..f853387612 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.propertyeditor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.propertyeditor.html
@@ -6,43 +6,58 @@
 
         <div class="umb-nested-content__items" ng-hide="vm.nodes.length === 0" ui-sortable="vm.sortableOptions" ng-model="vm.nodes">
 
-            <div class="umb-nested-content__item" ng-repeat="node in vm.nodes" ng-class="{ 'umb-nested-content__item--active' : vm.currentNode.key === node.key, 'umb-nested-content__item--single' : vm.singleMode }">
+            <div ng-repeat="node in vm.nodes">
 
-                <div class="umb-nested-content__header-bar" ng-click="vm.editNode($index)" ng-hide="vm.singleMode" umb-auto-focus="{{vm.currentNode.key === node.key ? 'true' : 'false'}}">
+                <ng-form name="ncRowForm" val-server-match="{ 'contains' : node.key  }">
 
-                    <div class="umb-nested-content__heading"><i ng-if="vm.showIcons" class="icon" ng-class="vm.getIcon($index)"></i><span class="umb-nested-content__item-name" ng-class="{'--has-icon': vm.showIcons}" ng-bind="vm.getName($index)"></span></div>
+                    <div class="umb-nested-content__item"
+                         ng-class="{ 'umb-nested-content__item--active' : vm.currentNode.key === node.key, 'umb-nested-content__item--single' : vm.singleMode, '--error': ncRowForm.$invalid }">
 
-                    <div class="umb-nested-content__icons">
-                        <button type="button" class="umb-nested-content__icon umb-nested-content__icon--copy" title="{{vm.labels.copy_icon_title}}" ng-click="vm.clickCopy($event, node);" ng-if="vm.showCopy">
-                            <i class="icon icon-documents" aria-hidden="true"></i>
-                            <span class="sr-only">{{vm.labels.copy_icon_title}}</span>
-                        </button>
-                        <button type="button" class="umb-nested-content__icon umb-nested-content__icon--delete" localize="title" title="general_delete" ng-class="{ 'umb-nested-content__icon--disabled': !vm.canDeleteNode($index) }" ng-click="vm.requestDeleteNode($index); $event.stopPropagation();">
-                            <i class="icon icon-trash" aria-hidden="true"></i>
-                            <span class="sr-only">
-                                <localize key="general_delete">Delete</localize>
-                            </span>
-                        </button>
+                        <div class="umb-nested-content__header-bar"
+                             ng-click="vm.editNode($index)"
+                             ng-hide="vm.singleMode"
+                             umb-auto-focus="{{vm.currentNode.key === node.key ? 'true' : 'false'}}">
+
+                            <div class="umb-nested-content__heading"><i ng-if="vm.showIcons" class="icon umb-nested-content__item-icon" ng-class="vm.getIcon($index)"></i><span class="umb-nested-content__item-name" ng-class="{'--has-icon': vm.showIcons}" ng-bind="vm.getName($index)"></span></div>
+
+                            <div class="umb-nested-content__icons">
+                                <button type="button" class="umb-nested-content__icon umb-nested-content__icon--copy" title="{{vm.labels.copy_icon_title}}" ng-click="vm.clickCopy($event, node);" ng-if="vm.showCopy">
+                                    <i class="icon icon-documents" aria-hidden="true"></i>
+                                    <span class="sr-only">{{vm.labels.copy_icon_title}}</span>
+                                </button>
+                                <button type="button" class="umb-nested-content__icon umb-nested-content__icon--delete" localize="title" title="general_delete" ng-class="{ 'umb-nested-content__icon--disabled': !vm.canDeleteNode($index) }" ng-click="vm.requestDeleteNode($index); $event.stopPropagation();">
+                                    <i class="icon icon-trash" aria-hidden="true"></i>
+                                    <span class="sr-only">
+                                        <localize key="general_delete">Delete</localize>
+                                    </span>
+                                </button>
+                            </div>
+                        </div>
+
+
+                        <div class="umb-nested-content__content" ng-if="vm.currentNode.key === node.key && !vm.sorting">
+                            <umb-nested-content-editor ng-model="node" tab-alias="ncTabAlias" />
+                        </div>
                     </div>
 
-                </div>
-
-                <div class="umb-nested-content__content" ng-if="vm.currentNode.key === node.key && !vm.sorting">
-                    <umb-nested-content-editor ng-model="node" tab-alias="ncTabAlias" />
-                </div>
+                </ng-form>
             </div>
 
         </div>
 
         <div ng-hide="vm.hasContentTypes">
             <div class="umb-nested-content__help-text">
-                <localize key="content_nestedContentNoContentTypes"></localize>
+                <localize key="content_nestedContentNoContentTypes">No content types are configured for this property.</localize>
             </div>
         </div>
-
         <div class="umb-nested-content__footer-bar" ng-hide="!vm.inited || vm.hasContentTypes === false || vm.singleMode === true">
-            <button type="button" class="btn-reset umb-nested-content__add-content umb-focus" ng-class="{ '--disabled': (!vm.scaffolds.length || vm.nodes.length >= vm.maxItems) }" ng-click="vm.openNodeTypePicker($event)" prevent-default>
-                <localize key="grid_addElement"></localize>
+            <button
+                type="button"
+                class="btn-reset umb-nested-content__add-content umb-focus"
+                ng-class="{ '--disabled': (!vm.scaffolds.length || vm.nodes.length >= vm.maxItems) }"
+                ng-click="vm.openNodeTypePicker($event)"
+                aria-disabled="{{!vm.scaffolds.length || vm.nodes.length >= vm.maxItems}}">
+                <localize key="grid_addElement">Add element</localize>
             </button>
         </div>
 
@@ -64,12 +79,4 @@
 
     </ng-form>
 
-    <umb-overlay
-        ng-if="vm.overlayMenu.show"
-        position="target"
-        size="vm.overlayMenu.size"
-        view="vm.overlayMenu.view"
-        model="vm.overlayMenu">
-    </umb-overlay>
-
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.html
new file mode 100644
index 0000000000..a2fbb0e907
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.html
@@ -0,0 +1,3 @@
+<div class="umb-property-editor umb-property-editor--notsupported">
+    <localize key="errors_errorPropertyEditorNotSupportedInElementTypes" tokens="[model.label, model.editor]"></localize>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.less
new file mode 100644
index 0000000000..5eaec3f67b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.less
@@ -0,0 +1,7 @@
+.umb-property-editor.umb-property-editor--notsupported {
+    background-color: @red;
+    color: white;
+    padding: 5px 10px;
+    width: auto;
+    border-radius: @baseBorderRadius * 2;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.controller.js
index 6bfde10e9c..b30c04fdb9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.controller.js
@@ -7,6 +7,8 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.RadioButtonsContro
 
         function init() {
 
+            vm.uniqueId = String.CreateGuid();
+
             //we can't really do anything if the config isn't an object
             if (Utilities.isObject($scope.model.config.items)) {
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
index 1c3aa898db..88f8e676a5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
@@ -3,11 +3,16 @@
 
         <ul class="unstyled">
             <li ng-repeat="item in vm.viewItems track by item.key">
-                <umb-radiobutton name="{{model.alias}}" value="{{item.value}}" model="model.value" text="{{item.value}}" required="model.validation.mandatory && model.value == ''"></umb-radiobutton>
+                <umb-radiobutton name="{{model.alias}}_{{vm.uniqueId}}"
+                                 value="{{item.value}}"
+                                 model="model.value"
+                                 text="{{item.value}}"
+                                 required="model.validation.mandatory && model.value == ''">
+                </umb-radiobutton>
             </li>
         </ul>
 
-        <div ng-messages="radioButtonsFieldForm[model.alias].$error" show-validation-on-submit>
+        <div ng-messages="radioButtonsFieldForm[model.alias + '_' + vm.uniqueId].$error" show-validation-on-submit>
             <p class="help-inline" ng-message="required">{{mandatoryMessage}}</p>
         </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
index 221e7666f7..abd0c6bc81 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
@@ -22,16 +22,16 @@
                 <td class="col-link">
                     <div ng-show="!link.edit">
                         <i class="icon {{link.internalIcon}}" ng-show="link.internalIcon"></i>
-                        <a href="{{link.link}}" target="_blank" ng-show="!link.isInternal">{{link.link}}</a>
-                        <a href="#/content/content/edit/{{link.internal}}" target="_blank" ng-show="link.isInternal" ng-bind="link.internalName"></a>
+                        <a href="{{link.link}}" target="_blank" rel="noopener" ng-show="!link.isInternal">{{link.link}}</a>
+                        <a href="#/content/content/edit/{{link.internal}}" target="_blank" rel="noopener" ng-show="link.isInternal" ng-bind="link.internalName"></a>
                     </div>
                     <div ng-show="link.edit">
                         <div ng-show="!link.isInternal">
-                                <div class="control-wrapper">
-                                    <input type="text" ng-model="link.link" />
-                                </div>
-                                <localize key="or">or</localize> <a href="#" ng-click="switchLinkType($event,link)"><localize key="relatedlinks_chooseInternal">choose internal page</localize></a>
+                            <div class="control-wrapper">
+                                <input type="text" ng-model="link.link" />
                             </div>
+                            <localize key="or">or</localize> <a href="#" ng-click="switchLinkType($event,link)"><localize key="relatedlinks_chooseInternal">choose internal page</localize></a>
+                        </div>
 
                         <div ng-show="link.isInternal">
                             <i class="icon {{link.internalIcon}}" ng-show="link.internalIcon"></i>
@@ -88,4 +88,4 @@
         </tfoot>
     </table>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js
index 33e2b834f3..47d1f401c7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js
@@ -29,11 +29,15 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.RteController",
             // extend commands with properties for font-icon and if it is a custom command
             $scope.tinyMceConfig.commands = _.map($scope.tinyMceConfig.commands, function (obj) {
                 var icon = getFontIcon(obj.alias);
-                return angular.extend(obj, {
+
+                var objCmd = Utilities.extend(obj, {
                     fontIcon: icon.name,
                     isCustom: icon.isCustom,
-                    selected: $scope.model.value.toolbar.indexOf(obj.alias) >= 0
+                    selected: $scope.model.value.toolbar.indexOf(obj.alias) >= 0,
+                    icon: "mce-ico " + (icon.isCustom ? ' mce-i-custom ' : ' mce-i-') + icon.name
                 });
+
+                return objCmd;
             });
         });
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
index ee2929e3ea..96de0cd040 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
@@ -2,12 +2,13 @@
 
     <umb-control-group label="Toolbar" description="Pick the toolbar options that should be available when editing">
         <div ng-repeat="cmd in tinyMceConfig.commands">
-                <umb-checkbox
-                    model="cmd.selected"
-                    on-change="selectCommand(cmd)"
-                    icon-class="mce-ico {{(cmd.isCustom ? ' mce-i-custom ' : ' mce-i-') + cmd.fontIcon}}"
-                    text="{{cmd.name}}"
-                    class="mce-cmd" />
+            <umb-checkbox
+                model="cmd.selected"
+                on-change="selectCommand(cmd)"
+                icon="{{cmd.icon}}"
+                text="{{cmd.name}}"
+                class="mce-cmd">
+            </umb-checkbox>
         </div>
     </umb-control-group>
 
@@ -17,7 +18,9 @@
             <umb-checkbox
                 model="css.selected"
                 on-change="selectStylesheet(css)"
-                text="{{css.name}}"/>
+                text="{{css.name}}">
+            </umb-checkbox>
+
         </div>
     </umb-control-group>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.html
index ea0c2ef7bc..27c59194c1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.html
@@ -1,6 +1,6 @@
-<div ng-controller="Umbraco.PropertyEditors.SliderController">
+<div class="umb-property-editor umb-slider" ng-controller="Umbraco.PropertyEditors.SliderController">
 
-    <div style="padding-top: 50px; padding-bottom: 40px; width: 66.6%">
+    <div style="padding-top: 50px; padding-bottom: 40px;">
         <umb-range-slider 
             ng-model="sliderValue"
             options="sliderOptions"
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 4a7fff99f8..4f3cb6770b 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,42 +1,38 @@
 function textAreaController($scope, validationMessageService) {
 
     // macro parameter editor doesn't contains a config object,
-    // so we create a new one to hold any properties 
+    // so we create a new one to hold any properties
     if (!$scope.model.config) {
         $scope.model.config = {};
     }
-    $scope.model.count = 0;
 
-    if (!$scope.model.config.maxChars) {
-        $scope.model.config.maxChars = false;
-    }
-
-    $scope.model.maxlength = false;
-    if ($scope.model.config && $scope.model.config.maxChars) {
-        $scope.model.maxlength = true;
-    }
+    $scope.maxChars = $scope.model.config.maxChars || 0;
+    $scope.maxCharsLimit = ($scope.model.config && $scope.model.config.maxChars > 0);
+    $scope.charsCount = 0;
+    $scope.nearMaxLimit = false;
+    $scope.validLength = true;
 
     $scope.$on("formSubmitting", function() {
-        if ($scope.isLengthValid()) {
+        if ($scope.validLength) {
             $scope.textareaFieldForm.textarea.$setValidity("maxChars", true);
         } else {
             $scope.textareaFieldForm.textarea.$setValidity("maxChars", false);
         }
     });
 
-    $scope.isLengthValid = function() {
-        if (!$scope.model.maxlength) {
-            return true;
-        } 
-        return $scope.model.config.maxChars >= $scope.model.count;
+    function checkLengthVadility() {
+        $scope.validLength = !($scope.maxCharsLimit === true && $scope.charsCount > $scope.maxChars);
     }
 
-    $scope.model.change = function () {
+    $scope.change = function () {
         if ($scope.model.value) {
-            $scope.model.count = $scope.model.value.length;
+            $scope.charsCount = $scope.model.value.length;
+            checkLengthVadility();
+            $scope.nearMaxLimit = $scope.maxCharsLimit === true && $scope.validLength === true && $scope.charsCount > Math.max($scope.maxChars*.8, $scope.maxChars-50);
         }
     }
-    $scope.model.change();
+    $scope.model.onValueChanged = $scope.change;
+    $scope.change();
 
     // Set the message to use for when a mandatory field isn't completed.
     // Will either use the one provided on the property type or a localised default.
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
index 87f6ffeac9..2f183c29f0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
@@ -1,17 +1,29 @@
 <div ng-controller="Umbraco.PropertyEditors.textAreaController">
     <ng-form name="textareaFieldForm">
-        <textarea ng-model="model.value" id="{{model.alias}}" name="textarea" rows="{{model.config.rows || 10}}" class="umb-property-editor umb-textarea textstring" val-server="value" ng-keyup="model.change()" ng-trim="false" ng-required="model.validation.mandatory" aria-required="{{model.validation.mandatory}}"></textarea>
+        <textarea ng-model="model.value"
+            id="{{model.alias}}"
+            name="textarea"
+            rows="{{model.config.rows || 10}}"
+            class="umb-property-editor umb-textarea textstring"
+            val-server="value"
+            ng-keyup="change()"
+            ng-trim="false"
+            ng-required="model.validation.mandatory"
+            aria-required="{{model.validation.mandatory}}">
+        </textarea>
 
         <span ng-messages="textareaFieldForm.textarea.$error" show-validation-on-submit >
             <span class="help-inline" ng-message="required">{{mandatoryMessage}}</span>
             <span class="help-inline" ng-message="valServer">{{textareaFieldForm.textarea.errorMsg}}</span>
         </span>
 
-        <div class="help" ng-if="model.maxlength === true && model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
-            <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]" watch-tokens="true">%0% characters left.</localize>
+        <div class="help" ng-if="nearMaxLimit">
+            <p class="sr-only" tabindex="0">{{model.label}} <localize key="textbox_characters_left" tokens="[maxChars - charsCount]" watch-tokens="true">%0% characters left.</localize></p>
+            <p aria-hidden="true"><localize key="textbox_characters_left" tokens="[maxChars - charsCount]" watch-tokens="true">%0% characters left.</localize></p>
         </div>
-        <div class="help text-error" ng-if="!isLengthValid()">
-            <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]" watch-tokens="true">Maximum %0% characters, <strong>%1%</strong> too many.</localize>
+        <div class="help text-error" ng-if="validLength === false">
+            <p class="sr-only" tabindex="0">{{model.label}} <localize key="textbox_characters_exceed" tokens="[maxChars, charsCount - maxChars]" watch-tokens="true">Maximum %0% characters, <strong>%1%</strong> too many.</localize></p>
+            <p aria-hidden="true"><localize key="textbox_characters_exceed" tokens="[maxChars, charsCount - maxChars]" watch-tokens="true">Maximum %0% characters, <strong>%1%</strong> too many.</localize></p>
         </div>
 
     </ng-form>
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 b47c3584b3..b7c740e749 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
@@ -4,37 +4,41 @@ function textboxController($scope, validationMessageService) {
     if (!$scope.model.config) {
         $scope.model.config = {};
     }
-    $scope.model.count = 0;
-    if (!$scope.model.config.maxChars) {
-        // 500 is the maximum number that can be stored
-        // in the database, so set it to the max, even
-        // if no max is specified in the config
-        $scope.model.config.maxChars = 500;
-    }
+
+    // 512 is the maximum number that can be stored
+    // in the database, so set it to the max, even
+    // if no max is specified in the config
+    $scope.maxChars = Math.min($scope.model.config.maxChars || 512, 512);
+    $scope.charsCount = 0;
+    $scope.nearMaxLimit = false;
+    $scope.validLength = true;
 
     $scope.$on("formSubmitting", function() {
-        if ($scope.isLengthValid()) {
+        if ($scope.validLength === true) {
             $scope.textboxFieldForm.textbox.$setValidity("maxChars", true);
         } else {
             $scope.textboxFieldForm.textbox.$setValidity("maxChars", false);
         }
     });
 
-    $scope.isLengthValid = function() {
-        return $scope.model.config.maxChars >= $scope.model.count;
+    function checkLengthVadility() {
+        $scope.validLength = $scope.charsCount <= $scope.maxChars;
     }
 
-    $scope.model.change = function () {
+    $scope.change = function () {
         if ($scope.model.value) {
-            $scope.model.count = $scope.model.value.length;
+            $scope.charsCount = $scope.model.value.length;
+            checkLengthVadility();
+            $scope.nearMaxLimit = $scope.validLength && $scope.charsCount > Math.max($scope.maxChars*.8, $scope.maxChars-25);
         }
     }
-    $scope.model.change();
+    $scope.model.onValueChanged = $scope.change;
+    $scope.change();
 
     // Set the message to use for when a mandatory field isn't completed.
     // Will either use the one provided on the property type or a localised default.
     validationMessageService.getMandatoryMessage($scope.model.validation).then(function(value) {
         $scope.mandatoryMessage = value;
-    });    
+    });
 }
 angular.module('umbraco').controller("Umbraco.PropertyEditors.textboxController", textboxController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
index 5d86259e93..5e135ea7d9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
@@ -1,27 +1,30 @@
 <div ng-controller="Umbraco.PropertyEditors.textboxController">
     <ng-form name="textboxFieldForm">
-        <input type="text" name="textbox" ng-model="model.value" id="{{model.alias}}"
+        <input type="text"
+               id="{{model.alias}}"
+               name="textbox"
+               ng-model="model.value"
                class="umb-property-editor umb-textstring textstring"
                val-server="value"
                ng-required="model.validation.mandatory"
                aria-required="{{model.validation.mandatory}}"
                aria-invalid="False"
                ng-trim="false"
-               ng-keyup="model.change()" />
-        
+               ng-keyup="change()" />
+
         <div ng-messages="textboxFieldForm.textbox.$error" show-validation-on-submit>
             <p class="sr-only" ng-message="valServer" tabindex="0">{{model.label}} {{textboxFieldForm.textbox.errorMsg}}</p>
             <p class="help-inline" ng-message="valServer" tabindex="0" aria-hidden="true">{{textboxFieldForm.textbox.errorMsg}}</p>
             <p class="help-inline" ng-message="required">{{mandatoryMessage}}</p>
         </div>
 
-        <div class="help" ng-if="model.count >= (model.config.maxChars*.8) && model.count <= model.config.maxChars">
-            <p class="sr-only" tabindex="0">{{model.label}} <localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]" watch-tokens="true">%0% characters left.</localize></p>
-            <p aria-hidden="True"><localize key="textbox_characters_left" tokens="[model.config.maxChars - model.count]" watch-tokens="true">%0% characters left.</localize></p>
+        <div class="help" ng-if="nearMaxLimit">
+            <p class="sr-only" tabindex="0">{{model.label}} <localize key="textbox_characters_left" tokens="[maxChars - charsCount]" watch-tokens="true">%0% characters left.</localize></p>
+            <p aria-hidden="true"><localize key="textbox_characters_left" tokens="[maxChars - charsCount]" watch-tokens="true">%0% characters left.</localize></p>
         </div>
-        <div class="help text-error" ng-if="!isLengthValid()">
-            <p class="sr-only" tabindex="0">{{model.label}} <localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]" watch-tokens="true">Maximum %0% characters, <strong>%1%</strong> too many.</localize></p>
-            <p aria-hidden="true"><localize key="textbox_characters_exceed" tokens="[model.config.maxChars, model.count - model.config.maxChars]" watch-tokens="true">Maximum %0% characters, <strong>%1%</strong> too many.</localize></p>
+        <div class="help text-error" ng-if="validLength === false">
+            <p class="sr-only" tabindex="0">{{model.label}} <localize key="textbox_characters_exceed" tokens="[maxChars, charsCount - maxChars]" watch-tokens="true">Maximum %0% characters, <strong>%1%</strong> too many.</localize></p>
+            <p aria-hidden="true"><localize key="textbox_characters_exceed" tokens="[maxChars, charsCount - maxChars]" watch-tokens="true">Maximum %0% characters, <strong>%1%</strong> too many.</localize></p>
         </div>
 
     </ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html
index 65c8c2364c..ef36aae593 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html
@@ -1,7 +1,7 @@
 <div ng-controller="Umbraco.PropertyEditors.UrlListController">
     <ul class="nav nav-stacked">
         <li ng-repeat="value in renderModel">
-            <a href="{{getUrl(value.url)}}" prevent-default="{{value.url.indexOf('/') == -1}}" target="{{value.urlTarget}}">
+            <a href="{{getUrl(value.url)}}" prevent-default="{{value.url.indexOf('/') == -1}}" target="{{value.urlTarget}}" class="umb-outline">
                 <i ng-class="value.icon" aria-hidden="true"></i>
                 <span>{{value.linkText || value.url}}</span>
             </a>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/overlays/remove.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/overlays/remove.html
new file mode 100644
index 0000000000..69812032e7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/overlays/remove.html
@@ -0,0 +1,9 @@
+<div>
+
+    <div class="umb-alert umb-alert--warning mb2">
+        <localize key="defaultdialogs_propertyuserpickerremovewarning" tokens="[model.username]">This will remove the user <strong>{{ model.username }}</strong>.</localize>
+    </div>
+
+    <localize key="defaultdialogs_confirmremove">Yes, remove</localize>?
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
new file mode 100644
index 0000000000..f2055fea3a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
@@ -0,0 +1,109 @@
+function userPickerController($scope, usersResource , iconHelper, editorService, overlayService){
+
+    function trim(str, chr) {
+        var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
+        return str.replace(rgxtrim, '');
+    }
+
+    $scope.renderModel = [];
+    $scope.allowRemove = true;
+
+    var multiPicker = $scope.model.config.multiPicker && $scope.model.config.multiPicker !== '0' ? true : false;
+
+    $scope.openUserPicker = function () {
+
+        var currentSelection = [];
+        var userPicker = {
+            multiPicker: multiPicker,
+            selection: currentSelection,
+            submit: function (model) {
+                if (model.selection) {
+                    _.each(model.selection, function (item, i) {
+                        $scope.add(item);
+                    });
+                }
+                editorService.close();
+            },
+            close: function () {
+                editorService.close();
+            }
+        };
+
+        editorService.userPicker(userPicker);
+    };
+
+    $scope.remove = function (index) {
+        const dialog = {
+            view: "views/propertyeditors/userpicker/overlays/remove.html",
+            username: $scope.renderModel[index].name,
+            submitButtonLabelKey: "defaultdialogs_yesRemove",
+            submitButtonStyle: "danger",
+
+            submit: function () {
+                $scope.renderModel.splice(index, 1);
+                $scope.userName = '';
+
+                overlayService.close();
+            },
+            close: function () {
+                overlayService.close();
+            }
+        };
+
+        overlayService.open(dialog);
+    };
+
+    $scope.add = function (item) {
+        var currIds = _.map($scope.renderModel, function (i) {
+            if ($scope.model.config.idType === "udi") {
+                return i.udi;
+            }
+            else {
+                return i.id;
+            }
+        });
+
+        var itemId = $scope.model.config.idType === "udi" ? item.udi : item.id;
+
+        if (currIds.indexOf(itemId) < 0) {
+            item.icon = item.icon ? iconHelper.convertFromLegacyIcon(item.icon) : "icon-user";
+            $scope.renderModel.push({ name: item.name, id: item.id, udi: item.udi, icon: item.icon, avatars: item.avatars });
+        }
+    };
+
+    $scope.clear = function() {
+        $scope.renderModel = [];
+    };
+
+    var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
+        var currIds = _.map($scope.renderModel, function (i) {
+            if ($scope.model.config.idType === "udi") {
+                return i.udi;
+            }
+            else {
+                return i.id;
+            }
+        });
+        $scope.model.value = trim(currIds.join(), ",");
+    });
+
+    //when the scope is destroyed we need to unsubscribe
+    $scope.$on('$destroy', function () {
+        unsubscribe();
+    });
+
+    //load user data
+    var modelIds = $scope.model.value ? $scope.model.value.split(',') : [];
+
+    // entityResource.getByIds doesn't support "User" and we would like to show avatars in umb-user-preview as well.
+    usersResource.getUsers(modelIds).then(function (data) {
+        _.each(data, function (item, i) {
+            // set default icon if it's missing
+            item.icon = item.icon ? iconHelper.convertFromLegacyIcon(item.icon) : "icon-user";
+            $scope.renderModel.push({ name: item.name, id: item.id, udi: item.udi, icon: item.icon, avatars: item.avatars });
+        });
+    });
+}
+
+
+angular.module('umbraco').controller("Umbraco.PropertyEditors.UserPickerController", userPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html
new file mode 100644
index 0000000000..8345317eee
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html
@@ -0,0 +1,21 @@
+<div ng-controller="Umbraco.PropertyEditors.UserPickerController" class="umb-property-editor umb-userpicker">
+
+	<div>
+        <umb-user-preview
+            ng-repeat="user in renderModel"
+            name="user.name"
+            avatars="user.avatars"
+            allow-remove="allowRemove"
+            on-remove="remove($index)">
+        </umb-user-preview>
+	</div>
+
+	<button type="button" ng-show="model.config.multiPicker === true || renderModel.length === 0" 
+		class="umb-node-preview-add"
+        ng-click="openUserPicker()">
+		<localize key="general_add">Add</localize>
+	</button>
+
+    <input type="hidden" name="mandatory" ng-model="model.mandatory" ng-required="model.validation.mandatory && !renderModel.length" />
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.controller.js
index 71f59a9a1f..bd990961bf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.controller.js
@@ -26,7 +26,7 @@ function RelationTypeCreateController($scope, $location, relationTypeResource, n
     }
 
     function createRelationType() {
-        if (formHelper.submitForm({ scope: $scope, formCtrl: this.createRelationTypeForm, statusMessage: "Creating relation type..." })) {
+        if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createRelationTypeForm, statusMessage: "Creating relation type..." })) {
             var node = $scope.currentNode;
 
             relationTypeResource.create(vm.relationType).then(function (data) {
@@ -36,11 +36,12 @@ function RelationTypeCreateController($scope, $location, relationTypeResource, n
                 var currentPath = node.path ? node.path : "-1";
                 navigationService.syncTree({ tree: "relationTypes", path: currentPath + "," + data, forceReload: true, activate: true });
 
-                formHelper.resetForm({ scope: $scope });
+                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createRelationTypeForm });
 
                 var currentSection = appState.getSectionState("currentSection");
                 $location.path("/" + currentSection + "/relationTypes/edit/" + data);
             }, function (err) {
+                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createRelationTypeForm, hasErrors: true });
                 if (err.data && err.data.message) {
                     notificationsService.error(err.data.message);
                     navigationService.hideMenu();
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html b/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html
index beb1962b4e..93debb5507 100644
--- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html
@@ -5,42 +5,49 @@
               ng-submit="vm.createRelationType()">
 
             <!-- Name -->
-            <umb-control-group label="@relationType_name">
-                <input type="text" name="relationTypeName" ng-model="vm.relationType.name" class="umb-textstring textstring input-block-level" umb-auto-focus required />
+            <umb-control-group label="@relationType_name" alias="relationTypeName">
+                <input type="text" name="relationTypeName" id="relationTypeName" ng-model="vm.relationType.name" class="umb-textstring textstring input-block-level" umb-auto-focus required />
             </umb-control-group>
 
             <!-- Direction -->
             <umb-control-group label="@relationType_direction">
+                <p tabindex="0" class="sr-only"><localize key="relationType_direction"></localize></p>
                 <ul class="unstyled">
                     <li>
-                        <label class="radio">
-                            <umb-radiobutton name="relationType-direction" value="false" model="vm.relationType.isBidirectional" />
-                            <localize key="relationType_parentToChild">Parent to child</localize>
+                        <label class="radio" for="parentToChild">
+                            <umb-radiobutton name="relationType-direction"
+                                             value="false"
+                                             model="vm.relationType.isBidirectional" required="true" input-id="parentToChild"
+                                             label-key="relationType_parentToChild">
+                            </umb-radiobutton>
                         </label>
                     </li>
                     <li>
-                        <label class="radio">
-                            <umb-radiobutton name="relationType-direction" value="true" model="vm.relationType.isBidirectional" />
-                            <localize key="relationType_bidirectional">Bidirectional</localize>
+                        <label class="radio" for="bidirectional">
+                            <umb-radiobutton name="relationType-direction"
+                                             value="true"
+                                             model="vm.relationType.isBidirectional" required="true"  input-id="bidirectional"
+                                             label-key="relationType_bidirectional">
+                            </umb-radiobutton>
                         </label>
                     </li>
                 </ul>
             </umb-control-group>
 
             <!-- Parent -->
-            <umb-control-group label="@relationType_parent">
-                <select name="relationType-parent"
+            <umb-control-group label="@relationType_parent" alias="relationType-parent">
+                <select name="relationType-parent" id="relationType-parent"
                         ng-model="vm.relationType.parentObjectType"
-                        class="umb-property-editor umb-dropdown">
+                        class="umb-property-editor umb-dropdown" required>
                     <option ng-repeat="objectType in vm.objectTypes" value="{{objectType.id}}">{{objectType.name}}</option>
                 </select>
             </umb-control-group>
 
             <!-- Child -->
-            <umb-control-group label="@relationType_child">
-                <select name="relationType-child"
+            <umb-control-group label="@relationType_child" alias="relationType-child">
+                <select name="relationType-child" id="relationType-child"
                         ng-model="vm.relationType.childObjectType"
-                        class="umb-property-editor umb-dropdown">
+                        class="umb-property-editor umb-dropdown" required>
                     <option ng-repeat="objectType in vm.objectTypes" value="{{objectType.id}}">{{objectType.name}}</option>
                 </select>
             </umb-control-group>
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
index 74b3e31b87..62117728d0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
@@ -54,11 +54,14 @@ function RelationTypeEditController($scope, $routeParams, relationTypeResource,
         });
 
         // load references when the 'relations' tab is first activated/switched to
-        eventsService.on("app.tabChange", function (event, args) {
+        var appTabChange =  eventsService.on("app.tabChange", function (event, args) {
             if (args.alias === "relations") {
                 loadRelations();
             }
         });
+        $scope.$on('$destroy', function () {
+            appTabChange();
+        });
 
         // Inital page/overview API call of relation type
         relationTypeResource.getById($routeParams.id)
@@ -102,7 +105,7 @@ function RelationTypeEditController($scope, $routeParams, relationTypeResource,
     function formatDates(relations) {
         if (relations) {
             userService.getCurrentUser().then(function (currentUser) {
-                angular.forEach(relations, function (relation) {
+                relations.forEach(function (relation) {
                     relation.timestampFormatted = dateHelper.getLocalDate(relation.createDate, currentUser.locale, 'LLL');
                 });
             });
@@ -116,12 +119,13 @@ function RelationTypeEditController($scope, $routeParams, relationTypeResource,
             vm.page.saveButtonState = "busy";
 
             relationTypeResource.save(vm.relationType).then(function (data) {
-                formHelper.resetForm({ scope: $scope, notifications: data.notifications });
+                formHelper.resetForm({ scope: $scope });
                 bindRelationType(data);
 
                 vm.page.saveButtonState = "success";
 
             }, function (error) {
+                formHelper.resetForm({ scope: $scope, hasErrors: true });
                 contentEditingHelper.handleSaveError({
                     err: error
                 });
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html b/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html
index 043ced9a5f..100d8d9d09 100644
--- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html
+++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/views/relationType.html
@@ -11,10 +11,18 @@
             <umb-control-group label="@relationType_direction">
                 <ul class="unstyled">
                     <li>
-                        <umb-radiobutton name="relationTypeDirection" value="false" model="model.relationType.isBidirectional" text="{{vm.labels.parentToChild}}"></umb-radiobutton>
+                        <umb-radiobutton name="relationTypeDirection"
+                                         value="false"
+                                         model="model.relationType.isBidirectional"
+                                         text="{{vm.labels.parentToChild}}">
+                        </umb-radiobutton>
                     </li>
                     <li>
-                        <umb-radiobutton name="relationTypeDirection" value="true" model="model.relationType.isBidirectional" text="{{vm.labels.bidirectional}}"></umb-radiobutton>
+                        <umb-radiobutton name="relationTypeDirection"
+                                         value="true"
+                                         model="model.relationType.isBidirectional"
+                                         text="{{vm.labels.bidirectional}}">
+                        </umb-radiobutton>
                     </li>
                 </ul>
             </umb-control-group>
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
index 096ae72e61..14d7e54a66 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
@@ -27,7 +27,7 @@
 
         function createFolder(form) {
 
-            if (formHelper.submitForm({scope: $scope, formCtrl: form })) {
+            if (formHelper.submitForm({ scope: $scope, formCtrl: form })) {
 
                 codefileResource.createContainer("scripts", node.id, vm.folderName).then(function (saved) {
 
@@ -40,14 +40,15 @@
                         activate: true
                     });
 
-                    formHelper.resetForm({ scope: $scope });
+                    formHelper.resetForm({ scope: $scope, formCtrl: form });
 
                     var section = appState.getSectionState("currentSection");
 
-                }, function(err) {
+                }, function (err) {
+
+                    formHelper.resetForm({ scope: $scope, formCtrl: form, hasErrors: true });
+                    vm.createFolderError = err;
 
-                  vm.createFolderError = err;
-                    
                 });
             }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
index 7d2896f606..b9f355f092 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
@@ -7,14 +7,14 @@
 
             <ul class="umb-actions umb-actions-child">
                 <li class="umb-action">
-                    <button href="" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
-                        <i class="large icon icon-script"></i>
+                    <button type="button" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
+                        <i class="large icon icon-script" aria-hidden="true"></i>
                         <span class="menu-label"><localize key="create_newJavascriptFile">New javascript file</localize></span>
                     </button>
                 </li>
                 <li class="umb-action">
-                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
-                        <i class="large icon icon-folder"></i>
+                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
+                        <i class="large icon icon-folder" aria-hidden="true"></i>
                         <span class="menu-label"><localize key="general_folder"></localize>...</span>
                     </button>
                 </li>
@@ -26,7 +26,7 @@
             <form novalidate name="createFolderForm"
                 ng-submit="vm.createFolder(createFolderForm)"
                 val-form-manager>
-                
+
                 <div ng-show="vm.createFolderError">
                     <div class="alert alert-error">
                         <div>{{vm.createFolderError.data.message}}</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js
index 6033a6bdc7..af80878c35 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js
@@ -22,14 +22,14 @@
             $location.path("/settings/stylesheets/edit/" + node.id).search("create", "true").search("rtestyle", "true");
             navigationService.hideMenu();
         }
-        
+
         function showCreateFolder() {
             vm.creatingFolder = true;
         }
 
         function createFolder(form) {
 
-            if (formHelper.submitForm({scope: $scope, formCtrl: form })) {
+            if (formHelper.submitForm({ scope: $scope, formCtrl: form })) {
 
                 codefileResource.createContainer("stylesheets", node.id, vm.folderName).then(function (saved) {
 
@@ -42,12 +42,13 @@
                         activate: true
                     });
 
-                    formHelper.resetForm({ scope: $scope });
+                    formHelper.resetForm({ scope: $scope, formCtrl: form });
 
-                }, function(err) {
+                }, function (err) {
+
+                    formHelper.resetForm({ scope: $scope, formCtrl: form, hasErrors: true });
+                    vm.createFolderError = err;
 
-                  vm.createFolderError = err;
-                    
                 });
             }
 
@@ -57,7 +58,7 @@
             const showMenu = true;
             navigationService.hideDialog(showMenu);
         }
-        
+
     }
 
     angular.module("umbraco").controller("Umbraco.Editors.StyleSheets.CreateController", StyleSheetsCreateController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
index 4c7f62e17f..cf0b6906ca 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
@@ -7,20 +7,20 @@
 
             <ul class="umb-actions umb-actions-child">
                 <li class="umb-action">
-                    <button href="" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
-                        <i class="large icon icon-script"></i>
+                    <button type="button" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
+                        <i class="large icon icon-script" aria-hidden="true"></i>
                         <span class="menu-label"><localize key="create_newStyleSheetFile">New style sheet file</localize></span>
                     </button>
                 </li>
                 <li class="umb-action">
-                    <button href="" ng-click="vm.createRichtextStyle()" class="umb-action-link umb-outline btn-reset">
-                        <i class="large icon icon-script"></i>
+                    <button type="button" ng-click="vm.createRichtextStyle()" class="umb-action-link umb-outline btn-reset">
+                        <i class="large icon icon-script" aria-hidden="true"></i>
                         <span class="menu-label"><localize key="create_newRteStyleSheetFile">New richtext style sheet file</localize></span>
                     </button>
                 </li>
                 <li class="umb-action">
-                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
-                        <i class="large icon icon-folder"></i>
+                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
+                        <i class="large icon icon-folder" aria-hidden="true"></i>
                         <span class="menu-label"><localize key="general_folder"></localize>...</span>
                     </button>
                 </li>
@@ -50,7 +50,7 @@
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="vm.creatingFolder">
-        <button class="btn btn-info" ng-click="vm.close()">
+        <button type="button" class="btn btn-info" ng-click="vm.close()">
             <localize key="buttons_somethingElse">Do something else</localize>
         </button>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.html
index cc5487d747..20c62cbd77 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.html
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.html
@@ -2,7 +2,7 @@
     
     <form novalidate name="richTextRuleForm" val-form-manager>
 
-    <umb-editor-view>
+        <umb-editor-view>
 
             <umb-editor-header
                 name="model.title"
@@ -64,9 +64,8 @@
                         action="vm.submit(model)">
                     </umb-button>
                 </umb-editor-footer-content-right>
-            </umb-editor-footer>
-            '        
-    </umb-editor-view>
+            </umb-editor-footer>     
+        </umb-editor-view>
 
     </form>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.controller.js b/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.controller.js
index 7a3a51cf2e..de2865d843 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.controller.js
@@ -59,7 +59,6 @@ angular.module("umbraco").controller("Umbraco.Editors.StyleSheets.RulesControlle
             };
 
             editorService.open(ruleDialog);
-
         }
 
         function setDirty() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.html
index 213499740f..8187b88152 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.html
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.html
@@ -9,13 +9,11 @@
                 <div class="umb-property-editor umb-stylesheet-rules form-horizontal" ng-controller="Umbraco.Editors.StyleSheets.RulesController">
                     <div ui-sortable="sortableOptions" ng-model="model.stylesheet.rules">
                         <div class="umb-stylesheet-rules__listitem" ng-repeat="rule in model.stylesheet.rules track by $id(rule)">
-                            <i class="icon icon-navigation handle"></i>
-                            <div class="umb-stylesheet-rules__left">
-                                {{rule.name}}
-                            </div>
+                            <i class="icon icon-navigation handle" aria-hidden="true"></i>
+                            <div class="umb-stylesheet-rules__left">{{rule.name}}</div>
                             <div class="umb-stylesheet-rules__right">
-                                <a class="umb-node-preview__action" ng-click="edit(rule, $event)"><localize key="general_edit">Edit</localize></a>
-                                <a class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(rule, $event)"><localize key="general_remove">Remove</localize></a>
+                                <button type="button" class="umb-node-preview__action" ng-click="edit(rule, $event)"><localize key="general_edit">Edit</localize></button>
+                                <button type="button" class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(rule, $event)"><localize key="general_remove">Remove</localize></button>
                             </div>
                         </div>
                     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
index 2e3bc6eb80..7b527804f5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
@@ -549,7 +549,7 @@
             var availableMasterTemplates = [];
 
             // filter out the current template and the selected master template
-            angular.forEach(vm.templates, function (template) {
+            vm.templates.forEach(function (template) {
                 if (template.alias !== vm.template.alias && template.alias !== vm.template.masterTemplateAlias) {
                     var templatePathArray = template.path.split(',');
                     // filter descendant templates of current template
@@ -602,7 +602,7 @@
         function getMasterTemplateName(masterTemplateAlias, templates) {
             if (masterTemplateAlias) {
                 var templateName = "";
-                angular.forEach(templates, function (template) {
+                templates.forEach(function (template) {
                     if (template.alias === masterTemplateAlias) {
                         templateName = template.name;
                     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
index c5ad1b68d0..255b2c4885 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
@@ -30,12 +30,11 @@
 
                                 <div ng-class="{'btn-group': vm.template.masterTemplateAlias}" style="margin-right: 10px;">
 
-                                    <button
-                                        data-element="button-masterTemplate"
-                                        type="button"
-                                        class="btn umb-button--xs"
-                                        ng-click="vm.openMasterTemplateOverlay()"
-                                        style="font-size: 14px;">
+                                    <button type="button"
+                                            data-element="button-masterTemplate"
+                                            class="btn umb-button__button umb-button--xs umb-outline"
+                                            style="font-size: 14px;"
+                                            ng-click="vm.openMasterTemplateOverlay()">
                                         <span class="bold"><localize key="template_mastertemplate">Master template</localize>:</span>
                                         <span style="margin-left: 5px;">
                                             <span ng-if="vm.template.masterTemplateAlias">{{ vm.getMasterTemplateName(vm.template.masterTemplateAlias, vm.templates) }}</span>
@@ -43,12 +42,18 @@
                                         </span>
                                     </button>
 
-                                    <a ng-if="vm.template.masterTemplateAlias" ng-click="vm.removeMasterTemplate()" class="btn umb-button--xs dropdown-toggle umb-button-group__toggle">
-                                        <span class="icon icon-wrong"></span>
-                                    </a>
+                                    <button type="button"
+                                            class="btn umb-button__button umb-button--xs dropdown-toggle umb-button-group__toggle flex-inline items-center"
+                                            style="font-size: 14px; height: 100%;"
+                                            localize="title"
+                                            title="@general_remove"
+                                            ng-if="vm.template.masterTemplateAlias"
+                                            ng-click="vm.removeMasterTemplate()">
+                                        <umb-icon icon="icon-wrong" class="icon icon-wrong"></umb-icon>
+                                    </button>
 
                                 </div>
-                                
+
                             </div>
 
                             <div class="flex" style="margin-left: auto;">
@@ -97,7 +102,7 @@
             </umb-editor-container>
 
             <umb-editor-footer>
-                
+
                 <umb-editor-footer-content-left>
 
                     <umb-keyboard-shortcuts-overview
@@ -109,12 +114,13 @@
                 </umb-editor-footer-content-left>
 
             <umb-editor-footer-content-right>
-                
+
                 <umb-button
                     ng-if="model.infiniteMode"
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
index f996e944db..fd5cfc4e4f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
@@ -1,23 +1,31 @@
 (function () {
     "use strict";
 
-    function UserGroupEditController($scope, $location, $routeParams, userGroupsResource, localizationService, contentEditingHelper, editorService) {
+    function UserGroupEditController($scope, $location, $routeParams, userGroupsResource, localizationService, contentEditingHelper, editorService, overlayService) {
+
+        var infiniteMode = $scope.model && $scope.model.infiniteMode;
+        var id = infiniteMode ? $scope.model.id : $routeParams.id;
+        var create = infiniteMode ? $scope.model.create : $routeParams.create;
 
         var vm = this;
         var contentPickerOpen = false;
 
         vm.page = {};
         vm.page.rootIcon = "icon-folder";
+        vm.page.submitButtonLabelKey = infiniteMode ? "buttons_saveAndClose" : "buttons_save";
+
         vm.userGroup = {};
         vm.labels = {};
-        vm.showBackButton = true;
+        vm.showBackButton = !infiniteMode;
 
         vm.goToPage = goToPage;
         vm.openSectionPicker = openSectionPicker;
         vm.openContentPicker = openContentPicker;
         vm.openMediaPicker = openMediaPicker;
         vm.openUserPicker = openUserPicker;
-        vm.removeSelectedItem = removeSelectedItem;
+        vm.removeSection = removeSection;
+        vm.removeAssignedPermissions = removeAssignedPermissions;
+        vm.removeUser = removeUser;
         vm.clearStartNode = clearStartNode;
         vm.save = save;
         vm.openGranularPermissionsPicker = openGranularPermissionsPicker;
@@ -53,7 +61,7 @@
                 vm.labels.noStartNode = name;
             });
 
-            if ($routeParams.create) {
+            if (create) {
                 // get user group scaffold
                 userGroupsResource.getUserGroupScaffold().then(function (userGroup) {
                     vm.userGroup = userGroup;
@@ -63,7 +71,7 @@
                 });
             } else {
                 // get user group
-                userGroupsResource.getUserGroup($routeParams.id).then(function (userGroup) {
+                userGroupsResource.getUserGroup(id).then(function (userGroup) {
                     vm.userGroup = userGroup;
                     formatGranularPermissionSelection();
                     setSectionIcon(vm.userGroup.sections);
@@ -71,7 +79,6 @@
                     vm.loading = false;
                 });
             }
-
         }
 
         function save() {
@@ -85,11 +92,15 @@
             }).then(function (saved) {
 
                 vm.userGroup = saved;
-                formatGranularPermissionSelection();
-                setSectionIcon(vm.userGroup.sections);
-                makeBreadcrumbs();
-                vm.page.saveButtonState = "success";
 
+                if (infiniteMode) {
+                    $scope.model.submit(vm.userGroup);
+                } else {
+                    formatGranularPermissionSelection();
+                    setSectionIcon(vm.userGroup.sections);
+                    makeBreadcrumbs();
+                    vm.page.saveButtonState = "success";
+                }
             }, function (err) {
                 vm.page.saveButtonState = "error";
             });
@@ -185,7 +196,7 @@
          * however the list to display the permissions isn't via the dictionary way so we need to format it
          */
         function formatGranularPermissionSelection() {
-            angular.forEach(vm.userGroup.assignedPermissions, function (node) {
+            vm.userGroup.assignedPermissions.forEach(function (node) {
                 formatGranularPermissionSelectionForNode(node);
             });
         }
@@ -193,8 +204,8 @@
         function formatGranularPermissionSelectionForNode(node) {
             //the dictionary is assigned via node.permissions we will reformat to node.allowedPermissions
             node.allowedPermissions = [];
-            angular.forEach(node.permissions, function (permissions, key) {
-                angular.forEach(permissions, function (p) {
+            Object.values(node.permissions).forEach(function (permissions) {
+                permissions.forEach(function (p) {
                     if (p.checked) {
                         node.allowedPermissions.push(p);
                     }
@@ -272,10 +283,33 @@
 
         }
 
-        function removeSelectedItem(index, selection) {
-            if (selection && selection.length > 0) {
-                selection.splice(index, 1);
-            }
+        function removeSection(index) {
+            vm.userGroup.sections.splice(index, 1);
+        }
+
+        function removeAssignedPermissions(index) {
+            vm.userGroup.assignedPermissions.splice(index, 1);
+        }
+
+        function removeUser(index) {
+            const dialog = {
+                view: "views/users/views/overlays/remove.html",
+                username: vm.userGroup.users[index].username,
+                userGroupName: vm.userGroup.name.toLowerCase(),
+                submitButtonLabelKey: "defaultdialogs_yesRemove",
+                submitButtonStyle: "danger",
+
+                submit: function () {
+                    vm.userGroup.users.splice(index, 1);
+
+                    overlayService.close();
+                },
+                close: function () {
+                    overlayService.close();
+                }
+            };
+
+            overlayService.open(dialog);
         }
 
         function clearStartNode(type) {
@@ -299,7 +333,7 @@
         }
 
         function setSectionIcon(sections) {
-            angular.forEach(sections, function (section) {
+            sections.forEach(function (section) {
                 section.icon = "icon-section";
             });
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html
index eae6dbd75c..f423d06c3c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/group.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html
@@ -6,14 +6,13 @@
 
         <umb-editor-view ng-if="!vm.loading">
 
-            <umb-editor-header
-                name="vm.userGroup.name"
-                alias="vm.userGroup.alias"
-                alias-locked="vm.userGroup.isSystemUserGroup"
-                icon="vm.userGroup.icon"
-                hide-description="true"
-                on-back="vm.goToPage(vm.breadcrumbs[0])"
-                show-back-button="vm.showBackButton">
+            <umb-editor-header name="vm.userGroup.name"
+                               alias="vm.userGroup.alias"
+                               alias-locked="vm.userGroup.isSystemUserGroup"
+                               icon="vm.userGroup.icon"
+                               hide-description="true"
+                               on-back="vm.goToPage(vm.breadcrumbs[0])"
+                               show-back-button="vm.showBackButton">
             </umb-editor-header>
 
             <umb-editor-container>
@@ -31,13 +30,12 @@
                                 <umb-box-content class="block-form">
 
                                     <umb-control-group style="margin-bottom: 20px;" label="@main_sections" description="@user_sectionsHelp">
-                                        <umb-node-preview
-                                            style="max-width: 100%;"
-                                            ng-repeat="section in vm.userGroup.sections"
-                                            icon="section.icon"
-                                            name="section.name"
-                                            allow-remove="true"
-                                            on-remove="vm.removeSelectedItem($index, vm.userGroup.sections)">
+                                        <umb-node-preview style="max-width: 100%;"
+                                                          ng-repeat="section in vm.userGroup.sections"
+                                                          icon="section.icon"
+                                                          name="section.name"
+                                                          allow-remove="true"
+                                                          on-remove="vm.removeSection($index)">
                                         </umb-node-preview>
 
                                         <button type="button"
@@ -49,15 +47,14 @@
                                     </umb-control-group>
 
                                     <umb-control-group style="margin-bottom: 20px;" label="@user_startnode" description="@user_startnodehelp">
-                                        <umb-node-preview
-                                            ng-if="vm.userGroup.contentStartNode.id"
-                                            style="max-width: 100%;"
-                                            icon="vm.userGroup.contentStartNode.icon"
-                                            name="vm.userGroup.contentStartNode.name"
-                                            allow-edit="true"
-                                            allow-remove="true"
-                                            on-edit="vm.openContentPicker()"
-                                            on-remove="vm.clearStartNode('content')">
+                                        <umb-node-preview ng-if="vm.userGroup.contentStartNode.id"
+                                                          style="max-width: 100%;"
+                                                          icon="vm.userGroup.contentStartNode.icon"
+                                                          name="vm.userGroup.contentStartNode.name"
+                                                          allow-edit="true"
+                                                          allow-remove="true"
+                                                          on-edit="vm.openContentPicker()"
+                                                          on-remove="vm.clearStartNode('content')">
                                         </umb-node-preview>
 
 
@@ -72,16 +69,15 @@
                                     </umb-control-group>
 
                                     <umb-control-group label="@user_mediastartnode" description="@user_mediastartnodehelp">
-                                        
-                                        <umb-node-preview
-                                            ng-if="vm.userGroup.mediaStartNode.id"
-                                            style="max-width: 100%;"
-                                            icon="vm.userGroup.mediaStartNode.icon"
-                                            name="vm.userGroup.mediaStartNode.name"
-                                            allow-edit="true"
-                                            allow-remove="true"
-                                            on-edit="vm.openMediaPicker()"
-                                            on-remove="vm.clearStartNode('media')">
+
+                                        <umb-node-preview ng-if="vm.userGroup.mediaStartNode.id"
+                                                          style="max-width: 100%;"
+                                                          icon="vm.userGroup.mediaStartNode.icon"
+                                                          name="vm.userGroup.mediaStartNode.name"
+                                                          allow-edit="true"
+                                                          allow-remove="true"
+                                                          on-edit="vm.openMediaPicker()"
+                                                          on-remove="vm.clearStartNode('media')">
                                         </umb-node-preview>
 
 
@@ -101,9 +97,8 @@
                             <umb-box>
                                 <umb-box-header title-key="user_permissionsDefault"></umb-box-header>
                                 <umb-box-content class="block-form">
-                                    <umb-control-group
-                                        ng-repeat="(category, permissions) in vm.userGroup.defaultPermissions"
-                                        label="{{ category }}">
+                                    <umb-control-group ng-repeat="(category, permissions) in vm.userGroup.defaultPermissions"
+                                                       label="{{ category }}">
                                         <umb-toggle-group items="permissions"></umb-toggle-group>
                                     </umb-control-group>
                                 </umb-box-content>
@@ -113,17 +108,16 @@
                                 <umb-box-header title-key="user_permissionsGranular"></umb-box-header>
                                 <umb-box-content class="block-form">
                                     <umb-control-group label="Nodes" description="@user_permissionsGranularHelp">
-                                        
-                                        <umb-node-preview
-                                            ng-repeat="node in vm.userGroup.assignedPermissions"
-                                            style="max-width: 100%;"
-                                            icon="node.icon"
-                                            name="node.name"
-                                            permissions="node.allowedPermissions"
-                                            allow-remove="true"
-                                            on-remove="vm.removeSelectedItem($index, vm.userGroup.assignedPermissions)"
-                                            allow-edit="true"
-                                            on-edit="vm.setPermissionsForNode(node)">
+
+                                        <umb-node-preview ng-repeat="node in vm.userGroup.assignedPermissions"
+                                                          style="max-width: 100%;"
+                                                          icon="node.icon"
+                                                          name="node.name"
+                                                          permissions="node.allowedPermissions"
+                                                          allow-remove="true"
+                                                          on-remove="vm.removeAssignedPermissions($index)"
+                                                          allow-edit="true"
+                                                          on-edit="vm.setPermissionsForNode(node)">
                                         </umb-node-preview>
 
                                         <button type="button"
@@ -133,7 +127,7 @@
                                             <localize key="general_add">Add</localize>
                                         </button>
                                     </umb-control-group>
-                                    
+
                                 </umb-box-content>
                             </umb-box>
 
@@ -144,13 +138,12 @@
                             <umb-box>
                                 <umb-box-header title-key="sections_users"></umb-box-header>
                                 <umb-box-content>
-                                    
-                                    <umb-user-preview
-                                        ng-repeat="user in vm.userGroup.users"
-                                        name="user.name"
-                                        avatars="user.avatars"
-                                        allow-remove="true"
-                                        on-remove="vm.removeSelectedItem($index, vm.userGroup.users)">
+
+                                    <umb-user-preview ng-repeat="user in vm.userGroup.users"
+                                                      name="user.name"
+                                                      avatars="user.avatars"
+                                                      allow-remove="true"
+                                                      on-remove="vm.removeUser($index)">
                                     </umb-user-preview>
 
                                     <button type="button"
@@ -175,24 +168,30 @@
 
                 <umb-editor-footer-content-left>
 
-                    <umb-breadcrumbs
-                        ancestors="vm.breadcrumbs"
-                        allow-on-open="true"
-                        on-open="vm.goToPage(ancestor)">
+                    <umb-breadcrumbs ancestors="vm.breadcrumbs"
+                                     allow-on-open="true"
+                                     on-open="vm.goToPage(ancestor)">
                     </umb-breadcrumbs>
 
                 </umb-editor-footer-content-left>
 
                 <umb-editor-footer-content-right>
 
-                    <umb-button
-                        type="button"
-                        action="vm.save()"
-                        state="vm.page.saveButtonState"
-                        button-style="success"
-                        shortcut="ctrl+s"
-                        label="Save"
-                        label-key="buttons_save">
+                    <umb-button ng-if="model.infiniteMode"
+                                type="button"
+                                button-style="link"
+                                label-key="general_close"
+                                shortcut="esc"
+                                action="model.close(model)">
+                    </umb-button>
+
+                    <umb-button type="button"
+                                action="vm.save()"
+                                state="vm.page.saveButtonState"
+                                button-style="success"
+                                shortcut="ctrl+s"
+                                label="Save"
+                                label-key="{{vm.page.submitButtonLabelKey}}">
                     </umb-button>
 
                 </umb-editor-footer-content-right>
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
index 19218d3d08..459014024c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
@@ -1,7 +1,11 @@
 (function () {
     "use strict";
 
-    function UserEditController($scope, eventsService, $q, $location, $routeParams, formHelper, usersResource, userService, contentEditingHelper, localizationService, mediaHelper, Upload, umbRequestHelper, usersHelper, authResource, dateHelper, editorService, overlayService) {
+    function UserEditController($scope, eventsService, $q, $location, $routeParams, formHelper, usersResource,
+        userService, contentEditingHelper, localizationService, mediaHelper, Upload, umbRequestHelper,
+        usersHelper, authResource, dateHelper, editorService, overlayService, externalLoginInfoService) {
+
+        var currentLoggedInUser = null;
 
         var vm = this;
 
@@ -29,6 +33,7 @@
         vm.openUserGroupPicker = openUserGroupPicker;
         vm.openContentPicker = openContentPicker;
         vm.openMediaPicker = openMediaPicker;
+        vm.editSelectedItem = editSelectedItem;
         vm.removeSelectedItem = removeSelectedItem;
         vm.disableUser = disableUser;
         vm.enableUser = enableUser;
@@ -38,10 +43,13 @@
         vm.changeAvatar = changeAvatar;
         vm.clearAvatar = clearAvatar;
         vm.save = save;
+        vm.allowGroupEdit = allowGroupEdit;
 
         vm.changePassword = changePassword;
         vm.toggleChangePassword = toggleChangePassword;
 
+        vm.denyLocalLogin = externalLoginInfoService.hasDenyLocalLogin();
+
         function init() {
 
             vm.loading = true;
@@ -168,7 +176,9 @@
                         extendedSave(saved).then(function (result) {
                             //if all is good, then reset the form
                             formHelper.resetForm({ scope: $scope });
-                        }, Utilities.noop);
+                        }, function () {
+                            formHelper.resetForm({ scope: $scope, hasErrors: true });
+                        });
 
                         vm.user = _.omit(saved, "navigation");
                         //restore
@@ -179,7 +189,7 @@
                         vm.page.saveButtonState = "success";
 
                     }, function (err) {
-
+                        formHelper.resetForm({ scope: $scope, hasErrors: true });
                         contentEditingHelper.handleSaveError({
                             err: err,
                             showNotifications: true
@@ -281,7 +291,7 @@
                 submit: function (model) {
                     // select items
                     if (model.selection) {
-                        angular.forEach(model.selection, function (item) {
+                        model.selection.forEach(function (item) {
                             if (item.id === "-1") {
                                 item.name = vm.labels.contentRoot;
                                 item.icon = "icon-folder";
@@ -310,7 +320,7 @@
                 submit: function (model) {
                     // select items
                     if (model.selection) {
-                        angular.forEach(model.selection, function (item) {
+                        model.selection.forEach(function (item) {
                             if (item.id === "-1") {
                                 item.name = vm.labels.mediaRoot;
                                 item.icon = "icon-folder";
@@ -333,7 +343,7 @@
             var found = false;
             // check if item is already in the selected list
             if (selection.length > 0) {
-                angular.forEach(selection, function (selectedItem) {
+                selection.forEach(function (selectedItem) {
                     if (selectedItem.udi === item.udi) {
                         found = true;
                     }
@@ -345,6 +355,21 @@
             }
         }
 
+        function editSelectedItem(index, selection) {
+            var group = selection[index];
+            const editor = {
+                id: group.id,
+                submit: function (model) {
+                    selection[index] = model;
+                    editorService.close();
+                },
+                close: function () {
+                    editorService.close();
+                }
+            };
+            editorService.userGroupEditor(editor);
+        }
+
         function removeSelectedItem(index, selection) {
             selection.splice(index, 1);
         }
@@ -437,8 +462,7 @@
 
         function performDelete() {
             usersResource.deleteNonLoggedInUser(vm.user.id).then(function (data) {
-                formHelper.showNotifications(data);
-                goToPage(vm.breadcrumbs[0]);
+               goToPage(vm.breadcrumbs[0]);
             }, function (error) {
                 vm.deleteNotLoggedInUserButtonState = "error";
                 formHelper.showNotifications(error.data);
@@ -536,6 +560,8 @@
         function formatDatesToLocal(user) {
             // get current backoffice user and format dates
             userService.getCurrentUser().then(function (currentUser) {
+                currentLoggedInUser = currentUser;
+
                 user.formattedLastLogin = getLocalDate(user.lastLoginDate, currentUser.locale, "LLL");
                 user.formattedLastLockoutDate = getLocalDate(user.lastLockoutDate, currentUser.locale, "LLL");
                 user.formattedCreateDate = getLocalDate(user.createDate, currentUser.locale, "LLL");
@@ -544,6 +570,16 @@
             });
         }
 
+        function allowGroupEdit(group) {
+            if (!currentLoggedInUser) {
+                return false;
+            }
+            if (currentLoggedInUser.userGroups.indexOf(group.alias) === -1 && currentLoggedInUser.userGroups.indexOf("admin") === -1) {
+                return false;
+            }
+            return true;
+        }
+
         init();
     }
     angular.module("umbraco").controller("Umbraco.Editors.Users.UserController", UserEditController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.html b/src/Umbraco.Web.UI.Client/src/views/users/user.html
index 39e0519ad6..a2ec69b757 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.html
@@ -7,6 +7,7 @@
         <umb-editor-view>
 
             <umb-editor-header name="vm.user.name"
+                               name-locked="vm.denyLocalLogin"
                                hide-icon="true"
                                hide-description="true"
                                hide-alias="true"
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
index 31c52a344b..4b81e7c11c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
@@ -123,7 +123,7 @@
         }
 
         function clearSelection() {
-            angular.forEach(vm.userGroups, function (userGroup) {
+            vm.userGroups.forEach(function (userGroup) {
                 userGroup.selected = false;
             });
             vm.selection = [];
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/overlays/remove.html b/src/Umbraco.Web.UI.Client/src/views/users/views/overlays/remove.html
new file mode 100644
index 0000000000..97eb7db0b6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/overlays/remove.html
@@ -0,0 +1,9 @@
+<div>
+
+    <div class="umb-alert umb-alert--warning mb2">
+        <localize key="defaultdialogs_userremovewarning" tokens="[model.username, model.userGroupName]">This will remove the user <strong>{{ model.username }} from the {{ model.userGropName }} group</strong>.</localize>
+    </div>
+
+    <localize key="defaultdialogs_confirmremove">Yes, remove</localize>?
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.controller.js
new file mode 100644
index 0000000000..f1df6c3228
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.controller.js
@@ -0,0 +1,13 @@
+(function () {
+    "use strict";
+
+    function DetailsController($scope, externalLoginInfoService) {
+
+        var vm = this;
+
+        vm.denyLocalLogin = externalLoginInfoService.hasDenyLocalLogin();
+    }
+
+    angular.module("umbraco").controller("Umbraco.Editors.Users.DetailsController", DetailsController);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html b/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
index bb3efaede2..5a4181c9f3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
@@ -1,4 +1,4 @@
-<div class="umb-user-details-details">
+<div ng-controller="Umbraco.Editors.Users.DetailsController as vm" class="umb-user-details-details">
 
     <div class="umb-user-details-details__main-content">
 
@@ -10,22 +10,31 @@
 
                     <umb-control-group label="@general_email" required="true" alias="email">
 
-                        <input type="email"
-                               localize="placeholder"
-                               placeholder="@placeholders_enteremail"
-                               class="input-block-level"
-                               ng-model="model.user.email"
-                               umb-auto-focus
-                               name="email"
-                               id="email"
-                               val-email
-                               ng-required="true"
-                               val-server-field="Email" />
-                        <span ng-messages="userProfileForm.email.$error" show-validation-on-submit>
-                            <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
-                            <span class="help-inline" ng-message="valEmail"><localize key="validation_invalidEmail">Invalid email</localize></span>
-                            <span class="help-inline" ng-message="valServerField">{{userProfileForm.email.errorMsg}}</span>
-                        </span>
+                        <div ng-if="!vm.denyLocalLogin">
+                            <input type="email"
+                                   localize="placeholder"
+                                   placeholder="@placeholders_enteremail"
+                                   class="input-block-level"
+                                   ng-model="model.user.email"
+                                   umb-auto-focus
+                                   name="email"
+                                   id="email"
+                                   val-email
+                                   ng-required="true"
+                                   val-server-field="Email" />
+                            <span ng-messages="userProfileForm.email.$error" show-validation-on-submit>
+                                <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
+                                <span class="help-inline" ng-message="valEmail"><localize key="validation_invalidEmail">Invalid email</localize></span>
+                                <span class="help-inline" ng-message="valServerField">{{userProfileForm.email.errorMsg}}</span>
+                            </span>
+                        </div>
+                        <div ng-if="vm.denyLocalLogin">
+                            <input type="email"
+                                   class="input-block-level"
+                                   ng-model="model.user.email"
+                                   id="email"
+                                   disabled />
+                        </div>
                     </umb-control-group>
 
                     <umb-control-group label="@general_username" ng-if="!model.usernameIsEmail" required="true">
@@ -72,6 +81,8 @@
                                             content-start-node="userGroup.contentStartNode"
                                             media-start-node="userGroup.mediaStartNode"
                                             allow-remove="true"
+                                            allow-edit="model.allowGroupEdit(userGroup)"
+                                            on-edit="model.editSelectedItem($index, model.user.userGroups)"
                                             on-remove="model.removeSelectedItem($index, model.user.userGroups)">
                     </umb-user-group-preview>
 
@@ -252,7 +263,7 @@
                                     size="s">
                         </umb-button>
                     </div>
-                    <div>
+                    <div ng-if="!vm.denyLocalLogin">
 
                         <umb-button type="button" ng-if="model.user.userDisplayState.key !== 'Invited'"
                                     button-style="[action,block]"
@@ -274,7 +285,7 @@
                         </umb-button>
                     </div>
 
-                    <div ng-if="model.user.resetPasswordValue">
+                    <div ng-if="!vm.denyLocalLogin && model.user.resetPasswordValue">
                         <p><br />Password reset to value: <strong>{{model.user.resetPasswordValue}}</strong></p>
                     </div>
 
@@ -286,7 +297,7 @@
                         <localize key="general_status">Status</localize>:
                     </div>
                     <div class="umb-user-details-details__information-item-content">
-                        <umb-badge style="margin-top: 4px;" size="s" color="{{model.user.userDisplayState.color}}">
+                        <umb-badge style="margin-top: 4px;" size="xs" color="{{model.user.userDisplayState.color}}">
                             {{model.user.userDisplayState.name}}
                         </umb-badge>
                     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index 2217628872..70102c9418 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -4,7 +4,7 @@
     function UsersController($scope, $timeout, $location, $routeParams, usersResource,
         userGroupsResource, userService, localizationService,
         usersHelper, formHelper, dateHelper, editorService,
-        listViewHelper) {
+        listViewHelper, externalLoginInfoService) {
 
         var vm = this;
 
@@ -69,32 +69,43 @@
         // Get last selected layout for "users" (defaults to first layout = card layout)
         vm.activeLayout = listViewHelper.getLayout("users", vm.layouts);
 
+        vm.denyLocalLogin = externalLoginInfoService.hasDenyLocalLogin();
+
+        // returns the object representing the user create button, returns null if deny local login is true
+        function getCreateUserButton() {
+            if (!vm.denyLocalLogin) {
+                return {
+                    type: "button",
+                    labelKey: "user_createUser",
+                    handler: function () {
+                        vm.setUsersViewState('createUser');
+                    }
+                };
+            }
+            return null;
+        }
+
+        // No default buttons with denyLocalLogin
         // Don't show the invite button if no email is configured
         if (Umbraco.Sys.ServerVariables.umbracoSettings.showUserInvite) {
             vm.defaultButton = {
+                type: "button",
                 labelKey: "user_inviteUser",
                 handler: function () {
                     vm.setUsersViewState('inviteUser');
                 }
             };
-            vm.subButtons = [
-                {
-                    labelKey: "user_createUser",
-                    handler: function () {
-                        vm.setUsersViewState('createUser');
-                    }
-                }
-            ];
+            var createUserBtn = getCreateUserButton();
+            if (createUserBtn) {
+                vm.subButtons = [createUserBtn];
+            }
         }
         else {
-            vm.defaultButton = {
-                labelKey: "user_createUser",
-                handler: function () {
-                    vm.setUsersViewState('createUser');
-                }
-            };
+            vm.defaultButton = getCreateUserButton();
         }
 
+            
+
         vm.toggleFilter = toggleFilter;
         vm.setUsersViewState = setUsersViewState;
         vm.selectLayout = selectLayout;
@@ -274,7 +285,7 @@
         }
 
         function clearSelection() {
-            angular.forEach(vm.users, function (user) {
+            vm.users.forEach(function (user) {
                 user.selected = false;
             });
             vm.selection = [];
@@ -305,7 +316,7 @@
             vm.disableUserButtonState = "busy";
             usersResource.disableUsers(vm.selection).then(function (data) {
                 // update userState
-                angular.forEach(vm.selection, function (userId) {
+                vm.selection.forEach(function (userId) {
                     var user = getUserFromArrayById(userId, vm.users);
                     if (user) {
                         user.userState = 1;
@@ -326,7 +337,7 @@
             vm.enableUserButtonState = "busy";
             usersResource.enableUsers(vm.selection).then(function (data) {
                 // update userState
-                angular.forEach(vm.selection, function (userId) {
+                vm.selection.forEach(function (userId) {
                     var user = getUserFromArrayById(userId, vm.users);
                     if (user) {
                         user.userState = 0;
@@ -345,7 +356,7 @@
             vm.unlockUserButtonState = "busy";
             usersResource.unlockUsers(vm.selection).then(function (data) {
                 // update userState
-                angular.forEach(vm.selection, function (userId) {
+                vm.selection.forEach(function (userId) {
                     var user = getUserFromArrayById(userId, vm.users);
                     if (user) {
                         user.userState = 0;
@@ -423,14 +434,14 @@
         function selectAll() {
             if (areAllSelected()) {
                 vm.selection = [];
-                angular.forEach(vm.users, function (user) {
+                vm.users.forEach(function (user) {
                     user.selected = false;
                 });
             } else {
                 // clear selection so we don't add the same user twice
                 vm.selection = [];
                 // select all users
-                angular.forEach(vm.users, function (user) {
+                vm.users.forEach(function (user) {
                     // prevent the current user to be selected
                     if (!user.isCurrentUser) {
                         user.selected = true;
@@ -470,7 +481,7 @@
         function getFilterName(array) {
             var name = vm.labels.all;
             var found = false;
-            angular.forEach(array, function (item) {
+            array.forEach(function (item) {
                 if (item.selected) {
                     if (!found) {
                         name = item.name
@@ -491,7 +502,7 @@
 
             //If the selection is "ALL" then we need to unselect everything else since this is an 'odd' filter
             if (userState.key === "All") {
-                angular.forEach(vm.userStatesFilter, function (i) {
+                vm.userStatesFilter.forEach(function (i) {
                     i.selected = false;
                 });
                 //we can't unselect All
@@ -500,7 +511,7 @@
                 vm.usersOptions.userStates = [];
             }
             else {
-                angular.forEach(vm.userStatesFilter, function (i) {
+                vm.userStatesFilter.forEach(function (i) {
                     if (i.key === "All") {
                         i.selected = false;
                     }
@@ -715,13 +726,13 @@
         }
 
         function setUserDisplayState(users) {
-            angular.forEach(users, function (user) {
+            users.forEach(function (user) {
                 user.userDisplayState = usersHelper.getUserStateFromValue(user.userState);
             });
         }
 
         function formatDates(users) {
-            angular.forEach(users, function (user) {
+            users.forEach(function (user) {
                 if (user.lastLoginDate) {
                     var dateVal;
                     var serverOffset = Umbraco.Sys.ServerVariables.application.serverTimeOffset;
@@ -752,7 +763,7 @@
 
             var firstSelectedUserGroups;
 
-            angular.forEach(users, function (user) {
+            users.forEach(function (user) {
 
                 if (!user.selected) {
                     return;
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index a0098d411c..57c87807fc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -103,58 +103,72 @@
         </umb-editor-sub-header>
 
         <!-- Filters -->
-        <div style="margin-bottom: 20px;" class="flex items-center">
+        <div class="flex items-center mb3">
 
             <div style="font-size: 16px;">
                 <span class="bold"><localize key="sections_users">Users</localize></span> <span ng-if="vm.usersOptions.totalItems">({{vm.usersOptions.totalItems}})</span>
             </div>
 
-            <div class="flex" style="margin-left: auto;">
-
+            <div class="flex ml-auto">
                 <!-- State filter -->
-                <div style="position: relative;" ng-if="vm.userStatesFilter.length > 0">
-                    <a class="btn btn-link dropdown-toggle flex" href="" ng-click="vm.toggleFilter('state')">
+                <div class="umb-filter" ng-if="vm.userStatesFilter.length > 0">
+                    <button type="button" class="btn btn-link dropdown-toggle umb-filter__toggle" ng-click="vm.toggleFilter('state')">
                         <span><localize key="general_status">Status</localize>:</span>
-                        <span class="bold truncate dib" style="margin-left: 5px; margin-right: 3px; max-width: 150px;">{{ vm.getFilterName(vm.userStatesFilter) }}</span>
-                        <span class="caret"></span>
-                    </a>
+                        <span class="bold truncate dib umb-filter__label">{{ vm.getFilterName(vm.userStatesFilter) }}</span>
+                        <span class="caret" aria-hidden="true"></span>
+                    </button>
                     <umb-dropdown class="pull-right" ng-if="vm.page.showStatusFilter" on-close="vm.page.showStatusFilter = false;">
                         <umb-dropdown-item ng-repeat="userState in vm.userStatesFilter | filter:{ key: '!All'}" ng-show="userState.count > 0" style="padding: 8px 20px 8px 16px;">
-                            <umb-checkbox model="userState.selected"
-                                          on-change="vm.setUserStatesFilter(userState)"
-                                          text="{{ userState.name }} ({{userState.count}})">
-                            </umb-checkbox>
+                            <div class="flex items-center">
+                                <umb-checkbox input-id="userstate-{{$index}}"
+                                              name="userstate"
+                                              model="userState.selected"
+                                              on-change="vm.setUserStatesFilter(userState)">
+                                </umb-checkbox>
+                                <label for="userstate-{{$index}}">
+                                    <umb-badge size="s" color="{{userState.color}}">{{userState.name}} <span class="ml1 umb-badge__count">{{userState.count}}</span></umb-badge>
+                                </label>
+                            </div>
                         </umb-dropdown-item>
                     </umb-dropdown>
                 </div>
 
                 <!-- Groups filter -->
-                <div style="position: relative;">
-                    <a class="btn btn-link dropdown-toggle flex" href="" ng-click="vm.toggleFilter('group')">
-                        <span><localize key="general_groups"></localize>:</span>
-                        <span class="bold truncate dib" style="margin-left: 5px; margin-right: 3px; max-width: 150px;">{{ vm.getFilterName(vm.userGroups) }}</span>
-                        <span class="caret"></span>
-                    </a>
+                <div class="umb-filter">
+                    <button type="button" class="btn btn-link dropdown-toggle umb-filter__toggle" ng-click="vm.toggleFilter('group')">
+                        <span><localize key="general_groups">Groups</localize>:</span>
+                        <span class="bold truncate dib umb-filter__label">{{ vm.getFilterName(vm.userGroups) }}</span>
+                        <span class="caret" aria-hidden="true"></span>
+                    </button>
                     <umb-dropdown class="pull-right" ng-if="vm.page.showGroupFilter" on-close="vm.page.showGroupFilter = false;">
                         <umb-dropdown-item ng-repeat="userGroup in vm.userGroups" style="padding: 8px 20px 8px 16px;">
-                            <umb-checkbox model="userGroup.selected"
-                                          on-change="vm.setUserGroupFilter(userGroup)"
-                                          text="{{ userGroup.name }}">
-                            </umb-checkbox>
+                            <div class="flex items-center">
+                                <umb-checkbox input-id="usergroup-{{$index}}"
+                                              name="usergroup"
+                                              model="userGroup.selected"
+                                              on-change="vm.setUserGroupFilter(userGroup)">
+                                </umb-checkbox>
+                                <label for="usergroup-{{$index}}">
+                                    <span class="flex items-center">
+                                        <i class="{{userGroup.icon}}" aria-hidden="true"></i>
+                                        <span class="ml1">{{userGroup.name}}</span>
+                                    </span>
+                                </label>
+                            </div>
                         </umb-dropdown-item>
                     </umb-dropdown>
                 </div>
 
                 <!-- Order By -->
-                <div style="position: relative;">
-                    <a class="btn btn-link dropdown-toggle flex" href="" ng-click="vm.toggleFilter('orderBy')">
+                <div class="umb-filter">
+                    <button type="button" class="btn btn-link dropdown-toggle umb-filter__toggle" ng-click="vm.toggleFilter('orderBy')">
                         <span><localize key="general_orderBy">Order by</localize>:</span>
-                        <span class="bold" style="margin-left: 2px;">{{ vm.getSortLabel(vm.usersOptions.orderBy, vm.usersOptions.orderDirection) }} </span>
-                        <span class="caret"></span>
-                    </a>
+                        <span class="bold truncate dib umb-filter__label">{{ vm.getSortLabel(vm.usersOptions.orderBy, vm.usersOptions.orderDirection) }} </span>
+                        <span class="caret" aria-hidden="true"></span>
+                    </button>
                     <umb-dropdown class="pull-right" ng-if="vm.page.showOrderByFilter" on-close="vm.page.showOrderByFilter = false;" umb-keyboard-list>
                         <umb-dropdown-item ng-repeat="sortData in vm.userSortData">
-                            <a href="#" ng-click="vm.setOrderByFilter(sortData.key, sortData.direction)" prevent-default>{{sortData.label}}</a>
+                            <button type="button" ng-click="vm.setOrderByFilter(sortData.key, sortData.direction)">{{sortData.label}}</button>
                         </umb-dropdown-item>
                     </umb-dropdown>
                 </div>
@@ -211,9 +225,9 @@
                 <div class="umb-table-head">
                     <div class="umb-table-row">
                         <div class="umb-table-cell umb-user-table-col-avatar not-fixed" style="width: 70px; padding:10px 15px;">
-                            <a href="" style="text-decoration: none;" ng-click="vm.selectAll()">
+                            <button type="button" class="btn-reset umb-checkmark__action" style="outline: none;" ng-click="vm.selectAll()">
                                 <umb-checkmark checked="vm.areAllSelected()" size="xs"></umb-checkmark>
-                            </a>
+                            </button>
                         </div>
                         <div class="umb-table-cell umb-table__name"><localize key="general_name">Name</localize></div>
                         <div class="umb-table-cell"><localize key="user_usergroup">User group</localize></div>
@@ -347,9 +361,9 @@
                                 on-remove="vm.removeSelectedUserGroup($index, vm.newUser.userGroups)">
                             </umb-user-group-preview>
 
-                            <a href="" style="max-width: 100%;" class="umb-node-preview-add" ng-click="vm.openUserGroupPicker($event)" prevent-default>
+                            <button type="button" style="max-width: 100%;" class="btn-reset umb-node-preview-add" ng-click="vm.openUserGroupPicker($event)">
                                 <localize key="general_add">Add</localize>
-                            </a>
+                            </button>
 
                             <input type="hidden" ng-model="vm.newUser.userGroupsValidation" ng-required="!vm.newUser.userGroups.length" />
 
@@ -502,7 +516,7 @@
                     </umb-checkmark>
                     <h3 class="bold" style="margin: 0 0 0 10px;">
                         {{vm.newUser.name | umbWordLimit:1}}
-                        <localize key="user_userInvited">has been created</localize>
+                        <localize key="user_userInvited">has been invited</localize>
                     </h3>
                 </div>
 
@@ -517,6 +531,7 @@
                         size="m">
                     </umb-button>
                     <umb-button
+                        ng-if="vm.newUser.id"
                         type="button"
                         button-style="action"
                         label-key="user_goToProfile"
diff --git a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
new file mode 100644
index 0000000000..d6e84e7ef3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
@@ -0,0 +1,227 @@
+
+/*********************************************************************************************************/
+/* website preview */
+/*********************************************************************************************************/
+
+(function() {
+
+
+    if ( window.location !== window.parent.location ) {
+        //we are in an iFrame, so lets skip the dialog.
+        return;
+    }
+
+    const scriptElement = document.currentScript;
+
+    function setCookie(cname, cvalue, exminutes) {
+        var d = new Date();
+        d.setTime(d.getTime() + (exminutes * 60 * 1000));
+        document.cookie = cname + "=" + cvalue + ";expires="+d.toUTCString() + ";path=/";
+    }
+
+    function getCookie(cname) {
+        var name = cname + "=";
+        var ca = document.cookie.split(";");
+        for(var i = 0; i < ca.length; i++) {
+            var c = ca[i];
+            while (c.charAt(0) == " ") {
+                c = c.substring(1);
+            }
+            if (c.indexOf(name) == 0) {
+                return c.substring(name.length, c.length);
+            }
+        }
+        return null;
+    }
+
+
+    function beforeUnloadHandler(e) {
+        endPreviewSession();
+    }
+    window.addEventListener("beforeunload", beforeUnloadHandler, false);
+
+    function startPreviewSession() {
+        // lets registrer this preview session.
+        var amountOfPreviewSessions = Math.max(localStorage.getItem('UmbPreviewSessionAmount') || 0, 0);
+        amountOfPreviewSessions++;
+        localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
+    }
+    function resetPreviewSessions() {
+        localStorage.setItem('UmbPreviewSessionAmount', 0);
+    }
+    function endPreviewSession() {
+        var amountOfPreviewSessions = localStorage.getItem('UmbPreviewSessionAmount') || 0;
+        amountOfPreviewSessions--;
+        localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
+
+        if(amountOfPreviewSessions <= 0) {
+            // We are good to secretly end preview mode.
+            navigator.sendBeacon(scriptElement.getAttribute("data-umbraco-path")+"/preview/end");
+        }
+    }
+    startPreviewSession();
+
+    function endPreviewMode() {
+        resetPreviewSessions();
+        window.top.location.href = scriptElement.getAttribute("data-umbraco-path")+"/preview/end?redir=" + encodeURIComponent(window.location.pathname+window.location.search);
+    }
+    function continuePreviewMode(minutsToExpire) {
+        setCookie("UMB-WEBSITE-PREVIEW-ACCEPT", "true", minutsToExpire || 4);
+    }
+
+    var user = getCookie("UMB-WEBSITE-PREVIEW-ACCEPT");
+    if (user != "true") {
+        askToViewPublishedVersion();
+    } else {
+        continuePreviewMode();
+    }
+
+    function askToViewPublishedVersion() {
+
+        scriptElement.getAttribute("data-umbraco-path");
+
+        const request = new XMLHttpRequest();
+        request.open("GET", scriptElement.getAttribute("data-umbraco-path") + "/LocalizedText");
+        request.send();
+
+        request.onreadystatechange = (e) => {
+            if (request.readyState == 4 && request.status == 200) {
+                const jsonLocalization = JSON.parse(request.responseText);
+                createAskUserAboutVersionDialog(jsonLocalization);
+            }
+        }
+
+    }
+    function createAskUserAboutVersionDialog(jsonLocalization) {
+
+        const localizeVarsFallback = {
+            "viewPublishedContentHeadline": "Preview content?",
+            "viewPublishedContentDescription":"You have ended preview mode, do you want to continue previewing this content?",
+            "viewPublishedContentAcceptButton":"You have ended preview mode, do you want to continue previewing this content?",
+            "viewPublishedContentDeclineButton":"Preview"
+        };
+
+        const umbLocalizedVars = jsonLocalization || {};
+        umbLocalizedVars.preview = Object.assign(localizeVarsFallback, jsonLocalization.preview);
+
+
+
+        // This modal is also used in preview.js
+        var modelStyles = `
+            /* Webfont: LatoLatin-Bold */
+            @font-face {
+                font-family: 'Lato';
+                src: url('https://fonts.googleapis.com/css2?family=Lato:wght@700&display=swap');
+                font-style: normal;
+                font-weight: 700;
+                font-display: swap;
+                text-rendering: optimizeLegibility;
+            }
+
+            .umbraco-preview-dialog {
+                position: fixed;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                z-index: 99999999;
+                top:0;
+                bottom:0;
+                left:0;
+                right:0;
+                overflow: auto;
+                background-color: rgba(0,0,0,0.6);
+            }
+
+            .umbraco-preview-dialog__modal {
+                background-color: #fff;
+                border-radius: 6px;
+                box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+                margin: auto;
+                padding: 30px 40px;
+                width: 100%;
+                max-width: 540px;
+                font-family: Lato,Helvetica Neue,Helvetica,Arial,sans-serif;
+                font-size: 15px;
+                line-height: 1.5;
+            }
+
+            .umbraco-preview-dialog__headline {
+                font-weight: 700;
+                font-size: 22px;
+                color: #1b264f;
+                margin-top:10px;
+                margin-bottom:20px;
+            }
+            .umbraco-preview-dialog__question {
+                margin-bottom:30px;
+            }
+            .umbraco-preview-dialog__modal > button {
+                display: inline-block;
+                cursor: pointer;
+                padding: 8px 18px;
+                text-align: center;
+                vertical-align: middle;
+                border-radius: 3px;
+                border:none;
+                font-family: inherit;
+                font-weight: 700;
+                font-size: 15px;
+                float:right;
+                margin-left:10px;
+
+                color: #1b264f;
+                background-color: #f6f1ef;
+            }
+            .umbraco-preview-dialog__modal > button:hover {
+                color: #2152a3;
+                background-color: #f6f1ef;
+            }
+            .umbraco-preview-dialog__modal > button.umbraco-preview-dialog__continue {
+                color: #fff;
+                background-color: #2bc37c;
+            }
+            .umbraco-preview-dialog__modal > button.umbraco-preview-dialog__continue:hover {
+                background-color: #39d38b;
+            }
+        `;
+
+        var bodyEl = document.getElementsByTagName("BODY")[0];
+
+        var fragment = document.createElement("div");
+        var shadowRoot = fragment.attachShadow({ mode: 'open' });
+
+        var style = document.createElement("style");
+        style.innerHTML = modelStyles;
+        shadowRoot.appendChild(style);
+
+        var con = document.createElement("div");
+        con.className = "umbraco-preview-dialog";
+        shadowRoot.appendChild(con);
+
+        var modal = document.createElement("div");
+        modal.className = "umbraco-preview-dialog__modal";
+        modal.innerHTML = `<div class="umbraco-preview-dialog__headline">${umbLocalizedVars.preview.viewPublishedContentHeadline}</div>
+            <div class="umbraco-preview-dialog__question">${umbLocalizedVars.preview.viewPublishedContentDescription}</div>`;
+        con.appendChild(modal);
+
+        var continueButton = document.createElement("button");
+        continueButton.type = "button";
+        continueButton.className = "umbraco-preview-dialog__continue";
+        continueButton.innerHTML = umbLocalizedVars.preview.viewPublishedContentAcceptButton;
+        continueButton.addEventListener("click", endPreviewMode);
+        modal.appendChild(continueButton);
+
+        var exitButton = document.createElement("button");
+        exitButton.type = "button";
+        exitButton.innerHTML = umbLocalizedVars.preview.viewPublishedContentDeclineButton;
+        exitButton.addEventListener("click", function() {
+            bodyEl.removeChild(fragment);
+            continuePreviewMode(5);
+        });
+        modal.appendChild(exitButton);
+
+        bodyEl.appendChild(fragment);
+        continueButton.focus();
+    }
+
+})();
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 5883f59be8..fd84c7d3f4 100644
--- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
+++ b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
@@ -1,3 +1,4 @@
+const jsdom = require("jsdom");
 module.exports = function (config) {
 
     config.set({
@@ -11,7 +12,6 @@ module.exports = function (config) {
         files: [
 
             // Jasmine plugins
-            'node_modules/jasmine-promise-matchers/dist/jasmine-promise-matchers.js',
             
             //libraries
             'node_modules/jquery/dist/jquery.min.js',
@@ -101,15 +101,17 @@ module.exports = function (config) {
         // - PhantomJS
         // - IE (only Windows)
         // CLI --browsers Chrome,Firefox,Safari
-        browsers: ['ChromeHeadless'],
-
-        customLaunchers: {
-            ChromeDebugging: {
-                base: 'Chrome',
-                flags: ['--remote-debugging-port=9333']
-            }
-        },
-
+        browsers: ['jsdom'],
+		
+		// Configure a user agent so the log file gets generated properly
+		jsdomLauncher: {
+		  jsdom: {
+			resources: new jsdom.ResourceLoader({
+			  userAgent: "umbraco-test-suite",
+			})
+		  }
+		},
+		
         // allow waiting a bit longer, some machines require this
 
         browserNoActivityTimeout: 100000,     // default 10,000ms
@@ -124,11 +126,9 @@ module.exports = function (config) {
 
         plugins: [
             require('karma-jasmine'),
-            require('karma-phantomjs-launcher'),
-            require('karma-chrome-launcher'),
+            require('karma-jsdom-launcher'),
             require('karma-junit-reporter'),
             require('karma-spec-reporter')
-
         ],
 
         // the default configuration
diff --git a/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js b/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js
index 31310e1c46..c9dde30c4f 100644
--- a/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js
+++ b/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js
@@ -171,7 +171,7 @@ angular.mock.$Browser.prototype = {
                 }
             }
         } else {
-            if (!angular.equals(this.cookieHash, this.lastCookieHash)) {
+            if (!Utilities.equals(this.cookieHash, this.lastCookieHash)) {
                 this.lastCookieHash = Utilities.copy(this.cookieHash);
                 this.cookieHash = Utilities.copy(this.cookieHash);
             }
@@ -699,7 +699,7 @@ angular.mock.dump = function (object) {
             });
             out = '[ ' + out.join(', ') + ' ]';
         } else if (Utilities.isObject(object)) {
-            if (angular.isFunction(object.$eval) && angular.isFunction(object.$apply)) {
+            if (Utilities.isFunction(object.$eval) && Utilities.isFunction(object.$apply)) {
                 out = serializeScope(object);
             } else if (object instanceof Error) {
                 out = object.stack || ('' + object.name + ': ' + object.message);
@@ -927,7 +927,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
         responsesPush = angular.bind(responses, responses.push);
 
     function createResponse(status, data, headers) {
-        if (angular.isFunction(status)) return status;
+        if (Utilities.isFunction(status)) return status;
 
         return function () {
             return angular.isNumber(status)
@@ -943,7 +943,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
             wasExpected = false;
 
         function prettyPrint(data) {
-            return (Utilities.isString(data) || angular.isFunction(data) || data instanceof RegExp)
+            return (Utilities.isString(data) || Utilities.isFunction(data) || data instanceof RegExp)
                 ? data
                 : angular.toJson(data);
         }
@@ -1372,20 +1372,20 @@ function MockHttpExpectation(method, url, data, headers) {
 
     this.matchUrl = function (u) {
         if (!url) return true;
-        if (angular.isFunction(url.test)) return url.test(u);
+        if (Utilities.isFunction(url.test)) return url.test(u);
         return url == u;
     };
 
     this.matchHeaders = function (h) {
-        if (angular.isUndefined(headers)) return true;
-        if (angular.isFunction(headers)) return headers(h);
-        return angular.equals(headers, h);
+        if (Utilities.isUndefined(headers)) return true;
+        if (Utilities.isFunction(headers)) return headers(h);
+        return Utilities.equals(headers, h);
     };
 
     this.matchData = function (d) {
-        if (angular.isUndefined(data)) return true;
-        if (data && angular.isFunction(data.test)) return data.test(d);
-        if (data && !Utilities.isString(data)) return angular.toJson(data) == d;
+        if (Utilities.isUndefined(data)) return true;
+        if (data && Utilities.isFunction(data.test)) return data.test(d);
+        if (data && !Utilities.isString(data)) return Utilities.toJson(data) == d;
         return data == d;
     };
 
@@ -1484,7 +1484,7 @@ angular.mock.$TimeoutDecorator = function ($delegate, $browser) {
 
     function formatPendingTasksAsString(tasks) {
         var result = [];
-        angular.forEach(tasks, function (task) {
+        Utilities.forEach(tasks, function (task) {
             result.push('{id: ' + task.id + ', ' + 'time: ' + task.time + '}');
         });
 
diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js
index 49d8914ac6..c111421d75 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js
@@ -5,11 +5,11 @@ describe('Content picker controller tests', function () {
     beforeEach(module('umbraco'));
 
     //inject the contentMocks service
-    beforeEach(inject(function ($rootScope, $controller, angularHelper, $httpBackend, entityMocks, mocksUtils, localizationMocks) {
+    beforeEach(inject(function ($rootScope, $controller, angularHelper, $httpBackend, entityMocks, mocksUtils, localizationMocks, userMocks) {
 
         //for these tests we don't want any authorization to occur
-        mocksUtils.disableAuth();
-
+        mocksUtils.setAuth();
+		
         httpBackend = $httpBackend;
         scope = $rootScope.$new();
 
@@ -34,6 +34,7 @@ describe('Content picker controller tests', function () {
         //see /mocks/content.mocks.js for how its setup
         entityMocks.register();
         localizationMocks.register();
+        userMocks.register();
 
         controller = $controller('Umbraco.PropertyEditors.ContentPickerController', {
             $scope: scope,
@@ -42,7 +43,7 @@ describe('Content picker controller tests', function () {
 
         //For controller tests its easiest to have the digest and flush happen here
         //since its intially always the same $http calls made
-
+		
         //scope.$digest resolves the promise against the httpbackend
         scope.$digest();
 
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/filters/truncate-filters.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/filters/truncate-filters.spec.js
index 1e9ea2ea46..64a984b499 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/common/filters/truncate-filters.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/common/filters/truncate-filters.spec.js
@@ -53,7 +53,6 @@
         testCases.forEach(function(test){
             
             it('Expects \'' + test.input + '\' to be truncated as \''+ test.expectedResult + '\', when noOfChars=' + test.noOfChars + ', and appendDots=' + test.appendDots, function() {
-                console.log($truncate(test.input, test.noOfChars, test.appendDots));
                 expect($truncate(test.input, test.noOfChars, test.appendDots)).toBe(test.expectedResult);
             });
         });
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/block-editor-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/block-editor-service.spec.js
new file mode 100644
index 0000000000..3c0cad32dd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/block-editor-service.spec.js
@@ -0,0 +1,422 @@
+describe('blockEditorService tests', function () {
+
+    var contentKey = "6A1F5BDD-67EF-4173-B061-D6348ED07094";
+    var contentUdi = "umb://element/6A1F5BDD67EF4173B061D6348ED07094";
+    var settingsKey = "2AF42343-C8A2-400D-BA43-4818C2B3CDC5";
+    var settingsUdi = "umb://element/2AF42343C8A2400DBA434818C2B3CDC5";
+
+    var blockEditorService, contentResource, $rootScope, $scope, $q, localizationService, $timeout;
+
+    beforeEach(module('umbraco.services'));
+    beforeEach(module('umbraco.resources'));
+    beforeEach(module('umbraco.mocks'));
+    beforeEach(module('umbraco'));
+
+    beforeEach(inject(function ($injector, mocksUtils, _$rootScope_, _$q_, _$timeout_) {
+
+        mocksUtils.disableAuth();
+
+        $rootScope = _$rootScope_;
+        $scope = $rootScope.$new();
+        $q = _$q_;
+        $timeout = _$timeout_;
+
+        contentResource = $injector.get("contentResource");
+        spyOn(contentResource, "getScaffoldByKey").and.callFake(
+            function () {
+                var scaffold = mocksUtils.getMockVariantContent(1234, contentKey, contentUdi);
+                return $q.resolve(scaffold);
+            }
+        );
+        // this seems to be required because of the poor promise implementation in localizationService (see TODO in that service)
+        localizationService = $injector.get("localizationService");
+        spyOn(localizationService, "localize").and.callFake(
+            function () {
+                return $q.resolve("Localized test text");
+            }
+        );
+
+        blockEditorService = $injector.get('blockEditorService');
+
+    }));
+
+
+    var blockConfigurationMock = { contentElementTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB", label: "Test label", settingsElementTypeKey: null, view: "/testview.html" };
+
+    var propertyModelMock = {
+        layout: {
+            "Umbraco.TestBlockEditor": [
+                {
+                    contentUdi: contentUdi
+                }
+            ]
+        },
+        contentData: [
+            {
+                udi: contentUdi,
+                contentTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB",
+                testproperty: "myTestValue"
+            }
+        ]
+    };
+
+    var blockWithSettingsConfigurationMock = { contentElementTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB", label: "Test label", settingsElementTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB", view: "/testview.html" };
+    var propertyModelWithSettingsMock = {
+        layout: {
+            "Umbraco.TestBlockEditor": [
+                {
+                    contentUdi: contentUdi,
+                    settingsUdi: settingsUdi
+                }
+            ]
+        },
+        contentData: [
+            {
+                udi: contentUdi,
+                contentTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB",
+                testproperty: "myTestValue"
+            }
+        ],
+        settingsData: [
+            {
+                udi: settingsUdi,
+                contentTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB",
+                testproperty: "myTestValueForSettings"
+            }
+        ]
+    };
+
+    describe('init blockEditorModelObject', function () {
+
+        it('fail if no model value', function () {
+            function createWithNoModelValue() {
+                blockEditorService.createModelObject(null, "Umbraco.TestBlockEditor", [], $scope, $scope);
+            }
+            expect(createWithNoModelValue).toThrow();
+        });
+
+        it('return a object, with methods', function () {
+            var modelObject = blockEditorService.createModelObject({}, "Umbraco.TestBlockEditor", [], $scope, $scope);
+
+            expect(modelObject).not.toBeUndefined();
+            expect(modelObject.load).not.toBeUndefined();
+        });
+
+        it('getBlockConfiguration provide the requested block configurtion', function () {
+            var modelObject = blockEditorService.createModelObject({}, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
+
+            expect(modelObject.getBlockConfiguration(blockConfigurationMock.contentElementTypeKey).label).toBe(blockConfigurationMock.label);
+        });
+
+        it('load provides data for itemPicker', function (done) {
+            var modelObject = blockEditorService.createModelObject({}, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
+
+            modelObject.load().then(() => {
+                try {
+                    var itemPickerOptions = modelObject.getAvailableBlocksForBlockPicker();
+                    expect(itemPickerOptions.length).toBe(1);
+                    expect(itemPickerOptions[0].blockConfigModel.contentElementTypeKey).toBe(blockConfigurationMock.contentElementTypeKey);
+                    done();
+                } catch (e) {
+                    done.fail(e);
+                }
+            });
+
+            $rootScope.$digest();
+            $timeout.flush();
+        });
+
+        it('getLayoutEntry has values', function (done) {
+
+
+            var modelObject = blockEditorService.createModelObject(propertyModelMock, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
+
+            modelObject.load().then(() => {
+
+                try {
+                    var layout = modelObject.getLayout();
+
+                    expect(layout).not.toBeUndefined();
+                    expect(layout.length).toBe(1);
+                    expect(layout[0]).toBe(propertyModelMock.layout["Umbraco.TestBlockEditor"][0]);
+                    expect(layout[0].contentUdi).toBe(propertyModelMock.layout["Umbraco.TestBlockEditor"][0].contentUdi);
+
+                    done();
+                } catch (e) {
+                    done.fail(e);
+                }
+            });
+
+            $rootScope.$digest();
+            $timeout.flush();
+        });
+
+        it('getBlockObject has values', function (done) {
+
+
+            var modelObject = blockEditorService.createModelObject(propertyModelMock, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
+
+            modelObject.load().then(() => {
+
+                try {
+                    var layout = modelObject.getLayout();
+
+                    var blockObject = modelObject.getBlockObject(layout[0]);
+
+                    expect(blockObject).not.toBeUndefined();
+                    expect(blockObject.data.udi).toBe(propertyModelMock.contentData[0].udi);
+                    expect(blockObject.content.variants[0].tabs[0].properties[0].value).toBe(propertyModelMock.contentData[0].testproperty);
+
+                    done();
+                } catch (e) {
+                    done.fail(e);
+                }
+            });
+
+            $rootScope.$digest();
+            $timeout.flush();
+        });
+
+
+        it('getBlockObject syncs primitive values', function (done) {
+
+            var propertyModel = angular.copy(propertyModelMock);
+
+            var modelObject = blockEditorService.createModelObject(propertyModel, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
+
+            modelObject.load().then(() => {
+
+                try {
+                    var layout = modelObject.getLayout();
+
+                    var blockObject = modelObject.getBlockObject(layout[0]);
+
+                    blockObject.content.variants[0].tabs[0].properties[0].value = "anotherTestValue";
+
+                    // invoke angularJS Store.
+                    $timeout(function () {
+                        expect(blockObject.data).toEqual(propertyModel.contentData[0]);
+                        expect(blockObject.data.testproperty).toBe("anotherTestValue");
+                        expect(propertyModel.contentData[0].testproperty).toBe("anotherTestValue");
+
+                        done();
+                    });
+
+                } catch (e) {
+                    done.fail(e);
+                }
+            });
+
+            $rootScope.$digest();
+            $timeout.flush();
+
+        });
+
+
+        it('getBlockObject syncs values of object', function (done) {
+
+            var propertyModel = angular.copy(propertyModelMock);
+
+            var complexValue = { "list": ["A", "B", "C"] };
+            propertyModel.contentData[0].testproperty = complexValue;
+
+
+            var modelObject = blockEditorService.createModelObject(propertyModel, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
+
+            modelObject.load().then(() => {
+
+                try {
+                    var layout = modelObject.getLayout();
+
+                    var blockObject = modelObject.getBlockObject(layout[0]);
+
+                    blockObject.content.variants[0].tabs[0].properties[0].value.list[0] = "AA";
+                    blockObject.content.variants[0].tabs[0].properties[0].value.list.push("D");
+
+                    // invoke angularJS Store.
+                    $timeout(function () {
+                        expect(propertyModel.contentData[0].testproperty.list[0]).toBe("AA");
+                        expect(propertyModel.contentData[0].testproperty.list.length).toBe(4);
+
+                        done();
+                    });
+
+
+                } catch (e) {
+                    done.fail(e);
+                }
+            });
+
+            $rootScope.$digest();
+            $timeout.flush();
+        });
+
+        it('layout is referencing layout of propertyModel', function (done) {
+
+            var propertyModel = angular.copy(propertyModelMock);
+
+            var modelObject = blockEditorService.createModelObject(propertyModel, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
+
+            modelObject.load().then(() => {
+
+                var layout = modelObject.getLayout();
+
+                // remove from layout;
+                layout.splice(0, 1);
+
+                expect(propertyModel.layout["Umbraco.TestBlockEditor"].length).toBe(0);
+                expect(propertyModel.layout["Umbraco.TestBlockEditor"][0]).toBeUndefined();
+
+                done();
+            });
+
+            $rootScope.$digest();
+            $timeout.flush();
+        });
+
+        it('removeDataAndDestroyModel removes data', function (done) {
+
+            var propertyModel = angular.copy(propertyModelMock);
+
+            var modelObject = blockEditorService.createModelObject(propertyModel, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
+
+            modelObject.load().then(() => {
+
+                try {
+                    var layout = modelObject.getLayout();
+
+                    var blockObject = modelObject.getBlockObject(layout[0]);
+
+                    expect(blockObject).not.toBeUndefined();
+                    expect(blockObject).not.toBe(null);
+
+                    // remove from layout;
+                    layout.splice(0, 1);
+
+                    // remove from data;
+                    modelObject.removeDataAndDestroyModel(blockObject);
+
+                    expect(propertyModel.contentData.length).toBe(0);
+                    expect(propertyModel.contentData[0]).toBeUndefined();
+                    expect(propertyModel.layout["Umbraco.TestBlockEditor"].length).toBe(0);
+                    expect(propertyModel.layout["Umbraco.TestBlockEditor"][0]).toBeUndefined();
+
+                    done();
+                } catch (e) {
+                    done.fail(e);
+                }
+            });
+
+            $rootScope.$digest();
+            $timeout.flush();
+        });
+
+        it('getBlockObject of block with settings has values', function (done) {
+
+            var propertyModel = angular.copy(propertyModelWithSettingsMock);
+
+            var modelObject = blockEditorService.createModelObject(propertyModel, "Umbraco.TestBlockEditor", [blockWithSettingsConfigurationMock], $scope, $scope);
+
+            modelObject.load().then(() => {
+
+                var layout = modelObject.getLayout();
+
+                var blockObject = modelObject.getBlockObject(layout[0]);
+
+                expect(blockObject).not.toBeUndefined();
+                expect(blockObject.data.udi).toBe(propertyModel.contentData[0].udi);
+                expect(blockObject.content.variants[0].tabs[0].properties[0].value).toBe(propertyModel.contentData[0].testproperty);
+
+                done();
+            });
+
+            $rootScope.$digest();
+            $timeout.flush();
+        });
+
+
+        it('getBlockObject of block with settings syncs primative values', function (done) {
+
+            var propertyModel = angular.copy(propertyModelWithSettingsMock);
+
+            var modelObject = blockEditorService.createModelObject(propertyModel, "Umbraco.TestBlockEditor", [blockWithSettingsConfigurationMock], $scope, $scope);
+
+            modelObject.load().then(() => {
+
+                var layout = modelObject.getLayout();
+
+                var blockObject = modelObject.getBlockObject(layout[0]);
+
+                blockObject.content.variants[0].tabs[0].properties[0].value = "anotherTestValue";
+                blockObject.settings.variants[0].tabs[0].properties[0].value = "anotherTestValueForSettings";
+
+                // invoke angularJS Store.
+                $timeout(function () {
+                    expect(blockObject.data).toEqual(propertyModel.contentData[0]);
+                    expect(blockObject.data.testproperty).toBe("anotherTestValue");
+                    expect(propertyModel.contentData[0].testproperty).toBe("anotherTestValue");
+
+                    expect(blockObject.settingsData).toEqual(propertyModel.settingsData[0]);
+                    expect(blockObject.settingsData.testproperty).toBe("anotherTestValueForSettings");
+                    expect(propertyModel.settingsData[0].testproperty).toBe("anotherTestValueForSettings");
+
+                    done();
+                });
+
+            });
+
+            $rootScope.$digest();
+            $timeout.flush();
+        });
+
+
+        it('getBlockObject of block with settings syncs values of object', function (done) {
+
+            var propertyModel = angular.copy(propertyModelWithSettingsMock);
+
+            var complexValue = { "list": ["A", "B", "C"] };
+            propertyModel.contentData[0].testproperty = complexValue;
+
+            var complexSettingsValue = { "list": ["A", "B", "C"] };
+            propertyModel.settingsData[0].testproperty = complexSettingsValue;
+
+            var modelObject = blockEditorService.createModelObject(propertyModel, "Umbraco.TestBlockEditor", [blockWithSettingsConfigurationMock], $scope, $scope);
+
+            modelObject.load().then(() => {
+
+                try {
+                    var layout = modelObject.getLayout();
+
+                    var blockObject = modelObject.getBlockObject(layout[0]);
+
+                    blockObject.content.variants[0].tabs[0].properties[0].value.list[0] = "AA";
+                    blockObject.content.variants[0].tabs[0].properties[0].value.list.push("D");
+
+                    blockObject.settings.variants[0].tabs[0].properties[0].value.list[0] = "settingsValue";
+                    blockObject.settings.variants[0].tabs[0].properties[0].value.list.push("settingsNewValue");
+
+                    // invoke angularJS Store.
+                    $timeout(function () {
+                        expect(propertyModel.contentData[0].testproperty.list[0]).toBe("AA");
+                        expect(propertyModel.contentData[0].testproperty.list.length).toBe(4);
+
+                        expect(propertyModel.settingsData[0].testproperty.list[0]).toBe("settingsValue");
+                        expect(propertyModel.settingsData[0].testproperty.list.length).toBe(4);
+
+                        done();
+                    });
+
+
+                } catch (e) {
+                    done.fail(e);
+                }
+            });
+
+            $rootScope.$digest();
+            $timeout.flush();
+        });
+
+
+    });
+
+});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/server-validation-manager.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/server-validation-manager.spec.js
index 5d2a618f46..ab2a5cdd69 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/server-validation-manager.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/server-validation-manager.spec.js
@@ -1,10 +1,13 @@
 describe('serverValidationManager tests', function () {
-    var serverValidationManager;
+    var $rootScope, serverValidationManager, $timeout;
 
     beforeEach(module('umbraco.services'));
     
     beforeEach(inject(function ($injector) {
-        serverValidationManager = $injector.get('serverValidationManager');        
+        $rootScope = $injector.get('$rootScope');
+        $timeout = $injector.get('$timeout');
+        serverValidationManager = $injector.get('serverValidationManager');
+        serverValidationManager.clear();
     }));
 
     describe('managing field validation errors', function () {
@@ -314,6 +317,158 @@
 
     });
 
+    describe('managing complex editor validation errors', function () {
+
+        // this root element doesn't have it's own attached errors, instead it has model state just 
+        // showing that it has errors within it's nested properties. that ModelState is automatically
+        // added on the server side.
+        var nonRootLevelComplexValidationMsg = `[
+    {
+        "$elementTypeAlias": "addressBook",
+		"$id": "34E3A26C-103D-4A05-AB9D-7E14032309C3",
+        "addresses":
+        [
+			{
+				"$elementTypeAlias": "addressInfo",
+				"$id": "FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1",
+				"ModelState":
+                {
+                    "_Properties.city.invariant.null.country": [
+                        "City is not in Australia"
+                    ],
+                    "_Properties.city.invariant.null.capital": [
+                        "Not a capital city"
+                    ]
+                }
+			},
+			{
+				"$elementTypeAlias": "addressInfo",
+				"$id": "7170A4DD-2441-4B1B-A8D3-437D75C4CBC9",
+				"ModelState":
+                {
+                    "_Properties.city.invariant.null.country": [
+                        "City is not in Australia"
+                    ],
+                    "_Properties.city.invariant.null.capital": [
+                        "Not a capital city"
+                    ]
+                }
+			}
+        ],
+        "ModelState":
+        {
+            "_Properties.addresses.invariant.null": [
+                ""
+            ]
+        }
+    }
+]`;
+
+        it('create dictionary of id to ModelState', function () {
+
+            //arrange
+            var complexValidationMsg = `[
+    {
+        "$elementTypeAlias": "addressBook",
+		"$id": "34E3A26C-103D-4A05-AB9D-7E14032309C3",
+        "addresses":
+        [
+			{
+				"$elementTypeAlias": "addressInfo",
+				"$id": "FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1",
+				"ModelState":
+                {
+                    "_Properties.city.invariant.null.country": [
+                        "City is not in Australia"
+                    ],
+                    "_Properties.city.invariant.null.capital": [
+                        "Not a capital city"
+                    ]
+                }
+			},
+			{
+				"$elementTypeAlias": "addressInfo",
+				"$id": "7170A4DD-2441-4B1B-A8D3-437D75C4CBC9",
+				"ModelState":
+                {
+                    "_Properties.city.invariant.null.country": [
+                        "City is not in Australia"
+                    ],
+                    "_Properties.city.invariant.null.capital": [
+                        "Not a capital city"
+                    ]
+                }
+			}
+        ],
+        "ModelState":
+        {
+            "_Properties.addresses.invariant.null.counter": [
+                "Must have at least 3 addresses"
+            ],
+            "_Properties.bookName.invariant.null.book": [
+                "Invalid address book name"
+            ]
+        }
+    }
+]`;
+            
+            //act 
+            var ms = serverValidationManager.parseComplexEditorError(complexValidationMsg, "myBlockEditor");
+
+            //assert
+            expect(ms.length).toEqual(3);
+            expect(ms[0].validationPath).toEqual("myBlockEditor/34E3A26C-103D-4A05-AB9D-7E14032309C3");
+            expect(ms[1].validationPath).toEqual("myBlockEditor/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1");
+            expect(ms[2].validationPath).toEqual("myBlockEditor/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/7170A4DD-2441-4B1B-A8D3-437D75C4CBC9");
+
+        });
+
+        it('create dictionary of id to ModelState with inherited errors', function () {
+
+            //act 
+            var ms = serverValidationManager.parseComplexEditorError(nonRootLevelComplexValidationMsg, "myBlockEditor");
+
+            //assert
+            expect(ms.length).toEqual(3);
+            expect(ms[0].validationPath).toEqual("myBlockEditor/34E3A26C-103D-4A05-AB9D-7E14032309C3");
+            var item0ModelState = ms[0].modelState;
+            expect(Object.keys(item0ModelState).length).toEqual(1);
+            expect(item0ModelState["_Properties.addresses.invariant.null"].length).toEqual(1);
+            expect(item0ModelState["_Properties.addresses.invariant.null"][0]).toEqual("");
+            expect(ms[1].validationPath).toEqual("myBlockEditor/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1");
+            expect(ms[2].validationPath).toEqual("myBlockEditor/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/7170A4DD-2441-4B1B-A8D3-437D75C4CBC9");
+
+        });
+
+        it('add errors for ModelState with inherited errors', function () {
+
+            //act 
+            let modelState = {
+                "_Properties.blockFeatures.invariant.null": [
+                    nonRootLevelComplexValidationMsg
+                ]
+            };
+            serverValidationManager.addErrorsForModelState(modelState);
+
+            //assert
+            var propertyErrors = [
+                "blockFeatures",
+                "blockFeatures/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses",
+                "blockFeatures/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city",
+                "blockFeatures/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/7170A4DD-2441-4B1B-A8D3-437D75C4CBC9/city"
+            ]
+            // These will all exist
+            propertyErrors.forEach(x => expect(serverValidationManager.getPropertyError(x)).toBeDefined());
+
+            // These field errors also exist
+            expect(serverValidationManager.getPropertyError(propertyErrors[2], null, "country")).toBeDefined();
+            expect(serverValidationManager.getPropertyError(propertyErrors[2], null, "capital")).toBeDefined();
+            expect(serverValidationManager.getPropertyError(propertyErrors[3], null, "country")).toBeDefined();
+            expect(serverValidationManager.getPropertyError(propertyErrors[3], null, "capital")).toBeDefined();
+        });
+
+    });
+
     describe('validation error subscriptions', function() {
 
         it('can subscribe to a field error', function() {
@@ -327,7 +482,9 @@
                     allErrors: allErrors
                 };
             }, null);
+
             
+
             //act
             serverValidationManager.addFieldError("Name", "Required");
             serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1", null);
@@ -348,7 +505,9 @@
             var cb2 = function () {
             };
             serverValidationManager.subscribe(null, null, "Name", cb1, null);
+            
             serverValidationManager.subscribe(null, null, "Title", cb2, null);
+            
 
             //act
             serverValidationManager.addFieldError("Name", "Required");
@@ -374,6 +533,7 @@
             var args1;
             var args2;
             var numCalled = 0;
+            var numCalledWithErrors = 0;
 
             //arrange
             serverValidationManager.subscribe("myProperty", null, "value1", function (isValid, propertyErrors, allErrors) {
@@ -384,15 +544,19 @@
                 };
             }, null);
             
+            
             serverValidationManager.subscribe("myProperty", null, "", function (isValid, propertyErrors, allErrors) {
                 numCalled++;
+                if (propertyErrors.length > 0) {
+                    numCalledWithErrors++;
+                }
                 args2 = {
                     isValid: isValid,
                     propertyErrors: propertyErrors,
                     allErrors: allErrors
                 };
             }, null);
-
+            
             //act
             serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1", null);
             serverValidationManager.addPropertyError("myProperty", null, "value2", "Some value 2", null);
@@ -415,28 +579,36 @@
             expect(args2.propertyErrors[0].errorMsg).toEqual("Some value 1");
             expect(args2.propertyErrors[1].errorMsg).toEqual("Some value 2");
             expect(args2.allErrors.length).toEqual(2);
-            //Even though only 2 errors are added, the callback is called 3 times because any call to addPropertyError will invoke the callback
-            // if the property has errors existing.
-            expect(numCalled).toEqual(3);
+            //3 errors are added but a call to subscribe also calls the callback
+            expect(numCalled).toEqual(4);
+            expect(numCalledWithErrors).toEqual(3);
         });
 
         it('can subscribe to a culture error for both a property and its sub field', function () {
             var args1;
             var args2;
             var numCalled = 0;
+            var numCalledWithErrors = 0;
 
             //arrange
             serverValidationManager.subscribe(null, "en-US", null, function (isValid, propertyErrors, allErrors) {
                 numCalled++;
+                if (propertyErrors.length > 0) {
+                    numCalledWithErrors++;
+                }
                 args1 = {
                     isValid: isValid,
                     propertyErrors: propertyErrors,
                     allErrors: allErrors
                 };
             }, null);
+            
 
             serverValidationManager.subscribe(null, "es-ES", null, function (isValid, propertyErrors, allErrors) {
                 numCalled++;
+                if (propertyErrors.length > 0) {
+                    numCalledWithErrors++;
+                }
                 args2 = {
                     isValid: isValid,
                     propertyErrors: propertyErrors,
@@ -445,20 +617,162 @@
             }, null);
 
             //act
-            serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1", null);
-            serverValidationManager.addPropertyError("myProperty", "en-US", "value1", "Some value 1", null);
-            serverValidationManager.addPropertyError("myProperty", "en-US", "value2", "Some value 2", null);
-            serverValidationManager.addPropertyError("myProperty", "fr-FR", "", "Some value 3", null);
+            serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1", null);       // doesn't match
+            serverValidationManager.addPropertyError("myProperty", "en-US", "value1", "Some value 1", null);    // matches callback 1
+            serverValidationManager.addPropertyError("myProperty", "en-US", "value2", "Some value 2", null);    // matches callback 1
+            serverValidationManager.addPropertyError("myProperty", "fr-FR", "", "Some value 3", null);          // doesn't match - but all callbacks still execute
 
             //assert
-            expect(args1).not.toBeUndefined();
             expect(args1.isValid).toBe(false);
+            expect(args2.isValid).toBe(true); // no errors registered for this callback
 
-            expect(args2).toBeUndefined();
-
-            expect(numCalled).toEqual(2);
+            expect(numCalled).toEqual(10); // both subscriptions will be called once per addPropertyError and also called on subscribe
+            expect(numCalledWithErrors).toEqual(3); // the first subscription is called 3 times with errors because the 4th time we call addPropertyError all callbacks still execute
         });
-        
+
+        it('can subscribe to a property validation path prefix', function () {
+            var callbackA = [];
+            var callbackB = [];
+
+            //arrange
+            serverValidationManager.subscribe("myProperty", null, null, function (isValid, propertyErrors, allErrors) {
+                if (propertyErrors.length > 0) {
+                    callbackA.push(propertyErrors);
+                }
+            }, null, { matchType: "prefix" });
+
+            serverValidationManager.subscribe("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses", null, null, function (isValid, propertyErrors, allErrors) {
+                if (propertyErrors.length > 0) {
+                    callbackB.push(propertyErrors);
+                }
+            }, null, { matchType: "prefix" });
+
+            //act
+            // will match A:
+            serverValidationManager.addPropertyError("myProperty", null, null, "property error", null);
+            serverValidationManager.addPropertyError("myProperty", null, "value1", "value error", null);
+            // will match A + B
+            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", null, null, "property error", null);
+            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", null, "value1", "value error", null);
+            // won't match:
+            serverValidationManager.addPropertyError("myProperty", "en-US", null, "property error", null);
+            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", "en-US", null, "property error", null);
+            serverValidationManager.addPropertyError("otherProperty", null, null, "property error", null);
+            serverValidationManager.addPropertyError("otherProperty", null, "value1", "value error", null);
+
+            //assert
+
+            // both will be called each time addPropertyError is called
+            expect(callbackA.length).toEqual(8);
+            expect(callbackB.length).toEqual(6); // B - will only be called 6 times with errors because the first 2 calls to addPropertyError haven't added errors for B yet
+            expect(callbackA[callbackA.length - 1].length).toEqual(4); // 4 errors for A
+            expect(callbackB[callbackB.length - 1].length).toEqual(2); // 2 errors for B
+
+            // clear the data and notify
+            callbackA = [];
+            callbackB = [];
+
+            serverValidationManager.notify();
+            $timeout.flush();
+
+            expect(callbackA.length).toEqual(1);
+            expect(callbackB.length).toEqual(1);
+            expect(callbackA[0].length).toEqual(4); // 4 errors for A
+            expect(callbackB[0].length).toEqual(2); // 2 errors for B
+            
+        });
+
+        it('can subscribe to a property validation path suffix', function () {
+            var callbackA = [];
+            var callbackB = [];
+
+            //arrange
+            serverValidationManager.subscribe("myProperty", null, null, function (isValid, propertyErrors, allErrors) {
+                if (propertyErrors.length > 0) {
+                    callbackA.push(propertyErrors);
+                }
+            }, null, { matchType: "suffix" });
+
+            serverValidationManager.subscribe("city", null, null, function (isValid, propertyErrors, allErrors) {
+                if (propertyErrors.length > 0) {
+                    callbackB.push(propertyErrors);
+                }
+            }, null, { matchType: "suffix" });
+
+            //act
+            // will match A:
+            serverValidationManager.addPropertyError("myProperty", null, null, "property error", null);
+            serverValidationManager.addPropertyError("myProperty", null, "value1", "value error", null);
+            // will match B
+            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", null, null, "property error", null);
+            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", null, "value1", "value error", null);
+            // won't match:
+            serverValidationManager.addPropertyError("myProperty", "en-US", null, "property error", null);
+            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", "en-US", null, "property error", null);
+            serverValidationManager.addPropertyError("otherProperty", null, null, "property error", null);
+            serverValidationManager.addPropertyError("otherProperty", null, "value1", "value error", null);
+
+            //assert
+
+            // both will be called each time addPropertyError is called
+            expect(callbackA.length).toEqual(8);
+            expect(callbackB.length).toEqual(6); // B - will only be called 6 times with errors because the first 2 calls to addPropertyError haven't added errors for B yet
+            expect(callbackA[callbackA.length - 1].length).toEqual(2); // 2 errors for A
+            expect(callbackB[callbackB.length - 1].length).toEqual(2); // 2 errors for B
+
+            // clear the data and notify
+            callbackA = [];
+            callbackB = [];
+
+            serverValidationManager.notify();
+            $timeout.flush();
+
+            expect(callbackA.length).toEqual(1);
+            expect(callbackB.length).toEqual(1);
+            expect(callbackA[0].length).toEqual(2); // 2 errors for A
+            expect(callbackB[0].length).toEqual(2); // 2 errors for B
+
+        });
+
+        it('can subscribe to a property validation path contains', function () {
+            var callbackA = [];
+
+            //arrange
+            serverValidationManager.subscribe("addresses", null, null, function (isValid, propertyErrors, allErrors) {
+                if (propertyErrors.length > 0) {
+                    callbackA.push(propertyErrors);
+                }
+            }, null, { matchType: "contains" });
+
+            //act
+            // will match A:
+            serverValidationManager.addPropertyError("addresses", null, null, "property error", null);
+            serverValidationManager.addPropertyError("addresses", null, "value1", "value error", null);
+            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", null, null, "property error", null);
+            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", null, "value1", "value error", null);
+            // won't match:
+            serverValidationManager.addPropertyError("addresses", "en-US", null, "property error", null);
+            serverValidationManager.addPropertyError("addresses/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", "en-US", null, "property error", null);
+            serverValidationManager.addPropertyError("otherProperty", null, null, "property error", null);
+            serverValidationManager.addPropertyError("otherProperty", null, "value1", "value error", null);
+
+            //assert
+
+            // both will be called each time addPropertyError is called
+            expect(callbackA.length).toEqual(8);
+            expect(callbackA[callbackA.length - 1].length).toEqual(4); // 4 errors for A
+
+            // clear the data and notify
+            callbackA = [];
+
+            serverValidationManager.notify();
+            $timeout.flush();
+
+            expect(callbackA.length).toEqual(1);
+            expect(callbackA[0].length).toEqual(4); // 4 errors for A
+
+        });
+
         // TODO: Finish testing the rest!
 
     });
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-request-helper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-request-helper.spec.js
index ba8d651b56..68d1340f13 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-request-helper.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-request-helper.spec.js
@@ -6,6 +6,13 @@ describe('umbRequestHelper tests', function () {
 
     beforeEach(inject(function ($injector) {
         umbRequestHelper = $injector.get('umbRequestHelper');
+
+        // set the Umbraco.Sys.ServerVariables.application.applicationPath
+        if (!Umbraco) Umbraco = {};
+        if (!Umbraco.Sys) Umbraco.Sys = {};
+        if (!Umbraco.Sys.ServerVariables) Umbraco.Sys.ServerVariables = {};
+        if (!Umbraco.Sys.ServerVariables.application) Umbraco.Sys.ServerVariables.application = {};
+        Umbraco.Sys.ServerVariables.application.applicationPath = "/mysite/";
     }));
 
     describe('formatting Urls', function () {
@@ -34,4 +41,25 @@ describe('umbRequestHelper tests', function () {
         });
 
     });
+
+    describe('Virtual Paths', function () {
+
+        it('can convert virtual path to absolute url', function () {
+            var result = umbRequestHelper.convertVirtualToAbsolutePath("~/App_Plugins/hello/world.css");
+            expect(result).toBe("/mysite/App_Plugins/hello/world.css");
+        });
+
+        it('can convert absolute path to absolute url', function () {
+            var result = umbRequestHelper.convertVirtualToAbsolutePath("/App_Plugins/hello/world.css");
+            expect(result).toBe("/App_Plugins/hello/world.css");
+        });
+
+        it('throws on invalid virtual path', function () {
+            var relativePath = "App_Plugins/hello/world.css";
+            expect(function () {
+                umbRequestHelper.convertVirtualToAbsolutePath(relativePath);
+            }).toThrow("The path " + relativePath + " is not a virtual path");
+        });
+
+    });
 });
diff --git a/src/Umbraco.Web.UI.Docs/umb-docs.css b/src/Umbraco.Web.UI.Docs/umb-docs.css
index b748a0a609..e49f2ec88f 100644
--- a/src/Umbraco.Web.UI.Docs/umb-docs.css
+++ b/src/Umbraco.Web.UI.Docs/umb-docs.css
@@ -2,9 +2,9 @@
 html {
     font-family: 'Segoe UI', Tahoma, Helvetica, sans-serif;
 }
+
 body {
     font-family: 'Segoe UI', Tahoma, Helvetica, sans-serif;
-
 }
 
 .container, .navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
@@ -29,8 +29,27 @@ body {
     color: inherit;
 }
 
-.content code {
+a:hover {
+    text-decoration: none;
+    color: rgba(0, 0, 0, .8);
+}
+
+.content p code {
+    font-size: 85%;
     font-family: inherit;
+    background-color: #f7f7f9;
+    padding: 0px 3px;
+    border: 1px solid #e1e1e8;
+    color: #d14;
+    white-space: nowrap;
+}
+
+.header img {
+    width: 50px;
+}
+
+.breadcrumb {
+    background-color: #f7f7f7;
 }
 
 .navbar .container{
@@ -66,14 +85,6 @@ body {
     background-color: #ccc;
 }
 
-.breadcrumb {
-    background-color: #f7f7f7;
-}
-
-a:hover {
-    text-decoration: none;
-    color: rgba(0,0,0,.8);
-}
 .nav-list > .active > a, .nav-list > .active > a:hover, .nav-list > .active > a:focus,
 .form-search > .nav-list > .active > a, .form-search > .nav-list > .active > a:hover, .form-search > .nav-list > .active > a:focus {
     color: #f36f21;
@@ -96,16 +107,3 @@ a:hover {
 .form-search > ul.nav > li.module > a:hover{
     color: #fff;
 }
-
-.header img {
-    width: 50px;
-}
-
-.content .methods code {
-    border: 1px solid #e1e1e8;
-    background-color: #f7f7f9;
-    padding: 0px 3px;
-    font-size: 85%;
-    color: #d14;
-    white-space: nowrap;
-}
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 1d77505fc6..01d029cae0 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -169,6 +169,7 @@
     <Content Include="Config\Lang\zh-CN.user.xml" />
     <Content Include="Config\splashes\noNodes.aspx" />
     <Content Include="Umbraco\Config\Lang\cs.xml" />
+    <Content Include="Umbraco\Config\Lang\cy.xml" />
     <Content Include="Umbraco\Config\Lang\tr.xml" />
     <Content Include="Umbraco\Config\Lang\zh_tw.xml" />
     <Content Include="Config\Splashes\noNodes.aspx" />
@@ -285,6 +286,7 @@
     <Content Include="Views\Partials\Grid\Bootstrap3-Fluid.cshtml" />
     <Content Include="Umbraco\Views\Preview\Index.cshtml" />
     <Content Include="Umbraco\Views\web.config" />
+    <Content Include="Views\Partials\BlockList\Default.cshtml" />
     <None Include="Web.Debug.config.transformed" />
     <None Include="web.Template.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
@@ -345,9 +347,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8700</DevelopmentServerPort>
+          <DevelopmentServerPort>8111</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8700</IISUrl>          
+          <IISUrl>http://localhost:8111</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
@@ -375,6 +377,7 @@
     <!-- Create ClientDependency.config file from Template if it doesn't exist -->
     <Message Text="Copy ClientDependency.$(Configuration).config to ClientDependency.config" Importance="high" Condition="!Exists('$(ProjectDir)Config\ClientDependency.config')" />
     <Copy SourceFiles="$(ProjectDir)Config\ClientDependency.Release.config" DestinationFiles="$(ProjectDir)Config\ClientDependency.config" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="!Exists('$(ProjectDir)Config\ClientDependency.config')" />
+    <Copy SourceFiles="$(ProjectDir)Config\umbracoSettings.Release.config" DestinationFiles="$(ProjectDir)Config\umbracoSettings.config" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="!Exists('$(ProjectDir)Config\umbracoSettings.config')" />
     <!-- Create Serilog.config & serilog.user.config file from Templates if it doesn't exist -->
     <Message Text="Copy serilog.$(Configuration).config to serilog.config" Importance="high" Condition="!Exists('$(ProjectDir)Config\serilog.config')" />
     <Copy SourceFiles="$(ProjectDir)Config\serilog.Release.config" DestinationFiles="$(ProjectDir)Config\serilog.config" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="!Exists('$(ProjectDir)Config\serilog.config')" />
@@ -429,4 +432,4 @@
     <Message Text="ConfigFile: $(OriginalFileName) -&gt; $(OutputFileName)" Importance="high" Condition="Exists('$(ModifiedFileName)')" />
     <Copy SourceFiles="$(ModifiedFileName)" DestinationFiles="$(OutputFileName)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="Exists('$(ModifiedFileName)')" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index b7c1e6540c..f6f9b4b656 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -61,7 +61,7 @@
     <script type="text/javascript">
     document.angularReady = function (app) {
 
-        @Html.AngularValueExternalLoginInfoScript(ViewData.GetExternalSignInError())
+        @Html.AngularValueExternalLoginInfoScript(ViewData.GetExternalSignInProviderErrors())
         @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
 
     }
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index bd8d23a851..eefd182aff 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -1,10 +1,10 @@
-@using Umbraco.Core
+@using System.Globalization
+@using Umbraco.Core
 @using ClientDependency.Core
 @using ClientDependency.Core.Mvc
 @using Umbraco.Core.Composing
 @using Umbraco.Core.IO
 @using Umbraco.Web
-@using Umbraco.Core.Configuration
 
 @inherits WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
 
@@ -28,7 +28,7 @@
 
 <!DOCTYPE html>
 
-<html lang="en">
+<html lang="@CultureInfo.CurrentCulture.Name">
 <head>
     <base href="@Model.GlobalSettings.Path.EnsureEndsWith('/')" />
     <meta charset="utf-8">
@@ -73,15 +73,15 @@
 
             </div>
 
-            <umb-tour
-                ng-if="tour.show"
-                model="tour">
-            </umb-tour>
-
             <umb-notifications></umb-notifications>
 
         </div>
 
+        <umb-tour
+            ng-if="tour.show"
+            model="tour">
+        </umb-tour>
+
         <!-- help dialog controller by the help button - this also forces the backoffice UI to shift 400px  -->
         <umb-drawer data-element="drawer" ng-if="drawer.show" model="drawer.model" view="drawer.view"></umb-drawer>
 
@@ -99,7 +99,9 @@
     <umb-overlay ng-if="overlay.show"
                  model="overlay"
                  position="{{overlay.position}}"
+                 size="overlay.size"
                  view="overlay.view"
+                 name="overlay.name"
                  parent-scope="overlay.parentScope">
     </umb-overlay>
 
@@ -115,12 +117,19 @@
     <script>
 
         document.angularReady = function(app) {
-            @Html.AngularValueExternalLoginInfoScript(ViewData.GetExternalSignInError())
+            @Html.AngularValueExternalLoginInfoScript(ViewData.GetExternalSignInProviderErrors())
             @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
             @Html.AngularValueTinyMceAssets()
 
+            app.run(["iconHelper", function (iconHelper) {
+                @* We inject icons to the icon helper(service), since icons can only be loaded if user is authorized. By injecting these to the service they will not be requested as they will become cached. *@
+                iconHelper.defineIcon("icon-check", '@Html.Raw(Model.IconCheckData)');
+                iconHelper.defineIcon("icon-delete", '@Html.Raw(Model.IconDeleteData)');
+            }]);
+
             //required for the noscript trick
             document.getElementById("mainwrapper").style.display = "inherit";
+
         }
     </script>
 
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index 4b7bcaee87..eb89211652 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -4,12 +4,26 @@
 @using Umbraco.Core.IO
 @using Umbraco.Web
 @using Umbraco.Core.Configuration
+@using Umbraco.Core.Composing
+@using Umbraco.Core.Services
 
 @inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficePreviewModel>
 @{
     var disableDevicePreview = Model.DisableDevicePreview.ToString().ToLowerInvariant();
 
     Html.RequiresCss("assets/css/canvasdesigner.css", "Umbraco");
+
+    // See if we can get without using Current
+    var textService = Current.Services.TextService;
+
+    var EndLabel = textService.Localize("preview", "endLabel");
+    var EndTitle = textService.Localize("preview", "endTitle");
+    var OpenWebsiteLabel = textService.Localize("preview", "openWebsiteLabel");
+    var OpenWebsiteTitle = textService.Localize("preview", "openWebsiteTitle");
+    var returnToPreviewHeadline = textService.Localize("preview", "returnToPreviewHeadline");
+    var returnToPreviewDescription = textService.Localize("preview", "returnToPreviewDescription");
+    var returnToPreviewAcceptButton = textService.Localize("preview", "returnToPreviewAcceptButton");
+    var returnToPreviewDeclineButton = textService.Localize("preview", "returnToPreviewDeclineButton");
 }
 <!DOCTYPE html>
 <html lang="en">
@@ -22,6 +36,14 @@
     @Html.RenderCssHere(
         new BasicPath("Umbraco", IOHelper.ResolveUrl(SystemDirectories.Umbraco)))
 
+    <script type="text/javascript">
+        window.umbLocalizedVars = {
+            'returnToPreviewHeadline': '@returnToPreviewHeadline',
+            'returnToPreviewDescription':'@returnToPreviewDescription',
+            'returnToPreviewAcceptButton':'@returnToPreviewAcceptButton',
+            'returnToPreviewDeclineButton':'@returnToPreviewDeclineButton'
+        };
+    </script>
 </head>
 <body id="canvasdesignerPanel" ng-mouseover="outlinePositionHide()" ng-controller="previewController" ng-class="{'tabbing-active': tabbingActive === true}" ng-click="windowClickHandler($event)">
     <div class="wait" ng-show="!frameLoaded"></div>
@@ -65,7 +87,10 @@
                     </div>
                 }
 
-                <button ng-click="exitPreview()" title="Exit Preview" class="menu-bar__button umb-outline"><i class="icon icon-power"></i><span>Exit</span>
+                <button ng-click="openInBrowser()" title="Open preview in the browser" class="menu-bar__button umb-outline"><i class="icon icon-out"></i><span>Open in browser</span>
+                </button>
+
+                <button ng-click="exitPreview()" title="@EndTitle" class="menu-bar__button umb-outline"><i class="icon icon-power"></i><span>@EndLabel</span>
                 </button>
 
             </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
index fe7e8ac638..2375ebaf6d 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <language alias="cs" intName="Czech" localName="česky" lcid="5" culture="cs-CZ">
   <creator>
-    <name>umbraco</name>
-    <link>http://umbraco.org</link>
+    <name>Umbraco komunita</name>
+    <link>https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files</link>
   </creator>
   <area alias="actions">
     <key alias="assignDomain">Kultura a názvy hostitelů</key>
@@ -11,10 +11,13 @@
     <key alias="changeDocType">Změnit typ dokumentu</key>
     <key alias="copy">Kopírovat</key>
     <key alias="create">Vytvořit</key>
+    <key alias="export">Exportovat</key>
     <key alias="createPackage">Vytvořit balíček</key>
+    <key alias="createGroup">Vytvořit skupinu</key>
     <key alias="delete">Odstranit</key>
     <key alias="disable">Deaktivovat</key>
     <key alias="emptyRecycleBin">Vyprázdnit koš</key>
+    <key alias="enable">Aktivovat</key>
     <key alias="exportDocumentType">Exportovat typ dokumentu</key>
     <key alias="importDocumentType">Importovat typ dokumentu</key>
     <key alias="importPackage">Importovat balíček</key>
@@ -28,17 +31,64 @@
     <key alias="refreshNode">Znovu načíst uzly</key>
     <key alias="republish">Znovu publikovat celý web</key>
     <key alias="rights">Práva</key>
+    <key alias="rename" version="7.3.0">Přejmenovat</key>
+    <key alias="restore" version="7.3.0">Obnovit</key>
+    <key alias="SetPermissionsForThePage">Nastavit oprávnění pro stránku %0%</key>
+    <key alias="chooseWhereToCopy">Kam zkopírovat</key>
+    <key alias="chooseWhereToMove">Kam přesunout</key>
+    <key alias="toInTheTreeStructureBelow">do struktury stromu pod</key>
+    <key alias="infiniteEditorChooseWhereToCopy">Choose where to copy the selected item(s)</key>
+    <key alias="infiniteEditorChooseWhereToMove">Choose where to move the selected item(s)</key>
+    <key alias="wasMovedTo">bylo přesunuto</key>
+    <key alias="wasCopiedTo">bylo zkopírováno</key>
+    <key alias="wasDeleted">bylo smazáno</key>
     <key alias="rollback">Vrátit starší verzi</key>
     <key alias="sendtopublish">Odeslat k publikování</key>
     <key alias="sendToTranslate">Odeslat k překladu</key>
+    <key alias="setGroup">Nastavit skupinu</key>
     <key alias="sort">Seřadit</key>
     <key alias="translate">Přeložit</key>
     <key alias="update">Aktualizovat</key>
+    <key alias="setPermissions">Nastavit oprávnění</key>
+    <key alias="unlock">Odemknout</key>
+    <key alias="createblueprint">Vytvořit šablonu obsahu</key>
+    <key alias="resendInvite">Přeposlat pozvánku</key>
+  </area>
+  <area alias="actionCategories">
+    <key alias="content">Obsah</key>
+    <key alias="administration">Administrace</key>
+    <key alias="structure">Struktura</key>
+    <key alias="other">Ostatní</key>
+  </area>
+  <area alias="actionDescriptions">
+    <key alias="assignDomain">Povolit přístup k přiřazování kultury a názvů hostitelů</key>
+    <key alias="auditTrail">Povolit přístup k zobrazení protokolu historie uzlu</key>
+    <key alias="browse">Povolit přístup k zobrazení uzlu</key>
+    <key alias="changeDocType">Povolit přístup ke změně typu dokumentu daného uzlu</key>
+    <key alias="copy">Povolit přístup ke kopírování uzlu</key>
+    <key alias="create">Povolit přístup k vytváření uzlů</key>
+    <key alias="delete">Povolit přístup k mazání uzlů</key>
+    <key alias="move">Povolit přístup k přesunutí uzlu</key>
+    <key alias="protect">Povolit přístup k nastavení a změně veřejného přístupu k uzlu</key>
+    <key alias="publish">Povolit přístup k publikování uzlu</key>
+    <key alias="unpublish">Povolit přístup k zrušení publikování uzlu</key>
+    <key alias="rights">Povolit přístup ke změně oprávnění pro uzel</key>
+    <key alias="rollback">Povolit přístup k vrácení uzlu do předchozího stavu</key>
+    <key alias="sendtopublish">Povolit přístup k odeslání uzlu ke schválení před publikováním</key>
+    <key alias="sendToTranslate">Povolit přístup k odeslání uzlu k překladu</key>
+    <key alias="sort">Povolit přístup ke změně pořadí uzlů</key>
+    <key alias="translate">Povolit přístup k překladu uzlu</key>
+    <key alias="update">Povolit přístup k uložení uzlu</key>
+    <key alias="createblueprint">Povolit přístup k vytvoření šablony obsahu</key>
+  </area>
+  <area alias="apps">
+    <key alias="umbContent">Obsah</key>
+    <key alias="umbInfo">Info</key>
   </area>
   <area alias="assignDomain">
     <key alias="permissionDenied">Přístup zakázán.</key>
     <key alias="addNew">Přidat novou doménu</key>
-    <key alias="remove">odebrat</key>
+    <key alias="remove">Odebrat</key>
     <key alias="invalidNode">Neplatný uzel.</key>
     <key alias="invalidDomain">Neplatný tvar domény.</key>
     <key alias="duplicateDomain">Doména už byla přiřazena.</key>
@@ -49,16 +99,17 @@
     <key alias="domainExists">Doména '%0%' už byla přiřazena</key>
     <key alias="domainUpdated">Doména '%0%' byla aktualizována</key>
     <key alias="orEdit">Editace aktuálních domén</key>
+    <key alias="domainHelpWithVariants">
+    	<![CDATA[Povolené názvy domén jsou: "example.com", "www.example.com", "example.com:8080", nebo "https://www.example.com/".
+     Dále jsou podporovány také jednoúrovňové cesty v doménách, např. "example.com/en" nebo "/en".]]></key>
     <key alias="inherit">Dědit</key>
     <key alias="setLanguage">Kultura</key>
     <key alias="setLanguageHelp"><![CDATA[Nastaví kulturu pro uzly pod aktuálním uzlem,<br />nebo dědění kultury po nadřazeném uzlu. Vztahuje se také<br />
        na aktivní uzel.]]></key>
     <key alias="setDomains">Domény</key>
   </area>
-  <area alias="auditTrails">
-    <key alias="atViewingFor">Zobrazení pro</key>
-  </area>
   <area alias="buttons">
+    <key alias="clearSelection">Zrušit výběr</key>
     <key alias="select">Vybrat</key>
     <key alias="somethingElse">Dělat něco jiného</key>
     <key alias="bold">Tučně</key>
@@ -77,15 +128,62 @@
     <key alias="listNumeric">Číslovaný seznam</key>
     <key alias="macroInsert">Vložit makro</key>
     <key alias="pictureInsert">Vložit obrázek</key>
+    <key alias="publishAndClose">Publikovat a zavřít</key>
+    <key alias="publishDescendants">Publikovat s potomky</key>
     <key alias="relations">Editovat vztahy</key>
+    <key alias="returnToList">Zpět na seznam</key>
     <key alias="save">Uložit</key>
+    <key alias="saveAndClose">Uložit a zavřít</key>
     <key alias="saveAndPublish">Uložit a publikovat</key>
+    <key alias="saveAndSchedule">Uložit a naplánovat</key>
     <key alias="saveToPublish">Uložit a odeslat ke schválení</key>
     <key alias="saveAndPreview">Náhled</key>
+    <key alias="saveListView">Uložit zobrazení seznamu</key>
+    <key alias="schedulePublish">Naplánovat</key>
+    <key alias="showPage">Náhled</key>
     <key alias="showPageDisabled">Náhled je deaktivován, protože není přiřazena žádná šablona</key>
     <key alias="styleChoose">Vybrat styl</key>
     <key alias="styleShow">Zobrazit styly</key>
     <key alias="tableInsert">Vložit tabulku</key>
+    <key alias="generateModelsAndClose">Generovat modely a zavřít</key>
+    <key alias="saveAndGenerateModels">Uložit a generovat modely</key>
+    <key alias="undo">Zpět</key>
+    <key alias="redo">Znovu</key>
+    <key alias="rollback">Obnovit</key>
+    <key alias="deleteTag">Smazat štítek</key>
+    <key alias="confirmActionCancel">Zrušit</key>
+    <key alias="confirmActionConfirm">Potvrdit</key>
+	  <key alias="morePublishingOptions">Další možnosti publikování</key>
+  </area>
+  <area alias="auditTrails">
+    <key alias="atViewingFor">Zobrazení pro</key>
+    <key alias="delete">Obsah smazán</key>
+    <key alias="unpublish">Obsah nepublikován</key>
+    <key alias="unpublishvariant">Obsah nepublikován pro jazyky: %0% </key>
+    <key alias="publish">Obsah publikován</key>
+    <key alias="publishvariant">Obsah publikován pro jazyky: %0% </key>
+    <key alias="save">Obsah uložen</key>
+    <key alias="savevariant">Obsah uložen pro jazyky: %0%</key>
+    <key alias="move">Obsah přesunut</key>
+    <key alias="copy">Obsah zkopírován</key>
+    <key alias="rollback">Obsah vrácen zpět</key>
+    <key alias="sendtopublish">Obsah odeslán k publikování</key>
+    <key alias="sendtopublishvariant">Obsah odeslán k publikování pro jazyky: %0%</key>
+    <key alias="sort">Seřadit podřízené položky prováděné uživatelem</key>
+    <key alias="smallCopy">Kopírovat</key>
+    <key alias="smallPublish">Publikovat</key>
+    <key alias="smallPublishVariant">Publikovat</key>
+    <key alias="smallMove">Přesunout</key>
+    <key alias="smallSave">Uložit</key>
+    <key alias="smallSaveVariant">Uložit</key>
+    <key alias="smallDelete">Smazat</key>
+    <key alias="smallUnpublish">Nepublikovat</key>
+    <key alias="smallUnpublishVariant">Nepublikovat</key>
+    <key alias="smallRollBack">Vrátit zpět</key>
+    <key alias="smallSendToPublish">Odeslat k publikování</key>
+    <key alias="smallSendToPublishVariant">Odeslat k publikování</key>
+    <key alias="smallSort">Seřadit</key>
+    <key alias="historyIncludingVariants">Historie (všechny jazyky)</key>
   </area>
   <area alias="changeDocType">
     <key alias="changeDocTypeInstruction">Abyste změnili typ dokumentu pro zvolený obsah, nejprve jej vyberte ze seznamu typů platných pro tohle umístění.</key>
@@ -107,7 +205,14 @@
     <key alias="validationErrorPropertyWithMoreThanOneMapping">Nelze dokončit mapování vlastností, neboť nejméně jedna z vlastností má definováno více než jedno mapování.</key>
     <key alias="validDocTypesNote">Jsou zobrazeny pouze alternativní typy platné pro aktuální umístění.</key>
   </area>
+  <area alias="codefile">
+    <key alias="createFolderFailedById">Nepodařilo se vytvořit složku pod rodičem s ID %0%</key>
+    <key alias="createFolderFailedByName">Nepodařilo se vytvořit složku pod rodičem s názvem %0%</key>
+    <key alias="createFolderIllegalChars">Název složky nesmí obsahovat nepovolené znaky.</key>
+    <key alias="deleteItemFailed">Odstranění položky se nezdařilo: %0%</key>
+  </area>
   <area alias="content">
+    <key alias="isPublished" version="7.2">Is Published</key>
     <key alias="about">O této stránce</key>
     <key alias="alias">Alias</key>
     <key alias="alternativeTextHelp">(jak byste popsali obrázek přes telefon)</key>
@@ -124,45 +229,146 @@
     <key alias="itemChanged">Tato položko byla změněna po publikování</key>
     <key alias="itemNotPublished">Tato položka není publikována</key>
     <key alias="lastPublished">Naposledy publikováno</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 child items have been added</key>
+    <key alias="listViewNoMembers">No members have been added</key>
     <key alias="mediatype">Typ média</key>
     <key alias="mediaLinks">Odkaz na položky medií</key>
     <key alias="membergroup">Skupina členů</key>
     <key alias="memberrole">Role</key>
     <key alias="membertype">Typ člena</key>
+    <key alias="noChanges">No changes have been made</key>
     <key alias="noDate">Nevybráno žádné datum</key>
     <key alias="nodeName">Titulek stránky</key>
+    <key alias="noMediaLink">This media item has no link</key>
+    <key alias="noProperties">No content can be added for this item</key>
     <key alias="otherElements">Vlastnosti</key>
     <key alias="parentNotPublished">Tento dokument je publikován, ale není viditelný, protože jeho rodič '%0%' publikován není</key>
+    <key alias="parentCultureNotPublished">Tato jazyková verze je publikována, ale není viditelná, protože její rodič '%0%' publikován není</key>
     <key alias="parentNotPublishedAnomaly">Jejda: tento dokument je publikován, ale není v mezipaměti (vnitřní chyba)</key>
+    <key alias="getUrlException">Could not get the URL</key>
+    <key alias="routeError">This document is published but its URL would collide with content %0%</key>
+    <key alias="routeErrorCannotRoute">This document is published but its URL cannot be routed</key>
     <key alias="publish">Publikovat</key>
+    <key alias="published">Published</key>
+    <key alias="publishedPendingChanges">Published (pending changes)</key>
     <key alias="publishStatus">Stav publikování</key>
+    <key alias="publishDescendantsHelp"><![CDATA[Click <em>Publish with descendants</em> to publish <strong>%0%</strong> and all content items underneath and thereby making their content publicly available.]]></key>
+    <key alias="publishDescendantsWithVariantsHelp"><![CDATA[Click <em>Publish with descendants</em> to publish <strong>the selected languages</strong> and the same languages of content items underneath and thereby making their content publicly available.]]></key>
     <key alias="releaseDate">Datum publikování</key>
     <key alias="unpublishDate">Datum ukončení publikování</key>
     <key alias="removeDate">Datum odebrání</key>
+    <key alias="setDate">Set date</key>
     <key alias="sortDone">Třídění je aktualizováno</key>
     <key alias="sortHelp">Abyste uzly setřídili, jednoduše je přetáhněte anebo klikněte na jednu z hlaviček sloupce. Podržením "shift" nebo "control" při výběru můžete označit uzlů více.</key>
     <key alias="statistics">Statistika</key>
     <key alias="titleOptional">Titulek (volitelně)</key>
+    <key alias="altTextOptional">Alternative text (optional)</key>
     <key alias="type">Typ</key>
     <key alias="unpublish">Nepublikovat</key>
+    <key alias="unpublished">Draft</key>
+    <key alias="notCreated">Not created</key>
     <key alias="updateDate">Naposledy změněno</key>
     <key alias="updateDateDesc" version="7.0">Datum/čas poslední změny dokumentu</key>
     <key alias="uploadClear">Odebrat soubor(y)</key>
+	  <key alias="uploadClearImageContext">Click here to remove the image from the media item</key>
+    <key alias="uploadClearFileContext">Click here to remove the file from the media item</key>
     <key alias="urls">URL adresa dokumentu</key>
     <key alias="memberof">Člen skupin(y)</key>
     <key alias="notmemberof">Není člen skupin(y)</key>
     <key alias="childItems" version="7.0">Podřízené položky</key>
     <key alias="target" version="7.0">Cíl</key>
+    <key alias="scheduledPublishServerTime">This translates to the following time on the server:</key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">What does this mean?</a>]]></key>
+    <key alias="nestedContentDeleteItem">Are you sure you want to delete this item?</key>
+    <key alias="nestedContentDeleteAllItems">Are you sure you want to delete all items?</key>
+    <key alias="nestedContentEditorNotSupported">Property %0% uses editor %1% which is not supported by Nested Content.</key>
+    <key alias="nestedContentNoContentTypes">No content types are configured for this property.</key>
+    <key alias="nestedContentAddElementType">Add element type</key>
+    <key alias="nestedContentSelectElementTypeModalTitle">Select element type</key>
+    <key alias="nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the element type will be used.</key>
+    <key alias="nestedContentTemplateHelpTextPart1">Enter an angular expression to evaluate against each item for its name. Use</key>
+    <key alias="nestedContentTemplateHelpTextPart2">to display the item index</key>
+    <key alias="addTextBox">Add another text box</key>
+    <key alias="removeTextBox">Remove this text box</key>
+    <key alias="contentRoot">Content root</key>
+    <key alias="includeUnpublished">Include drafts: also publish unpublished content items.</key>
+    <key alias="isSensitiveValue">This value is hidden. If you need access to view this value please contact your website administrator.</key>
+    <key alias="isSensitiveValue_short">This value is hidden.</key>
+    <key alias="languagesToPublishForFirstTime">What languages would you like to publish? All languages with content are saved!</key>
+    <key alias="languagesToPublish">What languages would you like to publish?</key>
+    <key alias="languagesToSave">What languages would you like to save?</key>
+    <key alias="languagesToSaveForFirstTime">All languages with content are saved on creation!</key>
+    <key alias="languagesToSendForApproval">What languages would you like to send for approval?</key>
+    <key alias="languagesToSchedule">What languages would you like to schedule?</key>
+    <key alias="languagesToUnpublish">Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages.</key>
+    <key alias="publishedLanguages">Published Languages</key>
+    <key alias="unpublishedLanguages">Unpublished Languages</key>
+    <key alias="unmodifiedLanguages">Unmodified Languages</key>
+    <key alias="untouchedLanguagesForFirstTime">These languages haven't been created</key>
+    <key alias="readyToPublish">Ready to Publish?</key>
+    <key alias="readyToSave">Ready to Save?</key>
+    <key alias="sendForApproval">Send for approval</key>
+    <key alias="schedulePublishHelp">Select the date and time to publish and/or unpublish the content item.</key>
+    <key alias="createEmpty">Create new</key>
+    <key alias="createFromClipboard">Paste from clipboard</key>
+    <key alias="nodeIsInTrash">This item is in the Recycle Bin</key>
+  </area>
+  <area alias="blueprints">
+    <key alias="createBlueprintFrom">Vytvořit novou šablonu obsahu z '%0%'</key>
+    <key alias="blankBlueprint">Prázdná</key>
+    <key alias="selectBlueprint">Vybrat obsahovou šablonu</key>
+    <key alias="createdBlueprintHeading">Šablona obsahu byla vytvořena</key>
+    <key alias="createdBlueprintMessage">Šablona obsahu byla vytvořena z '%0%'</key>
+    <key alias="duplicateBlueprintMessage">Již existuje jiná šablona obsahu se stejným názvem</key>
+    <key alias="blueprintDescription">Šablona obsahu je předdefinovaný obsah, který si editor může vybrat jako základ pro vytváření nového obsahu</key>
   </area>
   <area alias="media">
     <key alias="clickToUpload">Klikněte pro nahrání</key>
+    <key alias="orClickHereToUpload">nebo kliknutím sem vyberte soubory</key>
+        <key alias="dragFilesHereToUpload">Sem můžete přetáhnout a nahrát soubory.</key>
+    <key alias="disallowedFileType">Tento soubor nelze nahrát, nemá povolený typ souboru</key>
+    <key alias="maxFileSize">Maximální velikost souboru je</key>
+    <key alias="mediaRoot">Nejvyšší složka médií</key>
+    <key alias="moveFailed">Nepodařilo se přesunout média</key>
+    <key alias="moveToSameFolderFailed">Nadřazené a cílové složky nemohou být stejné</key>
+    <key alias="copyFailed">Médium se nepodařilo zkopírovat</key>
+    <key alias="createFolderFailed">Nepodařilo se vytvořit složku pod nadřazeným id %0%</key>
+    <key alias="renameFolderFailed">Nepodařilo se přejmenovat složku s id %0%</key>
+    <key alias="dragAndDropYourFilesIntoTheArea">Přetáhněte své soubory do oblasti</key>
+  </area>
+  <area alias="member">
+    <key alias="createNewMember">Vytvořit nového člena</key>
+    <key alias="allMembers">Všichni členové</key>
+    <key alias="memberGroupNoProperties">Členské skupiny nemají žádné další vlastnosti pro úpravy.</key>
   </area>
   <area alias="create">
     <key alias="chooseNode">Kde chcete vytvořit nový %0%</key>
     <key alias="createUnder">Vytvořit položku pod</key>
+    <key alias="createContentBlueprint">Vyberte typ dokumentu, pro který chcete vytvořit šablonu obsahu</key>
+    <key alias="enterFolderName">Zadejte název složky</key>
     <key alias="updateData">Vyberte typ a titulek</key>
     <key alias="noDocumentTypes" version="7.0"><![CDATA[Nejsou dostupné žádné povolené typy dokumentů. Tyto musíte povolit v sekci nastavení pod <strong>"typy dokumentů"</strong>.]]></key>
+    <key alias="noDocumentTypesAtRoot"><![CDATA[Nejsou zde k dispozici žádné typy dokumentů pro vytváření obsahu. Musíte je vytvořit v <strong>Typy dokumentů</strong> v části <strong>Nastavení</strong>.]]></key>
+    <key alias="noDocumentTypesWithNoSettingsAccess">Vybraná stránka ve stromu obsahu neumožňuje vytváření žádných stránek pod ní.</key>
+    <key alias="noDocumentTypesEditPermissions">Oprávnění k úpravám pro tento typ dokumentu</key>
+    <key alias="noDocumentTypesCreateNew">Vytvořit nový typ dokumentu</key>
+    <key alias="noDocumentTypesAllowedAtRoot"><![CDATA[Nejsou zde k dispozici žádné povolené typy dokumentů pro vytváření obsahu. Musíte je povolit v sekci <strong>Typy dokumentů</strong> v části <strong>Nastavení</strong> změnou možnosti <strong>Povolit jako root</strong> v části <strong>Oprávnění</strong>.]]></key>
     <key alias="noMediaTypes" version="7.0"><![CDATA[Nejsou dostupné žádné povolené typy medií. Tyto musíte povolit v sekci nastavení pod <strong>"typy medií"</strong>.]]></key>
+    <key alias="noMediaTypesWithNoSettingsAccess">Vybraná média ve stromu neumožňuje vytváření pod nimi žádná další média.</key>
+    <key alias="noMediaTypesEditPermissions">Upravit oprávnění pro tento typ média</key>    
+    <key alias="documentTypeWithoutTemplate">Typ dokumentu bez šablony</key>
+    <key alias="newFolder">Nová složka</key>
+    <key alias="newDataType">Nový datový typ</key>
+    <key alias="newJavascriptFile">Nový skript JavaScript</key>
+    <key alias="newEmptyPartialView">Nová prázdná částečná šablona</key>
+    <key alias="newPartialViewMacro">Nové makro pro částečnou šablonu</key>
+    <key alias="newPartialViewFromSnippet">Nová částečná šablona ze snippetu</key>
+    <key alias="newPartialViewMacroFromSnippet">Nové makro částečné šablony ze snippetu</key>
+    <key alias="newPartialViewMacroNoMacro">Nové makro pro částečnou šablonu (bez makra)</key>
+    <key alias="newStyleSheetFile">Nový soubor stylů - stylopis</key>
+    <key alias="newRteStyleSheetFile">Nový soubor stylů Rich Text editoru</key>
   </area>
   <area alias="dashboard">
     <key alias="browser">Prohlédnout svůj web</key>
@@ -174,35 +380,42 @@
     <key alias="welcome">Vítejte</key>
   </area>
   <area alias="prompt">
-    <key alias="stay">Stay</key>
-    <key alias="discardChanges">Discard changes</key>
-    <key alias="unsavedChanges">You have unsaved changes</key>
-    <key alias="unsavedChangesWarning">Are you sure you want to navigate away from this page? - you have unsaved changes</key>
+    <key alias="stay">Zůstat zde</key>
+    <key alias="discardChanges">Zahodit změny</key>
+    <key alias="unsavedChanges">Máte neuložené změny</key>
+    <key alias="unsavedChangesWarning">Opravdu chcete opustit tuto stránku? Máte neuložené změny.</key>
+    <key alias="confirmListViewPublish">Publikování zviditelní vybrané položky na webu.</key>
+    <key alias="confirmListViewUnpublish">Zrušení publikování odstraní vybrané položky a všechny jejich potomky z webu.</key>
+    <key alias="confirmUnpublish">Zrušení publikování odstraní tuto stránku a všechny její potomky z webu.</key>
+    <key alias="doctypeChangeWarning">Máte neuložené změny. Provedením změn typu dokumentu změny zahodíte.</key>
   </area>
   <area alias="bulk">
-    <key alias="done">Done</key>
-    <key alias="deletedItem">Deleted %0% item</key>
-    <key alias="deletedItems">Deleted %0% items</key>
-    <key alias="deletedItemOfItem">Deleted %0% out of %1% item</key>
-    <key alias="deletedItemOfItems">Deleted %0% out of %1% items</key>
-    <key alias="publishedItem">Published %0% item</key>
-    <key alias="publishedItems">Published %0% items</key>
-    <key alias="publishedItemOfItem">Published %0% out of %1% item</key>
-    <key alias="publishedItemOfItems">Published %0% out of %1% items</key>
-    <key alias="unpublishedItem">Unpublished %0% item</key>
-    <key alias="unpublishedItems">Unpublished %0% items</key>
-    <key alias="unpublishedItemOfItem">Unpublished %0% out of %1% item</key>
-    <key alias="unpublishedItemOfItems">Unpublished %0% out of %1% items</key>
-    <key alias="movedItem">Moved %0% item</key>
-    <key alias="movedItems">Moved %0% items</key>
-    <key alias="movedItemOfItem">Moved %0% out of %1% item</key>
-    <key alias="movedItemOfItems">Moved %0% out of %1% items</key>
-    <key alias="copiedItem">Copied %0% item</key>
-    <key alias="copiedItems">Copied %0% items</key>
-    <key alias="copiedItemOfItem">Copied %0% out of %1% item</key>
-    <key alias="copiedItemOfItems">Copied %0% out of %1% items</key>
+    <key alias="done">Hotovo</key>
+    <key alias="deletedItem">Smazána %0% položka</key>
+    <key alias="deletedItems">Smazáno %0% položek</key>
+    <key alias="deletedItemOfItem">Smazána %0% z %1% položek</key>
+    <key alias="deletedItemOfItems">Smazáno %0% z %1% položek</key>
+    <key alias="publishedItem">Publikována %0% položka</key>
+    <key alias="publishedItems">Publikováno %0% položek</key>
+    <key alias="publishedItemOfItem">Publikována %0% z %1% položek</key>
+    <key alias="publishedItemOfItems">Publikováno %0% z %1% položek</key>
+    <key alias="unpublishedItem">Zrušeno publikování %0% položky</key>
+    <key alias="unpublishedItems">Zrušeno publikování %0% položek</key>
+    <key alias="unpublishedItemOfItem">Zrušeno publikování %0% z %1% položek</key>
+    <key alias="unpublishedItemOfItems">Zrušeno publikování %0% z %1% položek</key>
+    <key alias="movedItem">Přesunuta %0% položka</key>
+    <key alias="movedItems">Přesunuto %0% položek</key>
+    <key alias="movedItemOfItem">Přesunuta %0% z %1% položek</key>
+    <key alias="movedItemOfItems">Přesunuto %0% z %1% položek</key>
+    <key alias="copiedItem">Zkopírována %0% položka</key>
+    <key alias="copiedItems">Zkopírováno %0% položek</key>
+    <key alias="copiedItemOfItem">Zkopírována %0% z %1% položek</key>
+    <key alias="copiedItemOfItems">Zkopírováno %0% z %1% položek</key>
   </area>
   <area alias="defaultdialogs">
+    <key alias="nodeNameLinkPicker">Titulek odkazu</key>
+    <key alias="urlLinkPicker">Odkaz</key>
+    <key alias="anchorLinkPicker">Kotva / dotaz</key>
     <key alias="anchorInsert">Název</key>
     <key alias="assignDomain">Spravovat názvy hostitelů</key>
     <key alias="closeThisWindow">Zavřít toto okno</key>
@@ -213,6 +426,7 @@
     <key alias="cut">Vyjmout</key>
     <key alias="editdictionary">Editovat položku slovníku</key>
     <key alias="editlanguage">Editovat jazyk</key>
+    <key alias="editSelectedMedia">Edit selected media</key>
     <key alias="insertAnchor">Vložit místní odkaz</key>
     <key alias="insertCharacter">Vložit znak</key>
     <key alias="insertgraphicheadline">Vložit grafický titulek</key>
@@ -220,19 +434,25 @@
     <key alias="insertlink">Vložit odkaz</key>
     <key alias="insertMacro">Kliknout pro přidání makra</key>
     <key alias="inserttable">Vložit tabulku</key>
+    <key alias="languagedeletewarning">Tím se odstraní jazyk</key>
+    <key alias="languageChangeWarning">Změna kultury jazyka může být náročná operace a bude mít za následek opětovné sestavení mezipaměti obsahu a indexů</key>
     <key alias="lastEdited">Naposledy editováno</key>
     <key alias="link">Odkaz</key>
     <key alias="linkinternal">Místní odkaz:</key>
     <key alias="linklocaltip">Při používání místních odkazů vložte znak "#" před odkaz</key>
     <key alias="linknewwindow">Otevřít v novém okně?</key>
+	<key alias="macroContainerSettings">Nastavení makra</key>
     <key alias="macroDoesNotHaveProperties">Toto makro nemá žádné vlastnosti, které by bylo možno editovat</key>
     <key alias="paste">Vložit</key>
     <key alias="permissionsEdit">Editovat oprávnění pro</key>
+    <key alias="permissionsSet">Nastavit oprávnění pro</key>
+    <key alias="permissionsSetForGroup">Nastavit oprávnění pro %0% pro skupinu %1%</key>
+    <key alias="permissionsHelp">Vyberte skupiny uživatelů, pro které chcete nastavit oprávnění</key>
     <key alias="recycleBinDeleting">Položky koše jsou nyní mazány. Nezavírejte, prosím, toto okno, dokud operace probíhá</key>
     <key alias="recycleBinIsEmpty">Koš je nyní prázdný</key>
     <key alias="recycleBinWarning">Odebrání položek z koše způsobí jejich trvalé odstranění</key>
     <key alias="regexSearchError"><![CDATA[Webová služba<a target='_blank' href='http://regexlib.com'>regexlib.com</a> má v tuto chvíli nějaké problémy, které jsou mimo naší kontrolu. Omlouváme se za vzniklé nepříjemnosti.]]></key>
-    <key alias="regexSearchHelp">Vyhledat regulární výraz pro přidání validace formulářového prvku. Například: 'email, 'PSČ' 'url'</key>
+    <key alias="regexSearchHelp">Vyhledat regulární výraz pro přidání validace formulářového prvku. Například: 'email, 'PSČ' 'URL'</key>
     <key alias="removeMacro">Odstranit makro</key>
     <key alias="requiredField">Pole je vyžadování</key>
     <key alias="sitereindexed">Web je přeindexován</key>
@@ -243,21 +463,109 @@
     <key alias="thumbnailimageclickfororiginal">Klikněte na obrázek pro zobrazení v plné velikosti</key>
     <key alias="treepicker">Vybrat položku</key>
     <key alias="viewCacheItem">Zobrazit položku mezipaměti</key>
+    <key alias="relateToOriginalLabel">Navázat na originál</key>
+    <key alias="includeDescendants">Včetně potomků</key>
+    <key alias="theFriendliestCommunity">Nejpřátelštější komunita</key>
+    <key alias="linkToPage">Odkaz na stránku</key>
+    <key alias="openInNewWindow">Otevře propojený dokument v novém okně nebo na kartě</key>
+    <key alias="linkToMedia">Odkaz na média</key>
+    <key alias="selectContentStartNode">Vybrat počáteční uzel obsahu</key>
+    <key alias="selectMedia">Vybrat média</key>
+    <key alias="selectMediaType">Vybrat typ média</key>
+    <key alias="selectIcon">Vybrat ikonu</key>
+    <key alias="selectItem">Vybrat položku</key>
+    <key alias="selectLink">Vybrat odkaz</key>
+    <key alias="selectMacro">Vybrat makro</key>
+    <key alias="selectContent">Vybrat obsah</key>
+    <key alias="selectContentType">Vybrat typ obsahu</key>
+    <key alias="selectMediaStartNode">Vybrat počáteční uzel média</key>
+    <key alias="selectMember">Vybrat člena</key>
+    <key alias="selectMemberGroup">Vybrat skupinu členů</key>
+    <key alias="selectMemberType">Vybrat typ člena</key>
+    <key alias="selectNode">Vybrat uzel</key>
+    <key alias="selectSections">Vybrat sekce</key>
+    <key alias="selectUsers">Vybrat uživatele</key>
+    <key alias="noIconsFound">Nebyly nalezeny žádné ikony</key>
+    <key alias="noMacroParams">Pro toto makro neexistují žádné parametry</key>
+    <key alias="noMacros">K dispozici nejsou žádná makra</key>
+    <key alias="externalLoginProviders">Externí poskytovatelé přihlášení</key>
+    <key alias="exceptionDetail">Podrobnosti o výjimce</key>
+    <key alias="stacktrace">Stacktrace</key>
+    <key alias="innerException">Vnitřní výjimka</key>
+    <key alias="linkYour">Propojit se</key>
+    <key alias="unLinkYour">Odpojit se</key>
+    <key alias="account">účet</key>
+    <key alias="selectEditor">Vybrat editora</key>
+    <key alias="selectSnippet">Vybrat snippet</key>
+    <key alias="variantdeletewarning">Tímto odstraníte uzel a všechny jeho jazyky. Pokud chcete smazat pouze jeden jazyk, měli byste zrušit publikování uzlu v tomto jazyce.</key>
+  </area>
+  <area alias="dictionary">
+    <key alias="noItems">Nejsou žádné položky ve slovníku.</key>
   </area>
   <area alias="dictionaryItem">
     <key alias="description"><![CDATA[
       Editujte různé jazykové verze pro položku slovníku '<em>%0%</em>' níže.<br/>Můžete přidat další jazyky v nabídce 'jazyky' nalevo.]]></key>
     <key alias="displayName">Název jazyka</key>
+    <key alias="changeKeyError"><![CDATA[
+      Klíč '%0%' již existuje.
+   ]]></key>
+    <key alias="overviewTitle">Přehled slovníku</key>
+  </area>
+  <area alias="examineManagement">
+    <key alias="configuredSearchers">Konfigurovaní vyhledávače</key>
+    <key alias="configuredSearchersDescription">Zobrazuje vlastnosti a nástroje pro libovolný konfigurovaný vyhledávač (např. pro víceindexový vyhledávač)</key>
+    <key alias="fieldValues">Hodnoty pole</key>
+    <key alias="healthStatus">Stav</key>
+    <key alias="healthStatusDescription">Stav indexu a jeho čitelnost</key>
+    <key alias="indexers">Indexery</key>
+    <key alias="indexInfo">Informace o indexu</key>
+    <key alias="indexInfoDescription">Uvádí vlastnosti indexu</key>
+    <key alias="manageIndexes">Spravovat indexy Examine</key>
+    <key alias="manageIndexesDescription">Umožňuje zobrazit podrobnosti každého indexu a poskytuje některé nástroje pro správu indexů</key>
+    <key alias="rebuildIndex">Znovu vytvořit index</key>
+    <key alias="rebuildIndexWarning"><![CDATA[
+      To způsobí opětovné sestavení indexu.<br />V závislosti na tom, kolik obsahu je na vašem webu, může to chvíli trvat.<br />Nedoporučuje se znovu vytvářet index v době vysokého provozu na webu nebo při úpravách obsahu editory.
+     ]]>
+    </key>
+    <key alias="searchers">Vyhledávače</key>
+    <key alias="searchDescription">Prohledat index a zobrazit výsledky</key>
+    <key alias="tools">Nástroje</key>
+    <key alias="toolsDescription">Nástroje pro správu indexu</key>
+    <key alias="fields">pole</key>
+    <key alias="indexCannotRead">Index nelze číst a bude nutné jej znovu sestavit</key>
+    <key alias="processIsTakingLonger">Proces trvá déle, než se očekávalo, zkontrolujte Umbraco log a zkontrolujte, zda během této operace nedošlo k chybám</key>
+    <key alias="indexCannotRebuild">Tento index nelze znovu sestavit, protože nemá přiřazen</key>
+    <key alias="iIndexPopulator">IIndexPopulator</key>
   </area>
   <area alias="placeholders">
     <key alias="username">Zadejte Vaše uživatelské jméno</key>
     <key alias="password">Zadejte Vaše heslo</key>
+    <key alias="confirmPassword">Potvrďte heslo</key>
     <key alias="nameentity">Pojmenujte %0%...</key>
     <key alias="entername">Zadejte jméno...</key>
+    <key alias="enteremail">Zadejte e-mail...</key>
+    <key alias="enterusername">Zadejte uživatelské jméno...</key>
+    <key alias="label">Popisek...</key>
+    <key alias="enterDescription">Zadejte popis...</key>
     <key alias="search">Pište pro vyhledání...</key>
     <key alias="filter">Pište pro filtrování...</key>
+    <key alias="enterTags">Pište pro vložení štítků (po každém stiskněte klávesu Enter)...</key>
+    <key alias="email">Vložte svůj e-mail</key>
+    <key alias="enterMessage">Vložte zprávu...</key>
+    <key alias="usernameHint">Vaše uživatelské jméno je obvykle váš e-mail</key>
+    <key alias="anchor">#hodnota or ?klíč=hodnota</key>
+    <key alias="enterAlias">Vložte alias...</key>
+    <key alias="generatingAlias">Generování aliasu...</key>
   </area>
   <area alias="editcontenttype">
+    <key alias="createListView" version="7.2">Vytvořit vlastní zobrazení seznamu</key>
+    <key alias="removeListView" version="7.2">Odebrat vlastní zobrazení seznamu</key>
+    <key alias="aliasAlreadyExists">Typ obsahu, typ média nebo typ člena s tímto aliasem již existuje</key>
+  </area>
+  <area alias="renamecontainer">
+    <key alias="renamed">Přejmenováno</key>
+    <key alias="enterNewFolderName">Sem zadejte nový název složky</key>
+    <key alias="folderWasRenamed">%0% přejmenováno na %1%</key>
   </area>
   <area alias="editdatatype">
     <key alias="addPrevalue">Přidat předlohu</key>
@@ -271,6 +579,15 @@
     <key alias="rteRelatedStylesheets">Související stylopisy</key>
     <key alias="rteShowLabel">Zobrazit jmenovku</key>
     <key alias="rteWidthAndHeight">Šířka a výška</key>
+    <key alias="allPropTypes">Všechny typy vlastností a údaje o nich</key>
+    <key alias="willBeDeleted">použití tohoto datového typu bude trvale smazáno, potvrďte, že je chcete  odstranit</key>
+    <key alias="yesDelete">Ano, smazat</key>
+    <key alias="andAllRelated">a všechny typy vlastností a data vlastností používající tento typ dat</key>
+    <key alias="selectFolder">Vyberte složku, kterou chcete přesunout</key>
+    <key alias="inTheTree">do stromové struktury níže</key>
+    <key alias="wasMoved">byla přesunuta pod</key>
+    <key alias="hasReferencesDeleteConsequence"><![CDATA[Smazáním <strong>%0%</strong> vymažete vlastnosti a jejich data z následujících položek]]></key>
+    <key alias="acceptDeleteConsequence">Rozumím, že tato akce odstraní vlastnosti a data založená na tomto datovém typu</key>
   </area>
   <area alias="errorHandling">
     <key alias="errorButDataWasSaved">Vaše data byla uložena, ale než budete moci publikovat tuto stránku, je třeba odstranit některé chyby:</key>
@@ -286,10 +603,12 @@
     <key alias="errorRegExpWithoutTab">%0% není ve správném formátu</key>
   </area>
   <area alias="errors">
+    <key alias="receivedErrorFromServer">Ze serveru byla přijata chyba</key>
     <key alias="dissallowedMediaType">Použití daného typu souboru bylo zakázáno adminitrátorem</key>
     <key alias="codemirroriewarning">UPOZORNĚNÍ! I když CodeMirror je dle konfigurace povolený, je zakázaný v Internet Exploreru, protože není dost stabilní.</key>
     <key alias="contentTypeAliasAndNameNotNull">Vyplňte, prosím, alias i název nového typu vlastností!</key>
     <key alias="filePermissionsError">Vyskytl se problém při čtení/zápisu do určeného souboru nebo adresáře</key>
+    <key alias="macroErrorLoadingPartialView">Chyba při načítání skriptu částečné šablony (soubor: %0%)</key>
     <key alias="missingTitle">Uveďte, prosím, titulek</key>
     <key alias="missingType">Vyberte, prosím, typ</key>
     <key alias="pictureResizeBiggerThanOrg">Chystáte se obrázek zvětšit více, než je jeho původní rozměr. Opravdu chcete pokračovat?</key>
@@ -298,34 +617,43 @@
     <key alias="stylesNoStylesOnPage">Žádne aktivní styly nejsou dostupné</key>
     <key alias="tableColMergeLeft">Umístěte, prosím, kurzor nalevo od těch dvou buňek, které chcete sloučit</key>
     <key alias="tableSplitNotSplittable">Nemužete rozdělit buňku, která nebyla sloučená.</key>
+    <key alias="propertyHasErrors">Tato vlastnost je neplatná</key>
   </area>
   <area alias="general">
+    <key alias="options">Volby</key>
     <key alias="about">O...</key>
     <key alias="action">Akce</key>
     <key alias="actions">Akce</key>
     <key alias="add">Přidat</key>
     <key alias="alias">Alias</key>
+    <key alias="all">Vše</key>
     <key alias="areyousure">Jste si jistí?</key>
+    <key alias="back">Zpět</key>
+    <key alias="backToOverview">Zpět na přehled</key>
     <key alias="border">Okraj</key>
     <key alias="by">o</key>
     <key alias="cancel">Zrušit</key>
     <key alias="cellMargin">Okraj buňky</key>
     <key alias="choose">Vybrat</key>
+    <key alias="clear">Vyčistit</key>
     <key alias="close">Zavřít</key>
     <key alias="closewindow">Zavřít okno</key>
     <key alias="comment">Komentovat</key>
     <key alias="confirm">Potvrdit</key>
+    <key alias="constrain">Omezit</key>
     <key alias="constrainProportions">Zachovat proporce</key>
+    <key alias="content">Obsah</key>
     <key alias="continue">Pokračovat</key>
     <key alias="copy">Kopírovat</key>
     <key alias="create">Vytvořit</key>
-    <key alias="database">Databáse</key>
+    <key alias="database">Databáze</key>
     <key alias="date">Datum</key>
     <key alias="default">Výchozí</key>
     <key alias="delete">Odstranit</key>
     <key alias="deleted">Odstraněno</key>
     <key alias="deleting">Odstraňování...</key>
     <key alias="design">Vzhled</key>
+    <key alias="dictionary">Slovník</key>
     <key alias="dimensions">Rozměry</key>
     <key alias="down">Dolů</key>
     <key alias="download">Stáhnout</key>
@@ -334,60 +662,90 @@
     <key alias="elements">Prvky</key>
     <key alias="email">Email</key>
     <key alias="error">Chyba</key>
+    <key alias="field">Pole</key>
     <key alias="findDocument">Najít</key>
+    <key alias="first">První</key>
+    <key alias="focalPoint">Focal point</key>
+    <key alias="general">Obecné</key>
+    <key alias="groups">Skupiny</key>
+    <key alias="group">Skupina</key>
     <key alias="height">Výška</key>
     <key alias="help">Nápověda</key>
+    <key alias="hide">Skrýt</key>
+    <key alias="history">Historie</key>
     <key alias="icon">Ikona</key>
+    <key alias="id">Id</key>
     <key alias="import">Import</key>
+    <key alias="includeFromsubFolders">Zahrnout podsložky do vyhledávání</key>
+    <key alias="info">Info</key>
     <key alias="innerMargin">Vnitřní okraj</key>
     <key alias="insert">Vložit</key>
     <key alias="install">Instalovat</key>
+    <key alias="invalid">Neplatné</key>
     <key alias="justify">Vyrovnat</key>
+    <key alias="label">Popisek</key>
     <key alias="language">Jazyk</key>
+    <key alias="last">Poslední</key>
     <key alias="layout">Rozvržení</key>
+    <key alias="links">Odkazy</key>
     <key alias="loading">Nahrávání</key>
     <key alias="locked">Zamčeno</key>
     <key alias="login">Přihlášení</key>
     <key alias="logoff">Odhlášení</key>
     <key alias="logout">Odhlášení</key>
     <key alias="macro">Makro</key>
+    <key alias="mandatory">Povinné</key>
+    <key alias="message">Zpráva</key>
     <key alias="move">Přesunout</key>
     <key alias="name">Název</key>
     <key alias="new">Nový</key>
     <key alias="next">Následující</key>
     <key alias="no">Ne</key>
     <key alias="of">z</key>
+    <key alias="off">Vypnuto</key>
     <key alias="ok">OK</key>
     <key alias="open">Otevřít</key>
+    <key alias="on">Zapnuto</key>
     <key alias="or">nebo</key>
+    <key alias="orderBy">Seřadit podle</key>
     <key alias="password">Heslo</key>
     <key alias="path">Cesta</key>
     <key alias="pleasewait">Moment, prosím...</key>
     <key alias="previous">Předchozí</key>
     <key alias="properties">Vlastnosti</key>
+    <key alias="rebuild">Obnovit</key>
     <key alias="reciept">Email pro obdržení formulářových dat</key>
     <key alias="recycleBin">Koš</key>
+    <key alias="recycleBinEmpty">Váš koš je prázdný</key>
+    <key alias="reload">Znovu načíst</key>
     <key alias="remaining">Zbývající</key>
+    <key alias="remove">Odebrat</key>
     <key alias="rename">Přejmenovat</key>
     <key alias="renew">Obnovit</key>
     <key alias="required" version="7.0">Povinné</key>
+    <key alias="retrieve">Načíst</key>
     <key alias="retry">Zopakovat</key>
     <key alias="rights">Oprávnění</key>
+    <key alias="scheduledPublishing">Plánované publikování</key>
     <key alias="search">Hledat</key>
+    <key alias="searchNoResult">Litujeme, ale nemůžeme najít to, co hledáte.</key>
+    <key alias="noItemsInList">Nebyly přidány žádné položky</key>
     <key alias="server">Server</key>
+    <key alias="settings">Nastavení</key>
     <key alias="show">Zobrazit</key>
     <key alias="showPageOnSend">Zobrazit stránku při odeslání</key>
     <key alias="size">Rozměr</key>
     <key alias="sort">Seřadit</key>
-    <key alias="submit">Submit</key>
-    <!-- TODO: Translate this -->
-    <key alias="type">Typ</key>
-    <key alias="typeToSearch">Pro hledání pište...</key>
+    <key alias="status">Stav</key>
+    <key alias="submit">Potvrdit</key>
+    <key alias="type">Zadejte</key>
+    <key alias="typeToSearch">Pište pro vyhledávání...</key>
+    <key alias="under">pod</key>
     <key alias="up">Nahoru</key>
     <key alias="update">Aktualizovat</key>
     <key alias="upgrade">Povýšit</key>
     <key alias="upload">Nahrání</key>
-    <key alias="url">Url</key>
+    <key alias="url">URL</key>
     <key alias="user">Uživatel</key>
     <key alias="username">Uživatelské jméno</key>
     <key alias="value">Hodnota</key>
@@ -397,18 +755,56 @@
     <key alias="yes">Ano</key>
     <key alias="folder">Složka</key>
     <key alias="searchResults">Výsledky hledání</key>
-    <key alias="reorder">Reorder</key>
-    <key alias="reorderDone">I am done reordering</key>
+    <key alias="reorder">Přesunout</key>
+    <key alias="reorderDone">Skončil jsem s přesouváním</key>
+    <key alias="preview">Náhled</key>
+    <key alias="changePassword">Změnit heslo</key>
+    <key alias="to">na</key>
+    <key alias="listView">Seznam</key>
+    <key alias="saving">Ukládám...</key>
+    <key alias="current">aktuální</key>
+    <key alias="embed">Vložené</key>
+    <key alias="selected">vybrané</key>
+    <key alias="other">Další</key>
+    <key alias="articles">Články</key>
+    <key alias="videos">Videa</key>
+    <key alias="installing">Instalování</key>
+  </area>
+  <area alias="colors">
+    <key alias="blue">Modrá</key>
+  </area>
+  <area alias="shortcuts">
+    <key alias="addGroup">Přidat skupinu</key>
+    <key alias="addProperty">Přidat vlastnost</key>
+    <key alias="addEditor">Přidat editor</key>
+    <key alias="addTemplate">Přidat šablonu</key>
+    <key alias="addChildNode">Přidat vnořený uzel</key>
+    <key alias="addChild">Přidat potomka</key>
+    <key alias="editDataType">Upravit datový typ</key>
+    <key alias="navigateSections">Navigace v sekcích</key>
+    <key alias="shortcut">Klávesové zkratky</key>
+    <key alias="showShortcuts">zobrazit klávesové zkratky</key>
+    <key alias="toggleListView">Přepnout zobrazení seznamu</key>
+    <key alias="toggleAllowAsRoot">Přepnout povolení jako root</key>
+    <key alias="commentLine">Okomentovat/Odkomentovat řádky</key>
+    <key alias="removeLine">Odebrat řádek</key>
+    <key alias="copyLineUp">Kopírovat řádky nahoru</key>
+    <key alias="copyLineDown">Kopírovat řádky dolů</key>
+    <key alias="moveLineUp">Přesunout řádky nahoru</key>
+    <key alias="moveLineDown">Přesunout řádky dolů</key>
+    <key alias="generalHeader">Obecný</key>
+    <key alias="editorHeader">Editor</key>
+    <key alias="toggleAllowCultureVariants">Přepnout povolení jazykových verzí</key>
   </area>
   <area alias="graphicheadline">
-    <key alias="backgroundcolor">Background color</key>
-    <key alias="bold">Bold</key>
-    <key alias="color">Text color</key>
+    <key alias="backgroundcolor">Barva pozadí</key>
+    <key alias="bold">Tučně</key>
+    <key alias="color">Barva písma</key>
     <key alias="font">Font</key>
     <key alias="text">Text</key>
   </area>
   <area alias="headers">
-    <key alias="page">Page</key>
+    <key alias="page">Stránka</key>
   </area>
   <area alias="installer">
     <key alias="databaseErrorCannotConnect">Instalátor se nemůže připojit k databázi.</key>
@@ -422,8 +818,8 @@
     <key alias="databaseNotFound"><![CDATA[<p>Databáze nenalezena! Zkontrolujte, prosím, že informace v "připojovacím řetězci" souboru "web.config" jsou správné.</p>
               <p>Pro pokračování otevřete, prosím, soubor "web.config" (za pužití Visual Studia nebo Vašeho oblíbeného tedtového editoru), přejděte na jeho konec, přidejte připojovací řetězec pro Vaši databázi v klíčí nazvaném "umbracoDbDSN" a soubor uložte. </p>
               <p>
-              Klikněte na tlačítko <strong>zopakovat</strong>, až budete hotovi.<br /><a href="http://umbraco.org/redir/installWebConfig" target="_blank">
-			              Další informace o editování souboru web.config zde.</a></p>]]></key>
+              Klikněte na tlačítko <strong>zopakovat</strong>, až budete hotovi.<br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">
+			              Další informace o editování souboru web.config zde</a>.</p>]]></key>
     <key alias="databaseText"><![CDATA[Pro dokončení tohoto kroku potřebujete znát některé informace týkající se Vašeho databázového serveru ("připojovací řetězec").<br />
         Pokud je to nezbytné, kontaktujte vašeho poskytovatele hostingu.
         Jestliže instalujete na místní počítač nebo server, budete potřebovat informace od Vašeho systémového administrátora.]]></key>
@@ -441,7 +837,7 @@
     <key alias="defaultUserPassChanged"><![CDATA[<strong>Heslo výchozího uživatele bylo úspěšně změněno od doby instalace!</strong></p><p>Netřeba nic dalšího dělat. Klikněte na <b>Následující</b> pro pokračování.]]></key>
     <key alias="defaultUserPasswordChanged">Heslo je změněno!</key>
     <key alias="greatStart">Mějte skvělý start, sledujte naše uváděcí videa</key>
-    <key alias="licenseText">Kliknutím na tlačítko následující (nebo modifikováním umbracoConfigurationStatus v souboru web.config) přijímáte licenci tohoto software tak, jak je uvedena v poli níže. Upozorňujeme, že tato distribuce umbraca se skládá ze dvou různých licencí, open source MIT licence pro framework a umbraco freeware licence, která pokrývá UI.</key>
+    <key alias="licenseText">Kliknutím na tlačítko následující (nebo modifikováním umbracoConfigurationStatus v souboru web.config) přijímáte licenci tohoto software tak, jak je uvedena v poli níže. Upozorňujeme, že tato distribuce Umbraca se skládá ze dvou různých licencí, open source MIT licence pro framework a umbraco freeware licence, která pokrývá UI.</key>
     <key alias="None">Není nainstalováno.</key>
     <key alias="permissionsAffectedFolders">Dotčené soubory a složky</key>
     <key alias="permissionsAffectedFoldersMoreInfo">Další informace o nastavování oprávnění pro umbraco zde</key>
@@ -469,7 +865,7 @@
     <key alias="runwayFromScratch">Chci začít od nuly</key>
     <key alias="runwayFromScratchText"><![CDATA[
         V tuto chíli je Váš web úplně prázdný, takže je ideální chvíle začít od nuly a vytvořit si vlastní typy dokumentu a šablon.
-        (<a href="http://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">zjistěte jak</a>)
+        (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">zjistěte jak</a>)
         Stále se můžete později rozhodnout nainstalovat Runway. Za tím účelem navštivte Vývojářskou sekci a zvolte Balíčky.
       ]]></key>
     <key alias="runwayHeader">Právě jste vytvořili čistou platformu Umbraco. Co chcete dělat dále?</key>
@@ -515,8 +911,8 @@
                                 Stiskněte <strong>"následující"</strong> pro spuštění průvodce.]]></key>
   </area>
   <area alias="language">
-    <key alias="cultureCode">Kód kultury</key>
-    <key alias="displayName">Název kultury</key>
+    <key alias="cultureCode">Kód jazyka</key>
+    <key alias="displayName">Název jazyka</key>
   </area>
   <area alias="lockout">
     <key alias="lockoutWillOccur">Byli jste nečinní a odhlášení proběhne automaticky za</key>
@@ -531,8 +927,100 @@
     <key alias="greeting5">Šťastný bláznivý pátek</key>
     <key alias="greeting6">Šťastnou kočkobotu</key>
     <key alias="instruction">přihlašte se níže</key>
+    <key alias="signInWith">Přihlásit se pomocí</key>
     <key alias="timeout">Relace vypršela</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.org" style="text-decoration: none" target="_blank">umbraco.org</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.org</a></p> ]]></key>
+    <key alias="forgottenPassword">Zapomenuté heslo?</key>
+    <key alias="forgottenPasswordInstruction">Na uvedenou adresu bude zaslán e-mail s odkazem pro obnovení hesla</key>
+    <key alias="requestPasswordResetConfirmation">Pokud odpovídá našim záznamům, bude na zadanou adresu zaslán e-mail s pokyny k obnovení hesla</key>
+    <key alias="showPassword">Zobrazit heslo</key>
+    <key alias="hidePassword">Skrýt heslo</key>
+    <key alias="returnToLogin">Vrátit se na přihlašovací obrazovku</key>
+    <key alias="setPasswordInstruction">Zadejte nové heslo</key>
+    <key alias="setPasswordConfirmation">Vaše heslo bylo aktualizováno</key>
+    <key alias="resetCodeExpired">Odkaz, na který jste klikli, je neplatný nebo jeho platnost vypršela</key>
+    <key alias="resetPasswordEmailCopySubject">Umbraco: Resetování hesla</key>
+    <key alias="resetPasswordEmailCopyFormat"><![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Vyžadováno resetování hesla
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Vaše uživatelské jméno pro přihlášení do back-office Umbraco je: <strong>%0%</strong>
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
+																<tbody>
+																	<tr>
+																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																				Kliknutím na tento odkaz obnovíte své heslo
+																			</a>
+																		</td>
+																	</tr>
+																</tbody>
+															</table>
+														</p>
+														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>Pokud nemůžete kliknout na odkaz, zkopírujte a vložte tuto adresu URL do okna prohlížeče:</p>
+															<table border='0' cellpadding='0' cellspacing='0'>
+																<tr>
+																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
+																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
+																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%1%'>%1%</a>
+																		</font>
+																	</td>
+																</tr>
+															</table>
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+		</html>
+	]]></key>
   </area>
   <area alias="main">
     <key alias="dashboard">Ovládací panel</key>
@@ -555,6 +1043,7 @@
   </area>
   <area alias="notifications">
     <key alias="editNotifications">Upravte vaše oznámení pro %0%</key>
+    <key alias="notificationsSavedFor">Nastavení oznámení bylo uloženo pro</key>
     <key alias="mailBody"><![CDATA[
       Dobrý den, %0%
 
@@ -568,7 +1057,8 @@
 
       Zdraví umbraco robot
     ]]></key>
-    <key alias="mailBodyHtml"><![CDATA[<p>Hi %0%</p>
+    <key alias="mailBodyVariantSummary">Následující jazyky byly změněny %0%</key>
+    <key alias="mailBodyHtml"><![CDATA[<p>Ahoj %0%</p>
 
 		  <p>Toto je automatická zpráva informující Vás, že úloha <strong>'%1%'</strong>
 		  byla provedena na stránce <a href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a>
@@ -595,14 +1085,68 @@
 		  <p>Mějte hezký den!<br /><br />
 			  Zdraví umbraco robot
 		  </p>]]></key>
+    <key alias="mailBodyVariantHtmlSummary"><![CDATA[<p>Byly změněny následující jazyky:</p>
+        %0%
+    ]]></key>
     <key alias="mailSubject">[%0%] Upozornění o %1% na %2%</key>
     <key alias="notifications">Upozornění</key>
   </area>
   <area alias="packager">
+    <key alias="actions">Akce</key>
+    <key alias="created">Vytvořeno</key>
+    <key alias="createPackage">Vytvořit balíček</key>
     <key alias="chooseLocalPackageText"><![CDATA[
       Vyberte balíček ve svém počítači kliknutím na tlačítko Procházet<br />
          a výběrem balíčku. Balíčky umbraco mají obvykle přípony ".umb" nebo ".zip".
       ]]></key>
+    <key alias="deletewarning">Tím se balíček odstraní</key>
+    <key alias="dropHere">Přetáhněte sem pro nahrání</key>
+    <key alias="includeAllChildNodes">Zahrnout všechny podřízené uzly</key>
+    <key alias="orClickHereToUpload">nebo kliknutím sem vyberte soubor balíčku</key>
+    <key alias="uploadPackage">Nahrát balíček</key>
+    <key alias="localPackageDescription">Nainstalujte místní balíček výběrem ze svého počítače. Instalujte pouze balíčky ze zdrojů, které znáte a kterým důvěřujete</key>
+    <key alias="uploadAnother">Nahrát další balíček</key>
+    <key alias="cancelAndUploadAnother">Zrušit a nahrát další balíček</key>
+    <key alias="accept">Přijímám</key>
+    <key alias="termsOfUse">podmínky použití</key>
+    <key alias="pathToFile">Cesta k souboru</key>
+    <key alias="pathToFileDescription">Absolutní cesta k souboru (ie: /bin/umbraco.bin)</key>
+    <key alias="installed">Nainstalováno</key>
+    <key alias="installedPackages">Nainstalované balíčky</key>
+    <key alias="installLocal">Instalovat místní</key>
+    <key alias="installFinish">Dokončit</key>
+    <key alias="noConfigurationView">Tento balíček nemá žádné zobrazení konfigurace</key>
+    <key alias="noPackagesCreated">Zatím nebyly vytvořeny žádné balíčky</key>
+    <key alias="noPackages">Nemáte nainstalované žádné balíčky</key>
+    <key alias="noPackagesDescription"><![CDATA[Nemáte nainstalované žádné balíčky. Nainstalujte místní balíček tak, že jej vyberete ze svého počítače, nebo procházejte dostupné balíčky pomocí ikony <strong>Balíčky</strong> v pravém horním rohu obrazovky.]]></key>
+    <key alias="packageActions">Akce balíčku</key>
+    <key alias="packageAuthorUrl">Web autora</key>
+    <key alias="packageContent">Obsah balíčku</key>
+    <key alias="packageFiles">Soubory balíčku</key>
+    <key alias="packageIconUrl">URL ikony</key>
+    <key alias="packageInstall">Nainstalovat balíček</key>
+    <key alias="packageLicense">Licence</key>
+    <key alias="packageLicenseUrl">URL licence</key>
+    <key alias="packageProperties">Vlastnosti balíčku</key>
+    <key alias="packageSearch">Hledat balíčky</key>
+    <key alias="packageSearchResults">Výsledky pro</key>
+    <key alias="packageNoResults">Nemohli jsme nic najít</key>
+    <key alias="packageNoResultsDescription">Zkuste prosím vyhledat jiný balíček nebo procházet jednotlivé kategorie</key>
+    <key alias="packagesPopular">Oblíbené</key>
+    <key alias="packagesNew">Nové</key>
+    <key alias="packageHas">má</key>
+    <key alias="packageKarmaPoints">karma body</key>
+    <key alias="packageInfo">Informace</key>
+    <key alias="packageOwner">Vlastník</key>
+    <key alias="packageContrib">Přispěvatelé</key>
+    <key alias="packageCreated">Vytvořeno</key>
+    <key alias="packageCurrentVersion">Aktuální verze</key>
+    <key alias="packageNetVersion">.NET verze</key>
+    <key alias="packageDownloads">Počet stažení</key>
+    <key alias="packageLikes">Počet lajků</key>
+    <key alias="packageCompatibility">kompatibilita</key>
+    <key alias="packageCompatibilityDescription">Tento balíček je kompatibilní s následujícími verzemi Umbraco, jak ohlásili členové komunity. Plnou kompatibilitu nelze zaručit u verzí hlášených pod 100%</key>
+    <key alias="packageExternalSources">Externí zdroje</key>
     <key alias="packageAuthor">Autor</key>
     <key alias="packageDocumentation">Dokumentace</key>
     <key alias="packageMetaData">Meta data balíčku</key>
@@ -621,6 +1165,17 @@
       <span style="color: Red; font-weight: bold;">Upozornění:</span> všechny dokumenty, media atd. závislé na položkách, které odstraníte, přestanou pracovat a mohou vést k nestabilitě systému,
       takže odinstalovávejte opatrně. Jste-li na pochybách, kontaktujte autora balíčku.]]></key>
     <key alias="packageVersion">Verze balíčku</key>
+    <key alias="packageVersionUpgrade">Upgradování z verze</key>
+    <key alias="packageAlreadyInstalled">Balíček je již nainstalován</key>
+    <key alias="targetVersionMismatch">Tento balíček nelze nainstalovat, vyžaduje minimální verzi Umbraco</key>
+    <key alias="installStateUninstalling">Odinstalovávám...</key>
+    <key alias="installStateDownloading">Stahuji...</key>
+    <key alias="installStateImporting">Importuji...</key>
+    <key alias="installStateInstalling">Instaluji...</key>
+    <key alias="installStateRestarting">Restartuji, prosím čekejte...</key>
+    <key alias="installStateComplete">Vše je hotovo, váš prohlížeč se nyní obnoví, prosím čekejte...</key>
+    <key alias="installStateCompleted">Klepnutím na tlačítko „Dokončit“ dokončete instalaci a znovu načtěte stránku.</key>
+    <key alias="installStateUploading">Nahrávám balíček...</key>
   </area>
   <area alias="paste">
     <key alias="doNothing">Vložit s úplným formatováním (nedoporučeno)</key>
@@ -629,9 +1184,9 @@
     <key alias="removeSpecialFormattering">Vložit, ale odstranit formátování (doporučeno)</key>
   </area>
   <area alias="publicAccess">
-    <key alias="paAdvanced">Ochrana prostřednictvím rolí</key>
-    <key alias="paAdvancedHelp"><![CDATA[Pokud si přejete řídit přístup ke stránce za použití autentizace prostřednictvím rolí,<br /> použijte členské skupiny umbraca.]]></key>
-    <key alias="paAdvancedNoGroups">Musíte vytvořit členskou skupinu před tím, než můžete použít autentizaci prostřednictvím rolí</key>
+    <key alias="paGroups">Ochrana prostřednictvím rolí</key>
+    <key alias="paGroupsHelp"><![CDATA[Pokud si přejete řídit přístup ke stránce za použití autentizace prostřednictvím rolí,<br /> použijte členské skupiny umbraca.]]></key>
+    <key alias="paGroupsNoGroups">Musíte vytvořit členskou skupinu před tím, než můžete použít autentizaci prostřednictvím rolí</key>
     <key alias="paErrorPage">Chybová stránka</key>
     <key alias="paErrorPageHelp">Použita, když jsou lidé přihlášení, ale nemají přístup</key>
     <key alias="paHowWould">Vyberte, jak omezit přístup k této stránce</key>
@@ -640,16 +1195,28 @@
     <key alias="paLoginPage">Přihlašovací stránka</key>
     <key alias="paLoginPageHelp">Vyberte stránku, která obsahuje přihlašovací formulář</key>
     <key alias="paRemoveProtection">Odstranit ochranu</key>
+    <key alias="paRemoveProtectionConfirm"><![CDATA[Are you sure you want to remove the protection from the page <strong>%0%</strong>?]]></key>
     <key alias="paSelectPages">Vyberte stránky, které obsahují přihlašovací formulář a chybová hlášení</key>
     <key alias="paSelectRoles">Vyberte role, které mají přístup k této stránce</key>
+    <key alias="paSelectGroups"><![CDATA[Vyberte role, které mají přístup ke stránce <strong>%0%</strong>]]></key>
+    <key alias="paSelectMembers"><![CDATA[Vyberte členy, kteří mají přístup ke stránce <strong>%0%</strong>]]></key>
+    <key alias="paMembers">Ochrana konkrétních členů</key>
+    <key alias="paMembersHelp">Pokud si přejete udělit přístup konkrétním členům</key>
     <key alias="paSetLogin">Nastavte přihlašovací jmého a heslo pro tuto stránku</key>
     <key alias="paSimple">Jednouživatelská ochrana</key>
     <key alias="paSimpleHelp">Jestliže chcete nastavit jenom jednoduchou ochranu prostřednictvím uživatelského jména a hesla</key>
   </area>
   <area alias="publish">
+    <key alias="invalidPublishBranchPermissions">Nedostatečná uživatelská oprávnění k publikování všech potomků</key>
+    <key alias="contentPublishedFailedIsTrashed"><![CDATA[
+      %0% nelze publikovat, protože položka je v koši.
+    ]]></key>
     <key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
       %0% nemůže být publikována, protože položka je naplánovaná k uvolnění.
     ]]></key>
+    <key alias="contentPublishedFailedExpired"><![CDATA[
+      %0% nelze publikovat, protože platnost položky vypršela.
+    ]]></key>
     <key alias="contentPublishedFailedInvalid"><![CDATA[
       %0% nemůže být publikována, protože tyto vlastnosti: %1%  nesplňují validační pravidla.
     ]]></key>
@@ -659,7 +1226,9 @@
     <key alias="contentPublishedFailedByParent"><![CDATA[
       %0% nemůže být publikována, protože rodičovská stránka není publikována.
     ]]></key>
-    <key alias="includeUnpublished">Zahrnout nepublikované podřízené stránky</key>
+    <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% nelze zveřejnit, protože chybí jméno.]]></key>
+    <!-- TADY JSEM SKONCIL -->
+    <key alias="contentPublishedFailedReqCultureValidationError">Ověření se nezdařilo pro požadovaný jazyk '% 0%'. Tento jazyk byl uložen, ale nezveřejněn.</key>
     <key alias="inProgress">Probíhá publikování - počkejte, prosím...</key>
     <key alias="inProgressCounter">%0% ze %1% stránek bylo publikováno...</key>
     <key alias="nodePublish">%0% byla publikována</key>
@@ -668,23 +1237,49 @@
     <key alias="publishHelp"><![CDATA[Klikněte <em>ok</em> pro publikování <strong>%0%</strong> a tedy zveřejnění jejího obsahu.<br/><br />
       Můžete publikovat tuto stránku a všechny její podstránky zatrhnutím <em>publikovat všchny podstránky</em> níže.
       ]]></key>
+    <key alias="includeUnpublished">Zahrnout nepublikované podřízené stránky</key>
   </area>
   <area alias="colorpicker">
     <key alias="noColors">Nenakonfigurovali jste žádné schválené barvy</key>
   </area>
+  <area alias="contentPicker">
+    <key alias="allowedItemTypes">Můžete vybrat pouze položky typu (typů): %0%</key>
+    <key alias="pickedTrashedItem">Vybrali jste aktuálně odstraněnou položku obsahu nebo položku v koši</key>
+    <key alias="pickedTrashedItems">Vybrali jste aktuálně odstraněné položky obsahu nebo položky v koši</key>
+  </area>
+  <area alias="mediaPicker">
+    <key alias="deletedItem">Smazaná položka</key>
+    <key alias="pickedTrashedItem">Vybrali jste aktuálně odstraněnou položku média nebo položku v koši</key>
+    <key alias="pickedTrashedItems">Vybrali jste aktuálně odstraněné položky médií nebo položky médií v koši</key>
+    <key alias="trashed">V koši</key>
+  </area>
   <area alias="relatedlinks">
+    <key alias="enterExternal">zadejte externí odkaz</key>
+    <key alias="chooseInternal">zvolte interní stránku</key>
+    <key alias="caption">Nadpis</key>
+    <key alias="link">Odkaz</key>
+    <key alias="newWindow">Otevřít v novém okně</key>
+    <key alias="captionPlaceholder">zadejte titulek</key>
+    <key alias="externalLinkPlaceholder">Zadejte odkaz</key>
+    <!-- DEPRECATED ??? -->
     <key alias="addExternal">Přidat vnější odkaz</key>
     <key alias="addInternal">Přidat vnitřní odkaz</key>
     <key alias="addlink">Přidat</key>
-    <key alias="caption">Nadpis</key>
     <key alias="internalPage">Vnitřní stránka</key>
     <key alias="linkurl">URL</key>
     <key alias="modeDown">Posunout dolů</key>
     <key alias="modeUp">Posunout nahoru</key>
-    <key alias="newWindow">Otevřít v novém okně</key>
     <key alias="removeLink">Odebrat odkaz</key>
   </area>
+  <area alias="imagecropper">
+        <key alias="reset">Zrušit oříznutí</key>
+    <key alias="saveCrop">Uložit oříznutí</key>
+    <key alias="addCrop">Přidat nové oříznutí</key>
+        <key alias="updateEditCrop">Hotovo</key>
+        <key alias="undoEditCrop">Vrátit změny</key>
+  </area>
   <area alias="rollback">
+    <key alias="headline">Vyberte verzi, kterou chcete porovnat s aktuální verzí</key>
     <key alias="currentVersion">Současná verze</key>
     <key alias="diffHelp"><![CDATA[Tohle ukazuje rozdíly mezi současnou verzi a vybranou verzi<br /><del>Červený</del> text nebude ve vybrané verzi zobrazen, <ins>zelený znamená přidaný</ins>].]]></key>
     <key alias="documentRolledBack">Dokument byl vrácen na starší verzi</key>
@@ -697,20 +1292,29 @@
     <key alias="editscript">Editovat skriptovací soubor</key>
   </area>
   <area alias="sections">
-    <key alias="concierge">Domovník</key>
     <key alias="content">Obsah</key>
+    <key alias="forms">Formuláře</key>
+    <key alias="media">Média</key>
+    <key alias="member">Členové</key>
+    <key alias="packages">Balíčky</key>
+    <key alias="settings">Nastavení</key>
+    <key alias="translation">Překlad</key>
+    <key alias="users">Uživatelé</key>
+    <!-- DEPRECATED ??? -->
+    <key alias="concierge">Domovník</key>
     <key alias="courier">Kurýr</key>
     <key alias="developer">Vývojář</key>
     <key alias="installer">Průvodce nastavením Umbraca</key>
-    <key alias="media">Media</key>
-    <key alias="member">Členové</key>
     <key alias="newsletters">Zpravodaje</key>
-    <key alias="settings">Nastavení</key>
     <key alias="statistics">Statistiky</key>
-    <key alias="translation">Překlad</key>
-    <key alias="users">Uživatelé</key>
     <key alias="help" version="7.0">Nápověda</key>
   </area>
+  <area alias="help">
+    <key alias="tours">Příručky</key>
+    <key alias="theBestUmbracoVideoTutorials">Nejlepší videopříručky Umbraco</key>
+    <key alias="umbracoForum">Navštívit our.umbraco.com</key>
+    <key alias="umbracoTv">Navštívit umbraco.tv</key>
+  </area>
   <area alias="settings">
     <key alias="defaulttemplate">Výchozí šablona</key>
     <key alias="importDocumentTypeHelp">Pro importování typu dokumentu vyhledejte soubor ".udt" ve svém počítači tak, že kliknete na tlačítko "Prohledat" a pak kliknete na "Import" (na následující obrazovce budete vyzváni k potvrzení)</key>
@@ -726,16 +1330,25 @@
     <key alias="contentTypeUses">Tento typ obsahu používá</key>
     <key alias="asAContentMasterType">jako nadřazený typ obsahu. Záložky z nadřazených typů obsahu nejsou zobrazeny a mohou byt editovány pouze na nadřazených typech obsahu samotných</key>
     <key alias="noPropertiesDefinedOnTab">Na této záložce nejsou definovány žádné vlastnosti. Pro vytvoření nové vlastnosti klikněte na odkaz "přidat novou vlastnost" nahoře.</key>
+    <key alias="createMatchingTemplate">Vytvořit odpovídající šablonu</key>
+    <key alias="addIcon">Přidat ikonu</key>
   </area>
   <area alias="sort">
-    <key alias="sortOrder">Sort order</key>
-    <key alias="sortCreationDate">Creation date</key>
+    <key alias="sortOrder">Řazení</key>
+    <key alias="sortCreationDate">Datum vytvoření</key>
     <key alias="sortDone">Třídění bylo ukončeno.</key>
     <key alias="sortHelp">Abyste nastavili, jak mají být položky seřazeny, přetáhněte jednotlivé z nich nahoru či dolů. Anebo klikněte na hlavičku sloupce pro setřídění celé kolekce</key>
     <key alias="sortPleaseWait"><![CDATA[ Čekejte, prosím. Položky jsou tříděny a může to chvíli trvat.]]></key>
+    <key alias="sortEmptyState">Tato položka nemá vnořené položky k seřazení</key>
   </area>
   <area alias="speechBubbles">
-    <key alias="contentPublishedFailedByEvent">Publikování bylo zrušeno doplňkem třetí strany</key>
+    <key alias="validationFailedHeader">Validace</key>
+    <key alias="validationFailedMessage">Před uložením položky je nutné opravit chyby</key>
+    <key alias="operationFailedHeader">Chyba</key>
+    <key alias="operationSavedHeader">Uloženo</key>
+    <key alias="invalidUserPermissionsText">Nedostatečná uživatelská oprávnění, operace nemohla být dokončena</key>
+    <key alias="operationCancelledHeader">Zrušeno</key>
+    <key alias="operationCancelledText">Operace byla zrušena doplňkem třetí strany</key>
     <key alias="contentTypeDublicatePropertyType">Typ vlastnosti už existuje</key>
     <key alias="contentTypePropertyTypeCreated">Typ vlastnosti vytvořen</key>
     <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Název: %0% <br />Datový typ: %1%]]></key>
@@ -749,108 +1362,332 @@
     <key alias="cssSavedText">Stylopis byl uložen bez chyb</key>
     <key alias="dataTypeSaved">Datový typ byl uložen</key>
     <key alias="dictionaryItemSaved">Položka slovníku byla uložena</key>
-    <key alias="editContentPublishedFailedByParent">Publikování se nezdařilo, protože nadřazená stránka není publikována</key>
     <key alias="editContentPublishedHeader">Obsah byl publikován</key>
     <key alias="editContentPublishedText">a je viditelný na webu</key>
+    <key alias="editMultiContentPublishedText">%0% dokumentů zveřejněných a viditelných na webu</key>
+    <key alias="editVariantPublishedText">%0% zveřejněných a viditelných na webu</key>
+    <key alias="editMultiVariantPublishedText">%0% dokumentů zveřejněných pro jazyky %1% a viditelných na webu</key>
     <key alias="editContentSavedHeader">Obsah byl uložen</key>
     <key alias="editContentSavedText">Nezapomeňte na publikování, aby se změny projevily</key>
+    <key alias="editContentScheduledSavedText">Načasování publikování bylo aktualizováno</key>
+    <key alias="editVariantSavedText">%0% uloženo</key>
     <key alias="editContentSendToPublish">Odeslat ke schválení</key>
     <key alias="editContentSendToPublishText">Změny byly odeslány ke schválení</key>
-    <key alias="editMediaSaved">Medium bylo uloženo</key>
-    <key alias="editMediaSavedText">Medium bylo uloženo bez chyb</key>
+    <key alias="editVariantSendToPublishText">%0% změn bylo odesláno ke schválení</key>
+    <key alias="editMediaSaved">Médium bylo uloženo</key>
+    <key alias="editMediaSavedText">Médium bylo uloženo bez chyb</key>
     <key alias="editMemberSaved">Člen byl uložen</key>
+    <key alias="editMemberGroupSaved">Skupina členů byla uložena</key>
     <key alias="editStylesheetPropertySaved">Vlastnost stylopisu byla uložena</key>
     <key alias="editStylesheetSaved">Stylopis byl uložen</key>
     <key alias="editTemplateSaved">Šablona byla uložena</key>
     <key alias="editUserError">Chyba při ukládání uživatele (zkontrolujte log)</key>
     <key alias="editUserSaved">Uživatel byl uložen</key>
     <key alias="editUserTypeSaved">Typ uživatele byl uložen</key>
+    <key alias="editUserGroupSaved">Skupina uživatelů byla uložena</key>
+    <key alias="editCulturesAndHostnamesSaved">Jazyky a názvy hostitelů byly uloženy</key>
+    <key alias="editCulturesAndHostnamesError">Při ukládání jazyků a názvů hostitelů došlo k chybě</key>
     <key alias="fileErrorHeader">Soubor nebyl uložen</key>
     <key alias="fileErrorText">soubor nemohl být uložen. Zkontrolujte, prosím, oprávnění k souboru</key>
     <key alias="fileSavedHeader">Soubor byl uložen</key>
     <key alias="fileSavedText">Soubor byl uložen bez chyb</key>
     <key alias="languageSaved">Jazyk byl uložen</key>
+    <key alias="mediaTypeSavedHeader">Typ média byl uložen</key>
+    <key alias="memberTypeSavedHeader">Typ člena byl uložen</key>
+    <key alias="memberGroupSavedHeader">Skupina členů byla uložena</key>
     <key alias="templateErrorHeader">Šablona nebyla uložena</key>
     <key alias="templateErrorText">Ujistěte se, prosím, že nemáte 2 šablony se stejným aliasem</key>
     <key alias="templateSavedHeader">Šablona byla uložena</key>
     <key alias="templateSavedText">Šablona byla uložena bez chyb!</key>
     <key alias="contentUnpublished">Publikování obsahu bylo zrušeno</key>
+    <key alias="contentCultureUnpublished">Varianta obsahu %0% nebyla publikována</key>
+    <key alias="contentMandatoryCultureUnpublished">Povinný jazyk '%0%' nebyl publikován. Všechny jazyky pro tuto položku obsahu nejsou nyní publikovány.</key>
     <key alias="partialViewSavedHeader">Částečný pohled byl uložen</key>
     <key alias="partialViewSavedText">Částečný pohled byl uložen bez chyb!</key>
     <key alias="partialViewErrorHeader">Částečný pohled nebyl uložen</key>
     <key alias="partialViewErrorText">Při ukládání souboru došlo k chybě.</key>
+    <key alias="permissionsSavedFor">Oprávnění byla uložena pro</key>
+    <key alias="deleteUserGroupsSuccess">Smazáno %0% skupin uživatelů</key>
+    <key alias="deleteUserGroupSuccess">%0% bylo smazáno</key>
+    <key alias="enableUsersSuccess">Povoleno %0% uživatelů</key>
+    <key alias="disableUsersSuccess">Zakázáno %0% uživatelů</key>
+    <key alias="enableUserSuccess">%0% je nyní povoleno</key>
+    <key alias="disableUserSuccess">%0% je nyní zakázáno</key>
+    <key alias="setUserGroupOnUsersSuccess">Skupiny uživatelů byly nastaveny</key>
+    <key alias="unlockUsersSuccess">Odemčeno %0% uživatelů</key>
+    <key alias="unlockUserSuccess">%0% je nyný odemčeno</key>
+    <key alias="memberExportedSuccess">Člen byl exportován do souboru</key>
+    <key alias="memberExportedError">Při exportu člena došlo k chybě</key>
+    <key alias="deleteUserSuccess">Uživatel %0% byl smazán</key>
+    <key alias="resendInviteHeader">Pozvat uživatele</key>
+    <key alias="resendInviteSuccess">Pozvánka byla znovu odeslána na %0%</key>
+    <key alias="contentReqCulturePublishError">Dokument nelze publikovat, protože %0% není publikována</key>
+    <key alias="contentCultureValidationError">Ověření pro jazyk '%0%' se nezdařilo</key>
+    <key alias="documentTypeExportedSuccess">Typ dokumentu byl exportován do souboru</key>
+    <key alias="documentTypeExportedError">Při exportu typu dokumentu došlo k chybě</key>
+    <key alias="scheduleErrReleaseDate1">Datum vydání nemůže být v minulosti</key>
+    <key alias="scheduleErrReleaseDate2">Nelze naplánovat publikování dokumentu, protože %0% není publikována</key>
+    <key alias="scheduleErrReleaseDate3">Dokument nelze naplánovat na publikování, protože „%0%“ má datum zveřejnění později než nepovinný jazyk</key>
+    <key alias="scheduleErrExpireDate1">Datum vypršení platnosti nemůže být v minulosti</key>
+    <key alias="scheduleErrExpireDate2">Datum vypršení nemůže být před datem vydání</key>
+    <!-- DEPRECATED ??? -->
+    <key alias="contentPublishedFailedByEvent">Publikování bylo zrušeno doplňkem třetí strany</key>
+    <key alias="editContentPublishedFailedByParent">Publikování se nezdařilo, protože nadřazená stránka není publikována</key>
   </area>
   <area alias="stylesheet">
-    <key alias="aliasHelp">Používá CSS syntaxi např.: h1, .redHeader, .blueTex</key>
+    <key alias="addRule">Přidat styl</key>
+    <key alias="editRule">Upravit styl</key>
+    <key alias="editorRules">Styly Rich Text editoru</key>
+    <key alias="editorRulesHelp">Definujte styly, které by měly být k dispozici v editoru formátovaného textu pro tuto šablonu stylů</key>
     <key alias="editstylesheet">Editovat stylopis</key>
     <key alias="editstylesheetproperty">Editovat vlastnost stylopisu</key>
     <key alias="nameHelp">Název, který identifikuje vlastnost stylu v editoru formátovaného textu</key>
     <key alias="preview">Náhled</key>
+    <key alias="previewHelp">Jak bude text vypadat v Rich Text editoru.</key>
+    <key alias="selector">CSS identifikátor nebo třída</key>
+    <key alias="selectorHelp">Používá syntaxi CSS, např. "h1" nebo ".redHeader"</key>
     <key alias="styles">Styly</key>
+    <key alias="stylesHelp">CSS, který by měl být použit v editoru RTF, např. "color:red;"</key>
+    <key alias="tabCode">Kód</key>
+    <key alias="tabRules">Rich Text editor</key>
+    <!-- DEPRECATED ??? -->
+    <key alias="aliasHelp">Používá CSS syntaxi např.: h1, .redHeader, .blueTex</key>
   </area>
   <area alias="template">
+    <key alias="deleteByIdFailed">Nepodařilo se odstranit šablonu s ID %0%</key>
     <key alias="edittemplate">Editovat šablonu</key>
+    <key alias="insertSections">Sekce</key>
     <key alias="insertContentArea">Vložit obsahovou oblast</key>
     <key alias="insertContentAreaPlaceHolder">Vložit zástupce obsahové oblasti</key>
+    <key alias="insert">Vložit</key>
+    <key alias="insertDesc">Vyberte, co chcete vložit do své šablony</key>
     <key alias="insertDictionaryItem">Vložit položku slovníku</key>
+    <key alias="insertDictionaryItemDesc">Položka slovníku je zástupný symbol pro překladatelný text, což usnadňuje vytváření návrhů pro vícejazyčné webové stránky.</key>
     <key alias="insertMacro">Vložit makro</key>
+    <key alias="insertMacroDesc">
+            Makro je konfigurovatelná součást, která je skvělá pro opakovaně použitelné části návrhu, kde potřebujete předat parametry, jako jsou galerie, formuláře a seznamy.
+        </key>
     <key alias="insertPageField">Vložit pole stránky umbraco</key>
+    <key alias="insertPageFieldDesc">Zobrazuje hodnotu pojmenovaného pole z aktuální stránky s možnostmi upravit hodnotu nebo alternativní hodnoty.</key>
+    <key alias="insertPartialView">Částečná šablona</key>
+    <key alias="insertPartialViewDesc">
+            Částečná šablona je samostatný soubor šablony, který lze vykreslit uvnitř jiné šablony. Je to skvělé pro opakované použití nebo pro oddělení složitých šablon.
+        </key>
     <key alias="mastertemplate">Nadřazená šablona</key>
-    <key alias="quickGuide">Rychlá příručka k šablonovým značkám umbraca</key>
+    <key alias="noMaster">Žádný master</key>
+    <key alias="renderBody">Vykreslit podřízenou šablonu</key>
+    <key alias="renderBodyDesc"><![CDATA[
+     Vykreslí obsah podřízené šablony vložením zástupného symbolu <code>@RenderBody()</code>.
+      ]]></key>
+    <key alias="defineSection">Definujte pojmenovanou sekci</key>
+    <key alias="defineSectionDesc"><![CDATA[
+         Definuje část vaší šablony jako pojmenovanou sekci jejím zabalením do <code>@section {...}</code>. Ta může být vykreslena v konkrétní oblasti nadřazené šablony pomocí <code>@RenderSection</code>.
+      ]]></key>
+    <key alias="renderSection">Vykreslit pojmenovanou sekci</key>
+    <key alias="renderSectionDesc"><![CDATA[
+      Vykreslí pojmenovanou oblast podřízené šablony vložením zástupného symbolu <code>@RenderSection(name)</code>. Tím se vykreslí oblast podřízené šablony, která je zabalena do odpovídající definice <code>@section[name] {...}</code>.
+      ]]></key>
+    <key alias="sectionName">Název sekce</key>
+    <key alias="sectionMandatory">Sekce je povinná</key>
+    <key alias="sectionMandatoryDesc"><![CDATA[
+            Pokud je povinná, musí podřízená šablona obsahovat definici <code>@section</code>, jinak se zobrazí chyba.
+            ]]></key>
+    <key alias="queryBuilder">Tvůrce dotazů</key>
+    <key alias="itemsReturned">položky vráceny, do</key>
+    <key alias="copyToClipboard">zkopírovat do schránky</key>
+    <key alias="iWant">Chci</key>
+    <key alias="allContent">veškerý obsah</key>
+    <key alias="contentOfType">obsah typu "%0%"</key>
+    <key alias="from">z(e)</key>
+    <key alias="websiteRoot">můj web</key>
+    <key alias="where">kde</key>
+    <key alias="and">a</key>
+    <key alias="is">je</key>
+    <key alias="isNot">není</key>
+    <key alias="before">před</key>
+    <key alias="beforeIncDate">před (včetně zvoleného datumu)</key>
+    <key alias="after">po</key>
+    <key alias="afterIncDate">po (včetně zvoleného datumu)</key>
+    <key alias="equals">rovná se</key>
+    <key alias="doesNotEqual">nerovná se</key>
+    <key alias="contains">obsahuje</key>
+    <key alias="doesNotContain">neobsahuje</key>
+    <key alias="greaterThan">větší než</key>
+    <key alias="greaterThanEqual">větší nebo rovno</key>
+    <key alias="lessThan">menší než</key>
+    <key alias="lessThanEqual">menší nebo rovno</key>
+    <key alias="id">Id</key>
+    <key alias="name">Název</key>
+    <key alias="createdDate">Datum vytvoření</key>
+    <key alias="lastUpdatedDate">Datum poslední aktualizace</key>
+    <key alias="orderBy">řadit podle</key>
+    <key alias="ascending">vzestupně</key>
+    <key alias="descending">sestupně</key>
     <key alias="template">Šablona</key>
+    <!-- DEPRECATED ??? -->
+    <key alias="quickGuide">Rychlá příručka k šablonovým značkám umbraca</key>
   </area>
   <area alias="grid">
-    <key alias="media">Image</key>
-    <key alias="macro">Macro</key>
-    <key alias="insertControl">Choose type of content</key>
-    <key alias="chooseLayout">Choose a layout</key>
-    <key alias="addRows">Add a row</key>
-    <key alias="addElement">Add content</key>
-    <key alias="dropElement">Drop content</key>
-    <key alias="settingsApplied">Settings applied</key>
-    <key alias="contentNotAllowed">This content is not allowed here</key>
-    <key alias="contentAllowed">This content is allowed here</key>
-    <key alias="clickToEmbed">Click to embed</key>
-    <key alias="clickToInsertImage">Click to insert image</key>
-    <key alias="placeholderImageCaption">Image caption...</key>
-    <key alias="placeholderWriteHere">Write here...</key>
-    <key alias="gridLayouts">Grid Layouts</key>
-    <key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
-    <key alias="addGridLayout">Add Grid Layout</key>
-    <key alias="addGridLayoutDetail">Adjust the layout by setting column widths and adding additional sections</key>
-    <key alias="rowConfigurations">Row configurations</key>
-    <key alias="rowConfigurationsDetail">Rows are predefined cells arranged horizontally</key>
-    <key alias="addRowConfiguration">Add row configuration</key>
-    <key alias="addRowConfigurationDetail">Adjust the row by setting cell widths and adding additional cells</key>
-    <key alias="columns">Columns</key>
-    <key alias="columnsDetails">Total combined number of columns in the grid layout</key>
-    <key alias="settings">Settings</key>
-    <key alias="settingsDetails">Configure what settings editors can change</key>
-    <key alias="styles">Styles</key>
-    <key alias="stylesDetails">Configure what styling editors can change</key>
-    <key alias="allowAllEditors">Allow all editors</key>
-    <key alias="allowAllRowConfigurations">Allow all row configurations</key>
+    <key alias="media">Obrázek</key>
+    <key alias="macro">Makro</key>
+    <key alias="insertControl">Vybrat typ obsahu</key>
+    <key alias="chooseLayout">Vybrat rozvržení</key>
+    <key alias="addRows">Přidat řádek</key>
+    <key alias="addElement">Přidat obsah</key>
+    <key alias="dropElement">Zahodit obsah</key>
+    <key alias="settingsApplied">Nastavení aplikováno</key>
+    <key alias="contentNotAllowed">Tento obsah zde není povolen</key>
+    <key alias="contentAllowed">Tento obsah je zde povolen</key>
+    <key alias="clickToEmbed">Klepněte pro vložení</key>
+    <key alias="clickToInsertImage">Klepnutím vložíte obrázek</key>
+    <key alias="placeholderImageCaption">Titulek obrázku...</key>
+    <key alias="placeholderWriteHere">Zde pište...</key>
+    <key alias="gridLayouts">Rozvržení mřížky</key>
+    <key alias="gridLayoutsDetail">Rozvržení je celková pracovní oblast pro editor mřížky, obvykle potřebujete pouze jedno nebo dvě různá rozvržení</key>
+    <key alias="addGridLayout">Přidat rozvržení mřížky</key>
+    <key alias="addGridLayoutDetail">Upravte rozvržení nastavením šířky sloupců a přidáním dalších sekcí</key>
+    <key alias="rowConfigurations">Konfigurace řádků</key>
+    <key alias="rowConfigurationsDetail">Řádky jsou předdefinované buňky uspořádané vodorovně</key>
+    <key alias="addRowConfiguration">Přidat konfiguraci řádku</key>
+    <key alias="addRowConfigurationDetail">Upravte řádek nastavením šířky buněk a přidáním dalších buněk</key>
+    <key alias="columns">Sloupce</key>
+    <key alias="columnsDetails">Celkový počet sloupců v rozvržení mřížky</key>
+    <key alias="settings">Nastavení</key>
+    <key alias="settingsDetails">Nakonfigurujte, jaká nastavení mohou editoři změnit</key>
+    <key alias="styles">Styly</key>
+    <key alias="stylesDetails">Nakonfigurujte, co mohou editoři stylů změnit</key>
+    <key alias="allowAllEditors">Povolit všechny editory</key>
+    <key alias="allowAllRowConfigurations">Povolit všechny konfigurace řádků</key>
+    <key alias="maxItems">Maximální počet položek</key>
+    <key alias="maxItemsDescription">Nechte prázdné nebo nastavte na 0 pro neomezené</key>
+    <key alias="setAsDefault">Nastavit jako výchozí</key>
+    <key alias="chooseExtra">Vyberat navíc</key>
+    <key alias="chooseDefault">Zvolit výchozí</key>
+    <key alias="areAdded">jsou přidány</key>
+        <key alias="warning">Varování</key>
+        <key alias="youAreDeleting">Odstraňujete konfiguraci řádku</key>
+        <key alias="deletingARow">
+            Odstranění názvu konfigurace řádku povede ke ztrátě dat pro veškerý existující obsah založený na této konfiguraci.
+        </key>
+  </area>
+  <area alias="contentTypeEditor">
+    <key alias="compositions">Složení</key>
+    <key alias="group">Skupina</key>
+    <key alias="noGroups">Nepřidali jste žádné skupiny</key>
+    <key alias="addGroup">Přidat skupinu</key>
+    <key alias="inheritedFrom">Zděděno od</key>
+    <key alias="addProperty">Přidat vlastnost</key>
+    <key alias="requiredLabel">Požadovaný popisek</key>
+    <key alias="enableListViewHeading">Povolit zobrazení seznamu</key>
+    <key alias="enableListViewDescription">Nakonfiguruje položku obsahu tak, aby zobrazovala seznam svých potomků a seznam potomků, které je možné prohledávat, potomci se nebudou zobrazovat ve stromu</key>
+    <key alias="allowedTemplatesHeading">Povolené šablony</key>
+    <key alias="allowedTemplatesDescription">Vyberte, kteří editoři šablon mohou používat obsah tohoto typu</key>
+    <key alias="allowAsRootHeading">Povolit jako root</key>
+    <key alias="allowAsRootDescription">Povolit editorům vytvářet obsah tohoto typu v kořenovém adresáři stromu obsahu.</key>
+    <key alias="childNodesHeading">Povolené typy podřízených uzlů</key>
+    <key alias="childNodesDescription">Povolit vytváření obsahu zadaných typů pod obsahem tohoto typu.</key>
+    <key alias="chooseChildNode">Vybrat podřízený uzel</key>
+    <key alias="compositionsDescription">Zdědí záložky a vlastnosti z existujícího typu dokumentu. Nové záložky budou přidány do aktuálního typu dokumentu nebo sloučeny, pokud existuje záložka se stejným názvem.</key>
+    <key alias="compositionInUse">Tento typ obsahu se používá ve složení, a proto jej nelze poskládat.</key>
+    <key alias="noAvailableCompositions">Nejsou k dispozici žádné typy obsahu, které lze použít jako složení.</key>
+    <key alias="compositionRemoveWarning">Odebráním složení odstraníte všechna související data vlastností. Jakmile uložíte typ dokumentu, již není cesta zpět.</key>
+    <key alias="availableEditors">Vytvořit nové</key>
+    <key alias="reuse">Použít existující</key>
+    <key alias="editorSettings">Nastavení editoru</key>
+    <key alias="configuration">Konfigurace</key>
+    <key alias="yesDelete">Ano, smazat</key>
+    <key alias="movedUnderneath">bylo přesunuto pod</key>
+    <key alias="copiedUnderneath">bylo zkopírováno pod</key>
+    <key alias="folderToMove">Vybrat složku, kterou chcete přesunout</key>
+    <key alias="folderToCopy">Vybrat složku, kterou chcete kopírovat</key>
+    <key alias="structureBelow">ve stromové struktuře níže</key>
+    <key alias="allDocumentTypes">Všechny typy dokumentů</key>
+    <key alias="allDocuments">Všechny dokumenty</key>
+    <key alias="allMediaItems">Všechny média</key>
+    <key alias="usingThisDocument">použití tohoto typu dokumentu bude trvale smazáno, prosím potvrďte, že je chcete také odstranit.</key>
+    <key alias="usingThisMedia">použití tohoto typu média bude trvale smazáno, potvrďte, že je chcete také odstranit.</key>
+    <key alias="usingThisMember">použití tohoto typu člena bude trvale smazáno, potvrďte, že je chcete také odstranit</key>
+    <key alias="andAllDocuments">a všechny dokumenty používající tento typ</key>
+    <key alias="andAllMediaItems">a všechny mediální položky používající tento typ</key>
+    <key alias="andAllMembers">a všichni členové používající tento typ</key>
+    <key alias="memberCanEdit">Člen může upravovat</key>
+    <key alias="memberCanEditDescription">Povolit editaci této vlastnosti členem na jeho stránce profilu</key>
+    <key alias="isSensitiveData">Obsahuje citlivá data</key>
+    <key alias="isSensitiveDataDescription">Skrýt tuto hodnotu vlastnosti před editory obsahu, kteří nemají přístup k prohlížení citlivých informací</key>
+    <key alias="showOnMemberProfile">Zobrazit v profilu člena</key>
+    <key alias="showOnMemberProfileDescription">Povolit zobrazení této vlastnosti na stránce profilu člena</key>
+    <key alias="tabHasNoSortOrder">záložka nemá žádné řazení</key>
+    <key alias="compositionUsageHeading">Kde se toto složení používá?</key>
+    <key alias="compositionUsageSpecification">Toto složení se v současnosti používá ve složení následujících typů obsahu:</key>
+    <key alias="variantsHeading">Povolit různé jazyky</key>
+    <key alias="variantsDescription">Povolit editorům vytvářet obsah tohoto typu v různých jazycích.</key>
+    <key alias="allowVaryByCulture">Povolit různé jazyky</key>
+    <key alias="elementType">Typ prvku</key>
+    <key alias="elementHeading">Je typ prvku</key>
+    <key alias="elementDescription">Typ prvku je určen k použití například ve vnořeném obsahu, nikoli ve stromu.</key>
+    <key alias="elementCannotToggle">Jakmile byl typ dokumentu použit k vytvoření jedné nebo více položek obsahu, nelze jej změnit na typ prvku.</key>
+    <key alias="elementDoesNotSupport">To neplatí pro typ prvku</key>
+    <key alias="propertyHasChanges">V této vlastnosti jste provedli změny. Opravdu je chcete zahodit?</key>
+  </area>
+  <area alias="languages">
+    <key alias="addLanguage">Přidat jazyk</key>
+    <key alias="mandatoryLanguage">Povinný jazyk</key>
+    <key alias="mandatoryLanguageHelp">Před publikováním uzlu je nutné vyplnit vlastnosti v tomto jazyce.</key>
+    <key alias="defaultLanguage">Výchozí jazyk</key>
+    <key alias="defaultLanguageHelp">Web Umbraco může mít nastaven pouze jeden výchozí jazyk.</key>
+    <key alias="changingDefaultLanguageWarning">Přepnutí výchozího jazyka může mít za následek chybějící výchozí obsah.</key>
+    <key alias="fallsbackToLabel">Nahradit nepřeložený obsah za</key>
+    <key alias="noFallbackLanguageOption">Žádné nahrazení nepřeloženého jazyka</key>
+    <key alias="fallbackLanguageDescription">Chcete-li povolit automatické zobrazení vícejazyčného obsahu v jiném jazyce, pokud není v požadovaném jazyce přeložen, vyberte jej zde.</key>
+    <key alias="fallbackLanguage">Nahrazujicí jazyk</key>
+    <key alias="none">žádný</key>
+  </area>
+  <area alias="macro">
+    <key alias="addParameter">Přidat parametr</key>
+    <key alias="editParameter">Upravit parametr</key>
+    <key alias="enterMacroName">Zadejte název makra</key>
+    <key alias="parameters">Parametry</key>
+    <key alias="parametersDescription">Definujte parametry, které by měly být k dispozici při použití tohoto makra.</key>
+    <key alias="selectViewFile">Vyberte soubor makra pro částečnou šablonu</key>
+  </area>
+  <area alias="modelsBuilder">
+    <key alias="buildingModels">Stavební modely</key>
+    <key alias="waitingMessage">to může chvíli trvat, nebojte se</key>
+    <key alias="modelsGenerated">Generované modely</key>
+    <key alias="modelsGeneratedError">Modely nelze vygenerovat</key>
+    <key alias="modelsExceptionInUlog">Generování modelů selhalo, viz výjimka v logu Umbraca</key>
   </area>
   <area alias="templateEditor">
+    <key alias="addFallbackField">Přidat záložní pole</key>
+    <key alias="fallbackField">Náhradní pole</key>
+    <key alias="addDefaultValue">Přidat výchozí hodnotu</key>
+    <key alias="defaultValue">Výchozí hodnota</key>
     <key alias="alternativeField">Alternativní pole</key>
     <key alias="alternativeText">Alternativní text</key>
     <key alias="casing">Velká a malá písmena</key>
     <key alias="encoding">Kódování</key>
     <key alias="chooseField">Vybrat pole</key>
-    <key alias="convertLineBreaks">Konvertovat </key>
+    <key alias="convertLineBreaks">Konvertovat</key>
+    <key alias="convertLineBreaksDescription">Ano, převést konce řádků</key>
     <key alias="convertLineBreaksHelp">Nahrazuje nové řádky html tagem &amp;lt;br&amp;gt;</key>
     <key alias="customFields">Vlastní pole</key>
     <key alias="dateOnly">Ano, pouze datum</key>
+    <key alias="formatAndEncoding">Formát a kódování</key>
     <key alias="formatAsDate">Formátovat jako datum</key>
+    <key alias="formatAsDateDescr">Naformátuje hodnotu jako datum nebo datum s časem podle aktivního jazyka</key>
     <key alias="htmlEncode">HTML kódování</key>
     <key alias="htmlEncodeHelp">Nahradí speciální znaky jejich HTML ekvivalentem.</key>
     <key alias="insertedAfter">Bude vloženo za hodnotou pole</key>
     <key alias="insertedBefore">Bude vloženo před hodnotou pole</key>
     <key alias="lowercase">Malá písmena</key>
+    <key alias="modifyOutput">Upravit výstup</key>
     <key alias="none">Nic</key>
+    <key alias="outputSample">Ukázka výstupu</key>
     <key alias="postContent">Vložit za polem</key>
     <key alias="preContent">Vložit před polem</key>
     <key alias="recursive">Rekurzivní</key>
+    <key alias="recursiveDescr">Ano, udělej to rekurzivní</key>
+    <key alias="separator">Oddělovač</key>
     <key alias="standardFields">Standardní pole</key>
     <key alias="uppercase">Velká písmena</key>
     <key alias="urlEncode">Kódování URL</key>
@@ -861,7 +1698,7 @@
   </area>
   <area alias="translation">
     <key alias="details">Podrobnosti překladu</key>
-    <key alias="DownloadXmlDTD">Stáhnout xml DTD</key>
+    <key alias="DownloadXmlDTD">Stáhnout XML DTD</key>
     <key alias="fields">Pole</key>
     <key alias="includeSubpages">Zahrnout podstránky</key>
     <key alias="mailBody"><![CDATA[
@@ -877,7 +1714,7 @@
 
       Mějte hezký den!
 
-      Zdraví umbraco robot
+      Zdraví Umbraco robot
     ]]></key>
     <key alias="noTranslators">Žádní uživatelé překladatelé nebyli nalezeni. Vytvořte, prosím, překladatele před tím, než začnete posílat obsah k překladu</key>
     <key alias="pageHasBeenSendToTranslation">Stránka '%0%' byla poslána k překladu</key>
@@ -892,6 +1729,9 @@
     <key alias="uploadTranslationXml">Nahrát xml překladu</key>
   </area>
   <area alias="treeHeaders">
+    <key alias="content">Obsah</key>
+    <key alias="contentBlueprints">Šablony obsahu</key>
+    <key alias="media">Média</key>
     <key alias="cacheBrowser">Prohlížeč mezipaměti</key>
     <key alias="contentRecycleBin">Koš</key>
     <key alias="createdPackages">Vytvořené balíčky</key>
@@ -909,8 +1749,11 @@
     <key alias="memberRoles">Role</key>
     <key alias="memberTypes">Typy členů</key>
     <key alias="documentTypes">Typy dokumentů</key>
+    <key alias="relationTypes">Typy vztahů/vazeb</key>
     <key alias="packager">Balíčky</key>
     <key alias="packages">Balíčky</key>
+    <key alias="partialViews">Částečné šablony</key>
+    <key alias="partialViewMacros">Makra částečných šablon</key>
     <key alias="repositories">Instalovat z úložiště</key>
     <key alias="runway">Instalovat Runway</key>
     <key alias="runwayModules">Moduly Runway</key>
@@ -918,9 +1761,14 @@
     <key alias="scripts">Skripty</key>
     <key alias="stylesheets">Stylopisy</key>
     <key alias="templates">Šablony</key>
-    <key alias="userPermissions">Oprávnění Uživatele</key>
-    <key alias="userTypes">Typy Uživatelů</key>
+    <key alias="logViewer">Prohlížeč logu</key>
     <key alias="users">Uživatelé</key>
+    <key alias="settingsGroup">Nastavení</key>
+    <key alias="templatingGroup">Šablony</key>
+    <key alias="thirdPartyGroup">Třetí strana</key>
+    <!-- DEPRECATED ??? -->
+    <key alias="userPermissions">Oprávnění uživatele</key>
+    <key alias="userTypes">Typy uživatelů</key>
   </area>
   <area alias="update">
     <key alias="updateAvailable">Nová aktualizace je připrvena</key>
@@ -929,23 +1777,46 @@
     <key alias="updateNoServerError">Chyba při kontrole aktualizace. Zkontrolujte, prosím, trasovací zásobník pro další informace</key>
   </area>
   <area alias="user">
+    <key alias="access">Přístupy</key>
+    <key alias="accessHelp">Na základě přiřazených skupin a počátečních uzlů má uživatel přístup k následujícím uzlům</key>
+    <key alias="assignAccess">Přiřadit přístup</key>
     <key alias="administrators">Administrátor</key>
     <key alias="categoryField">Pole kategorie</key>
+    <key alias="createDate">Uživatel byl vytvořen</key>
     <key alias="changePassword">Změnit heslo</key>
+    <key alias="changePhoto">Změnit fotku</key>
     <key alias="newPassword">Změnit heslo</key>
+    <key alias="noLockouts">nebyl uzamčen</key>
+    <key alias="noPasswordChange">Heslo nebylo změněno</key>
     <key alias="confirmNewPassword">Potvrdit heslo</key>
     <key alias="changePasswordDescription">Můžete změnit své heslo pro přístup do administrace Umbraca vyplněním formuláře níže a kliknutím na tlačítko 'Změnit Heslo'</key>
     <key alias="contentChannel">Kanál obsahu</key>
+    <key alias="createAnotherUser">Vytvořit dalšího uživatele</key>
+    <key alias="createUserHelp">Vytvořte nové uživatele a udělte mu přístup do Umbraco. Po vytvoření nového uživatele bude vygenerováno heslo, které s ním můžete sdílet.</key>
     <key alias="descriptionField">Popis</key>
     <key alias="disabled">Deaktivovat uživatele</key>
     <key alias="documentType">Typ dokumentu</key>
     <key alias="editors">Editor</key>
     <key alias="excerptField">Výtah</key>
+    <key alias="failedPasswordAttempts">Neúspěšné pokusy o přihlášení</key>
+    <key alias="goToProfile">Přejít na uživatelský profil</key>
+    <key alias="groupsHelp">Přidáním skupin přidělte přístup a oprávnění</key>
+    <key alias="inviteAnotherUser">Pozvat dalšího uživatele</key>
+    <key alias="inviteUserHelp">Pozvěte nové uživatele, a poskytněte jim přístup do Umbraco. Uživatelům bude zaslán e-mail s pozvánkou a s informacemi o tom, jak se přihlásit do Umbraco. Pozvánky mají platnost 72 hodin.</key>
     <key alias="language">Jazyk</key>
+    <key alias="languageHelp">Nastavte jazyk, který uvidíte v nabídkách a dialogových oknech</key>
+    <key alias="lastLockoutDate">Poslední datum uzamčení</key>
+    <key alias="lastLogin">Poslední přihlášení</key>
+    <key alias="lastPasswordChangeDate">Heslo bylo naposledy změněno</key>
     <key alias="loginname">Přihlašovací jméno</key>
     <key alias="mediastartnode">Úvodní uzel v knihovně medií</key>
+    <key alias="mediastartnodehelp">Omezte knihovnu médií na konkrétní počáteční uzel</key>
+    <key alias="mediastartnodes">Úvodní uzly v knihovně medií</key>
+    <key alias="mediastartnodeshelp">Omezte knihovnu médií na konkrétní počáteční uzly</key>
     <key alias="modules">Sekce</key>
     <key alias="noConsole">Deaktivovat přistup k Umbracu</key>
+    <key alias="noLogin">se dosud nepřihlásil</key>
+    <key alias="oldPassword">Staré heslo</key>
     <key alias="password">Heslo</key>
     <key alias="resetPassword">Resetovat heslo</key>
     <key alias="passwordChanged">Vyše heslo bylo změněno!</key>
@@ -959,13 +1830,526 @@
     <key alias="permissionReplaceChildren">Nahradit oprávnění podřízených uzlů</key>
     <key alias="permissionSelectedPages">Nyní měníte oprávnění pro stránky:</key>
     <key alias="permissionSelectPages">Vyberte stránky, pro které chcete měnit oprávnění</key>
+    <key alias="removePhoto">Odebrat fotografii</key>
+    <key alias="permissionsDefault">Výchozí oprávnění</key>
+    <key alias="permissionsGranular">Upřesnění oprávnění</key>
+    <key alias="permissionsGranularHelp">Nastavte oprávnění pro konkrétní uzly</key>
+    <key alias="profile">Profil</key>
     <key alias="searchAllChildren">Prohledat všechny podřízené uzly</key>
+    <key alias="sectionsHelp">Přidejte sekce, do kterých mají uživatelé přístup</key>
+    <key alias="selectUserGroups">Vybrat skupiny uživatelů</key>
+    <key alias="noStartNode">Nebyl vybrán žádný počáteční uzel</key>
+    <key alias="noStartNodes">Nebyly vybrány žádné počáteční uzly</key>
     <key alias="startnode">Úvodní uzel v obsahu</key>
+    <key alias="startnodehelp">Omezte strom obsahu na konkrétní počáteční uzel</key>
+    <key alias="startnodes">Úvodní uzly obsahu</key>
+    <key alias="startnodeshelp">Omezte strom obsahu na konkrétní počáteční uzly</key>
+    <key alias="updateDate">Uživatel byl naposledy aktualizován</key>
+    <key alias="userCreated">byl vytvořen</key>
+    <key alias="userCreatedSuccessHelp">Nový uživatel byl úspěšně vytvořen. Pro přihlášení do Umbraco použijte heslo níže.</key>
+    <key alias="userManagement">Správa uživatelů</key>
     <key alias="username">Uživatelské jméno</key>
     <key alias="userPermissions">Oprávnění uživatele</key>
+    <key alias="usergroup">Uživatelská skupina</key>
+    <key alias="userInvited">byl pozván</key>
+    <key alias="userInvitedSuccessHelp">Novému uživateli byla zaslána pozvánka s informacemi, jak se přihlásit do Umbraco.</key>
+    <key alias="userinviteWelcomeMessage">Dobrý den, vítejte v Umbraco! Za pouhou 1 minutu budete moci používat Umbraco. Jenom od vás potřebujeme, abyste si nastavili heslo a přidali obrázek pro svůj avatar.</key>
+    <key alias="userinviteExpiredMessage">Vítejte v Umbraco! Vaše pozvánka bohužel vypršela. Obraťte se na svého správce a požádejte jej, aby jí znovu odeslal.</key>
+    <key alias="userinviteAvatarMessage">Nahrání vaší fotografie usnadní ostatním uživatelům, aby vás poznali. Kliknutím na kruh výše nahrajte svou fotku.</key>
     <key alias="writer">Spisovatel</key>
+    <key alias="change">Změnit</key>
     <key alias="yourProfile" version="7.0">Váš profil</key>
     <key alias="yourHistory" version="7.0">Vaše nedávná historie</key>
     <key alias="sessionExpires" version="7.0">Relace vyprší za</key>
+    <key alias="inviteUser">Pozvat uživatele</key>
+    <key alias="createUser">Vytvořit uživatele</key>
+    <key alias="sendInvite">Odeslat pozvánku</key>
+    <key alias="backToUsers">Zpět na seznam uživatelů</key>
+    <key alias="inviteEmailCopySubject">Umbraco: Pozvánka</key>
+    <key alias="inviteEmailCopyFormat"><![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Zdravím Vás, %0%,
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Byli jste pozváni <a href="mailto:%4%" style="text-decoration: underline; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a> do CMS Umbraco.
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Zpráva od <a href="mailto:%1%" style="text-decoration: none; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a>:
+															<br/>
+															<em>%2%</em>
+														</p>
+														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
+															<tbody>
+																<tr>
+																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
+																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
+																			<tbody>
+																				<tr>
+																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																							Kliknutím na tento odkaz přijměte pozvání
+																						</a>
+																					</td>
+																				</tr>
+																			</tbody>
+																		</table>
+																	</td>
+																</tr>
+															</tbody>
+														</table>
+														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>Pokud nemůžete kliknout na odkaz, zkopírujte a vložte tuto adresu URL do okna prohlížeče:</p>
+															<table border='0' cellpadding='0' cellspacing='0'>
+																<tr>
+																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
+																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
+																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%3%'>%3%</a>
+																		</font>
+																	</td>
+																</tr>
+															</table>
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+    </html>]]></key>
+    <key alias="invite">Pozvat</key>
+    <key alias="defaultInvitationMessage">Zasílám pozvání...</key>
+    <key alias="deleteUser">Smazat uživatele</key>
+    <key alias="deleteUserConfirmation">Opravdu chcete smazat tento uživatelský účet?</key>
+    <key alias="stateAll">Vše</key>
+    <key alias="stateActive">Aktivní</key>
+    <key alias="stateDisabled">Zakázané</key>
+    <key alias="stateLockedOut">Uzamčeno</key>
+    <key alias="stateInvited">Pozváno</key>
+    <key alias="stateInactive">Neaktivní</key>
+    <key alias="sortNameAscending">Jméno (A-Z)</key>
+    <key alias="sortNameDescending">Jméno (Z-A)</key>
+    <key alias="sortCreateDateAscending">Nejnovější</key>
+    <key alias="sortCreateDateDescending">Nejstarší</key>
+    <key alias="sortLastLoginDateDescending">Poslední přihlášení</key>
+    <key alias="noUserGroupsAdded">Nebyly přidány žádné skupiny uživatelů</key>
+  </area>
+  <area alias="validation">
+    <key alias="validation">Validace</key>
+    <key alias="validateAsEmail">Ověřit jako e-mailovou adresu</key>
+    <key alias="validateAsNumber">Ověřit jako číslo</key>
+    <key alias="validateAsUrl">Ověřit jako URL</key>
+    <key alias="enterCustomValidation">...nebo zadat vlastní ověření</key>
+    <key alias="fieldIsMandatory">Pole je povinné</key>
+    <key alias="mandatoryMessage">Zadat chybovou zprávu pro vlastní validaci (volitelné)</key>
+    <key alias="validationRegExp">Zadat regulární výraz</key>
+    <key alias="validationRegExpMessage">Zadat chybovou zprávu pro vlastní validaci (volitelné)</key>
+    <key alias="minCount">Musíte přidat alespoň</key>
+    <key alias="maxCount">Můžete jen mít</key>
+    <key alias="items">položky</key>
+    <key alias="itemsSelected">vybrané položky</key>
+    <key alias="invalidDate">Neplatné datum</key>
+    <key alias="invalidNumber">Není číslo</key>
+    <key alias="invalidEmail">Neplatný e-mail</key>
+    <key alias="invalidNull">Hodnota nemůže být nulová</key>
+    <key alias="invalidEmpty">Hodnota nemůže být prázdná</key>
+    <key alias="invalidPattern">Hodnota je neplatná, neodpovídá správnému vzoru</key>
+    <key alias="customValidation">Vlastní ověření</key>
+    <key alias="entriesShort"><![CDATA[Minimálně %0% záznamů, vyžaduje <strong>%1%</strong> více.]]></key>
+    <key alias="entriesExceed"><![CDATA[Maximálně %0% záznamů, <strong>%1%</strong> příliš mnoho.]]></key>
+  </area>
+  <area alias="healthcheck">
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+		   2: XPath
+		   3: Configuration file path
+	  -->
+    <key alias="checkSuccessMessage">Hodnota je nastavena na doporučenou hodnotu: '%0%'.</key>
+    <key alias="rectifySuccessMessage">Hodnota byla nastavena na '%1%' pro XPath '%2%' v konfiguračním souboru '%3%'.</key>
+    <key alias="checkErrorMessageDifferentExpectedValue">Očekávaná hodnota '%1%' pro '%2%' v konfiguračním souboru '%3%', ale nalezeno '%0%'.</key>
+    <key alias="checkErrorMessageUnexpectedValue">Nalezena neočekávaná hodnota '%0%' pro '%2%' v konfiguračním souboru '%3%'.</key>
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+	  -->
+    <key alias="customErrorsCheckSuccessMessage">Vlastní chyby jsou nastaveny na '%0%'.</key>
+    <key alias="customErrorsCheckErrorMessage">Vlastní chyby jsou aktuálně nastaveny na '%0%'. Před nasazením se doporučuje nastavit na '%1%'.</key>
+    <key alias="customErrorsCheckRectifySuccessMessage">Vlastní chyby byly úspěšně nastaveny na '%0%'.</key>
+    <key alias="macroErrorModeCheckSuccessMessage">MacroErrors jsou nastaveny na '%0%'.</key>
+    <key alias="macroErrorModeCheckErrorMessage">MakroErrors jsou nastaveny na '%0%', což zabrání úplnému načtení některých nebo všech stránek na vašem webu, pokud dojde k chybám v makrech. Náprava nastaví hodnotu na '%1%'.</key>
+    <key alias="macroErrorModeCheckRectifySuccessMessage">MakroErrors jsou nyní nastaveny na '%0%'.</key>
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+		   2: Server version
+	  -->
+    <key alias="trySkipIisCustomErrorsCheckSuccessMessage">Try Skip IIS Custom Errors je nastaveno na '%0%' a používáte verzi IIS '%1%'.</key>
+    <key alias="trySkipIisCustomErrorsCheckErrorMessage">Try Skip IIS Custom Errors je aktuálně nastaveno na '%0%'. Doporučuje se nastavit %1% pro vaši verzi služby IIS (%2%).</key>
+    <key alias="trySkipIisCustomErrorsCheckRectifySuccessMessage">Try Skip IIS Custom Errors úspěšně nastaveno na '%0%'.</key>
+    <!-- The following keys get predefined tokens passed in that are not all the same, like above -->
+    <key alias="configurationServiceFileNotFound">Soubor neexistuje: '%0%'.</key>
+    <key alias="configurationServiceNodeNotFound"><![CDATA[Nelze najít <strong>'% 0%'</strong> v konfiguračním souboru <strong>'% 1%'</strong>.]]></key>
+    <key alias="configurationServiceError">Došlo k chybě, zkontrolujte ji v logu: %0%.</key>
+    <key alias="databaseSchemaValidationCheckDatabaseOk">Databáze - Databázové schéma je pro tuto verzi Umbraco správné</key>
+    <key alias="databaseSchemaValidationCheckDatabaseErrors">Bylo zjištěno %0% problémů se schématem vaší databáze (podrobnosti najdete v logu)</key>
+    <key alias="databaseSchemaValidationCheckDatabaseLogMessage">Při ověřování databázového schématu vůči aktuální verzi Umbraco byly zjištěny některé chyby.</key>
+    <key alias="httpsCheckValidCertificate">Certifikát vašeho webu je platný.</key>
+    <key alias="httpsCheckInvalidCertificate">Chyba ověření certifikátu: '%0%'</key>
+    <key alias="httpsCheckExpiredCertificate">Platnost SSL certifikátu vašeho webu vypršela.</key>
+    <key alias="httpsCheckExpiringCertificate">Platnost certifikátu SSL vašeho webu vyprší za %0% dní.</key>
+    <key alias="healthCheckInvalidUrl">Chyba při pingování adresy URL %0% - '%1%'</key>
+    <key alias="httpsCheckIsCurrentSchemeHttps">Aktuálně prohlížíte web pomocí schématu HTTPS.</key>
+    <key alias="httpsCheckConfigurationRectifyNotPossible">AppSetting 'Umbraco.Core.UseHttps' je v souboru web.config nastaven na 'false'. Jakmile vstoupíte na tento web pomocí schématu HTTPS, mělo by být nastaveno na 'true'.</key>
+    <key alias="httpsCheckConfigurationCheckResult">AppSetting 'Umbraco.Core.UseHttps' je v souboru web.config nastaven na '%0%', vaše cookies %1% jsou označeny jako zabezpečené.</key>
+    <key alias="httpsCheckEnableHttpsError">V souboru web.config se nepodařilo aktualizovat nastavení 'Umbraco.Core.UseHttps'. Chyba: %0%</key>
+    <!-- The following keys don't get tokens passed in -->
+    <key alias="httpsCheckEnableHttpsButton">Povolit HTTPS</key>
+    <key alias="httpsCheckEnableHttpsDescription">Nastaví nastavení umbracoSSL na true v appSettings v souboru web.config.</key>
+    <key alias="httpsCheckEnableHttpsSuccess">AppSetting 'Umbraco.Core.UseHttps' je nyní nastaveno na 'true' v souboru web.config, vaše cookies budou označeny jako zabezpečené.</key>
+    <key alias="rectifyButton">Fix</key>
+    <key alias="cannotRectifyShouldNotEqual">Nelze opravit kontrolu pro porovnání hodnot pomocí 'ShouldNotEqual'.</key>
+    <key alias="cannotRectifyShouldEqualWithValue">Nelze opravit kontrolu pro porovnání hodnot pomocí  'ShouldEqual' s poskytnutou hodnotou.</key>
+    <key alias="valueToRectifyNotProvided">Hodnota k opravě nebyla poskytnuta.</key>
+    <key alias="compilationDebugCheckSuccessMessage">Režim kompilace ladění je zakázán.</key>
+    <key alias="compilationDebugCheckErrorMessage">Režim ladění je aktuálně povolen. Před spuštěním webu se doporučuje toto nastavení deaktivovat.</key>
+    <key alias="compilationDebugCheckRectifySuccessMessage">Režim ladění byl úspěšně deaktivován.</key>
+    <key alias="traceModeCheckSuccessMessage">Režim sledování je deaktivován.</key>
+    <key alias="traceModeCheckErrorMessage">Režim sledování je aktuálně povolen. Před spuštěním se doporučuje toto nastavení deaktivovat.</key>
+    <key alias="traceModeCheckRectifySuccessMessage">Režim sledování byl úspěšně deaktivován.</key>
+    <key alias="folderPermissionsCheckMessage">Všechny složky mají nastavena správná oprávnění.</key>
+    <!-- The following keys get these tokens passed in:
+	    0: Comma delimitted list of failed folder paths
+  	-->
+    <key alias="requiredFolderPermissionFailed"><![CDATA[Následující složky musí být nastaveny s oprávněním k úpravám, ale nelze k nim přistupovat: <strong>%0%</strong>.]]></key>
+    <key alias="optionalFolderPermissionFailed"><![CDATA[Následující složky musí být nastaveny s oprávněními k úpravám, aby některé operace Umbraco fungovaly, ale nemohly být přístupné: <strong>%0%</strong>. Pokud nejsou psány, není třeba podniknout žádné kroky.]]></key>
+    <key alias="filePermissionsCheckMessage">Všechny soubory mají nastavena správná oprávnění.</key>
+    <!-- The following keys get these tokens passed in:
+	    0: Comma delimitted list of failed folder paths
+  	-->
+    <key alias="requiredFilePermissionFailed"><![CDATA[Následující soubory musí být nastaveny s právy pro zápis, ale nelze k nim získat přístup: <strong>%0%</strong>.]]></key>
+    <key alias="optionalFilePermissionFailed"><![CDATA[Následující soubory musí být nastaveny s oprávněními pro zápis, aby určité operace Umbraco fungovaly, ale nemohly být přístupné: <strong>%0%</strong>. Pokud nejsou psány, není třeba podniknout žádné kroky.]]></key>
+    <key alias="clickJackingCheckHeaderFound"><![CDATA[Bylo nalezeno záhlaví nebo metaznačka <strong>X-Frame-Options</strong>, které určuje, zda může být obsah webu zobrazen na jiném webu pomocí IFRAME.]]></key>
+    <key alias="clickJackingCheckHeaderNotFound"><![CDATA[Nebylo nalezeno záhlaví nebo metaznačka <strong>X-Frame-Options</strong>, které určuje, zda může být obsah webu zobrazen na jiném webu pomocí IFRAME.]]></key>
+    <key alias="setHeaderInConfig">Nastavit záhlaví v Konfiguraci</key>
+    <key alias="clickJackingSetHeaderInConfigDescription">Přidá hodnotu do sekce httpProtocol/customHeaders do web.config, aby se zabránilo tomu, že web může být zobrazen na jiném webu pomocí IFRAME.</key>
+    <key alias="clickJackingSetHeaderInConfigSuccess">Do souboru web.config bylo přidáno nastavení pro vytvoření záhlaví, které zabrání jinému webu, zobrazit tento web pomocí IFRAME.</key>
+    <key alias="setHeaderInConfigError">Nelze aktualizovat soubor web.config. Chyba: %0%</key>
+    <key alias="noSniffCheckHeaderFound"><![CDATA[Bylo nalezeno záhlaví nebo metaznačka <strong>X-Content-Type-Options</strong> použitá k ochraně před zranitelnostmi čichání MIME.]]></key>
+    <key alias="noSniffCheckHeaderNotFound"><![CDATA[Záhlaví nebo metaznačky <strong>X-Content-Type-Options</strong> použité k ochraně před zranitelnostmi čichání MIME nebyly nalezeny.]]></key>
+    <key alias="noSniffSetHeaderInConfigDescription">Přidá hodnotu do sekce httpProtocol/customHeaders v souboru web.config, která chrání před zranitelnostmi MIME.</key>
+    <key alias="noSniffSetHeaderInConfigSuccess">Do souboru web.config bylo přidáno nastavení pro vytvoření záhlaví, které chrání před zranitelnostmi MIME.</key>
+    <key alias="hSTSCheckHeaderFound"><![CDATA[Záhlaví <strong>Strict-Transport-Security</strong>, také známo jako HSTS-header, bylo nalezeno.]]></key>
+    <key alias="hSTSCheckHeaderNotFound"><![CDATA[záhlaví <strong>Strict-Transport-Security</strong> nebylo nalezeno.]]></key>
+    <key alias="hSTSSetHeaderInConfigDescription">Do sekce httpProtocol/customHeaders v souboru web.config přidá záhlaví 'Strict-Transport-Security' s hodnotou 'max-age = 10886400'. Tuto opravu použijte pouze v případě, že vaše domény budou spuštěny s https po dobu příštích 18 týdnů (minimálně).</key>
+    <key alias="hSTSSetHeaderInConfigSuccess">Do vašeho souboru web.config bylo přidáno záhlaví HSTS.</key>
+    <key alias="xssProtectionCheckHeaderFound"><![CDATA[Záhlaví <strong>X-XSS-Protection</strong> bylo nalezeno.]]></key>
+    <key alias="xssProtectionCheckHeaderNotFound"><![CDATA[Záhlaví <strong>X-XSS-Protection</strong> bylo nalezeno.]]></key>
+    <key alias="xssProtectionSetHeaderInConfigDescription">Přidá záhlaví 'X-XSS-Protection' s hodnotou '1; mode=block' do sekce httpProtocol/customHeaders v souboru web.config. </key>
+    <key alias="xssProtectionSetHeaderInConfigSuccess">Záhlaví X-XSS-Protection bylo přidáno do vašeho souboru web.config.</key>
+    <!-- The following key get these tokens passed in:
+	    0: Comma delimitted list of headers found
+  	-->
+    <key alias="excessiveHeadersFound"><![CDATA[Byly nalezeny následující záhlaví odhalující informace o technologii webových stránek: <strong>%0%</strong>.]]></key>
+    <key alias="excessiveHeadersNotFound">Nebyly nalezeny žádné hlavičky odhalující informace o technologii webových stránek.</key>
+    <key alias="smtpMailSettingsNotFound">V souboru Web.config nelze najít system.net/mailsettings.</key>
+    <key alias="smtpMailSettingsHostNotConfigured">V části system.net/mailsettings v souboru web.config není hostitel nakonfigurován.</key>
+    <key alias="smtpMailSettingsConnectionSuccess">Nastavení SMTP jsou správně nakonfigurována a služba funguje jak má.</key>
+    <key alias="smtpMailSettingsConnectionFail">Server SMTP konfigurovaný s hostitelem '%0%' a portem '%1%' nelze nalézt. Zkontrolujte prosím, zda jsou nastavení SMTP v souboru Web.config a v sekci system.net/mailsettings správná.</key>
+    <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[E-mail s upozorněním byl nastaven na <strong>%0%</strong>.]]></key>
+    <key alias="notificationEmailsCheckErrorMessage"><![CDATA[E-mail s oznámením je stále nastaven na výchozí hodnotu <strong>%0%</strong>.]]></key>
+    <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Výsledky plánovaných kontrol Umbraco Health Checks provedených na %0% v %1% jsou následující:</p>%2%</body></html>]]></key>
+    <key alias="scheduledHealthCheckEmailSubject">Stav Umbraco Health Check: %0%</key>
+    <key alias="checkAllGroups">Zkontrolovat všechny skupiny</key>
+    <key alias="checkGroup">Zkontrolovat skupinu</key>
+    <key alias="helpText">
+        <![CDATA[
+        <p>Kontrola vyhodnocuje různé oblasti vašeho webu z hlediska nastavení osvědčených postupů, konfigurace, potenciálních problémů atd. Problémy lze snadno vyřešit stisknutím tlačítka. Můžete přidat své vlastní kontroly, podívejte se na <a href="https://our.umbraco.com/documentation/Extending/Healthcheck/" target="_blank" rel="noopener" class="btn-link -underline">dokumentaci pro více informací</a> o vlastních kontrolách.</p>
+        ]]>
+    </key>
+  </area>
+  <area alias="redirectUrls">
+    <key alias="disableUrlTracker">Zakázat sledování URL</key>
+    <key alias="enableUrlTracker">Povolit sledování URL</key>
+    <key alias="culture">Jazyk</key>
+    <key alias="originalUrl">Originální URL</key>
+    <key alias="redirectedTo">Přesměrováno na</key>
+    <key alias="redirectUrlManagement">Správa URL přesměrování</key>
+    <key alias="panelInformation">Na tuto položku obsahu přesměrovávají následující adresy URL:</key>
+    <key alias="noRedirects">Nebyla provedena žádná přesměrování</key>
+    <key alias="noRedirectsDescription">Jakmile bude publikovaná stránka přejmenována nebo přesunuta, bude automaticky provedeno přesměrování na novou stránku.</key>
+    <key alias="confirmRemove">Opravdu chcete odstranit přesměrování z '%0%' na '%1%'?</key>
+    <key alias="redirectRemoved">Přesměrování bylo odstraněno.</key>
+    <key alias="redirectRemoveError">Chyba při odebírání URL přesměrování.</key>
+    <key alias="redirectRemoveWarning">Toto odstraní přesměrování</key>
+    <key alias="confirmDisable">Opravdu chcete zakázat sledování URL adres?</key>
+    <key alias="disabledConfirm">Sledování URL adres je nyní zakázáno.</key>
+    <key alias="disableError">Při deaktivaci sledování URL adres došlo k chybě, další informace naleznete v logu.</key>
+    <key alias="enabledConfirm">Sledování URL adres je nyní povoleno.</key>
+    <key alias="enableError">Chyba při povolení sledování URL adres, další informace lze nalézt v logu.</key>
+  </area>
+  <area alias="emptyStates">
+    <key alias="emptyDictionaryTree">Žádné položky ze slovníku na výběr</key>
+  </area>
+  <area alias="textbox">
+    <key alias="characters_left"><![CDATA[Zbývá <strong>%0%</strong> znaků.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maximálně %0% znaků, <strong>%1%</strong> je moc.]]></key>
+  </area>
+  <area alias="recycleBin">
+    <key alias="contentTrashed">Obsah s ID: {0} v koši souvisí s původním nadřazeným obsahem s ID: {1}</key>
+    <key alias="mediaTrashed">Média s ID: {0} v koši souvisí s původním nadřazeným médiem s ID: {1}</key>
+    <key alias="itemCannotBeRestored">Tuto položku nelze automaticky obnovit</key>
+    <key alias="itemCannotBeRestoredHelpText">Neexistuje žádné místo, kde lze tuto položku automaticky obnovit. Položku můžete přesunout ručně pomocí stromu níže.</key>
+    <key alias="wasRestored">byla obnovena pod</key>
+  </area>
+  <area alias="relationType">
+    <key alias="direction">Směr</key>
+    <key alias="parentToChild">Nadřazený s potomkem</key>
+    <key alias="bidirectional">Obousměrný</key>
+    <key alias="parent">Nadřazená</key>
+    <key alias="child">Potomek</key>
+    <key alias="count">Počet</key>
+    <key alias="relations">Vazby</key>
+    <key alias="created">Vytvořeno</key>
+    <key alias="comment">Komentář</key>
+    <key alias="name">Název</key>
+    <key alias="noRelations">Žádné vazby pro tento typ vazby.</key>
+    <key alias="tabRelationType">Typ vazby</key>
+    <key alias="tabRelations">Vazby</key>
+  </area>
+  <area alias="dashboardTabs">
+    <key alias="contentIntro">Začínáme</key>
+    <key alias="contentRedirectManager">Správa přesměrování</key>
+    <key alias="mediaFolderBrowser">Obsah</key>
+    <key alias="settingsWelcome">Vítejte</key>
+    <key alias="settingsExamine">Správa Examine</key>
+    <key alias="settingsPublishedStatus">Stav publikování</key>
+    <key alias="settingsModelsBuilder">Tvůrce modelů</key>
+    <key alias="settingsHealthCheck">Health Check</key>
+    <key alias="settingsProfiler">Profilování</key>
+    <key alias="memberIntro">Začínáme</key>
+    <key alias="formsInstall">Instalovat Umbraco formuláře</key>
+  </area>
+  <area alias="visuallyHiddenTexts">
+    <key alias="goBack">Jít zpět</key>
+    <key alias="activeListLayout">Aktivní rozvržení:</key>
+    <key alias="jumpTo">Skočit do</key>
+    <key alias="group">skupina</key>
+    <key alias="passed">prošlo</key>
+    <key alias="warning">varování</key>
+    <key alias="failed">selhalo</key>
+    <key alias="suggestion">návrh</key>
+    <key alias="checkPassed">Kontrola prošla</key>
+    <key alias="checkFailed">Kontrola selhala</key>
+    <key alias="openBackofficeSearch">Otevřít hledání v backoffice</key>
+    <key alias="openCloseBackofficeHelp">Otevřít/zavřít nápovědu backoffice</key>
+    <key alias="openCloseBackofficeProfileOptions">Otevřít/zavřít možnosti vašeho profilu</key>
+    <key alias="openContextMenu">Otevřít kontextové menu pro</key>
+    <key alias="currentLanguage">Aktuální jazyk</key>
+    <key alias="switchLanguage">Přepnout jazyk na</key>
+    <key alias="createNewFolder">Vytvořit novou složku</key>
+    <key alias="newPartialView">Částečná šablona</key>
+    <key alias="newPartialViewMacro">Makro částečné šablony</key>
+    <key alias="newMember">Člen</key>
+    <key alias="newDataType">Datový typ</key>
+    <key alias="redirectDashboardSearchLabel">Prohledat přesměrování</key>
+    <key alias="userGroupSearchLabel">Prohledat skupiny uživatelů</key>
+    <key alias="userSearchLabel">Prohledat uživatele</key>
+    <key alias="createItem">Vytvořit položku</key>
+    <key alias="create">Vytvořit</key>
+    <key alias="edit">Upravit</key>
+    <key alias="name">Název</key>
+  </area>
+  <area alias="references">
+    <key alias="tabName">Závislosti</key>
+    <key alias="DataTypeNoReferences">Tento datový typ nemá žádné závislosti.</key>
+    <key alias="labelUsedByDocumentTypes">Použito v dokumentových typech</key>
+    <key alias="noDocumentTypes">Žádné vazby na typy dokumentů.</key>
+    <key alias="labelUsedByMediaTypes">Použito v typech médií</key>
+    <key alias="noMediaTypes">Žádné vazby na typy médií.</key>
+    <key alias="labelUsedByMemberTypes">Použito v typech členů</key>
+    <key alias="noMemberTypes">Žádné vazby na typy členů.</key>
+    <key alias="usedByProperties">Použito v </key>
+    <key alias="labelUsedByDocuments">Použito v dokumentech</key>
+    <key alias="labelUsedByMembers">Použito ve členech</key>
+    <key alias="labelUsedByMedia">Použito v médiích</key>
+  </area>
+  <area alias="logViewer">
+      <key alias="logLevels">Úrovně logování</key>
+      <key alias="savedSearches">Uložená vyhledávání</key>
+      <key alias="totalItems">Celkem položek</key>
+      <key alias="timestamp">Časové razítko</key>
+      <key alias="level">Úroveň</key>
+      <key alias="machine">Stroj</key>
+      <key alias="message">Zpráva</key>
+      <key alias="exception">Výjimka</key>
+      <key alias="properties">Vlastnosti</key>
+      <key alias="searchWithGoogle">Vyhledat na Googlu</key>
+      <key alias="searchThisMessageWithGoogle">Vyhledat zprávu na Googlu</key>
+      <key alias="searchWithBing">Vyhledat na Bing</key>
+      <key alias="searchThisMessageWithBing">Vyhledat zprávu na Bing</key>
+      <key alias="searchOurUmbraco">Prohledat naše Umbraco</key>
+      <key alias="searchThisMessageOnOurUmbracoForumsAndDocs">Vyhledat tuto zprávu na našich fórech a dokumentech Umbraco</key>
+      <key alias="searchOurUmbracoWithGoogle">Vyhledat Our Umbraco na Googlu</key>
+      <key alias="searchOurUmbracoForumsUsingGoogle">Prohledat Our Umbraco fóra pomocí Googlu</key>
+      <key alias="searchUmbracoSource">Prohledat Umbraco Source</key>
+      <key alias="searchWithinUmbracoSourceCodeOnGithub">Vyhledat ve zdrojovém kódu Umbraco na Github</key>
+      <key alias="searchUmbracoIssues">Prohledat Umbraco Issues</key>
+      <key alias="searchUmbracoIssuesOnGithub">Prohledat Umbraco Issues na Github</key>
+      <key alias="deleteThisSearch">Smazat toto vyhledávání</key>
+      <key alias="findLogsWithRequestId">Najít logy s ID požadavku</key>
+      <key alias="findLogsWithNamespace">Najít logy se jmenným prostorem</key>
+      <key alias="findLogsWithMachineName">Najít logy s názvem stroje</key>
+      <key alias="open">Otevřít</key>
+  </area>
+  <area alias="clipboard">
+    <key alias="labelForCopyAllEntries">Kopírovat %0%</key>
+    <key alias="labelForArrayOfItemsFrom">%0% z %1%</key>
+    <key alias="labelForRemoveAllEntries">Odebrat všechny položky</key>
+  </area>
+  <area alias="propertyActions">
+    <key alias="tooltipForPropertyActionsMenu">Otevřít akce vlastností</key>
+  </area>
+  <area alias="nuCache">
+    <key alias="wait">Čekejte</key>
+    <key alias="refreshStatus">Stav obnovení</key>
+    <key alias="memoryCache">Cache paměť</key>
+    <key alias="memoryCacheDescription">
+        <![CDATA[
+            Toto tlačítko umožňuje znovu načíst mezipaměť úplným opětovným načtením z databáze (ale tato mezipaměť databáze nebude znovu vytvořena). To je poměrně rychlé. Použijte jej, pokud si myslíte, že mezipaměť paměti nebyla po některých událostech správně obnovena - což by naznačovalo menší problém Umbraco. (poznámka: spustí opětovné načtení na všech serverech v prostředí LB).
+    ]]>
+    </key>
+    <key alias="reload">Znovu načíst</key>
+    <key alias="databaseCache">Cache databáze</key>
+    <key alias="databaseCacheDescription">
+        <![CDATA[
+    Toto tlačítko umožňuje znovu vytvořit mezipaměť databáze, tj. obsah tabulky cmsContentNu. <strong>Znovuvytvoření může být náročné.</strong> Použijte jej, když nestačí obnovení stránky, a domníváte se, že mezipaměť databáze nebyla správně vygenerována - což by naznačovalo možný kritický problém Umbraco.
+    ]]>
+    </key>
+    <key alias="rebuild">Obnovit</key>
+    <key alias="internals">Internals</key>
+    <key alias="internalsDescription">
+        <![CDATA[
+    Toto tlačítko umožňuje spustit kolekci snímků NuCache (po spuštění fullCLR GC).
+     Pokud nevíte, co to znamená, pravděpodobně to <em>nebudete</em> muset používat.
+    ]]>
+    </key>
+    <key alias="collect">Sběr</key>
+    <key alias="publishedCacheStatus">Stav publikované mezipaměti</key>
+    <key alias="caches">Mezipaměti</key>
+  </area>
+  <area alias="profiling">
+    <key alias="performanceProfiling">Profilování výkonu</key>
+    <key alias="performanceProfilingDescription">
+        <![CDATA[
+                <p> Umbraco aktuálně běží v režimu ladění. To znamená, že můžete použít vestavěný profiler výkonu k vyhodnocení výkonu při vykreslování stránek. </p> <p> Pokud chcete aktivovat profiler pro konkrétní vykreslení stránky, jednoduše při požadavku na stránku jednoduše přidejte <b>umbDebug=true</b> do URL.</p> <p> Pokud chcete, aby byl profiler ve výchozím nastavení aktivován pro všechna vykreslení stránky, můžete použít přepínač níže. Ve vašem prohlížeči nastaví soubor cookie, který automaticky aktivuje profiler. Jinými slovy, profiler bude ve výchozím nastavení aktivní pouze ve <i> vašem </i> prohlížeči, ne v ostatních. </p>
+        ]]>
+    </key>
+    <key alias="activateByDefault">Ve výchozím stavu aktivovat profiler</key>
+    <key alias="reminder">Přátelské připomenutí</key>
+    <key alias="reminderDescription">
+        <![CDATA[
+            <p>
+                Nikdy byste neměli nechat produkční web běžet v režimu ladění. Režim ladění je vypnut nastavením <b> debug="false" </b> na elementu <b>compilation</b> v souboru web.config.
+            </p>
+        ]]>
+    </key>
+    <key alias="profilerEnabledDescription">
+        <![CDATA[
+            <p>
+                Umbraco v současné době neběží v režimu ladění, takže nemůžete použít vestavěný profiler. Takto by to mělo být pro produkční web.
+            </p>
+            <p>
+                Režim ladění je zapnut nastavením <b> debug="true" </b> na elementu <b> compilation </b> v souboru web.config.
+            </p>
+        ]]>
+    </key>
+  </area>
+  <area alias="settingsDashboardVideos">
+    <key alias="trainingHeadline">Hodiny tréninkových videí Umbraco jsou blíž než si myslíte</key>
+    <key alias="trainingDescription">
+        <![CDATA[
+        <p> Chcete ovládnout Umbraco? Stačí strávit pár minut sledování jednoho z těchto videí o používání Umbraco. Nebo navštivte <a href="http://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a>, kde najdete ještě více videí o Umbraco </p>
+    ]]>
+    </key>
+    <key alias="getStarted">Chcete-li začít</key>
+  </area>
+  <area alias="settingsDashboard">
+    <key alias="start">Začněte zde</key>
+    <key alias="startDescription">Tato část obsahuje stavební bloky pro váš web Umbraco. Podle níže uvedených odkazů se dozvíte více o práci s položkami v části Nastavení</key>
+    <key alias="more">Zjistit více</key>
+    <key alias="bulletPointOne">
+        <![CDATA[
+            Další informace o práci s položkami naleznete v části Nastavení <a class="btn-link -underline" href="https://our.umbraco.com/documentation/Getting-Started/Backoffice/Sections/" target="_blank" rel="noopener">v sekci Dokumentace</a> v Our Umbraco
+        ]]>
+    </key>
+    <key alias="bulletPointTwo">
+        <![CDATA[
+            Zeptejte se na <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank" rel="noopener">fóru komunity</a>
+        ]]>
+    </key>
+    <key alias="bulletPointThree">
+        <![CDATA[
+            Podívejte se na naše <a class="btn-link -underline" href="https://umbraco.tv" target="_blank" rel="noopener">výuková videa</a> (některá jsou zdarma, jiná vyžadují předplatné)
+        ]]>
+    </key>
+    <key alias="bulletPointFour">
+        <![CDATA[
+            Další informace o našich <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank" rel="noopener">nástrojích zvyšujících produktivitu a komerční podpoře</a>
+        ]]>
+    </key>
+    <key alias="bulletPointFive">
+        <![CDATA[
+            Zjistěte více o možnostech <a class="btn-link -underline" href="https://umbraco.com/training" target="_blank" rel="noopener">školení a certifikace</a>
+        ]]>
+    </key>
+  </area>
+  <area alias="startupDashboard">
+    <key alias="fallbackHeadline">Vítejte v přátelském CMS</key>
+    <key alias="fallbackDescription">Děkujeme, že jste si vybrali Umbraco - myslíme si, že by to mohl být začátek něčeho krásného. I když se to může zpočátku zdát ohromující, udělali jsme hodně pro to, aby byla křivka učení co nejhladší a nejrychlejší.</key>
+  </area>  
+  <area alias="formsDashboard">
+    <key alias="formsHeadline">Umbraco formuláře</key>
+    <key alias="formsDescription">Vytvářejte formuláře pomocí intuitivního rozhraní drag and drop. Od jednoduchých kontaktních formulářů, které odesílají e-maily, až po pokročilé dotazníky, které se integrují do systémů CRM. Vaši klienti to budou milovat!</key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
new file mode 100644
index 0000000000..eacfcde1bf
--- /dev/null
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
@@ -0,0 +1,2784 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<language alias="cy_gb" intName="Welsh (UK)" localName="Cymraeg (UK)" lcid="1106" culture="cy-GB">
+    <creator>
+        <name>Method4 Ltd</name>
+        <link>https://www.method4.co.uk/</link>
+    </creator>
+    <area alias="actions">
+        <key alias="assignDomain">Diwylliannau ac Enwau Gwesteia</key>
+        <key alias="auditTrail">Trywydd Archwilio</key>
+        <key alias="browse">Dewis Nod</key>
+        <key alias="changeDocType">Newid Math o Ddogfen</key>
+        <key alias="changeDataType">Newid Math o Data</key>
+        <key alias="copy">Copïo</key>
+        <key alias="create">Creu</key>
+        <key alias="export">Allforio</key>
+        <key alias="createPackage">Creu Pecyn</key>
+        <key alias="createGroup">Creu grŵp</key>
+        <key alias="delete">Dileu</key>
+        <key alias="disable">Analluogi</key>
+        <key alias="editSettings">Golygu gosodiadau</key>
+        <key alias="emptyRecycleBin">Gwagu bin ailgylchu</key>
+        <key alias="enable">Galluogi</key>
+        <key alias="exportDocumentType">Allforio Math o Ddogfen</key>
+        <key alias="importDocumentType">Mewnforio Math o Ddogfen</key>
+        <key alias="importPackage">Mewnforio Pecyn</key>
+        <key alias="liveEdit">Golygu mewn Cynfas</key>
+        <key alias="logout">Gadael</key>
+        <key alias="move">Symud</key>
+        <key alias="notify">Hysbysiadau</key>
+        <key alias="protect">Cyrchiad cyhoeddus</key>
+        <key alias="publish">Cyhoeddi</key>
+        <key alias="unpublish">Dadgyhoeddi</key>
+        <key alias="refreshNode">Ail-lwytho</key>
+        <key alias="republish">Ail-gyhoeddi yr holl safle</key>
+        <key alias="remove">Dileu</key>
+        <key alias="rename" version="7.3.0">Ailenwi</key>
+        <key alias="restore" version="7.3.0">Adfer</key>
+        <key alias="SetPermissionsForThePage">Gosod hawliau ar gyfer y dudalen %0%</key>
+        <key alias="chooseWhereToCopy">Dewis ble i copïo</key>
+        <key alias="chooseWhereToMove">Dewis ble i symud</key>
+        <key alias="toInTheTreeStructureBelow">Yn y strwythyr goeden isod</key>
+        <key alias="infiniteEditorChooseWhereToCopy">Dewis ble i gopïo'r eitem(au) a ddewiswyd</key>
+        <key alias="infiniteEditorChooseWhereToMove">Dewis ble i symud yr eitem(au) a ddewiswyd</key>
+        <key alias="wasMovedTo">wedi symud i</key>
+        <key alias="wasCopiedTo">wedi copïo i</key>
+        <key alias="wasDeleted">wedi dileu</key>
+        <key alias="rights">Hawliau</key>
+        <key alias="rollback">Rolio yn ôl</key>
+        <key alias="sendtopublish">Anfon I Gyhoeddi</key>
+        <key alias="sendToTranslate">Anfon I Gyfieithu</key>
+        <key alias="setGroup">Gosod grŵp</key>
+        <key alias="sort">Trefnu</key>
+        <key alias="translate">Cyfieithu</key>
+        <key alias="update">Diweddaru</key>
+        <key alias="setPermissions">Gosod Hawliau</key>
+        <key alias="unlock">Datgloi</key>
+        <key alias="createblueprint">Creu Templed Gynnwys</key>
+        <key alias="resendInvite">Ail-anfon Gwahoddiad</key>
+    </area>
+    <area alias="actionCategories">
+        <key alias="content">Cynnwys</key>
+        <key alias="administration">Gweinyddu</key>
+        <key alias="structure">Strwythyr</key>
+        <key alias="other">Arall</key>
+    </area>
+    <area alias="actionDescriptions">
+        <key alias="assignDomain">Caniatáu hawl i osod to assign diwylliannau ac enwau gwesteia</key>
+        <key alias="auditTrail">Caniatáu hawl i weld cofnod hanes nod</key>
+        <key alias="browse">Caniatáu hawl i weld nod</key>
+        <key alias="changeDocType">Caniatáu hawl i newid math o ddogfen ar gyfer nod</key>
+        <key alias="copy">Caniatáu hawl i gopïo nod</key>
+        <key alias="create">Caniatáu hawl i greu nodau</key>
+        <key alias="delete">Caniatáu hawl i ddileu nodau</key>
+        <key alias="move">Caniatáu hawl i symud nodau</key>
+        <key alias="protect">Caniatáu hawl i osod a newid cyrchiad cyhoeddus ar gyfer nod</key>
+        <key alias="publish">Caniatáu hawl i gyhoeddi nod</key>
+        <key alias="unpublish">Caniatáu hawl i dadgyhoeddi nod</key>
+        <key alias="rights">Caniatáu hawl i newid hawliau ar gyfer nod</key>
+        <key alias="rollback">Caniatáu hawl i rolio nod yn ôl at gyflwr blaenorol</key>
+        <key alias="sendtopublish">Caniatáu hawl i anfon nod am gymeradwyo cyn cyhoeddi</key>
+        <key alias="sendToTranslate">Caniatáu hawl i anfon nod am gyfieithiad</key>
+        <key alias="sort">Caniatáu hawl i newid trefn nodau</key>
+        <key alias="translate">Caniatáu hawl i gyfiethu nod</key>
+        <key alias="update">Caniatáu hawl i achub nod</key>
+        <key alias="createblueprint">Caniatáu hawl i greu Templed Cynnwys</key>
+    </area>
+    <area alias="apps">
+        <key alias="umbContent">Cynnwys</key>
+        <key alias="umbInfo">Gwybodaeth</key>
+    </area>
+    <area alias="assignDomain">
+        <key alias="permissionDenied">Dim hawl.</key>
+        <key alias="addNew">Ychwanegu Parth newydd</key>
+        <key alias="remove">dileu</key>
+        <key alias="invalidNode">Nod annilys.</key>
+        <key alias="invalidDomain">Fformat parth annilys.</key>
+        <key alias="duplicateDomain">Parth wedi'i neilltuo eisoes.</key>
+        <key alias="language">Iaith</key>
+        <key alias="domain">Parth</key>
+        <key alias="domainCreated">Parth newydd '%0%' wedi'i greu</key>
+        <key alias="domainDeleted">Parth '%0%' wedi dileu</key>
+        <key alias="domainExists">Parth '%0%' wedi neilltuo eisoes</key>
+        <key alias="domainUpdated">Parth '%0%' wedi diweddaru</key>
+        <key alias="orEdit">Golygu Parthau Presennol</key>
+        <key alias="domainHelpWithVariants">
+            <![CDATA[Parthau dilys yw: "enghraifft.com", "www.enghraifft.com", "enghraifft.com:8080" neu "https://www.enghraifft.com/". 
+            Mae llwybrau un-lefel mewn parthau wedi'u cefnogi, e.e. "enghraifft.com/cy" neu "/cy".]]>
+        </key>
+        <key alias="inherit">Etifeddu</key>
+        <key alias="setLanguage">Diwylliant</key>
+        <key alias="setLanguageHelp">
+            <![CDATA[Gosod y diwylliant ar gyfer nodau o dan y nod bresennol,<br /> neu etifeddu diwylliant o nodau rhiant. Bydd hyn hefyd<br />
+      yn berthnasol i'r nod bresennol, oni bai fod parth isod yn berthnasol hefyd.]]>
+        </key>
+        <key alias="setDomains">Parthau</key>
+    </area>
+    <area alias="buttons">
+        <key alias="clearSelection">Clirio dewisiad</key>
+        <key alias="select">Dewis</key>
+        <key alias="somethingElse">Gwneud rhywbeth arall</key>
+        <key alias="bold">Trwm</key>
+        <key alias="deindent">Canslo Mewnoliad Paragraff</key>
+        <key alias="formFieldInsert">Mewnosod maes ffurflen</key>
+        <key alias="graphicHeadline">Mewnosod pennawd graffig</key>
+        <key alias="htmlEdit">Golygu Html</key>
+        <key alias="indent">Mewnoli Paragraff</key>
+        <key alias="italic">Italig</key>
+        <key alias="justifyCenter">Canoli</key>
+        <key alias="justifyLeft">Unioni Chwith</key>
+        <key alias="justifyRight">Unioni Dde</key>
+        <key alias="linkInsert">Mewnosod Dolen</key>
+        <key alias="linkLocal">Mewnosod dolen leol (angor)</key>
+        <key alias="listBullet">Rhestr Bwled</key>
+        <key alias="listNumeric">Rhestr rhifol</key>
+        <key alias="macroInsert">Mewnosod macro</key>
+        <key alias="pictureInsert">Mewnosod llun</key>
+        <key alias="publishAndClose">Chyhoeddi a cau</key>
+        <key alias="publishDescendants">Cyhoeddi efo disgynnydd</key>
+        <key alias="relations">Golygu perthnasau</key>
+        <key alias="returnToList">Dychwelyd i'r rhestr</key>
+        <key alias="save">Achub</key>
+        <key alias="saveAndClose">Achub a cau</key>
+        <key alias="saveAndPublish">Achub a chyhoeddi</key>
+        <key alias="saveAndSchedule">Achub ac amserlenni</key>
+        <key alias="saveToPublish">Achub ac anfon am gymeradwyo</key>
+        <key alias="saveListView">Achub gwedd rhestr</key>
+        <key alias="schedulePublish">Amserlenni</key>
+        <key alias="showPage">Rhagolwg</key>
+        <key alias="saveAndPreview">Save and preview</key>
+        <key alias="showPageDisabled">Rhagolwg wedi analluogi gan nad oes templed wedi'i neilltuo</key>
+        <key alias="styleChoose">Dewis arddull</key>
+        <key alias="styleShow">Dangos arddulliau</key>
+        <key alias="tableInsert">Mewnosod tabl</key>
+        <key alias="generateModelsAndClose">Cynhyrchu modelau a cau</key>
+        <key alias="saveAndGenerateModels">Achub a chynhyrchu modelau</key>
+        <key alias="undo">Dadwneud</key>
+        <key alias="redo">Ail-wneud</key>
+        <key alias="rollback">Rolio yn ôl</key>
+        <key alias="deleteTag">Dileu tag</key>
+        <key alias="confirmActionCancel">Canslo</key>
+        <key alias="confirmActionConfirm">Cadarnhau</key>
+        <key alias="morePublishingOptions">Mwy opsiynau cyhoeddi</key>
+        <key alias="submitChanges">Submit</key>
+        <key alias="submitChangesAndClose">Submit and close</key>
+    </area>
+    <area alias="auditTrails">
+        <key alias="atViewingFor">Dangos am</key>
+        <key alias="delete">Cynnwys wedi'i dileu</key>
+        <key alias="unpublish">Cynnwys wedi'i dadgyhoeddi</key>
+        <key alias="unpublishvariant">Cynnwys wedi'i dadgyhoeddi am y ieithoedd: %0% </key>
+        <key alias="publish">Cynnwys wedi'i Achub a Chyhoeddi</key>
+        <key alias="publishvariant">Cynnwys wedi'i Achub a Chyhoeddi am y ieithoedd: %0% </key>
+        <key alias="save">Cynnwys wedi'i achub</key>
+        <key alias="savevariant">Cynnwys wedi'i achub am y ieithoedd: %0%</key>
+        <key alias="move">Cynnwys wedi'i symud</key>
+        <key alias="copy">Cynnwys wedi'i copïo</key>
+        <key alias="rollback">Cynnwys wedi'i rolio yn ôl</key>
+        <key alias="sendtopublish">Cynnwys wedi'i anfon i Gyhoeddi</key>
+        <key alias="sendtopublishvariant">Cynnwys wedi'i anfon i gyhoeddi am y ieithoedd: %0%</key>
+        <key alias="sendtotranslate">Cynnwys wedi'i anfon i gyfieithu</key>
+        <key alias="sort">Trefnu eitemau blant cyflawnwyd gan ddefnyddiwr</key>
+        <key alias="custom">%0%</key>
+        <key alias="smallCopy">Copïo</key>
+        <key alias="smallPublish">Cyhoeddi</key>
+        <key alias="smallPublishVariant">Cyhoeddi</key>
+        <key alias="smallMove">Symud</key>
+        <key alias="smallSave">Achub</key>
+        <key alias="smallSaveVariant">Achub</key>
+        <key alias="smallDelete">Dileu</key>
+        <key alias="smallUnpublish">Dadgyhoeddi</key>
+        <key alias="smallUnpublishVariant">Dadgyhoeddi</key>
+        <key alias="smallRollBack">Rolio yn ôl</key>
+        <key alias="smallSendToPublish">Anfon i Gyhoeddi</key>
+        <key alias="smallSendToPublishVariant">Anfon i Gyhoeddi</key>
+        <key alias="smallSendToTranslate">Anfon i Gyfieithu</key>
+        <key alias="smallSort">Tefnu</key>
+        <key alias="smallCustom">Arferu</key>
+        <key alias="historyIncludingVariants">Hanes (pob amrywiad)</key>
+    </area>
+    <area alias="changeDocType">
+        <key alias="changeDocTypeInstruction">Er mwyn newid y math o ddogfen ar gyfer y cynnwys dewiswyd, yn gyntaf dewiswch o'r rhestr o fathau dilys ar gyfer y lleoliad yma.</key>
+        <key alias="changeDocTypeInstruction2">Wedyn cadarnhewch a/neu newid y mapiau priodweddau o'r math bresennol at yr un newydd, yna cliciwch Achub.</key>
+        <key alias="contentRepublished">Mae'r cynnwys wedi'i ail-gyhoeddi.</key>
+        <key alias="currentProperty">Priodwedd Bresennol</key>
+        <key alias="currentType">Math bresennol</key>
+        <key alias="docTypeCannotBeChanged">Ni ellir newid y fath o ddogfen gan nad oes dewisiadau amgen ar gyfer y lleoliad yma. Bydd dewis amgen yn ddilys os caniateir i'r dewis fod o dan rhiant yr eitem gynnwys sydd wedi'i ddewis ac fod caniatâd i bob eitem gynnwys blentyn sy'n bodoli eisoes i gael eu creu oddi'i tan.</key>
+        <key alias="docTypeChanged">Math o Ddogfen Wedi'i Newid</key>
+        <key alias="mapProperties">Mapio Priodweddau</key>
+        <key alias="mapToProperty">Mapio i Briodwedd</key>
+        <key alias="newTemplate">Templed Newydd</key>
+        <key alias="newType">Math Newydd</key>
+        <key alias="none">dim</key>
+        <key alias="selectedContent">Cynnwys</key>
+        <key alias="selectNewDocType">Dewis Math o Ddogfen Newydd</key>
+        <key alias="successMessage">Mae'r math o ddogfen ar gyfer y cynnwys dewiswyd wedi cael ei newid yn llwyddiannus i [new type] ac mae'r priodweddau canlynol wedi'u mapio:</key>
+        <key alias="to">i</key>
+        <key alias="validationErrorPropertyWithMoreThanOneMapping">Ni ellir cwblhau mapio'r priodweddau gan fod gan un neu fwy o'r priodweddau fwy nag un map wedi'i ddiffinio.</key>
+        <key alias="validDocTypesNote">Dim ond mathau amgen sy'n ddilys ar gyfer y lleoliad bresennol sydd yn ymddangos.</key>
+    </area>
+    <area alias="codefile">
+        <key alias="createFolderFailedById">Methwyd creu ffolder o dan id rhiant %0%</key>
+        <key alias="createFolderFailedByName">Methwyd creu ffolder o dan rhiant efo enw %0%</key>
+        <key alias="createFolderIllegalChars">Mae'r enw'r ffolder methu cynnwys nodau anghyfreithlon.</key>
+        <key alias="deleteItemFailed">Methwyd dileu eitem: %0%</key>
+    </area>
+    <area alias="content">
+        <key alias="isPublished" version="7.2">Wedi Cyhoeddi</key>
+        <key alias="about">Am y dudlaen yma</key>
+        <key alias="alias">Enw arall</key>
+        <key alias="alternativeTextHelp">(sut fyddwch chi'n disgrifio'r llun dros y ffôn)</key>
+        <key alias="alternativeUrls">Dolenni Amgen</key>
+        <key alias="clickToEdit">Cliwich i olygu'r eitem yma</key>
+        <key alias="createBy">Creuwyd gan</key>
+        <key alias="createByDesc" version="7.0">Awdur gwreiddiol</key>
+        <key alias="updatedBy" version="7.0">Diweddarwyd gan</key>
+        <key alias="createDate">Creuwyd</key>
+        <key alias="createDateDesc" version="7.0">Dyddiad/amser creuwyd y ddogfen yma</key>
+        <key alias="documentType">Math o Ddogfen</key>
+        <key alias="editing">Yn golygu</key>
+        <key alias="expireDate">Dileu am</key>
+        <key alias="itemChanged">Mae'r eitem yma wedi cael ei newid ar ôl cyhoeddi</key>
+        <key alias="itemNotPublished">Nid yw'r eitem yma wedi cael ei gyhoeddi</key>
+        <key alias="lastPublished">Cyhoeddiad ddiwethaf</key>
+        <key alias="noItemsToShow">Nid oes unrhyw eitemau i ddangos</key>
+        <key alias="listViewNoItems" version="7.1.5">Nid oes unrhyw eitemau i ddangos yn y rhestr.</key>
+        <key alias="listViewNoContent">Nid oes unrhyw gynnwys wedi'i ychwanegu</key>
+        <key alias="listViewNoMembers">Nid oes unrhyw aelodau wedi'u ychwanegu</key>
+        <key alias="mediatype">Math o Gyfrwng</key>
+        <key alias="mediaLinks">Dolen i eitem gyfrwng(au)</key>
+        <key alias="membergroup">Grŵp Aelod</key>
+        <key alias="memberrole">Rôl</key>
+        <key alias="membertype">Math o Aelod</key>
+        <key alias="noChanges">Dim newidiadau wedi'u gwneud</key>
+        <key alias="noDate">Dim dyddiad wedi'i ddewis</key>
+        <key alias="nodeName">Teitl tudalen</key>
+        <key alias="noMediaLink">Does dim dolen gan yr eitem gyfrwng yma</key>
+        <key alias="noProperties">Ni all unrhyw gynnwys cael ei hychwanegu am eitem hon</key>
+        <key alias="otherElements">Priodweddau</key>
+        <key alias="parentNotPublished">Mae'r ddogfen yma wedi'i gyhoeddi ond nid yw'n weladwy gan nad yw'r rhiant '%0%' wedi'i gyhoeddi</key>
+        <key alias="parentCultureNotPublished">Mae'r diwylliant yma yn cyhoeddedig ond ddim yn weladwy oherwydd mae'n anghyhoeddedig ar rhiant '%0%'</key>
+        <key alias="parentNotPublishedAnomaly">Mae'r ddogfen yma wedi'i gyhoeddi ond nid yw'n bodoli yn y storfa</key>
+        <key alias="getUrlException">Ni ellir nôl y url</key>
+        <key alias="routeError">Mae'r ddogfen yma wedi'i gyhoeddi ond byddai'r url yn gwrthdaro gyda chynnwys %0%</key>
+        <key alias="routeErrorCannotRoute">Mae'r ddogfen yma wedi'i gyhoeddi ond mae'r url methu cael ei cyfeirio</key>
+        <key alias="publish">Cyhoeddi</key>
+        <key alias="published">Wedi cyhoeddi</key>
+        <key alias="publishedPendingChanges">Wedi cyhoeddi (newidiadau nes arddodiad)</key>
+        <key alias="publishStatus">Statws Cyhoeddi</key>
+        <key alias="publishDescendantsHelp"><![CDATA[Click <em>Cyhoeddi efo disgynnyddion</em> i cyhoeddi <strong>%0%</strong> ac yr holl eitemau cynnwys o dan ac a thrwy hynny wneud eu cynnwys ar gael i'r cyhoedd.]]></key>
+        <key alias="publishDescendantsWithVariantsHelp"><![CDATA[Click <em>Cyhoeddi efo disgynnyddion</em> i cyhoeddi <strong>y ieithoedd a ddewiswyd</strong> ac yr un ieithoedd o'r eitemau o dan a thrwy hynny wneud eu cynnwys ar gael i'r cyhoedd.]]></key>
+        <key alias="releaseDate">Cyhoeddi am</key>
+        <key alias="unpublishDate">Dadgyhoeddi am</key>
+        <key alias="removeDate">Clirio Dyddiad</key>
+        <key alias="setDate">Gosod dyddiad</key>
+        <key alias="sortDone">Trefn wedi diweddaru</key>
+        <key alias="sortHelp">Er mwyn trefnu'r nodau, llusgwch y nodau neu cliciwch un o benynnau'r colofnau. Gallwch ddewis nifer o nodau gan ddal y botwm "shift" neu "control" wrth ddewis</key>
+        <key alias="statistics">Ystadegau</key>
+        <key alias="titleOptional">Teitl (dewisol)</key>
+        <key alias="altTextOptional">Testyn amgen (dewisol)</key>
+        <key alias="type">Math</key>
+        <key alias="unpublish">Dadgyhoeddi</key>
+        <key alias="unpublished">Wedi dadgyhoeddi</key>
+        <key alias="notCreated">Heb ei greu</key>
+        <key alias="updateDate">Golygwyd ddiwethaf</key>
+        <key alias="updateDateDesc" version="7.0">Dyddiad/amser golygwyd y ddogfen yma</key>
+        <key alias="uploadClear">Dileu ffeil(iau)</key>
+        <key alias="uploadClearImageContext">Cliciwch yma i dileu'r llun oddi wrth y eitem cyfrwng</key>
+        <key alias="uploadClearFileContext">Cliciwch yma i dileu'r ffeil oddi wrth y eitem cyfrwng</key>
+        <key alias="urls">Dolen i ddogfen</key>
+        <key alias="memberof">Aeold o grŵp(iau)</key>
+        <key alias="notmemberof">Ddim yn aelod o'r grŵp(iau)</key>
+        <key alias="childItems" version="7.0">Eitemau blentyn</key>
+        <key alias="target" version="7.0">Targed</key>
+        <key alias="scheduledPublishServerTime">Mae hyn yn trawsnewid at yr amser ganlynol ar y gweinydd:</key>
+        <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">Beth mae hyn yn golygu?</a>]]></key>
+        <key alias="nestedContentDeleteItem">Ydych chi'n sicr eich bod eisiau dileu'r eitem yma?</key>
+        <key alias="nestedContentEditorNotSupported">Mae'r priodwedd %0% yn defnyddio'r golygydd %1% sydd ddim yn cyd-fynd â Chynnwys Amnyth.</key>
+        <key alias="nestedContentDeleteAllItems">Wyt ti'n siŵr fod ti eisiau dileu pob eitem?</key>
+        <key alias="nestedContentNoContentTypes">Nid oes unrhyw fathau o gynnwys wedi'u ffurfweddu ar gyfer yr eiddo hwn.</key>
+        <key alias="nestedContentAddElementType">Ychwanegu teip elfen</key>
+        <key alias="nestedContentSelectElementTypeModalTitle">Dewis teip elfen</key>
+        <key alias="nestedContentGroupHelpText">Dewis y grŵp dylid arddangos ei briodweddau. Os caiff ei adael yn wag, bydd y grŵp cyntaf ar yr elfen yn cael ei defnyddio.</key>
+        <key alias="nestedContentTemplateHelpTextPart1">Rhowch fynegiad angular i werthuso yn erbyn pib eitem am ei enw. Defnyddiwch</key>
+        <key alias="nestedContentTemplateHelpTextPart2">i ddangos y mynegai'r eitem</key>
+        <key alias="addTextBox">Ychwanegu blwch testun arall</key>
+        <key alias="removeTextBox">Dileu'r blwch testun yma</key>
+        <key alias="contentRoot">Gwraidd cynnwys</key>
+        <key alias="includeUnpublished">Cynnwys eitemau cynnwys heb eu cyhoeddi.</key>
+        <key alias="isSensitiveValue">Mae'r gwerth yma'n gudd. Os ydych chi angen hawl i weld y gwerth yma, cysylltwch â gweinyddwr eich gwefan.</key>
+        <key alias="isSensitiveValue_short">Mae'r gwerth yma'n gudd.</key>
+        <key alias="languagesToPublishForFirstTime">Pa ieithoedd yr hoffech chi eu cyhoeddi? Mae pob iaith sydd â chynnwys wei cael ei arbed!</key>
+        <key alias="languagesToPublish">Pa ieithoedd yr hoffech chi eu cyhoeddi? </key>
+        <key alias="languagesToSave">Pa ieithoedd yr hoffech chi eu arbed?</key>
+        <key alias="languagesToSaveForFirstTime">Mae pob iaith sydd â chynnwys yn cael ei arbed wrth greu!</key>
+        <key alias="languagesToSendForApproval">Pa ieithoedd hoffech chi anfon am gymeradwyaeth?</key>
+        <key alias="languagesToSchedule">Pa ieithoedd yr hoffech chi eu hamserlennu?</key>
+        <key alias="languagesToUnpublish">Dewiswch yr ieithoedd i'w anghyhoeddi. Bydd anghyhoeddi iaith orfodol yn anghyhoeddi pob iaith.</key>
+        <key alias="publishedLanguages">Ieithoedd Cyhoeddedig</key>
+        <key alias="unpublishedLanguages">Ieithoedd heb ei gyhoeddi</key>
+        <key alias="unmodifiedLanguages">Ieithoedd heb eu haddasu</key>
+        <key alias="untouchedLanguagesForFirstTime">Nid yw'r ieithoedd hyn wedi'u creu</key>
+        <key alias="variantsWillBeSaved">Bydd pob amrywiad newydd yn cael ei arbed.</key>
+        <key alias="variantsToPublish">P'un amrywiadau wyt ti eisiau cyhoeddi?</key>
+        <key alias="variantsToSave">Dewiswch pa amrywiadau wyt ti eisiau arbed.</key>
+        <key alias="variantsToSendForApproval">Dewiswch pa amrywiadau i anfon am gymeradwyaeth.</key>
+        <key alias="variantsToSchedule">Gosod cyhoeddi rhestredig...</key>
+        <key alias="variantsToUnpublish">Dewiswch yr amrywiadau i'w anghyhoeddi. Bydd anghyhoeddi iaith orfodol yn anghyhoeddi pob amrywiad.</key>
+        <key alias="publishRequiresVariants">Mae'r amrywiadau canlynol yn ofynnol er mwyn i gyhoeddi:</key>
+        <key alias="notReadyToPublish">Ni ddim yn barod i Gyhoeddi</key>
+        <key alias="readyToPublish">Barod i Gyhoeddi?</key>
+        <key alias="readyToSave">Barod i Arbed?</key>
+        <key alias="sendForApproval">Anfonwch am gymeradwyaeth</key>
+        <key alias="schedulePublishHelp">Dewiswch y dyddiad a'r amser i gyhoeddi a / neu anghyhoeddi'r eitem gynnwys.</key>
+        <key alias="createEmpty">Creu newydd</key>
+        <key alias="createFromClipboard">Gludo o'r clipfwrdd</key>
+        <key alias="nodeIsInTrash">Mae'r eitem yma yn y Bin Ailgylchu</key>
+    </area>
+    <area alias="blueprints">
+        <key alias="createBlueprintFrom">Creu Templed Cynnwys newydd o '%0%'</key>
+        <key alias="blankBlueprint">Gwag</key>
+        <key alias="selectBlueprint">Dewis Templed Cynnwys</key>
+        <key alias="createdBlueprintHeading">Templed Cynnwys wedi'i greu</key>
+        <key alias="createdBlueprintMessage">Creuwyd Templed Cynnwys o '%0%'</key>
+        <key alias="duplicateBlueprintMessage">Mae Templed Cynnwys gyda'r un enw yn bodoli eisoes</key>
+        <key alias="blueprintDescription">Mae Templed Cynnwys yn gynnwys sydd wedi'i ddiffinio o flaen llaw y gellir ei ddewis gan olygwr i'w ddefnyddio fel sail ar gyfer creu cynnwys newydd</key>
+    </area>
+    <area alias="media">
+        <key alias="clickToUpload">Cliciwch i lanlwytho</key>
+        <key alias="dropFilesHere">Gollyngwch eich ffeiliau yma...</key>
+        <key alias="urls">Dolen i gyfrwng</key>
+        <key alias="orClickHereToUpload">neu cliciwch yma i ddewis ffeiliau</key>
+        <key alias="dragFilesHereToUpload">Gallwch lusgo ffeiliau yma i lanlwtho.</key>
+        <key alias="onlyAllowedFiles">Dim ond mathau caniatol o ffeil sydd</key>
+        <key alias="disallowedFileType">Ni ellir lanlwytho'r ffeil yma, nid yw math y ffeil yn wedi'i gymeradwyo</key>
+        <key alias="maxFileSize">Maint ffeil uchaf</key>
+        <key alias="mediaRoot">Gwraidd gyfrwng</key>
+        <key alias="moveFailed">Methwyd symud cyfrwng</key>
+        <key alias="moveToSameFolderFailed">Ni all y ffolderi rhiant a chyrchfan fod yr un peth</key>
+        <key alias="copyFailed">Methwyd copïo cyfrwng</key>
+        <key alias="createFolderFailed">Methwyd creu ffolder o dan id rhiant %0%</key>
+        <key alias="renameFolderFailed">Methwyd ailenwi'r ffolder gyda id %0%</key>
+        <key alias="dragAndDropYourFilesIntoTheArea">Llusgo a gollwng eich ffeil(iau) i mewn i'r ardal</key>
+        <key alias="uploadNotAllowed">Ni chaniateir llwytho i fyny yn y lleoliad hwn.</key>
+    </area>
+    <area alias="member">
+        <key alias="createNewMember">Creu aelod newydd</key>
+        <key alias="allMembers">Pob Aelod</key>
+        <key alias="memberGroupNoProperties">Nid oes gan grwpiau aelodau unrhyw eiddo ychwanegol ar gyfer golygu.</key>
+    </area>
+    <area alias="create">
+        <key alias="chooseNode">Ble hoffwch greu eitem newydd %0%</key>
+        <key alias="createUnder">Creu eitem o dan</key>
+        <key alias="createContentBlueprint">Dewiswch y fath o ddogfen hoffwch greu templed dogfen ar ei gyfer</key>
+        <key alias="enterFolderName">Rhoi enw ffolder i mewn</key>
+        <key alias="updateData">Dewiswch fath a theitl</key>
+        <key alias="noDocumentTypes" version="7.0"><![CDATA[Nid oes unrhyw fathau o ddogfennau caniataol ar gael am greu cynnwys fan hyn. Rhaid i chi alluogi'r rhain yn <strong>Mathau o Ddogfennau</strong> o fewn y adran <strong>Gosodiadau</strong>, gan olygu y opsiwn <strong>Mathau o nod blentyn caniataol</strong> o dan <strong>Caniatadau</strong>]]></key>
+        <key alias="noDocumentTypesAtRoot"><![CDATA[Nid oes unrhyw fathau o ddogfennau ar gael. Rhaid i chi creu rhain yn <strong>Mathau o Ddogfennau</strong> tu fewn y adran <strong>Gosodiadau</strong>.]]></key>
+        <key alias="noDocumentTypesWithNoSettingsAccess">Nid yw'r dudalen a ddewiswyd yn y goeden gynnwys yn caniatáu i unrhyw dudalennau gael eu creu oddi tani.</key>
+        <key alias="noDocumentTypesEditPermissions">Golygu caniatâd ar gyfer y math hwn o ddogfen</key>
+        <key alias="noDocumentTypesCreateNew">Creu Math o Ddogfen newydd</key>
+        <key alias="noDocumentTypesAllowedAtRoot"><![CDATA[Nid oes unrhyw fathau o ddogfennau caniataol ar gael am greu cynnwys fan hyn. Rhaid i chi alluogi'r rhain yn <strong>Mathau o Ddogfennau</strong> o fewn y adran <strong>Gosodiadau</strong>, gan olygu y opsiwn <strong>Caniatáu fel gwraidd</strong> o dan <strong>Caniatadau</strong>]]></key>
+        <key alias="noMediaTypes" version="7.0"><![CDATA[Nid oes unrhyw fathau o gyfrwng caniataol ar gael. Rhaid i chi alluogi'r rhain yn yr adran gosodiadau o dan <strong>"mathau o gyfrwng"</strong>.]]></key>
+        <key alias="noMediaTypesWithNoSettingsAccess">Nid yw'r cyfryngau a ddewiswyd yn y goeden yn caniatáu i unrhyw gyfryngau eraill gael eu creu oddi tano.</key>
+        <key alias="noMediaTypesEditPermissions">Golygu caniatâd ar gyfer y math hwn o gyfryngau</key>
+        <key alias="documentTypeWithoutTemplate">Math o Ddogfen heb dempled</key>
+        <key alias="newFolder">Ffolder newydd</key>
+        <key alias="newDataType">Math o ddata newydd</key>
+        <key alias="newJavascriptFile">Ffeil JavaScript newydd</key>
+        <key alias="newEmptyPartialView">Rhan-wedd wag newydd</key>
+        <key alias="newPartialViewMacro">Macro rhan-wedd newydd</key>
+        <key alias="newPartialViewFromSnippet">Rhan-wedd newydd o damaid</key>
+        <key alias="newPartialViewMacroFromSnippet">Macro rhan-wedd wag newydd o damaid</key>
+        <key alias="newPartialViewMacroNoMacro">Macro rhan-wedd newydd (heb macro)</key>
+        <key alias="newStyleSheetFile">Ffeil ddalen arddull newydd</key>
+        <key alias="newRteStyleSheetFile">Ffeil ddalen arddull Golygydd Testun Cyfoethog newydd</key>
+        <key alias="newEmptyPartialViewMacro">Macro rhan-wedd wag newydd</key>
+    </area>
+    <area alias="dashboard">
+        <key alias="browser">Pori eich gwefan</key>
+        <key alias="dontShowAgain">- Cuddio</key>
+        <key alias="nothinghappens">Os nad yw Umbraco yn agor, efallai byddwch angen galluogi popups o'r safle yma</key>
+        <key alias="openinnew">wedi agor mewn ffenestr newydd</key>
+        <key alias="restart">Ailgychwyn</key>
+        <key alias="visit">Ymweld â</key>
+        <key alias="welcome">Croeso</key>
+    </area>
+    <area alias="prompt">
+        <key alias="stay">Aros</key>
+        <key alias="discardChanges">Hepgor newidiadau</key>
+        <key alias="unsavedChanges">Mae gennych chi newidiadau sydd heb eu achub</key>
+        <key alias="unsavedChangesWarning">Ydych chi'n sicr eich bod eisiau llywio i ffwrdd o'r dudalen yma? - mae gennych chi newidiadau sydd heb eu achub</key>
+        <key alias="confirmListViewPublish">Bydd cyhoeddi yn gwneud yr eitemau a ddewiswyd yn weladwy ar y wefan.</key>
+        <key alias="confirmListViewUnpublish">Bydd anghyhoeddi yn tynnu'r eitemau a ddewiswyd a'u holl ddisgynyddion o'r safle.</key>
+        <key alias="confirmUnpublish">Bydd dadgyhoeddi yn dileu'r dudalen yma a phob un o'i phlant o'r safle.</key>
+        <key alias="doctypeChangeWarning">Mae gennych chi newidiadau heb eu cadw. Bydd gwneud newidiadau i'r Math o Ddogfen yn taflu'r newidiadau i ffwrdd.</key>
+    </area>
+    <area alias="bulk">
+        <key alias="done">Wedi gwneud</key>
+        <key alias="deletedItem">Wedi dileu eitem %0%</key>
+        <key alias="deletedItems">Wedi dileu %0% eitem</key>
+        <key alias="deletedItemOfItem">Wedi dileu %0% allan o %1% eitem</key>
+        <key alias="deletedItemOfItems">Wedi dileu %0% allan o %1% o eitemau</key>
+        <key alias="publishedItem">Wedi cyhoeddi eitem %0%</key>
+        <key alias="publishedItems">Wedi cyhoeddi %0% o eitemau</key>
+        <key alias="publishedItemOfItem">Wedi cyhoeddi %0% allan o %1% eitem</key>
+        <key alias="publishedItemOfItems">Wedi cyhoeddi %0% allan o %1% eitemau</key>
+        <key alias="unpublishedItem">Wedi dadgyhoeddi eitem %0%</key>
+        <key alias="unpublishedItems">Wedi dadgyhoeddi %0% o eitemau</key>
+        <key alias="unpublishedItemOfItem">Wedi dadgyhoeddi %0% allan o %1% eitem</key>
+        <key alias="unpublishedItemOfItems">Wedi dadgyhoeddi %0% allan o %1% o eitemau</key>
+        <key alias="movedItem">Wedi symud eitem %0%</key>
+        <key alias="movedItems">Wedi symud %0% o eitemau</key>
+        <key alias="movedItemOfItem">Wedi symud %0% allan o %1% eitem</key>
+        <key alias="movedItemOfItems">Wedi symud %0% allan o %1% o eitemau</key>
+        <key alias="copiedItem">Wedi copïo eitem %0%</key>
+        <key alias="copiedItems">Wedi copïo %0% o eitemau</key>
+        <key alias="copiedItemOfItem">Wedi copïo %0% allan o %1% eitem</key>
+        <key alias="copiedItemOfItems">Wedi copïo %0% allan o %1% eitemau</key>
+    </area>
+    <area alias="defaultdialogs">
+        <key alias="nodeNameLinkPicker">Teitl y ddolen</key>
+        <key alias="urlLinkPicker">Dolen</key>
+        <key alias="anchorLinkPicker">Angor / llinyn ymholi</key>
+        <key alias="anchorInsert">Enw</key>
+        <key alias="assignDomain">Gweinyddu enwau gwesteia</key>
+        <key alias="closeThisWindow">Cau'r ffenestr yma</key>
+        <key alias="confirmdelete">Ydych chi'n sicr eich bod eisiau dileu</key>
+        <key alias="confirmdeleteXofX">Wyt ti'n siŵr fod ti eisiau dileu %0% yn seiliedig ar %1%</key>
+
+        <key alias="confirmdisable">Ydych chi'n sicr eich bod eisiau analluogi</key>
+
+        <key alias="confirmremove">Wyt ti'n siŵr fod ti eisiau dileu</key>
+        <key alias="confirmremoveusageof"><![CDATA[Ydych chi'n siŵr bod chi am gael gwared ar y defnydd o <b>%0%</b>]]></key>
+        <key alias="confirmremovereferenceto"><![CDATA[Ydych chi'n siŵr bod chi am gael gwared ar y cyfeirnod i <b>%0%</b>]]></key>
+
+        <key alias="confirmlogout">Ydych chi'n sicr?</key>
+        <key alias="confirmSure">Ydych chi'n sicr?</key>
+        <key alias="cut">Torri</key>
+        <key alias="editdictionary">Golygu Eitem Geiriadur</key>
+        <key alias="editlanguage">Golygu Iaith</key>
+        <key alias="editSelectedMedia">Golygu cyfrwng a dewiswyd</key>
+        <key alias="insertAnchor">Mewnosod dolen leol</key>
+        <key alias="insertCharacter">Mewnosod nod</key>
+        <key alias="insertgraphicheadline">Mewnosod pennawd graffig</key>
+        <key alias="insertimage">Mewnosod llun</key>
+        <key alias="insertlink">Mewnosod dolen</key>
+        <key alias="insertMacro">Cliciwch i ychwanegu Macro</key>
+        <key alias="inserttable">Mewnosod tabl</key>
+        <key alias="languagedeletewarning">Bydd hyn yn dileu'r iaith</key>
+        <key alias="languageChangeWarning">Gall newid y diwylliant ar gyfer iaith fod yn weithrediad drud a bydd yn arwain at ailadeiladu'r storfa cynnwys a'r mynegeion</key>
+        <key alias="lastEdited">Golygwyd ddiwethaf</key>
+        <key alias="link">Dolen</key>
+        <key alias="linkinternal">Dolen fewnol:</key>
+        <key alias="linklocaltip">Wrth ddefnyddio dolenni leol, defnyddiwch "#" o flaen y ddolen</key>
+        <key alias="linknewwindow">Agor mewn ffenestr newydd?</key>
+        <key alias="macroContainerSettings">Gosodiadau Macro</key>
+        <key alias="macroDoesNotHaveProperties">Nid yw'r macro yma yn cynnwys unrhyw briodweddau gallwch chi olygu</key>
+        <key alias="paste">Gludo</key>
+        <key alias="permissionsEdit">Golygu hawliau ar gyfer</key>
+        <key alias="permissionsSet">Gosod hawliau ar gyfer</key>
+        <key alias="permissionsSetForGroup">Gosod hawliau ar gyfer %0% ar gyfer y grŵp defnyddwyr %1%</key>
+        <key alias="permissionsHelp">Dewiswch y grŵpiau defnyddwyr yr ydych eisiau gosod hwaliau ar eu cyfer</key>
+        <key alias="recycleBinDeleting">Mae'r eitemau yn y bin ailgylchu yn cael eu dileu. Peidiwch â chau'r ffenestr yma wrth i'r gweithrediad gymryd lle</key>
+        <key alias="recycleBinIsEmpty">Mae'r bin ailgylchu yn awr yn wag</key>
+        <key alias="recycleBinWarning">Pan gaiff eitemau eu dileu o'r bin ailgylchu, byddent yn diflannu am byth</key>
+        <key alias="regexSearchError"><![CDATA[Mae problem gyda gwasanaeth gwe <a target='_blank' href='http://regexlib.com'>regexlib.com</a> ar hyn o bryd, nid oes gennym reolaeth dros hyn. Mae'n ddrwg iawn gennym ni am yr anghyfleustra.]]></key>
+        <key alias="regexSearchHelp">Chwiliwch am fynegiad cyson er mwyn ychwanegu dilysiad i faes ffurflen. Enghraifft: 'email, 'zip-code' 'url'</key>
+        <key alias="removeMacro">Dileu Macro</key>
+        <key alias="requiredField">Maes Gofynnol</key>
+        <key alias="sitereindexed">Safle wedi'i ail-fynegi</key>
+        <key alias="siterepublished">Mae storfa'r wefan wedi'i ddiweddaru. Mae holl gynnwys cyhoeddi wedi'i ddiweddaru, ac mae'r holl gynnwys sydd heb ei gyhoeddi yn dal i fod heb ei gyhoeddi</key>
+        <key alias="siterepublishHelp">Bydd storfa'r wefan yn cael ei adnewyddu. Bydd holl gynnwys cyhoeddi yn cael ei ddiweddaru, ac bydd holl gynnwys sydd heb ei gyhoeddi yn dal i fod heb ei gyhoeddi.</key>
+        <key alias="tableColumns">Nifer o golofnau</key>
+        <key alias="tableRows">Nifer o resi</key>
+        <key alias="templateContentAreaHelp">
+            <![CDATA[<strong>Gosodwch id dalfan</strong> wrth osod ID ar eich dalfan gallwch chwistrellu cynnwys i mewn i'r templed yma o dempledi blentyn,
+      wrth gyfeirio at yr ID yma gan ddefnyddio elfen <code>&lt;asp:content /&gt;</code>.]]>
+        </key>
+        <key alias="templateContentPlaceHolderHelp">
+            <![CDATA[<strong>Dewiswch id dalfan</strong> o'r rhestr isod. Gallwch ddim ond
+      ddewis Id (neu sawl) o feistr y dempled bresennol.]]>
+        </key>
+        <key alias="thumbnailimageclickfororiginal">Cliciwch ar y llun i weld y maint llawn</key>
+        <key alias="treepicker">Dewis eitem</key>
+        <key alias="viewCacheItem">Gweld Eitem Storfa</key>
+        <key alias="createFolder">Creu ffolder...</key>
+        <key alias="relateToOriginalLabel">Perthnasu at y gwreiddiol</key>
+        <key alias="includeDescendants">Cynnwys disgynyddion</key>
+        <key alias="theFriendliestCommunity">Y gymuned fwyaf cyfeillgar</key>
+        <key alias="linkToPage">Dolen i dudalen</key>
+        <key alias="openInNewWindow">Agor y ddolen ddogfen mewn ffenestr neu tab newydd</key>
+        <key alias="linkToMedia">Dolen i gyfrwng</key>
+        <key alias="linkToFile">Dolen i ffeil</key>
+        <key alias="selectContentStartNode">Dewis nod cychwyn cynnwys</key>
+        <key alias="selectMedia">Dewis cyfrwng</key>
+        <key alias="selectMediaType">Dewis y math o gyfrwng</key>
+        <key alias="selectIcon">Dewis eicon</key>
+        <key alias="selectItem">Dewis eitem</key>
+        <key alias="selectLink">Dewis dolen</key>
+        <key alias="selectMacro">Dewis macro</key>
+        <key alias="selectContent">Dewis cynnwys</key>
+        <key alias="selectContentType">Dewiswch y math o gynnwys</key>
+        <key alias="selectMediaStartNode">Dewis nod cychwyn cyfrwng</key>
+        <key alias="selectMember">Dewis aelod</key>
+        <key alias="selectMemberGroup">Dewis grŵp aelod</key>
+        <key alias="selectMemberType">Dewiswch fath aelod</key>
+        <key alias="selectNode">Dewis nod</key>
+        <key alias="selectSections">Dewis adran</key>
+        <key alias="selectUser">Dewis defnyddiwr</key>
+        <key alias="selectUsers">Dewis defnyddwyr</key>
+        <key alias="noIconsFound">Dim eiconau wedi'u darganfod</key>
+        <key alias="noMacroParams">Does dim paramedrau ar gyfer y macro yma</key>
+        <key alias="noMacros">Does dim macro ar gael i fewnosod</key>
+        <key alias="externalLoginProviders">Darparwyr mewngofnodi allanol</key>
+        <key alias="exceptionDetail">Manylion Eithriad</key>
+        <key alias="stacktrace">Trywydd stac</key>
+        <key alias="innerException">Eithriad Fewnol</key>
+        <key alias="linkYour">Dolenni eich</key>
+        <key alias="unLinkYour">Dad-ddolenni eich</key>
+        <key alias="account">cyfrif</key>
+        <key alias="selectEditor">Dewiswch olygwr</key>
+        <key alias="selectEditorConfiguration">Dewiswch ffurfweddiad</key>
+        <key alias="selectSnippet">Dewiswch damaid</key>
+        <key alias="variantdeletewarning">Bydd hyn yn dileu'r nod a'i holl ieithoedd. Os mai dim ond un iaith yr ydych am ei dileu, ewch i'w anghyhoedd yn lle.</key>
+        <key alias="propertyuserpickerremovewarning"><![CDATA[Bydd hyn yn cael gwared ar y defnyddiwr <b>%0%</b>.]]></key>
+        <key alias="userremovewarning"><![CDATA[bydd hyn yn cael gwared ar y defnyddiwr <b>%0%</b> o'r grŵp <b>%1%</b>]]></key>
+        <key alias="yesRemove">Ydw, dileu</key>
+    </area>
+    <area alias="dictionary">
+        <key alias="noItems">Nid oes unrhyw eitemau geiriadur.</key>
+    </area>
+    <area alias="dictionaryItem">
+        <key alias="description">
+            <![CDATA[
+            Golygwch y fersiynau iaith gwahanol ar gyfer yr eitem geiriadur '<em>%0%</em>' islaw<br/>Gallwch ychwanegu ieithoedd ychwanegol o dan 'ieithoedd' yn y ddewislen ar y chwith
+            ]]>
+        </key>
+        <key alias="displayName">Enw Diwylliant</key>
+        <key alias="changeKey">Golygu allwedd yr eitem geiriadur.</key>
+        <key alias="changeKeyError">
+            <![CDATA[
+            Mae'r allwedd '%0%' yn bodoli eisoes.
+            ]]>
+        </key>
+        <key alias="overviewTitle">Trosolwg Geiriadur</key>
+    </area>
+    <area alias="examineManagement">
+        <key alias="configuredSearchers">Chwilwyr wedi'u Ffurfweddu</key>
+        <key alias="configuredSearchersDescription">Yn dangos priodweddau ac offer ar gyfer unrhyw Chwiliwr wedi'i ffurfweddu (h.y. fel chwiliwr aml-fynegai)</key>
+        <key alias="fieldValues">Gwerthoedd maes</key>
+        <key alias="healthStatus">Statws iechyd</key>
+        <key alias="healthStatusDescription">Statws iechyd y mynegai ac os gellir ei ddarllen</key>
+        <key alias="indexers">Mynegewyr</key>
+        <key alias="indexInfo">Gwybodaeth mynegai</key>
+        <key alias="indexInfoDescription">Yn rhestru priodweddau'r mynegai</key>
+        <key alias="manageIndexes">Rheoli mynegeion Examine</key>
+        <key alias="manageIndexesDescription">Yn caniatáu ichi weld manylion pob mynegai ac yn darparu rhai offer ar gyfer rheoli'r mynegeion</key>
+        <key alias="rebuildIndex">Ailadeiladu mynegai </key>
+        <key alias="rebuildIndexWarning">
+            <![CDATA[
+            Bydd hyn yn achosi i'r mynegai gael ei ailadeiladu.<br />
+            Yn dibynnu ar faint o gynnwys sydd yn eich gwefan, gallai hyn gymryd cryn amser.<br />
+            Ni argymhellir ailadeiladu mynegai ar adegau o draffig gwefan uchel neu pan fydd golygyddion yn golygu cynnwys.
+            ]]>
+        </key>
+        <key alias="searchers">Chwilwyr</key>
+        <key alias="searchDescription">Chwiliwch y mynegai a gweld y canlyniadau</key>
+        <key alias="tools">Offer</key>
+        <key alias="toolsDescription">Offer i reoli'r mynegai</key>
+        <key alias="fields">meysydd</key>
+        <key alias="indexCannotRead">Ni ellir darllen yr mynegai a bydd angen ei ailadeiladu</key>
+        <key alias="processIsTakingLonger">Mae'r broses yn cymryd mwy o amser na'r disgwyl, gwiriwch y log umbraco i weld os mae wedi bod unrhyw wall yn ystod y gweithrediad hwn</key>
+        <key alias="indexCannotRebuild">Ni ellir ailadeiladu'r mynegai hwn oherwydd nad yw wedi'i aseinio</key>
+        <key alias="iIndexPopulator">IIndexPopulator</key>
+    </area>
+    <area alias="placeholders">
+        <key alias="username">Darparwch eich enw defnyddiwr</key>
+        <key alias="password">Darparwch eich cyfrinair</key>
+        <key alias="confirmPassword">Cadarnhewch eich cyfrinair</key>
+        <key alias="nameentity">Enwch y %0%...</key>
+        <key alias="entername">Darparwch enw...</key>
+        <key alias="enteremail">Darparwch ebost...</key>
+        <key alias="enterusername">Darparwch enw defnyddiwr...</key>
+        <key alias="label">Label...</key>
+        <key alias="enterDescription">Darparwch ddisgrifiad...</key>
+        <key alias="search">Teipiwch i chwilio...</key>
+        <key alias="filter">Teipiwch i hidlo...</key>
+        <key alias="enterTags">Teipiwch i ychwanegu tagiau (gwasgwch enter ar ôl pob tag)...</key>
+        <key alias="email">Darparwch eich ebost</key>
+        <key alias="enterMessage">Darparwch neges...</key>
+        <key alias="usernameHint">Mae eich enw defnyddiwr fel arfer eich cyfeiriad ebost</key>
+        <key alias="anchor">#gwerth neu ?allwedd=gwerth</key>
+        <key alias="enterAlias">Darparwch enw arall...</key>
+        <key alias="generatingAlias">Yn generadu enw arall...</key>
+        <key alias="a11yCreateItem">Creu eitem</key>
+        <key alias="a11yCreate">Creu</key>
+        <key alias="a11yEdit">Golygu</key>
+        <key alias="a11yName">Enw</key>
+    </area>
+    <area alias="editcontenttype">
+        <key alias="allowAtRoot" version="7.2">Caniatáu ar y gwraidd</key>
+        <key alias="allowAtRootDesc" version="7.2">Dim ond Mathau o Gynnwys gyda hwn wedi ticio all gael eu creu ar lefel wraidd coed Cynnwys a Chyfrwng</key>
+        <key alias="allowedchildnodetypes">Mathau o nod blentyn caniataol</key>
+        <key alias="contenttypecompositions">Cyfansoddiadau Mathau o Ddogfen</key>
+        <key alias="create">Creu</key>
+        <key alias="deletetab">Dileu tab</key>
+        <key alias="description">Disgrifiad</key>
+        <key alias="newtab">Tab newydd</key>
+        <key alias="tab">Tab</key>
+        <key alias="thumbnail">Ciplun bach</key>
+        <key alias="hasListView">Galluogi gwedd rhestr</key>
+        <key alias="hasListViewDesc" version="7.2">Ffurfweddu'r eitem gynnwysi ddangos rhestr trefnadwy &amp; a chwiladwy o'i phlant, ni fydd y plant yn cael eu dangos yn y goeden</key>
+        <key alias="currentListView" version="7.2">Gwedd rhestr bresennol</key>
+        <key alias="currentListViewDesc" version="7.2">Y fath o ddata gwedd rhestr gweithredol</key>
+        <key alias="createListView" version="7.2">Creu gwedd rhestr pwrpasol</key>
+        <key alias="removeListView" version="7.2">Dileu gwedd rhestr pwrpasol</key>
+        <key alias="aliasAlreadyExists">Mae math o gynnwys, math o gyfrwng neu math o aeold gyda'r enw arall yma'n bodoli eisoes</key>
+    </area>
+    <area alias="renamecontainer">
+        <key alias="renamed">Wedi ailenwi</key>
+        <key alias="enterNewFolderName">Darparwch enw ffolder newydd yma</key>
+        <key alias="folderWasRenamed">%0% wedi ailenwi i %1%</key>
+    </area>
+    <area alias="editdatatype">
+        <key alias="addPrevalue">Ychwanegu cyn-werth</key>
+        <key alias="dataBaseDatatype">Math o ddata cronfa ddata</key>
+        <key alias="guid">GUID golygydd priodwedd</key>
+        <key alias="renderControl">Golygydd priodwedd</key>
+        <key alias="rteButtons">Botymau</key>
+        <key alias="rteEnableAdvancedSettings">Galluogi gosodiadau datblygedig ar gyfer</key>
+        <key alias="rteEnableContextMenu">Galluogi dewislen cyd-destun</key>
+        <key alias="rteMaximumDefaultImgSize">Maint fwyaf diofyn llun wedi'i fewnosod</key>
+        <key alias="rteRelatedStylesheets">Taflenni arddull perthnasol</key>
+        <key alias="rteShowLabel">Dangos label</key>
+        <key alias="rteWidthAndHeight">Lled ac uchder</key>
+        <key alias="allPropTypes">Holl fathau o briodweddau &amp; data priodwedd</key>
+        <key alias="willBeDeleted">yn defnyddio'r fath yma o ddata yn cael eu dileu yn barhaol, cadarnhewch eich bod eisiau dileu'r rhain hefyd</key>
+        <key alias="yesDelete">Iawn, dileu</key>
+        <key alias="andAllRelated">a holl fathau o briodwedd &amp; data priodwedd sy'n defnyddio'r math o ddata yma</key>
+        <key alias="selectFolder">Dewiswch y ffolder i symud</key>
+        <key alias="inTheTree">i'r strwythyr goeden isod</key>
+        <key alias="wasMoved">wedi symud o dan</key>
+
+        <key alias="hasReferencesDeleteConsequence"><![CDATA[Bydd dileu <strong>%0%</strong> yn dileu'r briodweddau a'i data o'r eitemau canlynol]]></key>
+        <key alias="acceptDeleteConsequence">Rwy'n deall y weithred hon yn dileu'r holl briodweddau a data sy'n seiliedig ar Fath o Ddata hon</key>
+    </area>
+    <area alias="errorHandling">
+        <key alias="errorButDataWasSaved">Mae eich data wedi'i achub, ond cyn i chi allu cyhoeddi'r dudalen yma, mae yna wallau yr ydych angen eu gwirio yn gyntaf:</key>
+        <key alias="errorChangingProviderPassword">Nid yw'r darparwr aeoldaeth bresennol yn cefnogi newid cyfrinair (EnablePasswordRetrieval angen cael ei osod i true)</key>
+        <key alias="errorExistsWithoutTab">%0% yn bodoli eisoes</key>
+        <key alias="errorHeader">Roedd yna wallau:</key>
+        <key alias="errorHeaderWithoutTab">Roedd yna wallau:</key>
+        <key alias="errorInPasswordFormat">Dylai'r cyfrinair fod o leiaf %0% nod o hyd a chynnwys o leiaf %1% nod(au) sydd ddim yn llythyren na rhif</key>
+        <key alias="errorIntegerWithoutTab">%0% angen bod yn gyfanrif</key>
+        <key alias="errorMandatory">Mae'r maes %0% yn y tab %1% yn ofynnol</key>
+        <key alias="errorMandatoryWithoutTab">%0% yn faes ofynnol</key>
+        <key alias="errorRegExp">%0% yn %1% mewn fformat annilys</key>
+        <key alias="errorRegExpWithoutTab">%0% mewn fformat annilys</key>
+        <key alias="errorPropertyEditorNotSupportedInElementTypes">Briodwedd '%0%' yn defnyddio'r golygydd '%1%' sydd ddim wedi ei chynnal yn y teipiau elfen.</key>
+    </area>
+    <area alias="errors">
+        <key alias="receivedErrorFromServer">Derbynwyd gwall o'r gweinydd</key>
+        <key alias="dissallowedMediaType">Mae'r math o ffeil yma wedi'i wahardd gan y gweinyddwr</key>
+        <key alias="codemirroriewarning">NODYN! Er bod CodeMirror wedi'i alluogi gan y ffurfwedd, mae o wedi'i analluogi mewn Internet Explorer gan nad yw'n ddigon cadarn.</key>
+        <key alias="contentTypeAliasAndNameNotNull">Darparwch yr enw ac yr enw arall ar y math o briodwedd newydd!</key>
+        <key alias="filePermissionsError">Mae yna broblem gyda hawliau darllen/ysgrifennu i ffeil neu ffolder penodol</key>
+        <key alias="macroErrorLoadingPartialView">Gwall yn llwytho sgript Rhan-Wedd (ffeil: %0%)</key>
+        <key alias="macroErrorLoadingUsercontrol">Gwall yn llwytho Rheolydd Defnyddiwr '%0%'</key>
+        <key alias="macroErrorLoadingCustomControl">Gwall yn llwytho Rheolydd Pwrpasol (Gwasaneth: %0%, Math: '%1%')</key>
+        <key alias="macroErrorLoadingMacroEngineScript">Gwall yn llwytho sgript MacroEngine (ffeil: %0%)</key>
+        <key alias="macroErrorParsingXSLTFile">"Gwall yn dosbarthu'r ffeil XSLT: %0%</key>
+        <key alias="macroErrorReadingXSLTFile">"Gwall yn darllen y ffeil XSLT: %0%</key>
+        <key alias="missingTitle">Darparwch deitl</key>
+        <key alias="missingType">Dewiswch fath</key>
+        <key alias="pictureResizeBiggerThanOrg">Rydych ar fîn gwneud y llun yn fwy 'na'r maint gwreiddiol. Ydych chi'n sicr eich bod eisiau parhau?</key>
+        <key alias="pythonErrorHeader">Gwall yn y sgript python</key>
+        <key alias="pythonErrorText">Nid yw'r sgript python wedi'i achub gan ei fod yn cynnwys gwall(au)</key>
+        <key alias="startNodeDoesNotExists">Nod gychwynnol wedi'i ddileu, cysylltwch â'ch gweinyddwr</key>
+        <key alias="stylesMustMarkBeforeSelect">Marciwch gynnwys cyn newid arddull</key>
+        <key alias="stylesNoStylesOnPage">Dim arddulliau gweithredol ar gael</key>
+        <key alias="tableColMergeLeft">Symudwch y cyrchwr ar ochr chwith y ddwy gell yr ydych eisiau cyfuno</key>
+        <key alias="tableSplitNotSplittable">Ni allwch hollti cell sydd heb ei gyfuno.</key>
+        <key alias="propertyHasErrors">Mae gan briodwedd hon gwallau</key>
+        <key alias="errorPropertyEditorNotSupportedInElementTypes">Priodwedd '%0%' yn defnyddio'r golygydd '%1%' sydd ddim yn cael ei gefnogi mewn Mathau o Elfen.</key>
+        <key alias="xsltErrorHeader">Gwall yn y ffynhonnell XSLT</key>
+        <key alias="xsltErrorText">Nid yw'r XSLTwedi'i achub gan ei fod yn cynnwys gwall(au)</key>
+        <key alias="missingPropertyEditorErrorMessage">Mae gwall ffurfwedd gyda'r math o ddata sy'n cael ei ddefnyddio ar gyfer y priodwedd yma, gwiriwch y fath o ddata</key>
+    </area>
+    <area alias="general">
+        <key alias="options">Dewisiadau</key>
+        <key alias="about">Amdano</key>
+        <key alias="action">Gweithred</key>
+        <key alias="actions">Gweithredoedd</key>
+        <key alias="add">Ychwanegu</key>
+        <key alias="alias">Enw arall</key>
+        <key alias="all">Holl</key>
+        <key alias="areyousure">Ydych chi'n sicr?</key>
+        <key alias="back">Yn ôl</key>
+        <key alias="backToOverview">Yn ôl i'r trosolwg</key>
+        <key alias="border">Ffin</key>
+        <key alias="by">wrth</key>
+        <key alias="cancel">Canslo</key>
+        <key alias="cellMargin">Ymyl cell</key>
+        <key alias="choose">Dewis</key>
+        <key alias="clear">Clirio</key>
+        <key alias="close">Cau</key>
+        <key alias="closewindow">Cau Ffenest</key>
+        <key alias="comment">Sylw</key>
+        <key alias="confirm">Cadarnhau</key>
+        <key alias="constrain">Gorfodi</key>
+        <key alias="constrainProportions">Gorfodi cyfraneddau</key>
+        <key alias="content">Cynnwys</key>
+        <key alias="continue">Bwrw ymlaen</key>
+        <key alias="copy">Copïo</key>
+        <key alias="create">Creu</key>
+        <key alias="cropSection">Adran tocio</key>
+        <key alias="database">Cronfa ddata</key>
+        <key alias="date">Dyddiad</key>
+        <key alias="default">Diofyn</key>
+        <key alias="delete">Dileu</key>
+        <key alias="deleted">Wedi dileu</key>
+        <key alias="deleting">Yn dileu...</key>
+        <key alias="design">Cynllun</key>
+        <key alias="dictionary">Geiriadur</key>
+        <key alias="dimensions">Dimensiynau</key>
+        <key alias="discard">Gwaredu</key>
+        <key alias="down">I lawr</key>
+        <key alias="download">Lawrlwytho</key>
+        <key alias="edit">Golygu</key>
+        <key alias="edited">Golygwyd</key>
+        <key alias="elements">Elfennau</key>
+        <key alias="email">Ebost</key>
+        <key alias="error">Gwall</key>
+        <key alias="field">Maes</key>
+        <key alias="findDocument">Canfod</key>
+        <key alias="first">Cyntaf</key>
+        <key alias="focalPoint">Canolbwynt</key>
+        <key alias="general">Cyffredinol</key>
+        <key alias="groups">Grŵpiau</key>
+        <key alias="group">Grŵp</key>
+        <key alias="height">Uchder</key>
+        <key alias="help">Help</key>
+        <key alias="hide">Cuddio</key>
+        <key alias="history">Hanes</key>
+        <key alias="icon">Eicon</key>
+        <key alias="id">Id</key>
+        <key alias="import">Mewnforio</key>
+        <key alias="includeFromsubFolders">Cynnwys is-ffolderi wrth chwilio</key>
+        <key alias="excludeFromSubFolders">Search only this folder Chwilio yn ffolder hwn yn unig</key>
+        <key alias="info">Gwybodaeth</key>
+        <key alias="innerMargin">Ymyl mewnol</key>
+        <key alias="insert">Mewnosod</key>
+        <key alias="install">Gosod</key>
+        <key alias="invalid">Annilys</key>
+        <key alias="justify">Unioni</key>
+        <key alias="label">Label</key>
+        <key alias="language">Iaith</key>
+        <key alias="last">Olaf</key>
+        <key alias="layout">Gosodiad</key>
+        <key alias="links">Dolenni</key>
+        <key alias="loading">Yn llwytho</key>
+        <key alias="locked">Wedi cloi</key>
+        <key alias="login">Mewngofnodi</key>
+        <key alias="logoff">Allgofnodi</key>
+        <key alias="logout">Allgofnodi</key>
+        <key alias="macro">Macro</key>
+        <key alias="mandatory">Gofynnol</key>
+        <key alias="message">Neges</key>
+        <key alias="move">Symud</key>
+        <key alias="more">Mwy</key>
+        <key alias="name">Enw</key>
+        <key alias="new">Newydd</key>
+        <key alias="next">Nesaf</key>
+        <key alias="no">Na</key>
+        <key alias="of">o</key>
+        <key alias="off">I ffwrdd</key>
+        <key alias="ok">Iawn</key>
+        <key alias="open">Agor</key>
+        <key alias="options">Opsiynau</key>
+        <key alias="on">Ymlaen</key>
+        <key alias="or">neu</key>
+        <key alias="orderBy">Trefnu wrth</key>
+        <key alias="password">Cyfrinair</key>
+        <key alias="path">Llwybr</key>
+        <key alias="placeHolderID">ID Dalfan</key>
+        <key alias="pleasewait">Un eiliad os gwelwch yn dda...</key>
+        <key alias="previous">Blaenorol</key>
+        <key alias="properties">Priodweddau</key>
+        <key alias="rebuild">Ailadeiladu</key>
+        <key alias="reciept">Ebost i dderbyn data ffurflen</key>
+        <key alias="recycleBin">Bin Ailgylchu</key>
+        <key alias="recycleBinEmpty">Mae eich bin ailgylchu yn wag</key>
+        <key alias="reload">Ail-lwytho</key>
+        <key alias="remaining">Ar ôl</key>
+        <key alias="remove">Dileu</key>
+        <key alias="rename">Ailenwi</key>
+        <key alias="renew">Adnewyddu</key>
+        <key alias="required" version="7.0">Gofynnol</key>
+        <key alias="retrieve">Adfer</key>
+        <key alias="retry">Ceisio eto</key>
+        <key alias="rights">Hawliau</key>
+        <key alias="scheduledPublishing">Cyhoeddi ar amserlen</key>
+        <key alias="search">Chwilio</key>
+        <key alias="searchNoResult">Mae'n ddrwg gennym ni, ni all ganfod beth roeddwch chi'n chwilio amdano.</key>
+        <key alias="noItemsInList">Dim eitemau wedi'u hychwanegu</key>
+        <key alias="server">Gweinydd</key>
+        <key alias="settings">Gosodiadau</key>
+        <key alias="show">Dangos</key>
+        <key alias="showPageOnSend">Dangos y dudlaen wrth Anfon</key>
+        <key alias="size">Maint</key>
+        <key alias="sort">Trefnu</key>
+        <key alias="status">Statws</key>
+        <key alias="submit">Cyflwyno</key>
+        <key alias="success">Llwyddiant</key>
+        <key alias="type">Math</key>
+        <key alias="typeToSearch">Math i chwilio...</key>
+        <key alias="under">o dan</key>
+        <key alias="up">I fyny</key>
+        <key alias="update">Diweddaru</key>
+        <key alias="upgrade">Uwchraddio</key>
+        <key alias="upload">Lanlwytho</key>
+        <key alias="url">Url</key>
+        <key alias="user">Defnyddiwr</key>
+        <key alias="username">Enw defnyddiwr</key>
+        <key alias="value">Gwerth</key>
+        <key alias="view">Gwedd</key>
+        <key alias="welcome">Croeso...</key>
+        <key alias="width">Lled</key>
+        <key alias="yes">Ie</key>
+        <key alias="folder">Ffolder</key>
+        <key alias="searchResults">Canlyniadau chwilio</key>
+        <key alias="reorder">Ail-drefnu</key>
+        <key alias="reorderDone">Rydw i wedi gorffen ail-drefnu</key>
+        <key alias="preview">Rhagolwg</key>
+        <key alias="changePassword">Newid cyfrinair</key>
+        <key alias="to">i</key>
+        <key alias="listView">Gwedd rhestr</key>
+        <key alias="saving">Yn achub...</key>
+        <key alias="current">presennol</key>
+        <key alias="embed">Mewnblannu</key>
+        <key alias="retrieve">Adfer</key>
+        <key alias="selected">dewiswyd</key>
+        <key alias="other">Arall</key>
+        <key alias="articles">Erthyglau</key>
+        <key alias="videos">Fideos</key>
+        <key alias="clear">Clirio</key>
+        <key alias="installing">Arsefydlu</key>
+    </area>
+    <area alias="colors">
+        <key alias="black">Du</key>
+        <key alias="green">Gwyrdd</key>
+        <key alias="yellow">Melyn</key>
+        <key alias="orange">Oren</key>
+        <key alias="blue">Glas</key>
+        <key alias="bluegrey">Llwyd Las</key>
+        <key alias="grey">Llwyd</key>
+        <key alias="brown">Brown</key>
+        <key alias="lightblue">Glas Golau</key>
+        <key alias="cyan">Gwyrddlas</key>
+        <key alias="lightgreen">Gwyrdd Golau</key>
+        <key alias="lime">Leim</key>
+        <key alias="amber">Melyngoch</key>
+        <key alias="deeporange">Oren Ddwfn</key>
+        <key alias="red">Coch</key>
+        <key alias="pink">Pinc</key>
+        <key alias="purple">Piws</key>
+        <key alias="deeppurple">Piws Ddwfn</key>
+        <key alias="indigo">Dulas</key>
+    </area>
+    <area alias="shortcuts">
+        <key alias="addTab">Ychwanegu tab</key>
+        <key alias="addGroup">Ychwanegu grŵp</key>
+        <key alias="addProperty">Ychwanegu priodwedd</key>
+        <key alias="addEditor">Ychwanegu golygydd</key>
+        <key alias="addTemplate">Ychwanegu templed</key>
+        <key alias="addChildNode">Ychwanegu nod blentyn</key>
+        <key alias="addChild">Ychwanegu plentyn</key>
+        <key alias="editDataType">Golygu math o ddata</key>
+        <key alias="navigateSections">Llywio adrannau</key>
+        <key alias="shortcut">Llwybrau byr</key>
+        <key alias="showShortcuts">dangos llwybrau byr</key>
+        <key alias="toggleListView">Toglo gwedd rhestr</key>
+        <key alias="toggleAllowAsRoot">Toglo caniatáu fel gwraidd</key>
+        <key alias="commentLine">Sylwi/Dad-sylwi llinellau</key>
+        <key alias="removeLine">Dileu llinell</key>
+        <key alias="copyLineUp">Copïo llinellau i fyny</key>
+        <key alias="copyLineDown">Copïo llinellau i lawr</key>
+        <key alias="moveLineUp">Symud Llinellau I Fyny</key>
+        <key alias="moveLineDown">Symud Llinellau I Lawr</key>
+        <key alias="generalHeader">Cyffredinol</key>
+        <key alias="editorHeader">Golygydd</key>
+        <key alias="toggleAllowCultureVariants">Toglo caniatáu amrywiadau diwylliant</key>
+        <key alias="toggleAllowSegmentVariants">Toglo caniatáu segmentiad</key>
+    </area>
+    <area alias="graphicheadline">
+        <key alias="backgroundcolor">Lliw cefndir</key>
+        <key alias="bold">Trwm</key>
+        <key alias="color">Lliw ffont</key>
+        <key alias="font">Ffont</key>
+        <key alias="text">Testun</key>
+    </area>
+    <area alias="headers">
+        <key alias="page">Tudalen</key>
+    </area>
+    <area alias="installer">
+        <key alias="databaseErrorCannotConnect">Ni all y gosodydd gysylltu â'r gronfa ddata.</key>
+        <key alias="databaseErrorWebConfig">Methwyd achub y ffeil web.config. Ceisiwch newid y llinyn gyswllt yn uniongyrchol.</key>
+        <key alias="databaseFound">Canfwyd eich cronfa ddata ac mae'n cael ei adnabod fel</key>
+        <key alias="databaseHeader">Ffurfwedd gronfa ddata</key>
+        <key alias="databaseInstall">
+            <![CDATA[
+      Gwasgwch y botwm <strong>gosod</strong> i osod y gronfa ddata %0% Umbraco
+    ]]>
+        </key>
+        <key alias="databaseInstallDone"><![CDATA[Mae Umbraco %0% yn awr wedi copïo i'ch gronfa ddata. Gwasgwch <strong>Nesaf</strong> i fwrw ymlaen.]]></key>
+        <key alias="databaseNotFound">
+            <![CDATA[<p>Cronfa ddata heb ei ganfod! Gwiriwch fod y gwybodaeth yn y "llinyn gyswllt" o'r ffeil "web.config" yn gywir.</p>
+              <p>Er mwyn parhau, newidiwch y ffeil "web.config" (gan ddefnyddio Visual Studio neu eich hoff olygydd testun), rholiwch at y gwaelod, ychwanegwch y llinyn gyswllt ar gyfer eich cronfa ddata yn yr allwedd o'r enw "UmbracoDbDSN" ac achub y ffeil. </p>
+              <p>
+              Cliciwch y botwm <strong>ceisio eto</strong> pan rydych wedi
+              gorffen.<br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">
+			              Mwy o wybodaeth am newid y ffeil web.config yma</a>.</p>]]>
+        </key>
+        <key alias="databaseText">
+            <![CDATA[Er mwyn cwblhau'r cam yma, rhaid i chi berchen gwybodaeth am eich gweinydd gronfa ddata ("llinyn gyswllt").<br />
+        Cysylltwch â'ch darparwr gwe (ISP) os oes angen.
+        Os ydych chi'n gosod ar beiriant leol neu weinydd, efallai bydd angen gwybodaeth o'ch gweinyddwr system arnoch.]]>
+        </key>
+        <key alias="databaseUpgrade">
+            <![CDATA[
+      <p>
+      Gwasgwch y botwm <strong>uwchraddio</strong> i uwchraddio eoch gronfa ddata i Umbraco %0%</p>
+      <p>
+      Peidiwch â phoeni - ni fydd unrhyw gynnwys yn cael ei ddileu a bydd popeth yn parhau i weithio wedyn!
+      </p>
+      ]]>
+        </key>
+        <key alias="databaseUpgradeDone">
+            <![CDATA[Mae eich cronfa ddata wedi'u uwchraddio at y fersiwn terfynol %0%.<br />Gwasgwch <strong>Nesaf</strong> i
+      barhau. ]]>
+        </key>
+        <key alias="databaseUpToDate"><![CDATA[Mae eich cronfa ddata bresennol wedi diweddaru eisoes!. Cliciwch <strong>nesaf</strong> i barhau gyda'r dewin ffurfwedd]]></key>
+        <key alias="defaultUserChangePass"><![CDATA[<strong>Mae angen newid cyfrinair y defnyddiwr Diofyn!</strong>]]></key>
+        <key alias="defaultUserDisabled"><![CDATA[<strong>Mae'r defnyddiwr Diofyn wedi'u analluogi neu does dim hawliau i Umbraco!</strong></p><p>Does dim angen unrhyw weithredoedd pellach. Cliciwch <b>Nesaf</b> i barhau.]]></key>
+        <key alias="defaultUserPassChanged"><![CDATA[<strong>Mae cyfrinair y defnyddiwr Diofyn wedi'i newid yn llwyddiannus ers y gosodiad!</strong></p><p>Does dim angen unrhyw weithredoedd pellach. Cliciwch <strong>Nesaf</strong> i barhau.]]></key>
+        <key alias="defaultUserPasswordChanged">Mae'r cyfrinair wedi'i newid!</key>
+        <key alias="greatStart">Cewch gychwyn gwych, gwyliwch ein fideos rhaglith</key>
+        <key alias="licenseText">Wrth glicio'r botwm nesaf (neu newid y umbracoConfigurationStatus yn web.config), rydych yn derbyn y trwydded ar gyfer y meddalwedd yma fel y nodir yn y blwch isod. Sylwch fod y dosbarthiad Umbraco yma yn cynnwys 2 drwydded gwahanol, y trwydded cod agored MIT ar gyfer y fframwaith ac y trwydded Umbraco rhadwedd sy'n ymdrin â'r Rhyngwyneb Defnyddiwr.</key>
+        <key alias="None">Heb osod eto.</key>
+        <key alias="permissionsAffectedFolders">Ffeiliau a ffolderi wedi'u effeithio</key>
+        <key alias="permissionsAffectedFoldersMoreInfo">Mwy o wybodaeth am osod hawliau ar gyfer Umbraco yma</key>
+        <key alias="permissionsAffectedFoldersText">Rydych angen caniatáu i ASP.NET newid hawliau ar y ffeiliau/ffolderi canlynol</key>
+        <key alias="permissionsAlmostPerfect">
+            <![CDATA[<strong>Mae eich gosodiadau hawliau bron a bod yn berffaith!</strong><br /><br />
+        Gallwch redeg Umbraco heb broblemau, ond ni fydd yn bosibl i chi osod pecynnau sydd wedi'u hargymell er mwyn cymryd mantais llawn o Umbraco.]]>
+        </key>
+        <key alias="permissionsHowtoResolve">Sut i Gywiro</key>
+        <key alias="permissionsHowtoResolveLink">Cliciwch yma i ddarllen y ferswin destun</key>
+        <key alias="permissionsHowtoResolveText"><![CDATA[Gwyliwch ein <strong>fideo tiwtorial</strong> ar osod hawliau ffolder ar gyfer Umbraco neu darllenwch y fersiwn destun.]]></key>
+        <key alias="permissionsMaybeAnIssue">
+            <![CDATA[<strong>Gall eich gosodiadau hawliau fod yn broblem!</strong>
+      <br/><br />
+      Gallwch redeg Umbraco heb broblemau, ond ni fydd yn bosibl i chi greu ffolderi neu gosod pecynnau sydd wedi'u hargymell er mwyn cymryd mantais llawn o Umbraco.]]>
+        </key>
+        <key alias="permissionsNotReady">
+            <![CDATA[<strong>Nid yw eich gosodiadau hawliau yn barod ar gyfer Umbraco!</strong>
+          <br /><br />
+          Er mwyn rhedeg Umbraco, bydd angen i chi ddiweddaru eich gosodiadau hawliau.]]>
+        </key>
+        <key alias="permissionsPerfect">
+            <![CDATA[<strong>Mae eich gosodiadau hawliau yn berffaith!</strong><br /><br />
+              Rydych yn barod i redeg Umbraco a gosod pecynnau!]]>
+        </key>
+        <key alias="permissionsResolveFolderIssues">Yn datrys y broblem ffolder</key>
+        <key alias="permissionsResolveFolderIssuesLink">Dilynwch y ddolen yma ar gyfer mwy o wybodaethar broblemau gyda ASP.NET a chreu ffolderi</key>
+        <key alias="permissionsSettingUpPermissions">Gosod hawliau ffolderi</key>
+        <key alias="permissionsText">
+            <![CDATA[
+      Mae Umbraco angen hawliau ysgrifennu/newid er mwyn creu rhai ffolderi ar gyfer cadw ffeiliau fel lluniau a PDFs.
+      Mae Umbraco hefyd yn cadw data dros-dro (storfa) ar gyfer mwyhau perfformiad eich gwefan.
+    ]]>
+        </key>
+        <key alias="runwayFromScratch">Rydw i eisiau ail-gychwyn</key>
+        <key alias="runwayFromScratchText">
+            <![CDATA[
+        Mae eich gwefan yn hollol wag ar hyn o bryd, felly mae hynny'n berffaith os rydych chi eisiau cychwyn eto a chreu eich mathau o ddogfennau a thempledi eich hunain.
+        (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">dysgwch sut</a>)
+        Gallwch ddewis i osod Runway yn hwyrach os hoffwch chi. Ewch at yr adran Datblygwr a dewiswch Pecynnau.
+      ]]>
+        </key>
+        <key alias="runwayHeader">Rydych newydd osod platfform glân Umbraco. Beth hoffwch chi wneud nesaf?</key>
+        <key alias="runwayInstalled">Mae Runway wedi'i osod</key>
+        <key alias="runwayInstalledText">
+            <![CDATA[
+      Mae gennych chi'r sylfaen yn ei lle. Dewiswchpa fodylau yr hoffwch osod ar ei phen.<br />
+      Dyma ein rhestr o fodylau yr ydym yn argymell, ticiwch y rhai hoffwch chi'u gosod,  neu gwelwch yr <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">holl restr o fodylau</a>
+      ]]>
+        </key>
+        <key alias="runwayOnlyProUsers">Dim ond wedi'i argymell ar gyfer defnyddwyr brofiadol</key>
+        <key alias="runwaySimpleSite">Hoffwn i gychwyn gyda gwefan syml</key>
+        <key alias="runwaySimpleSiteText">
+            <![CDATA[
+      <p>
+        Mae "Runway" yn wefan syml sy'n darparu mathau o ddogfennau a thempledi syml. Gall y gosodwr osod Runway i chi yn awtomatig,
+        ond gallwch olygu, estyn neu ei ddileu yn hawdd. Nid yw'n angenrheidiol a gallwch ddefnyddio Umbraco yn berffaith heb. Ond, 
+        mae Runwayyn cynnig sylfaen hawdd wedi'i seilio ar arferion gorau er mwyn i chi gychwyn yn gyflymach nag erioed.
+        Os rydych chi'n dewis gosod Runway, gallwch ddewis blociau adeiliadu syml o'r enw Modylau Runway er mwyn mwyhau eich tudalennau Runway.
+        </p>
+        <small>
+        <em>Wedi cynnwys gyda Runway:</em> Tudalen Hafan, Tudalen Cychwyn Allan, Tudalen Gosod Modylau.<br />
+        <em>Modylau Dewisol:</em> Llywio Dop, Map o'r wefan, Cysylltu, Oriel.
+        </small>
+      ]]>
+        </key>
+        <key alias="runwayWhatIsRunway">Beth yw Runway</key>
+        <key alias="step1">Cam 1/5 Derbyn trwydded</key>
+        <key alias="step2">Cam 2/5: Ffurfwedd Gronfa Ddata</key>
+        <key alias="step3">Cam 3/5: Dilysu Hawliau Ffeiliau</key>
+        <key alias="step4">Cam 4/5: Gwirio Diogelwch Umbraco</key>
+        <key alias="step5">Cam 5/5: Mae Umbraco yn barod i chi gychwyn</key>
+        <key alias="thankYou">Diolch am ddewis Umbraco</key>
+        <key alias="theEndBrowseSite">
+            <![CDATA[<h3>Porwch eich safle newydd</h3>
+Rydych wedi gosod Runway, felly beth am weld sut mae eich gwefan newydd yn edrych.]]>
+        </key>
+        <key alias="theEndFurtherHelp">
+            <![CDATA[<h3>Cymorth a gwyboaeth bellach</h3>
+Cewch gymorth o'n cymuned gwobrwyol, porwch drwy ein dogfennaeth neu gwyliwch fideos yn rhad ac am ddim ar sut i adeiladu gwefan syml, sut i ddefnyddio pecynnau a chanllaw cyflym i dermeg Umbraco]]>
+        </key>
+        <key alias="theEndHeader">Mae Umbraco wedi'i osod %0% ac mae'n barod i'w ddefnyddio</key>
+        <key alias="theEndInstallFailed">
+            <![CDATA[Er mwyn gorffen y gosodiad, bydd angen i chi
+        olygu'r ffeil <strong>/web.config</strong> a diweddaru'r allwedd AppSetting <strong>UmbracoConfigurationStatus</strong> yng ngwaelod y gwerth o <strong>'%0%'</strong>.]]>
+        </key>
+        <key alias="theEndInstallSuccess">
+            <![CDATA[Gallwch gychwyn <strong>yn syth</strong> wrth glicio ar y botwm "Cychwyn Umbraco" isod. <br />Os ydych yn <strong>newydd i Umbraco</strong>,
+gallwch ddarganfod digonedd o adnoddau ar ein tudalennau cychwyn allan.]]>
+        </key>
+        <key alias="theEndOpenUmbraco">
+            <![CDATA[<h3>Cychwyn Umbraco</h3>
+Er mwyn gweinyddu eich gwefan, agorwch swyddfa gefn Umbraco a dechreuwch ychwangeu cynnwys, diweddaru'r templedi a thaflenni arddull neu ychwanegu nodweddion newydd]]>
+        </key>
+        <key alias="Unavailable">Methwyd cysylltu â'r gronfa ddata.</key>
+        <key alias="Version3">Umbraco Fersiwn 3</key>
+        <key alias="Version4">Umbraco Fersiwn 4</key>
+        <key alias="watch">Gwylio</key>
+        <key alias="welcomeIntro">
+            <![CDATA[Bydd y dewin yma yn eich llywio drwy'r broses o ffurfweddi <strong>Umbraco %0%</strong> ar gyfer gosodiad ffres neu uwchraddio o ferswin 3.0.
+                                <br /><br />
+                                Gwasgwch <strong>"nesaf"</strong> i gychwyn y dewin.]]>
+        </key>
+    </area>
+    <area alias="language">
+        <key alias="cultureCode">Côd Diwylliant</key>
+        <key alias="displayName">Enw Diwylliant</key>
+    </area>
+    <area alias="lockout">
+        <key alias="lockoutWillOccur">Rydych wedi segura a bydd allgofnodi awtomatig yn digwydd mewn</key>
+        <key alias="renewSession">Adnewyddwch rwan er mwyn achub eich gwaith</key>
+    </area>
+    <area alias="login">
+        <key alias="greeting0">Dydd Sul Swmpus</key>
+        <key alias="greeting1">Dydd Llun Llwyddiannus</key>
+        <key alias="greeting2">Dydd Mawrth Moethus</key>
+        <key alias="greeting3">Dydd Mercher Melys</key>
+        <key alias="greeting4">Dydd Iau Iachus</key>
+        <key alias="greeting5">Dydd Gwener Gwych</key>
+        <key alias="greeting6">Dydd Sadwrn Syfrdannus</key>
+        <key alias="instruction">Mewngofnodwch isod</key>
+        <key alias="signInWith">Mewngofnodwch gyda</key>
+        <key alias="timeout">Sesiwn wedi cyrraedd terfyn amser</key>
+        <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
+        <key alias="forgottenPassword">Wedi anghofio eich cyfrinair?</key>
+        <key alias="forgottenPasswordInstruction">Bydd ebost yn cael ei anfon i'r cyfeiriad darparwyd gyda dolen i ailosod eich cyfrinair</key>
+        <key alias="requestPasswordResetConfirmation">Bydd ebost gyda chyfarwyddiadau ailosod cyfrinair yn cael ei anfon at y cyfeiriad darparwyd os yw'n cyfateb â'n cofnodion</key>
+        <key alias="showPassword">Dangos cyfrinair</key>
+        <key alias="hidePassword">Cuddio cyfrinair</key>
+        <key alias="returnToLogin">Dychwelyd i'r ffurflen mewngofnodi</key>
+        <key alias="setPasswordInstruction">Darparwch gyfrinair newydd</key>
+        <key alias="setPasswordConfirmation">Mae eich cyfrinair wedi'i ddiweddaru</key>
+        <key alias="resetCodeExpired">Mae'r ddolen rydych wedi clicio arno naill ai yn annilys neu wedi dod i ben</key>
+        <key alias="resetPasswordEmailCopySubject">Umbraco: Ailosod Cyfrinair</key>
+        <key alias="resetPasswordEmailCopyFormat">
+            <![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Ailosod cyfrinair wedi dymuno
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Eich enw defnyddiwr ar gyfer swyddfa gefn Umbraco yw: <strong>%0%</strong>
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
+																<tbody>
+																	<tr>
+																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																				Cliciwch y ddolen yma er mwyn ailosod eich cyfrinair
+																			</a>
+																		</td>
+																	</tr>
+																</tbody>
+															</table>
+														</p>
+														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>Os na allwch glicio ar y ddolen yma, copïwch a gludwch y URL i mewn i'ch porwr:</p>
+															<table border='0' cellpadding='0' cellspacing='0'>
+																<tr>
+																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
+																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
+																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%1%'>%1%</a>
+																		</font>
+																	</td>
+																</tr>
+															</table>
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+		</html>
+	]]>
+        </key>
+    </area>
+    <area alias="main">
+        <key alias="dashboard">Dashfwrdd</key>
+        <key alias="sections">Adrannau</key>
+        <key alias="tree">Cynnwys</key>
+    </area>
+    <area alias="moveOrCopy">
+        <key alias="choose">Dewis tudalen uwchben...</key>
+        <key alias="copyDone">%0% wedi copïo i %1%</key>
+        <key alias="copyTo">Dewiswch ble ddylai'r ddogfen %0% gael ei gopïo i isod</key>
+        <key alias="moveDone">%0% wedi ei symud i %1%</key>
+        <key alias="moveTo">Dewiswch ble ddylai'r ddogfen %0% gael ei symud i isod</key>
+        <key alias="nodeSelected">wedi ei ddewis fel gwraidd eich cynnwys newydd, cliciwch 'iawn' isod.</key>
+        <key alias="noNodeSelected">Dim nod wedi'i ddewis eto, dewiswch nod yn y rhestr uchod yn gyntaf cyn clicio 'iawn'</key>
+        <key alias="notAllowedByContentType">Nid yw'r nod bresennol yn cael ei ganiatáu o dan y nod ddewiswyd oherwydd ei fath</key>
+        <key alias="notAllowedByPath">Ni all y nod bresennol gael ei symud i un o'i is-dudalennau</key>
+        <key alias="notAllowedAtRoot">Ni all y nod bresennol fodoli ar y gwraidd</key>
+        <key alias="notValid">Nid yw'r gweithred wedi'i ganiatáu gan nad oes gennych ddigon o hawliau ar gyfer 1 neu fwy o ddogfennau blentyn.</key>
+        <key alias="relateToOriginal">Perthnasu eitemau wedi'u copïo at y rhai gwreiddiol</key>
+    </area>
+    <area alias="notifications">
+        <key alias="editNotifications"><![CDATA[Golygu eich hysbysiad ar gyfer <strong>%0%</strong>]]></key>
+        <key alias="notificationsSavedFor">Gosodiad hysbysiadau wedi cadw am</key>
+        <key alias="mailBody">
+            <![CDATA[
+        Helo %0%
+        
+        Mae hyn yn ebost awtomatig i'ch hysbysu fod y dasg '%1%'
+        wedi'i berfformio ar y dudalen '%2%'
+        gan y defnyddiwr '%3%'
+        
+        Ewch at http://%4%/#/content/content/edit/%5% i olygu.
+
+        Mwynhewch eich diwrnod!
+        
+        Hwyl fawr oddi wrth y robot Umbraco
+        ]]>
+        </key>
+        <key alias="mailBodyVariantSummary">Mae'r ieithoedd canlynol wedi'u haddasu %0%</key>
+        <key alias="mailBodyHtml">
+            <![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Helo %0%,
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Mae hyn yn ebost awtomatig i'ch hysbysu fod y dasg <strong>'%1%'</strong> wedi'i berfformio ar y dudalen <a style="color: #392F54; text-decoration: none; -ms-word-break: break-all; word-break: break-all;" href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> gan y defnyddiwr <strong>'%3%'</strong>
+														</p>
+														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
+															<tbody>
+																<tr>
+																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
+																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
+																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>GOLYGU</a> </td> </tr></tbody></table>
+																	</td>
+																</tr>
+															</tbody>
+														</table>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															<h3>Crynodeb diweddariad:</h3>
+															<table style="width: 100%;">
+																 %6%
+															</table>
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Mwynhewch eich diwrnod!<br /><br />
+															Hwyl fawr oddi wrth y robot Umbraco
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+		</html>
+	]]>
+        </key>
+        <key alias="mailBodyVariantHtmlSummary">
+            <![CDATA[<p>Mae'r ieithoedd canlynol wedi'u haddasu:</p>
+        %0%
+    ]]>
+        </key>
+        <key alias="mailSubject">[%0%] Hysbysiad am %1% wedi perfformio am %2%</key>
+        <key alias="notifications">Hysbysiadau</key>
+    </area>
+    <area alias="packager">
+        <key alias="actions">Gweithredoedd</key>
+        <key alias="created">Creu</key>
+        <key alias="createPackage">Creu pecyn</key>
+        <key alias="chooseLocalPackageText">
+            <![CDATA[
+      Dewiswch becyn o'ch peiriant, gan glicio ar y botwm<br />
+         Pori a darganfod y pecyn. Fel arfer, mae gen becynnau Umbraco estyniadau ".umb" neu ".zip".
+      ]]>
+        </key>
+        <key alias="deletewarning">Bydd hwn yn dileu'r pecyn</key>
+        <key alias="dropHere">Gollwng i lanlwytho</key>
+        <key alias="includeAllChildNodes">Cynhwyswch yr holl nodau plentyn</key>
+        <key alias="orClickHereToUpload">neu cliciwch yma i ddewis ffeil pecyn</key>
+        <key alias="uploadPackage">Lanlwytho pecyn</key>
+        <key alias="localPackageDescription">Gosod pecyn leol wrth ddewis o'ch peiriant. Dylwch ddim ond osod pecynnau o ffynonellau yr ydych yn adnabod a bod gennych hyder ynddynt</key>
+        <key alias="uploadAnother">Lanlwytho pecyn arall</key>
+        <key alias="cancelAndUploadAnother">Canslo a lanlwytho pecyn arall</key>
+        <key alias="packageLicense">Trwydded</key>
+        <key alias="accept">Rydw i'n derbyn</key>
+        <key alias="termsOfUse">termau defnydd</key>
+        <key alias="pathToFile">Llwybr i'r ffeil</key>
+        <key alias="pathToFileDescription">Llwybr llwyr i'r ffeil (ie: /bin/umbraco.bin)</key>
+        <key alias="installed">Wedi'i osod</key>
+        <key alias="installLocal">Gosod yn lleol</key>
+        <key alias="packageInstall">Gosod pecyn</key>
+        <key alias="installFinish">Gorffen</key>
+        <key alias="installedPackages">Pecynnau wedi'u gosod</key>
+        <key alias="noPackages">Nid oes gennych unrhyw becynnau wedi'u gosod</key>
+        <key alias="noPackagesDescription"><![CDATA[Nid oes gennych unrhyw becynnau wedi'u gosod. Naill ai gosodwch becyn leol wrth ddewis o'ch peiriant, neu porwch drwy pecynnau sydd ar gael wrth ddefnyddio'r eicon <strong>'Pecynnau'</strong> yng nghornel dop, dde eich sgrîn]]></key>
+        <key alias="noConfigurationView">Nid oes gan y pecyn hwn unrhyw olwg cyfluniad</key>
+        <key alias="noPackagesCreated">Nid oes unrhyw becynnau wedi'u creu eto</key>
+        <key alias="packageActions">Camau Gweithredu Pecyn</key>
+        <key alias="packageAuthorUrl">URL y Awdur</key>
+        <key alias="packageContent">Cynnwys y Pecyn</key>
+        <key alias="packageFiles">Ffeiliau y Pecyn</key>
+        <key alias="packageIconUrl">URL Eicon</key>
+        <key alias="packageInstall">Gosod pecyn</key>
+        <key alias="packageLicense">Trwydded</key>
+        <key alias="packageLicenseUrl">URL Trwydded</key>
+        <key alias="packageProperties">Priodweddau Pecyn</key>
+        <key alias="packageSearch">Chwilio am becynnau</key>
+        <key alias="packageSearchResults">Canlyniadau ar gyfer</key>
+        <key alias="packageNoResults">Ni allwn ddarganfod unrhyw beth ar gyfer</key>
+        <key alias="packageNoResultsDescription">Ceisiwch chwilio am becyn arall neu porwch drwy'r categorïau</key>
+        <key alias="packagesPopular">Poblogaidd</key>
+        <key alias="packagesNew">Pecynnau newydd</key>
+        <key alias="packageHas">yn cynnwys</key>
+        <key alias="packageKarmaPoints">pwyntiau karma</key>
+        <key alias="packageInfo">Gwybodaeth</key>
+        <key alias="packageOwner">Perchennog</key>
+        <key alias="packageContrib">Cyfranwyr</key>
+        <key alias="packageCreated">Creuwyd</key>
+        <key alias="packageCurrentVersion">Fersiwn bresennol</key>
+        <key alias="packageNetVersion">Fersiwn .NET</key>
+        <key alias="packageDownloads">Lawrlwythiadau</key>
+        <key alias="packageLikes">Hoffi</key>
+        <key alias="packageCompatibility">Cydweddoldeb</key>
+        <key alias="packageCompatibilityDescription">Mae'r pecyn yma yn gydnaws â'r fersiynau canlynol o Umbraco, fel y mae aelodau'r gymued yn adrodd yn ôl. Ni all warantu cydweddoldeb cyflawn ar gyfer fersiynau sydd wedi'u hadrodd o dan 100%</key>
+        <key alias="packageExternalSources">Ffynonellau allanol</key>
+        <key alias="packageAuthor">Awdur</key>
+        <key alias="packageDemonstration">Arddangosiad</key>
+        <key alias="packageDocumentation">Dogfennaeth</key>
+        <key alias="packageMetaData">Meta ddata pecynnau</key>
+        <key alias="packageName">Enw pecyn</key>
+        <key alias="packageNoItemsHeader">Does dim eitemau o fewn y pecyn</key>
+        <key alias="packageNoItemsText">
+            <![CDATA[Nid yw'r pecyn yma yn cynnwys unrhyw eitemau i ddadosod.<br/><br/>
+      Gallwch ddileu hyn yn ddiogel o'r system wrth glicio "dadosod pecyn" isod.]]>
+        </key>
+        <key alias="packageNoUpgrades">Dim uwchraddiadau ar gael</key>
+        <key alias="packageOptions">Dewisiadau pecyn</key>
+        <key alias="packageReadme">Readme pecyn</key>
+        <key alias="packageRepository">Ystorfa pecyn</key>
+        <key alias="packageUninstallConfirm">Cadarnhau dadosod pecyn</key>
+        <key alias="packageUninstalledHeader">Pecyn wedi dadosod</key>
+        <key alias="packageUninstalledText">Cafodd y pecyn ei ddadosod yn llwyddiannus</key>
+        <key alias="packageUninstallHeader">Dadosod pecyn</key>
+        <key alias="packageUninstallText">
+            <![CDATA[Gallwch ddi-ddewis eitemau dydych chi ddim eisiau dileu, rwan, isod. Wrth glicio "cadarnhau dadosod" bydd yr holl eitemau ddewiswyd yn cael eu dileu.<br />
+      <span style="color: Red; font-weight: bold;">Rhybudd:</span> bydd unrhyw ddogfennau, cyfrwng ayyb sy'n dibynnu ar yr eitemau yr ydych am ddileu yn torri, a gall arwain at system ansefydlog,
+      felly dadosodwch gyda gofal. Os oes unrhyw amheuaeth, cysylltwch ag awdur y pecyn.]]>
+        </key>
+        <key alias="packageUpgradeDownload">Lawrlwytho diweddariad o'r ystorfa</key>
+        <key alias="packageUpgradeHeader">Uwchraddio pecyn</key>
+        <key alias="packageUpgradeInstructions">Cyfarwyddiadau uwchraddio</key>
+        <key alias="packageUpgradeText"> Mae yna uwchraddiad ar gael ar gyfer y pecyn yma. Gallwch lawrlwytho'n uniongyrchol o'r ystorfa pecynnau Umbraco.</key>
+        <key alias="packageVersion">Fersiwn pecyn</key>
+        <key alias="packageVersionUpgrade">Uwchraddio o ferswin</key>
+        <key alias="packageVersionHistory">Hanes ferswin pecyn</key>
+        <key alias="viewPackageWebsite">Gweld gwefan pecyn</key>
+        <key alias="packageAlreadyInstalled">Pecyn wedi'i osod eisoes</key>
+        <key alias="targetVersionMismatch">Ni all y pecyn yma gael ei osod, mae angen fersiwn Umrbaco o leiaf</key>
+        <key alias="installStateUninstalling">Dadosod...</key>
+        <key alias="installStateDownloading">Lawrlwytho...</key>
+        <key alias="installStateImporting">Mewnforio...</key>
+        <key alias="installStateInstalling">Gosod...</key>
+        <key alias="installStateRestarting">Ailgychwyn, arhoswch...</key>
+        <key alias="installStateComplete">Wedi cwblhau, bydd eich porwr yn adnewyddu, arhoswch...</key>
+        <key alias="installStateCompleted">Cliciwch 'Cwblhau' i orffen y gosodiad ac adnewyddu'r dudalen.</key>
+        <key alias="installStateUploading">Lanlwytho pecyn...</key>
+    </area>
+    <area alias="paste">
+        <key alias="doNothing">Gludo gyda fformatio llawn (Heb ei argymell)</key>
+        <key alias="errorMessage">Mae'r testun yr ydych yn ceisio gludo yn cynnwys nodauneu fformatio arbennig. Gall hyn gael ei achosi gan ludo testun o Microsoft Word. Gall Umbraco ddileu nodau neu fformatio arbennig yn awtomatig, fel bod y cynnwys sy'n cael ei ludo yn fwy addas ar gyfer y we.</key>
+        <key alias="removeAll">Gludo fel testun crai heb unrhyw fformatio</key>
+        <key alias="removeSpecialFormattering">Gludo, ond dileu fformatio (Wedi'i hargymell)</key>
+    </area>
+    <area alias="publicAccess">
+        <key alias="paGroups">Amddiffyniad yn seiliedig grŵp</key>
+        <key alias="paGroupsHelp">Os ydych chi am ganiatáu mynediad i bob aelod o grwpiau aelodau penodol</key>
+        <key alias="paGroupsNoGroups">Mae angen i chi greu grŵp aelod cyn y gallwch ddefnyddio dilysiad grŵp</key>
+        <key alias="paAdvanced">Amddiffyn ar sail rôl</key>
+        <key alias="paAdvancedHelp">Os hoffwch reoli cyrchiad i'r dudalen wrth ddefnyddio dilysu ar sail rôl, gan ddefnyddio grwpiau aelodaeth Umbraco.</key>
+        <key alias="paAdvancedNoGroups">Mae angen i chi greu grŵp aeloadeth cyn i chi allu defnyddio dilysu ar sail rôl</key>
+        <key alias="paErrorPage">Tudalen Wall</key>
+        <key alias="paErrorPageHelp">Wedi'i ddefnyddio pan mae defnyddwyr wedi mewngofnodi, ond nid oes ganddynt hawliau</key>
+        <key alias="paHowWould">Dewiswch sut i gyfyngu hawliau at y dudalen yma</key>
+        <key alias="paIsProtected">%0% wedi amddiffyn rwan</key>
+        <key alias="paIsRemoved">Amddiffyniad wedi dileu o %0%</key>
+        <key alias="paLoginPage">Tudalen Mewngofnodi</key>
+        <key alias="paLoginPageHelp">Dewiswch y dudalen sy'n cynnwys y ffurflen mewngofnodi</key>
+        <key alias="paRemoveProtection">Dileu Amddiffyniad</key>
+        <key alias="paSelectPages">Dewiswch y tudalennau sy'n cynnwys ffurflenni mewngofnodi a negeseuon gwall</key>
+        <key alias="paSelectRoles">Dewiswch y rolau sydd a hawliau i'r dudlaen yma</key>
+        <key alias="paSetLogin">Gosodwch yr enw defnyddiwr a chyfrinair ar gyfer y dudalen yma</key>
+        <key alias="paSimple">Amddiffyniad defnyddiwr unigol</key>
+        <key alias="paSimpleHelp">Os hoffwch osod amddifyniad syml wrth ddefnyddio enw defnyddiwr a chyfrinair sengl</key>
+        <key alias="paRemoveProtectionConfirm"><![CDATA[Ydych chi'n siŵr eich bod chi am gael gwared ar yr amddiffyniad o'r dudalen <strong>%0%</strong>?]]></key>
+        <key alias="paSelectGroups"><![CDATA[Dewiswch y grwpiau sydd â mynediad i'r dudalen <strong>%0%</strong>]]></key>
+        <key alias="paSelectMembers"><![CDATA[Dewiswch yr aelodau sydd â mynediad i'r dudalen <strong>%0%</strong>]]></key>
+        <key alias="paMembers">Amddiffyn aelodau penodol</key>
+        <key alias="paMembersHelp">Os ydych am ganiatáu mynediad i aelodau penodol</key>
+    </area>
+    <area alias="publish">
+        <key alias="invalidPublishBranchPermissions">Caniatâd annigonol gan ddefnyddwyr i gyhoeddi'r holl ddogfennau disgynyddion</key>
+        <key alias="contentPublishedFailedIsTrashed">
+            <![CDATA[Methwyd cyhoeddi %0% oherwydd mae'r eitem yn y bin ailgylchu.]]>
+        </key>
+        <key alias="contentPublishedFailedAwaitingRelease">
+            <![CDATA[Methwyd cyhoeddi %0% oherwydd mae'r eitem wedi ei amserlenni ar gyfer rhyddhad.]]>
+        </key>
+        <key alias="contentPublishedFailedExpired">
+            <![CDATA[Methwyd cyhoeddi %0% oherwydd mae'r eitem wedi terfynu.]]>
+        </key>
+        <key alias="contentPublishedFailedInvalid">
+            <![CDATA[Methwyd cyhoeddi %0% oherwydd nid oedd y priodweddau canlynol:  %1%  yn pasio'r rheolau dilysu.]]>
+        </key>
+        <key alias="contentPublishedFailedByEvent">
+            <![CDATA[Methwyd cyhoeddi %0% oherwydd cafodd y gweithred ei ganslo gan 3-ydd parti.]]>
+        </key>
+        <key alias="contentPublishedFailedByParent">
+            <![CDATA[Methwyd cyhoeddi %0% oherwydd mae yna dudlaen rhiant sydd heb ei gyhoeddi.]]>
+        </key>
+        <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% ni ellir ei gyhoeddi, oherwydd ei enw ar goll.]]></key>
+        <key alias="contentPublishedFailedReqCultureValidationError">Methodd y dilysiad ar gyfer yr iaith ofynnol '%0%'. Roedd yr iaith wedi cael ei arbed ond nid ei chyhoeddi.</key>
+        <key alias="includeUnpublished">Cynnwys is-dudalennau heb eu cyhoeddi</key>
+        <key alias="inProgress">Cyhoeddi ar waith - arhoswch...</key>
+        <key alias="inProgressCounter">%0% allan o %1% o dudalennau wedi eu cyhoeddi...</key>
+        <key alias="nodePublish">%0% wedi ei gyhoeddi</key>
+        <key alias="nodePublishAll">%0% ac eu is-dudalennau wedi'u cyhoeddi</key>
+        <key alias="publishAll">Cyhoeddi %0% ac ei holl is-dudalennau</key>
+        <key alias="publishHelp">
+            <![CDATA[Cliciwch <em>Cyhoeddi</em> er mwyn cyhoeddi <strong>%0%</strong> a felly yn gwneud i'r cynnwys berthnasol fod ar gael i'r cyhoedd.<br/><br />
+      Gallwch gyhoeddi'r dudalen yma ac ei holl is-dudalennau wrth dicio <em>Cynnwys tudalennau heb eu cyhoeddi</em> isod.
+      ]]>
+        </key>
+    </area>
+    <area alias="colorpicker">
+        <key alias="noColors">Nid ydych chi wedi ffurfweddu unrhyw liwiau sydd wedi'u cymeradwyo</key>
+    </area>
+    <area alias="contentPicker">
+        <key alias="allowedItemTypes">Gallwch ond ddewis eitemau o'r math(au): %0%</key>
+        <key alias="pickedTrashedItem">Rydych wedi dewis eitem gynnwys sydd naill ai wedi'i ddileu neu yn y bin ailgylchu</key>
+        <key alias="pickedTrashedItems">Rydych wedi dewis eitemau gynnwys sydd naill ai wedi'u dileu neu yn y bin ailgylchu</key>
+    </area>
+    <area alias="mediaPicker">
+        <key alias="pickedTrashedItem">Rydych wedi dewis eitem gyfrwng sydd naill ai wedi'i ddileu neu yn y bin ailgylchu</key>
+        <key alias="pickedTrashedItems">Rydych wedi dewis eitemau gyfrwng sydd naill ai wedi'u dileu neu yn y bin ailgylchu</key>
+        <key alias="deletedItem">Eitem wedi'i ddileu</key>
+        <key alias="trashed">Yn sbwriel</key>
+    </area>
+    <area alias="relatedlinks">
+        <key alias="enterExternal">Darparwch ddolen allanol</key>
+        <key alias="chooseInternal">Dewiswch dudalen fewnol</key>
+        <key alias="caption">Capsiwn</key>
+        <key alias="link">Dolen</key>
+        <key alias="newWindow">Agor mewn ffenestr newydd</key>
+        <key alias="captionPlaceholder">Darparwch y capsiwn arddangos</key>
+        <key alias="externalLinkPlaceholder">Darparwch y ddolen</key>
+    </area>
+    <area alias="imagecropper">
+        <key alias="reset">Ailosod tocio</key>
+        <key alias="saveCrop">Achub tocio</key>
+        <key alias="addCrop">Ychwanegu tocio newydd</key>
+        <key alias="updateEditCrop">Wedi gwneud</key>
+        <key alias="undoEditCrop">Dadwneud golygion</key>
+        <key alias="customCrop">Diffiniad defnyddiwr</key>
+    </area>
+    <area alias="rollback">
+        <key alias="headline">Dewis fersiwn i gymharu efo fersiwn bresennol</key>
+        <key alias="changes">Newidiadau</key>
+        <key alias="created">Creuwyd</key>
+        <key alias="currentVersion">Fersiwn bresennol</key>
+        <key alias="diffHelp"><![CDATA[May hyn yn dangos y gwahaniaeth rhwng y fersiwn bresennol ac y fersiwn dewiswyd<br />Ni fydd testun <del>coch</del> yn cael ei ddangos yn y fersiwn dewiswyd. , <ins>mae gwyrdd yn golygu wedi'i ychwanegu</ins>]]></key>
+        <key alias="documentRolledBack">Dogfen wedi'i rolio yn ôl</key>
+        <key alias="htmlHelp">Mae hyn yn dangos y fersiwn dewiswyd ar ffurf HTML, os hoffwch weld y gwahaniaeth rhwng 2 fersiwn ar yr un pryd, defnyddiwch y wedd gwahaniaethol</key>
+        <key alias="rollbackTo">Rolio yn ôl at</key>
+        <key alias="selectVersion">Dewis fersiwn</key>
+        <key alias="view">Gwedd</key>
+    </area>
+    <area alias="scripts">
+        <key alias="editscript">Golygu ffeil sgript</key>
+    </area>
+    <area alias="sections">
+        <key alias="concierge">Gwas</key>
+        <key alias="content">Cynnwys</key>
+        <key alias="courier">Tywyswr</key>
+        <key alias="developer">Datblygwr</key>
+        <key alias="forms">Ffurflenni</key>
+        <key alias="help" version="7.0">Cymorth</key>
+        <key alias="installer">Dewin Ffurfweddu Umbraco</key>
+        <key alias="media">Cyfrwng</key>
+        <key alias="member">Aelodau</key>
+        <key alias="newsletters">Cylchlythyrau</key>
+        <key alias="packages">Pecynnau</key>
+        <key alias="settings">Gosodiadau</key>
+        <key alias="statistics">Ystadegau</key>
+        <key alias="translation">Cyfieithiad</key>
+        <key alias="users">Defnyddwyr</key>
+        <key alias="analytics">Dadansoddeg</key>
+    </area>
+    <area alias="help">
+        <key alias="goTo">ewch i</key>
+        <key alias="helpTopicsFor">Pynciau cymorth ar gyfer</key>
+        <key alias="videoChaptersFor">Penodau fideo ar gyfer</key>
+        <key alias="tours">Teithiau</key>
+        <key alias="theBestUmbracoVideoTutorials">Y fideos tiwtorial Umbraco gorau</key>
+        <key alias="umbracoForum">Ymweld â our.umbraco.com</key>
+        <key alias="umbracoTv">Ymweld â umbraco.tv</key>
+    </area>
+    <area alias="settings">
+        <key alias="defaulttemplate">Templed diofyn</key>
+        <key alias="dictionary editor egenskab">Allwedd Geiriadur</key>
+        <key alias="importDocumentTypeHelp">Er mwyn mewnforio math o ddogfen, darganfyddwch y ffeil ".udt" ar ecih cyfrifiadur wrth glicio ar y botwn "Pori" a cliciwch "Mewnforio" (byddwch yn cael eich gofyn i gadarnhau ar y sgrîn nesaf)</key>
+        <key alias="newtabname">Teitl Tab Newydd</key>
+        <key alias="nodetype">Math o nod</key>
+        <key alias="objecttype">Math</key>
+        <key alias="stylesheet">Taflen arddull</key>
+        <key alias="script">Sgript</key>
+        <key alias="stylesheet editor egenskab">Priodwedd taflen arddull</key>
+        <key alias="tab">Tab</key>
+        <key alias="tabname">Teitl Tab</key>
+        <key alias="tabs">Tabiau</key>
+        <key alias="contentTypeEnabled">Math o Gynnwys Meistr wedi'i alluogi</key>
+        <key alias="contentTypeUses">Mae'r Math o Gynnwys yma yn defnyddio</key>
+        <key alias="asAContentMasterType">fel Math o Gynnwys Meistr. Nid yw tabiau o Fath o Gynnwys Meistr yn cael eu dangos a gall dim ond eu golygu ar y Math o Gynnwys Meistr ei hunan</key>
+        <key alias="noPropertiesDefinedOnTab">Dim priodweddau wedi'u diffinio ar y tab yma. Cliciwch ar y ddolen "ychwanegu priodwedd newydd" ar y topi greu priodwedd newydd.</key>
+        <key alias="masterDocumentType">Math o Ddogfen Feistr</key>
+        <key alias="createMatchingTemplate">Creu templedi cydweddol</key>
+        <key alias="addIcon">Ychwanegu eicon</key>
+    </area>
+    <area alias="sort">
+        <key alias="sortOrder">Trefn</key>
+        <key alias="sortCreationDate">Dyddiad creu</key>
+        <key alias="sortDone">Trefnu wedi'i gwblhau.</key>
+        <key alias="sortHelp">Llusgwch yr eitemau gwahanol i fyny neu i lawr isod er mwyn gosod sut dylen nhw gael eu trefnu. Neu cliciwch ar beniadau'r golofnau i drefnu'r holl gasgliad o eitemau</key>
+        <key alias="sortPleaseWait"><![CDATA[Arhoswch. Mae'r eitemau yn cael eu trefnu, gall hyn gymryd amser.]]></key>
+        <key alias="sortEmptyState">Nid oes gan y nod hwn nodau plentyn i trefnu</key>
+    </area>
+    <area alias="speechBubbles">
+        <key alias="validationFailedHeader">Dilysiad</key>
+        <key alias="validationFailedMessage">Rhaid i wallau dilysu gael eu trwsio cyn gall yr eitem gael ei achub</key>
+        <key alias="operationFailedHeader">Wedi methu</key>
+        <key alias="operationSavedHeader">Wedi achub</key>
+        <key alias="invalidUserPermissionsText">Diffyg hawliau defnyddiwr, ni ellir cwblhau'r gweithred</key>
+        <key alias="operationCancelledHeader">Wedi canslo</key>
+        <key alias="operationCancelledText">Gweithred wedi'i ganslo gan ymestyniad 3-ydd parti</key>
+        <key alias="contentPublishedFailedByEvent">Cyhoeddi wedi'i ganslo gan ymestyniad 3-ydd parti</key>
+        <key alias="contentTypeDublicatePropertyType">Math o briodwedd yn bodoli eisoes</key>
+        <key alias="contentTypePropertyTypeCreated">Math o briodwedd wedi'i greu</key>
+        <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Enw: %0% <br /> Math o ddata: %1%]]></key>
+        <key alias="contentTypePropertyTypeDeleted">math o briodwedd wedi'i ddileu</key>
+        <key alias="contentTypeSavedHeader">Math o Ddogfen wedi'u achub</key>
+        <key alias="contentTypeTabCreated">Tab wedi'i greu</key>
+        <key alias="contentTypeTabDeleted">Tab wedi'i ddileu</key>
+        <key alias="contentTypeTabDeletedText">Tab gyda id: %0% wedi'i ddileu</key>
+        <key alias="cssErrorHeader">Taflen arddull heb ei achub</key>
+        <key alias="cssSavedHeader">Taflen arddull wedi'i achub</key>
+        <key alias="cssSavedText">Taflen arddull wedi'i achub heb unrhyw wallau</key>
+        <key alias="dataTypeSaved">Math o ddata wedi'i achub</key>
+        <key alias="dictionaryItemSaved">Eitem geiriadur wedi'i achub</key>
+        <key alias="editContentPublishedFailedByParent">Cyhoeddi wedi methu gan nad yw'r dudalen rhiant wedi'i gyhoeddi</key>
+        <key alias="editContentPublishedHeader">Cynnwys wedi'i gyhoeddi</key>
+        <key alias="editContentPublishedText">ac yn weladwy ar y wefan</key>
+        <key alias="editMultiContentPublishedText">%0% dogfennau wedi'i gyhoeddi ac yn gweledig ar y wefan</key>
+        <key alias="editVariantPublishedText">%0% gyhoeddi ac yn gweledig ar y wefan</key>
+        <key alias="editMultiVariantPublishedText">%0% dogfennau wedi'i gyhoeddi am yr ieithoedd %1% ac yn gweledig ar y wefan</key>
+        <key alias="editContentPublishedWithExpireDateText">ac yn weladwy ar y wefan tan %0% at %1%</key>
+        <key alias="editContentSavedHeader">Cynnwys wedi'i achub</key>
+        <key alias="editContentSavedText">Cofiwch gyhoeddi er mwyn i'r newidiadau fod yn weladwy</key>
+        <key alias="editContentScheduledSavedText">Mae amserlen ar gyfer cyhoeddi wedi'i diweddaru</key>
+        <key alias="editVariantSavedText">%0% wedi arbed</key>
+        <key alias="editContentSavedWithReleaseDateText">Bydd newidiadau yn cael ei gymerdwyo ar %0% at %1%</key>
+        <key alias="editContentSendToPublish">Wedi'i anfon am gymeradwyo</key>
+        <key alias="editContentSendToPublishText">Newidiadau wedi'u hanfon am gymeradwyo</key>
+        <key alias="editVariantSendToPublishText">%0% newidiadau wedi'u hanfon am gymeradwyo</key>
+        <key alias="editMediaSaved">Cyfrwng wedi'i achub</key>
+        <key alias="editMemberGroupSaved">Grŵp aeloadeth wedi'i achub</key>
+        <key alias="editMediaSavedText">Cyfrwng wedi'i achub heb unrhyw wallau</key>
+        <key alias="editMemberSaved">Aelod wedi'i achub</key>
+        <key alias="editStylesheetPropertySaved">Priodwedd taflen arddull wedi'i achub</key>
+        <key alias="editStylesheetSaved">Taflen arddull wedi'i achub</key>
+        <key alias="editTemplateSaved">Templed wedi'i achub</key>
+        <key alias="editUserError">Gwall yn achub y defnyddiwr (gwiriwch y log)</key>
+        <key alias="editUserSaved">Defnyddiwr wedi'i achub</key>
+        <key alias="editUserTypeSaved">math o ddefnyddiwr wedi'i achub</key>
+        <key alias="editUserGroupSaved">Grŵp defnyddwyr wedi'i achub</key>
+        <key alias="editCulturesAndHostnamesSaved">Diwylliannau ac enwau gwesteia wedi'i achub</key>
+        <key alias="editCulturesAndHostnamesError">Gwall wrth achub diwylliannau ac enwau gwesteia</key>
+        <key alias="fileErrorHeader">Ffeil heb ei achub</key>
+        <key alias="fileErrorText">Ni ellir achub y ffeil. Gwiriwch hawliau'r ffeil</key>
+        <key alias="fileSavedHeader">Ffeil wedi'i achub</key>
+        <key alias="fileSavedText">Ffeil wedi'i achub heb unrhyw wallau</key>
+        <key alias="languageSaved">Iaith wedi'i achub</key>
+        <key alias="mediaTypeSavedHeader">Math o Gyfrwng wedi'i achub</key>
+        <key alias="memberTypeSavedHeader">Math o Aelod wedi'i achub</key>
+        <key alias="memberGroupSavedHeader">Grŵp Aelod wedi'i achub</key>
+        <key alias="pythonErrorHeader">Sgript Python heb ei achub</key>
+        <key alias="pythonErrorText">Ni ellir achub y sgript Python oherwydd gwall</key>
+        <key alias="pythonSavedHeader">Sgript Python wedi'i achub</key>
+        <key alias="pythonSavedText">Dim gwallau yn y sgript Python</key>
+        <key alias="templateErrorHeader">Templed heb ei achub</key>
+        <key alias="templateErrorText">Sicrhewch nad oes gennych 2 dempled gyda'r un enw arall</key>
+        <key alias="templateSavedHeader">Templed wedi'i achub</key>
+        <key alias="templateSavedText">Templed wedi'i achub heb unrhyw wallau!</key>
+        <key alias="xsltErrorHeader">XSLT heb ei achub</key>
+        <key alias="xsltErrorText">XSLT yn cynnwys gwall</key>
+        <key alias="xsltPermissionErrorText">Ni ellir achub y ffeil XSLT, gwiriwch hawliau ffeil</key>
+        <key alias="xsltSavedHeader">XSLT wedi'i achub</key>
+        <key alias="xsltSavedText">Dim gwallau yn yr XSLT</key>
+        <key alias="contentUnpublished">Cynnwys wedi'i ddadgyhoeddi</key>
+        <key alias="contentCultureUnpublished">amrywiad cynnwys %0% wedi'i dadgyhoeddi</key>
+        <key alias="contentMandatoryCultureUnpublished">Roedd yr iaith orfodol '%0%' wedi'i dadgyhoeddi. Mae'r holl ieithoedd ar gyfer yr eitem gynnwys hon bellach wedi'i dadgyhoeddi.</key>
+        <key alias="partialViewSavedHeader">Rhan-wedd wedi'i achub</key>
+        <key alias="partialViewSavedText">Rhan-wedd wedi'i achub heb unrhyw wallau!</key>
+        <key alias="partialViewErrorHeader">Rhan-wedd heb ei achub</key>
+        <key alias="partialViewErrorText">Bu gwall yn ystod achub y ffeil.</key>
+        <key alias="permissionsSavedFor">Hawliau wedi'u hachub ar gyfer</key>
+        <key alias="scriptSavedHeader">Gwedd sgript wedi'i achub</key>
+        <key alias="scriptSavedText">Gwedd sgript wedi'i achub heb unrhyw wallau!</key>
+        <key alias="scriptErrorHeader">Gwedd sgript heb ei achub</key>
+        <key alias="scriptErrorText">Bu gwall yn ystod achub y ffeil.</key>
+        <key alias="cssErrorText">Bu gwall yn ystod achub y ffeil.</key>
+        <key alias="deleteUserGroupsSuccess">Wedi dileu %0% o rwpiau defnwyddwr</key>
+        <key alias="deleteUserGroupSuccess">%0% wedi'i ddileu</key>
+        <key alias="enableUsersSuccess">%0% o ddefnyddwyr wedi'u galluogi</key>
+        <key alias="enableUsersError">Bu gwall yn ystod galluogi'r defnyddwyr</key>
+        <key alias="disableUsersSuccess">Wedi analluogi %0% o ddefnyddwyr</key>
+        <key alias="disableUsersError">Bu gwall yn ystod analluogi'r defnyddwyr</key>
+        <key alias="enableUserSuccess">%0% yn awr wedi galluogi</key>
+        <key alias="enableUserError">Bu gwall yn ystod galluogi'r defnyddiwr</key>
+        <key alias="disableUserSuccess">%0% yn awr wedi analluogi</key>
+        <key alias="disableUserError">Bu gwall yn ystod analluogi'r defnyddiwr</key>
+        <key alias="setUserGroupOnUsersSuccess">Grwpiau defnyddiwr wedi'u gosod</key>
+        <key alias="deleteUserGroupsSuccess">Wedi dileu %0% o rwpiau defnyddwyr</key>
+        <key alias="deleteUserGroupSuccess">%0% wedi dileu</key>
+        <key alias="unlockUsersSuccess">Wedi datgloi %0% o ddefnyddwyr</key>
+        <key alias="unlockUsersError">Bu gwall yn ystod datgloi'r defnyddwyr</key>
+        <key alias="unlockUserSuccess">%0% yn awr wedi datgloi</key>
+        <key alias="unlockUserError">Bu gwall yn ystod datgloi'r defnyddiwr</key>
+        <key alias="memberExportedSuccess">Allforwyd yr aelod at ffeil</key>
+        <key alias="memberExportedError">Bu gwall yn ystod allforio'r aelod</key>
+        <key alias="deleteUserSuccess">Defnyddiwr %0% wedi'i ddileu</key>
+        <key alias="resendInviteHeader">Gawhodd defnyddiwr</key>
+        <key alias="resendInviteSuccess">Gwahoddiad wedi'i ail-anfon at %0%</key>
+        <key alias="contentReqCulturePublishError">Methu cyhoeddi'r ddogfen gan nad yw'r gofynnol '%0%' wedi cael ei gyhoeddi</key>
+        <key alias="contentCultureValidationError">Methodd dilysiad ar gyfer iaith '%0%'</key>
+        <key alias="documentTypeExportedSuccess">Mae'r math dogfen wedi ei allforio i ffeil</key>
+        <key alias="documentTypeExportedError">Digwyddodd gwall wrth allforio'r math dogfen</key>
+        <key alias="scheduleErrReleaseDate1">Ni all y dyddiad rhyddhau fod yn y gorffennol</key>
+        <key alias="scheduleErrReleaseDate2">Ni all drefnu'r ddogfen i'w chyhoeddi gan nad yw'r gofynnol '%0%' wedi cael ei gyhoeddi</key>
+        <key alias="scheduleErrReleaseDate3">Ni all drefnu'r ddogfen i'w chyhoeddi oherwydd mae ganddo'r gofynnol '%0%' ddyddiad cyhoeddi yn hwyrach nag iaith nad yw'n orfodol</key>
+        <key alias="scheduleErrExpireDate1">Ni all y dyddiad terfyn fod yn y gorffennol</key>
+        <key alias="scheduleErrExpireDate2">Ni all y dyddiad terfyn fod cyn y dyddiad rhyddhau</key>
+    </area>
+    <area alias="stylesheet">
+        <key alias="aliasHelp">Yn defnyddio cystrawen CSS e.e: h1, .coch, .glas</key>
+        <key alias="addRule">Ychwanegu ardull</key>
+        <key alias="editRule">Golygu ardull</key>
+        <key alias="editorRules">Ardull golygydd testun cyfoethog</key>
+        <key alias="editorRulesHelp">Diffiniwch yr arddulliau a ddylai fod ar gael yn y golygydd testun cyfoethog ar gyfer y daflen arddull hon</key>
+        <key alias="editstylesheet">Golygu taflen arddull</key>
+        <key alias="editstylesheetproperty">Golygu priodwedd taflen arddull</key>
+        <key alias="nameHelp">Enw ar gyfer adnabod y priodwedd arddull yn y golygydd testun gyfoethog</key>
+        <key alias="preview">Rhagolwg</key>
+        <key alias="previewHelp">Sut fydd y testun yn edrych yn y golygydd testun cyfoethog.</key>
+        <key alias="selector">Dewisydd</key>
+        <key alias="selectorHelp">Yn defnyddio cystrawen CSS e.e: h1, .coch, .glas</key>
+        <key alias="styles">Arddulliau</key>
+        <key alias="stylesHelp">Dyled y CSS ei gymhwyso yn y golygydd testun cyfoethog, e.g. "color:red;"</key>
+        <key alias="tabCode">Côd</key>
+        <key alias="tabRules">Golygydd</key>
+    </area>
+
+    <area alias="template">
+        <key alias="deleteByIdFailed">Methwyd dileu templed efo'r ID %0%</key>
+        <key alias="edittemplate">Golygu templed</key>
+        <key alias="insertSections">Adrannau</key>
+        <key alias="insertContentArea">Mewnosod ardal cynnwys</key>
+        <key alias="insertContentAreaPlaceHolder">Mewnosod dalfan ar gyfer ardal cynnwys</key>
+        <key alias="insert">Mewnosod</key>
+        <key alias="insertDesc">Dewiswch beth i fewnosod i mewn i'ch templed</key>
+        <key alias="insertDictionaryItem">Eitem geiriadaur</key>
+        <key alias="insertDictionaryItemDesc">Mae eitem geiriadur yn ddalfan ar gyfer darn o destun y gall gael ei gyfieithu, sy'n ei wneud yn hawdd i greu dyluniadau ar gyfer gwefannau aml-ieithog.</key>
+        <key alias="insertMacro">Macro</key>
+        <key alias="insertMacroDesc">
+            Mae Macro yn gydran ffurfweddol sy'n wych ar gyfer
+            darnau o'ch dyluniad sy'n cael eu ail-ddefnyddio, ble mae angen y dewis i ddarparu paramedrau,
+            er enghraifft orielau, ffurflenni a rhestri.
+        </key>
+        <key alias="insertPageField">Gwerth</key>
+        <key alias="insertPageFieldDesc">Yn dangos gwerth maes penodol o'r dudalen bresennol, gyda'r dewisiadau i newid y gwerth neu syrthio'n ôl at werthoedd eraill.</key>
+        <key alias="insertPartialView">Rhan-wedd</key>
+        <key alias="insertPartialViewDesc">
+            Mae rhan-wedd yn ffeil templed ar wahân y gall gael ei ddatganu o fewn templed arall,
+            mae'n wych ar gyfer ail-ddefnyddio côd neu ar gyfer gwahanu templedi cymhleth i mewn i ffeiliau gwahanol.
+        </key>
+        <key alias="mastertemplate">Templed Meistr</key>
+        <key alias="noMastertemplate">Dim templed meistr</key>
+        <key alias="noMaster">Dim meistr</key>
+
+        <key alias="renderBody">Datganu templed blentyn</key>
+        <key alias="renderBodyDesc">
+            <![CDATA[
+            Yn datganu cynnwys templed blentyn, wrth fewnosod dalfan
+            <code>@RenderBody()</code>.
+            ]]>
+        </key>
+        <key alias="defineSection">Diffiniwch adran benodol</key>
+        <key alias="defineSectionDesc">
+            <![CDATA[
+            Yn diffinio rhan o'ch templed fel adran benodol gan ei lapio mewn
+            <code>@section { ... }</code>. Gall hyn gael ei ddatganu mewn adran
+            benodol o rhiant y templed yma, wrth ddefnyddio <code>@RenderSection</code>.
+            ]]>
+        </key>
+        <key alias="renderSection">Datganu adran benodol</key>
+        <key alias="renderSectionDesc">
+            <![CDATA[
+            Yn datganu adran benodol o dempled blentyn, wrth fewnosod dalfan <code>@RenderSection(name)</code>.
+            mae hyn yn datganu  adran o dempled blentyn sydd wedi'i lapio mewn diffiniad berthnasol o <code>@section [name]{ ... }</code>.
+            ]]>
+        </key>
+        <key alias="sectionName">Enw Adran</key>
+        <key alias="sectionMandatory">Mae Adran yn ofynnol</key>
+        <key alias="sectionMandatoryDesc">
+            Os yn ofynnol, rhaid i'r templed blentyn gynnwys diffiniad adran <code>@section</code>, fel arall bydd gwall yn cael ei ddangos.
+        </key>
+        <key alias="queryBuilder">Adeiladwr ymholiad</key>
+        <key alias="buildQuery">Adeiladu ymholiad</key>
+        <key alias="itemsReturned">o eitemau wedi dychwelyd, mewn</key>
+        <key alias="copyToClipboard">Copi i'r clipfwrdd</key>
+        <key alias="iWant">Rydw i eisiau</key>
+        <key alias="allContent">holl gynnwys</key>
+        <key alias="contentOfType">cynnwys o'r fath &quot;%0%&quot;</key>
+        <key alias="from">o</key>
+        <key alias="websiteRoot">fy wefan</key>
+        <key alias="where">ble</key>
+        <key alias="and">ac</key>
+        <key alias="is">yn</key>
+        <key alias="isNot">ddim yn</key>
+        <key alias="before">cyn</key>
+        <key alias="beforeIncDate">cyn (gan gynnwys y dyddiad dewiswyd)</key>
+        <key alias="after">ar ôl</key>
+        <key alias="afterIncDate">ar ôl (gan gynnwys y dyddiad dewiswyd)</key>
+        <key alias="equals">yn gyfartal i</key>
+        <key alias="doesNotEqual">ddim yn gyfartal i</key>
+        <key alias="contains">yn cynnwys</key>
+        <key alias="doesNotContain">ddim yn cynnwys</key>
+        <key alias="greaterThan">yn fwy na</key>
+        <key alias="greaterThanEqual">yn fwy na neu yn gyfartal i</key>
+        <key alias="lessThan">llai na</key>
+        <key alias="lessThanEqual">llai na neu yn gyfartal i</key>
+        <key alias="id">Id</key>
+        <key alias="name">Enw</key>
+        <key alias="createdDate">Dyddiad Creu</key>
+        <key alias="lastUpdatedDate">Dyddiad Diweddariad Ddiwethaf</key>
+        <key alias="orderBy">trefnu wrth</key>
+        <key alias="ascending">esgynnol</key>
+        <key alias="descending">disgynnol</key>
+        <key alias="template">Templed</key>
+    </area>
+    <area alias="grid">
+        <key alias="rte">Golygydd Testun Gyfoethog</key>
+        <key alias="media">Llun</key>
+        <key alias="macro">Macro</key>
+        <key alias="embed">Mewnosod</key>
+        <key alias="headline">Pennawd</key>
+        <key alias="quote">Dyfyniad</key>
+        <key alias="insertControl">Dewis math o gynnwys</key>
+        <key alias="chooseLayout">Dewis cynllun</key>
+        <key alias="addRows">Ychwanegu rhes</key>
+        <key alias="addElement">Ychwanegu cynnwys</key>
+        <key alias="dropElement">Gollwng cynnwys</key>
+        <key alias="settingsApplied">Gosodiadau wedi'u hymgeisio</key>
+        <key alias="contentNotAllowed">Nid yw'r cynnwys yma wedi'i ganiatáu yma</key>
+        <key alias="contentAllowed">Caniateir y cynnwys yma</key>
+        <key alias="clickToEmbed">Cliciwch i fewnblannu</key>
+        <key alias="clickToInsertImage">Cliciwch i fewnosod llun</key>
+        <key alias="placeholderImageCaption">Capsiwn llun...</key>
+        <key alias="placeholderWriteHere">Ysgrifennwch yma...</key>
+        <key alias="gridLayouts">Cynlluniau Grid</key>
+        <key alias="gridLayoutsDetail">Cynlluniau yw'r holl ardal weithio gyfan ar gyfer y golygydd grid, fel arfer rydych ddim ond angen un neu ddau gynllun gwahanol</key>
+        <key alias="addGridLayout">Ychwanegu Cynllun Grid</key>
+        <key alias="editGridLayout">Golygu Cynllun Grid</key>
+        <key alias="addGridLayoutDetail">Newid y cynllun wrth osod lledau colofnau ac ychwanegu adrannau ychwanegol</key>
+        <key alias="rowConfigurations">Ffurfweddau rhes</key>
+        <key alias="rowConfigurationsDetail">Mae rhesi yn gelloedd sydd wedi'u trefnu yn llorweddol</key>
+        <key alias="addRowConfiguration">Ychwanegu Ffurfwedd rhes</key>
+        <key alias="editRowConfiguration">Golygu Ffurfwedd rhes</key>
+        <key alias="addRowConfigurationDetail">Newidiwch y rhes wrth osod lledau colofn ac ychwanegu adrannau ychwanegol</key>
+        <key alias="noConfiguration">Nid oes ffurfwedd pellach ar gael</key>
+        <key alias="columns">Colofnau</key>
+        <key alias="columnsDetails">Cyfanswm y nifer o golofnau yn y cynllun grid</key>
+        <key alias="settings">Gosodiadau</key>
+        <key alias="settingsDetails">Ffurfweddu pa osodiadau gall olygyddion eu newid</key>
+        <key alias="styles">Ardduliau</key>
+        <key alias="stylesDetails">Ffurfweddu pa arddulliau gall olygyddion eu newid</key>
+        <key alias="settingDialogDetails">Bydd gosodiadau dim ond yn newid os mae'r ffurfwedd json yn ddilys</key>
+        <key alias="allowAllEditors">Caniatáu pob golygydd</key>
+        <key alias="allowAllRowConfigurations">Caniatáu holl ffurfweddi rhes</key>
+        <key alias="maxItems">Uchafswm o eitemau</key>
+        <key alias="maxItemsDescription">Gadewch yn wag neu gosod i 0 ar gyfer diderfyn</key>
+        <key alias="setAsDefault">Gosod fel diofyn</key>
+        <key alias="chooseExtra">Dewis ychwanegol</key>
+        <key alias="chooseDefault">Dewis diofyn</key>
+        <key alias="areAdded">wedi'u hychwanegu</key>
+        <key alias="warning">Rhybudd</key>
+        <key alias="youAreDeleting">Rydych chi'n dileu'r ffurfwedd rhes</key>
+        <key alias="deletingARow">Bydd dileu enw ffurfwedd rhes yn arwain at golli data ar gyfer unrhyw gynnwys cynfodol sy'n seiliedig ar ffurfwedd hwn.</key>
+    </area>
+    <area alias="contentTypeEditor">
+        <key alias="compositions">Cyfansoddiadau</key>
+        <key alias="noTabs">Nid ydych wedi ychwanegu unrhyw dabiau</key>
+        <key alias="addNewTab">Ychwanegu tab newydd</key>
+        <key alias="addAnotherTab">Ychwanegu tab arall</key>
+        <key alias="group">Grŵp</key>
+        <key alias="noGroups">Nid ydych wedi ychwanegu unrhyw grwpiau</key>
+        <key alias="addGroup">Ychwanegu grŵp</key>
+        <key alias="inheritedFrom">Wedi etifeddu o</key>
+        <key alias="addProperty">Ychwanegu priodwedd</key>
+        <key alias="requiredLabel">Label gofynnol</key>
+        <key alias="enableListViewHeading">Caniatáu gwedd rhestr</key>
+        <key alias="enableListViewDescription">Ffurfweddi yr eitem gynnwys i ddangos rhestr trefnadwy a chwiladwy o'i phlant, ni fydd y plant yn cael eu dangos yn y goeden</key>
+        <key alias="allowedTemplatesHeading">Templedi Caniateir</key>
+        <key alias="allowedTemplatesDescription">Dewiswch pa olygoddion templedi sy'n cael defnyddio cynnwys o'r fath yma</key>
+        <key alias="allowAsRootHeading">Caniatáu fel gwraidd</key>
+        <key alias="allowAsRootDescription">Caniatáu golygyddion i greu cynnwys o'r fath yma yng ngwraidd y goeden gynnwys</key>
+        <key alias="allowAsRootCheckbox">Iawn - caniatáu cynnwys o'r fath yma yn y gwraidd</key>
+        <key alias="childNodesHeading">Mathau o nod blentyn caniateir</key>
+        <key alias="childNodesDescription">Caniatáu cynnwys o'r mathau benodol i gael eu creu o dan cynnwys o'r fath yma</key>
+        <key alias="chooseChildNode">Dewis nod blentyn</key>
+        <key alias="compositionsDescription">Etifeddu tabiau a phriodweddau o fath o ddogfen sy'n bodoli eisoes. Bydd tabiau newydd yn cael eu ychwanegu at y fath o ddogfen bresennol neu eu cyfuno os mae tab gyda enw yr union yr un fath yn bodoli eisoes.</key>
+        <key alias="compositionInUse">Mae'r math o gynnwys yma wedi'i ddefnyddio mewn cyfansoddiad, felly ni ellir ei gyfansoddi ei hunan.</key>
+        <key alias="noAvailableCompositions">Nid oes unrhyw fathau o gynnwys ar gael i'w defnyddio fel cyfansoddiad.</key>
+        <key alias="compositionRemoveWarning">Bydd dileu cyfansoddiad yn dileu'r holl ddata eiddo priodwedd gysylltiedig. Ar ôl i chi arbed y math o ddogfen, bydd ddim ffordd nôl.</key>
+        <key alias="availableEditors">Golygyddion ar gael</key>
+        <key alias="reuse">Ail-ddefnyddio</key>
+        <key alias="editorSettings">Gosodiadau golygydd</key>
+        <key alias="searchResultSettings">Ffurfweddau sydd ar gael</key>
+        <key alias="searchResultEditors">Creu ffurfwedd newydd</key>
+        <key alias="configuration">Ffurfwedd</key>
+        <key alias="yesDelete">Iawn, dileu</key>
+        <key alias="movedUnderneath">wedi symud islaw</key>
+        <key alias="copiedUnderneath">wedi copïo islaw</key>
+        <key alias="folderToMove">Dewiswch y ffolder i symud</key>
+        <key alias="folderToCopy">Dewiswch y ffolder i gopïo</key>
+        <key alias="structureBelow">i yn y strwythyr goeden isod</key>
+        <key alias="allDocumentTypes">Holl Fathau o Ddogfennau</key>
+        <key alias="allDocuments">Holl Ddogfennau</key>
+        <key alias="allMediaItems">Holl eitemau gyfrwng</key>
+        <key alias="usingThisDocument">sy'n defnyddio'r fath o ddogfen yma fydd yn cael eu dileu yn barhaol, cadarnhewch os hoffwch ddileu'r rhain hefyd.</key>
+        <key alias="usingThisMedia">sy'n defnyddio'r fath o gyfrwng yma fydd yn cael eu dileu yn barhaol, cadarnhewch os hoffwch ddileu'r rhain hefyd.</key>
+        <key alias="usingThisMember">sy'n defnyddio'r fath o aelod yma fydd yn cael eu dileu yn barhaol, cadarnhewch os hoffwch ddileu'r rhain hefyd.</key>
+        <key alias="andAllDocuments">a phob dogfen sy'n defnyddio'r fath yma</key>
+        <key alias="andAllMediaItems">a phob eitem gyfrwng sy'n defnyddio'r fath yma</key>
+        <key alias="andAllMembers">a phob aelod sy'n defnyddio'r fath yma</key>
+        <key alias="thisEditorUpdateSettings">sy'n defnyddio'r golygydd yma fydd yn cael eu diweddaru gyda'r gosodiadau newydd</key>
+        <key alias="memberCanEdit">Aeloed yn gallu golygu</key>
+        <key alias="memberCanEditDescription">Caniatáu i'r gwerth briodwedd yma gael ei olygu gan yr aelod ar eu tudalen broffil</key>
+        <key alias="isSensitiveData">Yn ddata sensitif</key>
+        <key alias="isSensitiveDataDescription">Cuddio'r priodwedd yma o'r golygyddion cynnwys sydd heb hawliau i weld gwybodaeth sensitif</key>
+        <key alias="showOnMemberProfile">Dangos ar broffil aelod</key>
+        <key alias="showOnMemberProfileDescription">Caniatáu i'r gwerth briodwedd yma gael ei ddangos ar y dudalen broffil aelod</key>
+        <key alias="tabHasNoSortOrder">does dim rhif trefnu gan y tab</key>
+        <key alias="compositionUsageHeading">Ble mae'r cyfansoddiad yma'n cael ei ddefnyddio?</key>
+        <key alias="compositionUsageSpecification">Mae'r cyfansoddiad yma yn cael ei ddefnyddio'n bresennol yng nghyfansoddiad o'r mathau o gynnwys ganlynol:</key>
+        <key alias="variantsHeading">Caniatáu amrywiadau</key>
+        <key alias="cultureVariantHeading">Caniatáu amrywiad  yn ôl ddiwylliant</key>
+        <key alias="segmentVariantHeading">Caniatáu segmentiad</key>
+        <key alias="cultureVariantLabel">Amrywio gan ddiwylliant</key>
+        <key alias="segmentVariantLabel">Amrywio gan segmentiad</key>
+        <key alias="variantsDescription">Caniatáu i olygyddion greu cynnwys o'r math hwn mewn gwahanol ieithoedd</key>
+        <key alias="cultureVariantDescription">Caniatáu golygyddion i greu cynnwys o ieithoedd gwahanol</key>
+        <key alias="segmentVariantDescription">Caniatáu golygyddion i greu segmentiadau o'r cynnwys hwn</key>
+        <key alias="allowVaryByCulture">Caniatáu amrywio yn ôl diwylliant</key>
+        <key alias="allowVaryBySegment">Caniatáu segmentiad</key>
+        <key alias="elementType">Math o elfen</key>
+        <key alias="elementHeading">Yn fath Elfen</key>
+        <key alias="elementDescription">Mae math Elfen i fod i gael ei ddefnyddio er enghraifft mewn Cynnwys Nythu, ac nid yn y goeden</key>
+        <key alias="elementCannotToggle">Ni ellir newid math o ddogfen i fath Elfen ar ôl mae'n cael ei defnyddio i greu un neu fwy o eitemau cynnwys.</key>
+        <key alias="elementDoesNotSupport">Nid yw hyn yn berthnasol ar gyfer math Elfen</key>
+        <key alias="propertyHasChanges">Rydych wedi gwneud newidiadau i'r eiddo hwn. Ydych chi'n siŵr eich bod chi am eu taflu?</key>
+    </area>
+    <area alias="languages">
+        <key alias="addLanguage">Ychwanegu iaith</key>
+        <key alias="mandatoryLanguage">Iath gorfodol</key>
+        <key alias="mandatoryLanguageHelp">Rhaid llenwi eiddo ar yr iaith hon cyn y gellir cyhoeddi'r nod.</key>
+        <key alias="defaultLanguage">Iaith diofyn</key>
+        <key alias="defaultLanguageHelp">Gall wefan Umbraco ddim ond cael un iaith ddiofyn.</key>
+        <key alias="changingDefaultLanguageWarning">Gall newid iaith ddiofyn arwain at golli cynnwys diofyn.</key>
+        <key alias="fallsbackToLabel">Syrthio yn ôl i</key>
+        <key alias="noFallbackLanguageOption">Dim iaith cwympo yn ôl</key>
+        <key alias="fallbackLanguageDescription">Er mwyn caniatáu i gynnwys amlieithog ddisgyn yn ôl i iaith arall os nad yw'n bresennol yn yr iaith y gofynnwyd amdani, dewiswch hi yma.</key>
+        <key alias="fallbackLanguage">Iaith cwympo yn ôl</key>
+        <key alias="none">dim</key>
+    </area>
+    <area alias="macro">
+        <key alias="addParameter">Ychwanegu paramedr</key>
+        <key alias="editParameter">Golygu paramedr</key>
+        <key alias="enterMacroName">Rhowch enw macro</key>
+        <key alias="parameters">Paramedrau</key>
+        <key alias="parametersDescription">Diffiniwch y paramedrau a ddylai fod ar gael wrth ddefnyddio'r macro hwn.</key>
+        <key alias="selectViewFile">Dewiswch ffeil macro golwg rhannol</key>
+    </area>
+    <area alias="modelsBuilder">
+        <key alias="buildingModels">Adeiladu modelau</key>
+        <key alias="waitingMessage">gall hyn gymryd amser, peidiwch â phoeni</key>
+        <key alias="modelsGenerated">Modelau wedi'u generadu</key>
+        <key alias="modelsGeneratedError">Methwyd generadu modelau</key>
+        <key alias="modelsExceptionInUlog">Methwyd generadu modelau, gweler yr eithriadau yn y log Umbraco</key>
+    </area>
+    <area alias="templateEditor">
+        <key alias="addFallbackField">Ychwanegu maes rolio yn ôl</key>
+        <key alias="fallbackField">Maes rolio yn ôl</key>
+        <key alias="addDefaultValue">Ychwanegu gwerth diofyn</key>
+        <key alias="defaultValue">Gwerth diofyn</key>
+        <key alias="alternativeField">Maes rolio yn ôl</key>
+        <key alias="alternativeText">Gwerth diofyn</key>
+        <key alias="casing">Cyflwr</key>
+        <key alias="encoding">Amgodiad</key>
+        <key alias="chooseField">Dewis maes</key>
+        <key alias="convertLineBreaks">Trawsnewid torriadau llinellau</key>
+        <key alias="convertLineBreaksDescription">Iawn, trawsnewid torriadau llinellau</key>
+        <key alias="convertLineBreaksHelp">Cyfnewid torriadau llinellau gyda tag html 'br'</key>
+        <key alias="customFields">Meysydd bersonol</key>
+        <key alias="dateOnly">Dyddiad yn unig</key>
+        <key alias="formatAndEncoding">Fformat ac amgodiad</key>
+        <key alias="formatAsDate">Fformatio ar ffurf dyddiad</key>
+        <key alias="formatAsDateDescr">Fformatio'r gwerth ar ffurf dyddiad, neu dyddiad gyda amser, yn ôl y diwylliant gweithredol</key>
+        <key alias="htmlEncode">Amgodi HTML</key>
+        <key alias="htmlEncodeHelp">Bydd yn cyfnewid nodau arbennig gyda'u nodau HTML cyfatebol.</key>
+        <key alias="insertedAfter">Bydd yn cael ei fewnosod ar ôl y gwerth maes</key>
+        <key alias="insertedBefore">Bydd yn cael ei fewnosod cyn y gwerth maes</key>
+        <key alias="lowercase">Llythrennau bach</key>
+        <key alias="modifyOutput">Newid allbwn</key>
+        <key alias="none">Dim</key>
+        <key alias="outputSample">Sampl allbwn</key>
+        <key alias="postContent">Mewnosod ar ôl maes</key>
+        <key alias="preContent">Mewnosod cyn maes</key>
+        <key alias="recursive">Ailadroddus</key>
+        <key alias="recursiveDescr">Iawn, gwnewch yn ailadroddus</key>
+        <key alias="separator">Gwahanwr</key>
+        <key alias="standardFields">Meysydd Safonol</key>
+        <key alias="uppercase">Llythrennau bras</key>
+        <key alias="urlEncode">Amgodi URL</key>
+        <key alias="urlEncodeHelp">Bydd yn fformatio nodau arbennig o fewn URL</key>
+        <key alias="usedIfAllEmpty">Bydd ddim ond yn cael ei ddefnyddio pan mae'r gwerthoedd maes uchod yn wag</key>
+        <key alias="usedIfEmpty">Bydd y maes yma ddim ond yn cael ei ddefnyddio os mae'r maes gynradd yn wag</key>
+        <key alias="withTime">Dyddiad ac amser</key>
+    </area>
+    <area alias="translation">
+        <key alias="assignedTasks">Tasgau wedi'u neilltuo i chi</key>
+        <key alias="assignedTasksHelp">
+            <![CDATA[ Mae'r rhestr isod yn dangostasgau cyfieithu <strong>wedi'u neilltuo i chi</strong>. Er mwyn gweld gwedd fanwl gan gynnwys sylwadau, cliciwch ar "Manylion" neu enw'r dudalen.
+     Gallwch hefyd lawrlwytho'r dudalen ar ffurf XML yn uniongyrchol gan glicio'r ddolen "Lawrlwytho Xml". <br/>
+     Er mwyn cau tasg cyfieithu, ewch at y wedd fanylion a cliciwch ar y botwm "Cau".
+    ]]>
+        </key>
+        <key alias="closeTask">cau tasg</key>
+        <key alias="details">Manylion cyfieithiad</key>
+        <key alias="downloadAllAsXml">Lawrlwytho pob tasg cyfieithu ar ffurf XML</key>
+        <key alias="downloadTaskAsXml">Lawrlwytho XML</key>
+        <key alias="DownloadXmlDTD">Lawrlwytho XML DTD</key>
+        <key alias="fields">Meysydd</key>
+        <key alias="includeSubpages">Cynnwys is-dudalennau</key>
+        <key alias="mailBody">
+            <![CDATA[
+      Helo %0%
+
+      mae hyn yn ebost awtomatig i'ch hysbysu fod y ddogfen '%1%'
+      wedi'i hanfon am gyfieithiad i mewn i '%5%' gan %2%.
+
+      Ewch at http://%3%/translation/details.aspx?id=%4% i olygu.
+
+      Neu mewngofnodwch i Umbraco i gael trosolwg o'ch tasgau cyfieithu
+      http://%3%
+
+      Mwynhewch eich diwrnod!
+
+      Hwyl fawr oddi wrth y robot Umbraco
+    ]]>
+        </key>
+        <key alias="mailSubject">[%0%] Tasg cyfieithu ar gyfer %1%</key>
+        <key alias="noTranslators">Dim defnyddwyr cyfieithu wedi'u darganfod. Creuwch ddefnyddiwr cyfieithu cyn i chi gychwyn anfon cynnwys am gyfieithiadau</key>
+        <key alias="ownedTasks">Tasgau wedi'u creu gennych chi</key>
+        <key alias="ownedTasksHelp">
+            <![CDATA[ Mae'r rhestr isod yn dangos tudalennau <strong>wedi'u creu gennych chi</strong>. Er mwyn gweld gwedd fanwl sy'n cynnwys sylwadau,
+     cliciwch ar "Manylion" neu enw'r dudalen. Gallwch hefyd lawrlwytho'r dudalen ar ffurf XML yn uniongyrchol gan glicio ar y ddolen "Lawrlwytho Xml".
+     Er mwyn cau tasgau cyfieithu, ewch at y wedd fanylion a cliciwch y botwm "Cau".
+    ]]>
+        </key>
+        <key alias="pageHasBeenSendToTranslation">Mae'r dudalen '%0%' wedi cael ei anfon am gyfieithiad</key>
+        <key alias="noLanguageSelected">Dewiswch yr iaith y dylai'r cynnwys gael ei gyfieithu i</key>
+        <key alias="sendToTranslate">Anfon y dudalen '%0%' am gyfieithiad</key>
+        <key alias="taskAssignedBy">Wedi'i neilltuo gan</key>
+        <key alias="taskOpened">Tasg wedi'i hagor</key>
+        <key alias="totalWords">Cyfanswm o eiriau</key>
+        <key alias="translateTo">Cyfieithu i</key>
+        <key alias="translationDone">Cyfieithiad wedi'i gwblhau.</key>
+        <key alias="translationDoneHelp">Gallwch ragolygu'r tudalennau yr ydych newydd gyfieithu gan glicio isod. Os mae'r dudalen gwreiddiol wedi'i ganfod, byddwch yn cael cymhariaeth o'r 2 dudalen.</key>
+        <key alias="translationFailed">Cyfieithiad wedi methu, mae'n bosib fod y ffeil XML wedi llygru</key>
+        <key alias="translationOptions">Dewisiadau cyfieithu</key>
+        <key alias="translator">Cyfieithydd</key>
+        <key alias="uploadTranslationXml">Lanlwytho cyfieithiad XML</key>
+    </area>
+    <area alias="treeHeaders">
+        <key alias="content">Cynnwys</key>
+        <key alias="contentBlueprints">Templedi Cynnwys</key>
+        <key alias="media">Cyfrwng</key>
+        <key alias="cacheBrowser">Porwr Storfa</key>
+        <key alias="contentRecycleBin">Bin Ailgylchu</key>
+        <key alias="createdPackages">Pecynnau wedi'u creu</key>
+        <key alias="dataTypes">Mathau o Ddata</key>
+        <key alias="dictionary">Geiriadur</key>
+        <key alias="installedPackages">Pecynnau wedi'u gosod</key>
+        <key alias="installSkin">Gosod croen</key>
+        <key alias="installStarterKit">Gosod cit gychwynol</key>
+        <key alias="languages">Ieithoedd</key>
+        <key alias="localPackage">Gosod pecyn leol</key>
+        <key alias="macros">Macros</key>
+        <key alias="mediaTypes">Mathau o Gyfrwng</key>
+        <key alias="member">Aelodau</key>
+        <key alias="memberGroups">Grwpiau Aelodau</key>
+        <key alias="memberRoles">Grwpiau Rolau</key>
+        <key alias="memberTypes">Mathau o Aelod</key>
+        <key alias="documentTypes">Mathau o Ddogfen</key>
+        <key alias="relationTypes">Math o Berthynas</key>
+        <key alias="packager">Pecynnydd</key>
+        <key alias="packages">Pecynnau</key>
+        <key alias="partialViews">Rhan-weddi</key>
+        <key alias="partialViewMacros">Ffeiliau Rhan-wedd Macro</key>
+        <key alias="python">Ffeiliau Python</key>
+        <key alias="repositories">Gosod o ystorfa</key>
+        <key alias="runway">Gosod Runway</key>
+        <key alias="runwayModules">Modylau Runway</key>
+        <key alias="scripting">Ffeiliau Sgriptio</key>
+        <key alias="scripts">Sgriptiau</key>
+        <key alias="stylesheets">Taflenni arddull</key>
+        <key alias="templates">Templedi</key>
+        <key alias="xslt">Ffeiliau XSLT</key>
+        <key alias="analytics">Dadansoddeg</key>
+        <key alias="logViewer">Gwyliwr Log</key>
+        <key alias="users">Defnyddwyr</key>
+        <key alias="settingsGroup">Gosodiadau</key>
+        <key alias="templatingGroup">Templedi</key>
+        <key alias="thirdPartyGroup">Trydydd parti</key>
+    </area>
+    <area alias="update">
+        <key alias="updateAvailable">Diweddariad newydd yn barod</key>
+        <key alias="updateDownloadText">%0% yn barod, cliciwch yma i lawrlwytho</key>
+        <key alias="updateNoServer">Dim cysylltiad at y gweinydd</key>
+        <key alias="updateNoServerError">Gwall yn chwilio am ddiweddariad. Ceisiwch wirio'r trywydd stac am fwy o wybodaeth</key>
+    </area>
+    <area alias="user">
+        <key alias="access">Mynediad</key>
+        <key alias="accessHelp">Ar sail y grwpiau aelodaeth ac y nodau cychwyn, mae gan y defnyddiwr hawliau at y nodau ganlynol</key>
+        <key alias="assignAccess">Neilltuo hawl</key>
+        <key alias="administrators">Gweinyddwr</key>
+        <key alias="categoryField">Maes categori</key>
+        <key alias="createDate">Defnyddiwr wedi'i greu</key>
+        <key alias="changePassword">Newidiwch Eich Cyfrinair</key>
+        <key alias="changePhoto">Newidiwch lun</key>
+        <key alias="newPassword">Cyfrinair newydd</key>
+        <key alias="noLockouts">ddim wedi cloi allan</key>
+        <key alias="noPasswordChange">Nid yw'r cyfrinair wedi'i newid</key>
+        <key alias="confirmNewPassword">Cadarnhau cyfrinair newydd</key>
+        <key alias="changePasswordDescription">Gallwch newid eich cyfrinair i gyrchu Swyddfa Gefn Umbracogan lenwi allan y ffurflen isod a chlicio'r botwm 'Newid Cyfrinair'</key>
+        <key alias="contentChannel">Sianel Gynnwys</key>
+        <key alias="createAnotherUser">Creu defnyddiwr arall</key>
+        <key alias="createUserHelp">Creu defnyddwyr newydd i roi hawliau iddynt gyrchu Umbraco. Pan mae defnyddiwr newydd yn cael ei greu, bydd cyfrinair yn cael ei generadu y gallwch chi rannu gyda'r defnyddiwr.</key>
+        <key alias="descriptionField">Maes disgrifiad</key>
+        <key alias="disabled">Analluogi Defnyddiwr</key>
+        <key alias="documentType">Math o Ddogfen</key>
+        <key alias="editors">Golygydd</key>
+        <key alias="excerptField">Maes dyfyniad</key>
+        <key alias="failedPasswordAttempts">Nifer o fethiannau ceisio mewngofnodi</key>
+        <key alias="goToProfile">Ewch at broffil defnyddiwr</key>
+        <key alias="groupsHelp">Ychwanegu grwpiau i neilltuo mynediad a hawliau</key>
+        <key alias="inviteAnotherUser">Gwahodd defnyddiwr arall</key>
+        <key alias="inviteUserHelp">Gwahodd defnyddwyr newydd i roi hawliau iddynt gyrchu Umbraco. Bydd gwahoddiad ebost yn cael ei anfon at y defnyddiwr gyda gwybodaeth ar sut i fewngofnodi i Umbraco. Mae gwahoddiadau yn para am 72 awr.</key>
+        <key alias="language">Iaith</key>
+        <key alias="languageHelp">Gosod yr iaith fyddwch chi'n gweld yn y dewislenni a'r deialogau</key>
+        <key alias="lastLockoutDate">Dyddiad cloi allan diweddaraf</key>
+        <key alias="lastLogin">Mewngofnodi diweddaraf</key>
+        <key alias="lastPasswordChangeDate">Cyfrinair wedi'i newid ddiwethaf</key>
+        <key alias="loginname">Enw defnyddiwr</key>
+        <key alias="mediastartnode">Nod gychwynol gyfrwng</key>
+        <key alias="mediastartnodehelp">Cyfyngu'r llyfrgell gyfrwng at nod gychwynol benodol</key>
+        <key alias="mediastartnodes">Nodau gychwynol gyfrwng</key>
+        <key alias="mediastartnodeshelp">Cyfyngu'r llyfrgell gyfrwng at nodau gychwynol benodol</key>
+        <key alias="modules">Adrannau</key>
+        <key alias="noConsole">Analluogi Mynediad Umbraco</key>
+        <key alias="noLogin">ddim wedi mewngofnodi eto</key>
+        <key alias="oldPassword">Hen gyfrinair</key>
+        <key alias="password">Cyfrinair</key>
+        <key alias="resetPassword">Ailosod cyfrinair</key>
+        <key alias="passwordChanged">Mae eich cyfrinair wedi'i newid!</key>
+        <key alias="passwordChangedGeneric">Cyfrinair wedi'i newid</key>
+        <key alias="passwordConfirm">Cadarnhewch y cyfrinair newydd</key>
+        <key alias="passwordEnterNew">Darparwch eich cyfrinair newydd</key>
+        <key alias="passwordIsBlank">Ni all eich cyfrinair newydd fod yn wag!</key>
+        <key alias="passwordCurrent">Cyfrinair bresennol</key>
+        <key alias="passwordInvalid">Cyfrinair bresennol annilys</key>
+        <key alias="passwordIsDifferent">Roedd gwahaniaeth rhwng y cyfrinair newydd ac y cyfrinair i gadarnhau. Ceisiwch eto!</key>
+        <key alias="passwordMismatch">Nid yw'r cyfrinair cadarnhau yn cyfateb â'r cyfrinair newydd!</key>
+        <key alias="permissionReplaceChildren">Cyfnewid hawliau nod blentyn</key>
+        <key alias="permissionSelectedPages">Rydych ar hyn o bryd yn newid hawliau ar gyfer y tudalennau:</key>
+        <key alias="permissionSelectPages">Dewis tudalennau i newid eu hawliau</key>
+        <key alias="removePhoto">Dileu llun</key>
+        <key alias="permissionsDefault">Hawliau diofyn</key>
+        <key alias="permissionsGranular">Hawliau gronynnog</key>
+        <key alias="permissionsGranularHelp">Gosod hawliau ar gyfer nodau penodol</key>
+        <key alias="profile">Proffil</key>
+        <key alias="searchAllChildren">Chwilio holl blant</key>
+        <key alias="sectionsHelp">Ychwanegu adrannau i roi hawliau i ddefnyddwyr</key>
+        <key alias="selectUserGroups">Dewis grwpiau defnyddwir</key>
+        <key alias="noStartNode">Dim nod gychwynol wedi'i ddewis</key>
+        <key alias="noStartNodes">Dim nodau cychwynol wedi'u dewis</key>
+        <key alias="startnode">Nod gynnwys gychwynol</key>
+        <key alias="startnodehelp">Cyfyngu'r goeden gynnwys i nod gychwynol benodol</key>
+        <key alias="startnodes">Nodau cynnwys gychwynol</key>
+        <key alias="startnodeshelp">Cyfyngu'r goeden gynnwys i nodau gychwynol benodol</key>
+        <key alias="updateDate">Defnyddiwr wedi diweddaru ddiwethaf</key>
+        <key alias="userCreated">wedi ei greu</key>
+        <key alias="userCreatedSuccessHelp">Mae'r defnyddiwr newydd wedi'i greu. Er mwyn mewngofnodi i Umbraco defnyddiwch y cyfrinair isod.</key>
+        <key alias="userManagement">Rheoli defnyddwyr</key>
+        <key alias="username">Enw</key>
+        <key alias="userPermissions">Hawliau defnyddiwr</key>
+        <key alias="userGroupPermissions">Hawliau grwpiau defnyddiwr</key>
+        <key alias="usergroup">Grŵp defnyddiwr</key>
+        <key alias="userGroups">Grwpiau defnyddiwr</key>
+        <key alias="userInvited">wedi'i wahodd</key>
+        <key alias="userInvitedSuccessHelp">Mae gwahoddiad wedi cael ei anfon at y defnyddiwr newydd gyda manylion ar sut i fewngofnodi i Umbraco.</key>
+        <key alias="userinviteWelcomeMessage">Helo a chroeso i Umbraco! Mewn 1 munud yn unig, byddech chi'n barod i fynd, rydym dim ond angen gosod cyfrinair a llun ar gyfer eich avatar.</key>
+        <key alias="userinviteExpiredMessage">Croeso i Umbraco! Yn anffodus, mae eich gwahoddiad wedi terfynu. Cysylltwch â'ch gweinyddwr a gofynnwch iddynt ail-anfon.</key>
+        <key alias="userinviteAvatarMessage">Lanlwythwch lun i wneud o'n haws i boble eich adnabod chi.</key>
+        <key alias="writer">Ysgrifennydd</key>
+        <key alias="translator">Cyfieithydd</key>
+        <key alias="change">Newid</key>
+        <key alias="yourProfile" version="7.0">Eich proffil</key>
+        <key alias="yourHistory" version="7.0">Eich hanes diweddar</key>
+        <key alias="sessionExpires" version="7.0">Sesiwn yn terfynu mewn</key>
+        <key alias="inviteUser">Gwahodd defnyddiwr</key>
+        <key alias="createUser">Creu defnyddiwr</key>
+        <key alias="sendInvite">Anfon gwahoddiad</key>
+        <key alias="backToUsers">Yn ôl at ddefnyddwyr</key>
+        <key alias="inviteEmailCopySubject">Umbraco: Gwahoddiad</key>
+        <key alias="inviteEmailCopyFormat">
+            <![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Helo %0%,
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Rydych wedi cael eich gwahodd gan <a href="mailto:%4%" style="text-decoration: underline; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a> i'r Swyddfa Gefn Umbraco.
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Neges oddi wrth <a href="mailto:%1%" style="text-decoration: none; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a>:
+															<br/>
+															<em>%2%</em>
+														</p>
+														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
+															<tbody>
+																<tr>
+																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
+																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
+																			<tbody>
+																				<tr>
+																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																							Cliciwch y ddolen yma i dderbyn y gwahoddiad
+																						</a>
+																					</td>
+																				</tr>
+																			</tbody>
+																		</table>
+																	</td>
+																</tr>
+															</tbody>
+														</table>
+														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>Os na allwch chi glicio ar y ddolen, copiwch a gludwch y URL i mewn i'ch porwr:</p>
+															<table border='0' cellpadding='0' cellspacing='0'>
+																<tr>
+																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
+																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
+																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%3%'>%3%</a>
+																		</font>
+																	</td>
+																</tr>
+															</table>
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+    </html>]]>
+        </key>
+        <key alias="invite">Gwahoddiad</key>
+        <key alias="defaultInvitationMessage">Yn ail-anfon y gwahoddiad...</key>
+        <key alias="deleteUser">Dileu Defnyddiwr</key>
+        <key alias="deleteUserConfirmation">Ydych chi'n sicr eich bod eisiau dileu'r cyfrif defnyddiwr yma?</key>
+        <key alias="stateAll">Pob</key>
+        <key alias="stateActive">Gweithredol</key>
+        <key alias="stateDisabled">Wedi analluogi</key>
+        <key alias="stateLockedOut">Wedi cloi allan</key>
+        <key alias="stateInvited">Wedi gwahodd</key>
+        <key alias="stateInactive">Anactif</key>
+        <key alias="sortNameAscending">Enw (A-Y)</key>
+        <key alias="sortNameDescending">Enw (Y-A)</key>
+        <key alias="sortCreateDateAscending">Hynaf</key>
+        <key alias="sortCreateDateDescending">Diweddaraf</key>
+        <key alias="sortLastLoginDateDescending">Mewngofnodi diweddaraf</key>
+        <key alias="noUserGroupsAdded">No user groups have been added</key>
+    </area>
+    <area alias="validation">
+        <key alias="validation">Dilysiad</key>
+        <key alias="noValidation">Dim dilysiad</key>
+        <key alias="validateAsEmail">Dilysu fel cyfeiriad ebost</key>
+        <key alias="validateAsNumber">Dilysu fel rhif</key>
+        <key alias="validateAsUrl">Dilysu fel URL</key>
+        <key alias="enterCustomValidation">...neu darparwch ddilysiad bersonol</key>
+        <key alias="fieldIsMandatory">Maes yn ofynnol</key>
+        <key alias="mandatoryMessage">Darparwch neges gwall dilysiad arferu (opsiynol)</key>
+        <key alias="validationRegExp">Darparwch fynegiad rheoliadd</key>
+        <key alias="validationRegExpMessage">Darparwch neges gwall dilysiad arferu (opsiynol)</key>
+        <key alias="minCount">Mae angen i chi ychwanegu o leiaf</key>
+        <key alias="maxCount">gallwch ddim ond gael</key>
+        <key alias="addUpTo">Adio lan i</key>
+        <key alias="items">o eitemau</key>
+        <key alias="urls">url(s)</key>
+        <key alias="urlsSelected">url(s) wedi'i ddewis</key>
+        <key alias="itemsSelected">o eitemau wedi'u dewis</key>
+        <key alias="invalidDate">Dyddiad annilys</key>
+        <key alias="invalidNumber">Ddim yn rif</key>
+        <key alias="invalidEmail">Ebost annilys</key>
+        <key alias="invalidNull">Ni all y gwerth fod yn null</key>
+        <key alias="invalidEmpty">Ni all y gwerth fod yn gwag</key>
+        <key alias="invalidPattern">Mae'r gwerth yn annilys, nid yw'n cyfateb i'r patrwm cywir</key>
+        <key alias="customValidation">Dilysiad arferu</key>
+        <key alias="entriesShort"><![CDATA[Lleiafswm o %0% gofnodion, angen <strong>%1%</strong> mwy.]]></key>
+        <key alias="entriesExceed"><![CDATA[Uchafswm o %0% gofnodion, <strong>%1%</strong> gormod.]]></key>
+    </area>
+    <area alias="healthcheck">
+        <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+		   2: XPath
+		   3: Configuration file path
+	  -->
+        <key alias="checkSuccessMessage">Gwerth wedi'i osod at y gwerth argymhellwyd: '%0%'.</key>
+        <key alias="rectifySuccessMessage">Gwerth wedi'i osod at '%1%' ar gyfer XPath '%2%' yn y ffeil ffurfweddu '%3%'.</key>
+        <key alias="checkErrorMessageDifferentExpectedValue">Yn disgwyl y gwerth '%1%' ar gyfer '%2%' yn y ffeil ffurfweddu '%3%', ond darganfyddwyd '%0%'.</key>
+        <key alias="checkErrorMessageUnexpectedValue">Darganfyddwyd gwerth annisgwyl '%0%' ar gyfer '%2%' yn y ffeil ffurfweddu '%3%'.</key>
+        <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+	  -->
+        <key alias="customErrorsCheckSuccessMessage">Gwallau bersonol wedi gosod at '%0%'.</key>
+        <key alias="customErrorsCheckErrorMessage">Gwallau bersonol wedi gosod at '%0%' yn bresennol. Argymhellwyd i osod hyn i '%1%' cyn mynd yn fyw.</key>
+        <key alias="customErrorsCheckRectifySuccessMessage">Gwallau bersonol wedi gosod at '%0%' yn llwyddiannus.</key>
+
+        <key alias="macroErrorModeCheckSuccessMessage">Gwallau Macro wedi gosod at '%0%'.</key>
+        <key alias="macroErrorModeCheckErrorMessage">Gwallau Macro wedi gosod at '%0%' a fydd yn atal rhai neu holl dudalennau yn eich safle rhag llwytho'n gyfan gwbl os oes unrhyw wallau o fewn macros. Bydd cywiro hyn yn gosod y gwerth at '%1%'.</key>
+        <key alias="macroErrorModeCheckRectifySuccessMessage">Gwallau Macro wedi gosod at '%0%' yn llwyddiannus.</key>
+        <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+		   2: Server version
+	  -->
+        <key alias="trySkipIisCustomErrorsCheckSuccessMessage">Ceisio sgipio Gwallau IIS Bersonol wedi'i osod at '%0%' ac rydych yn defnyddio fersiwn IIS '%1%'.</key>
+        <key alias="trySkipIisCustomErrorsCheckErrorMessage">Ceisio sgipio Gwallau IIS Bersonol wedi'i osod at '%0%'. Argymhellwyd gosod hyn at '%1%' ar gyfer eich fersiwn IIS (%2%).</key>
+        <key alias="trySkipIisCustomErrorsCheckRectifySuccessMessage">Ceisio sgipio Gwallau IIS Bersonol wedi'i osod at '%0%' yn llwyddiannus.</key>
+        <!-- The following keys get predefined tokens passed in that are not all the same, like above -->
+        <key alias="configurationServiceFileNotFound">Ffeil ddim yn bodoli: '%0%'.</key>
+        <key alias="configurationServiceNodeNotFound"><![CDATA[Methwyd darganfod <strong>'%0%'</strong> yn y ffeil ffurfweddu <strong>'%1%'</strong>.]]></key>
+        <key alias="configurationServiceError">Bu gwall, gwiriwch y log ar gyfer y gwall cyflawn: %0%.</key>
+        <key alias="xmlDataIntegrityCheckMembers">Aelodau - Cyfanswm XML: %0%, Cyfanswm: %1%, Cyfanswm annilys: %2%</key>
+        <key alias="xmlDataIntegrityCheckMedia">Cyfrwng - Cyfanswm XML: %0%, Cyfanswm: %1%, Cyfanswm annilys: %2%</key>
+        <key alias="xmlDataIntegrityCheckContent">Cynnwys - Cyfanswm XML: %0%, Cyfanswm wedi cyhoeddi: %1%, Cyfanswm annilys: %2%</key>
+        <key alias="databaseSchemaValidationCheckDatabaseOk">Cronfa ddata - Mae'r sgema gronfa ddata yn gywir ar gyfer y fersiwn yma o Umbraco</key>
+        <key alias="databaseSchemaValidationCheckDatabaseErrors">%0% o broblemau wedi'u canfod gyda'ch sgema gronfa ddata (Gwiriwch y log am fanylion)</key>
+        <key alias="databaseSchemaValidationCheckDatabaseLogMessage">Darganfyddwyd gwallau wrth ddilysu'r sgema gronfa ddata yn erbyn y fersiwn bresennol o Umbraco.</key>
+        <key alias="httpsCheckValidCertificate">Mae tystysgrif eich gwefan yn ddilys.</key>
+        <key alias="httpsCheckInvalidCertificate">Gwall dilysu tystysgrif: '%0%'</key>
+        <key alias="httpsCheckExpiredCertificate">Mae tystysgrif SSL eich gwefan wedi terfynu.</key>
+        <key alias="httpsCheckExpiringCertificate">Mae tystysgrif SSL eich gwefan am derfynu mewn %0% diwrnod.</key>
+        <key alias="healthCheckInvalidUrl">Gwall yn pingio'r URL %0% - '%1%'</key>
+        <key alias="httpsCheckIsCurrentSchemeHttps">Rydych yn bresennol %0% yn gweld y wefan yn defnyddio'r cynllun HTTPS.</key>
+        <key alias="httpsCheckConfigurationRectifyNotPossible">Mae'r appSetting 'umbracoUseSSL' wedi'i osod at 'false' yn eich ffeil web.config. Unwaith rydych yn ymweld â'r safle gan ddefnyddio'r cynllun HTTPS, dylai hynny gael ei osod i 'true'.</key>
+        <key alias="httpsCheckConfigurationCheckResult">Mae'r appSetting 'umbracoUseSSL' wedi'i osod at '%0%' yn eich ffeil web.config, mae eich cwcis %1% marcio yn ddiogel.</key>
+        <key alias="httpsCheckEnableHttpsError">Ni ellir diweddaru'r gosodiad 'umbracoUseSSL' yn eich ffeil web.config. Gwall: %0%</key>
+        <!-- The following keys don't get tokens passed in -->
+        <key alias="httpsCheckEnableHttpsButton">Galluogi HTTPS</key>
+        <key alias="httpsCheckEnableHttpsDescription">Yn gosod umbracoSSL i true yn yr appSettings yn y ffeil web.config.</key>
+        <key alias="httpsCheckEnableHttpsSuccess">Mae'r appSetting 'umbracoUseSSL' yn awr wedi'i osod at 'true' yn eich ffeil web.config, bydd eich cwcis wedi eu marcio yn ddiogel.</key>
+        <key alias="rectifyButton">Trwsio</key>
+        <key alias="cannotRectifyShouldNotEqual">Ni ellir trwsio gwiriad gyda math chymhariaeth gwerth o 'ShouldNotEqual'.</key>
+        <key alias="cannotRectifyShouldEqualWithValue">Ni ellir trwsio gwiriad gyda math chymhariaeth gwerth o 'ShouldEqual' gyda gwerth a ddarparwyd.</key>
+        <key alias="valueToRectifyNotProvided">Gwerth i drwrsio gwiriad heb ei ddarparu.</key>
+        <key alias="compilationDebugCheckSuccessMessage">Modd casgliad dadfygio wedi'i analluogi.</key>
+        <key alias="compilationDebugCheckErrorMessage">Modd casgliad dadfygio wedi'i alluogi. Argymhellwyd analluogi'r gosodiad yma cyn mynd yn fyw.</key>
+        <key alias="compilationDebugCheckRectifySuccessMessage">Modd casgliad dadfygio wedi'i analluogi yn llwyddiannus.</key>
+        <key alias="traceModeCheckSuccessMessage">Modd olrhain wedi'i analluogi.</key>
+        <key alias="traceModeCheckErrorMessage">Modd olrhain wedi'i alluogi. Argymhellwyd analluogi'r gosodiad yma cyn mynd yn fyw.</key>
+        <key alias="traceModeCheckRectifySuccessMessage">Modd olrhain wedi'i analluogi yn llwyddiannus.</key>
+        <key alias="folderPermissionsCheckMessage">Mae gan pob ffolder yr hawliau cywir wedi'u gosod.</key>
+        <!-- The following keys get these tokens passed in:
+	    0: Comma delimitted list of failed folder paths
+  	-->
+        <key alias="requiredFolderPermissionFailed"><![CDATA[Mae angen i'r ffolderi ganlynol gael eu gosod gyda hawliau golygu ond ni ellir eu cyrchu: <strong>%0%</strong>.]]></key>
+        <key alias="optionalFolderPermissionFailed"><![CDATA[Mae angen i'r ffolderi ganlynol gael eu gosod gyda hawliau golygu ar gyfer rhai gweithredoedd Umbraco penodol er mwyn gweithio, ond ni ellir eu cyrchu: <strong>%0%</strong>. Os nad ydyn nhw'n cael eu ysgrifennu atynt, does dim angen unrhyw weithred.]]></key>
+        <key alias="filePermissionsCheckMessage">Mae gan pob ffeil yr hawliau cywir wedi'u gosod.</key>
+        <!-- The following keys get these tokens passed in:
+	    0: Comma delimitted list of failed folder paths
+  	-->
+        <key alias="requiredFilePermissionFailed"><![CDATA[Mae angen i'r ffeiliau ganlynol gael eu gosod gyda hawliau ysgrifennu ond ni ellir eu cyrchu: <strong>%0%</strong>.]]></key>
+        <key alias="optionalFilePermissionFailed"><![CDATA[Mae angen i'r ffeiliau ganlynol gael eu gosod gyda hawliau ysgrifennu ar gyfer rhai gweithredoedd Umbraco penodol er mwyn gweithio, ond ni ellir eu cyrchu: <strong>%0%</strong>. Os nad ydyn nhw'n cael eu ysgrifennu atynt, does dim angen unrhyw weithred.]]></key>
+        <key alias="clickJackingCheckHeaderFound"><![CDATA[Mae'r peniad neu meta-tag <strong>X-Frame-Options</strong> sy'n cael ei ddefnyddio i reoli os mae safle'n gallu cael ei osod o fewn IFRAME gan safle arall wedi'i ganfod.]]></key>
+        <key alias="clickJackingCheckHeaderNotFound"><![CDATA[Nid yw'r peniad neu meta-tag <strong>X-Frame-Options</strong> sy'n cael ei ddefnyddio i reoli os mae safle'n gallu cael ei osod o fewn IFRAME gan safle arall wedi'i ganfod.]]></key>
+        <key alias="setHeaderInConfig">Gosod Peniad o fewn Ffurfwedd</key>
+        <key alias="clickJackingSetHeaderInConfigDescription">Ychwanegu gwerth at yr adran httpProtocol/customHeaders o'r ffeil web.config er mwyn atal y safle rhag cael ei ddangos o fewn IFRAME gan safleoedd eraill.</key>
+        <key alias="clickJackingSetHeaderInConfigSuccess">Gosodiad ar gyfer creu peniad sy'n atal y wefan rhag cael ei ddangos o fewn IFRAME ar safle arall wedi'i ychwanegu at eich ffeil web.config.</key>
+        <key alias="setHeaderInConfigError">Ni ellir diweddaru'r ffeil web.config. Gwall: %0%</key>
+        <key alias="noSniffCheckHeaderFound"><![CDATA[Mae'r peniad neu meta-tag <strong>X-Content-Type-Options</strong> sy'n cael ei ddefnyddio i amddiffyn yn erbyn gwendidau sniffio MIME wedi'i ganfod.]]></key>
+        <key alias="noSniffCheckHeaderNotFound"><![CDATA[Nid yw'r peniad neu meta-tag <strong>X-Content-Type-Options</strong> sy'n cael ei ddefnyddio i amddiffyn yn erbyn gwendidau sniffio MIME wedi'i ganfod.]]></key>
+        <key alias="noSniffSetHeaderInConfigDescription">Ychwanegu gwerth at yr adran httpProtocol/customHeaders o'r ffeil web.config er mwyn amddiffyn yn erbyn gwendidau sniffio MIME.</key>
+        <key alias="noSniffSetHeaderInConfigSuccess">Gosodiad ar gyfer creu peniad sy'n amddiffyn yn erbyn gwendidau sniffio MIME wedi'i ychwanegu at eich ffeil web.config.</key>
+        <key alias="hSTSCheckHeaderFound"><![CDATA[Mae'r peniad <strong>Strict-Transport-Security</strong>, hefyd wedi'i adnabod fel HSTS-header, wedi'i ganfod.]]></key>
+        <key alias="hSTSCheckHeaderNotFound"><![CDATA[Nid yw'r peniad <strong>Strict-Transport-Security</strong> wedi'i ganfod.]]></key>
+        <key alias="hSTSSetHeaderInConfigDescription">Ychwanegu'r peniad 'Strict-Transport-Security' gyda'r gwerth 'max-age=10886400; preload' i'r adran httpProtocol/customHeaders o'r ffeil web.config. Defnyddiwch y trwsiad hyn dim ond os bydd gennych chi eich parthau yn rhedeg gyda https am yr 18 wythnos nesaf (o leiaf).</key>
+        <key alias="hSTSSetHeaderInConfigSuccess">Mae'r peniad HSTS wedi'i ychwanegu at y ffeil web.config.</key>
+        <key alias="xssProtectionCheckHeaderFound"><![CDATA[Mae'r peniad <strong>X-XSS-Protection</strong> wedi'i ganfod.]]></key>
+        <key alias="xssProtectionCheckHeaderNotFound"><![CDATA[Nid yw'r peniad <strong>X-XSS-Protection</strong> wedi'i ganfod.]]></key>
+        <key alias="xssProtectionSetHeaderInConfigDescription">Ychwanegu'r peniad 'X-XSS-Protection' gyda'r gwerth '1; mode=block' at yr adran httpProtocol/customHeaders yn y ffeil web.config. </key>
+        <key alias="xssProtectionSetHeaderInConfigSuccess">Mae'r peniad X-XSS-Protection wedi'i ychwanegu at y ffeil web.config.</key>
+        <!-- The following key get these tokens passed in:
+	    0: Comma delimitted list of headers found
+  	-->
+        <key alias="excessiveHeadersFound"><![CDATA[Mae'r peniadau canlynol sy'n datgelu gwynodaeth am dechnoleg eich gwefan wedi'u canfod: <strong>%0%</strong>.]]></key>
+        <key alias="excessiveHeadersNotFound">Dim peniadau sy'n datgelu gwynodaeth am dechnoleg eich gwefan wedi'u canfod.</key>
+        <key alias="smtpMailSettingsNotFound">Ni ellir darganfod system.net/mailsettings yn y ffeil Web.config.</key>
+        <key alias="smtpMailSettingsHostNotConfigured">Yn yr adran system.net/mailsettings o'r ffeil Web.config, nid yw'r "host" wedi ffurfweddu.</key>
+        <key alias="smtpMailSettingsConnectionSuccess">Gosodiadau SMTP wedi ffurfweddu'n gywir ac mae'r gwasanaeth yn gweithio fel y disgwylir.</key>
+        <key alias="smtpMailSettingsConnectionFail">Ni ellir cysylltu â gweinydd SMTP sydd wedi ffurfweddu gyda "host" '%0%' a phorth '%1%'. Gwiriwch fod y gosodiadau SMTP yn y ffeil Web.config, system.net/mailsettings yn gywir.</key>
+        <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Ebost hysbusu wedi'i osod at <strong>%0%</strong>.]]></key>
+        <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Ebost hysbusu yn dal wedi'i osod at y gwerth diofyn o <strong>%0%</strong>.]]></key>
+        <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Canlyniadau'r gwiriad Statws Iechyd Umbraco ar amserlen rhedwyd ar %0% am %1% fel y ganlyn:</p>%2%</body></html>]]></key>
+        <key alias="scheduledHealthCheckEmailSubject">Statws Iechyd Umbraco: %0%</key>
+        <key alias="checkAllGroups">Gwiriwch Pob Grŵp</key>
+        <key alias="checkGroup">Gwiriwch y grŵp</key>
+        <key alias="helpText">
+            <![CDATA[
+            <p>Mae'r gwiriwr iechyd yn gwerthuso gwahanol rannau o'ch gwefan ar gyfer gosodiadau arfer gorau, cyfluniad, problemau posibl, ac ati. Gallwch chi drwsio problemau yn hawdd trwy wasgu botwm.
+            Gallwch chi ychwanegu eich gwiriadau iechyd eich hun, edrych ar <a href="https://our.umbraco.com/documentation/Extending/Healthcheck/" target="_blank" rel="noopener" class="btn-link -underline">y ddogfennaeth i gael mwy o wybodaeth</a> am wiriadau iechyd arferu.</p>
+            ]]>
+        </key>
+        <key alias="tls12HealthCheckSuccess">Eich wefan gallu defnyddio y protocol gwarchodaeth TLS 1.2 wrth wneud cysylltiadau allanol i endpoints HTTPS</key>
+        <key alias="tls12HealthCheckWarn">Nid yw'ch gwefan wedi'i ffurfweddu i ganiatáu protocol diogelwch TLS 1.2 wrth wneud cysylltiadau allanol: efallai na fydd modd cyrchu rhai endpoints HTTPS gan ddefnyddio protocol llai diogel.</key>
+    </area>
+    <area alias="redirectUrls">
+        <key alias="disableUrlTracker">Analluogi olinydd URL</key>
+        <key alias="enableUrlTracker">Galluogi olinydd URL</key>
+        <key alias="culture">Diwylliant</key>
+        <key alias="originalUrl">URL gwreiddiol</key>
+        <key alias="redirectedTo">Ailgyfeirwyd I</key>
+        <key alias="redirectUrlManagement">Gweinyddu Ailgyfeirio URLs</key>
+        <key alias="panelInformation">Mae'r URLs ganlynol yn ailgyfeirio at yr eitem gynnwys yma:</key>
+        <key alias="noRedirects">Dim ailgyfeiriadau wedi'u gwneud</key>
+        <key alias="noRedirectsDescription">Pan mae tudalen wedi'i gyhoeddi yn cael ei ailenwi neu symud bydd ailgyfeiriad yn cael ei greu yn awtomatig at y dudalen newydd.</key>
+        <key alias="removeButton">Dileu</key>
+        <key alias="confirmRemove">Ydych chi'n sicr eich bod eisiau dileu'r ailgyfeiriad o '%0%' at '%1%'?</key>
+        <key alias="redirectRemoved">URL ailgyfeirio wedi'i ddileu.</key>
+        <key alias="redirectRemoveError">Gwall yn dileu'r URL.</key>
+        <key alias="redirectRemoveWarning">Bydd hyn yn dileu'r ailgyfeiriad</key>
+        <key alias="confirmDisable">Ydych chi'n sicr eich bod eisiau analluogi'r olinydd URL?</key>
+        <key alias="disabledConfirm">Mae'r olinydd URL wedi cael ei analluogi.</key>
+        <key alias="disableError">Gwall yn ystod analluogi'r olinydd URL, gall fwy o wybodaeth gael ei ddarganfod yn eich ffeil log.</key>
+        <key alias="enabledConfirm">Mae'r olinydd URL wedi cael ei alluogi.</key>
+        <key alias="enableError">Gwall yn ystod galluogi'r olinydd URL, gall fwy o wybodaeth gael ei ddarganfod yn eich ffeil log.</key>
+    </area>
+    <area alias="emptyStates">
+        <key alias="emptyDictionaryTree">Dim eitemau Geiriadur i ddewis ohonynt</key>
+    </area>
+    <area alias="textbox">
+        <key alias="characters_left">o nodau ar ôl</key>
+        <key alias="characters_exceed"><![CDATA[Uchafswm o %0% nodau cyfrannol, <strong>%1%</strong> gormod.]]></key>
+    </area>
+    <area alias="recycleBin">
+        <key alias="contentTrashed">Wedi chwalu cynnwys gyda Id: {0} yn berthnasol i gynnwys rhiant gwreiddiol gyda Id: {1}</key>
+        <key alias="mediaTrashed">Wedi chwalu cyfrwng gyda Id: {0} yn berthnasol i gyfrwng rhiant gwreiddiol gyda Id: {1}</key>
+        <key alias="itemCannotBeRestored">Ni ellir adfer yr eitem yma yn awtomatig</key>
+        <key alias="itemCannotBeRestoredHelpText">Nid oes unrhyw leoliad lle gellir adfer yr eitem hon yn awtomatig. Gallwch chi symud yr eitem â llaw gan ddefnyddio'r goeden isod.</key>
+        <key alias="wasRestored">oedd adferwyd o dan</key>
+        <key alias="noRestoreRelation">Does dim perthynas 'adfer' ar gael ar gyfer y nod yma. Defnyddiwch y ddewislen Symud i'w symud â llaw.</key>
+        <key alias="restoreUnderRecycled">Mae'r eitem yr ydych eisiau adfer yr item oddi tan ('%0%') yn y bin ailgylchu. Defnyddiwch y ddewislen Symud i'w symud â llaw.</key>
+    </area>
+    <area alias="relationType">
+        <key alias="direction">Cyfeiriad</key>
+        <key alias="parentToChild">Rhiant i plentyn</key>
+        <key alias="bidirectional">Deugyfeiriadol</key>
+        <key alias="parent">Rhiant</key>
+        <key alias="child">Plentyn</key>
+        <key alias="count">Cyfrif</key>
+        <key alias="relations">Cysylltiadau</key>
+        <key alias="created">Creu</key>
+        <key alias="comment">Sylw</key>
+        <key alias="name">Enw</key>
+        <key alias="noRelations">Dim cysylltiadau ar gyfer y math hwn o berthynas.</key>
+        <key alias="tabRelationType">Math o Berthynas</key>
+        <key alias="tabRelations">Cysylltiadau</key>
+    </area>
+    <area alias="dashboardTabs">
+        <key alias="contentIntro">Dechrau Arni</key>
+        <key alias="contentRedirectManager">Rheolaeth Ailgyfeirio URL</key>
+        <key alias="mediaFolderBrowser">Cynnwys</key>
+        <key alias="settingsWelcome">Croeso</key>
+        <key alias="settingsExamine">Rheolaeth Examine</key>
+        <key alias="settingsPublishedStatus">Statws Cyhoeddedig</key>
+        <key alias="settingsModelsBuilder">Adeiladwr Modelau</key>
+        <key alias="settingsHealthCheck">Gwiriad Iechyd</key>
+        <key alias="settingsProfiler">Proffilio</key>
+        <key alias="memberIntro">Dechrau Arni</key>
+        <key alias="formsInstall">Gosod Ffurflenni Umbraco</key>
+    </area>
+    <area alias="visuallyHiddenTexts">
+        <key alias="goBack">Mynd yn ôl</key>
+        <key alias="activeListLayout">Cynllun gweithredol:</key>
+        <key alias="jumpTo">Neidio i</key>
+        <key alias="group">grŵp</key>
+        <key alias="passed">pasio</key>
+        <key alias="warning">rhybudd</key>
+        <key alias="failed">methu</key>
+        <key alias="suggestion">awgrym</key>
+        <key alias="checkPassed">Gwiriad wedi'i basio</key>
+        <key alias="checkFailed">Gwiriad wedi'i methu</key>
+        <key alias="openBackofficeSearch">Agor chwiliad swyddfa gefn</key>
+        <key alias="openCloseBackofficeHelp">Agor/Cau cymorth swyddfa gefn</key>
+        <key alias="openCloseBackofficeProfileOptions">Agor/Cau eich opsiynau proffil</key>
+        <key alias="assignDomainDescription">Sefydli Diwylliannau ac Enwau Gwesteia am %0%</key>
+        <key alias="createDescription">Creu nod newydd o dan %0%</key>
+        <key alias="protectDescription">Sefydli Mynediad Cyhoeddus ar %0%</key>
+        <key alias="rightsDescription">Sefydli Caniataid ar %0%</key>
+        <key alias="sortDescription"> Newid y trefniad am %0%</key>
+        <key alias="createblueprintDescription">Creu templed cynnwys yn seiliedig ar %0%</key>
+        <key alias="openContextMenu">Agor dewislen cyd-destun ar gyfer</key>
+        <key alias="currentLanguage">Iaith gyfredol</key>
+        <key alias="switchLanguage">Newid iaith i</key>
+        <key alias="createNewFolder">Creu ffolder newydd</key>
+        <key alias="newPartialView">Golwg Rhannol</key>
+        <key alias="newPartialViewMacro">Macro Golwg Rhannol</key>
+        <key alias="newMember">Aelod</key>
+        <key alias="newDataType">Math o ddata</key>
+        <key alias="redirectDashboardSearchLabel">Chwilio'r dangosfwrdd ailgyfeirio</key>
+        <key alias="userGroupSearchLabel">Chwilio'r adran grŵp defnyddwyr</key>
+        <key alias="userSearchLabel">Chwilio'r adran defnyddwyr</key>
+        <key alias="createItem">Creu eitem</key>
+        <key alias="create">Creu</key>
+        <key alias="edit">Golygu</key>
+        <key alias="name">Enw</key>
+        <key alias="addNewRow">Ychwanegu rhes newydd</key>
+        <key alias="tabExpand">Gweld mwy o opsiynau</key>
+        <key alias="hasTranslation">Wedi cyfieithu</key>
+        <key alias="noTranslation">Cyfieithiad ar goll</key>
+        <key alias="dictionaryListCaption">Eitemau geiriadur</key>
+    </area>
+    <area alias="references">
+        <key alias="tabName">Cyfeiriadau</key>
+        <key alias="DataTypeNoReferences">This Data Type has no references. Nid oes gan y Math o Ddata hwn unrhyw gyferiadau.</key>
+        <key alias="labelUsedByDocumentTypes">Defnyddir mewn Mathau o Ddogfennau</key>
+        <key alias="noDocumentTypes">Ddim cyfeiriadau i Fathau o Ddogfennau.</key>
+        <key alias="labelUsedByMediaTypes">Defnyddir mewm Mathau o Gyfrwng</key>
+        <key alias="noMediaTypes">Ddim cyfeiriadau i Fathau o Gyfrwng.</key>
+        <key alias="labelUsedByMemberTypes">Defnyddir mewn Mathau o Aelod</key>
+        <key alias="noMemberTypes">Ddim cyfeiriadau i Fathau o Aelod.</key>
+        <key alias="usedByProperties">Defnyddir gan</key>
+        <key alias="labelUsedByDocuments">A ddefnyddir yn Ddogfennau</key>
+        <key alias="labelUsedByMembers">A ddefnyddir yn Aelodau</key>
+        <key alias="labelUsedByMedia">A ddefnyddir yn Cyfryngau</key>
+    </area>
+    <area alias="logViewer">
+        <key alias="deleteSavedSearch">Dileu Chwiliad Cadwedig</key>
+        <key alias="logLevels">Lefelau Log</key>
+        <key alias="savedSearches">Chwiliadau Cadwedig</key>
+        <key alias="saveSearch">Arbed Chwiliad</key>
+        <key alias="saveSearchDescription">Rhoi enw cyfeillgar am eich ymholiad chwilio</key>
+        <key alias="filterSearch">Hidlo Chwiliad</key>
+        <key alias="totalItems">Cyfanswm o Eitemau</key>
+        <key alias="timestamp">Stamp Amser</key>
+        <key alias="level">Lefel</key>
+        <key alias="machine">Peiriant</key>
+        <key alias="message">Neges</key>
+        <key alias="exception">Eithriad</key>
+        <key alias="properties">Priodweddau</key>
+        <key alias="searchWithGoogle">Chwilio efo Google</key>
+        <key alias="searchThisMessageWithGoogle">Chwiliwch y neges hon efo Google</key>
+        <key alias="searchWithBing">Chwilio efo Bing</key>
+        <key alias="searchThisMessageWithBing">Chwiliwch y neges hon efo Bing</key>
+        <key alias="searchOurUmbraco">Chwilio Our Umbraco</key>
+        <key alias="searchThisMessageOnOurUmbracoForumsAndDocs">Chwiliwch y neges hon arno Our Umbraco fforymau a dogfennau</key>
+        <key alias="searchOurUmbracoWithGoogle">Chwilio Our Umbraco efo Google</key>
+        <key alias="searchOurUmbracoForumsUsingGoogle">Chwilio Our Umbraco fforymau efo Google</key>
+        <key alias="searchUmbracoSource">Chwilio'r cod gwreiddiol Umbraco</key>
+        <key alias="searchWithinUmbracoSourceCodeOnGithub">Chwilio tu fewn y cod gwreiddiol Umbraco ar Github</key>
+        <key alias="searchUmbracoIssues">Chwilio Problemau Umbraco</key>
+        <key alias="searchUmbracoIssuesOnGithub">Chwilio Problemau Umbraco ar Github</key>
+        <key alias="deleteThisSearch">Dileu chwiliad hon</key>
+        <key alias="findLogsWithRequestId">Darganfod logiau efo ID y Cais</key>
+        <key alias="findLogsWithNamespace">Darganfod logiau efo Namespace</key>
+        <key alias="findLogsWithMachineName">Darganfod logiau efo Enw Peiriant</key>
+        <key alias="open">Agor</key>
+    </area>
+    <area alias="clipboard">
+        <key alias="labelForCopyAllEntries">Copi %0%</key>
+        <key alias="labelForArrayOfItemsFrom">%0% o %1%</key>
+        <key alias="labelForRemoveAllEntries">Dileu pob eitem</key>
+        <key alias="labelForClearClipboard">Clirio y clipfwrdd</key>
+    </area>
+    <area alias="propertyActions">
+        <key alias="tooltipForPropertyActionsMenu">Agor Gweithredoedd Priodweddau</key>
+        <key alias="tooltipForPropertyActionsMenuClose">Cau Gweithredoedd Priodweddau</key>
+    </area>
+    <area alias="nuCache">
+        <key alias="wait">Aros</key>
+        <key alias="refreshStatus">Adnewyddu statws</key>
+        <key alias="memoryCache">Cuddstôr Cof</key>
+        <key alias="memoryCacheDescription">
+            <![CDATA[
+                Mae'r botwm hwn yn caniatáu ichi ail-lwytho'r cuddstôr mewn-cof, gan ail-lwytho fo o'r stôr cronfa ddata 
+                (ond nid yw'n ailadeiladu stôr cronfa ddata hwnna). Mae hyn yn gymharol o gyflym.
+                Defnyddio fo pan ti'n feddwl nad yw'r stôr gof wedi'i hadnewyddu'n iawn, ar ôl i rai digwyddiad 
+                digwydd&mdash;a fyddai'n arwydd o broblem fach efo Umbraco.
+                (nodyn: mae hyn yn achosi ail-lwytho ar pob gweinydd mewn amgylchedd LB).
+        ]]>
+        </key>
+        <key alias="reload">Ail-lwytho</key>
+        <key alias="databaseCache">Cuddstôr Cronfa Ddata </key>
+        <key alias="databaseCacheDescription">
+            <![CDATA[
+            Mae'r botwm hwn yn caniatáu ichi ailadeiladu'r cuddstôr cronfa ddata, h.y. y cynnwys o'r tabl cmsContentNu.
+            <strong>Gall ailadeiladu fod yn ddrud.</strong>
+            Defnyddio fo pan mae ail-lwytho ddim yn ddigon, a ti'n feddwl mai'r stôr cronfa ddata heb gael ei 
+            chynhyrchu'n iawn&mdash;a fyddai'n arwydd o broblem gritigol efo Umbraco.
+        ]]>
+        </key>
+        <key alias="rebuild">Ailadeiladu</key>
+        <key alias="internals">Mewnol</key>
+        <key alias="internalsDescription">
+            <![CDATA[
+        Mae'r botwm hwn yn caniatáu ichi sbarduno casgliad cipluniau o NuCache (ar ôl rhedeg fullCLR GC)
+        Oni bai chi'n gwybod beth mae hynny'n ei olygu, mae'n debyg <em>nad</em> oes angeni chi ei defnyddio.
+        ]]>
+        </key>
+        <key alias="collect">Casglu</key>
+        <key alias="publishedCacheStatus">Statws Cuddstôr Cyhoeddedig</key>
+        <key alias="caches">Cuddstorau</key>
+    </area>
+    <area alias="profiling">
+        <key alias="performanceProfiling">Proffilio perfformiad</key>
+        <key alias="performanceProfilingDescription">
+            <![CDATA[
+                <p>
+                    Mae Umbraco yn rhedeg mewn modd dadfygio. Mae hyn yn golygu y gallwch chi ddefnyddio'r proffiliwr perfformiad adeiledig i asesu'r perfformiad wrth rendro tudalennau.
+                </p>
+                <p>
+                    OS ti eisiau actifadu'r proffiliwr am rendro tudalen penodol, bydd angen ychwanegu <b>umbDebug=true</b> i'r ymholiad wrth geisio am y tudalen
+                </p>
+                <p>
+                    Os ydych chi am i'r proffiliwr gael ei actifadu yn ddiofyn am bob rendrad tudalen, gallwch chi ddefnyddio'r togl isod.
+                    Bydd e'n gosod cwci yn eich porwr, sydd wedyn yn actifadu'r proffiliwr yn awtomatig.
+                    Mewn geiriau eraill, bydd y proffiliwr dim ond yn actif yn ddiofyn yn eich porwr <i>chi</i> - nid porwr pawb eraill.
+                </p>
+        ]]>
+        </key>
+        <key alias="activateByDefault">Actifadu y proffiliwr yn ddiofyn</key>
+        <key alias="reminder">Nodyn atgoffa cyfeillgar</key>
+        <key alias="reminderDescription">
+            <![CDATA[
+            <p>
+                Ni ddylech chi fyth adael i safle cynhyrchu redeg yn y modd dadfygio. Mae'r modd dadfygio yn gallu cael ei diffodd trwy ychwanegu'r gosodiad <b>debug="false"</b> ar yr elfen <b>&lt;grynhoi /&gt;</b> yn web.config.
+            </p>
+        ]]>
+        </key>
+        <key alias="profilerEnabledDescription">
+            <![CDATA[
+            <p>
+                Mae Umbraco ddim yn rhedeg mewn modd dadfygio ar hyn o bryd, felly nid allwch chi ddefnyddio'r proffiliwer adeiledig. Dyma sut y dylai fod ar gyfer safle cynhyrchu.
+            </p>
+            <p>
+                Mae'r modd dadfygio yn gallu cael ei throi arno gan ychwanegu'r gosodiad <b>debug="true"</b> ar yr elfen <b>&lt;grynhoi /&gt;</b> yn web.config.
+            </p>
+        ]]>
+        </key>
+    </area>
+    <area alias="settingsDashboardVideos">
+        <key alias="trainingHeadline">Oriau o fideos hyfforddiant Umbraco ddim ond un clic i fwrdd</key>
+        <key alias="trainingDescription">
+            <![CDATA[
+                <P>Eisiau meistroli Umbraco? Treuliwch gwpl o funudau yn dysgu rhai o'r arferion gorau gan wylio un o'r fideos hyn am sut i ddefnyddio Umbraco. Ac ymweld â <a href="http://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a> am fwy o fideos am Umbraco</p>
+            ]]>
+        </key>
+        <key alias="getStarted">I roi cychwyn i chi</key>
+    </area>
+    <area alias="settingsDashboard">
+        <key alias="start">Dechrau yma</key>
+        <key alias="startDescription">Mae'r adran hon yn cynnwys y blociau adeiladu am eich safle Umbraco. Dilyn y dolenni isod i ddarganfod fwy am weithio gyda'r eitemau yn yr adran Gosodiadau</key>
+        <key alias="more">Ddarganfod fwy</key>
+        <key alias="bulletPointOne">
+            <![CDATA[
+            Darllenwch fwy am weithio efo'r eitemau yn yr adran Gosodiadau <a class="btn-link -underline" href="https://our.umbraco.com/documentation/Getting-Started/Backoffice/Sections/" target="_blank" rel="noopener">fewn yr adran Dogfennaeth</a> o Our Umbraco
+        ]]>
+        </key>
+        <key alias="bulletPointTwo">
+            <![CDATA[
+            Gofynnwch gwestiwn yn y <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank" rel="noopener">Fforwm Cymunedol</a>
+        ]]>
+        </key>
+        <key alias="bulletPointThree">
+            <![CDATA[
+            Gwyliwch ein <a class="btn-link -underline" href="https://umbraco.tv" target="_blank" rel="noopener">fideos tiwtorial</a> (mae rhai am ddim, ond bydd angen tanysgrifiad am rhai eraill)
+        ]]>
+        </key>
+        <key alias="bulletPointFour">
+            <![CDATA[
+            Darganfyddwch fwy am ein <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank" rel="noopener">hoffer hybu cynhyrchiant a chefnogaeth fasnachol</a>
+        ]]>
+        </key>
+        <key alias="bulletPointFive">
+            <![CDATA[
+            Darganfyddwch fwy am gyfleoedd <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank" rel="noopener">hyfforddi ac ardystio</a>
+        ]]>
+        </key>
+    </area>
+    <area alias="startupDashboard">
+        <key alias="fallbackHeadline">Croeso i'r SRC cyfeillgar</key>
+        <key alias="fallbackDescription">Diolch am ddewis Umbraco - rydyn ni'n credu y gallai hyn fod dechreuad i rywbeth prydferth. Er y gallai deilo'n llethol ar y dechrau, rydym wedi gwneud llawer i wneud y gromlin ddysgu mor llyfn a chyflym a phosib.</key>
+    </area>
+    <area alias="formsDashboard">
+        <key alias="formsHeadline">Ffurflenni Umbraco</key>
+        <key alias="formsDescription">Creu ffurflenni gan ddefnyddio rhyngwyneb llusgo a gollwng sythweledol. O ffurflenni cyswllt syml sy'n anfon e-byst, i holiaduron mwy datblygedig sy'n integreiddio efo systemau CRM. Bydd eich cleientiaid wrth ei modd!</key>
+    </area>
+    <area alias="blockEditor">
+        <key alias="headlineCreateBlock">Creu bloc newydd</key>
+        <key alias="headlineAddSettingsElementType">Atodwch adran gosodiadau</key>
+        <key alias="headlineAddCustomView">Dewis golygfa</key>
+        <key alias="headlineAddCustomStylesheet">Dewis taflen arddull</key>
+        <key alias="headlineAddThumbnail">Dewis delwedd bawd</key>
+        <key alias="labelcreateNewElementType">Creu newydd</key>
+        <key alias="labelCustomStylesheet">Taflen arddull arferu</key>
+        <key alias="addCustomStylesheet">Ychwanegu taflen arddull</key>
+        <key alias="headlineEditorAppearance">Ymddangosiad y golygydd</key>
+        <key alias="headlineDataModels">Modelau data</key>
+        <key alias="headlineCatalogueAppearance">Ymddangosiad y catalog</key>
+        <key alias="labelBackgroundColor">Lliw cefndir</key>
+        <key alias="labelIconColor">Lliw eicon</key>
+        <key alias="labelContentElementType">Model Cynnwys</key>
+        <key alias="labelLabelTemplate">Label</key>
+        <key alias="labelCustomView">Golygfa arferu</key>
+        <key alias="labelCustomViewInfoTitle">Ddangos disgrifiad golygfa arferu</key>
+        <key alias="labelCustomViewDescription">Trosysgrifo sut mae'r bloc hwn yn ymddangos yn yr UI y swyddfa gefn. Dewis ffeil .html sy'n cynnwys eich cyflwyniad.</key>
+        <key alias="labelSettingsElementType">Model gosodiadau</key>
+        <key alias="labelEditorSize">Maint y golygydd troshaen</key>
+        <key alias="addCustomView">Ychwanegu golygfa arferu</key>
+        <key alias="addSettingsElementType">Ychwanegu gosodiadau</key>
+        <key alias="labelTemplatePlaceholder">Trosysgrifo templed label</key>
+        <key alias="confirmDeleteBlockMessage"><![CDATA[Ydych chi'n siŵr eich bod chi am ddileu'r cynnwys o <strong>%0%</strong>.]]></key>
+        <key alias="confirmDeleteBlockTypeMessage"><![CDATA[Ydych chi'n siŵr eich bod chi am ddileu'r cyfluniad bloc o <strong>%0%</strong>.]]></key>
+        <key alias="confirmDeleteBlockTypeNotice">Bydd cynnwys y bloc hwn yn dal i fod yn bresennol, ni fydd golygu'r cynnwys hwn ar gael mwyach a bydd yn cael ei ddangos fel cynnwys heb gefnogaeth.</key>
+        <key alias="blockConfigurationOverlayTitle"><![CDATA[Cyfluniad o '%0%']]></key>
+        <key alias="thumbnail">Delwedd bawd</key>
+        <key alias="addThumbnail">Ychwanegu delwedd bawd</key>
+        <key alias="tabCreateEmpty">Creu gwag</key>
+        <key alias="tabClipboard">Clipfwrdd</key>
+        <key alias="tabBlockSettings">Gosodiadau</key>
+        <key alias="headlineAdvanced">Datblygedig</key>
+        <key alias="forceHideContentEditor">Gorfodi cuddio'r golygydd cynnwys</key>
+        <key alias="blockHasChanges">Rydych chi wedi gwneud newidiadau i'r cynnwys hwn. Wyt ti'n siŵr eich bod chi am eu taflu ei fwrdd?</key>
+        <key alias="confirmCancelBlockCreationHeadline">Gwaredu cread?</key>
+        <key alias="confirmCancelBlockCreationMessage"><![CDATA[Ydych chi'n siŵr eich bod chi'n am ganslo'r cread?]]></key>
+    </area>
+    <area alias="contentTemplatesDashboard">
+        <key alias="whatHeadline">Beth yw Templedi Gynnwys</key>
+        <key alias="whatDescription">Mae Templedi Gynnwys yn gynnwys cyn-diffiniedig sydd yn gallu cael ei ddewis wrth greu nod cynnwys newydd.</key>
+        <key alias="createHeadline">Sut ydw i'n creu Templed Gynnwys?</key>
+        <key alias="createDescription">
+            <![CDATA[
+                <p>Mae yna ddwy ffordd i greu Templed Gynnwys:</p>
+                <ul>
+                    <li>Gliciwch-de ar nod cynnwys a dewis "Creu Templed Gynnwys" i greu Templed Gynnwys newydd.</li>
+                    <li>Gliciwch-de ar y goeden Templedi Gynnwys yn yr adran Gosodiadau a dewis y Math of Dogfen ti eisiau creu Templed Gynnwys am.</li>
+                </ul>
+                <p>Unwaith y rhoddir enw, gall golygyddion ddechrau defnyddio'r Templed Gynnwys fel sylfaen am ei thudalen newydd.</p>
+            ]]>
+        </key>
+        <key alias="manageHeadline">Sut ydw i'n rheoli Templedi Gynnwys</key>
+        <key alias="manageDescription">Gallwch chi olygu a dileu Templedi Gynnwys o'r goeden "Templedi Gynnwys" yn yr adran Gosodiadau. Ehangwch y Math o Ddogfen mae'r Templed Gynnwys yn seiliedig arno a chlicio fo i'w golygu neu ddileu.</key>
+    </area>
+</language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 59ce327d4d..494416d777 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -17,6 +17,7 @@
     <key alias="createGroup">Opret gruppe</key>
     <key alias="delete">Slet</key>
     <key alias="disable">Deaktivér</key>
+    <key alias="editSettings">Edit settings</key>
     <key alias="emptyRecycleBin">Tøm papirkurv</key>
     <key alias="enable">Aktivér</key>
     <key alias="exportDocumentType">Eksportér dokumenttype</key>
@@ -152,6 +153,8 @@
     <key alias="confirmActionCancel">Fortryd</key>
     <key alias="confirmActionConfirm">Bekræft</key>
 	<key alias="morePublishingOptions">Flere publiseringsmuligheder</key>
+    <key alias="submitChanges">Indsæt</key>
+    <key alias="submitChangesAndClose">Indsæt og luk</key>
   </area>
   <area alias="auditTrails">
     <key alias="atViewingFor">For</key>
@@ -242,8 +245,8 @@
     <key alias="parentNotPublished">Dette dokument er udgivet, men ikke synligt da den overliggende side '%0%' ikke er udgivet!</key>
     <key alias="parentCultureNotPublished">Dette sprog er udgivet, men ikke synligt, da den overliggende side '%0%' ikke er udgivet!</key>
     <key alias="parentNotPublishedAnomaly">Ups: dette dokument er udgivet, men er ikke i cachen (intern fejl)</key>
-    <key alias="getUrlException">Kunne ikke hente url'en</key>
-    <key alias="routeError">Dette dokument er udgivet, men dets url ville kollidere med indholdet %0%</key>
+    <key alias="getUrlException">Kunne ikke hente URL'en</key>
+    <key alias="routeError">Dette dokument er udgivet, men dets URL ville kollidere med indholdet %0%</key>
     <key alias="routeErrorCannotRoute">Dette dokument er udgivet, men dets URL kan ikke dirigeres</key>
     <key alias="publish">Udgiv</key>
     <key alias="published">Udgivet</key>
@@ -261,6 +264,8 @@
     <key alias="titleOptional">Titel (valgfri)</key>
     <key alias="altTextOptional">Alternativ tekst (valgfri)</key>
     <key alias="type">Type</key>
+    <key alias="variantsToPublish">Hvilke varianter vil du udgive?</key>
+    <key alias="variantsToSave">Vælg hvilke varianter, der skal gemmes.</key>
     <key alias="unpublish">Afpublicér</key>
     <key alias="unpublished">Afpubliceret</key>
     <key alias="notCreated">Ikke oprettet</key>
@@ -282,7 +287,7 @@
     <key alias="addTextBox">Tilføj en ny tekstboks</key>
     <key alias="removeTextBox">Fjern denne tekstboks</key>
     <key alias="contentRoot">Indholdsrod</key>
-    <key alias="includeUnpublished">Medtag udkast: udgiv også ikke-publicerede sider.</key>
+    <key alias="includeUnpublished">Inkluder ikke-udgivet indhold.</key>
     <key alias="isSensitiveValue">Denne værdi er skjult.Hvis du har brug for adgang til at se denne værdi, bedes du kontakte din web-administrator.</key>
     <key alias="isSensitiveValue_short">Denne værdi er skjult.</key>
     <key alias="languagesToPublishForFirstTime">Hvilke sprog vil du gerne udgive? Alle sprog med indhold gemmes!</key>
@@ -323,7 +328,7 @@
     <key alias="copyFailed">Kopiering af mediet fejlede</key>
     <key alias="createFolderFailed">Oprettelse af mappen under parent med id %0% fejlede</key>
     <key alias="renameFolderFailed">Omdøbning af mappen med id %0% fejlede</key>
-    <key alias="dragAndDropYourFilesIntoTheArea">Træk dine filer ind i dropzonen for, at uploade dem til mediebiblioteketet.</key>
+    <key alias="dragAndDropYourFilesIntoTheArea">Træk dine filer ind i dropzonen for, at uploade dem til mediebiblioteket.</key>
   </area>
   <area alias="member">
     <key alias="createNewMember">Opret et nyt medlem</key>
@@ -345,6 +350,16 @@
     <key alias="noMediaTypesWithNoSettingsAccess">Det valgte medie i træet tillader ikke at medier oprettes under det.</key>
     <key alias="noMediaTypesEditPermissions">Rediger tilladelser for denne medietype.</key>
     <key alias="documentTypeWithoutTemplate">Dokumenttype uden skabelon</key>
+    <key alias="documentTypeWithTemplate">Dokumenttype med skabelon</key>
+    <key alias="documentTypeWithTemplateDescription">Definerer en indholdsside, der kan oprettes af redaktørerne i indholdstræet, og som er kan tilgås direkte på en URL.</key>
+    <key alias="documentType">Dokumenttype</key>
+    <key alias="documentTypeDescription">Definerer en indholdskomponent, der kan oprettes af redaktørerne i indholdstræet og benyttes i sammenhæng med andet indhold, men som ikke kan tilgås direkte på en URL.</key>
+    <key alias="elementType">Element-type</key>
+    <key alias="elementTypeDescription">Definerer skabelonen for et sæt at egenskaber, der kan anvendes som skema i avancerede felter som f.eks. 'Block List' eller 'Nested Content'.</key>
+    <key alias="composition">Komposition</key>
+    <key alias="compositionDescription">Definerer et sæt genbrugbare egenskaber, der kan inkluderes i definitionen af andre dokumenttyper - f.eks. et sæt 'Almindelige side-data'.</key>
+    <key alias="folder">Mappe</key>
+    <key alias="folderDescription">Benyttes til at organisere dokumenttyper, element-typer og kompositioner i dokumenttype-træet.</key>
     <key alias="newFolder">Ny mappe</key>
     <key alias="newDataType">Ny datatype</key>
     <key alias="newJavascriptFile">Ny JavaScript-fil</key>
@@ -437,7 +452,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', 'postnr.', '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>
@@ -469,6 +484,7 @@
     <key alias="selectMemberType">Vælg medlemstype</key>
     <key alias="selectNode">Vælg node</key>
     <key alias="selectSections">Vælg sektioner</key>
+    <key alias="selectUser">Vælg bruger</key>
     <key alias="selectUsers">Vælg brugere</key>
     <key alias="noIconsFound">Ingen ikoner blev fundet</key>
     <key alias="noMacroParams">Der er ingen parametre for denne makro</key>
@@ -523,7 +539,7 @@
     <key alias="fields">felter</key>
     <key alias="indexCannotRead">Indexet skal bygges igen, for at kunne læses</key>
     <key alias="processIsTakingLonger">Processen tager længere tid end forventet. Kontrollér Umbraco loggen for at se om der er sket fejl under operationen</key>
-    <key alias="indexCannotRebuild">Dette index kan ikke genbygess for det ikke har nogen</key>
+    <key alias="indexCannotRebuild">Dette index kan ikke genbygges for det ikke har nogen</key>
     <key alias="iIndexPopulator">IIndexPopulator</key>
   </area>
   <area alias="placeholders">
@@ -607,6 +623,7 @@
     <key alias="tableColMergeLeft">Du skal stå til venstre for de 2 celler du ønsker at samle!</key>
     <key alias="tableSplitNotSplittable">Du kan ikke opdele en celle, som ikke allerede er delt.</key>
     <key alias="propertyHasErrors">Denne egenskab er ugyldig</key>
+    <key alias="errorPropertyEditorNotSupportedInElementTypes">Feltet %0% bruger editor %1% som ikke er supporteret for ElementTyper.</key>
   </area>
   <area alias="general">
     <key alias="about">Om</key>
@@ -643,6 +660,7 @@
     <key alias="design">Design</key>
     <key alias="dictionary">Ordbog</key>
     <key alias="dimensions">Dimensioner</key>
+    <key alias="discard">Kassér</key>
     <key alias="down">Ned</key>
     <key alias="download">Hent</key>
     <key alias="edit">Rediger</key>
@@ -735,7 +753,7 @@
     <key alias="update">Opdatér</key>
     <key alias="upgrade">Opdatér</key>
     <key alias="upload">Upload</key>
-    <key alias="url">Url</key>
+    <key alias="url">URL</key>
     <key alias="user">Bruger</key>
     <key alias="username">Brugernavn</key>
     <key alias="value">Værdi</key>
@@ -833,7 +851,7 @@
     <key alias="permissionsSettingUpPermissions">Sætter folderrettigheder op</key>
     <key alias="permissionsText">Umbraco har behov for 'write/modify' adgang til bestemte foldere, for at kunne gemme filer som billeder og PDF'er. Umbraco gemmer også midlertidige data (eksempelvis cachen) for at forbedre ydelsen på dit website.</key>
     <key alias="runwayFromScratch">Jeg har lyst til at begynde på bar bund</key>
-    <key alias="runwayFromScratchText"><![CDATA[Dit website er helt tomt for øjeblikket, så det er perfekt hvis du ønsker at begynde på bar bund og oprette dine egne dokumenttyper og skabeloner. (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">lær hvordan</a>) Du kan stadig vælge at installere Runway senere. Gå venligst til Udvikler-sektionen og vælg Pakker.]]></key>
+    <key alias="runwayFromScratchText"><![CDATA[Dit website er helt tomt for øjeblikket, så det er perfekt hvis du ønsker at begynde på bar bund og oprette dine egne dokumenttyper og skabeloner. (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">lær hvordan</a>) Du kan stadig vælge at installere Runway senere. Gå venligst til Udvikler-sektionen og vælg Pakker.]]></key>
     <key alias="runwayHeader">Du har lige opsat en ren Umbraco-platform. Hvad ønsker du nu at gøre?</key>
     <key alias="runwayInstalled">Runway er installeret</key>
     <key alias="runwayInstalledText"><![CDATA[Du har fundamentet på plads. Vælg hvilke moduler du ønsker at installere ovenpå det.<br/>Dette er vores liste over anbefalede moduler. Kryds dem af du ønsker at installere eller se den <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">fulde liste af moduler</a>  ]]></key>
@@ -879,7 +897,7 @@
     <key alias="instruction">Log ind nedenfor</key>
     <key alias="signInWith">Log ind med</key>
     <key alias="timeout">Din session er udløbet</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">Glemt adgangskode?</key>
     <key alias="forgottenPasswordInstruction">En e-mail vil blive sendt til den angivne adresse med et link til at nulstille din adgangskode</key>
     <key alias="requestPasswordResetConfirmation">En e-mail med instruktioner for nulstilling af adgangskoden vil blive sendt til den angivne adresse, hvis det matcher vores optegnelser</key>
@@ -1048,10 +1066,6 @@ Mange hilsner fra Umbraco robotten
     <key alias="contentPublishedFailedInvalid"><![CDATA[
     %0% kunne ikke publiceres da følgende egenskaber :  %1%  ikke overholdte valderingsreglerne.
     ]]></key>
-    <key alias="contentPublishedFailedByEvent"><![CDATA[
-        %0% kunne ikke publiceres, et 3. part tilføjelsesprogram annullerede handlingen.
-    ]]>
-    </key>
     <key alias="contentPublishedFailedByEvent">%0% kunne ikke udgives, fordi et 3. parts modul annullerede handlingen</key>
     <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% kan ikke udgives, fordi det mangler et navn.]]></key>
     <key alias="includeUnpublished">Medtag ikke-udgivede undersider</key>
@@ -1100,7 +1114,6 @@ Mange hilsner fra Umbraco robotten
     <key alias="currentVersion">Nuværende version</key>
     <key alias="diffHelp"><![CDATA[Her vises forskellene mellem den nuværende version og den valgte version<br /><del>Rød</del> tekst vil ikke blive vist i den valgte version. <ins>Grøn betyder tilføjet</ins>]]></key>
     <key alias="documentRolledBack">Dokument tilbagerullet</key>
-    <key alias="headline">Vælg en version at sammenligne med den nuværende version</key>
     <key alias="htmlHelp">Her vises den valgte version som html. Hvis du ønsker at se forskellen mellem de 2 versioner på samme tid, brug 'diff'-oversigten</key>
     <key alias="rollbackTo">Tilbagerulning til</key>
     <key alias="selectVersion">Vælg version</key>
@@ -1350,6 +1363,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="rowConfigurationsDetail">Rækker er foruddefinerede celler, der arrangeres vandret</key>
     <key alias="addRowConfiguration">Tilføj rækkekonfiguration</key>
     <key alias="addRowConfigurationDetail">Juster rækken ved at indstille cellebredder og tilføje yderligere celler</key>
+    <key alias="noConfiguration">Ingen yderligere konfiguration tilgængelig</key>
     <key alias="columns">Kolonner</key>
     <key alias="columnsDetails">Det totale antal kolonner i dit grid</key>
     <key alias="settings">Indstillinger</key>
@@ -1431,6 +1445,8 @@ Mange hilsner fra Umbraco robotten
     <key alias="elementDescription">En Element-type er tiltænkt brug i f.eks. Nested Content, ikke i indholdstræet.</key>
     <key alias="elementDoesNotSupport">Dette benyttes ikke for en Element-type</key>
     <key alias="propertyHasChanges">Du har lavet ændringer til denne egenskab. Er du sikker på at du vil kassere dem?</key>
+    <key alias="displaySettingsHeadline">Visning</key>
+    <key alias="displaySettingsLabelOnTop">Label hen over (fuld bredde)</key>
   </area>
   <area alias="languages">
     <key alias="addLanguage">Tilføj sprog</key>
@@ -1490,7 +1506,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="standardFields">Standard felter</key>
     <key alias="uppercase">Store bogstaver</key>
     <key alias="urlEncode">URL encode</key>
-    <key alias="urlEncodeHelp">Hvis indholdet af felterne skal sendes til en url, skal denne slåes til så specialtegn formateres</key>
+    <key alias="urlEncodeHelp">Hvis indholdet af felterne skal sendes til en URL, skal denne slåes til så specialtegn formateres</key>
     <key alias="usedIfAllEmpty">Denne tekst bruges hvis ovenstående felter er tomme</key>
     <key alias="usedIfEmpty">Dette felt vil blive brugt hvis ovenstående felt er tomt</key>
     <key alias="withTime">Ja, med klokkeslæt. Dato/tid separator: </key>
@@ -1667,19 +1683,20 @@ Mange hilsner fra Umbraco robotten
     <key alias="validation">Validering</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="validateAsUrl">Valider som URL</key>
     <key alias="enterCustomValidation">...eller indtast din egen validering</key>
     <key alias="fieldIsMandatory">Feltet er påkrævet</key>
     <key alias="validationRegExp">Indtast et regulært udtryk</key>
     <key alias="minCount">Du skal tilføje mindst</key>
     <key alias="maxCount">Du kan kun have</key>
+    <key alias="addUpTo">Tilføj op til </key>
     <key alias="items">elementer</key>
     <key alias="itemsSelected">elementer valgt</key>
     <key alias="invalidDate">Ugyldig dato</key>
     <key alias="invalidNumber">Ikke et tal</key>
     <key alias="invalidEmail">Ugyldig e-mail</key>
-    <key alias="entriesShort"><![CDATA[Minimum %0% entries, needs <strong>%1%</strong> more.]]></key>
-    <key alias="entriesExceed"><![CDATA[Maximum %0% entries, <strong>%1%</strong> too many.]]></key>
+    <key alias="entriesShort"><![CDATA[Minimum %0% element(er), tilføj <strong>%1%</strong> mere.]]></key>
+    <key alias="entriesExceed"><![CDATA[Maksimum %0% element(er), <strong>%1%</strong> for mange.]]></key>
   </area>
   <area alias="redirectUrls">
     <key alias="disableUrlTracker">Slå URL tracker fra</key>
@@ -1779,8 +1796,10 @@ Mange hilsner fra Umbraco robotten
     <key alias="usedByProperties">Brugt af</key>
   </area>
   <area alias="logViewer">
+    <key alias="deleteSavedSearch">Slet gemte søgning</key>
     <key alias="logLevels">Log type</key>
-    <key alias="savedSearches">Gemte søgninger</key>
+    <key alias="saveSearch">Gem søgning</key>
+    <key alias="saveSearchDescription">Indtast et navn for din søgebetingelse</key>
     <key alias="totalItems">Samlet resultat</key>
     <key alias="timestamp">Dato</key>
     <key alias="level">Type</key>
@@ -1810,8 +1829,64 @@ Mange hilsner fra Umbraco robotten
     <key alias="labelForCopyAllEntries">Kopier %0%</key>
     <key alias="labelForArrayOfItemsFrom">%0% fra %1%</key>
     <key alias="labelForRemoveAllEntries">Fjern alle elementer</key>
+    <key alias="labelForClearClipboard">Ryd udklipsholder</key>
   </area>
   <area alias="propertyActions">
     <key alias="tooltipForPropertyActionsMenu">Åben egenskabshandlinger</key>
   </area>
+  <area alias="blockEditor">
+    <key alias="headlineCreateBlock">Vælg elementtype</key>
+    <key alias="headlineAddSettingsElementType">Tilføj en indstillings elementtype</key>
+    <key alias="headlineAddCustomView">Tilføj visning</key>
+    <key alias="headlineAddCustomStylesheet">Tilføj stylesheet</key>
+    <key alias="headlineAddThumbnail">Vælg billede</key>
+    <key alias="labelcreateNewElementType">Opret ny elementtype</key>
+    <key alias="labelCustomStylesheet">Overskriv stylesheet</key>
+    <key alias="addCustomStylesheet">Tilføj stylesheet</key>
+    <key alias="headlineEditorAppearance">Redigerings udseende</key>
+    <key alias="headlineDataModels">Data modeller</key>
+    <key alias="headlineCatalogueAppearance">katalog udseende</key>
+    <key alias="labelBackgroundColor">Baggrunds farve</key>
+    <key alias="labelIconColor">Ikon farve</key>
+    <key alias="labelContentElementType">Indholds model</key>
+    <key alias="labelLabelTemplate">Label</key>
+    <key alias="labelCustomView">Speciel visning</key>
+    <key alias="labelCustomViewInfoTitle">Vis speciel visning beskrivelsen</key>
+    <key alias="labelCustomViewDescription">Overskrift hvordan denne block præsenteres i BackOffice interfacet. Vælg en .html fil der indeholder din præsensation.</key>
+    <key alias="labelSettingsElementType">Indstillings model</key>
+    <key alias="labelEditorSize">Rederings lagets størrelse</key>
+    <key alias="addCustomView">Tilføj speciel visning</key>
+    <key alias="addSettingsElementType">Tilføj instillinger</key>
+    <key alias="labelTemplatePlaceholder">Overskriv label form</key>
+    <key alias="confirmDeleteBlockMessage"><![CDATA[Er du sikker på at du vil slette indholdet <strong>%0%</strong>?]]></key>
+    <key alias="confirmDeleteBlockTypeMessage"><![CDATA[Er du sikker på at du vil slette konfigurationen <strong>%0%</strong>?]]></key>
+    <key alias="confirmDeleteBlockTypeNotice">Indholdet vil stadigt eksistere, men redigering af dette indhold vil ikke være muligt. Indholdet vil blive vist som ikke understøttet indhold.</key>
+    <key alias="blockConfigurationOverlayTitle"><![CDATA[Konfiguration af '%0%']]></key>
+    <key alias="thumbnail">Billede</key>
+    <key alias="addThumbnail">Tilføj billede</key>
+    <key alias="tabCreateEmpty">Opret ny</key>
+    <key alias="tabClipboard">Udklipsholder</key>
+    <key alias="tabBlockSettings">Indstillinger</key>
+    <key alias="headlineAdvanced">Avanceret</key>
+    <key alias="forceHideContentEditor">Skjuld indholds editoren</key>
+    <key alias="blockHasChanges">Du har lavet ændringer til dette indhold. Er du sikker på at du vil kassere dem?</key>
+    <key alias="confirmCancelBlockCreationHeadline">Annuller oprettelse?</key>
+    <key alias="confirmCancelBlockCreationMessage"><![CDATA[Er du sikker på at du vil annullere oprettelsen.]]></key>
+    <key alias="elementTypeDoesNotExistHeadline">Error!</key>
+    <key alias="elementTypeDoesNotExistDescription">The ElementType of this block does not exist anymore</key>
+  </area>
+  <area alias="preview">
+    <key alias="endLabel">Afslut</key>
+    <key alias="endTitle">Afslut forhåndsvisning</key>
+    <key alias="openWebsiteLabel">Vis i nyt vindue</key>
+    <key alias="openWebsiteTitle">Åben forhåndsvisning i nyt vindue</key>
+    <key alias="returnToPreviewHeadline">Forhåndsvisning af indholdet?</key>
+    <key alias="returnToPreviewDescription">Du har afslutet forhåndsvisning, vil du starte forhåndsvisning igen for at se seneste gemte version af indholdet?</key>
+    <key alias="returnToPreviewButton">Start forhåndsvisning</key>
+    <key alias="returnToPreviewDeclineButton">Se udgivet indhold</key>
+    <key alias="viewPublishedContentHeadline">Se udgivet indhold?</key>
+    <key alias="viewPublishedContentDescription">Du er i forhåndsvisning, vil du afslutte for at se den udgivet version?</key>
+    <key alias="viewPublishedContentAcceptButton">Se udgivet version</key>
+    <key alias="viewPublishedContentDeclineButton">Forbliv i forhåndsvisning</key>
+  </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
index 529074f24d..4f1c4c977f 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
@@ -4,10 +4,6 @@
     <name>The Umbraco community</name>
     <link>https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files</link>
   </creator>
-  <!--???-->
-  <!-- = unklar-->
-  <!--!!!-->
-  <!-- = ToDo-->
   <area alias="actions">
     <key alias="assignDomain">Kulturen und Hostnamen</key>
     <key alias="auditTrail">Protokoll</key>
@@ -450,7 +446,7 @@
     <key alias="recycleBinIsEmpty">Der Papierkorb ist leer</key>
     <key alias="recycleBinWarning">Wenn Sie den Papierkorb leeren, werden die enthaltenen Elemente endgültig gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden.</key>
     <key alias="regexSearchError">Der Webservice von &lt;a target='_blank' href='http://regexlib.com'&gt;regexlib.com&lt;/a&gt; ist zur Zeit nicht erreichbar. Bitte versuchen Sie es später erneut.</key>
-    <key alias="regexSearchHelp">Finden Sie einen vorbereiteten regulären Ausdruck zur Validierung der Werte, die in dieses Feld eingegeben werden - zum Beispiel 'email, 'plz', 'url' oder ähnlich.</key>
+    <key alias="regexSearchHelp">Finden Sie einen vorbereiteten regulären Ausdruck zur Validierung der Werte, die in dieses Feld eingegeben werden - zum Beispiel 'email, 'plz', 'URL' oder ähnlich.</key>
     <key alias="removeMacro">Macro entfernen</key>
     <key alias="requiredField">Pflichtfeld</key>
     <key alias="sitereindexed">Die Website-Index wurd neu erstellt</key>
@@ -713,7 +709,6 @@
     <key alias="off">Aus</key>
     <key alias="ok">Ok</key>
     <key alias="open">Öffnen</key>
-    <key alias="options">Optionen</key>
     <key alias="on">An</key>
     <!--???-->
     <key alias="or">oder</key>
@@ -825,9 +820,11 @@
     </key>
     <key alias="databaseInstallDone">Die Datenbank wurde für Umbraco %0% konfiguriert. Klicken Sie auf &lt;strong&gt;weiter&lt;/strong&gt;, um fortzufahren.</key>
     <key alias="databaseNotFound">
-      &lt;p&gt;Die angegebene Datenbank ist leider nicht erreichbar. Bitte prüfen Sie die Verbindungszeichenfolge ("Connection String") in der "web.config"-Datei.&lt;/p&gt;
-      &lt;p&gt;Um fortzufahren, passen Sie bitte die "web.config"-Datei mit einem beliebigen Text-Editor an. Scrollen Sie dazu nach unten, fügen Sie die Verbindungszeichenfolge für die zuverbindende Datenbank als Eintrag "UmbracoDbDSN" hinzu und speichern Sie die Datei.&lt;/p&gt;
-      &lt;p&gt;Klicken Sie nach erfolgter Anpassung auf &lt;strong&gt;Wiederholen&lt;/strong&gt;.&lt;br /&gt;Wenn Sie weitere technische Informationen benötigen, besuchen Sie &lt;a href="https://our.umbraco.com/wiki" target="_blank"&gt;The Umbraco documentation wiki&lt;/a&gt;.&lt;/p&gt;
+        <![CDATA[
+      <p>Die angegebene Datenbank ist leider nicht erreichbar. Bitte prüfen Sie die Verbindungszeichenfolge ("Connection String") in der "web.config"-Datei.</p>
+      <p>Um fortzufahren, passen Sie bitte die "web.config"-Datei mit einem beliebigen Text-Editor an. Scrollen Sie dazu nach unten, fügen Sie die Verbindungszeichenfolge für die zuverbindende Datenbank als Eintrag "UmbracoDbDSN" hinzu und speichern Sie die Datei.</p>
+      <p>Klicken Sie nach erfolgter Anpassung auf <strong>Wiederholen</strong>.<br />Wenn Sie weitere technische Informationen benötigen, besuchen Sie <a href="https://our.umbraco.com/wiki" target="_blank" rel="noopener">The Umbraco documentation wik</a>.</p>
+    ]]>
     </key>
     <key alias="databaseText">Um diesen Schritt abzuschließen, müssen Sie die notwendigen Informationen zur Datenbankverbindung angeben.&lt;br /&gt;Bitte kontaktieren Sie Ihren Provider bzw. Server-Administrator für weitere Informationen.</key>
     <key alias="databaseUpgrade">
@@ -869,7 +866,7 @@
     <key alias="runwayFromScratch">Ich möchte mit einem leeren System ohne Inhalte und Vorgaben starten</key>
     <key alias="runwayFromScratchText">
       Die Website ist zur Zeit komplett leer und ohne Inhalte und Vorgaben zu Erstellung eigener Dokumenttypen und Vorlagen bereit.
-      (&lt;a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types"&gt;So geht's&lt;/a&gt;)
+      (&lt;a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types"&gt;So geht's&lt;/a&gt;)
       Sie können "Runway" auch jederzeit später installieren. Verwenden Sie hierzu den Punkt "Pakete" im Entwickler-Bereich.
     </key>
     <key alias="runwayHeader">Die Einrichtung von Umbraco ist abgeschlossen und das Content-Management-System steht bereit. Wie soll es weitergehen?</key>
@@ -930,7 +927,7 @@
     <key alias="instruction">Hier anmelden:</key>
     <key alias="signInWith">Anmelden mit</key>
     <key alias="timeout">Sitzung abgelaufen</key>
-    <key alias="bottomText">&lt;p style="text-align:right;"&gt;&amp;copy; 2001 - %0% &lt;br /&gt;&lt;a href="http://umbraco.com" style="text-decoration: none" target="_blank"&gt;umbraco.org&lt;/a&gt;&lt;/p&gt; </key>
+    <key alias="bottomText">&lt;p style="text-align:right;"&gt;&amp;copy; 2001 - %0% &lt;br /&gt;&lt;a href="https://umbraco.com" style="text-decoration: none" target="_blank"&gt;umbraco.org&lt;/a&gt;&lt;/p&gt; </key>
     <key alias="forgottenPassword">Kennwort vergessen?</key>
     <key alias="forgottenPasswordInstruction">Es wird eine E-Mail mit einem Kennwort-Zurücksetzen-Link an die angegebene Adresse geschickt.</key>
     <key alias="requestPasswordResetConfirmation">Es wird eine E-Mail mit Anweisungen zum Zurücksetzen des Kennwortes an die angegebene Adresse geschickt sofern diese im Datenbestand gefunden wurde.</key>
@@ -1496,9 +1493,6 @@
     <key alias="addRule">Neuer Stil</key>
     <key alias="editRule">Stil bearbeiten</key>
     <key alias="editorRules">Rich text editor Stile</key>
-    <key alias="editorRulesHelp">
-      Definiere die Stile, die im 'Rich-Text-Editor' verfügbar sein sollen.
-    </key>
     <key alias="editorRulesHelp">Definiere die Styles, die im Rich-Text-Editor dieses Stylesheets verfügbar sein sollen.</key>
     <key alias="editstylesheet">Stylesheet bearbeiten</key>
     <key alias="editstylesheetproperty">Stylesheet-Regel bearbeiten</key>
@@ -2182,7 +2176,7 @@
     <key alias="culture">Kultur</key>
     <key alias="originalUrl">Original URL</key>
     <key alias="redirectedTo">Weiterleiten zu</key>
-    <key alias="redirectUrlManagement">Url-Weiterleitungen verwalten</key>
+    <key alias="redirectUrlManagement">URL-Weiterleitungen verwalten</key>
     <key alias="panelInformation">Die folgenden URLs leiten auf diesen Inhalt:</key>
     <key alias="noRedirects">Es wurden keine Weiterleitungen angelegt</key>
     <key alias="noRedirectsDescription">
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 0150a5542d..c6a5ce4821 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1,2445 +1,2561 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language alias="en" intName="English (UK)" localName="English (UK)" lcid="" culture="en-GB">
-  <creator>
-    <name>The Umbraco community</name>
-    <link>https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files</link>
-  </creator>
-  <area alias="actions">
-    <key alias="assignDomain">Culture and Hostnames</key>
-    <key alias="auditTrail">Audit Trail</key>
-    <key alias="browse">Browse Node</key>
-    <key alias="changeDocType">Change Document Type</key>
-    <key alias="copy">Copy</key>
-    <key alias="create">Create</key>
-    <key alias="export">Export</key>
-    <key alias="createPackage">Create Package</key>
-    <key alias="createGroup">Create group</key>
-    <key alias="delete">Delete</key>
-    <key alias="disable">Disable</key>
-    <key alias="emptyRecycleBin">Empty recycle bin</key>
-    <key alias="enable">Enable</key>
-    <key alias="exportDocumentType">Export Document Type</key>
-    <key alias="importDocumentType">Import Document Type</key>
-    <key alias="importPackage">Import Package</key>
-    <key alias="liveEdit">Edit in Canvas</key>
-    <key alias="logout">Exit</key>
-    <key alias="move">Move</key>
-    <key alias="notify">Notifications</key>
-    <key alias="protect">Public access</key>
-    <key alias="publish">Publish</key>
-    <key alias="unpublish">Unpublish</key>
-    <key alias="refreshNode">Reload</key>
-    <key alias="republish">Republish entire site</key>
-    <key alias="rename" version="7.3.0">Rename</key>
-    <key alias="restore" version="7.3.0">Restore</key>
-    <key alias="SetPermissionsForThePage">Set permissions for the page %0%</key>
-    <key alias="chooseWhereToCopy">Choose where to copy</key>
-    <key alias="chooseWhereToMove">Choose where to move</key>
-    <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
-    <key alias="infiniteEditorChooseWhereToCopy">Choose where to copy the selected item(s)</key>
-    <key alias="infiniteEditorChooseWhereToMove">Choose where to move the selected item(s)</key>
-    <key alias="wasMovedTo">was moved to</key>
-    <key alias="wasCopiedTo">was copied to</key>
-    <key alias="wasDeleted">was deleted</key>
-    <key alias="rights">Permissions</key>
-    <key alias="rollback">Rollback</key>
-    <key alias="sendtopublish">Send To Publish</key>
-    <key alias="sendToTranslate">Send To Translation</key>
-    <key alias="setGroup">Set group</key>
-    <key alias="sort">Sort</key>
-    <key alias="translate">Translate</key>
-    <key alias="update">Update</key>
-    <key alias="setPermissions">Set permissions</key>
-    <key alias="unlock">Unlock</key>
-    <key alias="createblueprint">Create Content Template</key>
-    <key alias="resendInvite">Resend Invitation</key>
-  </area>
-  <area alias="actionCategories">
-    <key alias="content">Content</key>
-    <key alias="administration">Administration</key>
-    <key alias="structure">Structure</key>
-    <key alias="other">Other</key>
-  </area>
-  <area alias="actionDescriptions">
-    <key alias="assignDomain">Allow access to assign culture and hostnames</key>
-    <key alias="auditTrail">Allow access to view a node's history log</key>
-    <key alias="browse">Allow access to view a node</key>
-    <key alias="changeDocType">Allow access to change document type for a node</key>
-    <key alias="copy">Allow access to copy a node</key>
-    <key alias="create">Allow access to create nodes</key>
-    <key alias="delete">Allow access to delete nodes</key>
-    <key alias="move">Allow access to move a node</key>
-    <key alias="protect">Allow access to set and change public access for a node</key>
-    <key alias="publish">Allow access to publish a node</key>
-    <key alias="unpublish">Allow access to unpublish a node</key>
-    <key alias="rights">Allow access to change permissions for a node</key>
-    <key alias="rollback">Allow access to roll back a node to a previous state</key>
-    <key alias="sendtopublish">Allow access to send a node for approval before publishing</key>
-    <key alias="sendToTranslate">Allow access to send a node for translation</key>
-    <key alias="sort">Allow access to change the sort order for nodes</key>
-    <key alias="translate">Allow access to translate a node</key>
-    <key alias="update">Allow access to save a node</key>
-    <key alias="createblueprint">Allow access to create a Content Template</key>
-  </area>
-  <area alias="apps">
-    <key alias="umbContent">Content</key>
-    <key alias="umbInfo">Info</key>
-  </area>
-  <area alias="assignDomain">
-    <key alias="permissionDenied">Permission denied.</key>
-    <key alias="addNew">Add new Domain</key>
-    <key alias="remove">remove</key>
-    <key alias="invalidNode">Invalid node.</key>
-    <key alias="invalidDomain">One or more domains have an invalid format.</key>
-    <key alias="duplicateDomain">Domain has already been assigned.</key>
-    <key alias="language">Language</key>
-    <key alias="domain">Domain</key>
-    <key alias="domainCreated">New domain '%0%' has been created</key>
-    <key alias="domainDeleted">Domain '%0%' is deleted</key>
-    <key alias="domainExists">Domain '%0%' has already been assigned</key>
-    <key alias="domainUpdated">Domain '%0%' has been updated</key>
-    <key alias="orEdit">Edit Current Domains</key>
-    <key alias="domainHelpWithVariants">
-    	<![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080", or "https://www.example.com/".
-     Furthermore also one-level paths in domains are supported, eg. "example.com/en" or "/en".]]></key>
-    <key alias="inherit">Inherit</key>
-    <key alias="setLanguage">Culture</key>
-        <key alias="setLanguageHelp">
-            <![CDATA[Set the culture for nodes below the current node,<br /> or inherit culture from parent nodes. Will also apply<br />
-      to the current node, unless a domain below applies too.]]>
-        </key>
-    <key alias="setDomains">Domains</key>
-  </area>
-  <area alias="buttons">
-    <key alias="clearSelection">Clear selection</key>
-    <key alias="select">Select</key>
-    <key alias="somethingElse">Do something else</key>
-    <key alias="bold">Bold</key>
-    <key alias="deindent">Cancel Paragraph Indent</key>
-    <key alias="formFieldInsert">Insert form field</key>
-    <key alias="graphicHeadline">Insert graphic headline</key>
-    <key alias="htmlEdit">Edit Html</key>
-    <key alias="indent">Indent Paragraph</key>
-    <key alias="italic">Italic</key>
-    <key alias="justifyCenter">Center</key>
-    <key alias="justifyLeft">Justify Left</key>
-    <key alias="justifyRight">Justify Right</key>
-    <key alias="linkInsert">Insert Link</key>
-    <key alias="linkLocal">Insert local link (anchor)</key>
-    <key alias="listBullet">Bullet List</key>
-    <key alias="listNumeric">Numeric List</key>
-    <key alias="macroInsert">Insert macro</key>
-    <key alias="pictureInsert">Insert picture</key>
-    <key alias="publishAndClose">Publish and close</key>
-    <key alias="publishDescendants">Publish with descendants</key>
-    <key alias="relations">Edit relations</key>
-    <key alias="returnToList">Return to list</key>
-    <key alias="save">Save</key>
-    <key alias="saveAndClose">Save and close</key>
-    <key alias="saveAndPublish">Save and publish</key>
-    <key alias="saveAndSchedule">Save and schedule</key>
-    <key alias="saveToPublish">Save and send for approval</key>
-    <key alias="saveListView">Save list view</key>
-    <key alias="schedulePublish">Schedule</key>
-    <key alias="showPage">Preview</key>
-    <key alias="saveAndPreview">Save and preview</key>
-    <key alias="showPageDisabled">Preview is disabled because there's no template assigned</key>
-    <key alias="styleChoose">Choose style</key>
-    <key alias="styleShow">Show styles</key>
-    <key alias="tableInsert">Insert table</key>
-    <key alias="saveAndGenerateModels">Save and generate models</key>
-    <key alias="undo">Undo</key>
-    <key alias="redo">Redo</key>
-    <key alias="deleteTag">Delete tag</key>
-    <key alias="confirmActionCancel">Cancel</key>
-    <key alias="confirmActionConfirm">Confirm</key>
-	<key alias="morePublishingOptions">More publishing options</key>
-  </area>
-  <area alias="auditTrails">
-    <key alias="atViewingFor">Viewing for</key>
-    <key alias="delete">Content deleted</key>
-    <key alias="unpublish">Content unpublished</key>
-    <key alias="publish">Content saved and Published</key>
-    <key alias="publishvariant">Content saved and published for languages: %0% </key>
-    <key alias="save">Content saved</key>
-    <key alias="savevariant">Content saved for languages: %0%</key>
-    <key alias="move">Content moved</key>
-    <key alias="copy">Content copied</key>
-    <key alias="rollback">Content rolled back</key>
-    <key alias="sendtopublish">Content sent for publishing</key>
-    <key alias="sendtopublishvariant">Content sent for publishing for languages: %0%</key>
-    <key alias="sort">Sort child items performed by user</key>
-    <key alias="custom">%0%</key>
-    <key alias="smallCopy">Copy</key>
-    <key alias="smallPublish">Publish</key>
-    <key alias="smallPublishVariant">Publish</key>
-    <key alias="smallMove">Move</key>
-    <key alias="smallSave">Save</key>
-    <key alias="smallSaveVariant">Save</key>
-    <key alias="smallDelete">Delete</key>
-    <key alias="smallUnpublish">Unpublish</key>
-    <key alias="smallRollBack">Rollback</key>
-    <key alias="smallSendToPublish">Send To Publish</key>
-    <key alias="smallSendToPublishVariant">Send To Publish</key>
-    <key alias="smallSort">Sort</key>
-    <key alias="smallCustom">Custom</key>
-    <key alias="historyIncludingVariants">History (all variants)</key>
-  </area>
-  <area alias="changeDocType">
-    <key alias="changeDocTypeInstruction">To change the document type for the selected content, first select from the list of valid types for this location.</key>
-    <key alias="changeDocTypeInstruction2">Then confirm and/or amend the mapping of properties from the current type to the new, and click Save.</key>
-    <key alias="contentRepublished">The content has been re-published.</key>
-    <key alias="currentProperty">Current Property</key>
-    <key alias="currentType">Current type</key>
-    <key alias="docTypeCannotBeChanged">The document type cannot be changed, as there are no alternatives valid for this location.  An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it.</key>
-    <key alias="docTypeChanged">Document Type Changed</key>
-    <key alias="mapProperties">Map Properties</key>
-    <key alias="mapToProperty">Map to Property</key>
-    <key alias="newTemplate">New Template</key>
-    <key alias="newType">New Type</key>
-    <key alias="none">none</key>
-    <key alias="selectedContent">Content</key>
-    <key alias="selectNewDocType">Select New Document Type</key>
-    <key alias="successMessage">The document type of the selected content has been successfully changed to [new type] and the following properties mapped:</key>
-    <key alias="to">to</key>
-    <key alias="validationErrorPropertyWithMoreThanOneMapping">Could not complete property mapping as one or more properties have more than one mapping defined.</key>
-    <key alias="validDocTypesNote">Only alternate types valid for the current location are displayed.</key>
-  </area>
-  <area alias="codefile">
-    <key alias="createFolderFailedById">Failed to create a folder under parent with ID %0%</key>
-    <key alias="createFolderFailedByName">Failed to create a folder under parent with name %0%</key>
-    <key alias="createFolderIllegalChars">The folder name cannot contain illegal characters.</key>
-    <key alias="deleteItemFailed">Failed to delete item: %0%</key>
-  </area>
-  <area alias="content">
-    <key alias="isPublished" version="7.2">Is Published</key>
-    <key alias="about">About this page</key>
-    <key alias="alias">Alias</key>
-    <key alias="alternativeTextHelp">(how would you describe the picture over the phone)</key>
-    <key alias="alternativeUrls">Alternative Links</key>
-    <key alias="clickToEdit">Click to edit this item</key>
-    <key alias="createBy">Created by</key>
-    <key alias="createByDesc" version="7.0">Original author</key>
-    <key alias="updatedBy" version="7.0">Updated by</key>
-    <key alias="createDate">Created</key>
-    <key alias="createDateDesc" version="7.0">Date/time this document was created</key>
-    <key alias="documentType">Document Type</key>
-    <key alias="editing">Editing</key>
-    <key alias="expireDate">Remove at</key>
-    <key alias="itemChanged">This item has been changed after publication</key>
-    <key alias="itemNotPublished">This item is not published</key>
-    <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>
-    <key alias="memberrole">Role</key>
-    <key alias="membertype">Member Type</key>
-    <key alias="noChanges">No changes have been made</key>
-    <key alias="noDate">No date chosen</key>
-    <key alias="nodeName">Page title</key>
-    <key alias="noMediaLink">This media item has no link</key>
-    <key alias="otherElements">Properties</key>
-    <key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
-    <key alias="parentCultureNotPublished">This culture is published but is not visible because it is unpublished on parent '%0%'</key>
-    <key alias="parentNotPublishedAnomaly">This document is published but is not in the cache</key>
-    <key alias="getUrlException">Could not get the url</key>
-    <key alias="routeError">This document is published but its url would collide with content %0%</key>
-    <key alias="routeErrorCannotRoute">This document is published but its url cannot be routed</key>
-    <key alias="publish">Publish</key>
-    <key alias="published">Published</key>
-    <key alias="publishedPendingChanges">Published (pending changes)</key>
-    <key alias="publishStatus">Publication Status</key>
-    <key alias="publishDescendantsHelp"><![CDATA[Publish <strong>%0%</strong> and all content items underneath and thereby making their content publicly available.]]></key>
-    <key alias="publishDescendantsWithVariantsHelp"><![CDATA[Publish variants and variants of same type underneath and thereby making their content publicly available.]]></key>
-    <key alias="releaseDate">Publish at</key>
-    <key alias="unpublishDate">Unpublish at</key>
-    <key alias="removeDate">Clear Date</key>
-    <key alias="setDate">Set date</key>
-    <key alias="sortDone">Sortorder is updated</key>
-    <key alias="sortHelp">To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the "shift" or "control" key while selecting</key>
-    <key alias="statistics">Statistics</key>
-    <key alias="titleOptional">Title (optional)</key>
-    <key alias="altTextOptional">Alternative text (optional)</key>
-    <key alias="type">Type</key>
-    <key alias="unpublish">Unpublish</key>
-    <key alias="unpublished">Unpublished</key>
-    <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="uploadClearImageContext">Click here to remove the image from the media item</key>
-    <key alias="uploadClearFileContext">Click here to remove the file from the media item</key>
-    <key alias="urls">Link to document</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>
-    <key alias="target" version="7.0">Target</key>
-    <key alias="scheduledPublishServerTime">This translates to the following time on the server:</key>
-    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">What does this mean?</a>]]></key>
-    <key alias="nestedContentDeleteItem">Are you sure you want to delete this item?</key>
-    <key alias="nestedContentEditorNotSupported">Property %0% uses editor %1% which is not supported by Nested Content.</key>
-    <key alias="nestedContentDeleteAllItems">Are you sure you want to delete all items?</key>
-    <key alias="nestedContentNoContentTypes">No content types are configured for this property.</key>
-    <key alias="nestedContentAddElementType">Add element type</key>
-    <key alias="nestedContentSelectElementTypeModalTitle">Select element type</key>
-    <key alias="nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the element type will be used.</key>
-    <key alias="nestedContentTemplateHelpTextPart1">Enter an angular expression to evaluate against each item for its name. Use</key>
-    <key alias="nestedContentTemplateHelpTextPart2">to display the item index</key>
-    <key alias="addTextBox">Add another text box</key>
-    <key alias="removeTextBox">Remove this text box</key>
-    <key alias="contentRoot">Content root</key>
-    <key alias="includeUnpublished">Include drafts and unpublished content items.</key>
-    <key alias="isSensitiveValue">This value is hidden. If you need access to view this value please contact your website administrator.</key>
-    <key alias="isSensitiveValue_short">This value is hidden.</key>
-    <key alias="languagesToPublishForFirstTime">What languages would you like to publish? All languages with content are saved!</key>
-    <key alias="languagesToPublish">What languages would you like to publish?</key>
-    <key alias="languagesToSave">What languages would you like to save?</key>
-    <key alias="languagesToSaveForFirstTime">All languages with content are saved on creation!</key>
-    <key alias="languagesToSendForApproval">What languages would you like to send for approval?</key>
-    <key alias="languagesToSchedule">What languages would you like to schedule?</key>
-    <key alias="languagesToUnpublish">Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages.</key>
-    <key alias="publishedLanguages">Published Languages</key>
-    <key alias="unpublishedLanguages">Unpublished Languages</key>
-    <key alias="unmodifiedLanguages">Unmodified Languages</key>
-    <key alias="untouchedLanguagesForFirstTime">These languages haven't been created</key>
-
-    <key alias="variantsWillBeSaved">All new variants will be saved.</key>
-    <key alias="variantsToPublish">Which variants you would like to publish?</key>
-    <key alias="variantsToSave">Choose which variants to be saved.</key>
-    <key alias="variantsToSendForApproval">Pick variants to send for approval.</key>
-    <key alias="variantsToSchedule">Set scheduled publishing...</key>
-    <key alias="variantsToUnpublish">Select the variants to unpublish. Unpublishing a mandatory language will unpublish all variants.</key>
-    <key alias="publishRequiresVariants">The following variants is required for publishing to take place:</key>
-
-    <key alias="notReadyToPublish">We are not ready to Publish</key>
-    <key alias="readyToPublish">Ready to publish?</key>
-    <key alias="readyToSave">Ready to Save?</key>
-    <key alias="sendForApproval">Send for approval</key>
-    <key alias="schedulePublishHelp">Select the date and time to publish and/or unpublish the content item.</key>
-    <key alias="createEmpty">Create new</key>
-    <key alias="createFromClipboard">Paste from clipboard</key>
-    <key alias="nodeIsInTrash">This item is in the Recycle Bin</key>
-  </area>
-  <area alias="blueprints">
-    <key alias="createBlueprintFrom">Create a new Content Template from '%0%'</key>
-    <key alias="blankBlueprint">Blank</key>
-    <key alias="selectBlueprint">Select a Content Template</key>
-    <key alias="createdBlueprintHeading">Content Template created</key>
-    <key alias="createdBlueprintMessage">A Content Template was created from '%0%'</key>
-    <key alias="duplicateBlueprintMessage">Another Content Template with the same name already exists</key>
-    <key alias="blueprintDescription">A Content Template is predefined content that an editor can select to use as the basis for creating new content</key>
-  </area>
-  <area alias="media">
-    <key alias="clickToUpload">Click to upload</key>
-    <key alias="orClickHereToUpload">or click here to choose files</key>
-    <key alias="dragFilesHereToUpload">You can drag files here to upload</key>
-    <key alias="disallowedFileType">Cannot upload this file, it does not have an approved file type</key>
-    <key alias="maxFileSize">Max file size is</key>
-    <key alias="mediaRoot">Media root</key>
-    <key alias="moveFailed">Failed to move media</key>
-    <key alias="copyFailed">Failed to copy media</key>
-    <key alias="createFolderFailed">Failed to create a folder under parent id %0%</key>
-    <key alias="renameFolderFailed">Failed to rename the folder with id %0%</key>
-    <key alias="dragAndDropYourFilesIntoTheArea">Drag and drop your file(s) into the area</key>
-  </area>
-  <area alias="member">
-    <key alias="createNewMember">Create a new member</key>
-    <key alias="allMembers">All Members</key>
-    <key alias="memberGroupNoProperties">Member groups have no additional properties for editing.</key>
-  </area>
-  <area alias="create">
-    <key alias="chooseNode">Where do you want to create the new %0%</key>
-    <key alias="createUnder">Create an item under</key>
-    <key alias="createContentBlueprint">Select the document type you want to make a content template for</key>
-    <key alias="enterFolderName">Enter a folder name</key>
-    <key alias="updateData">Choose a type and a title</key>
-    <key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed document types available for creating content here. You must enable these in <strong>Document Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
-    <key alias="noDocumentTypesAtRoot"><![CDATA[There are no document types available for creating content here. You must create these in <strong>Document Types</strong> within the <strong>Settings</strong> section.]]></key>
-    <key alias="noDocumentTypesWithNoSettingsAccess">The selected page in the content tree doesn't allow for any pages to be created below it.</key>
-    <key alias="noDocumentTypesEditPermissions">Edit permissions for this document type</key>
-    <key alias="noDocumentTypesCreateNew">Create a new document type</key>
-    <key alias="noDocumentTypesAllowedAtRoot"><![CDATA[There are no allowed document types available for creating content here. You must enable these in <strong>Document Types</strong> within the <strong>Settings</strong> section, by changing the <strong>Allow as root</strong> option under <strong>Permissions</strong>.]]></key>
-    <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed media types available for creating media here. You must enable these in <strong>Media Types Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
-    <key alias="noMediaTypesWithNoSettingsAccess">The selected media in the tree doesn't allow for any other media to be created below it.</key>
-    <key alias="noMediaTypesEditPermissions">Edit permissions for this media type</key>
-    <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
-    <key alias="newFolder">New folder</key>
-    <key alias="newDataType">New data type</key>
-    <key alias="newJavascriptFile">New JavaScript file</key>
-    <key alias="newEmptyPartialView">New empty partial view</key>
-    <key alias="newPartialViewMacro">New partial view macro</key>
-    <key alias="newPartialViewFromSnippet">New partial view from snippet</key>
-    <key alias="newPartialViewMacroFromSnippet">New partial view macro from snippet</key>
-    <key alias="newPartialViewMacroNoMacro">New partial view macro (without macro)</key>
-    <key alias="newStyleSheetFile">New style sheet file</key>
-    <key alias="newRteStyleSheetFile">New Rich Text Editor style sheet file</key>
-  </area>
-  <area alias="dashboard">
-    <key alias="browser">Browse your website</key>
-    <key alias="dontShowAgain">- Hide</key>
-    <key alias="nothinghappens">If Umbraco isn't opening, you might need to allow popups from this site</key>
-    <key alias="openinnew">has opened in a new window</key>
-    <key alias="restart">Restart</key>
-    <key alias="visit">Visit</key>
-    <key alias="welcome">Welcome</key>
-  </area>
-  <area alias="prompt">
-    <key alias="stay">Stay</key>
-    <key alias="discardChanges">Discard changes</key>
-    <key alias="unsavedChanges">You have unsaved changes</key>
-    <key alias="unsavedChangesWarning">Are you sure you want to navigate away from this page? - you have unsaved changes</key>
-    <key alias="confirmListViewPublish">Publishing will make the selected items visible on the site.</key>
-    <key alias="confirmListViewUnpublish">Unpublishing will remove the selected items and all their descendants from the site.</key>
-    <key alias="confirmUnpublish">Unpublishing will remove this page and all its descendants from the site.</key>
-    <key alias="doctypeChangeWarning">You have unsaved changes. Making changes to the Document Type will discard the changes.</key>
-  </area>
-  <area alias="bulk">
-    <key alias="done">Done</key>
-    <key alias="deletedItem">Deleted %0% item</key>
-    <key alias="deletedItems">Deleted %0% items</key>
-    <key alias="deletedItemOfItem">Deleted %0% out of %1% item</key>
-    <key alias="deletedItemOfItems">Deleted %0% out of %1% items</key>
-    <key alias="publishedItem">Published %0% item</key>
-    <key alias="publishedItems">Published %0% items</key>
-    <key alias="publishedItemOfItem">Published %0% out of %1% item</key>
-    <key alias="publishedItemOfItems">Published %0% out of %1% items</key>
-    <key alias="unpublishedItem">Unpublished %0% item</key>
-    <key alias="unpublishedItems">Unpublished %0% items</key>
-    <key alias="unpublishedItemOfItem">Unpublished %0% out of %1% item</key>
-    <key alias="unpublishedItemOfItems">Unpublished %0% out of %1% items</key>
-    <key alias="movedItem">Moved %0% item</key>
-    <key alias="movedItems">Moved %0% items</key>
-    <key alias="movedItemOfItem">Moved %0% out of %1% item</key>
-    <key alias="movedItemOfItems">Moved %0% out of %1% items</key>
-    <key alias="copiedItem">Copied %0% item</key>
-    <key alias="copiedItems">Copied %0% items</key>
-    <key alias="copiedItemOfItem">Copied %0% out of %1% item</key>
-    <key alias="copiedItemOfItems">Copied %0% out of %1% items</key>
-  </area>
-  <area alias="defaultdialogs">
-    <key alias="nodeNameLinkPicker">Link title</key>
-    <key alias="urlLinkPicker">Link</key>
-    <key alias="anchorLinkPicker">Anchor / querystring</key>
-    <key alias="anchorInsert">Name</key>
-    <key alias="assignDomain">Manage hostnames</key>
-    <key alias="closeThisWindow">Close this window</key>
-    <key alias="confirmdelete">Are you sure you want to delete</key>
-    <key alias="confirmdisable">Are you sure you want to disable</key>
-    <key alias="confirmlogout">Are you sure?</key>
-    <key alias="confirmSure">Are you sure?</key>
-    <key alias="cut">Cut</key>
-    <key alias="editdictionary">Edit Dictionary Item</key>
-    <key alias="editlanguage">Edit Language</key>
-    <key alias="editSelectedMedia">Edit selected media</key>
-    <key alias="insertAnchor">Insert local link</key>
-    <key alias="insertCharacter">Insert character</key>
-    <key alias="insertgraphicheadline">Insert graphic headline</key>
-    <key alias="insertimage">Insert picture</key>
-    <key alias="insertlink">Insert link</key>
-    <key alias="insertMacro">Click to add a Macro</key>
-    <key alias="inserttable">Insert table</key>
-    <key alias="languagedeletewarning">This will delete the language</key>
-    <key alias="languageChangeWarning">Changing the culture for a language may be an expensive operation and will result in the content cache and indexes being rebuilt</key>
-    <key alias="lastEdited">Last Edited</key>
-    <key alias="link">Link</key>
-    <key alias="linkinternal">Internal link:</key>
-    <key alias="linklocaltip">When using local links, insert "#" in front of link</key>
-    <key alias="linknewwindow">Open in new window?</key>
-	<key alias="macroContainerSettings">Macro Settings</key>
-    <key alias="macroDoesNotHaveProperties">This macro does not contain any properties you can edit</key>
-    <key alias="paste">Paste</key>
-    <key alias="permissionsEdit">Edit permissions for</key>
-    <key alias="permissionsSet">Set permissions for</key>
-    <key alias="permissionsSetForGroup">Set permissions for %0% for user group %1%</key>
-    <key alias="permissionsHelp">Select the users groups you want to set permissions for</key>
-    <key alias="recycleBinDeleting">The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place</key>
-    <key alias="recycleBinIsEmpty">The recycle bin is now empty</key>
-    <key alias="recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]></key>
-    <key alias="regexSearchHelp">Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code' 'url'</key>
-    <key alias="removeMacro">Remove Macro</key>
-    <key alias="requiredField">Required Field</key>
-    <key alias="sitereindexed">Site is reindexed</key>
-    <key alias="siterepublished">The website cache has been refreshed. All publish content is now up to date. While all unpublished content is still unpublished</key>
-    <key alias="siterepublishHelp">The website cache will be refreshed. All published content will be updated, while unpublished content will stay unpublished.</key>
-    <key alias="tableColumns">Number of columns</key>
-    <key alias="tableRows">Number of rows</key>
-    <key alias="thumbnailimageclickfororiginal">Click on the image to see full size</key>
-    <key alias="treepicker">Pick item</key>
-    <key alias="viewCacheItem">View Cache Item</key>
-    <key alias="relateToOriginalLabel">Relate to original</key>
-    <key alias="includeDescendants">Include descendants</key>
-    <key alias="theFriendliestCommunity">The friendliest community</key>
-    <key alias="linkToPage">Link to page</key>
-    <key alias="openInNewWindow">Opens the linked document in a new window or tab</key>
-    <key alias="linkToMedia">Link to media</key>
-    <key alias="selectContentStartNode">Select content start node</key>
-    <key alias="selectMedia">Select media</key>
-    <key alias="selectMediaType">Select media type</key>
-    <key alias="selectIcon">Select icon</key>
-    <key alias="selectItem">Select item</key>
-    <key alias="selectLink">Select link</key>
-    <key alias="selectMacro">Select macro</key>
-    <key alias="selectContent">Select content</key>
-    <key alias="selectContentType">Select content type</key>
-    <key alias="selectMediaStartNode">Select media start node</key>
-    <key alias="selectMember">Select member</key>
-    <key alias="selectMemberGroup">Select member group</key>
-    <key alias="selectMemberType">Select member type</key>
-    <key alias="selectNode">Select node</key>
-    <key alias="selectSections">Select sections</key>
-    <key alias="selectUsers">Select users</key>
-    <key alias="noIconsFound">No icons were found</key>
-    <key alias="noMacroParams">There are no parameters for this macro</key>
-    <key alias="noMacros">There are no macros available to insert</key>
-    <key alias="externalLoginProviders">External login providers</key>
-    <key alias="exceptionDetail">Exception Details</key>
-    <key alias="stacktrace">Stacktrace</key>
-    <key alias="innerException">Inner Exception</key>
-    <key alias="linkYour">Link your</key>
-    <key alias="unLinkYour">Un-link your</key>
-    <key alias="account">account</key>
-    <key alias="selectEditor">Select editor</key>
-    <key alias="selectSnippet">Select snippet</key>
-    <key alias="variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language, you should unpublish the node in that language instead.</key>
-  </area>
-  <area alias="dictionary">
-    <key alias="noItems">There are no dictionary items.</key>
-  </area>
-  <area alias="dictionaryItem">
-    <key alias="description"><![CDATA[
-      Edit the different language versions for the dictionary item '<em>%0%</em>' below
-   ]]></key>
-    <key alias="displayName">Culture Name</key>
-    <key alias="changeKeyError"><![CDATA[
-      The key '%0%' already exists.
-   ]]></key>
-    <key alias="overviewTitle">Dictionary overview</key>
-  </area>
-  <area alias="examineManagement">
-    <key alias="configuredSearchers">Configured Searchers</key>
-    <key alias="configuredSearchersDescription">Shows properties and tools for any configured Searcher (i.e. such as a multi-index searcher)</key>
-    <key alias="fieldValues">Field values</key>
-    <key alias="healthStatus">Health status</key>
-    <key alias="healthStatusDescription">The health status of the index and if it can be read</key>
-    <key alias="indexers">Indexers</key>
-    <key alias="indexInfo">Index info</key>
-    <key alias="indexInfoDescription">Lists the properties of the index</key>
-    <key alias="manageIndexes">Manage Examine's indexes</key>
-    <key alias="manageIndexesDescription">Allows you to view the details of each index and provides some tools for managing the indexes</key>
-    <key alias="rebuildIndex">Rebuild index</key>
-    <key alias="rebuildIndexWarning"><![CDATA[
-      This will cause the index to be rebuilt.<br />
-      Depending on how much content there is in your site this could take a while.<br />
-      It is not recommended to rebuild an index during times of high website traffic or when editors are editing content.
-     ]]>
-    </key>
-    <key alias="searchers">Searchers</key>
-    <key alias="searchDescription">Search the index and view the results</key>
-    <key alias="tools">Tools</key>
-    <key alias="toolsDescription">Tools to manage the index</key>
-    <key alias="fields">fields</key>
-    <key alias="indexCannotRead">The index cannot be read and will need to be rebuilt</key>
-    <key alias="processIsTakingLonger">The process is taking longer than expected, check the umbraco log to see if there have been any errors during this operation</key>
-    <key alias="indexCannotRebuild">This index cannot be rebuilt because it has no assigned</key>
-    <key alias="iIndexPopulator">IIndexPopulator</key>
-  </area>
-  <area alias="placeholders">
-    <key alias="username">Enter your username</key>
-    <key alias="password">Enter your password</key>
-    <key alias="confirmPassword">Confirm your password</key>
-    <key alias="nameentity">Name the %0%...</key>
-    <key alias="entername">Enter a name...</key>
-    <key alias="enteremail">Enter an email...</key>
-    <key alias="enterusername">Enter a username...</key>
-    <key alias="label">Label...</key>
-    <key alias="enterDescription">Enter a description...</key>
-    <key alias="search">Type to search...</key>
-    <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="enterMessage">Enter a message...</key>
-    <key alias="usernameHint">Your username is usually your email</key>
-    <key alias="anchor">#value or ?key=value</key>
-    <key alias="enterAlias">Enter alias...</key>
-    <key alias="generatingAlias">Generating alias...</key>
-    <key alias="a11yCreateItem">Create item</key>
-    <key alias="a11yCreate">Create</key>
-    <key alias="a11yEdit">Edit</key>
-    <key alias="a11yName">Name</key>
-  </area>
-  <area alias="editcontenttype">
-    <key alias="createListView" version="7.2">Create custom list view</key>
-    <key alias="removeListView" version="7.2">Remove custom list view</key>
-    <key alias="aliasAlreadyExists">A content type, media type or member type with this alias already exists</key>
-  </area>
-  <area alias="renamecontainer">
-    <key alias="renamed">Renamed</key>
-    <key alias="enterNewFolderName">Enter a new folder name here</key>
-    <key alias="folderWasRenamed">%0% was renamed to %1%</key>
-  </area>
-  <area alias="editdatatype">
-    <key alias="addPrevalue">Add prevalue</key>
-    <key alias="dataBaseDatatype">Database datatype</key>
-    <key alias="guid">Property editor GUID</key>
-    <key alias="renderControl">Property editor</key>
-    <key alias="rteButtons">Buttons</key>
-    <key alias="rteEnableAdvancedSettings">Enable advanced settings for</key>
-    <key alias="rteEnableContextMenu">Enable context menu</key>
-    <key alias="rteMaximumDefaultImgSize">Maximum default size of inserted images</key>
-    <key alias="rteRelatedStylesheets">Related stylesheets</key>
-    <key alias="rteShowLabel">Show label</key>
-    <key alias="rteWidthAndHeight">Width and height</key>
-    <key alias="allPropTypes">All property types &amp; property data</key>
-    <key alias="willBeDeleted">using this data type will be deleted permanently, please confirm you want to delete these as well</key>
-    <key alias="yesDelete">Yes, delete</key>
-    <key alias="andAllRelated">and all property types &amp; property data using this data type</key>
-    <key alias="selectFolder">Select the folder to move</key>
-    <key alias="inTheTree">to in the tree structure below</key>
-    <key alias="wasMoved">was moved underneath</key>
-  </area>
-  <area alias="errorHandling">
-    <key alias="errorButDataWasSaved">Your data has been saved, but before you can publish this page there are some errors you need to fix first:</key>
-    <key alias="errorChangingProviderPassword">The current membership provider does not support changing password (EnablePasswordRetrieval need to be true)</key>
-    <key alias="errorExistsWithoutTab">%0% already exists</key>
-    <key alias="errorHeader">There were errors:</key>
-    <key alias="errorHeaderWithoutTab">There were errors:</key>
-    <key alias="errorInPasswordFormat">The password should be a minimum of %0% characters long and contain at least %1% non-alpha numeric character(s)</key>
-    <key alias="errorIntegerWithoutTab">%0% must be an integer</key>
-    <key alias="errorMandatory">The %0% field in the %1% tab is mandatory</key>
-    <key alias="errorMandatoryWithoutTab">%0% is a mandatory field</key>
-    <key alias="errorRegExp">%0% at %1% is not in a correct format</key>
-    <key alias="errorRegExpWithoutTab">%0% is not in a correct format</key>
-  </area>
-  <area alias="errors">
-    <key alias="receivedErrorFromServer">Received an error from the server</key>
-    <key alias="dissallowedMediaType">The specified file type has been disallowed by the administrator</key>
-    <key alias="codemirroriewarning">NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough.</key>
-    <key alias="contentTypeAliasAndNameNotNull">Please fill both alias and name on the new property type!</key>
-    <key alias="filePermissionsError">There is a problem with read/write access to a specific file or folder</key>
-    <key alias="macroErrorLoadingPartialView">Error loading Partial View script (file: %0%)</key>
-    <key alias="missingTitle">Please enter a title</key>
-    <key alias="missingType">Please choose a type</key>
-    <key alias="pictureResizeBiggerThanOrg">You're about to make the picture larger than the original size. Are you sure that you want to proceed?</key>
-    <key alias="startNodeDoesNotExists">Startnode deleted, please contact your administrator</key>
-    <key alias="stylesMustMarkBeforeSelect">Please mark content before changing style</key>
-    <key alias="stylesNoStylesOnPage">No active styles available</key>
-    <key alias="tableColMergeLeft">Please place cursor at the left of the two cells you wish to merge</key>
-    <key alias="tableSplitNotSplittable">You cannot split a cell that hasn't been merged.</key>
-    <key alias="propertyHasErrors">This property is invalid</key>
-  </area>
-  <area alias="general">
-    <key alias="about">About</key>
-    <key alias="action">Action</key>
-    <key alias="actions">Actions</key>
-    <key alias="add">Add</key>
-    <key alias="alias">Alias</key>
-    <key alias="all">All</key>
-    <key alias="areyousure">Are you sure?</key>
-    <key alias="back">Back</key>
-    <key alias="backToOverview">Back to overview</key>
-    <key alias="border">Border</key>
-    <key alias="by">by</key>
-    <key alias="cancel">Cancel</key>
-    <key alias="cellMargin">Cell margin</key>
-    <key alias="choose">Choose</key>
-    <key alias="clear">Clear</key>
-    <key alias="close">Close</key>
-    <key alias="closewindow">Close Window</key>
-    <key alias="comment">Comment</key>
-    <key alias="confirm">Confirm</key>
-    <key alias="constrain">Constrain</key>
-    <key alias="constrainProportions">Constrain proportions</key>
-    <key alias="content">Content</key>
-    <key alias="continue">Continue</key>
-    <key alias="copy">Copy</key>
-    <key alias="create">Create</key>
-    <key alias="database">Database</key>
-    <key alias="date">Date</key>
-    <key alias="default">Default</key>
-    <key alias="delete">Delete</key>
-    <key alias="deleted">Deleted</key>
-    <key alias="deleting">Deleting...</key>
-    <key alias="design">Design</key>
-    <key alias="dictionary">Dictionary</key>
-    <key alias="dimensions">Dimensions</key>
-    <key alias="down">Down</key>
-    <key alias="download">Download</key>
-    <key alias="edit">Edit</key>
-    <key alias="edited">Edited</key>
-    <key alias="elements">Elements</key>
-    <key alias="email">Email</key>
-    <key alias="error">Error</key>
-    <key alias="field">Field</key>
-    <key alias="findDocument">Find</key>
-    <key alias="first">First</key>
-    <key alias="focalPoint">Focal point</key>
-    <key alias="general">General</key>
-    <key alias="groups">Groups</key>
-    <key alias="group">Group</key>
-    <key alias="height">Height</key>
-    <key alias="help">Help</key>
-    <key alias="hide">Hide</key>
-    <key alias="history">History</key>
-    <key alias="icon">Icon</key>
-    <key alias="id">Id</key>
-    <key alias="import">Import</key>
-    <key alias="includeFromsubFolders">Include subfolders in search</key>
-    <key alias="excludeFromSubFolders">Search only this folder</key>
-    <key alias="info">Info</key>
-    <key alias="innerMargin">Inner margin</key>
-    <key alias="insert">Insert</key>
-    <key alias="install">Install</key>
-    <key alias="invalid">Invalid</key>
-    <key alias="justify">Justify</key>
-    <key alias="label">Label</key>
-    <key alias="language">Language</key>
-    <key alias="last">Last</key>
-    <key alias="layout">Layout</key>
-    <key alias="links">Links</key>
-    <key alias="loading">Loading</key>
-    <key alias="locked">Locked</key>
-    <key alias="login">Login</key>
-    <key alias="logoff">Log off</key>
-    <key alias="logout">Logout</key>
-    <key alias="macro">Macro</key>
-    <key alias="mandatory">Mandatory</key>
-    <key alias="message">Message</key>
-    <key alias="move">Move</key>
-    <key alias="name">Name</key>
-    <key alias="new">New</key>
-    <key alias="next">Next</key>
-    <key alias="no">No</key>
-    <key alias="of">of</key>
-    <key alias="off">Off</key>
-    <key alias="ok">OK</key>
-    <key alias="open">Open</key>
-    <key alias="options">Options</key>
-    <key alias="on">On</key>
-    <key alias="or">or</key>
-    <key alias="orderBy">Order by</key>
-    <key alias="password">Password</key>
-    <key alias="path">Path</key>
-    <key alias="pleasewait">One moment please...</key>
-    <key alias="previous">Previous</key>
-    <key alias="properties">Properties</key>
-    <key alias="rebuild">Rebuild</key>
-    <key alias="reciept">Email to receive form data</key>
-    <key alias="recycleBin">Recycle Bin</key>
-    <key alias="recycleBinEmpty">Your recycle bin is empty</key>
-    <key alias="reload">Reload</key>
-    <key alias="remaining">Remaining</key>
-    <key alias="remove">Remove</key>
-    <key alias="rename">Rename</key>
-    <key alias="renew">Renew</key>
-    <key alias="required" version="7.0">Required</key>
-    <key alias="retrieve">Retrieve</key>
-    <key alias="retry">Retry</key>
-    <key alias="rights">Permissions</key>
-    <key alias="scheduledPublishing">Scheduled Publishing</key>
-    <key alias="search">Search</key>
-    <key alias="searchNoResult">Sorry, we can not find what you are looking for.</key>
-    <key alias="noItemsInList">No items have been added</key>
-    <key alias="server">Server</key>
-    <key alias="settings">Settings</key>
-    <key alias="show">Show</key>
-    <key alias="showPageOnSend">Show page on Send</key>
-    <key alias="size">Size</key>
-    <key alias="sort">Sort</key>
-    <key alias="status">Status</key>
-    <key alias="submit">Submit</key>
-    <key alias="success">Success</key>
-    <key alias="type">Type</key>
-    <key alias="typeToSearch">Type to search...</key>
-    <key alias="under">under</key>
-    <key alias="up">Up</key>
-    <key alias="update">Update</key>
-    <key alias="upgrade">Upgrade</key>
-    <key alias="upload">Upload</key>
-    <key alias="url">Url</key>
-    <key alias="user">User</key>
-    <key alias="username">Username</key>
-    <key alias="value">Value</key>
-    <key alias="view">View</key>
-    <key alias="welcome">Welcome...</key>
-    <key alias="width">Width</key>
-    <key alias="yes">Yes</key>
-    <key alias="folder">Folder</key>
-    <key alias="searchResults">Search results</key>
-    <key alias="reorder">Reorder</key>
-    <key alias="reorderDone">I am done reordering</key>
-    <key alias="preview">Preview</key>
-    <key alias="changePassword">Change password</key>
-    <key alias="to">to</key>
-    <key alias="listView">List view</key>
-    <key alias="saving">Saving...</key>
-    <key alias="current">current</key>
-    <key alias="embed">Embed</key>
-    <key alias="selected">selected</key>
-    <key alias="other">Other</key>
-    <key alias="articles">Articles</key>
-    <key alias="videos">Videos</key>
-    <key alias="clear">Clear</key>
-    <key alias="installing">Installing</key>
-  </area>
-  <area alias="colors">
-    <key alias="blue">Blue</key>
-  </area>
-  <area alias="shortcuts">
-    <key alias="addGroup">Add group</key>
-    <key alias="addProperty">Add property</key>
-    <key alias="addEditor">Add editor</key>
-    <key alias="addTemplate">Add template</key>
-    <key alias="addChildNode">Add child node</key>
-    <key alias="addChild">Add child</key>
-    <key alias="editDataType">Edit data type</key>
-    <key alias="navigateSections">Navigate sections</key>
-    <key alias="shortcut">Shortcuts</key>
-    <key alias="showShortcuts">show shortcuts</key>
-    <key alias="toggleListView">Toggle list view</key>
-    <key alias="toggleAllowAsRoot">Toggle allow as root</key>
-    <key alias="commentLine">Comment/Uncomment lines</key>
-    <key alias="removeLine">Remove line</key>
-    <key alias="copyLineUp">Copy Lines Up</key>
-    <key alias="copyLineDown">Copy Lines Down</key>
-    <key alias="moveLineUp">Move Lines Up</key>
-    <key alias="moveLineDown">Move Lines Down</key>
-    <key alias="generalHeader">General</key>
-    <key alias="editorHeader">Editor</key>
-    <key alias="toggleAllowCultureVariants">Toggle allow culture variants</key>
-    <key alias="toggleAllowSegmentVariants">Toggle allow segmentation</key>
-  </area>
-  <area alias="graphicheadline">
-    <key alias="backgroundcolor">Background colour</key>
-    <key alias="bold">Bold</key>
-    <key alias="color">Text colour</key>
-    <key alias="font">Font</key>
-    <key alias="text">Text</key>
-  </area>
-  <area alias="headers">
-    <key alias="page">Page</key>
-  </area>
-  <area alias="installer">
-    <key alias="databaseErrorCannotConnect">The installer cannot connect to the database.</key>
-    <key alias="databaseErrorWebConfig">Could not save the web.config file. Please modify the connection string manually.</key>
-    <key alias="databaseFound">Your database has been found and is identified as</key>
-    <key alias="databaseHeader">Database configuration</key>
-        <key alias="databaseInstall">
-            <![CDATA[
-      Press the <strong>install</strong> button to install the Umbraco %0% database
-    ]]>
-        </key>
-    <key alias="databaseInstallDone"><![CDATA[Umbraco %0% has now been copied to your database. Press <strong>Next</strong> to proceed.]]></key>
-    <key alias="databaseNotFound"><![CDATA[<p>Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.</p>
-              <p>To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file. </p>
-              <p>
-              Click the <strong>retry</strong> button when
-              done.<br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
-			              More information on editing web.config here.</a></p>]]></key>
-    <key alias="databaseText"><![CDATA[To complete this step, you must know some information regarding your database server ("connection string").<br />
-        Please contact your ISP if necessary.
-        If you're installing on a local machine or server you might need information from your system administrator.]]></key>
-    <key alias="databaseUpgrade"><![CDATA[
-      <p>
-      Press the <strong>upgrade</strong> button to upgrade your database to Umbraco %0%</p>
-      <p>
-      Don't worry - no content will be deleted and everything will continue working afterwards!
-      </p>
-      ]]></key>
-    <key alias="databaseUpgradeDone"><![CDATA[Your database has been upgraded to the final version %0%.<br />Press <strong>Next</strong> to
-      proceed. ]]></key>
-    <key alias="databaseUpToDate"><![CDATA[Your current database is up-to-date!. Click <strong>next</strong> to continue the configuration wizard]]></key>
-    <key alias="defaultUserChangePass"><![CDATA[<strong>The Default users' password needs to be changed!</strong>]]></key>
-    <key alias="defaultUserDisabled"><![CDATA[<strong>The Default user has been disabled or has no access to Umbraco!</strong></p><p>No further actions needs to be taken. Click <b>Next</b> to proceed.]]></key>
-    <key alias="defaultUserPassChanged"><![CDATA[<strong>The Default user's password has been successfully changed since the installation!</strong></p><p>No further actions needs to be taken. Click <strong>Next</strong> to proceed.]]></key>
-    <key alias="defaultUserPasswordChanged">The password is changed!</key>
-    <key alias="greatStart">Get a great start, watch our introduction videos</key>
-    <key alias="licenseText">By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI.</key>
-    <key alias="None">Not installed yet.</key>
-    <key alias="permissionsAffectedFolders">Affected files and folders</key>
-    <key alias="permissionsAffectedFoldersMoreInfo">More information on setting up permissions for Umbraco here</key>
-    <key alias="permissionsAffectedFoldersText">You need to grant ASP.NET modify permissions to the following files/folders</key>
-    <key alias="permissionsAlmostPerfect"><![CDATA[<strong>Your permission settings are almost perfect!</strong><br /><br />
-        You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]></key>
-    <key alias="permissionsHowtoResolve">How to Resolve</key>
-    <key alias="permissionsHowtoResolveLink">Click here to read the text version</key>
-    <key alias="permissionsHowtoResolveText"><![CDATA[Watch our <strong>video tutorial</strong> on setting up folder permissions for Umbraco or read the text version.]]></key>
-    <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>Your permission settings might be an issue!</strong>
-      <br/><br />
-      You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]></key>
-    <key alias="permissionsNotReady"><![CDATA[<strong>Your permission settings are not ready for Umbraco!</strong>
-          <br /><br />
-          In order to run Umbraco, you'll need to update your permission settings.]]></key>
-    <key alias="permissionsPerfect"><![CDATA[<strong>Your permission settings are perfect!</strong><br /><br />
-              You are ready to run Umbraco and install packages!]]></key>
-    <key alias="permissionsResolveFolderIssues">Resolving folder issue</key>
-    <key alias="permissionsResolveFolderIssuesLink">Follow this link for more information on problems with ASP.NET and creating folders</key>
-    <key alias="permissionsSettingUpPermissions">Setting up folder permissions</key>
-    <key alias="permissionsText"><![CDATA[
-      Umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's.
-      It also stores temporary data (aka: cache) for enhancing the performance of your website.
-    ]]></key>
-    <key alias="runwayFromScratch">I want to start from scratch</key>
-    <key alias="runwayFromScratchText"><![CDATA[
-        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates.
-        (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
-        You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
-      ]]></key>
-    <key alias="runwayHeader">You've just set up a clean Umbraco platform. What do you want to do next?</key>
-    <key alias="runwayInstalled">Runway is installed</key>
-    <key alias="runwayInstalledText"><![CDATA[
-      You have the foundation in place. Select what modules you wish to install on top of it.<br />
-      This is our list of recommended modules, check off the ones you would like to install, or view the <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">full list of modules</a>
-      ]]></key>
-    <key alias="runwayOnlyProUsers">Only recommended for experienced users</key>
-    <key alias="runwaySimpleSite">I want to start with a simple website</key>
-    <key alias="runwaySimpleSiteText"><![CDATA[
-      <p>
-      "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
-        but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
-        Runway offers an easy foundation based on best practices to get you started faster than ever.
-        If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.
-        </p>
-        <small>
-        <em>Included with Runway:</em> Home page, Getting Started page, Installing Modules page.<br />
-        <em>Optional Modules:</em> Top Navigation, Sitemap, Contact, Gallery.
-        </small>
-      ]]></key>
-    <key alias="runwayWhatIsRunway">What is Runway</key>
-    <key alias="step1">Step 1/5 Accept license</key>
-    <key alias="step2">Step 2/5: Database configuration</key>
-    <key alias="step3">Step 3/5: Validating File Permissions</key>
-    <key alias="step4">Step 4/5: Check Umbraco security</key>
-    <key alias="step5">Step 5/5: Umbraco is ready to get you started</key>
-    <key alias="thankYou">Thank you for choosing Umbraco</key>
-    <key alias="theEndBrowseSite"><![CDATA[<h3>Browse your new site</h3>
-You installed Runway, so why not see how your new website looks.]]></key>
-    <key alias="theEndFurtherHelp"><![CDATA[<h3>Further help and information</h3>
-Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]></key>
-    <key alias="theEndHeader">Umbraco %0% is installed and ready for use</key>
-    <key alias="theEndInstallFailed"><![CDATA[To finish the installation, you'll need to
-        manually edit the <strong>/web.config file</strong> and update the AppSetting key <strong>UmbracoConfigurationStatus</strong> in the bottom to the value of <strong>'%0%'</strong>.]]></key>
-    <key alias="theEndInstallSuccess"><![CDATA[You can get <strong>started instantly</strong> by clicking the "Launch Umbraco" button below. <br />If you are <strong>new to Umbraco</strong>,
-you can find plenty of resources on our getting started pages.]]></key>
-    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Launch Umbraco</h3>
-To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]></key>
-    <key alias="Unavailable">Connection to database failed.</key>
-    <key alias="Version3">Umbraco Version 3</key>
-    <key alias="Version4">Umbraco Version 4</key>
-    <key alias="watch">Watch</key>
-    <key alias="welcomeIntro"><![CDATA[This wizard will guide you through the process of configuring <strong>Umbraco %0%</strong> for a fresh install or upgrading from version 3.0.
-                                <br /><br />
-                                Press <strong>"next"</strong> to start the wizard.]]></key>
-  </area>
-  <area alias="language">
-    <key alias="cultureCode">Culture Code</key>
-    <key alias="displayName">Culture Name</key>
-  </area>
-  <area alias="lockout">
-    <key alias="lockoutWillOccur">You've been idle and logout will automatically occur in</key>
-    <key alias="renewSession">Renew now to save your work</key>
-  </area>
-  <area alias="login">
-    <key alias="greeting0">Happy super Sunday</key>
-    <key alias="greeting1">Happy manic Monday </key>
-    <key alias="greeting2">Happy tubular Tuesday</key>
-    <key alias="greeting3">Happy wonderful Wednesday</key>
-    <key alias="greeting4">Happy thunderous Thursday</key>
-    <key alias="greeting5">Happy funky Friday</key>
-    <key alias="greeting6">Happy Caturday</key>
-    <key alias="instruction">Log in below</key>
-    <key alias="signInWith">Sign in with</key>
-    <key alias="timeout">Session timed out</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
-    <key alias="forgottenPassword">Forgotten password?</key>
-    <key alias="forgottenPasswordInstruction">An email will be sent to the address specified with a link to reset your password</key>
-    <key alias="requestPasswordResetConfirmation">An email with password reset instructions will be sent to the specified address if it matched our records</key>
-    <key alias="showPassword">Show password</key>
-    <key alias="hidePassword">Hide password</key>
-    <key alias="returnToLogin">Return to login form</key>
-    <key alias="setPasswordInstruction">Please provide a new password</key>
-    <key alias="setPasswordConfirmation">Your Password has been updated</key>
-    <key alias="resetCodeExpired">The link you have clicked on is invalid or has expired</key>
-    <key alias="resetPasswordEmailCopySubject">Umbraco: Reset Password</key>
-    <key alias="resetPasswordEmailCopyFormat"><![CDATA[
-        <html>
-			<head>
-				<meta name='viewport' content='width=device-width'>
-				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-			</head>
-			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
-				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
-				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
-					<tr>
-						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
-							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
-								<tr>
-									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
-										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
-										<div> </div>
-										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
-									</td>
-									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
-					<tr>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
-							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
-								<br>
-								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
-									<tr>
-										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
-											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
-												<tr>
-													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
-														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
-															Password reset requested
-														</h1>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Your username to login to the Umbraco back-office is: <strong>%0%</strong>
-														</p>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
-																<tbody>
-																	<tr>
-																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
-																				Click this link to reset your password
-																			</a>
-																		</td>
-																	</tr>
-																</tbody>
-															</table>
-														</p>
-														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
-															<table border='0' cellpadding='0' cellspacing='0'>
-																<tr>
-																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
-																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
-																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%1%'>%1%</a>
-																		</font>
-																	</td>
-																</tr>
-															</table>
-														</p>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-								<br><br><br>
-							</div>
-						</td>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-					</tr>
-				</table>
-			</body>
-		</html>
-	]]></key>
-  </area>
-  <area alias="main">
-    <key alias="dashboard">Dashboard</key>
-    <key alias="sections">Sections</key>
-    <key alias="tree">Content</key>
-  </area>
-  <area alias="moveOrCopy">
-    <key alias="choose">Choose page above...</key>
-    <key alias="copyDone">%0% has been copied to %1%</key>
-    <key alias="copyTo">Select where the document %0% should be copied to below</key>
-    <key alias="moveDone">%0% has been moved to %1%</key>
-    <key alias="moveTo">Select where the document %0% should be moved to below</key>
-    <key alias="nodeSelected">has been selected as the root of your new content, click 'ok' below.</key>
-    <key alias="noNodeSelected">No node selected yet, please select a node in the list above before clicking 'ok'</key>
-    <key alias="notAllowedByContentType">The current node is not allowed under the chosen node because of its type</key>
-    <key alias="notAllowedByPath">The current node cannot be moved to one of its subpages</key>
-    <key alias="notAllowedAtRoot">The current node cannot exist at the root</key>
-    <key alias="notValid">The action isn't allowed since you have insufficient permissions on 1 or more child documents.</key>
-    <key alias="relateToOriginal">Relate copied items to original</key>
-  </area>
-  <area alias="notifications">
-    <key alias="editNotifications"><![CDATA[Select your notification for <strong>%0%</strong>]]></key>
-    <key alias="notificationsSavedFor">Notification settings saved for</key>
-    <key alias="mailBody"><![CDATA[
-      Hi %0%
-
-      This is an automated mail to inform you that the task '%1%'
-      has been performed on the page '%2%'
-      by the user '%3%'
-
-      Go to http://%4%/#/content/content/edit/%5% to edit.
-
-      %6%
-
-      Have a nice day!
-
-      Cheers from the Umbraco robot
-    ]]></key>
-    <key alias="mailBodyVariantSummary">The following languages have been modified %0%</key>
-    <key alias="mailBodyHtml"><![CDATA[
-        <html>
-			<head>
-				<meta name='viewport' content='width=device-width'>
-				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-			</head>
-			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
-				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
-				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
-					<tr>
-						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
-							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
-								<tr>
-									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
-										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
-										<div> </div>
-										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
-									</td>
-									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
-					<tr>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
-							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
-								<br>
-								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
-									<tr>
-										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
-											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
-												<tr>
-													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
-														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
-															Hi %0%,
-														</h1>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															This is an automated mail to inform you that the task <strong>'%1%'</strong> has been performed on the page <a style="color: #392F54; text-decoration: none; -ms-word-break: break-all; word-break: break-all;" href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> by the user <strong>'%3%'</strong>
-														</p>
-														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
-															<tbody>
-																<tr>
-																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
-																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
-																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>EDIT</a> </td> </tr></tbody></table>
-																	</td>
-																</tr>
-															</tbody>
-														</table>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															<h3>Update summary:</h3>
-															%6%
-														</p>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Have a nice day!<br /><br />
-															Cheers from the Umbraco robot
-														</p>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-								<br><br><br>
-							</div>
-						</td>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-					</tr>
-				</table>
-			</body>
-		</html>
-	]]></key>
-    <key alias="mailBodyVariantHtmlSummary"><![CDATA[<p>The following languages have been modified:</p>
-        %0%
-    ]]></key>
-    <key alias="mailSubject">[%0%] Notification about %1% performed on %2%</key>
-    <key alias="notifications">Notifications</key>
-  </area>
-  <area alias="packager">
-    <key alias="actions">Actions</key>
-    <key alias="created">Created</key>
-    <key alias="createPackage">Create package</key>
-    <key alias="chooseLocalPackageText"><![CDATA[
-      Choose Package from your machine, by clicking the Browse<br />
-         button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension.
-      ]]></key>
-    <key alias="deletewarning">This will delete the package</key>
-    <key alias="dropHere">Drop to upload</key>
-    <key alias="includeAllChildNodes">Include all child nodes</key>
-    <key alias="orClickHereToUpload">or click here to choose package file</key>
-    <key alias="uploadPackage">Upload package</key>
-    <key alias="localPackageDescription">Install a local package by selecting it from your machine. Only install packages from sources you know and trust</key>
-    <key alias="uploadAnother">Upload another package</key>
-    <key alias="cancelAndUploadAnother">Cancel and upload another package</key>
-    <key alias="accept">I accept</key>
-    <key alias="termsOfUse">terms of use</key>
-
-    <key alias="pathToFile">Path to file</key>
-    <key alias="pathToFileDescription">Absolute path to file (ie: /bin/umbraco.bin)</key>
-    <key alias="installed">Installed</key>
-    <key alias="installedPackages">Installed packages</key>
-    <key alias="installLocal">Install local</key>
-    <key alias="installFinish">Finish</key>
-    <key alias="noConfigurationView">This package has no configuration view</key>
-    <key alias="noPackagesCreated">No packages have been created yet</key>
-    <key alias="noPackages">You don’t have any packages installed</key>
-    <key alias="noPackagesDescription"><![CDATA[You don’t have any packages installed. Either install a local package by selecting it from your machine, or browse through available packages using the <strong>'Packages'</strong> icon in the top right of your screen]]></key>
-    <key alias="packageActions">Package Actions</key>
-    <key alias="packageAuthorUrl">Author URL</key>
-    <key alias="packageContent">Package Content</key>
-    <key alias="packageFiles">Package Files</key>
-    <key alias="packageIconUrl">Icon URL</key>
-    <key alias="packageInstall">Install package</key>
-    <key alias="packageLicense">License</key>
-    <key alias="packageLicenseUrl">License URL</key>
-    <key alias="packageProperties">Package Properties</key>
-    <key alias="packageSearch">Search for packages</key>
-    <key alias="packageSearchResults">Results for</key>
-    <key alias="packageNoResults">We couldn’t find anything for</key>
-    <key alias="packageNoResultsDescription">Please try searching for another package or browse through the categories</key>
-    <key alias="packagesPopular">Popular</key>
-    <key alias="packagesNew">New releases</key>
-    <key alias="packageHas">has</key>
-    <key alias="packageKarmaPoints">karma points</key>
-    <key alias="packageInfo">Information</key>
-    <key alias="packageOwner">Owner</key>
-    <key alias="packageContrib">Contributors</key>
-    <key alias="packageCreated">Created</key>
-    <key alias="packageCurrentVersion">Current version</key>
-    <key alias="packageNetVersion">.NET version</key>
-    <key alias="packageDownloads">Downloads</key>
-    <key alias="packageLikes">Likes</key>
-    <key alias="packageCompatibility">Compatibility</key>
-    <key alias="packageCompatibilityDescription">This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be guaranteed for versions reported below 100%</key>
-    <key alias="packageExternalSources">External sources</key>
-    <key alias="packageAuthor">Author</key>
-    <key alias="packageDocumentation">Documentation</key>
-    <key alias="packageMetaData">Package meta data</key>
-    <key alias="packageName">Package name</key>
-    <key alias="packageNoItemsHeader">Package doesn't contain any items</key>
-    <key alias="packageNoItemsText"><![CDATA[This package file doesn't contain any items to uninstall.<br/><br/>
-      You can safely remove this from the system by clicking "uninstall package" below.]]></key>
-    <key alias="packageOptions">Package options</key>
-    <key alias="packageReadme">Package readme</key>
-    <key alias="packageRepository">Package repository</key>
-    <key alias="packageUninstallConfirm">Confirm package uninstall</key>
-    <key alias="packageUninstalledHeader">Package was uninstalled</key>
-    <key alias="packageUninstalledText">The package was successfully uninstalled</key>
-    <key alias="packageUninstallHeader">Uninstall package</key>
-    <key alias="packageUninstallText"><![CDATA[You can unselect items you do not wish to remove, at this time, below. When you click "confirm uninstall" all checked-off items will be removed.<br />
-      <span style="color: Red; font-weight: bold;">Notice:</span> any documents, media etc depending on the items you remove, will stop working, and could lead to system instability,
-      so uninstall with caution. If in doubt, contact the package author.]]></key>
-    <key alias="packageVersion">Package version</key>
-    <key alias="packageAlreadyInstalled">Package already installed</key>
-    <key alias="targetVersionMismatch">This package cannot be installed, it requires a minimum Umbraco version of</key>
-    <key alias="installStateUninstalling">Uninstalling...</key>
-    <key alias="installStateDownloading">Downloading...</key>
-    <key alias="installStateImporting">Importing...</key>
-    <key alias="installStateInstalling">Installing...</key>
-    <key alias="installStateRestarting">Restarting, please wait...</key>
-    <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
-    <key alias="installStateCompleted">Please click 'Finish' to complete installation and reload the page.</key>
-    <key alias="installStateUploading">Uploading package...</key>
-  </area>
-  <area alias="paste">
-    <key alias="doNothing">Paste with full formatting (Not recommended)</key>
-    <key alias="errorMessage">The text you're trying to paste contains special characters or formatting. This could be caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so the pasted content will be more suitable for the web.</key>
-    <key alias="removeAll">Paste as raw text without any formatting at all</key>
-    <key alias="removeSpecialFormattering">Paste, but remove formatting (Recommended)</key>
-  </area>
-  <area alias="publicAccess">
-    <key alias="paGroups">Group based protection</key>
-    <key alias="paGroupsHelp">If you want to grant access to all members of specific member groups</key>
-    <key alias="paGroupsNoGroups">You need to create a member group before you can use group based authentication</key>
-    <key alias="paErrorPage">Error Page</key>
-    <key alias="paErrorPageHelp">Used when people are logged on, but do not have access</key>
-    <key alias="paHowWould"><![CDATA[Choose how to restrict access to the page <strong>%0%</strong>]]></key>
-    <key alias="paIsProtected"><![CDATA[<strong>%0%</strong> is now protected]]></key>
-    <key alias="paIsRemoved"><![CDATA[Protection removed from <strong>%0%</strong>]]></key>
-    <key alias="paLoginPage">Login Page</key>
-    <key alias="paLoginPageHelp">Choose the page that contains the login form</key>
-    <key alias="paRemoveProtection">Remove protection...</key>
-    <key alias="paRemoveProtectionConfirm"><![CDATA[Are you sure you want to remove the protection from the page <strong>%0%</strong>?]]></key>
-    <key alias="paSelectPages">Select the pages that contain login form and error messages</key>
-    <key alias="paSelectGroups"><![CDATA[Select the groups who have access to the page <strong>%0%</strong>]]></key>
-    <key alias="paSelectMembers"><![CDATA[Select the members who have access to the page <strong>%0%</strong>]]></key>
-    <key alias="paMembers">Specific members protection</key>
-    <key alias="paMembersHelp">If you wish to grant access to specific members</key>
-  </area>
-  <area alias="publish">
-    <key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
-      %0% could not be published because the item is scheduled for release.
-    ]]></key>
-    <key alias="contentPublishedFailedExpired"><![CDATA[
-      %0% could not be published because the item has expired.
-    ]]></key>
-    <key alias="contentPublishedFailedInvalid"><![CDATA[
-      %0% could not be published because these properties:  %1%  did not pass validation rules.
-    ]]></key>
-    <key alias="contentPublishedFailedByEvent"><![CDATA[
-      %0% could not be published, a 3rd party add-in cancelled the action.
-    ]]></key>
-    <key alias="contentPublishedFailedByParent"><![CDATA[
-      %0% can not be published, because a parent page is not published.
-    ]]></key>
-    <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% can not be published, because its missing a name.]]></key>
-    <key alias="includeUnpublished">Include unpublished subpages</key>
-    <key alias="inProgress">Publishing in progress - please wait...</key>
-    <key alias="inProgressCounter">%0% out of %1% pages have been published...</key>
-    <key alias="nodePublish">%0% has been published</key>
-    <key alias="nodePublishAll">%0% and subpages have been published</key>
-    <key alias="publishAll">Publish %0% and all its subpages</key>
-    <key alias="publishHelp"><![CDATA[Click <em>Publish</em> to publish <strong>%0%</strong> and thereby making its content publicly available.<br/><br />
-      You can publish this page and all its subpages by checking <em>Include unpublished subpages</em> below.
-      ]]></key>
-  </area>
-  <area alias="colorpicker">
-    <key alias="noColors">You have not configured any approved colours</key>
-  </area>
-  <area alias="contentPicker">
-    <key alias="allowedItemTypes">You can only select items of type(s): %0%</key>
-    <key alias="pickedTrashedItem">You have picked a content item currently deleted or in the recycle bin</key>
-    <key alias="pickedTrashedItems">You have picked content items currently deleted or in the recycle bin</key>
-  </area>
-  <area alias="mediaPicker">
-    <key alias="deletedItem">Deleted item</key>
-    <key alias="pickedTrashedItem">You have picked a media item currently deleted or in the recycle bin</key>
-    <key alias="pickedTrashedItems">You have picked media items currently deleted or in the recycle bin</key>
-    <key alias="trashed">Trashed</key>
-  </area>
-  <area alias="relatedlinks">
-    <key alias="enterExternal">enter external link</key>
-    <key alias="chooseInternal">choose internal page</key>
-    <key alias="caption">Caption</key>
-    <key alias="link">Link</key>
-    <key alias="newWindow">Open in new window</key>
-    <key alias="captionPlaceholder">enter the display caption</key>
-    <key alias="externalLinkPlaceholder">Enter the link</key>
-  </area>
-  <area alias="imagecropper">
-    <key alias="reset">Reset crop</key>
-    <key alias="saveCrop">Save crop</key>
-    <key alias="addCrop">Add new crop</key>
-    <key alias="updateEditCrop">Done</key>
-    <key alias="undoEditCrop">Undo edits</key>
-    <key alias="customCrop">User defined</key>
-  </area>
-  <area alias="rollback">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<language alias="en" intName="English (UK)" localName="English (UK)" lcid="" culture="en-GB">
+  <creator>
+    <name>The Umbraco community</name>
+    <link>https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files</link>
+  </creator>
+  <area alias="actions">
+    <key alias="assignDomain">Culture and Hostnames</key>
+    <key alias="auditTrail">Audit Trail</key>
+    <key alias="browse">Browse Node</key>
+    <key alias="changeDocType">Change Document Type</key>
+    <key alias="copy">Copy</key>
+    <key alias="create">Create</key>
+    <key alias="export">Export</key>
+    <key alias="createPackage">Create Package</key>
+    <key alias="createGroup">Create group</key>
+    <key alias="delete">Delete</key>
+    <key alias="disable">Disable</key>
+    <key alias="editSettings">Edit settings</key>
+    <key alias="emptyRecycleBin">Empty recycle bin</key>
+    <key alias="enable">Enable</key>
+    <key alias="exportDocumentType">Export Document Type</key>
+    <key alias="importDocumentType">Import Document Type</key>
+    <key alias="importPackage">Import Package</key>
+    <key alias="liveEdit">Edit in Canvas</key>
+    <key alias="logout">Exit</key>
+    <key alias="move">Move</key>
+    <key alias="notify">Notifications</key>
+    <key alias="protect">Restrict Public Access</key>
+    <key alias="publish">Publish</key>
+    <key alias="unpublish">Unpublish</key>
+    <key alias="refreshNode">Reload</key>
+    <key alias="republish">Republish entire site</key>
+    <key alias="remove">Remove</key>
+    <key alias="rename" version="7.3.0">Rename</key>
+    <key alias="restore" version="7.3.0">Restore</key>
+    <key alias="SetPermissionsForThePage">Set permissions for the page %0%</key>
+    <key alias="chooseWhereToCopy">Choose where to copy</key>
+    <key alias="chooseWhereToMove">Choose where to move</key>
+    <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
+    <key alias="infiniteEditorChooseWhereToCopy">Choose where to copy the selected item(s)</key>
+    <key alias="infiniteEditorChooseWhereToMove">Choose where to move the selected item(s)</key>
+    <key alias="wasMovedTo">was moved to</key>
+    <key alias="wasCopiedTo">was copied to</key>
+    <key alias="wasDeleted">was deleted</key>
+    <key alias="rights">Permissions</key>
+    <key alias="rollback">Rollback</key>
+    <key alias="sendtopublish">Send To Publish</key>
+    <key alias="sendToTranslate">Send To Translation</key>
+    <key alias="setGroup">Set group</key>
+    <key alias="sort">Sort</key>
+    <key alias="translate">Translate</key>
+    <key alias="update">Update</key>
+    <key alias="setPermissions">Set permissions</key>
+    <key alias="unlock">Unlock</key>
+    <key alias="createblueprint">Create Content Template</key>
+    <key alias="resendInvite">Resend Invitation</key>
+  </area>
+  <area alias="actionCategories">
+    <key alias="content">Content</key>
+    <key alias="administration">Administration</key>
+    <key alias="structure">Structure</key>
+    <key alias="other">Other</key>
+  </area>
+  <area alias="actionDescriptions">
+    <key alias="assignDomain">Allow access to assign culture and hostnames</key>
+    <key alias="auditTrail">Allow access to view a node's history log</key>
+    <key alias="browse">Allow access to view a node</key>
+    <key alias="changeDocType">Allow access to change document type for a node</key>
+    <key alias="copy">Allow access to copy a node</key>
+    <key alias="create">Allow access to create nodes</key>
+    <key alias="delete">Allow access to delete nodes</key>
+    <key alias="move">Allow access to move a node</key>
+    <key alias="protect">Allow access to set and change access restrictions for a node</key>
+    <key alias="publish">Allow access to publish a node</key>
+    <key alias="unpublish">Allow access to unpublish a node</key>
+    <key alias="rights">Allow access to change permissions for a node</key>
+    <key alias="rollback">Allow access to roll back a node to a previous state</key>
+    <key alias="sendtopublish">Allow access to send a node for approval before publishing</key>
+    <key alias="sendToTranslate">Allow access to send a node for translation</key>
+    <key alias="sort">Allow access to change the sort order for nodes</key>
+    <key alias="translate">Allow access to translate a node</key>
+    <key alias="update">Allow access to save a node</key>
+    <key alias="createblueprint">Allow access to create a Content Template</key>
+  </area>
+  <area alias="apps">
+    <key alias="umbContent">Content</key>
+    <key alias="umbInfo">Info</key>
+  </area>
+  <area alias="assignDomain">
+    <key alias="permissionDenied">Permission denied.</key>
+    <key alias="addNew">Add new Domain</key>
+    <key alias="remove">remove</key>
+    <key alias="invalidNode">Invalid node.</key>
+    <key alias="invalidDomain">One or more domains have an invalid format.</key>
+    <key alias="duplicateDomain">Domain has already been assigned.</key>
+    <key alias="language">Language</key>
+    <key alias="domain">Domain</key>
+    <key alias="domainCreated">New domain '%0%' has been created</key>
+    <key alias="domainDeleted">Domain '%0%' is deleted</key>
+    <key alias="domainExists">Domain '%0%' has already been assigned</key>
+    <key alias="domainUpdated">Domain '%0%' has been updated</key>
+    <key alias="orEdit">Edit Current Domains</key>
+    <key alias="domainHelpWithVariants">
+    	<![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080", or "https://www.example.com/".
+     Furthermore also one-level paths in domains are supported, eg. "example.com/en" or "/en".]]></key>
+    <key alias="inherit">Inherit</key>
+    <key alias="setLanguage">Culture</key>
+        <key alias="setLanguageHelp">
+            <![CDATA[Set the culture for nodes below the current node,<br /> or inherit culture from parent nodes. Will also apply<br />
+      to the current node, unless a domain below applies too.]]>
+        </key>
+    <key alias="setDomains">Domains</key>
+  </area>
+  <area alias="buttons">
+    <key alias="clearSelection">Clear selection</key>
+    <key alias="select">Select</key>
+    <key alias="somethingElse">Do something else</key>
+    <key alias="bold">Bold</key>
+    <key alias="deindent">Cancel Paragraph Indent</key>
+    <key alias="formFieldInsert">Insert form field</key>
+    <key alias="graphicHeadline">Insert graphic headline</key>
+    <key alias="htmlEdit">Edit Html</key>
+    <key alias="indent">Indent Paragraph</key>
+    <key alias="italic">Italic</key>
+    <key alias="justifyCenter">Center</key>
+    <key alias="justifyLeft">Justify Left</key>
+    <key alias="justifyRight">Justify Right</key>
+    <key alias="linkInsert">Insert Link</key>
+    <key alias="linkLocal">Insert local link (anchor)</key>
+    <key alias="listBullet">Bullet List</key>
+    <key alias="listNumeric">Numeric List</key>
+    <key alias="macroInsert">Insert macro</key>
+    <key alias="pictureInsert">Insert picture</key>
+    <key alias="publishAndClose">Publish and close</key>
+    <key alias="publishDescendants">Publish with descendants</key>
+    <key alias="relations">Edit relations</key>
+    <key alias="returnToList">Return to list</key>
+    <key alias="save">Save</key>
+    <key alias="saveAndClose">Save and close</key>
+    <key alias="saveAndPublish">Save and publish</key>
+    <key alias="saveAndSchedule">Save and schedule</key>
+    <key alias="saveToPublish">Save and send for approval</key>
+    <key alias="saveListView">Save list view</key>
+    <key alias="schedulePublish">Schedule</key>
+    <key alias="showPage">Preview</key>
+    <key alias="saveAndPreview">Save and preview</key>
+    <key alias="showPageDisabled">Preview is disabled because there's no template assigned</key>
+    <key alias="styleChoose">Choose style</key>
+    <key alias="styleShow">Show styles</key>
+    <key alias="tableInsert">Insert table</key>
+    <key alias="saveAndGenerateModels">Save and generate models</key>
+    <key alias="undo">Undo</key>
+    <key alias="redo">Redo</key>
+    <key alias="deleteTag">Delete tag</key>
+    <key alias="confirmActionCancel">Cancel</key>
+    <key alias="confirmActionConfirm">Confirm</key>
+	<key alias="morePublishingOptions">More publishing options</key>
+    <key alias="submitChanges">Submit</key>
+    <key alias="submitChangesAndClose">Submit and close</key>
+  </area>
+  <area alias="auditTrails">
+    <key alias="atViewingFor">Viewing for</key>
+    <key alias="delete">Content deleted</key>
+    <key alias="unpublish">Content unpublished</key>
+    <key alias="publish">Content saved and Published</key>
+    <key alias="publishvariant">Content saved and published for languages: %0% </key>
+    <key alias="save">Content saved</key>
+    <key alias="savevariant">Content saved for languages: %0%</key>
+    <key alias="move">Content moved</key>
+    <key alias="copy">Content copied</key>
+    <key alias="rollback">Content rolled back</key>
+    <key alias="sendtopublish">Content sent for publishing</key>
+    <key alias="sendtopublishvariant">Content sent for publishing for languages: %0%</key>
+    <key alias="sort">Sort child items performed by user</key>
+    <key alias="custom">%0%</key>
+    <key alias="smallCopy">Copy</key>
+    <key alias="smallPublish">Publish</key>
+    <key alias="smallPublishVariant">Publish</key>
+    <key alias="smallMove">Move</key>
+    <key alias="smallSave">Save</key>
+    <key alias="smallSaveVariant">Save</key>
+    <key alias="smallDelete">Delete</key>
+    <key alias="smallUnpublish">Unpublish</key>
+    <key alias="smallRollBack">Rollback</key>
+    <key alias="smallSendToPublish">Send To Publish</key>
+    <key alias="smallSendToPublishVariant">Send To Publish</key>
+    <key alias="smallSort">Sort</key>
+    <key alias="smallCustom">Custom</key>
+    <key alias="historyIncludingVariants">History (all variants)</key>
+  </area>
+  <area alias="changeDocType">
+    <key alias="changeDocTypeInstruction">To change the document type for the selected content, first select from the list of valid types for this location.</key>
+    <key alias="changeDocTypeInstruction2">Then confirm and/or amend the mapping of properties from the current type to the new, and click Save.</key>
+    <key alias="contentRepublished">The content has been re-published.</key>
+    <key alias="currentProperty">Current Property</key>
+    <key alias="currentType">Current type</key>
+    <key alias="docTypeCannotBeChanged">The document type cannot be changed, as there are no alternatives valid for this location.  An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it.</key>
+    <key alias="docTypeChanged">Document Type Changed</key>
+    <key alias="mapProperties">Map Properties</key>
+    <key alias="mapToProperty">Map to Property</key>
+    <key alias="newTemplate">New Template</key>
+    <key alias="newType">New Type</key>
+    <key alias="none">none</key>
+    <key alias="selectedContent">Content</key>
+    <key alias="selectNewDocType">Select New Document Type</key>
+    <key alias="successMessage">The document type of the selected content has been successfully changed to [new type] and the following properties mapped:</key>
+    <key alias="to">to</key>
+    <key alias="validationErrorPropertyWithMoreThanOneMapping">Could not complete property mapping as one or more properties have more than one mapping defined.</key>
+    <key alias="validDocTypesNote">Only alternate types valid for the current location are displayed.</key>
+  </area>
+  <area alias="codefile">
+    <key alias="createFolderFailedById">Failed to create a folder under parent with ID %0%</key>
+    <key alias="createFolderFailedByName">Failed to create a folder under parent with name %0%</key>
+    <key alias="createFolderIllegalChars">The folder name cannot contain illegal characters.</key>
+    <key alias="deleteItemFailed">Failed to delete item: %0%</key>
+  </area>
+  <area alias="content">
+    <key alias="isPublished" version="7.2">Is Published</key>
+    <key alias="about">About this page</key>
+    <key alias="alias">Alias</key>
+    <key alias="alternativeTextHelp">(how would you describe the picture over the phone)</key>
+    <key alias="alternativeUrls">Alternative Links</key>
+    <key alias="clickToEdit">Click to edit this item</key>
+    <key alias="createBy">Created by</key>
+    <key alias="createByDesc" version="7.0">Original author</key>
+    <key alias="updatedBy" version="7.0">Updated by</key>
+    <key alias="createDate">Created</key>
+    <key alias="createDateDesc" version="7.0">Date/time this document was created</key>
+    <key alias="documentType">Document Type</key>
+    <key alias="editing">Editing</key>
+    <key alias="expireDate">Remove at</key>
+    <key alias="itemChanged">This item has been changed after publication</key>
+    <key alias="itemNotPublished">This item is not published</key>
+    <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>
+    <key alias="memberrole">Role</key>
+    <key alias="membertype">Member Type</key>
+    <key alias="noChanges">No changes have been made</key>
+    <key alias="noDate">No date chosen</key>
+    <key alias="nodeName">Page title</key>
+    <key alias="noMediaLink">This media item has no link</key>
+    <key alias="otherElements">Properties</key>
+    <key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
+    <key alias="parentCultureNotPublished">This culture is published but is not visible because it is unpublished on parent '%0%'</key>
+    <key alias="parentNotPublishedAnomaly">This document is published but is not in the cache</key>
+    <key alias="getUrlException">Could not get the URL</key>
+    <key alias="routeError">This document is published but its URL would collide with content %0%</key>
+    <key alias="routeErrorCannotRoute">This document is published but its URL cannot be routed</key>
+    <key alias="publish">Publish</key>
+    <key alias="published">Published</key>
+    <key alias="publishedPendingChanges">Published (pending changes)</key>
+    <key alias="publishStatus">Publication Status</key>
+    <key alias="publishDescendantsHelp"><![CDATA[Publish <strong>%0%</strong> and all content items underneath and thereby making their content publicly available.]]></key>
+    <key alias="publishDescendantsWithVariantsHelp"><![CDATA[Publish variants and variants of same type underneath and thereby making their content publicly available.]]></key>
+    <key alias="releaseDate">Publish at</key>
+    <key alias="unpublishDate">Unpublish at</key>
+    <key alias="removeDate">Clear Date</key>
+    <key alias="setDate">Set date</key>
+    <key alias="sortDone">Sortorder is updated</key>
+    <key alias="sortHelp">To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the "shift" or "control" key while selecting</key>
+    <key alias="statistics">Statistics</key>
+    <key alias="titleOptional">Title (optional)</key>
+    <key alias="altTextOptional">Alternative text (optional)</key>
+    <key alias="captionTextOptional">Caption (optional)</key>
+    <key alias="type">Type</key>
+    <key alias="unpublish">Unpublish</key>
+    <key alias="unpublished">Unpublished</key>
+    <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="uploadClearImageContext">Click here to remove the image from the media item</key>
+    <key alias="uploadClearFileContext">Click here to remove the file from the media item</key>
+    <key alias="urls">Link to document</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>
+    <key alias="target" version="7.0">Target</key>
+    <key alias="scheduledPublishServerTime">This translates to the following time on the server:</key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">What does this mean?</a>]]></key>
+    <key alias="nestedContentDeleteItem">Are you sure you want to delete this item?</key>
+    <key alias="nestedContentEditorNotSupported">Property %0% uses editor %1% which is not supported by Nested Content.</key>
+    <key alias="nestedContentDeleteAllItems">Are you sure you want to delete all items?</key>
+    <key alias="nestedContentNoContentTypes">No content types are configured for this property.</key>
+    <key alias="nestedContentAddElementType">Add element type</key>
+    <key alias="nestedContentSelectElementTypeModalTitle">Select element type</key>
+    <key alias="nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the element type will be used.</key>
+    <key alias="nestedContentTemplateHelpTextPart1">Enter an angular expression to evaluate against each item for its name. Use</key>
+    <key alias="nestedContentTemplateHelpTextPart2">to display the item index</key>
+    <key alias="addTextBox">Add another text box</key>
+    <key alias="removeTextBox">Remove this text box</key>
+    <key alias="contentRoot">Content root</key>
+    <key alias="includeUnpublished">Include unpublished content items.</key>
+    <key alias="isSensitiveValue">This value is hidden. If you need access to view this value please contact your website administrator.</key>
+    <key alias="isSensitiveValue_short">This value is hidden.</key>
+    <key alias="languagesToPublishForFirstTime">What languages would you like to publish? All languages with content are saved!</key>
+    <key alias="languagesToPublish">What languages would you like to publish?</key>
+    <key alias="languagesToSave">What languages would you like to save?</key>
+    <key alias="languagesToSaveForFirstTime">All languages with content are saved on creation!</key>
+    <key alias="languagesToSendForApproval">What languages would you like to send for approval?</key>
+    <key alias="languagesToSchedule">What languages would you like to schedule?</key>
+    <key alias="languagesToUnpublish">Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages.</key>
+    <key alias="publishedLanguages">Published Languages</key>
+    <key alias="unpublishedLanguages">Unpublished Languages</key>
+    <key alias="unmodifiedLanguages">Unmodified Languages</key>
+    <key alias="untouchedLanguagesForFirstTime">These languages haven't been created</key>
+
+    <key alias="variantsWillBeSaved">All new variants will be saved.</key>
+    <key alias="variantsToPublish">Which variants would you like to publish?</key>
+    <key alias="variantsToSave">Choose which variants to be saved.</key>
+    <key alias="variantsToSendForApproval">Pick variants to send for approval.</key>
+    <key alias="variantsToSchedule">Set scheduled publishing...</key>
+    <key alias="variantsToUnpublish">Select the variants to unpublish. Unpublishing a mandatory language will unpublish all variants.</key>
+    <key alias="publishRequiresVariants">The following variants is required for publishing to take place:</key>
+
+    <key alias="notReadyToPublish">We are not ready to Publish</key>
+    <key alias="readyToPublish">Ready to publish?</key>
+    <key alias="readyToSave">Ready to Save?</key>
+    <key alias="sendForApproval">Send for approval</key>
+    <key alias="schedulePublishHelp">Select the date and time to publish and/or unpublish the content item.</key>
+    <key alias="createEmpty">Create new</key>
+    <key alias="createFromClipboard">Paste from clipboard</key>
+    <key alias="nodeIsInTrash">This item is in the Recycle Bin</key>
+  </area>
+  <area alias="blueprints">
+    <key alias="createBlueprintFrom">Create a new Content Template from '%0%'</key>
+    <key alias="blankBlueprint">Blank</key>
+    <key alias="selectBlueprint">Select a Content Template</key>
+    <key alias="createdBlueprintHeading">Content Template created</key>
+    <key alias="createdBlueprintMessage">A Content Template was created from '%0%'</key>
+    <key alias="duplicateBlueprintMessage">Another Content Template with the same name already exists</key>
+    <key alias="blueprintDescription">A Content Template is predefined content that an editor can select to use as the basis for creating new content</key>
+  </area>
+  <area alias="media">
+    <key alias="clickToUpload">Click to upload</key>
+    <key alias="orClickHereToUpload">or click here to choose files</key>
+    <key alias="dragFilesHereToUpload">You can drag files here to upload</key>
+    <key alias="disallowedFileType">Cannot upload this file, it does not have an approved file type</key>
+    <key alias="maxFileSize">Max file size is</key>
+    <key alias="mediaRoot">Media root</key>
+    <key alias="moveFailed">Failed to move media</key>
+    <key alias="copyFailed">Failed to copy media</key>
+    <key alias="createFolderFailed">Failed to create a folder under parent id %0%</key>
+    <key alias="renameFolderFailed">Failed to rename the folder with id %0%</key>
+    <key alias="dragAndDropYourFilesIntoTheArea">Drag and drop your file(s) into the area</key>
+  </area>
+  <area alias="member">
+    <key alias="createNewMember">Create a new member</key>
+    <key alias="allMembers">All Members</key>
+    <key alias="memberGroupNoProperties">Member groups have no additional properties for editing.</key>
+  </area>
+  <area alias="create">
+    <key alias="chooseNode">Where do you want to create the new %0%</key>
+    <key alias="createUnder">Create an item under</key>
+    <key alias="createContentBlueprint">Select the document type you want to make a content template for</key>
+    <key alias="enterFolderName">Enter a folder name</key>
+    <key alias="updateData">Choose a type and a title</key>
+    <key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed document types available for creating content here. You must enable these in <strong>Document Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
+    <key alias="noDocumentTypesAtRoot"><![CDATA[There are no document types available for creating content here. You must create these in <strong>Document Types</strong> within the <strong>Settings</strong> section.]]></key>
+    <key alias="noDocumentTypesWithNoSettingsAccess">The selected page in the content tree doesn't allow for any pages to be created below it.</key>
+    <key alias="noDocumentTypesEditPermissions">Edit permissions for this document type</key>
+    <key alias="noDocumentTypesCreateNew">Create a new document type</key>
+    <key alias="noDocumentTypesAllowedAtRoot"><![CDATA[There are no allowed document types available for creating content here. You must enable these in <strong>Document Types</strong> within the <strong>Settings</strong> section, by changing the <strong>Allow as root</strong> option under <strong>Permissions</strong>.]]></key>
+    <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed media types available for creating media here. You must enable these in <strong>Media Types Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node types</strong> under <strong>Permissions</strong>.]]></key>
+    <key alias="noMediaTypesWithNoSettingsAccess">The selected media in the tree doesn't allow for any other media to be created below it.</key>
+    <key alias="noMediaTypesEditPermissions">Edit permissions for this media type</key>
+    <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
+    <key alias="documentTypeWithTemplate">Document Type with Template</key>
+    <key alias="documentTypeWithTemplateDescription">The data definition for a content page that can be created by editors in the content tree and is directly accessible via a URL.</key>
+    <key alias="documentType">Document Type</key>
+    <key alias="documentTypeDescription">The data definition for a content component that can be created by editors in the content tree and be picked on other pages but has no direct URL.</key>
+    <key alias="elementType">Element Type</key>
+    <key alias="elementTypeDescription">Defines the schema for a repeating set of properties, for example, in a 'Block List' or 'Nested Content' property editor.</key>
+    <key alias="composition">Composition</key>
+    <key alias="compositionDescription">Defines a re-usable set of properties that can be included in the definition of multiple other Document Types. For example, a set of 'Common Page Settings'.</key>
+    <key alias="folder">Folder</key>
+    <key alias="folderDescription">Used to organise the Document Types, Compositions and Element Types created in this Document Type tree.</key>
+    <key alias="newFolder">New folder</key>
+    <key alias="newDataType">New data type</key>
+    <key alias="newJavascriptFile">New JavaScript file</key>
+    <key alias="newEmptyPartialView">New empty partial view</key>
+    <key alias="newPartialViewMacro">New partial view macro</key>
+    <key alias="newPartialViewFromSnippet">New partial view from snippet</key>
+    <key alias="newPartialViewMacroFromSnippet">New partial view macro from snippet</key>
+    <key alias="newPartialViewMacroNoMacro">New partial view macro (without macro)</key>
+    <key alias="newStyleSheetFile">New style sheet file</key>
+    <key alias="newRteStyleSheetFile">New Rich Text Editor style sheet file</key>
+  </area>
+  <area alias="dashboard">
+    <key alias="browser">Browse your website</key>
+    <key alias="dontShowAgain">- Hide</key>
+    <key alias="nothinghappens">If Umbraco isn't opening, you might need to allow popups from this site</key>
+    <key alias="openinnew">has opened in a new window</key>
+    <key alias="restart">Restart</key>
+    <key alias="visit">Visit</key>
+    <key alias="welcome">Welcome</key>
+  </area>
+  <area alias="prompt">
+    <key alias="stay">Stay</key>
+    <key alias="discardChanges">Discard changes</key>
+    <key alias="unsavedChanges">You have unsaved changes</key>
+    <key alias="unsavedChangesWarning">Are you sure you want to navigate away from this page? - you have unsaved changes</key>
+    <key alias="confirmListViewPublish">Publishing will make the selected items visible on the site.</key>
+    <key alias="confirmListViewUnpublish">Unpublishing will remove the selected items and all their descendants from the site.</key>
+    <key alias="confirmUnpublish">Unpublishing will remove this page and all its descendants from the site.</key>
+    <key alias="doctypeChangeWarning">You have unsaved changes. Making changes to the Document Type will discard the changes.</key>
+  </area>
+  <area alias="bulk">
+    <key alias="done">Done</key>
+    <key alias="deletedItem">Deleted %0% item</key>
+    <key alias="deletedItems">Deleted %0% items</key>
+    <key alias="deletedItemOfItem">Deleted %0% out of %1% item</key>
+    <key alias="deletedItemOfItems">Deleted %0% out of %1% items</key>
+    <key alias="publishedItem">Published %0% item</key>
+    <key alias="publishedItems">Published %0% items</key>
+    <key alias="publishedItemOfItem">Published %0% out of %1% item</key>
+    <key alias="publishedItemOfItems">Published %0% out of %1% items</key>
+    <key alias="unpublishedItem">Unpublished %0% item</key>
+    <key alias="unpublishedItems">Unpublished %0% items</key>
+    <key alias="unpublishedItemOfItem">Unpublished %0% out of %1% item</key>
+    <key alias="unpublishedItemOfItems">Unpublished %0% out of %1% items</key>
+    <key alias="movedItem">Moved %0% item</key>
+    <key alias="movedItems">Moved %0% items</key>
+    <key alias="movedItemOfItem">Moved %0% out of %1% item</key>
+    <key alias="movedItemOfItems">Moved %0% out of %1% items</key>
+    <key alias="copiedItem">Copied %0% item</key>
+    <key alias="copiedItems">Copied %0% items</key>
+    <key alias="copiedItemOfItem">Copied %0% out of %1% item</key>
+    <key alias="copiedItemOfItems">Copied %0% out of %1% items</key>
+  </area>
+  <area alias="defaultdialogs">
+    <key alias="nodeNameLinkPicker">Link title</key>
+    <key alias="urlLinkPicker">Link</key>
+    <key alias="anchorLinkPicker">Anchor / querystring</key>
+    <key alias="anchorInsert">Name</key>
+    <key alias="assignDomain">Manage hostnames</key>
+    <key alias="closeThisWindow">Close this window</key>
+    <key alias="confirmdelete">Are you sure you want to delete</key>
+    <key alias="confirmdeleteXofX">Are you sure you want to delete %0% based on %1%</key>
+    <key alias="confirmdisable">Are you sure you want to disable</key>
+    <key alias="confirmremove">Are you sure you want to remove</key>
+    <key alias="confirmremoveusageof"><![CDATA[Are you sure you want to remove the usage of <b>%0%</b>]]></key>
+    <key alias="confirmremovereferenceto"><![CDATA[Are you sure you want to remove the reference to <b>%0%</b>]]></key>
+    <key alias="confirmlogout">Are you sure?</key>
+    <key alias="confirmSure">Are you sure?</key>
+    <key alias="cut">Cut</key>
+    <key alias="editdictionary">Edit Dictionary Item</key>
+    <key alias="editlanguage">Edit Language</key>
+    <key alias="editSelectedMedia">Edit selected media</key>
+    <key alias="insertAnchor">Insert local link</key>
+    <key alias="insertCharacter">Insert character</key>
+    <key alias="insertgraphicheadline">Insert graphic headline</key>
+    <key alias="insertimage">Insert picture</key>
+    <key alias="insertlink">Insert link</key>
+    <key alias="insertMacro">Click to add a Macro</key>
+    <key alias="inserttable">Insert table</key>
+    <key alias="languagedeletewarning">This will delete the language</key>
+    <key alias="languageChangeWarning">Changing the culture for a language may be an expensive operation and will result in the content cache and indexes being rebuilt</key>
+    <key alias="lastEdited">Last Edited</key>
+    <key alias="link">Link</key>
+    <key alias="linkinternal">Internal link:</key>
+    <key alias="linklocaltip">When using local links, insert "#" in front of link</key>
+    <key alias="linknewwindow">Open in new window?</key>
+	<key alias="macroContainerSettings">Macro Settings</key>
+    <key alias="macroDoesNotHaveProperties">This macro does not contain any properties you can edit</key>
+    <key alias="paste">Paste</key>
+    <key alias="permissionsEdit">Edit permissions for</key>
+    <key alias="permissionsSet">Set permissions for</key>
+    <key alias="permissionsSetForGroup">Set permissions for %0% for user group %1%</key>
+    <key alias="permissionsHelp">Select the users groups you want to set permissions for</key>
+    <key alias="recycleBinDeleting">The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place</key>
+    <key alias="recycleBinIsEmpty">The recycle bin is now empty</key>
+    <key alias="recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</key>
+    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]></key>
+    <key alias="regexSearchHelp">Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code', 'URL'.</key>
+    <key alias="removeMacro">Remove Macro</key>
+    <key alias="requiredField">Required Field</key>
+    <key alias="sitereindexed">Site is reindexed</key>
+    <key alias="siterepublished">The website cache has been refreshed. All publish content is now up to date. While all unpublished content is still unpublished</key>
+    <key alias="siterepublishHelp">The website cache will be refreshed. All published content will be updated, while unpublished content will stay unpublished.</key>
+    <key alias="tableColumns">Number of columns</key>
+    <key alias="tableRows">Number of rows</key>
+    <key alias="thumbnailimageclickfororiginal">Click on the image to see full size</key>
+    <key alias="treepicker">Pick item</key>
+    <key alias="viewCacheItem">View Cache Item</key>
+    <key alias="relateToOriginalLabel">Relate to original</key>
+    <key alias="includeDescendants">Include descendants</key>
+    <key alias="theFriendliestCommunity">The friendliest community</key>
+    <key alias="linkToPage">Link to page</key>
+    <key alias="openInNewWindow">Opens the linked document in a new window or tab</key>
+    <key alias="linkToMedia">Link to media</key>
+    <key alias="selectContentStartNode">Select content start node</key>
+    <key alias="selectMedia">Select media</key>
+    <key alias="selectMediaType">Select media type</key>
+    <key alias="selectIcon">Select icon</key>
+    <key alias="selectItem">Select item</key>
+    <key alias="selectLink">Select link</key>
+    <key alias="selectMacro">Select macro</key>
+    <key alias="selectContent">Select content</key>
+    <key alias="selectContentType">Select content type</key>
+    <key alias="selectMediaStartNode">Select media start node</key>
+    <key alias="selectMember">Select member</key>
+    <key alias="selectMemberGroup">Select member group</key>
+    <key alias="selectMemberType">Select member type</key>
+    <key alias="selectNode">Select node</key>
+    <key alias="selectSections">Select sections</key>
+    <key alias="selectUser">Select user</key>
+    <key alias="selectUsers">Select users</key>
+    <key alias="noIconsFound">No icons were found</key>
+    <key alias="noMacroParams">There are no parameters for this macro</key>
+    <key alias="noMacros">There are no macros available to insert</key>
+    <key alias="externalLoginProviders">External login providers</key>
+    <key alias="exceptionDetail">Exception Details</key>
+    <key alias="stacktrace">Stacktrace</key>
+    <key alias="innerException">Inner Exception</key>
+    <key alias="linkYour">Link your</key>
+    <key alias="unLinkYour">Un-link your</key>
+    <key alias="account">account</key>
+    <key alias="selectEditor">Select editor</key>
+    <key alias="selectSnippet">Select snippet</key>
+    <key alias="variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language, you should unpublish the node in that language instead.</key>
+    <key alias="propertyuserpickerremovewarning"><![CDATA[This will remove the user <b>%0%</b>.]]></key>
+    <key alias="userremovewarning"><![CDATA[This will remove the user <b>%0%</b> from the <b>%1%</b> group]]></key>
+    <key alias="yesRemove">Yes, remove</key>
+  </area>
+  <area alias="dictionary">
+    <key alias="noItems">There are no dictionary items.</key>
+  </area>
+  <area alias="dictionaryItem">
+    <key alias="description"><![CDATA[
+      Edit the different language versions for the dictionary item '<em>%0%</em>' below
+   ]]></key>
+    <key alias="displayName">Culture Name</key>
+    <key alias="changeKeyError"><![CDATA[
+      The key '%0%' already exists.
+   ]]></key>
+    <key alias="overviewTitle">Dictionary overview</key>
+  </area>
+  <area alias="examineManagement">
+    <key alias="configuredSearchers">Configured Searchers</key>
+    <key alias="configuredSearchersDescription">Shows properties and tools for any configured Searcher (i.e. such as a multi-index searcher)</key>
+    <key alias="fieldValues">Field values</key>
+    <key alias="healthStatus">Health status</key>
+    <key alias="healthStatusDescription">The health status of the index and if it can be read</key>
+    <key alias="indexers">Indexers</key>
+    <key alias="indexInfo">Index info</key>
+    <key alias="indexInfoDescription">Lists the properties of the index</key>
+    <key alias="manageIndexes">Manage Examine's indexes</key>
+    <key alias="manageIndexesDescription">Allows you to view the details of each index and provides some tools for managing the indexes</key>
+    <key alias="rebuildIndex">Rebuild index</key>
+    <key alias="rebuildIndexWarning"><![CDATA[
+      This will cause the index to be rebuilt.<br />
+      Depending on how much content there is in your site this could take a while.<br />
+      It is not recommended to rebuild an index during times of high website traffic or when editors are editing content.
+     ]]>
+    </key>
+    <key alias="searchers">Searchers</key>
+    <key alias="searchDescription">Search the index and view the results</key>
+    <key alias="tools">Tools</key>
+    <key alias="toolsDescription">Tools to manage the index</key>
+    <key alias="fields">fields</key>
+    <key alias="indexCannotRead">The index cannot be read and will need to be rebuilt</key>
+    <key alias="processIsTakingLonger">The process is taking longer than expected, check the umbraco log to see if there have been any errors during this operation</key>
+    <key alias="indexCannotRebuild">This index cannot be rebuilt because it has no assigned</key>
+    <key alias="iIndexPopulator">IIndexPopulator</key>
+  </area>
+  <area alias="placeholders">
+    <key alias="username">Enter your username</key>
+    <key alias="password">Enter your password</key>
+    <key alias="confirmPassword">Confirm your password</key>
+    <key alias="nameentity">Name the %0%...</key>
+    <key alias="entername">Enter a name...</key>
+    <key alias="enteremail">Enter an email...</key>
+    <key alias="enterusername">Enter a username...</key>
+    <key alias="label">Label...</key>
+    <key alias="enterDescription">Enter a description...</key>
+    <key alias="search">Type to search...</key>
+    <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="enterMessage">Enter a message...</key>
+    <key alias="usernameHint">Your username is usually your email</key>
+    <key alias="anchor">#value or ?key=value</key>
+    <key alias="enterAlias">Enter alias...</key>
+    <key alias="generatingAlias">Generating alias...</key>
+    <key alias="a11yCreateItem">Create item</key>
+    <key alias="a11yCreate">Create</key>
+    <key alias="a11yEdit">Edit</key>
+    <key alias="a11yName">Name</key>
+  </area>
+  <area alias="editcontenttype">
+    <key alias="createListView" version="7.2">Create custom list view</key>
+    <key alias="removeListView" version="7.2">Remove custom list view</key>
+    <key alias="aliasAlreadyExists">A content type, media type or member type with this alias already exists</key>
+  </area>
+  <area alias="renamecontainer">
+    <key alias="renamed">Renamed</key>
+    <key alias="enterNewFolderName">Enter a new folder name here</key>
+    <key alias="folderWasRenamed">%0% was renamed to %1%</key>
+  </area>
+  <area alias="editdatatype">
+    <key alias="addPrevalue">Add prevalue</key>
+    <key alias="dataBaseDatatype">Database datatype</key>
+    <key alias="guid">Property editor GUID</key>
+    <key alias="renderControl">Property editor</key>
+    <key alias="rteButtons">Buttons</key>
+    <key alias="rteEnableAdvancedSettings">Enable advanced settings for</key>
+    <key alias="rteEnableContextMenu">Enable context menu</key>
+    <key alias="rteMaximumDefaultImgSize">Maximum default size of inserted images</key>
+    <key alias="rteRelatedStylesheets">Related stylesheets</key>
+    <key alias="rteShowLabel">Show label</key>
+    <key alias="rteWidthAndHeight">Width and height</key>
+    <key alias="allPropTypes">All property types &amp; property data</key>
+    <key alias="willBeDeleted">using this data type will be deleted permanently, please confirm you want to delete these as well</key>
+    <key alias="yesDelete">Yes, delete</key>
+    <key alias="andAllRelated">and all property types &amp; property data using this data type</key>
+    <key alias="selectFolder">Select the folder to move</key>
+    <key alias="inTheTree">to in the tree structure below</key>
+    <key alias="wasMoved">was moved underneath</key>
+  </area>
+  <area alias="errorHandling">
+    <key alias="errorButDataWasSaved">Your data has been saved, but before you can publish this page there are some errors you need to fix first:</key>
+    <key alias="errorChangingProviderPassword">The current membership provider does not support changing password (EnablePasswordRetrieval need to be true)</key>
+    <key alias="errorExistsWithoutTab">%0% already exists</key>
+    <key alias="errorHeader">There were errors:</key>
+    <key alias="errorHeaderWithoutTab">There were errors:</key>
+    <key alias="errorInPasswordFormat">The password should be a minimum of %0% characters long and contain at least %1% non-alpha numeric character(s)</key>
+    <key alias="errorIntegerWithoutTab">%0% must be an integer</key>
+    <key alias="errorMandatory">The %0% field in the %1% tab is mandatory</key>
+    <key alias="errorMandatoryWithoutTab">%0% is a mandatory field</key>
+    <key alias="errorRegExp">%0% at %1% is not in a correct format</key>
+    <key alias="errorRegExpWithoutTab">%0% is not in a correct format</key>
+    <key alias="errorPropertyEditorNotSupportedInElementTypes">Property '%0%' uses editor '%1%' which is not supported in Element Types.</key>
+  </area>
+  <area alias="errors">
+    <key alias="receivedErrorFromServer">Received an error from the server</key>
+    <key alias="dissallowedMediaType">The specified file type has been disallowed by the administrator</key>
+    <key alias="codemirroriewarning">NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough.</key>
+    <key alias="contentTypeAliasAndNameNotNull">Please fill both alias and name on the new property type!</key>
+    <key alias="filePermissionsError">There is a problem with read/write access to a specific file or folder</key>
+    <key alias="macroErrorLoadingPartialView">Error loading Partial View script (file: %0%)</key>
+    <key alias="missingTitle">Please enter a title</key>
+    <key alias="missingType">Please choose a type</key>
+    <key alias="pictureResizeBiggerThanOrg">You're about to make the picture larger than the original size. Are you sure that you want to proceed?</key>
+    <key alias="startNodeDoesNotExists">Startnode deleted, please contact your administrator</key>
+    <key alias="stylesMustMarkBeforeSelect">Please mark content before changing style</key>
+    <key alias="stylesNoStylesOnPage">No active styles available</key>
+    <key alias="tableColMergeLeft">Please place cursor at the left of the two cells you wish to merge</key>
+    <key alias="tableSplitNotSplittable">You cannot split a cell that hasn't been merged.</key>
+    <key alias="propertyHasErrors">This property is invalid</key>
+  </area>
+  <area alias="general">
+    <key alias="about">About</key>
+    <key alias="action">Action</key>
+    <key alias="actions">Actions</key>
+    <key alias="add">Add</key>
+    <key alias="alias">Alias</key>
+    <key alias="all">All</key>
+    <key alias="areyousure">Are you sure?</key>
+    <key alias="back">Back</key>
+    <key alias="backToOverview">Back to overview</key>
+    <key alias="border">Border</key>
+    <key alias="by">by</key>
+    <key alias="cancel">Cancel</key>
+    <key alias="cellMargin">Cell margin</key>
+    <key alias="choose">Choose</key>
+    <key alias="clear">Clear</key>
+    <key alias="close">Close</key>
+    <key alias="closewindow">Close Window</key>
+    <key alias="comment">Comment</key>
+    <key alias="confirm">Confirm</key>
+    <key alias="constrain">Constrain</key>
+    <key alias="constrainProportions">Constrain proportions</key>
+    <key alias="content">Content</key>
+    <key alias="continue">Continue</key>
+    <key alias="copy">Copy</key>
+    <key alias="create">Create</key>
+    <key alias="database">Database</key>
+    <key alias="date">Date</key>
+    <key alias="default">Default</key>
+    <key alias="delete">Delete</key>
+    <key alias="deleted">Deleted</key>
+    <key alias="deleting">Deleting...</key>
+    <key alias="design">Design</key>
+    <key alias="dictionary">Dictionary</key>
+    <key alias="dimensions">Dimensions</key>
+    <key alias="discard">Discard</key>
+    <key alias="down">Down</key>
+    <key alias="download">Download</key>
+    <key alias="edit">Edit</key>
+    <key alias="edited">Edited</key>
+    <key alias="elements">Elements</key>
+    <key alias="email">Email</key>
+    <key alias="error">Error</key>
+    <key alias="field">Field</key>
+    <key alias="findDocument">Find</key>
+    <key alias="first">First</key>
+    <key alias="focalPoint">Focal point</key>
+    <key alias="general">General</key>
+    <key alias="groups">Groups</key>
+    <key alias="group">Group</key>
+    <key alias="height">Height</key>
+    <key alias="help">Help</key>
+    <key alias="hide">Hide</key>
+    <key alias="history">History</key>
+    <key alias="icon">Icon</key>
+    <key alias="id">Id</key>
+    <key alias="import">Import</key>
+    <key alias="includeFromsubFolders">Include subfolders in search</key>
+    <key alias="excludeFromSubFolders">Search only this folder</key>
+    <key alias="info">Info</key>
+    <key alias="innerMargin">Inner margin</key>
+    <key alias="insert">Insert</key>
+    <key alias="install">Install</key>
+    <key alias="invalid">Invalid</key>
+    <key alias="justify">Justify</key>
+    <key alias="label">Label</key>
+    <key alias="language">Language</key>
+    <key alias="last">Last</key>
+    <key alias="layout">Layout</key>
+    <key alias="links">Links</key>
+    <key alias="loading">Loading</key>
+    <key alias="locked">Locked</key>
+    <key alias="login">Login</key>
+    <key alias="logoff">Log off</key>
+    <key alias="logout">Logout</key>
+    <key alias="macro">Macro</key>
+    <key alias="mandatory">Mandatory</key>
+    <key alias="message">Message</key>
+    <key alias="move">Move</key>
+    <key alias="name">Name</key>
+    <key alias="new">New</key>
+    <key alias="next">Next</key>
+    <key alias="no">No</key>
+    <key alias="of">of</key>
+    <key alias="off">Off</key>
+    <key alias="ok">OK</key>
+    <key alias="open">Open</key>
+    <key alias="options">Options</key>
+    <key alias="on">On</key>
+    <key alias="or">or</key>
+    <key alias="orderBy">Order by</key>
+    <key alias="password">Password</key>
+    <key alias="path">Path</key>
+    <key alias="pleasewait">One moment please...</key>
+    <key alias="previous">Previous</key>
+    <key alias="properties">Properties</key>
+    <key alias="rebuild">Rebuild</key>
+    <key alias="reciept">Email to receive form data</key>
+    <key alias="recycleBin">Recycle Bin</key>
+    <key alias="recycleBinEmpty">Your recycle bin is empty</key>
+    <key alias="reload">Reload</key>
+    <key alias="remaining">Remaining</key>
+    <key alias="remove">Remove</key>
+    <key alias="rename">Rename</key>
+    <key alias="renew">Renew</key>
+    <key alias="required" version="7.0">Required</key>
+    <key alias="retrieve">Retrieve</key>
+    <key alias="retry">Retry</key>
+    <key alias="rights">Permissions</key>
+    <key alias="scheduledPublishing">Scheduled Publishing</key>
+    <key alias="search">Search</key>
+    <key alias="searchNoResult">Sorry, we can not find what you are looking for.</key>
+    <key alias="noItemsInList">No items have been added</key>
+    <key alias="server">Server</key>
+    <key alias="settings">Settings</key>
+    <key alias="show">Show</key>
+    <key alias="showPageOnSend">Show page on Send</key>
+    <key alias="size">Size</key>
+    <key alias="sort">Sort</key>
+    <key alias="status">Status</key>
+    <key alias="submit">Submit</key>
+    <key alias="success">Success</key>
+    <key alias="type">Type</key>
+    <key alias="typeToSearch">Type to search...</key>
+    <key alias="under">under</key>
+    <key alias="up">Up</key>
+    <key alias="update">Update</key>
+    <key alias="upgrade">Upgrade</key>
+    <key alias="upload">Upload</key>
+    <key alias="url">URL</key>
+    <key alias="user">User</key>
+    <key alias="username">Username</key>
+    <key alias="value">Value</key>
+    <key alias="view">View</key>
+    <key alias="welcome">Welcome...</key>
+    <key alias="width">Width</key>
+    <key alias="yes">Yes</key>
+    <key alias="folder">Folder</key>
+    <key alias="searchResults">Search results</key>
+    <key alias="reorder">Reorder</key>
+    <key alias="reorderDone">I am done reordering</key>
+    <key alias="preview">Preview</key>
+    <key alias="changePassword">Change password</key>
+    <key alias="to">to</key>
+    <key alias="listView">List view</key>
+    <key alias="saving">Saving...</key>
+    <key alias="current">current</key>
+    <key alias="embed">Embed</key>
+    <key alias="selected">selected</key>
+    <key alias="other">Other</key>
+    <key alias="articles">Articles</key>
+    <key alias="videos">Videos</key>
+    <key alias="installing">Installing</key>
+    <key alias="avatar">Avatar for</key>
+  </area>
+  <area alias="colors">
+    <key alias="blue">Blue</key>
+  </area>
+  <area alias="shortcuts">
+    <key alias="addGroup">Add group</key>
+    <key alias="addProperty">Add property</key>
+    <key alias="addEditor">Add editor</key>
+    <key alias="addTemplate">Add template</key>
+    <key alias="addChildNode">Add child node</key>
+    <key alias="addChild">Add child</key>
+    <key alias="editDataType">Edit data type</key>
+    <key alias="navigateSections">Navigate sections</key>
+    <key alias="shortcut">Shortcuts</key>
+    <key alias="showShortcuts">show shortcuts</key>
+    <key alias="toggleListView">Toggle list view</key>
+    <key alias="toggleAllowAsRoot">Toggle allow as root</key>
+    <key alias="commentLine">Comment/Uncomment lines</key>
+    <key alias="removeLine">Remove line</key>
+    <key alias="copyLineUp">Copy Lines Up</key>
+    <key alias="copyLineDown">Copy Lines Down</key>
+    <key alias="moveLineUp">Move Lines Up</key>
+    <key alias="moveLineDown">Move Lines Down</key>
+    <key alias="generalHeader">General</key>
+    <key alias="editorHeader">Editor</key>
+    <key alias="toggleAllowCultureVariants">Toggle allow culture variants</key>
+    <key alias="toggleAllowSegmentVariants">Toggle allow segmentation</key>
+  </area>
+  <area alias="graphicheadline">
+    <key alias="backgroundcolor">Background colour</key>
+    <key alias="bold">Bold</key>
+    <key alias="color">Text colour</key>
+    <key alias="font">Font</key>
+    <key alias="text">Text</key>
+  </area>
+  <area alias="headers">
+    <key alias="page">Page</key>
+  </area>
+  <area alias="installer">
+    <key alias="databaseErrorCannotConnect">The installer cannot connect to the database.</key>
+    <key alias="databaseErrorWebConfig">Could not save the web.config file. Please modify the connection string manually.</key>
+    <key alias="databaseFound">Your database has been found and is identified as</key>
+    <key alias="databaseHeader">Database configuration</key>
+        <key alias="databaseInstall">
+            <![CDATA[
+      Press the <strong>install</strong> button to install the Umbraco %0% database
+    ]]>
+        </key>
+    <key alias="databaseInstallDone"><![CDATA[Umbraco %0% has now been copied to your database. Press <strong>Next</strong> to proceed.]]></key>
+    <key alias="databaseNotFound"><![CDATA[<p>Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.</p>
+              <p>To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file. </p>
+              <p>
+              Click the <strong>retry</strong> button when
+              done.<br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">
+			              More information on editing web.config here</a>.</p>]]></key>
+    <key alias="databaseText"><![CDATA[To complete this step, you must know some information regarding your database server ("connection string").<br />
+        Please contact your ISP if necessary.
+        If you're installing on a local machine or server you might need information from your system administrator.]]></key>
+    <key alias="databaseUpgrade"><![CDATA[
+      <p>
+      Press the <strong>upgrade</strong> button to upgrade your database to Umbraco %0%</p>
+      <p>
+      Don't worry - no content will be deleted and everything will continue working afterwards!
+      </p>
+      ]]></key>
+    <key alias="databaseUpgradeDone"><![CDATA[Your database has been upgraded to the final version %0%.<br />Press <strong>Next</strong> to
+      proceed. ]]></key>
+    <key alias="databaseUpToDate"><![CDATA[Your current database is up-to-date!. Click <strong>next</strong> to continue the configuration wizard]]></key>
+    <key alias="defaultUserChangePass"><![CDATA[<strong>The Default users' password needs to be changed!</strong>]]></key>
+    <key alias="defaultUserDisabled"><![CDATA[<strong>The Default user has been disabled or has no access to Umbraco!</strong></p><p>No further actions needs to be taken. Click <b>Next</b> to proceed.]]></key>
+    <key alias="defaultUserPassChanged"><![CDATA[<strong>The Default user's password has been successfully changed since the installation!</strong></p><p>No further actions needs to be taken. Click <strong>Next</strong> to proceed.]]></key>
+    <key alias="defaultUserPasswordChanged">The password is changed!</key>
+    <key alias="greatStart">Get a great start, watch our introduction videos</key>
+    <key alias="licenseText">By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI.</key>
+    <key alias="None">Not installed yet.</key>
+    <key alias="permissionsAffectedFolders">Affected files and folders</key>
+    <key alias="permissionsAffectedFoldersMoreInfo">More information on setting up permissions for Umbraco here</key>
+    <key alias="permissionsAffectedFoldersText">You need to grant ASP.NET modify permissions to the following files/folders</key>
+    <key alias="permissionsAlmostPerfect"><![CDATA[<strong>Your permission settings are almost perfect!</strong><br /><br />
+        You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]></key>
+    <key alias="permissionsHowtoResolve">How to Resolve</key>
+    <key alias="permissionsHowtoResolveLink">Click here to read the text version</key>
+    <key alias="permissionsHowtoResolveText"><![CDATA[Watch our <strong>video tutorial</strong> on setting up folder permissions for Umbraco or read the text version.]]></key>
+    <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>Your permission settings might be an issue!</strong>
+      <br/><br />
+      You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]></key>
+    <key alias="permissionsNotReady"><![CDATA[<strong>Your permission settings are not ready for Umbraco!</strong>
+          <br /><br />
+          In order to run Umbraco, you'll need to update your permission settings.]]></key>
+    <key alias="permissionsPerfect"><![CDATA[<strong>Your permission settings are perfect!</strong><br /><br />
+              You are ready to run Umbraco and install packages!]]></key>
+    <key alias="permissionsResolveFolderIssues">Resolving folder issue</key>
+    <key alias="permissionsResolveFolderIssuesLink">Follow this link for more information on problems with ASP.NET and creating folders</key>
+    <key alias="permissionsSettingUpPermissions">Setting up folder permissions</key>
+    <key alias="permissionsText"><![CDATA[
+      Umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's.
+      It also stores temporary data (aka: cache) for enhancing the performance of your website.
+    ]]></key>
+    <key alias="runwayFromScratch">I want to start from scratch</key>
+    <key alias="runwayFromScratchText"><![CDATA[
+        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates.
+        (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
+        You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
+      ]]></key>
+    <key alias="runwayHeader">You've just set up a clean Umbraco platform. What do you want to do next?</key>
+    <key alias="runwayInstalled">Runway is installed</key>
+    <key alias="runwayInstalledText"><![CDATA[
+      You have the foundation in place. Select what modules you wish to install on top of it.<br />
+      This is our list of recommended modules, check off the ones you would like to install, or view the <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">full list of modules</a>
+      ]]></key>
+    <key alias="runwayOnlyProUsers">Only recommended for experienced users</key>
+    <key alias="runwaySimpleSite">I want to start with a simple website</key>
+    <key alias="runwaySimpleSiteText"><![CDATA[
+      <p>
+      "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
+        but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
+        Runway offers an easy foundation based on best practices to get you started faster than ever.
+        If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.
+        </p>
+        <small>
+        <em>Included with Runway:</em> Home page, Getting Started page, Installing Modules page.<br />
+        <em>Optional Modules:</em> Top Navigation, Sitemap, Contact, Gallery.
+        </small>
+      ]]></key>
+    <key alias="runwayWhatIsRunway">What is Runway</key>
+    <key alias="step1">Step 1/5 Accept license</key>
+    <key alias="step2">Step 2/5: Database configuration</key>
+    <key alias="step3">Step 3/5: Validating File Permissions</key>
+    <key alias="step4">Step 4/5: Check Umbraco security</key>
+    <key alias="step5">Step 5/5: Umbraco is ready to get you started</key>
+    <key alias="thankYou">Thank you for choosing Umbraco</key>
+    <key alias="theEndBrowseSite"><![CDATA[<h3>Browse your new site</h3>
+You installed Runway, so why not see how your new website looks.]]></key>
+    <key alias="theEndFurtherHelp"><![CDATA[<h3>Further help and information</h3>
+Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]></key>
+    <key alias="theEndHeader">Umbraco %0% is installed and ready for use</key>
+    <key alias="theEndInstallFailed"><![CDATA[To finish the installation, you'll need to
+        manually edit the <strong>/web.config file</strong> and update the AppSetting key <strong>UmbracoConfigurationStatus</strong> in the bottom to the value of <strong>'%0%'</strong>.]]></key>
+    <key alias="theEndInstallSuccess"><![CDATA[You can get <strong>started instantly</strong> by clicking the "Launch Umbraco" button below. <br />If you are <strong>new to Umbraco</strong>,
+you can find plenty of resources on our getting started pages.]]></key>
+    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Launch Umbraco</h3>
+To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]></key>
+    <key alias="Unavailable">Connection to database failed.</key>
+    <key alias="Version3">Umbraco Version 3</key>
+    <key alias="Version4">Umbraco Version 4</key>
+    <key alias="watch">Watch</key>
+    <key alias="welcomeIntro"><![CDATA[This wizard will guide you through the process of configuring <strong>Umbraco %0%</strong> for a fresh install or upgrading from version 3.0.
+                                <br /><br />
+                                Press <strong>"next"</strong> to start the wizard.]]></key>
+  </area>
+  <area alias="language">
+    <key alias="cultureCode">Culture Code</key>
+    <key alias="displayName">Culture Name</key>
+  </area>
+  <area alias="lockout">
+    <key alias="lockoutWillOccur">You've been idle and logout will automatically occur in</key>
+    <key alias="renewSession">Renew now to save your work</key>
+  </area>
+  <area alias="login">
+    <key alias="greeting0">Happy super Sunday</key>
+    <key alias="greeting1">Happy manic Monday </key>
+    <key alias="greeting2">Happy tubular Tuesday</key>
+    <key alias="greeting3">Happy wonderful Wednesday</key>
+    <key alias="greeting4">Happy thunderous Thursday</key>
+    <key alias="greeting5">Happy funky Friday</key>
+    <key alias="greeting6">Happy Caturday</key>
+    <key alias="instruction">Log in below</key>
+    <key alias="signInWith">Sign in with</key>
+    <key alias="timeout">Session timed out</key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
+    <key alias="forgottenPassword">Forgotten password?</key>
+    <key alias="forgottenPasswordInstruction">An email will be sent to the address specified with a link to reset your password</key>
+    <key alias="requestPasswordResetConfirmation">An email with password reset instructions will be sent to the specified address if it matched our records</key>
+    <key alias="showPassword">Show password</key>
+    <key alias="hidePassword">Hide password</key>
+    <key alias="returnToLogin">Return to login form</key>
+    <key alias="setPasswordInstruction">Please provide a new password</key>
+    <key alias="setPasswordConfirmation">Your Password has been updated</key>
+    <key alias="resetCodeExpired">The link you have clicked on is invalid or has expired</key>
+    <key alias="resetPasswordEmailCopySubject">Umbraco: Reset Password</key>
+    <key alias="resetPasswordEmailCopyFormat"><![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Password reset requested
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Your username to login to the Umbraco back-office is: <strong>%0%</strong>
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
+																<tbody>
+																	<tr>
+																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																				Click this link to reset your password
+																			</a>
+																		</td>
+																	</tr>
+																</tbody>
+															</table>
+														</p>
+														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
+															<table border='0' cellpadding='0' cellspacing='0'>
+																<tr>
+																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
+																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
+																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%1%'>%1%</a>
+																		</font>
+																	</td>
+																</tr>
+															</table>
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+		</html>
+	]]></key>
+  </area>
+  <area alias="main">
+    <key alias="dashboard">Dashboard</key>
+    <key alias="sections">Sections</key>
+    <key alias="tree">Content</key>
+  </area>
+  <area alias="moveOrCopy">
+    <key alias="choose">Choose page above...</key>
+    <key alias="copyDone">%0% has been copied to %1%</key>
+    <key alias="copyTo">Select where the document %0% should be copied to below</key>
+    <key alias="moveDone">%0% has been moved to %1%</key>
+    <key alias="moveTo">Select where the document %0% should be moved to below</key>
+    <key alias="nodeSelected">has been selected as the root of your new content, click 'ok' below.</key>
+    <key alias="noNodeSelected">No node selected yet, please select a node in the list above before clicking 'ok'</key>
+    <key alias="notAllowedByContentType">The current node is not allowed under the chosen node because of its type</key>
+    <key alias="notAllowedByPath">The current node cannot be moved to one of its subpages</key>
+    <key alias="notAllowedAtRoot">The current node cannot exist at the root</key>
+    <key alias="notValid">The action isn't allowed since you have insufficient permissions on 1 or more child documents.</key>
+    <key alias="relateToOriginal">Relate copied items to original</key>
+  </area>
+  <area alias="notifications">
+    <key alias="editNotifications"><![CDATA[Select your notification for <strong>%0%</strong>]]></key>
+    <key alias="notificationsSavedFor">Notification settings saved for</key>
+    <key alias="mailBody"><![CDATA[
+      Hi %0%
+
+      This is an automated mail to inform you that the task '%1%'
+      has been performed on the page '%2%'
+      by the user '%3%'
+
+      Go to http://%4%/#/content/content/edit/%5% to edit.
+
+      %6%
+
+      Have a nice day!
+
+      Cheers from the Umbraco robot
+    ]]></key>
+    <key alias="mailBodyVariantSummary">The following languages have been modified %0%</key>
+    <key alias="mailBodyHtml"><![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Hi %0%,
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															This is an automated mail to inform you that the task <strong>'%1%'</strong> has been performed on the page <a style="color: #392F54; text-decoration: none; -ms-word-break: break-all; word-break: break-all;" href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> by the user <strong>'%3%'</strong>
+														</p>
+														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
+															<tbody>
+																<tr>
+																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
+																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
+																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>EDIT</a> </td> </tr></tbody></table>
+																	</td>
+																</tr>
+															</tbody>
+														</table>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															<h3>Update summary:</h3>
+															%6%
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Have a nice day!<br /><br />
+															Cheers from the Umbraco robot
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+		</html>
+	]]></key>
+    <key alias="mailBodyVariantHtmlSummary"><![CDATA[<p>The following languages have been modified:</p>
+        %0%
+    ]]></key>
+    <key alias="mailSubject">[%0%] Notification about %1% performed on %2%</key>
+    <key alias="notifications">Notifications</key>
+  </area>
+  <area alias="packager">
+    <key alias="actions">Actions</key>
+    <key alias="created">Created</key>
+    <key alias="createPackage">Create package</key>
+    <key alias="chooseLocalPackageText"><![CDATA[
+      Choose Package from your machine, by clicking the Browse<br />
+         button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension.
+      ]]></key>
+    <key alias="deletewarning">This will delete the package</key>
+    <key alias="dropHere">Drop to upload</key>
+    <key alias="includeAllChildNodes">Include all child nodes</key>
+    <key alias="orClickHereToUpload">or click here to choose package file</key>
+    <key alias="uploadPackage">Upload package</key>
+    <key alias="localPackageDescription">Install a local package by selecting it from your machine. Only install packages from sources you know and trust</key>
+    <key alias="uploadAnother">Upload another package</key>
+    <key alias="cancelAndUploadAnother">Cancel and upload another package</key>
+    <key alias="accept">I accept</key>
+    <key alias="termsOfUse">terms of use</key>
+
+    <key alias="pathToFile">Path to file</key>
+    <key alias="pathToFileDescription">Absolute path to file (ie: /bin/umbraco.bin)</key>
+    <key alias="installed">Installed</key>
+    <key alias="installedPackages">Installed packages</key>
+    <key alias="installLocal">Install local</key>
+    <key alias="installFinish">Finish</key>
+    <key alias="noConfigurationView">This package has no configuration view</key>
+    <key alias="noPackagesCreated">No packages have been created yet</key>
+    <key alias="noPackages">You don’t have any packages installed</key>
+    <key alias="noPackagesDescription"><![CDATA[You don’t have any packages installed. Either install a local package by selecting it from your machine, or browse through available packages using the <strong>'Packages'</strong> icon in the top right of your screen]]></key>
+    <key alias="packageActions">Package Actions</key>
+    <key alias="packageAuthorUrl">Author URL</key>
+    <key alias="packageContent">Package Content</key>
+    <key alias="packageFiles">Package Files</key>
+    <key alias="packageIconUrl">Icon URL</key>
+    <key alias="packageInstall">Install package</key>
+    <key alias="packageLicense">License</key>
+    <key alias="packageLicenseUrl">License URL</key>
+    <key alias="packageProperties">Package Properties</key>
+    <key alias="packageSearch">Search for packages</key>
+    <key alias="packageSearchResults">Results for</key>
+    <key alias="packageNoResults">We couldn’t find anything for</key>
+    <key alias="packageNoResultsDescription">Please try searching for another package or browse through the categories</key>
+    <key alias="packagesPopular">Popular</key>
+    <key alias="packagesNew">New releases</key>
+    <key alias="packageHas">has</key>
+    <key alias="packageKarmaPoints">karma points</key>
+    <key alias="packageInfo">Information</key>
+    <key alias="packageOwner">Owner</key>
+    <key alias="packageContrib">Contributors</key>
+    <key alias="packageCreated">Created</key>
+    <key alias="packageCurrentVersion">Current version</key>
+    <key alias="packageNetVersion">.NET version</key>
+    <key alias="packageDownloads">Downloads</key>
+    <key alias="packageLikes">Likes</key>
+    <key alias="packageCompatibility">Compatibility</key>
+    <key alias="packageCompatibilityDescription">This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be guaranteed for versions reported below 100%</key>
+    <key alias="packageExternalSources">External sources</key>
+    <key alias="packageAuthor">Author</key>
+    <key alias="packageDocumentation">Documentation</key>
+    <key alias="packageMetaData">Package meta data</key>
+    <key alias="packageName">Package name</key>
+    <key alias="packageNoItemsHeader">Package doesn't contain any items</key>
+    <key alias="packageNoItemsText"><![CDATA[This package file doesn't contain any items to uninstall.<br/><br/>
+      You can safely remove this from the system by clicking "uninstall package" below.]]></key>
+    <key alias="packageOptions">Package options</key>
+    <key alias="packageReadme">Package readme</key>
+    <key alias="packageRepository">Package repository</key>
+    <key alias="packageUninstallConfirm">Confirm package uninstall</key>
+    <key alias="packageUninstalledHeader">Package was uninstalled</key>
+    <key alias="packageUninstalledText">The package was successfully uninstalled</key>
+    <key alias="packageUninstallHeader">Uninstall package</key>
+    <key alias="packageUninstallText"><![CDATA[You can unselect items you do not wish to remove, at this time, below. When you click "confirm uninstall" all checked-off items will be removed.<br />
+      <span style="color: Red; font-weight: bold;">Notice:</span> any documents, media etc depending on the items you remove, will stop working, and could lead to system instability,
+      so uninstall with caution. If in doubt, contact the package author.]]></key>
+    <key alias="packageVersion">Package version</key>
+    <key alias="packageAlreadyInstalled">Package already installed</key>
+    <key alias="targetVersionMismatch">This package cannot be installed, it requires a minimum Umbraco version of</key>
+    <key alias="installStateUninstalling">Uninstalling...</key>
+    <key alias="installStateDownloading">Downloading...</key>
+    <key alias="installStateImporting">Importing...</key>
+    <key alias="installStateInstalling">Installing...</key>
+    <key alias="installStateRestarting">Restarting, please wait...</key>
+    <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
+    <key alias="installStateCompleted">Please click 'Finish' to complete installation and reload the page.</key>
+    <key alias="installStateUploading">Uploading package...</key>
+  </area>
+  <area alias="paste">
+    <key alias="doNothing">Paste with full formatting (Not recommended)</key>
+    <key alias="errorMessage">The text you're trying to paste contains special characters or formatting. This could be caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so the pasted content will be more suitable for the web.</key>
+    <key alias="removeAll">Paste as raw text without any formatting at all</key>
+    <key alias="removeSpecialFormattering">Paste, but remove formatting (Recommended)</key>
+  </area>
+  <area alias="publicAccess">
+    <key alias="paGroups">Group based protection</key>
+    <key alias="paGroupsHelp">If you want to grant access to all members of specific member groups</key>
+    <key alias="paGroupsNoGroups">You need to create a member group before you can use group based authentication</key>
+    <key alias="paErrorPage">Error Page</key>
+    <key alias="paErrorPageHelp">Used when people are logged on, but do not have access</key>
+    <key alias="paHowWould"><![CDATA[Choose how to restrict access to the page <strong>%0%</strong>]]></key>
+    <key alias="paIsProtected"><![CDATA[<strong>%0%</strong> is now protected]]></key>
+    <key alias="paIsRemoved"><![CDATA[Protection removed from <strong>%0%</strong>]]></key>
+    <key alias="paLoginPage">Login Page</key>
+    <key alias="paLoginPageHelp">Choose the page that contains the login form</key>
+    <key alias="paRemoveProtection">Remove protection...</key>
+    <key alias="paRemoveProtectionConfirm"><![CDATA[Are you sure you want to remove the protection from the page <strong>%0%</strong>?]]></key>
+    <key alias="paSelectPages">Select the pages that contain login form and error messages</key>
+    <key alias="paSelectGroups"><![CDATA[Select the groups who have access to the page <strong>%0%</strong>]]></key>
+    <key alias="paSelectMembers"><![CDATA[Select the members who have access to the page <strong>%0%</strong>]]></key>
+    <key alias="paMembers">Specific members protection</key>
+    <key alias="paMembersHelp">If you wish to grant access to specific members</key>
+  </area>
+  <area alias="publish">
+    <key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
+      %0% could not be published because the item is scheduled for release.
+    ]]></key>
+    <key alias="contentPublishedFailedExpired"><![CDATA[
+      %0% could not be published because the item has expired.
+    ]]></key>
+    <key alias="contentPublishedFailedInvalid"><![CDATA[
+      %0% could not be published because these properties:  %1%  did not pass validation rules.
+    ]]></key>
+    <key alias="contentPublishedFailedByEvent"><![CDATA[
+      %0% could not be published, a 3rd party add-in cancelled the action.
+    ]]></key>
+    <key alias="contentPublishedFailedByParent"><![CDATA[
+      %0% can not be published, because a parent page is not published.
+    ]]></key>
+    <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% can not be published, because its missing a name.]]></key>
+    <key alias="includeUnpublished">Include unpublished subpages</key>
+    <key alias="inProgress">Publishing in progress - please wait...</key>
+    <key alias="inProgressCounter">%0% out of %1% pages have been published...</key>
+    <key alias="nodePublish">%0% has been published</key>
+    <key alias="nodePublishAll">%0% and subpages have been published</key>
+    <key alias="publishAll">Publish %0% and all its subpages</key>
+    <key alias="publishHelp"><![CDATA[Click <em>Publish</em> to publish <strong>%0%</strong> and thereby making its content publicly available.<br/><br />
+      You can publish this page and all its subpages by checking <em>Include unpublished subpages</em> below.
+      ]]></key>
+  </area>
+  <area alias="colorpicker">
+    <key alias="noColors">You have not configured any approved colours</key>
+  </area>
+  <area alias="contentPicker">
+    <key alias="allowedItemTypes">You can only select items of type(s): %0%</key>
+    <key alias="pickedTrashedItem">You have picked a content item currently deleted or in the recycle bin</key>
+    <key alias="pickedTrashedItems">You have picked content items currently deleted or in the recycle bin</key>
+  </area>
+  <area alias="mediaPicker">
+    <key alias="deletedItem">Deleted item</key>
+    <key alias="pickedTrashedItem">You have picked a media item currently deleted or in the recycle bin</key>
+    <key alias="pickedTrashedItems">You have picked media items currently deleted or in the recycle bin</key>
+    <key alias="trashed">Trashed</key>
+  </area>
+  <area alias="relatedlinks">
+    <key alias="enterExternal">enter external link</key>
+    <key alias="chooseInternal">choose internal page</key>
+    <key alias="caption">Caption</key>
+    <key alias="link">Link</key>
+    <key alias="newWindow">Open in new window</key>
+    <key alias="captionPlaceholder">enter the display caption</key>
+    <key alias="externalLinkPlaceholder">Enter the link</key>
+  </area>
+  <area alias="imagecropper">
+    <key alias="reset">Reset crop</key>
+    <key alias="saveCrop">Save crop</key>
+    <key alias="addCrop">Add new crop</key>
+    <key alias="updateEditCrop">Done</key>
+    <key alias="undoEditCrop">Undo edits</key>
+    <key alias="customCrop">User defined</key>
+  </area>
+  <area alias="rollback">
     <key alias="changes">Changes</key>
     <key alias="created">Created</key>
-    <key alias="currentVersion">Current version</key>
-    <key alias="diffHelp"><![CDATA[This shows the differences between the current version and the selected version<br /><del>Red</del> text will not be shown in the selected version. , <ins>green means added</ins>]]></key>
-    <key alias="documentRolledBack">Document has been rolled back</key>
+    <key alias="currentVersion">Current version</key>
+    <key alias="diffHelp"><![CDATA[This shows the differences between the current version and the selected version<br /><del>Red</del> text will not be shown in the selected version. , <ins>green means added</ins>]]></key>
+    <key alias="documentRolledBack">Document has been rolled back</key>
     <key alias="headline">Select a version to compare with the current version</key>
-    <key alias="htmlHelp">This displays the selected version as HTML, if you wish to see the difference between 2 versions at the same time, use the diff view</key>
-    <key alias="rollbackTo">Rollback to</key>
-    <key alias="selectVersion">Select version</key>
-    <key alias="view">View</key>
-  </area>
-  <area alias="scripts">
-    <key alias="editscript">Edit script file</key>
-  </area>
-  <area alias="sections">
-    <key alias="concierge">Concierge</key>
-    <key alias="content">Content</key>
-    <key alias="courier">Courier</key>
-    <key alias="developer">Developer</key>
-    <key alias="forms">Forms</key>
-    <key alias="help" version="7.0">Help</key>
-    <key alias="installer">Umbraco Configuration Wizard</key>
-    <key alias="media">Media</key>
-    <key alias="member">Members</key>
-    <key alias="newsletters">Newsletters</key>
-    <key alias="packages">Packages</key>
-    <key alias="settings">Settings</key>
-    <key alias="statistics">Statistics</key>
-    <key alias="translation">Translation</key>
-    <key alias="users">Users</key>
-  </area>
-  <area alias="help">
-    <key alias="tours">Tours</key>
-    <key alias="theBestUmbracoVideoTutorials">The best Umbraco video tutorials</key>
-    <key alias="umbracoForum">Visit our.umbraco.com</key>
-    <key alias="umbracoTv">Visit umbraco.tv</key>
-  </area>
-  <area alias="settings">
-    <key alias="defaulttemplate">Default template</key>
-    <key alias="importDocumentTypeHelp">To import a document type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen)</key>
-    <key alias="newtabname">New Tab Title</key>
-    <key alias="nodetype">Node type</key>
-    <key alias="objecttype">Type</key>
-    <key alias="stylesheet">Stylesheet</key>
-    <key alias="script">Script</key>
-    <key alias="tab">Tab</key>
-    <key alias="tabname">Tab Title</key>
-    <key alias="tabs">Tabs</key>
-    <key alias="contentTypeEnabled">Master Content Type enabled</key>
-    <key alias="contentTypeUses">This Content Type uses</key>
-    <key alias="asAContentMasterType">as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself</key>
-    <key alias="noPropertiesDefinedOnTab">No properties defined on this tab. Click on the "add a new property" link at the top to create a new property.</key>
-    <key alias="createMatchingTemplate">Create matching template</key>
-    <key alias="addIcon">Add icon</key>
-  </area>
-  <area alias="sort">
-    <key alias="sortOrder">Sort order</key>
-    <key alias="sortCreationDate">Creation date</key>
-    <key alias="sortDone">Sorting complete.</key>
-    <key alias="sortHelp">Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items</key>
-    <key alias="sortPleaseWait"><![CDATA[Please wait. Items are being sorted, this can take a while.]]></key>
-  </area>
-  <area alias="speechBubbles">
-    <key alias="validationFailedHeader">Validation</key>
-    <key alias="validationFailedMessage">Validation errors must be fixed before the item can be saved</key>
-    <key alias="operationFailedHeader">Failed</key>
-    <key alias="operationSavedHeader">Saved</key>
-    <key alias="invalidUserPermissionsText">Insufficient user permissions, could not complete the operation</key>
-    <key alias="operationCancelledHeader">Cancelled</key>
-    <key alias="operationCancelledText">Operation was cancelled by a 3rd party add-in</key>
-    <key alias="contentPublishedFailedByEvent">Publishing was cancelled by a 3rd party add-in</key>
-    <key alias="contentTypeDublicatePropertyType">Property type already exists</key>
-    <key alias="contentTypePropertyTypeCreated">Property type created</key>
-    <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Name: %0% <br /> DataType: %1%]]></key>
-    <key alias="contentTypePropertyTypeDeleted">Propertytype deleted</key>
-    <key alias="contentTypeSavedHeader">Document Type saved</key>
-    <key alias="contentTypeTabCreated">Tab created</key>
-    <key alias="contentTypeTabDeleted">Tab deleted</key>
-    <key alias="contentTypeTabDeletedText">Tab with id: %0% deleted</key>
-    <key alias="cssErrorHeader">Stylesheet not saved</key>
-    <key alias="cssSavedHeader">Stylesheet saved</key>
-    <key alias="cssSavedText">Stylesheet saved without any errors</key>
-    <key alias="dataTypeSaved">Datatype saved</key>
-    <key alias="dictionaryItemSaved">Dictionary item saved</key>
-    <key alias="editContentPublishedFailedByParent">Publishing failed because the parent page isn't published</key>
-    <key alias="editContentPublishedHeader">Content published</key>
-    <key alias="editContentPublishedText">and visible on the website</key>
-    <key alias="editContentSavedHeader">Content saved</key>
-    <key alias="editContentSavedText">Remember to publish to make changes visible</key>
-    <key alias="editContentSendToPublish">Sent For Approval</key>
-    <key alias="editContentSendToPublishText">Changes have been sent for approval</key>
-    <key alias="editMediaSaved">Media saved</key>
-    <key alias="editMemberGroupSaved">Member group saved</key>
-    <key alias="editMediaSavedText">Media saved without any errors</key>
-    <key alias="editMemberSaved">Member saved</key>
-    <key alias="editStylesheetPropertySaved">Stylesheet Property Saved</key>
-    <key alias="editStylesheetSaved">Stylesheet saved</key>
-    <key alias="editTemplateSaved">Template saved</key>
-    <key alias="editUserError">Error saving user (check log)</key>
-    <key alias="editUserSaved">User Saved</key>
-    <key alias="editUserTypeSaved">User type saved</key>
-    <key alias="editUserGroupSaved">User group saved</key>
-    <key alias="editCulturesAndHostnamesSaved">Cultures and hostnames saved</key>
-    <key alias="editCulturesAndHostnamesError">Error saving cultures and hostnames</key>
-    <key alias="fileErrorHeader">File not saved</key>
-    <key alias="fileErrorText">file could not be saved. Please check file permissions</key>
-    <key alias="fileSavedHeader">File saved</key>
-    <key alias="fileSavedText">File saved without any errors</key>
-    <key alias="languageSaved">Language saved</key>
-    <key alias="mediaTypeSavedHeader">Media Type saved</key>
-    <key alias="memberTypeSavedHeader">Member Type saved</key>
-    <key alias="memberGroupSavedHeader">Member Group saved</key>
-    <key alias="templateErrorHeader">Template not saved</key>
-    <key alias="templateErrorText">Please make sure that you do not have 2 templates with the same alias</key>
-    <key alias="templateSavedHeader">Template saved</key>
-    <key alias="templateSavedText">Template saved without any errors!</key>
-    <key alias="contentUnpublished">Content unpublished</key>
-    <key alias="partialViewSavedHeader">Partial view saved</key>
-    <key alias="partialViewSavedText">Partial view saved without any errors!</key>
-    <key alias="partialViewErrorHeader">Partial view not saved</key>
-    <key alias="partialViewErrorText">An error occurred saving the file.</key>
-    <key alias="permissionsSavedFor">Permissions saved for</key>
-    <key alias="deleteUserGroupsSuccess">Deleted %0% user groups</key>
-    <key alias="deleteUserGroupSuccess">%0% was deleted</key>
-    <key alias="enableUsersSuccess">Enabled %0% users</key>
-    <key alias="disableUsersSuccess">Disabled %0% users</key>
-    <key alias="enableUserSuccess">%0% is now enabled</key>
-    <key alias="disableUserSuccess">%0% is now disabled</key>
-    <key alias="setUserGroupOnUsersSuccess">User groups have been set</key>
-    <key alias="unlockUsersSuccess">Unlocked %0% users</key>
-    <key alias="unlockUserSuccess">%0% is now unlocked</key>
-    <key alias="memberExportedSuccess">Member was exported to file</key>
-    <key alias="memberExportedError">An error occurred while exporting the member</key>
-    <key alias="deleteUserSuccess">User %0% was deleted</key>
-    <key alias="resendInviteHeader">Invite user</key>
-    <key alias="resendInviteSuccess">Invitation has been re-sent to %0%</key>
-    <key alias="documentTypeExportedSuccess">Document type was exported to file</key>
-    <key alias="documentTypeExportedError">An error occurred while exporting the document type</key>
-  </area>
-  <area alias="stylesheet">
-    <key alias="addRule">Add style</key>
-    <key alias="editRule">Edit style</key>
-    <key alias="editorRules">Rich text editor styles</key>
-    <key alias="editorRulesHelp">Define the styles that should be available in the rich text editor for this stylesheet</key>
-    <key alias="editstylesheet">Edit stylesheet</key>
-    <key alias="editstylesheetproperty">Edit stylesheet property</key>
-    <key alias="nameHelp">The name displayed in the editor style selector</key>
-    <key alias="preview">Preview</key>
-    <key alias="previewHelp">How the text will look like in the rich text editor.</key>
-    <key alias="selector">Selector</key>
-    <key alias="selectorHelp">Uses CSS syntax, e.g. "h1" or ".redHeader"</key>
-    <key alias="styles">Styles</key>
-    <key alias="stylesHelp">The CSS that should be applied in the rich text editor, e.g. "color:red;"</key>
-    <key alias="tabCode">Code</key>
-    <key alias="tabRules">Editor</key>
-  </area>
-  <area alias="template">
-    <key alias="deleteByIdFailed">Failed to delete template with ID %0%</key>
-    <key alias="edittemplate">Edit template</key>
-    <key alias="insertSections">Sections</key>
-    <key alias="insertContentArea">Insert content area</key>
-    <key alias="insertContentAreaPlaceHolder">Insert content area placeholder</key>
-    <key alias="insert">Insert</key>
-    <key alias="insertDesc">Choose what to insert into your template</key>
-    <key alias="insertDictionaryItem">Dictionary item</key>
-    <key alias="insertDictionaryItemDesc">A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites.</key>
-    <key alias="insertMacro">Macro</key>
-    <key alias="insertMacroDesc">
-            A Macro is a configurable component which is great for
-            reusable parts of your design, where you need the option to provide parameters,
-            such as galleries, forms and lists.
-        </key>
-    <key alias="insertPageField">Value</key>
-    <key alias="insertPageFieldDesc">Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values.</key>
-    <key alias="insertPartialView">Partial view</key>
-    <key alias="insertPartialViewDesc">
-            A partial view is a separate template file which can be rendered inside another
-            template, it's great for reusing markup or for separating complex templates into separate files.
-        </key>
-    <key alias="mastertemplate">Master template</key>
-    <key alias="noMaster">No master</key>
-    <key alias="renderBody">Render child template</key>
-    <key alias="renderBodyDesc"><![CDATA[
-     Renders the contents of a child template, by inserting a
-     <code>@RenderBody()</code> placeholder.
-      ]]></key>
-    <key alias="defineSection">Define a named section</key>
-    <key alias="defineSectionDesc"><![CDATA[
-         Defines a part of your template as a named section by wrapping it in
-          <code>@section { ... }</code>. This can be rendered in a
-          specific area of the parent of this template, by using <code>@RenderSection</code>.
-      ]]></key>
-    <key alias="renderSection">Render a named section</key>
-    <key alias="renderSectionDesc"><![CDATA[
-      Renders a named area of a child template, by inserting a <code>@RenderSection(name)</code> placeholder.
-      This renders an area of a child template which is wrapped in a corresponding <code>@section [name]{ ... }</code> definition.
-      ]]></key>
-    <key alias="sectionName">Section Name</key>
-    <key alias="sectionMandatory">Section is mandatory</key>
-    <key alias="sectionMandatoryDesc">
-            If mandatory, the child template must contain a <code>@section</code> definition, otherwise an error is shown.
-        </key>
-    <key alias="queryBuilder">Query builder</key>
-    <key alias="itemsReturned">items returned, in</key>
-    <key alias="copyToClipboard">copy to clipboard</key>
-    <key alias="iWant">I want</key>
-    <key alias="allContent">all content</key>
-    <key alias="contentOfType">content of type "%0%"</key>
-    <key alias="from">from</key>
-    <key alias="websiteRoot">my website</key>
-    <key alias="where">where</key>
-    <key alias="and">and</key>
-    <key alias="is">is</key>
-    <key alias="isNot">is not</key>
-    <key alias="before">before</key>
-    <key alias="beforeIncDate">before (including selected date)</key>
-    <key alias="after">after</key>
-    <key alias="afterIncDate">after (including selected date)</key>
-    <key alias="equals">equals</key>
-    <key alias="doesNotEqual">does not equal</key>
-    <key alias="contains">contains</key>
-    <key alias="doesNotContain">does not contain</key>
-    <key alias="greaterThan">greater than</key>
-    <key alias="greaterThanEqual">greater than or equal to</key>
-    <key alias="lessThan">less than</key>
-    <key alias="lessThanEqual">less than or equal to</key>
-    <key alias="id">Id</key>
-    <key alias="name">Name</key>
-    <key alias="createdDate">Created Date</key>
-    <key alias="lastUpdatedDate">Last Updated Date</key>
-    <key alias="orderBy">order by</key>
-    <key alias="ascending">ascending</key>
-    <key alias="descending">descending</key>
-    <key alias="template">Template</key>
-  </area>
-  <area alias="grid">
-    <key alias="media">Image</key>
-    <key alias="macro">Macro</key>
-    <key alias="insertControl">Choose type of content</key>
-    <key alias="chooseLayout">Choose a layout</key>
-    <key alias="addRows">Add a row</key>
-    <key alias="addElement">Add content</key>
-    <key alias="dropElement">Drop content</key>
-    <key alias="settingsApplied">Settings applied</key>
-    <key alias="contentNotAllowed">This content is not allowed here</key>
-    <key alias="contentAllowed">This content is allowed here</key>
-    <key alias="clickToEmbed">Click to embed</key>
-    <key alias="clickToInsertImage">Click to insert image</key>
-    <key alias="placeholderImageCaption">Image caption...</key>
-    <key alias="placeholderWriteHere">Write here...</key>
-    <key alias="gridLayouts">Grid Layouts</key>
-    <key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
-    <key alias="addGridLayout">Add Grid Layout</key>
-    <key alias="addGridLayoutDetail">Adjust the layout by setting column widths and adding additional sections</key>
-    <key alias="rowConfigurations">Row configurations</key>
-    <key alias="rowConfigurationsDetail">Rows are predefined cells arranged horizontally</key>
-    <key alias="addRowConfiguration">Add row configuration</key>
-    <key alias="addRowConfigurationDetail">Adjust the row by setting cell widths and adding additional cells</key>
-    <key alias="columns">Columns</key>
-    <key alias="columnsDetails">Total combined number of columns in the grid layout</key>
-    <key alias="settings">Settings</key>
-    <key alias="settingsDetails">Configure what settings editors can change</key>
-    <key alias="styles">Styles</key>
-    <key alias="stylesDetails">Configure what styling editors can change</key>
-    <key alias="allowAllEditors">Allow all editors</key>
-    <key alias="allowAllRowConfigurations">Allow all row configurations</key>
-    <key alias="maxItems">Maximum items</key>
-    <key alias="maxItemsDescription">Leave blank or set to 0 for unlimited</key>
-    <key alias="setAsDefault">Set as default</key>
-    <key alias="chooseExtra">Choose extra</key>
-    <key alias="chooseDefault">Choose default</key>
-    <key alias="areAdded">are added</key>
-        <key alias="warning">Warning</key>
-        <key alias="youAreDeleting">You are deleting the row configuration</key>
-        <key alias="deletingARow">
-            Deleting a row configuration name will result in loss of data for any existing content that is based on this configuration.
-        </key>
-  </area>
-  <area alias="contentTypeEditor">
-    <key alias="compositions">Compositions</key>
-    <key alias="group">Group</key>
-    <key alias="noGroups">You have not added any groups</key>
-    <key alias="addGroup">Add group</key>
-    <key alias="inheritedFrom">Inherited from</key>
-    <key alias="addProperty">Add property</key>
-    <key alias="requiredLabel">Required label</key>
-    <key alias="enableListViewHeading">Enable list view</key>
-    <key alias="enableListViewDescription">Configures the content item to show a sortable and searchable list of its children, the children will not be shown in the tree</key>
-    <key alias="allowedTemplatesHeading">Allowed Templates</key>
-    <key alias="allowedTemplatesDescription">Choose which templates editors are allowed to use on content of this type</key>
-    <key alias="allowAsRootHeading">Allow as root</key>
-    <key alias="allowAsRootDescription">Allow editors to create content of this type in the root of the content tree.</key>
-    <key alias="childNodesHeading">Allowed child node types</key>
-    <key alias="childNodesDescription">Allow content of the specified types to be created underneath content of this type.</key>
-    <key alias="chooseChildNode">Choose child node</key>
-    <key alias="compositionsDescription">Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists.</key>
-    <key alias="compositionInUse">This content type is used in a composition, and therefore cannot be composed itself.</key>
-    <key alias="noAvailableCompositions">There are no content types available to use as a composition.</key>
-    <key alias="compositionRemoveWarning">Removing a composition will delete all the associated property data. Once you save the document type there's no way back.</key>
-    <key alias="availableEditors">Create new</key>
-    <key alias="reuse">Use existing</key>
-    <key alias="editorSettings">Editor settings</key>
-    <key alias="configuration">Configuration</key>
-    <key alias="yesDelete">Yes, delete</key>
-    <key alias="movedUnderneath">was moved underneath</key>
-    <key alias="copiedUnderneath">was copied underneath</key>
-    <key alias="folderToMove">Select the folder to move</key>
-    <key alias="folderToCopy">Select the folder to copy</key>
-    <key alias="structureBelow">to in the tree structure below</key>
-    <key alias="allDocumentTypes">All Document types</key>
-    <key alias="allDocuments">All Documents</key>
-    <key alias="allMediaItems">All media items</key>
-    <key alias="usingThisDocument">using this document type will be deleted permanently, please confirm you want to delete these as well.</key>
-    <key alias="usingThisMedia">using this media type will be deleted permanently, please confirm you want to delete these as well.</key>
-    <key alias="usingThisMember">using this member type will be deleted permanently, please confirm you want to delete these as well</key>
-    <key alias="andAllDocuments">and all documents using this type</key>
-    <key alias="andAllMediaItems">and all media items using this type</key>
-    <key alias="andAllMembers">and all members using this type</key>
-    <key alias="memberCanEdit">Member can edit</key>
-    <key alias="memberCanEditDescription">Allow this property value to be edited by the member on their profile page</key>
-    <key alias="isSensitiveData">Is sensitive data</key>
-    <key alias="isSensitiveDataDescription">Hide this property value from content editors that don't have access to view sensitive information</key>
-    <key alias="showOnMemberProfile">Show on member profile</key>
-    <key alias="showOnMemberProfileDescription">Allow this property value to be displayed on the member profile page</key>
-    <key alias="tabHasNoSortOrder">tab has no sort order</key>
-    <key alias="compositionUsageHeading">Where is this composition used?</key>
-    <key alias="compositionUsageSpecification">This composition is currently used in the composition of the following content types:</key>
-    <key alias="variantsHeading">Allow variations</key>
-    <key alias="cultureVariantHeading">Allow vary by culture</key>
-    <key alias="segmentVariantHeading">Allow segmentation</key>
-    <key alias="cultureVariantLabel">Vary by culture</key>
-    <key alias="segmentVariantLabel">Vary by segments</key>
-    <key alias="variantsDescription">Allow editors to create content of this type in different languages.</key>
-    <key alias="cultureVariantDescription">Allow editors to create content of different languages.</key>
-    <key alias="segmentVariantDescription">Allow editors to create segments of this content.</key>
-    <key alias="allowVaryByCulture">Allow varying by culture</key>
-    <key alias="allowVaryBySegment">Allow segmentation</key>
-    <key alias="elementType">Element type</key>
-    <key alias="elementHeading">Is an Element type</key>
-    <key alias="elementDescription">An Element type is meant to be used for instance in Nested Content, and not in the tree.</key>
-    <key alias="elementCannotToggle">A document type cannot be changed to an Element type once it has been used to create one or more content items.</key>
-    <key alias="elementDoesNotSupport">This is not applicable for an Element type</key>
-    <key alias="propertyHasChanges">You have made changes to this property. Are you sure you want to discard them?</key>
-  </area>
-  <area alias="languages">
-    <key alias="addLanguage">Add language</key>
-    <key alias="mandatoryLanguage">Mandatory language</key>
-    <key alias="mandatoryLanguageHelp">Properties on this language have to be filled out before the node can be published.</key>
-    <key alias="defaultLanguage">Default language</key>
-    <key alias="defaultLanguageHelp">An Umbraco site can only have one default language set.</key>
-    <key alias="changingDefaultLanguageWarning">Switching default language may result in default content missing.</key>
-    <key alias="fallsbackToLabel">Falls back to</key>
-    <key alias="noFallbackLanguageOption">No fall back language</key>
-    <key alias="fallbackLanguageDescription">To allow multi-lingual content to fall back to another language if not present in the requested language, select it here.</key>
-    <key alias="fallbackLanguage">Fall back language</key>
-    <key alias="none">none</key>
-  </area>
-
-  <area alias="macro">
-    <key alias="addParameter">Add parameter</key>
-    <key alias="editParameter">Edit parameter</key>
-    <key alias="enterMacroName">Enter macro name</key>
-    <key alias="parameters">Parameters</key>
-    <key alias="parametersDescription">Define the parameters that should be available when using this macro.</key>
-    <key alias="selectViewFile">Select partial view macro file</key>
-  </area>
-  <area alias="modelsBuilder">
-    <key alias="buildingModels">Building models</key>
-    <key alias="waitingMessage">this can take a bit of time, don't worry</key>
-    <key alias="modelsGenerated">Models generated</key>
-    <key alias="modelsGeneratedError">Models could not be generated</key>
-    <key alias="modelsExceptionInUlog">Models generation has failed, see exception in U log</key>
-  </area>
-  <area alias="templateEditor">
-    <key alias="addFallbackField">Add fallback field</key>
-    <key alias="fallbackField">Fallback field</key>
-    <key alias="addDefaultValue">Add default value</key>
-    <key alias="defaultValue">Default value</key>
-    <key alias="alternativeField">Fallback field</key>
-    <key alias="alternativeText">Default value</key>
-    <key alias="casing">Casing</key>
-    <key alias="encoding">Encoding</key>
-    <key alias="chooseField">Choose field</key>
-    <key alias="convertLineBreaks">Convert line breaks</key>
-    <key alias="convertLineBreaksDescription">Yes, convert line breaks</key>
-    <key alias="convertLineBreaksHelp">Replaces line breaks with 'br' html tag</key>
-    <key alias="customFields">Custom Fields</key>
-    <key alias="dateOnly">Date only</key>
-    <key alias="formatAndEncoding">Format and encoding</key>
-    <key alias="formatAsDate">Format as date</key>
-    <key alias="formatAsDateDescr">Format the value as a date, or a date with time, according to the active culture</key>
-    <key alias="htmlEncode">HTML encode</key>
-    <key alias="htmlEncodeHelp">Will replace special characters by their HTML equivalent.</key>
-    <key alias="insertedAfter">Will be inserted after the field value</key>
-    <key alias="insertedBefore">Will be inserted before the field value</key>
-    <key alias="lowercase">Lowercase</key>
-    <key alias="modifyOutput">Modify output</key>
-    <key alias="none">None</key>
-    <key alias="outputSample">Output sample</key>
-    <key alias="postContent">Insert after field</key>
-    <key alias="preContent">Insert before field</key>
-    <key alias="recursive">Recursive</key>
-    <key alias="recursiveDescr">Yes, make it recursive</key>
-    <key alias="separator">Separator</key>
-    <key alias="standardFields">Standard Fields</key>
-    <key alias="uppercase">Uppercase</key>
-    <key alias="urlEncode">URL encode</key>
-    <key alias="urlEncodeHelp">Will format special characters in URLs</key>
-    <key alias="usedIfAllEmpty">Will only be used when the field values above are empty</key>
-    <key alias="usedIfEmpty">This field will only be used if the primary field is empty</key>
-    <key alias="withTime">Date and time</key>
-  </area>
-  <area alias="translation">
-    <key alias="details">Translation details</key>
-    <key alias="DownloadXmlDTD">Download XML DTD</key>
-    <key alias="fields">Fields</key>
-    <key alias="includeSubpages">Include subpages</key>
-    <key alias="mailBody"><![CDATA[
-      Hi %0%
-
-      This is an automated mail to inform you that the document '%1%'
-      has been requested for translation into '%5%' by %2%.
-
-      Go to http://%3%/translation/details.aspx?id=%4% to edit.
-
-      Or log into Umbraco to get an overview of your translation tasks
-      http://%3%
-
-      Have a nice day!
-
-      Cheers from the Umbraco robot
-    ]]></key>
-    <key alias="noTranslators">No translator users found. Please create a translator user before you start sending content to translation</key>
-    <key alias="pageHasBeenSendToTranslation">The page '%0%' has been send to translation</key>
-    <key alias="sendToTranslate">Send the page '%0%' to translation</key>
-    <key alias="totalWords">Total words</key>
-    <key alias="translateTo">Translate to</key>
-    <key alias="translationDone">Translation completed.</key>
-    <key alias="translationDoneHelp">You can preview the pages, you've just translated, by clicking below. If the original page is found, you will get a comparison of the 2 pages.</key>
-    <key alias="translationFailed">Translation failed, the XML file might be corrupt</key>
-    <key alias="translationOptions">Translation options</key>
-    <key alias="translator">Translator</key>
-    <key alias="uploadTranslationXml">Upload translation XML</key>
-  </area>
-  <area alias="treeHeaders">
-    <key alias="content">Content</key>
-    <key alias="contentBlueprints">Content Templates</key>
-    <key alias="media">Media</key>
-    <key alias="cacheBrowser">Cache Browser</key>
-    <key alias="contentRecycleBin">Recycle Bin</key>
-    <key alias="createdPackages">Created packages</key>
-    <key alias="dataTypes">Data Types</key>
-    <key alias="dictionary">Dictionary</key>
-    <key alias="installedPackages">Installed packages</key>
-    <key alias="installSkin">Install skin</key>
-    <key alias="installStarterKit">Install starter kit</key>
-    <key alias="languages">Languages</key>
-    <key alias="localPackage">Install local package</key>
-    <key alias="macros">Macros</key>
-    <key alias="mediaTypes">Media Types</key>
-    <key alias="member">Members</key>
-    <key alias="memberGroups">Member Groups</key>
-    <key alias="memberRoles">Member Roles</key>
-    <key alias="memberTypes">Member Types</key>
-    <key alias="documentTypes">Document Types</key>
-    <key alias="relationTypes">Relation Types</key>
-    <key alias="packager">Packages</key>
-    <key alias="packages">Packages</key>
-    <key alias="partialViews">Partial Views</key>
-    <key alias="partialViewMacros">Partial View Macro Files</key>
-    <key alias="repositories">Install from repository</key>
-    <key alias="runway">Install Runway</key>
-    <key alias="runwayModules">Runway modules</key>
-    <key alias="scripting">Scripting Files</key>
-    <key alias="scripts">Scripts</key>
-    <key alias="stylesheets">Stylesheets</key>
-    <key alias="templates">Templates</key>
-    <key alias="logViewer">Log Viewer</key>
-    <key alias="users">Users</key>
-    <key alias="settingsGroup">Settings</key>
-    <key alias="templatingGroup">Templating</key>
-    <key alias="thirdPartyGroup">Third Party</key>
-  </area>
-  <area alias="update">
-    <key alias="updateAvailable">New update ready</key>
-    <key alias="updateDownloadText">%0% is ready, click here for download</key>
-    <key alias="updateNoServer">No connection to server</key>
-    <key alias="updateNoServerError">Error checking for update. Please review trace-stack for further information</key>
-  </area>
-  <area alias="user">
-    <key alias="access">Access</key>
-    <key alias="accessHelp">Based on the assigned groups and start nodes, the user has access to the following nodes</key>
-    <key alias="assignAccess">Assign access</key>
-    <key alias="administrators">Administrator</key>
-    <key alias="categoryField">Category field</key>
-    <key alias="createDate">User created</key>
-    <key alias="changePassword">Change Your Password</key>
-    <key alias="changePhoto">Change photo</key>
-    <key alias="newPassword">New password</key>
-    <key alias="noLockouts">hasn't been locked out</key>
-    <key alias="noPasswordChange">The password hasn't been changed</key>
-    <key alias="confirmNewPassword">Confirm new password</key>
-    <key alias="changePasswordDescription">You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button</key>
-    <key alias="contentChannel">Content Channel</key>
-    <key alias="createAnotherUser">Create another user</key>
-    <key alias="createUserHelp">Create new users to give them access to Umbraco. When a new user is created a password will be generated that you can share with the user.</key>
-    <key alias="descriptionField">Description field</key>
-    <key alias="disabled">Disable User</key>
-    <key alias="documentType">Document Type</key>
-    <key alias="editors">Editor</key>
-    <key alias="excerptField">Excerpt field</key>
-    <key alias="failedPasswordAttempts">Failed login attempts</key>
-    <key alias="goToProfile">Go to user profile</key>
-    <key alias="groupsHelp">Add groups to assign access and permissions</key>
-    <key alias="inviteAnotherUser">Invite another user</key>
-    <key alias="inviteUserHelp">Invite new users to give them access to Umbraco. An invite email will be sent to the user with information on how to log in to Umbraco. Invites last for 72 hours.</key>
-    <key alias="language">Language</key>
-    <key alias="languageHelp">Set the language you will see in menus and dialogs</key>
-    <key alias="lastLockoutDate">Last lockout date</key>
-    <key alias="lastLogin">Last login</key>
-    <key alias="lastPasswordChangeDate">Password last changed</key>
-    <key alias="loginname">Username</key>
-    <key alias="mediastartnode">Media start node</key>
-    <key alias="mediastartnodehelp">Limit the media library to a specific start node</key>
-    <key alias="mediastartnodes">Media start nodes</key>
-    <key alias="mediastartnodeshelp">Limit the media library to specific start nodes</key>
-    <key alias="modules">Sections</key>
-    <key alias="noConsole">Disable Umbraco Access</key>
-    <key alias="noLogin">has not logged in yet</key>
-    <key alias="oldPassword">Old password</key>
-    <key alias="password">Password</key>
-    <key alias="resetPassword">Reset password</key>
-    <key alias="passwordChanged">Your password has been changed!</key>
-    <key alias="passwordChangedGeneric">Password changed</key>
-    <key alias="passwordConfirm">Please confirm the new password</key>
-    <key alias="passwordEnterNew">Enter your new password</key>
-    <key alias="passwordIsBlank">Your new password cannot be blank!</key>
-    <key alias="passwordCurrent">Current password</key>
-    <key alias="passwordInvalid">Invalid current password</key>
-    <key alias="passwordIsDifferent">There was a difference between the new password and the confirmed password. Please try again!</key>
-    <key alias="passwordMismatch">The confirmed password doesn't match the new password!</key>
-    <key alias="permissionReplaceChildren">Replace child node permissions</key>
-    <key alias="permissionSelectedPages">You are currently modifying permissions for the pages:</key>
-    <key alias="permissionSelectPages">Select pages to modify their permissions</key>
-    <key alias="removePhoto">Remove photo</key>
-    <key alias="permissionsDefault">Default permissions</key>
-    <key alias="permissionsGranular">Granular permissions</key>
-    <key alias="permissionsGranularHelp">Set permissions for specific nodes</key>
-    <key alias="profile">Profile</key>
-    <key alias="searchAllChildren">Search all children</key>
-    <key alias="sectionsHelp">Add sections to give users access</key>
-    <key alias="selectUserGroups">Select user groups</key>
-    <key alias="noStartNode">No start node selected</key>
-    <key alias="noStartNodes">No start nodes selected</key>
-    <key alias="startnode">Content start node</key>
-    <key alias="startnodehelp">Limit the content tree to a specific start node</key>
-    <key alias="startnodes">Content start nodes</key>
-    <key alias="startnodeshelp">Limit the content tree to specific start nodes</key>
-    <key alias="updateDate">User last updated</key>
-    <key alias="userCreated">has been created</key>
-    <key alias="userCreatedSuccessHelp">The new user has successfully been created. To log in to Umbraco use the password below.</key>
-    <key alias="userManagement">User management</key>
-    <key alias="username">Name</key>
-    <key alias="userPermissions">User permissions</key>
-    <key alias="usergroup">User group</key>
-    <key alias="userInvited">has been invited</key>
-    <key alias="userInvitedSuccessHelp">An invitation has been sent to the new user with details about how to log in to Umbraco.</key>
-    <key alias="userinviteWelcomeMessage">Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password and add a picture for your avatar.</key>
-    <key alias="userinviteExpiredMessage">Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it.</key>
-        <key alias="userinviteAvatarMessage">Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo.</key>
-    <key alias="writer">Writer</key>
-    <key alias="change">Change</key>
-    <key alias="yourProfile" version="7.0">Your profile</key>
-    <key alias="yourHistory" version="7.0">Your recent history</key>
-    <key alias="sessionExpires" version="7.0">Session expires in</key>
-    <key alias="inviteUser">Invite user</key>
-    <key alias="createUser">Create user</key>
-    <key alias="sendInvite">Send invite</key>
-    <key alias="backToUsers">Back to users</key>
-    <key alias="inviteEmailCopySubject">Umbraco: Invitation</key>
-    <key alias="inviteEmailCopyFormat"><![CDATA[
-        <html>
-			<head>
-				<meta name='viewport' content='width=device-width'>
-				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-			</head>
-			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
-				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
-				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
-					<tr>
-						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
-							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
-								<tr>
-									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
-										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
-										<div> </div>
-										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
-									</td>
-									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
-					<tr>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
-							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
-								<br>
-								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
-									<tr>
-										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
-											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
-												<tr>
-													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
-														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
-															Hi %0%,
-														</h1>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															You have been invited by <a href="mailto:%4%" style="text-decoration: underline; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a> to the Umbraco Back Office.
-														</p>
-														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
-															Message from <a href="mailto:%1%" style="text-decoration: none; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a>:
-															<br/>
-															<em>%2%</em>
-														</p>
-														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
-															<tbody>
-																<tr>
-																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
-																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
-																			<tbody>
-																				<tr>
-																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
-																							Click this link to accept the invite
-																						</a>
-																					</td>
-																				</tr>
-																			</tbody>
-																		</table>
-																	</td>
-																</tr>
-															</tbody>
-														</table>
-														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
-															<table border='0' cellpadding='0' cellspacing='0'>
-																<tr>
-																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
-																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
-																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%3%'>%3%</a>
-																		</font>
-																	</td>
-																</tr>
-															</table>
-														</p>
-													</td>
-												</tr>
-											</table>
-										</td>
-									</tr>
-								</table>
-								<br><br><br>
-							</div>
-						</td>
-						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
-					</tr>
-				</table>
-			</body>
-    </html>]]></key>
-    <key alias="invite">Invite</key>
-    <key alias="defaultInvitationMessage">Resending invitation...</key>
-    <key alias="deleteUser">Delete User</key>
-    <key alias="deleteUserConfirmation">Are you sure you wish to delete this user account?</key>
-    <key alias="stateAll">All</key>
-    <key alias="stateActive">Active</key>
-    <key alias="stateDisabled">Disabled</key>
-    <key alias="stateLockedOut">Locked out</key>
-    <key alias="stateInvited">Invited</key>
-    <key alias="stateInactive">Inactive</key>
-    <key alias="sortNameAscending">Name (A-Z)</key>
-    <key alias="sortNameDescending">Name (Z-A)</key>
-    <key alias="sortCreateDateAscending">Newest</key>
-    <key alias="sortCreateDateDescending">Oldest</key>
-    <key alias="sortLastLoginDateDescending">Last login</key>
-    <key alias="noUserGroupsAdded">No user groups have been added</key>
-  </area>
-  <area alias="validation">
-    <key alias="validation">Validation</key>
-    <key alias="noValidation">No validation</key>
-    <key alias="validateAsEmail">Validate as an email address</key>
-    <key alias="validateAsNumber">Validate as a number</key>
-    <key alias="validateAsUrl">Validate as a URL</key>
-    <key alias="enterCustomValidation">...or enter a custom validation</key>
-    <key alias="fieldIsMandatory">Field is mandatory</key>
-    <key alias="mandatoryMessage">Enter a custom validation error message (optional)</key>
-    <key alias="validationRegExp">Enter a regular expression</key>
-    <key alias="validationRegExpMessage">Enter a custom validation error message (optional)</key>
-    <key alias="minCount">You need to add at least</key>
-    <key alias="maxCount">You can only have</key>
-    <key alias="items">items</key>
-    <key alias="itemsSelected">items selected</key>
-    <key alias="invalidDate">Invalid date</key>
-    <key alias="invalidNumber">Not a number</key>
-    <key alias="invalidEmail">Invalid email</key>
-    <key alias="customValidation">Custom validation</key>
-    <key alias="entriesShort"><![CDATA[Minimum %0% entries, requires <strong>%1%</strong> more.]]></key>
-    <key alias="entriesExceed"><![CDATA[Maximum %0% entries, <strong>%1%</strong> too many.]]></key>
-  </area>
-  <area alias="healthcheck">
-    <!-- The following keys get these tokens passed in:
-	     0: Current value
-		   1: Recommended value
-		   2: XPath
-		   3: Configuration file path
-	  -->
-    <key alias="checkSuccessMessage">Value is set to the recommended value: '%0%'.</key>
-    <key alias="rectifySuccessMessage">Value was set to '%1%' for XPath '%2%' in configuration file '%3%'.</key>
-    <key alias="checkErrorMessageDifferentExpectedValue">Expected value '%1%' for '%2%' in configuration file '%3%', but found '%0%'.</key>
-    <key alias="checkErrorMessageUnexpectedValue">Found unexpected value '%0%' for '%2%' in configuration file '%3%'.</key>
-    <!-- The following keys get these tokens passed in:
-	     0: Current value
-		   1: Recommended value
-	  -->
-    <key alias="customErrorsCheckSuccessMessage">Custom errors are set to '%0%'.</key>
-    <key alias="customErrorsCheckErrorMessage">Custom errors are currently set to '%0%'. It is recommended to set this to '%1%' before go live.</key>
-    <key alias="customErrorsCheckRectifySuccessMessage">Custom errors successfully set to '%0%'.</key>
-    <key alias="macroErrorModeCheckSuccessMessage">MacroErrors are set to '%0%'.</key>
-    <key alias="macroErrorModeCheckErrorMessage">MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'.</key>
-    <key alias="macroErrorModeCheckRectifySuccessMessage">MacroErrors are now set to '%0%'.</key>
-    <!-- The following keys get these tokens passed in:
-	     0: Current value
-		   1: Recommended value
-		   2: Server version
-	  -->
-    <key alias="trySkipIisCustomErrorsCheckSuccessMessage">Try Skip IIS Custom Errors is set to '%0%' and you're using IIS version '%1%'.</key>
-    <key alias="trySkipIisCustomErrorsCheckErrorMessage">Try Skip IIS Custom Errors is currently '%0%'. It is recommended to set this to '%1%' for your IIS version (%2%).</key>
-    <key alias="trySkipIisCustomErrorsCheckRectifySuccessMessage">Try Skip IIS Custom Errors successfully set to '%0%'.</key>
-    <!-- The following keys get predefined tokens passed in that are not all the same, like above -->
-    <key alias="configurationServiceFileNotFound">File does not exist: '%0%'.</key>
-    <key alias="configurationServiceNodeNotFound"><![CDATA[Unable to find <strong>'%0%'</strong> in config file <strong>'%1%'</strong>.]]></key>
-    <key alias="configurationServiceError">There was an error, check log for full error: %0%.</key>
-    <key alias="databaseSchemaValidationCheckDatabaseOk">Database - The database schema is correct for this version of Umbraco</key>
-    <key alias="databaseSchemaValidationCheckDatabaseErrors">%0% problems were detected with your database schema (Check the log for details)</key>
-    <key alias="databaseSchemaValidationCheckDatabaseLogMessage">Some errors were detected while validating the database schema against the current version of Umbraco.</key>
-    <key alias="httpsCheckValidCertificate">Your website's certificate is valid.</key>
-    <key alias="httpsCheckInvalidCertificate">Certificate validation error: '%0%'</key>
-    <key alias="httpsCheckExpiredCertificate">Your website's SSL certificate has expired.</key>
-    <key alias="httpsCheckExpiringCertificate">Your website's SSL certificate is expiring in %0% days.</key>
-    <key alias="healthCheckInvalidUrl">Error pinging the URL %0% - '%1%'</key>
-    <key alias="httpsCheckIsCurrentSchemeHttps">You are currently %0% viewing the site using the HTTPS scheme.</key>
-    <key alias="httpsCheckConfigurationRectifyNotPossible">The appSetting 'Umbraco.Core.UseHttps' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'.</key>
-    <key alias="httpsCheckConfigurationCheckResult">The appSetting 'Umbraco.Core.UseHttps' is set to '%0%' in your web.config file, your cookies are %1% marked as secure.</key>
-    <key alias="httpsCheckEnableHttpsError">Could not update the 'Umbraco.Core.UseHttps' setting in your web.config file. Error: %0%</key>
-    <!-- The following keys don't get tokens passed in -->
-    <key alias="httpsCheckEnableHttpsButton">Enable HTTPS</key>
-    <key alias="httpsCheckEnableHttpsDescription">Sets umbracoSSL setting to true in the appSettings of the web.config file.</key>
-    <key alias="httpsCheckEnableHttpsSuccess">The appSetting 'Umbraco.Core.UseHttps' is now set to 'true' in your web.config file, your cookies will be marked as secure.</key>
-    <key alias="rectifyButton">Fix</key>
-    <key alias="cannotRectifyShouldNotEqual">Cannot fix a check with a value comparison type of 'ShouldNotEqual'.</key>
-    <key alias="cannotRectifyShouldEqualWithValue">Cannot fix a check with a value comparison type of 'ShouldEqual' with a provided value.</key>
-    <key alias="valueToRectifyNotProvided">Value to fix check not provided.</key>
-    <key alias="compilationDebugCheckSuccessMessage">Debug compilation mode is disabled.</key>
-    <key alias="compilationDebugCheckErrorMessage">Debug compilation mode is currently enabled. It is recommended to disable this setting before go live.</key>
-    <key alias="compilationDebugCheckRectifySuccessMessage">Debug compilation mode successfully disabled.</key>
-    <key alias="traceModeCheckSuccessMessage">Trace mode is disabled.</key>
-    <key alias="traceModeCheckErrorMessage">Trace mode is currently enabled. It is recommended to disable this setting before go live.</key>
-    <key alias="traceModeCheckRectifySuccessMessage">Trace mode successfully disabled.</key>
-    <key alias="folderPermissionsCheckMessage">All folders have the correct permissions set.</key>
-    <!-- The following keys get these tokens passed in:
-	    0: Comma delimitted list of failed folder paths
-  	-->
-    <key alias="requiredFolderPermissionFailed"><![CDATA[The following folders must be set up with modify permissions but could not be acccessed: <strong>%0%</strong>.]]></key>
-    <key alias="optionalFolderPermissionFailed"><![CDATA[The following folders must be set up with modify permissions for certain Umbraco operations to function but could not be acccessed: <strong>%0%</strong>. If they aren't being written to no action need be taken.]]></key>
-    <key alias="filePermissionsCheckMessage">All files have the correct permissions set.</key>
-    <!-- The following keys get these tokens passed in:
-	    0: Comma delimitted list of failed folder paths
-  	-->
-    <key alias="requiredFilePermissionFailed"><![CDATA[The following files must be set up with write permissions but could not be acccessed: <strong>%0%</strong>.]]></key>
-    <key alias="optionalFilePermissionFailed"><![CDATA[The following files must be set up with write permissions for certain Umbraco operations to function but could not be acccessed: <strong>%0%</strong>. If they aren't being written to no action need be taken.]]></key>
-    <key alias="clickJackingCheckHeaderFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMEd by another was found.]]></key>
-    <key alias="clickJackingCheckHeaderNotFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMEd by another was not found.]]></key>
-    <key alias="setHeaderInConfig">Set Header in Config</key>
-    <key alias="clickJackingSetHeaderInConfigDescription">Adds a value to the httpProtocol/customHeaders section of web.config to prevent the site being IFRAMEd by other websites.</key>
-    <key alias="clickJackingSetHeaderInConfigSuccess">A setting to create a header preventing IFRAMEing of the site by other websites has been added to your web.config file.</key>
-    <key alias="setHeaderInConfigError">Could not update web.config file. Error: %0%</key>
-    <key alias="noSniffCheckHeaderFound"><![CDATA[The header or meta-tag <strong>X-Content-Type-Options</strong> used to protect against MIME sniffing vulnerabilities was found.]]></key>
-    <key alias="noSniffCheckHeaderNotFound"><![CDATA[The header or meta-tag <strong>X-Content-Type-Options</strong> used to protect against MIME sniffing vulnerabilities was not found.]]></key>
-    <key alias="noSniffSetHeaderInConfigDescription">Adds a value to the httpProtocol/customHeaders section of web.config to protect against MIME sniffing vulnerabilities.</key>
-    <key alias="noSniffSetHeaderInConfigSuccess">A setting to create a header protecting against MIME sniffing vulnerabilities has been added to your web.config file.</key>
-    <key alias="hSTSCheckHeaderFound"><![CDATA[The header <strong>Strict-Transport-Security</strong>, also known as the HSTS-header, was found.]]></key>
-    <key alias="hSTSCheckHeaderNotFound"><![CDATA[The header <strong>Strict-Transport-Security</strong> was not found.]]></key>
-    <key alias="hSTSSetHeaderInConfigDescription">Adds the header 'Strict-Transport-Security' with the value 'max-age=10886400' to the httpProtocol/customHeaders section of web.config. Use this fix only if you will have your domains running with https for the next 18 weeks (minimum).</key>
-    <key alias="hSTSSetHeaderInConfigSuccess">The HSTS header has been added to your web.config file.</key>
-    <key alias="xssProtectionCheckHeaderFound"><![CDATA[The header <strong>X-XSS-Protection</strong> was found.]]></key>
-    <key alias="xssProtectionCheckHeaderNotFound"><![CDATA[The header <strong>X-XSS-Protection</strong> was not found.]]></key>
-    <key alias="xssProtectionSetHeaderInConfigDescription">Adds the header 'X-XSS-Protection' with the value '1; mode=block' to the httpProtocol/customHeaders section of web.config. </key>
-    <key alias="xssProtectionSetHeaderInConfigSuccess">The X-XSS-Protection header has been added to your web.config file.</key>
-    <!-- The following key get these tokens passed in:
-	    0: Comma delimitted list of headers found
-  	-->
-    <key alias="excessiveHeadersFound"><![CDATA[The following headers revealing information about the website technology were found: <strong>%0%</strong>.]]></key>
-    <key alias="excessiveHeadersNotFound">No headers revealing information about the website technology were found.</key>
-    <key alias="smtpMailSettingsNotFound">In the Web.config file, system.net/mailsettings could not be found.</key>
-    <key alias="smtpMailSettingsHostNotConfigured">In the Web.config file system.net/mailsettings section, the host is not configured.</key>
-    <key alias="smtpMailSettingsConnectionSuccess">SMTP settings are configured correctly and the service is operating as expected.</key>
-    <key alias="smtpMailSettingsConnectionFail">The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the Web.config file system.net/mailsettings are correct.</key>
-    <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notification email has been set to <strong>%0%</strong>.]]></key>
-    <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notification email is still set to the default value of <strong>%0%</strong>.]]></key>
-    <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:</p>%2%</body></html>]]></key>
-    <key alias="scheduledHealthCheckEmailSubject">Umbraco Health Check Status: %0%</key>
-    <key alias="checkAllGroups">Check All Groups</key>
-    <key alias="checkGroup">Check group</key>
-    <key alias="helpText">
-        <![CDATA[
-        <p>The health checker evaluates various areas of your site for best practice settings, configuration, potential problems, etc. You can easily fix problems by pressing a button.
-        You can add your own health checks, have a look at <a href="https://our.umbraco.com/documentation/Extending/Healthcheck/" target="_blank" class="btn-link -underline">the documentation for more information</a> about custom health checks.</p>
-        ]]>
-    </key>
-  </area>
-  <area alias="redirectUrls">
-    <key alias="disableUrlTracker">Disable URL tracker</key>
-    <key alias="enableUrlTracker">Enable URL tracker</key>
-    <key alias="originalUrl">Original URL</key>
-    <key alias="redirectedTo">Redirected To</key>
-    <key alias="redirectUrlManagement">Redirect Url Management</key>
-    <key alias="panelInformation">The following URLs redirect to this content item:</key>
-    <key alias="noRedirects">No redirects have been made</key>
-    <key alias="noRedirectsDescription">When a published page gets renamed or moved a redirect will automatically be made to the new page.</key>
-    <key alias="confirmRemove">Are you sure you want to remove the redirect from '%0%' to '%1%'?</key>
-    <key alias="redirectRemoved">Redirect URL removed.</key>
-    <key alias="redirectRemoveError">Error removing redirect URL.</key>
-    <key alias="redirectRemoveWarning">This will remove the redirect</key>
-    <key alias="confirmDisable">Are you sure you want to disable the URL tracker?</key>
-    <key alias="disabledConfirm">URL tracker has now been disabled.</key>
-    <key alias="disableError">Error disabling the URL tracker, more information can be found in your log file.</key>
-    <key alias="enabledConfirm">URL tracker has now been enabled.</key>
-    <key alias="enableError">Error enabling the URL tracker, more information can be found in your log file.</key>
-  </area>
-  <area alias="emptyStates">
-    <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
-  </area>
-  <area alias="textbox">
-    <key alias="characters_left"><![CDATA[<strong>%0%</strong> characters left.]]></key>
-    <key alias="characters_exceed"><![CDATA[Maximum %0% characters, <strong>%1%</strong> too many.]]></key>
-  </area>
-  <area alias="recycleBin">
-    <key alias="contentTrashed">Trashed content with Id: {0} related to original parent content with Id: {1}</key>
-    <key alias="mediaTrashed">Trashed media with Id: {0} related to original parent media item with Id: {1}</key>
-    <key alias="itemCannotBeRestored">Cannot automatically restore this item</key>
-    <key alias="itemCannotBeRestoredHelpText">There is no location where this item can be automatically restored. You can move the item manually using the tree below.</key>
-    <key alias="wasRestored">was restored under</key>
-  </area>
-  <area alias="relationType">
-    <key alias="direction">Direction</key>
-    <key alias="parentToChild">Parent to child</key>
-    <key alias="bidirectional">Bidirectional</key>
-    <key alias="parent">Parent</key>
-    <key alias="child">Child</key>
-    <key alias="count">Count</key>
-    <key alias="relations">Relations</key>
-    <key alias="created">Created</key>
-    <key alias="comment">Comment</key>
-    <key alias="name">Name</key>
-    <key alias="noRelations">No relations for this relation type.</key>
-    <key alias="tabRelationType">Relation Type</key>
-    <key alias="tabRelations">Relations</key>
-  </area>
-  <area alias="dashboardTabs">
-    <key alias="contentIntro">Getting Started</key>
-    <key alias="contentRedirectManager">Redirect URL Management</key>
-    <key alias="mediaFolderBrowser">Content</key>
-    <key alias="settingsWelcome">Welcome</key>
-    <key alias="settingsExamine">Examine Management</key>
-    <key alias="settingsPublishedStatus">Published Status</key>
-    <key alias="settingsModelsBuilder">Models Builder</key>
-    <key alias="settingsHealthCheck">Health Check</key>
-    <key alias="settingsProfiler">Profiling</key>
-    <key alias="memberIntro">Getting Started</key>
-    <key alias="formsInstall">Install Umbraco Forms</key>
-  </area>
-  <area alias="visuallyHiddenTexts">
-    <key alias="goBack">Go back</key>
-    <key alias="activeListLayout">Active layout:</key>
-    <key alias="jumpTo">Jump to</key>
-    <key alias="group">group</key>
-    <key alias="passed">passed</key>
-    <key alias="warning">warning</key>
-    <key alias="failed">failed</key>
-    <key alias="suggestion">suggestion</key>
-    <key alias="checkPassed">Check passed</key>
-    <key alias="checkFailed">Check failed</key>
-    <key alias="openBackofficeSearch">Open backoffice search</key>
-    <key alias="openCloseBackofficeHelp">Open/Close backoffice help</key>
-    <key alias="openCloseBackofficeProfileOptions">Open/Close your profile options</key>
-    <key alias="assignDomainDescription">Setup Culture and Hostnames for %0%</key>
-    <key alias="createDescription">Create new node under %0%</key>
-    <key alias="protectDescription">Setup Public access on %0%</key>
-    <key alias="rightsDescription">Setup Permissions on %0%</key>
-    <key alias="sortDescription">Change sort order for %0%</key>
-    <key alias="createblueprintDescription">Create Content Template based on %0%</key>
-    <key alias="openContextMenu">Open context menu for</key>
-    <key alias="currentLanguage">Current language</key>
-    <key alias="switchLanguage">Switch language to</key>
-    <key alias="createNewFolder">Create new folder</key>
-    <key alias="newPartialView">Partial View</key>
-    <key alias="newPartialViewMacro">Partial View Macro</key>
-    <key alias="newMember">Member</key>
-    <key alias="newDataType">Data type</key>
-    <key alias="redirectDashboardSearchLabel">Search the redirect dashboard</key>
-    <key alias="userGroupSearchLabel">Search the user group section</key>
-    <key alias="userSearchLabel">Search the users section</key>
-    <key alias="createItem">Create item</key>
-    <key alias="create">Create</key>
-    <key alias="edit">Edit</key>
-    <key alias="name">Name</key>
-    <key alias="addNewRow">Add new row</key>
-    <key alias="tabExpand">View more options</key>
-  </area>
-  <area alias="references">
-    <key alias="tabName">References</key>
-    <key alias="DataTypeNoReferences">This Data Type has no references.</key>
-    <key alias="labelUsedByDocumentTypes">Used in Document Types</key>
-    <key alias="noDocumentTypes">No references to Document Types.</key>
-    <key alias="labelUsedByMediaTypes">Used in Media Types</key>
-    <key alias="noMediaTypes">No references to Media Types.</key>
-    <key alias="labelUsedByMemberTypes">Used in Member Types</key>
-    <key alias="noMemberTypes">No references to Member Types.</key>
-    <key alias="usedByProperties">Used by</key>
-    <key alias="labelUsedByDocuments">Used in Documents</key>
-    <key alias="labelUsedByMembers">Used in Members</key>
-    <key alias="labelUsedByMedia">Used in Media</key>
-  </area>
-  <area alias="logViewer">
-    <key alias="logLevels">Log Levels</key>
-    <key alias="savedSearches">Saved Searches</key>
-    <key alias="totalItems">Total Items</key>
-    <key alias="timestamp">Timestamp</key>
-    <key alias="level">Level</key>
-    <key alias="machine">Machine</key>
-    <key alias="message">Message</key>
-    <key alias="exception">Exception</key>
-    <key alias="properties">Properties</key>
-    <key alias="searchWithGoogle">Search With Google</key>
-    <key alias="searchThisMessageWithGoogle">Search this message with Google</key>
-    <key alias="searchWithBing">Search With Bing</key>
-    <key alias="searchThisMessageWithBing">Search this message with Bing</key>
-    <key alias="searchOurUmbraco">Search Our Umbraco</key>
-    <key alias="searchThisMessageOnOurUmbracoForumsAndDocs">Search this message on Our Umbraco forums and docs</key>
-    <key alias="searchOurUmbracoWithGoogle">Search Our Umbraco with Google</key>
-    <key alias="searchOurUmbracoForumsUsingGoogle">Search Our Umbraco forums using Google</key>
-    <key alias="searchUmbracoSource">Search Umbraco Source</key>
-    <key alias="searchWithinUmbracoSourceCodeOnGithub">Search within Umbraco source code on Github</key>
-    <key alias="searchUmbracoIssues">Search Umbraco Issues</key>
-    <key alias="searchUmbracoIssuesOnGithub">Search Umbraco Issues on Github</key>
-    <key alias="deleteThisSearch">Delete this search</key>
-    <key alias="findLogsWithRequestId">Find Logs with Request ID</key>
-    <key alias="findLogsWithNamespace">Find Logs with Namespace</key>
-    <key alias="findLogsWithMachineName">Find Logs with Machine Name</key>
-    <key alias="open">Open</key>
-  </area>
-  <area alias="clipboard">
-    <key alias="labelForCopyAllEntries">Copy %0%</key>
-    <key alias="labelForArrayOfItemsFrom">%0% from %1%</key>
-    <key alias="labelForRemoveAllEntries">Remove all items</key>
-  </area>
-  <area alias="propertyActions">
-    <key alias="tooltipForPropertyActionsMenu">Open Property Actions</key>
-  </area>
-  <area alias="nuCache">
-    <key alias="wait">Wait</key>
-    <key alias="refreshStatus">Refresh status</key>
-    <key alias="memoryCache">Memory Cache</key>
-    <key alias="memoryCacheDescription">
-        <![CDATA[
-            This button lets you reload the in-memory cache, by entirely reloading it from the database
-    cache (but it does not rebuild that database cache). This is relatively fast.
-    Use it when you think that the memory cache has not been properly refreshed, after some events
-    triggered&mdash;which would indicate a minor Umbraco issue.
-    (note: triggers the reload on all servers in an LB environment).
-    ]]>
-    </key>
-    <key alias="reload">Reload</key>
-    <key alias="databaseCache">Database Cache</key>
-    <key alias="databaseCacheDescription">
-        <![CDATA[
-    This button lets you rebuild the database cache, ie the content of the cmsContentNu table.
-    <strong>Rebuilding can be expensive.</strong>
-    Use it when reloading is not enough, and you think that the database cache has not been
-    properly generated&mdash;which would indicate some critical Umbraco issue.
-    ]]>
-    </key>
-    <key alias="rebuild">Rebuild</key>
-    <key alias="internals">Internals</key>
-    <key alias="internalsDescription">
-        <![CDATA[
-    This button lets you trigger a NuCache snapshots collection (after running a fullCLR GC).
-    Unless you know what that means, you probably do <em>not</em> need to use it.
-    ]]>
-    </key>
-    <key alias="collect">Collect</key>
-    <key alias="publishedCacheStatus">Published Cache Status</key>
-    <key alias="caches">Caches</key>
-  </area>
-  <area alias="profiling">
-    <key alias="performanceProfiling">Performance profiling</key>
-    <key alias="performanceProfilingDescription">
-        <![CDATA[
-            <p>
-                Umbraco currently runs in debug mode. This means you can use the built-in performance profiler to assess the performance when rendering pages.
-            </p>
-            <p>
-                If you want to activate the profiler for a specific page rendering, simply add <b>umbDebug=true</b> to the querystring when requesting the page.
-            </p>
-            <p>
-                If you want the profiler to be activated by default for all page renderings, you can use the toggle below.
-                It will set a cookie in your browser, which then activates the profiler automatically.
-                In other words, the profiler will only be active by default in <i>your</i> browser - not everyone else's.
-            </p>
-    ]]>
-    </key>
-    <key alias="activateByDefault">Activate the profiler by default</key>
-    <key alias="reminder">Friendly reminder</key>
-    <key alias="reminderDescription">
-        <![CDATA[
-        <p>
-            You should never let a production site run in debug mode. Debug mode is turned off by setting <b>debug="false"</b> on the <b>&lt;compilation /&gt;</b> element in web.config.
-        </p>
-    ]]>
-    </key>
-    <key alias="profilerEnabledDescription">
-        <![CDATA[
-        <p>
-            Umbraco currently does not run in debug mode, so you can't use the built-in profiler. This is how it should be for a production site.
-        </p>
-        <p>
-            Debug mode is turned on by setting <b>debug="true"</b> on the <b>&lt;compilation /&gt;</b> element in web.config.
-        </p>
-    ]]>
-    </key>
-  </area>
-  <area alias="settingsDashboardVideos">
-    <key alias="trainingHeadline">Hours of Umbraco training videos are only a click away</key>
-    <key alias="trainingDescription">
-        <![CDATA[
-            <p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="http://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos</p>
-        ]]>
-    </key>
-    <key alias="getStarted">To get you started</key>
-  </area>
-  <area alias="settingsDashboard">
-    <key alias="start">Start here</key>
-    <key alias="startDescription">This section contains the building blocks for your Umbraco site. Follow the below links to find out more about working with the items in the Settings section</key>
-    <key alias="more">Find out more</key>
-    <key alias="bulletPointOne">
-        <![CDATA[
-        Read more about working with the items in Settings <a class="btn-link -underline" href="https://our.umbraco.com/documentation/Getting-Started/Backoffice/Sections/" target="_blank">in the Documentation section</a> of Our Umbraco
-    ]]>
-    </key>
-    <key alias="bulletPointTwo">
-        <![CDATA[
-        Ask a question in the <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank">Community Forum</a>
-    ]]>
-    </key>
-    <key alias="bulletPointThree">
-        <![CDATA[
-        Watch our <a class="btn-link -underline" href="https://umbraco.tv" target="_blank">tutorial videos</a> (some are free, some require a subscription)
-    ]]>
-    </key>
-    <key alias="bulletPointFour">
-        <![CDATA[
-        Find out about our <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank">productivity boosting tools and commercial support</a>
-    ]]>
-    </key>
-    <key alias="bulletPointFive">
-        <![CDATA[
-        Find out about real-life <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank">training and certification</a> opportunities
-    ]]>
-    </key>
-  </area>
-  <area alias="startupDashboard">
-    <key alias="fallbackHeadline">Welcome to The Friendly CMS</key>
-    <key alias="fallbackDescription">Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible.</key>
-  </area>
-  <area alias="formsDashboard">
-    <key alias="formsHeadline">Umbraco Forms</key>
-    <key alias="formsDescription">Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it!</key>
-  </area>
-  <area alias="contentTemplatesDashboard">
-    <key alias="whatHeadline">What are Content Templates?</key>
-    <key alias="whatDescription">Content Templates are pre-defined content that can be selected when creating a new content node.</key>
-    <key alias="createHeadline">How do I create a Content Template?</key>
-    <key alias="createDescription">
-        <![CDATA[
-            <p>There are two ways to create a Content Template:</p>
-            <ul>
-                <li>Right-click a content node and select "Create Content Template" to create a new Content Template.</li>
-                <li>Right-click the Content Templates tree in the Settings section and select the Document Type you want to create a Content Template for.</li>
-            </ul>
-            <p>Once given a name, editors can start using the Content Template as a foundation for their new page.</p>
-        ]]>
-    </key>
-    <key alias="manageHeadline">How do I manage Content Templates?</key>
-    <key alias="manageDescription">You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Expand the Document Type which the Content Template is based on and click it to edit or delete it.</key>
-  </area>
-</language>
+    <key alias="htmlHelp">This displays the selected version as HTML, if you wish to see the difference between 2 versions at the same time, use the diff view</key>
+    <key alias="rollbackTo">Rollback to</key>
+    <key alias="selectVersion">Select version</key>
+    <key alias="view">View</key>
+  </area>
+  <area alias="scripts">
+    <key alias="editscript">Edit script file</key>
+  </area>
+  <area alias="sections">
+    <key alias="concierge">Concierge</key>
+    <key alias="content">Content</key>
+    <key alias="courier">Courier</key>
+    <key alias="developer">Developer</key>
+    <key alias="forms">Forms</key>
+    <key alias="help" version="7.0">Help</key>
+    <key alias="installer">Umbraco Configuration Wizard</key>
+    <key alias="media">Media</key>
+    <key alias="member">Members</key>
+    <key alias="newsletters">Newsletters</key>
+    <key alias="packages">Packages</key>
+    <key alias="settings">Settings</key>
+    <key alias="statistics">Statistics</key>
+    <key alias="translation">Translation</key>
+    <key alias="users">Users</key>
+  </area>
+  <area alias="help">
+    <key alias="tours">Tours</key>
+    <key alias="theBestUmbracoVideoTutorials">The best Umbraco video tutorials</key>
+    <key alias="umbracoForum">Visit our.umbraco.com</key>
+    <key alias="umbracoTv">Visit umbraco.tv</key>
+  </area>
+  <area alias="settings">
+    <key alias="defaulttemplate">Default template</key>
+    <key alias="importDocumentTypeHelp">To import a document type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen)</key>
+    <key alias="newtabname">New Tab Title</key>
+    <key alias="nodetype">Node type</key>
+    <key alias="objecttype">Type</key>
+    <key alias="stylesheet">Stylesheet</key>
+    <key alias="script">Script</key>
+    <key alias="tab">Tab</key>
+    <key alias="tabname">Tab Title</key>
+    <key alias="tabs">Tabs</key>
+    <key alias="contentTypeEnabled">Master Content Type enabled</key>
+    <key alias="contentTypeUses">This Content Type uses</key>
+    <key alias="asAContentMasterType">as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself</key>
+    <key alias="noPropertiesDefinedOnTab">No properties defined on this tab. Click on the "add a new property" link at the top to create a new property.</key>
+    <key alias="createMatchingTemplate">Create matching template</key>
+    <key alias="addIcon">Add icon</key>
+  </area>
+  <area alias="sort">
+    <key alias="sortOrder">Sort order</key>
+    <key alias="sortCreationDate">Creation date</key>
+    <key alias="sortDone">Sorting complete.</key>
+    <key alias="sortHelp">Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items</key>
+    <key alias="sortPleaseWait"><![CDATA[Please wait. Items are being sorted, this can take a while.]]></key>
+  </area>
+  <area alias="speechBubbles">
+    <key alias="validationFailedHeader">Validation</key>
+    <key alias="validationFailedMessage">Validation errors must be fixed before the item can be saved</key>
+    <key alias="operationFailedHeader">Failed</key>
+    <key alias="operationSavedHeader">Saved</key>
+    <key alias="invalidUserPermissionsText">Insufficient user permissions, could not complete the operation</key>
+    <key alias="operationCancelledHeader">Cancelled</key>
+    <key alias="operationCancelledText">Operation was cancelled by a 3rd party add-in</key>
+    <key alias="contentPublishedFailedByEvent">Publishing was cancelled by a 3rd party add-in</key>
+    <key alias="contentTypeDublicatePropertyType">Property type already exists</key>
+    <key alias="contentTypePropertyTypeCreated">Property type created</key>
+    <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Name: %0% <br /> DataType: %1%]]></key>
+    <key alias="contentTypePropertyTypeDeleted">Propertytype deleted</key>
+    <key alias="contentTypeSavedHeader">Document Type saved</key>
+    <key alias="contentTypeTabCreated">Tab created</key>
+    <key alias="contentTypeTabDeleted">Tab deleted</key>
+    <key alias="contentTypeTabDeletedText">Tab with id: %0% deleted</key>
+    <key alias="cssErrorHeader">Stylesheet not saved</key>
+    <key alias="cssSavedHeader">Stylesheet saved</key>
+    <key alias="cssSavedText">Stylesheet saved without any errors</key>
+    <key alias="dataTypeSaved">Datatype saved</key>
+    <key alias="dictionaryItemSaved">Dictionary item saved</key>
+    <key alias="editContentPublishedFailedByParent">Publishing failed because the parent page isn't published</key>
+    <key alias="editContentPublishedHeader">Content published</key>
+    <key alias="editContentPublishedText">and visible on the website</key>
+    <key alias="editContentSavedHeader">Content saved</key>
+    <key alias="editContentSavedText">Remember to publish to make changes visible</key>
+    <key alias="editContentSendToPublish">Sent For Approval</key>
+    <key alias="editContentSendToPublishText">Changes have been sent for approval</key>
+    <key alias="editMediaSaved">Media saved</key>
+    <key alias="editMemberGroupSaved">Member group saved</key>
+    <key alias="editMediaSavedText">Media saved without any errors</key>
+    <key alias="editMemberSaved">Member saved</key>
+    <key alias="editStylesheetPropertySaved">Stylesheet Property Saved</key>
+    <key alias="editStylesheetSaved">Stylesheet saved</key>
+    <key alias="editTemplateSaved">Template saved</key>
+    <key alias="editUserError">Error saving user (check log)</key>
+    <key alias="editUserSaved">User Saved</key>
+    <key alias="editUserTypeSaved">User type saved</key>
+    <key alias="editUserGroupSaved">User group saved</key>
+    <key alias="editCulturesAndHostnamesSaved">Cultures and hostnames saved</key>
+    <key alias="editCulturesAndHostnamesError">Error saving cultures and hostnames</key>
+    <key alias="fileErrorHeader">File not saved</key>
+    <key alias="fileErrorText">file could not be saved. Please check file permissions</key>
+    <key alias="fileSavedHeader">File saved</key>
+    <key alias="fileSavedText">File saved without any errors</key>
+    <key alias="languageSaved">Language saved</key>
+    <key alias="mediaTypeSavedHeader">Media Type saved</key>
+    <key alias="memberTypeSavedHeader">Member Type saved</key>
+    <key alias="memberGroupSavedHeader">Member Group saved</key>
+    <key alias="templateErrorHeader">Template not saved</key>
+    <key alias="templateErrorText">Please make sure that you do not have 2 templates with the same alias</key>
+    <key alias="templateSavedHeader">Template saved</key>
+    <key alias="templateSavedText">Template saved without any errors!</key>
+    <key alias="contentUnpublished">Content unpublished</key>
+    <key alias="partialViewSavedHeader">Partial view saved</key>
+    <key alias="partialViewSavedText">Partial view saved without any errors!</key>
+    <key alias="partialViewErrorHeader">Partial view not saved</key>
+    <key alias="partialViewErrorText">An error occurred saving the file.</key>
+    <key alias="permissionsSavedFor">Permissions saved for</key>
+    <key alias="deleteUserGroupsSuccess">Deleted %0% user groups</key>
+    <key alias="deleteUserGroupSuccess">%0% was deleted</key>
+    <key alias="enableUsersSuccess">Enabled %0% users</key>
+    <key alias="disableUsersSuccess">Disabled %0% users</key>
+    <key alias="enableUserSuccess">%0% is now enabled</key>
+    <key alias="disableUserSuccess">%0% is now disabled</key>
+    <key alias="setUserGroupOnUsersSuccess">User groups have been set</key>
+    <key alias="unlockUsersSuccess">Unlocked %0% users</key>
+    <key alias="unlockUserSuccess">%0% is now unlocked</key>
+    <key alias="memberExportedSuccess">Member was exported to file</key>
+    <key alias="memberExportedError">An error occurred while exporting the member</key>
+    <key alias="deleteUserSuccess">User %0% was deleted</key>
+    <key alias="resendInviteHeader">Invite user</key>
+    <key alias="resendInviteSuccess">Invitation has been re-sent to %0%</key>
+    <key alias="documentTypeExportedSuccess">Document type was exported to file</key>
+    <key alias="documentTypeExportedError">An error occurred while exporting the document type</key>
+  </area>
+  <area alias="stylesheet">
+    <key alias="addRule">Add style</key>
+    <key alias="editRule">Edit style</key>
+    <key alias="editorRules">Rich text editor styles</key>
+    <key alias="editorRulesHelp">Define the styles that should be available in the rich text editor for this stylesheet</key>
+    <key alias="editstylesheet">Edit stylesheet</key>
+    <key alias="editstylesheetproperty">Edit stylesheet property</key>
+    <key alias="nameHelp">The name displayed in the editor style selector</key>
+    <key alias="preview">Preview</key>
+    <key alias="previewHelp">How the text will look like in the rich text editor.</key>
+    <key alias="selector">Selector</key>
+    <key alias="selectorHelp">Uses CSS syntax, e.g. "h1" or ".redHeader"</key>
+    <key alias="styles">Styles</key>
+    <key alias="stylesHelp">The CSS that should be applied in the rich text editor, e.g. "color:red;"</key>
+    <key alias="tabCode">Code</key>
+    <key alias="tabRules">Editor</key>
+  </area>
+  <area alias="template">
+    <key alias="deleteByIdFailed">Failed to delete template with ID %0%</key>
+    <key alias="edittemplate">Edit template</key>
+    <key alias="insertSections">Sections</key>
+    <key alias="insertContentArea">Insert content area</key>
+    <key alias="insertContentAreaPlaceHolder">Insert content area placeholder</key>
+    <key alias="insert">Insert</key>
+    <key alias="insertDesc">Choose what to insert into your template</key>
+    <key alias="insertDictionaryItem">Dictionary item</key>
+    <key alias="insertDictionaryItemDesc">A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites.</key>
+    <key alias="insertMacro">Macro</key>
+    <key alias="insertMacroDesc">
+            A Macro is a configurable component which is great for
+            reusable parts of your design, where you need the option to provide parameters,
+            such as galleries, forms and lists.
+        </key>
+    <key alias="insertPageField">Value</key>
+    <key alias="insertPageFieldDesc">Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values.</key>
+    <key alias="insertPartialView">Partial view</key>
+    <key alias="insertPartialViewDesc">
+            A partial view is a separate template file which can be rendered inside another
+            template, it's great for reusing markup or for separating complex templates into separate files.
+        </key>
+    <key alias="mastertemplate">Master template</key>
+    <key alias="noMaster">No master</key>
+    <key alias="renderBody">Render child template</key>
+    <key alias="renderBodyDesc"><![CDATA[
+     Renders the contents of a child template, by inserting a
+     <code>@RenderBody()</code> placeholder.
+      ]]></key>
+    <key alias="defineSection">Define a named section</key>
+    <key alias="defineSectionDesc"><![CDATA[
+         Defines a part of your template as a named section by wrapping it in
+          <code>@section { ... }</code>. This can be rendered in a
+          specific area of the parent of this template, by using <code>@RenderSection</code>.
+      ]]></key>
+    <key alias="renderSection">Render a named section</key>
+    <key alias="renderSectionDesc"><![CDATA[
+      Renders a named area of a child template, by inserting a <code>@RenderSection(name)</code> placeholder.
+      This renders an area of a child template which is wrapped in a corresponding <code>@section [name]{ ... }</code> definition.
+      ]]></key>
+    <key alias="sectionName">Section Name</key>
+    <key alias="sectionMandatory">Section is mandatory</key>
+    <key alias="sectionMandatoryDesc">
+            If mandatory, the child template must contain a <code>@section</code> definition, otherwise an error is shown.
+        </key>
+    <key alias="queryBuilder">Query builder</key>
+    <key alias="itemsReturned">items returned, in</key>
+    <key alias="copyToClipboard">copy to clipboard</key>
+    <key alias="iWant">I want</key>
+    <key alias="allContent">all content</key>
+    <key alias="contentOfType">content of type "%0%"</key>
+    <key alias="from">from</key>
+    <key alias="websiteRoot">my website</key>
+    <key alias="where">where</key>
+    <key alias="and">and</key>
+    <key alias="is">is</key>
+    <key alias="isNot">is not</key>
+    <key alias="before">before</key>
+    <key alias="beforeIncDate">before (including selected date)</key>
+    <key alias="after">after</key>
+    <key alias="afterIncDate">after (including selected date)</key>
+    <key alias="equals">equals</key>
+    <key alias="doesNotEqual">does not equal</key>
+    <key alias="contains">contains</key>
+    <key alias="doesNotContain">does not contain</key>
+    <key alias="greaterThan">greater than</key>
+    <key alias="greaterThanEqual">greater than or equal to</key>
+    <key alias="lessThan">less than</key>
+    <key alias="lessThanEqual">less than or equal to</key>
+    <key alias="id">Id</key>
+    <key alias="name">Name</key>
+    <key alias="createdDate">Created Date</key>
+    <key alias="lastUpdatedDate">Last Updated Date</key>
+    <key alias="orderBy">order by</key>
+    <key alias="ascending">ascending</key>
+    <key alias="descending">descending</key>
+    <key alias="template">Template</key>
+  </area>
+  <area alias="grid">
+    <key alias="media">Image</key>
+    <key alias="macro">Macro</key>
+    <key alias="insertControl">Choose type of content</key>
+    <key alias="chooseLayout">Choose a layout</key>
+    <key alias="addRows">Add a row</key>
+    <key alias="addElement">Add content</key>
+    <key alias="dropElement">Drop content</key>
+    <key alias="settingsApplied">Settings applied</key>
+    <key alias="contentNotAllowed">This content is not allowed here</key>
+    <key alias="contentAllowed">This content is allowed here</key>
+    <key alias="clickToEmbed">Click to embed</key>
+    <key alias="clickToInsertImage">Click to insert image</key>
+    <key alias="placeholderImageCaption">Image caption...</key>
+    <key alias="placeholderWriteHere">Write here...</key>
+    <key alias="gridLayouts">Grid Layouts</key>
+    <key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
+    <key alias="addGridLayout">Add Grid Layout</key>
+    <key alias="editGridLayout">Edit Grid Layout</key>
+    <key alias="addGridLayoutDetail">Adjust the layout by setting column widths and adding additional sections</key>
+    <key alias="rowConfigurations">Row configurations</key>
+    <key alias="rowConfigurationsDetail">Rows are predefined cells arranged horizontally</key>
+    <key alias="addRowConfiguration">Add row configuration</key>
+    <key alias="editRowConfiguration">Edit row configuration</key>
+    <key alias="addRowConfigurationDetail">Adjust the row by setting cell widths and adding additional cells</key>
+    <key alias="noConfiguration">No further configuration available</key>
+    <key alias="columns">Columns</key>
+    <key alias="columnsDetails">Total combined number of columns in the grid layout</key>
+    <key alias="settings">Settings</key>
+    <key alias="settingsDetails">Configure what settings editors can change</key>
+    <key alias="styles">Styles</key>
+    <key alias="stylesDetails">Configure what styling editors can change</key>
+    <key alias="allowAllEditors">Allow all editors</key>
+    <key alias="allowAllRowConfigurations">Allow all row configurations</key>
+    <key alias="maxItems">Maximum items</key>
+    <key alias="maxItemsDescription">Leave blank or set to 0 for unlimited</key>
+    <key alias="setAsDefault">Set as default</key>
+    <key alias="chooseExtra">Choose extra</key>
+    <key alias="chooseDefault">Choose default</key>
+    <key alias="areAdded">are added</key>
+        <key alias="warning">Warning</key>
+        <key alias="youAreDeleting">You are deleting the row configuration</key>
+        <key alias="deletingARow">
+            Deleting a row configuration name will result in loss of data for any existing content that is based on this configuration.
+        </key>
+  </area>
+  <area alias="contentTypeEditor">
+    <key alias="compositions">Compositions</key>
+    <key alias="group">Group</key>
+    <key alias="noGroups">You have not added any groups</key>
+    <key alias="addGroup">Add group</key>
+    <key alias="inheritedFrom">Inherited from</key>
+    <key alias="addProperty">Add property</key>
+    <key alias="requiredLabel">Required label</key>
+    <key alias="enableListViewHeading">Enable list view</key>
+    <key alias="enableListViewDescription">Configures the content item to show a sortable and searchable list of its children, the children will not be shown in the tree</key>
+    <key alias="allowedTemplatesHeading">Allowed Templates</key>
+    <key alias="allowedTemplatesDescription">Choose which templates editors are allowed to use on content of this type</key>
+    <key alias="allowAsRootHeading">Allow as root</key>
+    <key alias="allowAsRootDescription">Allow editors to create content of this type in the root of the content tree.</key>
+    <key alias="childNodesHeading">Allowed child node types</key>
+    <key alias="childNodesDescription">Allow content of the specified types to be created underneath content of this type.</key>
+    <key alias="chooseChildNode">Choose child node</key>
+    <key alias="compositionsDescription">Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists.</key>
+    <key alias="compositionInUse">This content type is used in a composition, and therefore cannot be composed itself.</key>
+    <key alias="noAvailableCompositions">There are no content types available to use as a composition.</key>
+    <key alias="compositionRemoveWarning">Removing a composition will delete all the associated property data. Once you save the document type there's no way back.</key>
+    <key alias="availableEditors">Create new</key>
+    <key alias="reuse">Use existing</key>
+    <key alias="editorSettings">Editor settings</key>
+    <key alias="configuration">Configuration</key>
+    <key alias="yesDelete">Yes, delete</key>
+    <key alias="movedUnderneath">was moved underneath</key>
+    <key alias="copiedUnderneath">was copied underneath</key>
+    <key alias="folderToMove">Select the folder to move</key>
+    <key alias="folderToCopy">Select the folder to copy</key>
+    <key alias="structureBelow">to in the tree structure below</key>
+    <key alias="allDocumentTypes">All Document types</key>
+    <key alias="allDocuments">All Documents</key>
+    <key alias="allMediaItems">All media items</key>
+    <key alias="usingThisDocument">using this document type will be deleted permanently, please confirm you want to delete these as well.</key>
+    <key alias="usingThisMedia">using this media type will be deleted permanently, please confirm you want to delete these as well.</key>
+    <key alias="usingThisMember">using this member type will be deleted permanently, please confirm you want to delete these as well</key>
+    <key alias="andAllDocuments">and all documents using this type</key>
+    <key alias="andAllMediaItems">and all media items using this type</key>
+    <key alias="andAllMembers">and all members using this type</key>
+    <key alias="memberCanEdit">Member can edit</key>
+    <key alias="memberCanEditDescription">Allow this property value to be edited by the member on their profile page</key>
+    <key alias="isSensitiveData">Is sensitive data</key>
+    <key alias="isSensitiveDataDescription">Hide this property value from content editors that don't have access to view sensitive information</key>
+    <key alias="showOnMemberProfile">Show on member profile</key>
+    <key alias="showOnMemberProfileDescription">Allow this property value to be displayed on the member profile page</key>
+    <key alias="tabHasNoSortOrder">tab has no sort order</key>
+    <key alias="compositionUsageHeading">Where is this composition used?</key>
+    <key alias="compositionUsageSpecification">This composition is currently used in the composition of the following content types:</key>
+    <key alias="variantsHeading">Allow variations</key>
+    <key alias="cultureVariantHeading">Allow vary by culture</key>
+    <key alias="segmentVariantHeading">Allow segmentation</key>
+    <key alias="cultureVariantLabel">Vary by culture</key>
+    <key alias="segmentVariantLabel">Vary by segments</key>
+    <key alias="variantsDescription">Allow editors to create content of this type in different languages.</key>
+    <key alias="cultureVariantDescription">Allow editors to create content of different languages.</key>
+    <key alias="segmentVariantDescription">Allow editors to create segments of this content.</key>
+    <key alias="allowVaryByCulture">Allow varying by culture</key>
+    <key alias="allowVaryBySegment">Allow segmentation</key>
+    <key alias="elementType">Element type</key>
+    <key alias="elementHeading">Is an Element type</key>
+    <key alias="elementDescription">An Element type is meant to be used for instance in Nested Content, and not in the tree.</key>
+    <key alias="elementCannotToggle">A document type cannot be changed to an Element type once it has been used to create one or more content items.</key>
+    <key alias="elementDoesNotSupport">This is not applicable for an Element type</key>
+    <key alias="propertyHasChanges">You have made changes to this property. Are you sure you want to discard them?</key>
+    <key alias="displaySettingsHeadline">Appearance</key>
+    <key alias="displaySettingsLabelOnTop">Label above (full-width)</key>
+  </area>
+  <area alias="languages">
+    <key alias="addLanguage">Add language</key>
+    <key alias="mandatoryLanguage">Mandatory language</key>
+    <key alias="mandatoryLanguageHelp">Properties on this language have to be filled out before the node can be published.</key>
+    <key alias="defaultLanguage">Default language</key>
+    <key alias="defaultLanguageHelp">An Umbraco site can only have one default language set.</key>
+    <key alias="changingDefaultLanguageWarning">Switching default language may result in default content missing.</key>
+    <key alias="fallsbackToLabel">Falls back to</key>
+    <key alias="noFallbackLanguageOption">No fall back language</key>
+    <key alias="fallbackLanguageDescription">To allow multi-lingual content to fall back to another language if not present in the requested language, select it here.</key>
+    <key alias="fallbackLanguage">Fall back language</key>
+    <key alias="none">none</key>
+  </area>
+
+  <area alias="macro">
+    <key alias="addParameter">Add parameter</key>
+    <key alias="editParameter">Edit parameter</key>
+    <key alias="enterMacroName">Enter macro name</key>
+    <key alias="parameters">Parameters</key>
+    <key alias="parametersDescription">Define the parameters that should be available when using this macro.</key>
+    <key alias="selectViewFile">Select partial view macro file</key>
+  </area>
+  <area alias="modelsBuilder">
+    <key alias="buildingModels">Building models</key>
+    <key alias="waitingMessage">this can take a bit of time, don't worry</key>
+    <key alias="modelsGenerated">Models generated</key>
+    <key alias="modelsGeneratedError">Models could not be generated</key>
+    <key alias="modelsExceptionInUlog">Models generation has failed, see exception in U log</key>
+  </area>
+  <area alias="templateEditor">
+    <key alias="addFallbackField">Add fallback field</key>
+    <key alias="fallbackField">Fallback field</key>
+    <key alias="addDefaultValue">Add default value</key>
+    <key alias="defaultValue">Default value</key>
+    <key alias="alternativeField">Fallback field</key>
+    <key alias="alternativeText">Default value</key>
+    <key alias="casing">Casing</key>
+    <key alias="encoding">Encoding</key>
+    <key alias="chooseField">Choose field</key>
+    <key alias="convertLineBreaks">Convert line breaks</key>
+    <key alias="convertLineBreaksDescription">Yes, convert line breaks</key>
+    <key alias="convertLineBreaksHelp">Replaces line breaks with 'br' html tag</key>
+    <key alias="customFields">Custom Fields</key>
+    <key alias="dateOnly">Date only</key>
+    <key alias="formatAndEncoding">Format and encoding</key>
+    <key alias="formatAsDate">Format as date</key>
+    <key alias="formatAsDateDescr">Format the value as a date, or a date with time, according to the active culture</key>
+    <key alias="htmlEncode">HTML encode</key>
+    <key alias="htmlEncodeHelp">Will replace special characters by their HTML equivalent.</key>
+    <key alias="insertedAfter">Will be inserted after the field value</key>
+    <key alias="insertedBefore">Will be inserted before the field value</key>
+    <key alias="lowercase">Lowercase</key>
+    <key alias="modifyOutput">Modify output</key>
+    <key alias="none">None</key>
+    <key alias="outputSample">Output sample</key>
+    <key alias="postContent">Insert after field</key>
+    <key alias="preContent">Insert before field</key>
+    <key alias="recursive">Recursive</key>
+    <key alias="recursiveDescr">Yes, make it recursive</key>
+    <key alias="separator">Separator</key>
+    <key alias="standardFields">Standard Fields</key>
+    <key alias="uppercase">Uppercase</key>
+    <key alias="urlEncode">URL encode</key>
+    <key alias="urlEncodeHelp">Will format special characters in URLs</key>
+    <key alias="usedIfAllEmpty">Will only be used when the field values above are empty</key>
+    <key alias="usedIfEmpty">This field will only be used if the primary field is empty</key>
+    <key alias="withTime">Date and time</key>
+  </area>
+  <area alias="translation">
+    <key alias="details">Translation details</key>
+    <key alias="DownloadXmlDTD">Download XML DTD</key>
+    <key alias="fields">Fields</key>
+    <key alias="includeSubpages">Include subpages</key>
+    <key alias="mailBody"><![CDATA[
+      Hi %0%
+
+      This is an automated mail to inform you that the document '%1%'
+      has been requested for translation into '%5%' by %2%.
+
+      Go to http://%3%/translation/details.aspx?id=%4% to edit.
+
+      Or log into Umbraco to get an overview of your translation tasks
+      http://%3%
+
+      Have a nice day!
+
+      Cheers from the Umbraco robot
+    ]]></key>
+    <key alias="noTranslators">No translator users found. Please create a translator user before you start sending content to translation</key>
+    <key alias="pageHasBeenSendToTranslation">The page '%0%' has been send to translation</key>
+    <key alias="sendToTranslate">Send the page '%0%' to translation</key>
+    <key alias="totalWords">Total words</key>
+    <key alias="translateTo">Translate to</key>
+    <key alias="translationDone">Translation completed.</key>
+    <key alias="translationDoneHelp">You can preview the pages, you've just translated, by clicking below. If the original page is found, you will get a comparison of the 2 pages.</key>
+    <key alias="translationFailed">Translation failed, the XML file might be corrupt</key>
+    <key alias="translationOptions">Translation options</key>
+    <key alias="translator">Translator</key>
+    <key alias="uploadTranslationXml">Upload translation XML</key>
+  </area>
+  <area alias="treeHeaders">
+    <key alias="content">Content</key>
+    <key alias="contentBlueprints">Content Templates</key>
+    <key alias="media">Media</key>
+    <key alias="cacheBrowser">Cache Browser</key>
+    <key alias="contentRecycleBin">Recycle Bin</key>
+    <key alias="createdPackages">Created packages</key>
+    <key alias="dataTypes">Data Types</key>
+    <key alias="dictionary">Dictionary</key>
+    <key alias="installedPackages">Installed packages</key>
+    <key alias="installSkin">Install skin</key>
+    <key alias="installStarterKit">Install starter kit</key>
+    <key alias="languages">Languages</key>
+    <key alias="localPackage">Install local package</key>
+    <key alias="macros">Macros</key>
+    <key alias="mediaTypes">Media Types</key>
+    <key alias="member">Members</key>
+    <key alias="memberGroups">Member Groups</key>
+    <key alias="memberRoles">Member Roles</key>
+    <key alias="memberTypes">Member Types</key>
+    <key alias="documentTypes">Document Types</key>
+    <key alias="relationTypes">Relation Types</key>
+    <key alias="packager">Packages</key>
+    <key alias="packages">Packages</key>
+    <key alias="partialViews">Partial Views</key>
+    <key alias="partialViewMacros">Partial View Macro Files</key>
+    <key alias="repositories">Install from repository</key>
+    <key alias="runway">Install Runway</key>
+    <key alias="runwayModules">Runway modules</key>
+    <key alias="scripting">Scripting Files</key>
+    <key alias="scripts">Scripts</key>
+    <key alias="stylesheets">Stylesheets</key>
+    <key alias="templates">Templates</key>
+    <key alias="logViewer">Log Viewer</key>
+    <key alias="users">Users</key>
+    <key alias="settingsGroup">Settings</key>
+    <key alias="templatingGroup">Templating</key>
+    <key alias="thirdPartyGroup">Third Party</key>
+  </area>
+  <area alias="update">
+    <key alias="updateAvailable">New update ready</key>
+    <key alias="updateDownloadText">%0% is ready, click here for download</key>
+    <key alias="updateNoServer">No connection to server</key>
+    <key alias="updateNoServerError">Error checking for update. Please review trace-stack for further information</key>
+  </area>
+  <area alias="user">
+    <key alias="access">Access</key>
+    <key alias="accessHelp">Based on the assigned groups and start nodes, the user has access to the following nodes</key>
+    <key alias="assignAccess">Assign access</key>
+    <key alias="administrators">Administrator</key>
+    <key alias="categoryField">Category field</key>
+    <key alias="createDate">User created</key>
+    <key alias="changePassword">Change your password</key>
+    <key alias="changePhoto">Change photo</key>
+    <key alias="newPassword">New password</key>
+    <key alias="noLockouts">hasn't been locked out</key>
+    <key alias="noPasswordChange">The password hasn't been changed</key>
+    <key alias="confirmNewPassword">Confirm new password</key>
+    <key alias="changePasswordDescription">You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button</key>
+    <key alias="contentChannel">Content Channel</key>
+    <key alias="createAnotherUser">Create another user</key>
+    <key alias="createUserHelp">Create new users to give them access to Umbraco. When a new user is created a password will be generated that you can share with the user.</key>
+    <key alias="descriptionField">Description field</key>
+    <key alias="disabled">Disable User</key>
+    <key alias="documentType">Document Type</key>
+    <key alias="editors">Editor</key>
+    <key alias="excerptField">Excerpt field</key>
+    <key alias="failedPasswordAttempts">Failed login attempts</key>
+    <key alias="goToProfile">Go to user profile</key>
+    <key alias="groupsHelp">Add groups to assign access and permissions</key>
+    <key alias="inviteAnotherUser">Invite another user</key>
+    <key alias="inviteUserHelp">Invite new users to give them access to Umbraco. An invite email will be sent to the user with information on how to log in to Umbraco. Invites last for 72 hours.</key>
+    <key alias="language">Language</key>
+    <key alias="languageHelp">Set the language you will see in menus and dialogs</key>
+    <key alias="lastLockoutDate">Last lockout date</key>
+    <key alias="lastLogin">Last login</key>
+    <key alias="lastPasswordChangeDate">Password last changed</key>
+    <key alias="loginname">Username</key>
+    <key alias="mediastartnode">Media start node</key>
+    <key alias="mediastartnodehelp">Limit the media library to a specific start node</key>
+    <key alias="mediastartnodes">Media start nodes</key>
+    <key alias="mediastartnodeshelp">Limit the media library to specific start nodes</key>
+    <key alias="modules">Sections</key>
+    <key alias="noConsole">Disable Umbraco Access</key>
+    <key alias="noLogin">has not logged in yet</key>
+    <key alias="oldPassword">Old password</key>
+    <key alias="password">Password</key>
+    <key alias="resetPassword">Reset password</key>
+    <key alias="passwordChanged">Your password has been changed!</key>
+    <key alias="passwordChangedGeneric">Password changed</key>
+    <key alias="passwordConfirm">Please confirm the new password</key>
+    <key alias="passwordEnterNew">Enter your new password</key>
+    <key alias="passwordIsBlank">Your new password cannot be blank!</key>
+    <key alias="passwordCurrent">Current password</key>
+    <key alias="passwordInvalid">Invalid current password</key>
+    <key alias="passwordIsDifferent">There was a difference between the new password and the confirmed password. Please try again!</key>
+    <key alias="passwordMismatch">The confirmed password doesn't match the new password!</key>
+    <key alias="permissionReplaceChildren">Replace child node permissions</key>
+    <key alias="permissionSelectedPages">You are currently modifying permissions for the pages:</key>
+    <key alias="permissionSelectPages">Select pages to modify their permissions</key>
+    <key alias="removePhoto">Remove photo</key>
+    <key alias="permissionsDefault">Default permissions</key>
+    <key alias="permissionsGranular">Granular permissions</key>
+    <key alias="permissionsGranularHelp">Set permissions for specific nodes</key>
+    <key alias="profile">Profile</key>
+    <key alias="searchAllChildren">Search all children</key>
+    <key alias="sectionsHelp">Add sections to give users access</key>
+    <key alias="selectUserGroups">Select user groups</key>
+    <key alias="noStartNode">No start node selected</key>
+    <key alias="noStartNodes">No start nodes selected</key>
+    <key alias="startnode">Content start node</key>
+    <key alias="startnodehelp">Limit the content tree to a specific start node</key>
+    <key alias="startnodes">Content start nodes</key>
+    <key alias="startnodeshelp">Limit the content tree to specific start nodes</key>
+    <key alias="updateDate">User last updated</key>
+    <key alias="userCreated">has been created</key>
+    <key alias="userCreatedSuccessHelp">The new user has successfully been created. To log in to Umbraco use the password below.</key>
+    <key alias="userManagement">User management</key>
+    <key alias="username">Name</key>
+    <key alias="userPermissions">User permissions</key>
+    <key alias="usergroup">User group</key>
+    <key alias="userInvited">has been invited</key>
+    <key alias="userInvitedSuccessHelp">An invitation has been sent to the new user with details about how to log in to Umbraco.</key>
+    <key alias="userinviteWelcomeMessage">Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password and add a picture for your avatar.</key>
+    <key alias="userinviteExpiredMessage">Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it.</key>
+        <key alias="userinviteAvatarMessage">Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo.</key>
+    <key alias="writer">Writer</key>
+    <key alias="change">Change</key>
+    <key alias="yourProfile" version="7.0">Your profile</key>
+    <key alias="yourHistory" version="7.0">Your recent history</key>
+    <key alias="sessionExpires" version="7.0">Session expires in</key>
+    <key alias="inviteUser">Invite user</key>
+    <key alias="createUser">Create user</key>
+    <key alias="sendInvite">Send invite</key>
+    <key alias="backToUsers">Back to users</key>
+    <key alias="inviteEmailCopySubject">Umbraco: Invitation</key>
+    <key alias="inviteEmailCopyFormat"><![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Hi %0%,
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															You have been invited by <a href="mailto:%4%" style="text-decoration: underline; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a> to the Umbraco Back Office.
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Message from <a href="mailto:%1%" style="text-decoration: none; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a>:
+															<br/>
+															<em>%2%</em>
+														</p>
+														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
+															<tbody>
+																<tr>
+																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
+																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
+																			<tbody>
+																				<tr>
+																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																							Click this link to accept the invite
+																						</a>
+																					</td>
+																				</tr>
+																			</tbody>
+																		</table>
+																	</td>
+																</tr>
+															</tbody>
+														</table>
+														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>If you cannot click on the link, copy and paste this URL into your browser window:</p>
+															<table border='0' cellpadding='0' cellspacing='0'>
+																<tr>
+																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
+																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
+																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%3%'>%3%</a>
+																		</font>
+																	</td>
+																</tr>
+															</table>
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+    </html>]]></key>
+    <key alias="invite">Invite</key>
+    <key alias="defaultInvitationMessage">Resending invitation...</key>
+    <key alias="deleteUser">Delete User</key>
+    <key alias="deleteUserConfirmation">Are you sure you wish to delete this user account?</key>
+    <key alias="stateAll">All</key>
+    <key alias="stateActive">Active</key>
+    <key alias="stateDisabled">Disabled</key>
+    <key alias="stateLockedOut">Locked out</key>
+    <key alias="stateInvited">Invited</key>
+    <key alias="stateInactive">Inactive</key>
+    <key alias="sortNameAscending">Name (A-Z)</key>
+    <key alias="sortNameDescending">Name (Z-A)</key>
+    <key alias="sortCreateDateAscending">Newest</key>
+    <key alias="sortCreateDateDescending">Oldest</key>
+    <key alias="sortLastLoginDateDescending">Last login</key>
+    <key alias="noUserGroupsAdded">No user groups have been added</key>
+  </area>
+  <area alias="validation">
+    <key alias="validation">Validation</key>
+    <key alias="noValidation">No validation</key>
+    <key alias="validateAsEmail">Validate as an email address</key>
+    <key alias="validateAsNumber">Validate as a number</key>
+    <key alias="validateAsUrl">Validate as a URL</key>
+    <key alias="enterCustomValidation">...or enter a custom validation</key>
+    <key alias="fieldIsMandatory">Field is mandatory</key>
+    <key alias="mandatoryMessage">Enter a custom validation error message (optional)</key>
+    <key alias="validationRegExp">Enter a regular expression</key>
+    <key alias="validationRegExpMessage">Enter a custom validation error message (optional)</key>
+    <key alias="minCount">You need to add at least</key>
+    <key alias="maxCount">You can only have</key>
+    <key alias="addUpTo">Add up to</key>
+    <key alias="items">items</key>
+    <key alias="urls">URL(s)</key>
+    <key alias="urlsSelected">URL(s) selected</key>
+    <key alias="itemsSelected">items selected</key>
+    <key alias="invalidDate">Invalid date</key>
+    <key alias="invalidNumber">Not a number</key>
+    <key alias="invalidEmail">Invalid email</key>
+    <key alias="customValidation">Custom validation</key>
+    <key alias="entriesShort"><![CDATA[Minimum %0% entries, requires <strong>%1%</strong> more.]]></key>
+    <key alias="entriesExceed"><![CDATA[Maximum %0% entries, <strong>%1%</strong> too many.]]></key>
+  </area>
+  <area alias="healthcheck">
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+		   2: XPath
+		   3: Configuration file path
+	  -->
+    <key alias="checkSuccessMessage">Value is set to the recommended value: '%0%'.</key>
+    <key alias="rectifySuccessMessage">Value was set to '%1%' for XPath '%2%' in configuration file '%3%'.</key>
+    <key alias="checkErrorMessageDifferentExpectedValue">Expected value '%1%' for '%2%' in configuration file '%3%', but found '%0%'.</key>
+    <key alias="checkErrorMessageUnexpectedValue">Found unexpected value '%0%' for '%2%' in configuration file '%3%'.</key>
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+	  -->
+    <key alias="customErrorsCheckSuccessMessage">Custom errors are set to '%0%'.</key>
+    <key alias="customErrorsCheckErrorMessage">Custom errors are currently set to '%0%'. It is recommended to set this to '%1%' before go live.</key>
+    <key alias="customErrorsCheckRectifySuccessMessage">Custom errors successfully set to '%0%'.</key>
+    <key alias="macroErrorModeCheckSuccessMessage">MacroErrors are set to '%0%'.</key>
+    <key alias="macroErrorModeCheckErrorMessage">MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'.</key>
+    <key alias="macroErrorModeCheckRectifySuccessMessage">MacroErrors are now set to '%0%'.</key>
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+		   2: Server version
+	  -->
+    <key alias="trySkipIisCustomErrorsCheckSuccessMessage">Try Skip IIS Custom Errors is set to '%0%' and you're using IIS version '%1%'.</key>
+    <key alias="trySkipIisCustomErrorsCheckErrorMessage">Try Skip IIS Custom Errors is currently '%0%'. It is recommended to set this to '%1%' for your IIS version (%2%).</key>
+    <key alias="trySkipIisCustomErrorsCheckRectifySuccessMessage">Try Skip IIS Custom Errors successfully set to '%0%'.</key>
+    <!-- The following keys get predefined tokens passed in that are not all the same, like above -->
+    <key alias="configurationServiceFileNotFound">File does not exist: '%0%'.</key>
+    <key alias="configurationServiceNodeNotFound"><![CDATA[Unable to find <strong>'%0%'</strong> in config file <strong>'%1%'</strong>.]]></key>
+    <key alias="configurationServiceError">There was an error, check log for full error: %0%.</key>
+    <key alias="databaseSchemaValidationCheckDatabaseOk">Database - The database schema is correct for this version of Umbraco</key>
+    <key alias="databaseSchemaValidationCheckDatabaseErrors">%0% problems were detected with your database schema (Check the log for details)</key>
+    <key alias="databaseSchemaValidationCheckDatabaseLogMessage">Some errors were detected while validating the database schema against the current version of Umbraco.</key>
+    <key alias="httpsCheckValidCertificate">Your website's certificate is valid.</key>
+    <key alias="httpsCheckInvalidCertificate">Certificate validation error: '%0%'</key>
+    <key alias="httpsCheckExpiredCertificate">Your website's SSL certificate has expired.</key>
+    <key alias="httpsCheckExpiringCertificate">Your website's SSL certificate is expiring in %0% days.</key>
+    <key alias="healthCheckInvalidUrl">Error pinging the URL %0% - '%1%'</key>
+    <key alias="httpsCheckIsCurrentSchemeHttps">You are currently %0% viewing the site using the HTTPS scheme.</key>
+    <key alias="httpsCheckConfigurationRectifyNotPossible">The appSetting 'Umbraco.Core.UseHttps' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'.</key>
+    <key alias="httpsCheckConfigurationCheckResult">The appSetting 'Umbraco.Core.UseHttps' is set to '%0%' in your web.config file, your cookies are %1% marked as secure.</key>
+    <key alias="httpsCheckEnableHttpsError">Could not update the 'Umbraco.Core.UseHttps' setting in your web.config file. Error: %0%</key>
+    <!-- The following keys don't get tokens passed in -->
+    <key alias="httpsCheckEnableHttpsButton">Enable HTTPS</key>
+    <key alias="httpsCheckEnableHttpsDescription">Sets umbracoSSL setting to true in the appSettings of the web.config file.</key>
+    <key alias="httpsCheckEnableHttpsSuccess">The appSetting 'Umbraco.Core.UseHttps' is now set to 'true' in your web.config file, your cookies will be marked as secure.</key>
+    <key alias="rectifyButton">Fix</key>
+    <key alias="cannotRectifyShouldNotEqual">Cannot fix a check with a value comparison type of 'ShouldNotEqual'.</key>
+    <key alias="cannotRectifyShouldEqualWithValue">Cannot fix a check with a value comparison type of 'ShouldEqual' with a provided value.</key>
+    <key alias="valueToRectifyNotProvided">Value to fix check not provided.</key>
+    <key alias="compilationDebugCheckSuccessMessage">Debug compilation mode is disabled.</key>
+    <key alias="compilationDebugCheckErrorMessage">Debug compilation mode is currently enabled. It is recommended to disable this setting before go live.</key>
+    <key alias="compilationDebugCheckRectifySuccessMessage">Debug compilation mode successfully disabled.</key>
+    <key alias="traceModeCheckSuccessMessage">Trace mode is disabled.</key>
+    <key alias="traceModeCheckErrorMessage">Trace mode is currently enabled. It is recommended to disable this setting before go live.</key>
+    <key alias="traceModeCheckRectifySuccessMessage">Trace mode successfully disabled.</key>
+    <key alias="folderPermissionsCheckMessage">All folders have the correct permissions set.</key>
+    <!-- The following keys get these tokens passed in:
+	    0: Comma delimitted list of failed folder paths
+  	-->
+    <key alias="requiredFolderPermissionFailed"><![CDATA[The following folders must be set up with modify permissions but could not be acccessed: <strong>%0%</strong>.]]></key>
+    <key alias="optionalFolderPermissionFailed"><![CDATA[The following folders must be set up with modify permissions for certain Umbraco operations to function but could not be acccessed: <strong>%0%</strong>. If they aren't being written to no action need be taken.]]></key>
+    <key alias="filePermissionsCheckMessage">All files have the correct permissions set.</key>
+    <!-- The following keys get these tokens passed in:
+	    0: Comma delimitted list of failed folder paths
+  	-->
+    <key alias="requiredFilePermissionFailed"><![CDATA[The following files must be set up with write permissions but could not be acccessed: <strong>%0%</strong>.]]></key>
+    <key alias="optionalFilePermissionFailed"><![CDATA[The following files must be set up with write permissions for certain Umbraco operations to function but could not be acccessed: <strong>%0%</strong>. If they aren't being written to no action need be taken.]]></key>
+    <key alias="clickJackingCheckHeaderFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMEd by another was found.]]></key>
+    <key alias="clickJackingCheckHeaderNotFound"><![CDATA[The header or meta-tag <strong>X-Frame-Options</strong> used to control whether a site can be IFRAMEd by another was not found.]]></key>
+    <key alias="setHeaderInConfig">Set Header in Config</key>
+    <key alias="clickJackingSetHeaderInConfigDescription">Adds a value to the httpProtocol/customHeaders section of web.config to prevent the site being IFRAMEd by other websites.</key>
+    <key alias="clickJackingSetHeaderInConfigSuccess">A setting to create a header preventing IFRAMEing of the site by other websites has been added to your web.config file.</key>
+    <key alias="setHeaderInConfigError">Could not update web.config file. Error: %0%</key>
+    <key alias="noSniffCheckHeaderFound"><![CDATA[The header or meta-tag <strong>X-Content-Type-Options</strong> used to protect against MIME sniffing vulnerabilities was found.]]></key>
+    <key alias="noSniffCheckHeaderNotFound"><![CDATA[The header or meta-tag <strong>X-Content-Type-Options</strong> used to protect against MIME sniffing vulnerabilities was not found.]]></key>
+    <key alias="noSniffSetHeaderInConfigDescription">Adds a value to the httpProtocol/customHeaders section of web.config to protect against MIME sniffing vulnerabilities.</key>
+    <key alias="noSniffSetHeaderInConfigSuccess">A setting to create a header protecting against MIME sniffing vulnerabilities has been added to your web.config file.</key>
+    <key alias="hSTSCheckHeaderFound"><![CDATA[The header <strong>Strict-Transport-Security</strong>, also known as the HSTS-header, was found.]]></key>
+    <key alias="hSTSCheckHeaderNotFound"><![CDATA[The header <strong>Strict-Transport-Security</strong> was not found.]]></key>
+    <key alias="hSTSSetHeaderInConfigDescription">Adds the header 'Strict-Transport-Security' with the value 'max-age=10886400' to the httpProtocol/customHeaders section of web.config. Use this fix only if you will have your domains running with https for the next 18 weeks (minimum).</key>
+    <key alias="hSTSSetHeaderInConfigSuccess">The HSTS header has been added to your web.config file.</key>
+    <key alias="xssProtectionCheckHeaderFound"><![CDATA[The header <strong>X-XSS-Protection</strong> was found.]]></key>
+    <key alias="xssProtectionCheckHeaderNotFound"><![CDATA[The header <strong>X-XSS-Protection</strong> was not found.]]></key>
+    <key alias="xssProtectionSetHeaderInConfigDescription">Adds the header 'X-XSS-Protection' with the value '1; mode=block' to the httpProtocol/customHeaders section of web.config. </key>
+    <key alias="xssProtectionSetHeaderInConfigSuccess">The X-XSS-Protection header has been added to your web.config file.</key>
+    <!-- The following key get these tokens passed in:
+	    0: Comma delimitted list of headers found
+  	-->
+    <key alias="excessiveHeadersFound"><![CDATA[The following headers revealing information about the website technology were found: <strong>%0%</strong>.]]></key>
+    <key alias="excessiveHeadersNotFound">No headers revealing information about the website technology were found.</key>
+    <key alias="smtpMailSettingsNotFound">In the Web.config file, system.net/mailsettings could not be found.</key>
+    <key alias="smtpMailSettingsHostNotConfigured">In the Web.config file system.net/mailsettings section, the host is not configured.</key>
+    <key alias="smtpMailSettingsConnectionSuccess">SMTP settings are configured correctly and the service is operating as expected.</key>
+    <key alias="smtpMailSettingsConnectionFail">The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the Web.config file system.net/mailsettings are correct.</key>
+    <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notification email has been set to <strong>%0%</strong>.]]></key>
+    <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notification email is still set to the default value of <strong>%0%</strong>.]]></key>
+    <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:</p>%2%</body></html>]]></key>
+    <key alias="scheduledHealthCheckEmailSubject">Umbraco Health Check Status: %0%</key>
+    <key alias="checkAllGroups">Check All Groups</key>
+    <key alias="checkGroup">Check group</key>
+    <key alias="helpText">
+        <![CDATA[
+        <p>The health checker evaluates various areas of your site for best practice settings, configuration, potential problems, etc. You can easily fix problems by pressing a button.
+        You can add your own health checks, have a look at <a href="https://our.umbraco.com/documentation/Extending/Healthcheck/" target="_blank" rel="noopener" class="btn-link -underline">the documentation for more information</a> about custom health checks.</p>
+        ]]>
+    </key>
+  </area>
+  <area alias="redirectUrls">
+    <key alias="disableUrlTracker">Disable URL tracker</key>
+    <key alias="enableUrlTracker">Enable URL tracker</key>
+    <key alias="originalUrl">Original URL</key>
+    <key alias="redirectedTo">Redirected To</key>
+    <key alias="redirectUrlManagement">Redirect URL Management</key>
+    <key alias="panelInformation">The following URLs redirect to this content item:</key>
+    <key alias="noRedirects">No redirects have been made</key>
+    <key alias="noRedirectsDescription">When a published page gets renamed or moved a redirect will automatically be made to the new page.</key>
+    <key alias="confirmRemove">Are you sure you want to remove the redirect from '%0%' to '%1%'?</key>
+    <key alias="redirectRemoved">Redirect URL removed.</key>
+    <key alias="redirectRemoveError">Error removing redirect URL.</key>
+    <key alias="redirectRemoveWarning">This will remove the redirect</key>
+    <key alias="confirmDisable">Are you sure you want to disable the URL tracker?</key>
+    <key alias="disabledConfirm">URL tracker has now been disabled.</key>
+    <key alias="disableError">Error disabling the URL tracker, more information can be found in your log file.</key>
+    <key alias="enabledConfirm">URL tracker has now been enabled.</key>
+    <key alias="enableError">Error enabling the URL tracker, more information can be found in your log file.</key>
+  </area>
+  <area alias="emptyStates">
+    <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
+  </area>
+  <area alias="textbox">
+    <key alias="characters_left"><![CDATA[<strong>%0%</strong> characters left.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maximum %0% characters, <strong>%1%</strong> too many.]]></key>
+  </area>
+  <area alias="recycleBin">
+    <key alias="contentTrashed">Trashed content with Id: {0} related to original parent content with Id: {1}</key>
+    <key alias="mediaTrashed">Trashed media with Id: {0} related to original parent media item with Id: {1}</key>
+    <key alias="itemCannotBeRestored">Cannot automatically restore this item</key>
+    <key alias="itemCannotBeRestoredHelpText">There is no location where this item can be automatically restored. You can move the item manually using the tree below.</key>
+    <key alias="wasRestored">was restored under</key>
+  </area>
+  <area alias="relationType">
+    <key alias="direction">Direction</key>
+    <key alias="parentToChild">Parent to child</key>
+    <key alias="bidirectional">Bidirectional</key>
+    <key alias="parent">Parent</key>
+    <key alias="child">Child</key>
+    <key alias="count">Count</key>
+    <key alias="relations">Relations</key>
+    <key alias="created">Created</key>
+    <key alias="comment">Comment</key>
+    <key alias="name">Name</key>
+    <key alias="noRelations">No relations for this relation type.</key>
+    <key alias="tabRelationType">Relation Type</key>
+    <key alias="tabRelations">Relations</key>
+  </area>
+  <area alias="dashboardTabs">
+    <key alias="contentIntro">Getting Started</key>
+    <key alias="contentRedirectManager">Redirect URL Management</key>
+    <key alias="mediaFolderBrowser">Content</key>
+    <key alias="settingsWelcome">Welcome</key>
+    <key alias="settingsExamine">Examine Management</key>
+    <key alias="settingsPublishedStatus">Published Status</key>
+    <key alias="settingsModelsBuilder">Models Builder</key>
+    <key alias="settingsHealthCheck">Health Check</key>
+    <key alias="settingsProfiler">Profiling</key>
+    <key alias="memberIntro">Getting Started</key>
+    <key alias="formsInstall">Install Umbraco Forms</key>
+  </area>
+  <area alias="visuallyHiddenTexts">
+    <key alias="goBack">Go back</key>
+    <key alias="activeListLayout">Active layout:</key>
+    <key alias="jumpTo">Jump to</key>
+    <key alias="group">group</key>
+    <key alias="passed">passed</key>
+    <key alias="warning">warning</key>
+    <key alias="failed">failed</key>
+    <key alias="suggestion">suggestion</key>
+    <key alias="checkPassed">Check passed</key>
+    <key alias="checkFailed">Check failed</key>
+    <key alias="openBackofficeSearch">Open backoffice search</key>
+    <key alias="openCloseBackofficeHelp">Open/Close backoffice help</key>
+    <key alias="openCloseBackofficeProfileOptions">Open/Close your profile options</key>
+    <key alias="assignDomainDescription">Setup Culture and Hostnames for %0%</key>
+    <key alias="createDescription">Create new node under %0%</key>
+    <key alias="protectDescription">Setup access restrictions on %0%</key>
+    <key alias="rightsDescription">Setup Permissions on %0%</key>
+    <key alias="sortDescription">Change sort order for %0%</key>
+    <key alias="createblueprintDescription">Create Content Template based on %0%</key>
+    <key alias="openContextMenu">Open context menu for</key>
+    <key alias="currentLanguage">Current language</key>
+    <key alias="switchLanguage">Switch language to</key>
+    <key alias="createNewFolder">Create new folder</key>
+    <key alias="newPartialView">Partial View</key>
+    <key alias="newPartialViewMacro">Partial View Macro</key>
+    <key alias="newMember">Member</key>
+    <key alias="newDataType">Data type</key>
+    <key alias="redirectDashboardSearchLabel">Search the redirect dashboard</key>
+    <key alias="userGroupSearchLabel">Search the user group section</key>
+    <key alias="userSearchLabel">Search the users section</key>
+    <key alias="createItem">Create item</key>
+    <key alias="create">Create</key>
+    <key alias="edit">Edit</key>
+    <key alias="name">Name</key>
+    <key alias="addNewRow">Add new row</key>
+    <key alias="tabExpand">View more options</key>
+    <key alias="searchOverlayTitle">Search the Umbraco backoffice</key>
+    <key alias="searchOverlayDescription">Search for content nodes, media nodes etc. across the backoffice.</key>
+    <key alias="searchInputDescription">When autocomplete results are available, press up and down arrows, or use the tab key and use the enter key to select.</key>
+    <key alias="path">Path: </key>
+    <key alias="foundIn">Found in</key>
+    <key alias="hasTranslation">Has translation</key>
+    <key alias="noTranslation">Missing translation</key>
+    <key alias="dictionaryListCaption">Dictionary items</key>
+    <key alias="contextMenuDescription">Select one of the options to edit the node.</key>
+    <key alias="contextDialogDescription">Perform action %0% on the %1% node</key>
+    <key alias="addImageCaption">Add image caption</key>
+  </area>
+  <area alias="references">
+    <key alias="tabName">References</key>
+    <key alias="DataTypeNoReferences">This Data Type has no references.</key>
+    <key alias="labelUsedByDocumentTypes">Used in Document Types</key>
+    <key alias="noDocumentTypes">No references to Document Types.</key>
+    <key alias="labelUsedByMediaTypes">Used in Media Types</key>
+    <key alias="noMediaTypes">No references to Media Types.</key>
+    <key alias="labelUsedByMemberTypes">Used in Member Types</key>
+    <key alias="noMemberTypes">No references to Member Types.</key>
+    <key alias="usedByProperties">Used by</key>
+    <key alias="labelUsedByDocuments">Used in Documents</key>
+    <key alias="labelUsedByMembers">Used in Members</key>
+    <key alias="labelUsedByMedia">Used in Media</key>
+  </area>
+  <area alias="logViewer">
+      <key alias="deleteSavedSearch">Delete Saved Search</key>
+      <key alias="logLevels">Log Levels</key>
+      <key alias="savedSearches">Saved Searches</key>
+      <key alias="saveSearch">Save Search</key>
+      <key alias="saveSearchDescription">Enter a friendly name for your search query</key>
+      <key alias="filterSearch">Filter Search</key>
+      <key alias="totalItems">Total Items</key>
+      <key alias="timestamp">Timestamp</key>
+      <key alias="level">Level</key>
+      <key alias="machine">Machine</key>
+      <key alias="message">Message</key>
+      <key alias="exception">Exception</key>
+      <key alias="properties">Properties</key>
+      <key alias="searchWithGoogle">Search With Google</key>
+      <key alias="searchThisMessageWithGoogle">Search this message with Google</key>
+      <key alias="searchWithBing">Search With Bing</key>
+      <key alias="searchThisMessageWithBing">Search this message with Bing</key>
+      <key alias="searchOurUmbraco">Search Our Umbraco</key>
+      <key alias="searchThisMessageOnOurUmbracoForumsAndDocs">Search this message on Our Umbraco forums and docs</key>
+      <key alias="searchOurUmbracoWithGoogle">Search Our Umbraco with Google</key>
+      <key alias="searchOurUmbracoForumsUsingGoogle">Search Our Umbraco forums using Google</key>
+      <key alias="searchUmbracoSource">Search Umbraco Source</key>
+      <key alias="searchWithinUmbracoSourceCodeOnGithub">Search within Umbraco source code on Github</key>
+      <key alias="searchUmbracoIssues">Search Umbraco Issues</key>
+      <key alias="searchUmbracoIssuesOnGithub">Search Umbraco Issues on Github</key>
+      <key alias="deleteThisSearch">Delete this search</key>
+      <key alias="findLogsWithRequestId">Find Logs with Request ID</key>
+      <key alias="findLogsWithNamespace">Find Logs with Namespace</key>
+      <key alias="findLogsWithMachineName">Find Logs with Machine Name</key>
+      <key alias="open">Open</key>
+      <key alias="polling">Polling</key>
+      <key alias="every2">Every 2 seconds</key>
+      <key alias="every5">Every 5 seconds</key>
+      <key alias="every10">Every 10 seconds</key>
+      <key alias="every20">Every 20 seconds</key>
+      <key alias="every30">Every 30 seconds</key>
+      <key alias="pollingEvery2">Polling every 2s</key>
+      <key alias="pollingEvery5">Polling every 5s</key>
+      <key alias="pollingEvery10">Polling every 10s</key>
+      <key alias="pollingEvery20">Polling every 20s</key>
+      <key alias="pollingEvery30">Polling every 30s</key>
+  </area>
+  <area alias="clipboard">
+    <key alias="labelForCopyAllEntries">Copy %0%</key>
+    <key alias="labelForArrayOfItemsFrom">%0% from %1%</key>
+    <key alias="labelForRemoveAllEntries">Remove all items</key>
+    <key alias="labelForClearClipboard">Clear clipboard</key>
+  </area>
+  <area alias="propertyActions">
+    <key alias="tooltipForPropertyActionsMenu">Open Property Actions</key>
+    <key alias="tooltipForPropertyActionsMenuClose">Close Property Actions</key>
+  </area>
+  <area alias="nuCache">
+    <key alias="wait">Wait</key>
+    <key alias="refreshStatus">Refresh status</key>
+    <key alias="memoryCache">Memory Cache</key>
+    <key alias="memoryCacheDescription">
+        <![CDATA[
+            This button lets you reload the in-memory cache, by entirely reloading it from the database
+    cache (but it does not rebuild that database cache). This is relatively fast.
+    Use it when you think that the memory cache has not been properly refreshed, after some events
+    triggered&mdash;which would indicate a minor Umbraco issue.
+    (note: triggers the reload on all servers in an LB environment).
+    ]]>
+    </key>
+    <key alias="reload">Reload</key>
+    <key alias="databaseCache">Database Cache</key>
+    <key alias="databaseCacheDescription">
+        <![CDATA[
+    This button lets you rebuild the database cache, ie the content of the cmsContentNu table.
+    <strong>Rebuilding can be expensive.</strong>
+    Use it when reloading is not enough, and you think that the database cache has not been
+    properly generated&mdash;which would indicate some critical Umbraco issue.
+    ]]>
+    </key>
+    <key alias="rebuild">Rebuild</key>
+    <key alias="internals">Internals</key>
+    <key alias="internalsDescription">
+        <![CDATA[
+    This button lets you trigger a NuCache snapshots collection (after running a fullCLR GC).
+    Unless you know what that means, you probably do <em>not</em> need to use it.
+    ]]>
+    </key>
+    <key alias="collect">Collect</key>
+    <key alias="publishedCacheStatus">Published Cache Status</key>
+    <key alias="caches">Caches</key>
+  </area>
+  <area alias="profiling">
+    <key alias="performanceProfiling">Performance profiling</key>
+    <key alias="performanceProfilingDescription">
+        <![CDATA[
+            <p>
+                Umbraco currently runs in debug mode. This means you can use the built-in performance profiler to assess the performance when rendering pages.
+            </p>
+            <p>
+                If you want to activate the profiler for a specific page rendering, simply add <b>umbDebug=true</b> to the querystring when requesting the page.
+            </p>
+            <p>
+                If you want the profiler to be activated by default for all page renderings, you can use the toggle below.
+                It will set a cookie in your browser, which then activates the profiler automatically.
+                In other words, the profiler will only be active by default in <i>your</i> browser - not everyone else's.
+            </p>
+    ]]>
+    </key>
+    <key alias="activateByDefault">Activate the profiler by default</key>
+    <key alias="reminder">Friendly reminder</key>
+    <key alias="reminderDescription">
+        <![CDATA[
+        <p>
+            You should never let a production site run in debug mode. Debug mode is turned off by setting <b>debug="false"</b> on the <b>&lt;compilation /&gt;</b> element in web.config.
+        </p>
+    ]]>
+    </key>
+    <key alias="profilerEnabledDescription">
+        <![CDATA[
+        <p>
+            Umbraco currently does not run in debug mode, so you can't use the built-in profiler. This is how it should be for a production site.
+        </p>
+        <p>
+            Debug mode is turned on by setting <b>debug="true"</b> on the <b>&lt;compilation /&gt;</b> element in web.config.
+        </p>
+    ]]>
+    </key>
+  </area>
+  <area alias="settingsDashboardVideos">
+    <key alias="trainingHeadline">Hours of Umbraco training videos are only a click away</key>
+    <key alias="trainingDescription">
+        <![CDATA[
+            <p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="https://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a> for even more Umbraco videos</p>
+        ]]>
+    </key>
+    <key alias="getStarted">To get you started</key>
+  </area>
+  <area alias="settingsDashboard">
+    <key alias="start">Start here</key>
+    <key alias="startDescription">This section contains the building blocks for your Umbraco site. Follow the below links to find out more about working with the items in the Settings section</key>
+    <key alias="more">Find out more</key>
+    <key alias="bulletPointOne">
+        <![CDATA[
+        Read more about working with the items in Settings <a class="btn-link -underline" href="https://our.umbraco.com/documentation/Getting-Started/Backoffice/Sections/" target="_blank" rel="noopener">in the Documentation section</a> of Our Umbraco
+    ]]>
+    </key>
+    <key alias="bulletPointTwo">
+        <![CDATA[
+        Ask a question in the <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank" rel="noopener">Community Forum</a>
+    ]]>
+    </key>
+    <key alias="bulletPointThree">
+        <![CDATA[
+        Watch our <a class="btn-link -underline" href="https://umbraco.tv" target="_blank" rel="noopener">tutorial videos</a> (some are free, some require a subscription)
+    ]]>
+    </key>
+    <key alias="bulletPointFour">
+        <![CDATA[
+        Find out about our <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank" rel="noopener">productivity boosting tools and commercial support</a>
+    ]]>
+    </key>
+    <key alias="bulletPointFive">
+        <![CDATA[
+        Find out about real-life <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank" rel="noopener">training and certification</a> opportunities
+    ]]>
+    </key>
+  </area>
+  <area alias="startupDashboard">
+    <key alias="fallbackHeadline">Welcome to The Friendly CMS</key>
+    <key alias="fallbackDescription">Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible.</key>
+  </area>
+  <area alias="formsDashboard">
+    <key alias="formsHeadline">Umbraco Forms</key>
+    <key alias="formsDescription">Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it!</key>
+  </area>
+  <area alias="blockEditor">
+    <key alias="headlineCreateBlock">Pick Element Type</key>
+    <key alias="headlineAddSettingsElementType">Attach a settings Element Type</key>
+    <key alias="headlineAddCustomView">Select view</key>
+    <key alias="headlineAddCustomStylesheet">Select stylesheet</key>
+    <key alias="headlineAddThumbnail">Choose thumbnail</key>
+    <key alias="labelcreateNewElementType">Create new Element Type</key>
+    <key alias="labelCustomStylesheet">Custom stylesheet</key>
+    <key alias="addCustomStylesheet">Add stylesheet</key>
+    <key alias="headlineEditorAppearance">Editor apperance</key>
+    <key alias="headlineDataModels">Data models</key>
+    <key alias="headlineCatalogueAppearance">Catalogue appearance</key>
+    <key alias="labelBackgroundColor">Background color</key>
+    <key alias="labelIconColor">Icon color</key>
+    <key alias="labelContentElementType">Content model</key>
+    <key alias="labelLabelTemplate">Label</key>
+    <key alias="labelCustomView">Custom view</key>
+    <key alias="labelCustomViewInfoTitle">Show custom view description</key>
+    <key alias="labelCustomViewDescription">Overwrite how this block appears in the BackOffice UI. Pick a .html file containing your presentation.</key>
+    <key alias="labelSettingsElementType">Settings model</key>
+    <key alias="labelEditorSize">Overlay editor size</key>
+    <key alias="addCustomView">Add custom view</key>
+    <key alias="addSettingsElementType">Add settings</key>
+    <key alias="labelTemplatePlaceholder">Overwrite label template</key>
+    <key alias="confirmDeleteBlockMessage"><![CDATA[Are you sure you want to delete the content <strong>%0%</strong>?]]></key>
+    <key alias="confirmDeleteBlockTypeMessage"><![CDATA[Are you sure you want to delete the block configuration <strong>%0%</strong>?]]></key>
+    <key alias="confirmDeleteBlockTypeNotice">The content of this block will still be present, editing of this content will no longer be available and will be shown as unsupported content.</key>
+    <key alias="blockConfigurationOverlayTitle"><![CDATA[Configuration of '%0%']]></key>
+    <key alias="thumbnail">Thumbnail</key>
+    <key alias="addThumbnail">Add thumbnail</key>
+    <key alias="tabCreateEmpty">Create empty</key>
+    <key alias="tabClipboard">Clipboard</key>
+    <key alias="tabBlockSettings">Settings</key>
+    <key alias="headlineAdvanced">Advanced</key>
+    <key alias="forceHideContentEditor">Force hide content editor</key>
+    <key alias="blockHasChanges">You have made changes to this content. Are you sure you want to discard them?</key>
+    <key alias="confirmCancelBlockCreationHeadline">Discard creation?</key>
+    <key alias="confirmCancelBlockCreationMessage"><![CDATA[Are you sure you want to cancel the creation.]]></key>
+    <key alias="elementTypeDoesNotExistHeadline">Error!</key>
+    <key alias="elementTypeDoesNotExistDescription">The ElementType of this block does not exist anymore</key>
+  </area>
+  <area alias="contentTemplatesDashboard">
+    <key alias="whatHeadline">What are Content Templates?</key>
+    <key alias="whatDescription">Content Templates are pre-defined content that can be selected when creating a new content node.</key>
+    <key alias="createHeadline">How do I create a Content Template?</key>
+    <key alias="createDescription">
+        <![CDATA[
+            <p>There are two ways to create a Content Template:</p>
+            <ul>
+                <li>Right-click a content node and select "Create Content Template" to create a new Content Template.</li>
+                <li>Right-click the Content Templates tree in the Settings section and select the Document Type you want to create a Content Template for.</li>
+            </ul>
+            <p>Once given a name, editors can start using the Content Template as a foundation for their new page.</p>
+        ]]>
+    </key>
+    <key alias="manageHeadline">How do I manage Content Templates?</key>
+    <key alias="manageDescription">You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Expand the Document Type which the Content Template is based on and click it to edit or delete it.</key>
+  </area>
+  <area alias="preview">
+    <key alias="endLabel">End</key>
+    <key alias="endTitle">End preview mode</key>
+    <key alias="openWebsiteLabel">Preview website</key>
+    <key alias="openWebsiteTitle">Open website in preview mode</key>
+    <key alias="returnToPreviewHeadline">Preview website?</key>
+    <key alias="returnToPreviewDescription">You have ended preview mode, do you want to enable it again to view the latest saved version of your website?</key>
+    <key alias="returnToPreviewAcceptButton">Preview latest version</key>
+    <key alias="returnToPreviewDeclineButton">View published version</key>
+    <key alias="viewPublishedContentHeadline">View published version?</key>
+    <key alias="viewPublishedContentDescription">You are in Preview Mode, do you want exit in order to view the published version of your website?</key>
+    <key alias="viewPublishedContentAcceptButton">View published version</key>
+    <key alias="viewPublishedContentDeclineButton">Stay in preview mode</key>
+  </area>
+</language>
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 6700818ee0..ad5992a195 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -17,6 +17,7 @@
     <key alias="createGroup">Create group</key>
     <key alias="delete">Delete</key>
     <key alias="disable">Disable</key>
+    <key alias="editSettings">Edit settings</key>
     <key alias="emptyRecycleBin">Empty recycle bin</key>
     <key alias="enable">Enable</key>
     <key alias="exportDocumentType">Export Document Type</key>
@@ -26,11 +27,12 @@
     <key alias="logout">Exit</key>
     <key alias="move">Move</key>
     <key alias="notify">Notifications</key>
-    <key alias="protect">Public access</key>
+    <key alias="protect">Restrict Public Access</key>
     <key alias="publish">Publish</key>
     <key alias="unpublish">Unpublish</key>
     <key alias="refreshNode">Reload</key>
     <key alias="republish">Republish entire site</key>
+    <key alias="remove">Remove</key>
     <key alias="rename" version="7.3.0">Rename</key>
     <key alias="restore" version="7.3.0">Restore</key>
     <key alias="SetPermissionsForThePage">Set permissions for the page %0%</key>
@@ -70,7 +72,7 @@
     <key alias="create">Allow access to create nodes</key>
     <key alias="delete">Allow access to delete nodes</key>
     <key alias="move">Allow access to move a node</key>
-    <key alias="protect">Allow access to set and change public access for a node</key>
+    <key alias="protect">Allow access to set and change access restrictions for a node</key>
     <key alias="publish">Allow access to publish a node</key>
     <key alias="unpublish">Allow access to unpublish a node</key>
     <key alias="rights">Allow access to change permissions for a node</key>
@@ -155,6 +157,8 @@
     <key alias="confirmActionCancel">Cancel</key>
     <key alias="confirmActionConfirm">Confirm</key>
 	<key alias="morePublishingOptions">More publishing options</key>
+    <key alias="submitChanges">Submit</key>
+    <key alias="submitChangesAndClose">Submit and close</key>
   </area>
   <area alias="auditTrails">
     <key alias="atViewingFor">Viewing for</key>
@@ -250,12 +254,12 @@
     <key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
     <key alias="parentCultureNotPublished">This culture is published but is not visible because it is unpublished on parent '%0%'</key>
     <key alias="parentNotPublishedAnomaly">This document is published but is not in the cache</key>
-    <key alias="getUrlException">Could not get the url</key>
-    <key alias="routeError">This document is published but its url would collide with content %0%</key>
-    <key alias="routeErrorCannotRoute">This document is published but its url cannot be routed</key>
+    <key alias="getUrlException">Could not get the URL</key>
+    <key alias="routeError">This document is published but its URL would collide with content %0%</key>
+    <key alias="routeErrorCannotRoute">This document is published but its URL cannot be routed</key>
     <key alias="publish">Publish</key>
     <key alias="published">Published</key>
-    <key alias="publishedPendingChanges">Published (pending changes)</key>&gt;
+    <key alias="publishedPendingChanges">Published (pending changes)</key>
     <key alias="publishStatus">Publication Status</key>
     <key alias="publishDescendantsHelp"><![CDATA[Publish <strong>%0%</strong> and all content items underneath and thereby making their content publicly available.]]></key>
     <key alias="publishDescendantsWithVariantsHelp"><![CDATA[Publish variants and variants of same type underneath and thereby making their content publicly available.]]></key>
@@ -268,6 +272,7 @@
     <key alias="statistics">Statistics</key>
     <key alias="titleOptional">Title (optional)</key>
     <key alias="altTextOptional">Alternative text (optional)</key>
+    <key alias="captionTextOptional">Caption (optional)</key>
     <key alias="type">Type</key>
     <key alias="unpublish">Unpublish</key>
     <key alias="unpublished">Draft</key>
@@ -296,7 +301,7 @@
     <key alias="addTextBox">Add another text box</key>
     <key alias="removeTextBox">Remove this text box</key>
     <key alias="contentRoot">Content root</key>
-    <key alias="includeUnpublished">Include drafts and unpublished content items.</key>
+    <key alias="includeUnpublished">Include unpublished content items.</key>
     <key alias="isSensitiveValue">This value is hidden. If you need access to view this value please contact your website administrator.</key>
     <key alias="isSensitiveValue_short">This value is hidden.</key>
     <key alias="languagesToPublishForFirstTime">What languages would you like to publish? All languages with content are saved!</key>
@@ -312,7 +317,7 @@
     <key alias="untouchedLanguagesForFirstTime">These languages haven't been created</key>
 
     <key alias="variantsWillBeSaved">All new variants will be saved.</key>
-    <key alias="variantsToPublish">Which variants you would like to publish?</key>
+    <key alias="variantsToPublish">Which variants would you like to publish?</key>
     <key alias="variantsToSave">Choose which variants to be saved.</key>
     <key alias="variantsToSendForApproval">Pick variants to send for approval.</key>
     <key alias="variantsToSchedule">Set scheduled publishing...</key>
@@ -350,6 +355,7 @@
     <key alias="createFolderFailed">Failed to create a folder under parent id %0%</key>
     <key alias="renameFolderFailed">Failed to rename the folder with id %0%</key>
     <key alias="dragAndDropYourFilesIntoTheArea">Drag and drop your file(s) into the area</key>
+    <key alias="uploadNotAllowed">Upload is not allowed in this location.</key>
   </area>
   <area alias="member">
     <key alias="createNewMember">Create a new member</key>
@@ -372,6 +378,16 @@
     <key alias="noMediaTypesWithNoSettingsAccess">The selected media in the tree doesn't allow for any other media to be created below it.</key>
     <key alias="noMediaTypesEditPermissions">Edit permissions for this media type</key>
     <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
+    <key alias="documentTypeWithTemplate">Document Type with Template</key>
+    <key alias="documentTypeWithTemplateDescription">The data definition for a content page that can be created by editors in the content tree and is directly accessible via a URL.</key>
+    <key alias="documentType">Document Type</key>
+    <key alias="documentTypeDescription">The data definition for a content component that can be created by editors in the content tree and be picked on other pages but has no direct URL.</key>
+    <key alias="elementType">Element Type</key>
+    <key alias="elementTypeDescription">Defines the schema for a repeating set of properties, for example, in a 'Block List' or 'Nested Content' property editor.</key>
+    <key alias="composition">Composition</key>
+    <key alias="compositionDescription">Defines a re-usable set of properties that can be included in the definition of multiple other Document Types. For example, a set of 'Common Page Settings'.</key>
+    <key alias="folder">Folder</key>
+    <key alias="folderDescription">Used to organise the Document Types, Compositions and Element Types created in this Document Type tree.</key>
     <key alias="newFolder">New folder</key>
     <key alias="newDataType">New data type</key>
     <key alias="newJavascriptFile">New JavaScript file</key>
@@ -433,6 +449,9 @@
     <key alias="closeThisWindow">Close this window</key>
     <key alias="confirmdelete">Are you sure you want to delete</key>
     <key alias="confirmdisable">Are you sure you want to disable</key>
+    <key alias="confirmremove">Are you sure you want to remove</key>
+    <key alias="confirmremoveusageof"><![CDATA[Are you sure you want to remove the usage of <b>%0%</b>]]></key>
+    <key alias="confirmremovereferenceto"><![CDATA[Are you sure you want to remove the reference to <b>%0%</b>]]></key>
     <key alias="confirmlogout">Are you sure?</key>
     <key alias="confirmSure">Are you sure?</key>
     <key alias="cut">Cut</key>
@@ -464,7 +483,7 @@
     <key alias="recycleBinIsEmpty">The recycle bin is now empty</key>
     <key alias="recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</key>
     <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]></key>
-    <key alias="regexSearchHelp">Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code' 'url'</key>
+    <key alias="regexSearchHelp">Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code', 'URL'.</key>
     <key alias="removeMacro">Remove Macro</key>
     <key alias="requiredField">Required Field</key>
     <key alias="sitereindexed">Site is reindexed</key>
@@ -496,6 +515,7 @@
     <key alias="selectMemberType">Select member type</key>
     <key alias="selectNode">Select node</key>
     <key alias="selectSections">Select sections</key>
+    <key alias="selectUser">Select user</key>
     <key alias="selectUsers">Select users</key>
     <key alias="noIconsFound">No icons were found</key>
     <key alias="noMacroParams">There are no parameters for this macro</key>
@@ -511,6 +531,9 @@
     <key alias="selectEditorConfiguration">Select configuration</key>
     <key alias="selectSnippet">Select snippet</key>
     <key alias="variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language, you should unpublish the node in that language instead.</key>
+    <key alias="propertyuserpickerremovewarning"><![CDATA[This will remove the user <b>%0%</b>.]]></key>
+    <key alias="userremovewarning"><![CDATA[This will remove the user <b>%0%</b> from the <b>%1%</b> group]]></key>
+    <key alias="yesRemove">Yes, remove</key>
   </area>
   <area alias="dictionary">
     <key alias="noItems">There are no dictionary items.</key>
@@ -637,6 +660,7 @@
     <key alias="tableColMergeLeft">Please place cursor at the left of the two cells you wish to merge</key>
     <key alias="tableSplitNotSplittable">You cannot split a cell that hasn't been merged.</key>
     <key alias="propertyHasErrors">This property is invalid</key>
+    <key alias="errorPropertyEditorNotSupportedInElementTypes">Property '%0%' uses editor '%1%' which is not supported in Element Types.</key>
   </area>
   <area alias="general">
     <key alias="options">Options</key>
@@ -665,6 +689,7 @@
     <key alias="continue">Continue</key>
     <key alias="copy">Copy</key>
     <key alias="create">Create</key>
+    <key alias="cropSection">Crop section</key>
     <key alias="database">Database</key>
     <key alias="date">Date</key>
     <key alias="default">Default</key>
@@ -674,6 +699,7 @@
     <key alias="design">Design</key>
     <key alias="dictionary">Dictionary</key>
     <key alias="dimensions">Dimensions</key>
+    <key alias="discard">Discard</key>
     <key alias="down">Down</key>
     <key alias="download">Download</key>
     <key alias="edit">Edit</key>
@@ -766,7 +792,7 @@
     <key alias="update">Update</key>
     <key alias="upgrade">Upgrade</key>
     <key alias="upload">Upload</key>
-    <key alias="url">Url</key>
+    <key alias="url">URL</key>
     <key alias="user">User</key>
     <key alias="username">Username</key>
     <key alias="value">Value</key>
@@ -789,8 +815,8 @@
     <key alias="other">Other</key>
     <key alias="articles">Articles</key>
     <key alias="videos">Videos</key>
-    <key alias="clear">Clear</key>
     <key alias="installing">Installing</key>
+    <key alias="avatar">Avatar for</key>
   </area>
   <area alias="colors">
     <key alias="blue">Blue</key>
@@ -842,8 +868,8 @@
               <p>To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file. </p>
               <p>
               Click the <strong>retry</strong> button when
-              done.<br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
-			              More information on editing web.config here.</a></p>]]></key>
+              done.<br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">
+			              More information on editing web.config here</a>.</p>]]></key>
     <key alias="databaseText"><![CDATA[To complete this step, you must know some information regarding your database server ("connection string").<br />
         Please contact your ISP if necessary.
         If you're installing on a local machine or server you might need information from your system administrator.]]></key>
@@ -890,7 +916,7 @@
     <key alias="runwayFromScratch">I want to start from scratch</key>
     <key alias="runwayFromScratchText"><![CDATA[
         Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates.
-        (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
+        (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
         You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
       ]]></key>
     <key alias="runwayHeader">You've just set up a clean Umbraco platform. What do you want to do next?</key>
@@ -958,7 +984,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="instruction">Log in below</key>
     <key alias="signInWith">Sign in with</key>
     <key alias="timeout">Session timed out</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">Forgotten password?</key>
     <key alias="forgottenPasswordInstruction">An email will be sent to the address specified with a link to reset your password</key>
     <key alias="requestPasswordResetConfirmation">An email with password reset instructions will be sent to the specified address if it matched our records</key>
@@ -1351,7 +1377,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="currentVersion">Current version</key>
     <key alias="diffHelp"><![CDATA[This shows the differences between the current version and the selected version<br /><del>Red</del> text will not be shown in the selected version. , <ins>green means added</ins>]]></key>
     <key alias="documentRolledBack">Document has been rolled back</key>
-    <key alias="headline">Select a version to compare with the current version</key>
     <key alias="htmlHelp">This displays the selected version as HTML, if you wish to see the difference between 2 versions at the same time, use the diff view</key>
     <key alias="rollbackTo">Rollback to</key>
     <key alias="selectVersion">Select version</key>
@@ -1407,6 +1432,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="validationFailedMessage">Validation errors must be fixed before the item can be saved</key>
     <key alias="operationFailedHeader">Failed</key>
     <key alias="operationSavedHeader">Saved</key>
+      <key alias="operationSavedHeaderReloadUser">Saved.  To view the changes please reload your browser</key>
     <key alias="invalidUserPermissionsText">Insufficient user permissions, could not complete the operation</key>
     <key alias="operationCancelledHeader">Cancelled</key>
     <key alias="operationCancelledText">Operation was cancelled by a 3rd party add-in</key>
@@ -1606,11 +1632,14 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="gridLayouts">Grid Layouts</key>
     <key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
     <key alias="addGridLayout">Add Grid Layout</key>
+    <key alias="editGridLayout">Edit Grid Layout</key>
     <key alias="addGridLayoutDetail">Adjust the layout by setting column widths and adding additional sections</key>
     <key alias="rowConfigurations">Row configurations</key>
     <key alias="rowConfigurationsDetail">Rows are predefined cells arranged horizontally</key>
     <key alias="addRowConfiguration">Add row configuration</key>
+    <key alias="editRowConfiguration">Edit row configuration</key>
     <key alias="addRowConfigurationDetail">Adjust the row by setting cell widths and adding additional cells</key>
+    <key alias="noConfiguration">No further configuration available</key>
     <key alias="columns">Columns</key>
     <key alias="columnsDetails">Total combined number of columns in the grid layout</key>
     <key alias="settings">Settings</key>
@@ -1698,6 +1727,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="elementCannotToggle">A document type cannot be changed to an element type once it has been used to create one or more content items.</key>
     <key alias="elementDoesNotSupport">This is not applicable for an element type</key>
     <key alias="propertyHasChanges">You have made changes to this property. Are you sure you want to discard them?</key>
+    <key alias="displaySettingsHeadline">Appearance</key>
+    <key alias="displaySettingsLabelOnTop">Label above (full-width)</key>
   </area>
   <area alias="languages">
     <key alias="addLanguage">Add language</key>
@@ -1850,7 +1881,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="administrators">Administrator</key>
     <key alias="categoryField">Category field</key>
     <key alias="createDate">User created</key>
-    <key alias="changePassword">Change Your Password</key>
+    <key alias="changePassword">Change your password</key>
     <key alias="changePhoto">Change photo</key>
     <key alias="newPassword">New password</key>
     <key alias="noLockouts">hasn't been locked out</key>
@@ -2054,7 +2085,10 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="validationRegExpMessage">Enter a custom validation error message (optional)</key>
     <key alias="minCount">You need to add at least</key>
     <key alias="maxCount">You can only have</key>
+    <key alias="addUpTo">Add up to</key>
     <key alias="items">items</key>
+    <key alias="urls">URL(s)</key>
+    <key alias="urlsSelected">URL(s) selected</key>
     <key alias="itemsSelected">items selected</key>
     <key alias="invalidDate">Invalid date</key>
     <key alias="invalidNumber">Not a number</key>
@@ -2173,7 +2207,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="helpText">
         <![CDATA[
         <p>The health checker evaluates various areas of your site for best practice settings, configuration, potential problems, etc. You can easily fix problems by pressing a button.
-        You can add your own health checks, have a look at <a href="https://our.umbraco.com/documentation/Extending/Healthcheck/" target="_blank" class="btn-link -underline">the documentation for more information</a> about custom health checks.</p>
+        You can add your own health checks, have a look at <a href="https://our.umbraco.com/documentation/Extending/Healthcheck/" target="_blank" rel="noopener" class="btn-link -underline">the documentation for more information</a> about custom health checks.</p>
         ]]>
     </key>
   </area>
@@ -2183,7 +2217,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="culture">Culture</key>
     <key alias="originalUrl">Original URL</key>
     <key alias="redirectedTo">Redirected To</key>
-    <key alias="redirectUrlManagement">Redirect Url Management</key>
+    <key alias="redirectUrlManagement">Redirect URL Management</key>
     <key alias="panelInformation">The following URLs redirect to this content item:</key>
     <key alias="noRedirects">No redirects have been made</key>
     <key alias="noRedirectsDescription">When a published page gets renamed or moved a redirect will automatically be made to the new page.</key>
@@ -2255,7 +2289,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="openCloseBackofficeProfileOptions">Open/Close your profile options</key>
     <key alias="assignDomainDescription">Setup Culture and Hostnames for %0%</key>
     <key alias="createDescription">Create new node under %0%</key>
-    <key alias="protectDescription">Setup Public access on %0%</key>
+    <key alias="protectDescription">Setup access restrictions on %0%</key>
     <key alias="rightsDescription">Setup Permissions on %0%</key>
     <key alias="sortDescription">Change sort order for %0%</key>
     <key alias="createblueprintDescription">Create Content Template based on %0%</key>
@@ -2276,6 +2310,17 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="name">Name</key>
     <key alias="addNewRow">Add new row</key>
     <key alias="tabExpand">View more options</key>
+    <key alias="searchOverlayTitle">Search the Umbraco backoffice</key>
+    <key alias="searchOverlayDescription">Search for content nodes, media nodes etc. across the backoffice.</key>
+    <key alias="searchInputDescription">When autocomplete results are available, press up and down arrows, or use the tab key and use the enter key to select.</key>
+    <key alias="path">Path: </key>
+    <key alias="foundIn">Found in</key>
+    <key alias="hasTranslation">Has translation</key>
+    <key alias="noTranslation">Missing translation</key>
+    <key alias="dictionaryListCaption">Dictionary items</key>
+    <key alias="contextMenuDescription">Select one of the options to edit the node.</key>
+    <key alias="contextDialogDescription">Perform action %0% on the %1% node</key>
+    <key alias="addImageCaption">Add image caption</key>
   </area>
   <area alias="references">
     <key alias="tabName">References</key>
@@ -2292,8 +2337,12 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="labelUsedByMedia">Used in Media</key>
   </area>
   <area alias="logViewer">
+      <key alias="deleteSavedSearch">Delete Saved Search</key>
       <key alias="logLevels">Log Levels</key>
       <key alias="savedSearches">Saved Searches</key>
+      <key alias="saveSearch">Save Search</key>
+      <key alias="saveSearchDescription">Enter a friendly name for your search query</key>
+      <key alias="filterSearch">Filter Search</key>
       <key alias="totalItems">Total Items</key>
       <key alias="timestamp">Timestamp</key>
       <key alias="level">Level</key>
@@ -2318,14 +2367,27 @@ To manage your website, simply open the Umbraco back office and start adding con
       <key alias="findLogsWithNamespace">Find Logs with Namespace</key>
       <key alias="findLogsWithMachineName">Find Logs with Machine Name</key>
       <key alias="open">Open</key>
+      <key alias="polling">Polling</key>
+      <key alias="every2">Every 2 seconds</key>
+      <key alias="every5">Every 5 seconds</key>
+      <key alias="every10">Every 10 seconds</key>
+      <key alias="every20">Every 20 seconds</key>
+      <key alias="every30">Every 30 seconds</key>
+      <key alias="pollingEvery2">Polling every 2s</key>
+      <key alias="pollingEvery5">Polling every 5s</key>
+      <key alias="pollingEvery10">Polling every 10s</key>
+      <key alias="pollingEvery20">Polling every 20s</key>
+      <key alias="pollingEvery30">Polling every 30s</key>
   </area>
   <area alias="clipboard">
     <key alias="labelForCopyAllEntries">Copy %0%</key>
     <key alias="labelForArrayOfItemsFrom">%0% from %1%</key>
     <key alias="labelForRemoveAllEntries">Remove all items</key>
+    <key alias="labelForClearClipboard">Clear clipboard</key>
   </area>
   <area alias="propertyActions">
     <key alias="tooltipForPropertyActionsMenu">Open Property Actions</key>
+    <key alias="tooltipForPropertyActionsMenuClose">Close Property Actions</key>
   </area>
   <area alias="nuCache">
     <key alias="wait">Wait</key>
@@ -2403,7 +2465,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="trainingHeadline">Hours of Umbraco training videos are only a click away</key>
     <key alias="trainingDescription">
         <![CDATA[
-        <p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="http://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos</p>
+        <p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="https://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a> for even more Umbraco videos</p>
     ]]>
     </key>
     <key alias="getStarted">To get you started</key>
@@ -2414,27 +2476,27 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="more">Find out more</key>
     <key alias="bulletPointOne">
         <![CDATA[
-            Read more about working with the items in Settings <a class="btn-link -underline" href="https://our.umbraco.com/documentation/Getting-Started/Backoffice/Sections/" target="_blank">in the Documentation section</a> of Our Umbraco
+            Read more about working with the items in Settings <a class="btn-link -underline" href="https://our.umbraco.com/documentation/Getting-Started/Backoffice/Sections/" target="_blank" rel="noopener">in the Documentation section</a> of Our Umbraco
         ]]>
     </key>
     <key alias="bulletPointTwo">
         <![CDATA[
-            Ask a question in the <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank">Community Forum</a>
+            Ask a question in the <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank" rel="noopener">Community Forum</a>
         ]]>
     </key>
     <key alias="bulletPointThree">
         <![CDATA[
-            Watch our <a class="btn-link -underline" href="https://umbraco.tv" target="_blank">tutorial videos</a> (some are free, some require a subscription)
+            Watch our <a class="btn-link -underline" href="https://umbraco.tv" target="_blank" rel="noopener">tutorial videos</a> (some are free, some require a subscription)
         ]]>
     </key>
     <key alias="bulletPointFour">
         <![CDATA[
-            Find out about our <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank">productivity boosting tools and commercial support</a>
+            Find out about our <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank" rel="noopener">productivity boosting tools and commercial support</a>
         ]]>
     </key>
     <key alias="bulletPointFive">
         <![CDATA[
-            Find out about real-life <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank">training and certification</a> opportunities
+            Find out about real-life <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank" rel="noopener">training and certification</a> opportunities
         ]]>
     </key>
   </area>
@@ -2446,6 +2508,47 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="formsHeadline">Umbraco Forms</key>
     <key alias="formsDescription">Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it!</key>
   </area>
+  <area alias="blockEditor">
+    <key alias="headlineCreateBlock">Pick Element Type</key>
+    <key alias="headlineAddSettingsElementType">Attach a settings Element Type</key>
+    <key alias="headlineAddCustomView">Select view</key>
+    <key alias="headlineAddCustomStylesheet">Select stylesheet</key>
+    <key alias="headlineAddThumbnail">Choose thumbnail</key>
+    <key alias="labelcreateNewElementType">Create new Element Type</key>
+    <key alias="labelCustomStylesheet">Custom stylesheet</key>
+    <key alias="addCustomStylesheet">Add stylesheet</key>
+    <key alias="headlineEditorAppearance">Editor apperance</key>
+    <key alias="headlineDataModels">Data models</key>
+    <key alias="headlineCatalogueAppearance">Catalogue appearance</key>
+    <key alias="labelBackgroundColor">Background color</key>
+    <key alias="labelIconColor">Icon color</key>
+    <key alias="labelContentElementType">Content model</key>
+    <key alias="labelLabelTemplate">Label</key>
+    <key alias="labelCustomView">Custom view</key>
+    <key alias="labelCustomViewInfoTitle">Show custom view description</key>
+    <key alias="labelCustomViewDescription">Overwrite how this block appears in the BackOffice UI. Pick a .html file containing your presentation.</key>
+    <key alias="labelSettingsElementType">Settings model</key>
+    <key alias="labelEditorSize">Overlay editor size</key>
+    <key alias="addCustomView">Add custom view</key>
+    <key alias="addSettingsElementType">Add settings</key>
+    <key alias="labelTemplatePlaceholder">Overwrite label template</key>
+    <key alias="confirmDeleteBlockMessage"><![CDATA[Are you sure you want to delete the content <strong>%0%</strong>?]]></key>
+    <key alias="confirmDeleteBlockTypeMessage"><![CDATA[Are you sure you want to delete the block configuration <strong>%0%</strong>?]]></key>
+    <key alias="confirmDeleteBlockTypeNotice">The content of this block will still be present, editing of this content will no longer be available and will be shown as unsupported content.</key>
+    <key alias="blockConfigurationOverlayTitle"><![CDATA[Configuration of '%0%']]></key>
+    <key alias="thumbnail">Thumbnail</key>
+    <key alias="addThumbnail">Add thumbnail</key>
+    <key alias="tabCreateEmpty">Create empty</key>
+    <key alias="tabClipboard">Clipboard</key>
+    <key alias="tabBlockSettings">Settings</key>
+    <key alias="headlineAdvanced">Advanced</key>
+    <key alias="forceHideContentEditor">Force hide content editor</key>
+    <key alias="blockHasChanges">You have made changes to this content. Are you sure you want to discard them?</key>
+    <key alias="confirmCancelBlockCreationHeadline">Discard creation?</key>
+    <key alias="confirmCancelBlockCreationMessage"><![CDATA[Are you sure you want to cancel the creation.]]></key>
+    <key alias="elementTypeDoesNotExistHeadline">Error!</key>
+    <key alias="elementTypeDoesNotExistDescription">The ElementType of this block does not exist anymore</key>
+  </area>
   <area alias="contentTemplatesDashboard">
     <key alias="whatHeadline">What are Content Templates?</key>
     <key alias="whatDescription">Content Templates are pre-defined content that can be selected when creating a new content node.</key>
@@ -2463,4 +2566,18 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="manageHeadline">How do I manage Content Templates?</key>
     <key alias="manageDescription">You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Expand the Document Type which the Content Template is based on and click it to edit or delete it.</key>
   </area>
+  <area alias="preview">
+    <key alias="endLabel">End</key>
+    <key alias="endTitle">End preview mode</key>
+    <key alias="openWebsiteLabel">Preview website</key>
+    <key alias="openWebsiteTitle">Open website in preview mode</key>
+    <key alias="returnToPreviewHeadline">Preview website?</key>
+    <key alias="returnToPreviewDescription">You have ended preview mode, do you want to enable it again to view the latest saved version of your website?</key>
+    <key alias="returnToPreviewAcceptButton">Preview latest version</key>
+    <key alias="returnToPreviewDeclineButton">View published version</key>
+    <key alias="viewPublishedContentHeadline">View published version?</key>
+    <key alias="viewPublishedContentDescription">You are in Preview Mode, do you want exit in order to view the published version of your website?</key>
+    <key alias="viewPublishedContentAcceptButton">View published version</key>
+    <key alias="viewPublishedContentDeclineButton">Stay in preview mode</key>
+  </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
index c35c84ebdc..6d0fc7661a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
@@ -185,8 +185,8 @@
     <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">Ups: este documento está publicado pero no está en la caché (error interno)</key>
-    <key alias="getUrlException">No se pudo obtener la url</key>
-        <key alias="routeError">Este documento está publicado pero tu url colisionará con contenido %0%</key>
+    <key alias="getUrlException">No se pudo obtener la URL</key>
+        <key alias="routeError">Este documento está publicado pero tu URL colisionará con contenido %0%</key>
     <key alias="publish">Publicar</key>
     <key alias="publishStatus">Estado de la Publicación</key>
     <key alias="releaseDate">Publicar el</key>
@@ -321,7 +321,7 @@
     <key alias="recycleBinIsEmpty">La papelera está vacía</key>
         <key alias="recycleBinWarning">No podrás recuperar los elementos una vez sean borrados de la papelera</key>
     <key alias="regexSearchError"><![CDATA[El servicio web <a target='_blank' href='http://regexlib.com'>regexlib.com</a> está experimentando algunos problemas en estos momentos, de los cuales no somos responsables. Pedimos disculpas por las molestias.]]></key>
-    <key alias="regexSearchHelp">Buscar una expresión regular para agregar validación a un campo de formulario. Ejemplo: 'correo electrónico', código postal "," url "</key>
+    <key alias="regexSearchHelp">Buscar una expresión regular para agregar validación a un campo de formulario. Ejemplo: 'correo electrónico', 'código postal', 'URL'.</key>
     <key alias="removeMacro">Eliminar macro</key>
     <key alias="requiredField">Campo obligatorio</key>
     <key alias="sitereindexed">El sitio ha sido reindexado</key>
@@ -504,11 +504,11 @@
     <key alias="innerMargin">Margen interno</key>
     <key alias="insert">Insertar</key>
     <key alias="install">Instalar</key>
-        <key alias="invalid">Inválido</key>
+    <key alias="invalid">Inválido</key>
     <key alias="justify">Justificar</key>
     <key alias="label">Etiqueta</key>
     <key alias="language">Idioma</key>
-        <key alias="last">Último</key>
+    <key alias="last">Último</key>
     <key alias="layout">Diseño</key>
     <key alias="loading">Cargando</key>
     <key alias="locked">Bloqueado</key>
@@ -520,7 +520,7 @@
     <key alias="message">Mensaje</key>
     <key alias="move">Mover</key>
     <key alias="name">Nombre</key>
-        <key alias="new">Nuevo</key>
+    <key alias="new">Nuevo</key>
     <key alias="next">Próximo</key>
     <key alias="no">No</key>
     <key alias="of">de</key>
@@ -562,7 +562,7 @@
     <key alias="update">Actualizar</key>
     <key alias="upgrade">Actualizar</key>
     <key alias="upload">Subir</key>
-    <key alias="url">Url</key>
+    <key alias="url">URL</key>
     <key alias="user">Usuario</key>
     <key alias="username">Nombre de usuario</key>
     <key alias="value">Valor</key>
@@ -625,7 +625,7 @@
     <key alias="databaseHeader">Configuración de la base de datos</key>
         <key alias="databaseInstall"><![CDATA[Pulsa el botón <strong> instalar </ strong> para instalar %0% la base de datos de Umbraco]]></key>
         <key alias="databaseInstallDone"><![CDATA[Se ha copiado Umbraco %0% a la base de datos. Pulsa <strong>Próximo</strong> para continuar]]></key>
-        <key alias="databaseNotFound"><![CDATA[<p>¡No se ha encontrado ninguna base de datos! Mira si la información en la cadena de conexión del “web.config” es correcta.</p> <p>Para continuar, edita el "web.config" (bien sea usando Visual Studio o tu editor de texto preferido), ve al final del archivo y añade la cadena de conexión para la base de datos con el nombre (key) "umbracoDbDSN" y guarda el archivo. </p> <p>Pincha en <strong>reintentar</strong> cuando hayas terminado.<br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">Pincha aquí para mayor información de como editar el web.config (en inglés)</a></p>]]></key>
+        <key alias="databaseNotFound"><![CDATA[<p>¡No se ha encontrado ninguna base de datos! Mira si la información en la cadena de conexión del “web.config” es correcta.</p> <p>Para continuar, edita el "web.config" (bien sea usando Visual Studio o tu editor de texto preferido), ve al final del archivo y añade la cadena de conexión para la base de datos con el nombre (key) "umbracoDbDSN" y guarda el archivo. </p> <p>Pincha en <strong>reintentar</strong> cuando hayas terminado.<br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">Pincha aquí para mayor información de como editar el web.config (en inglés)</a></p>]]></key>
     <key alias="databaseText"><![CDATA[Para completar este paso, debes conocer la información correspondiente a tu servidor de base de datos ("cadena de conexión").<br /> Por favor, contacta con tu ISP si es necesario. Si estás realizando la instalación en una máquina o servidor local, quizás necesites información de tu administrador de sistemas.]]></key>
         <key alias="databaseUpgrade"><![CDATA[<p> Pincha en <strong>actualizar</strong> para actualizar la base de datos a Umbraco %0%</p> <p> Ningún contenido será borrado de la base de datos y seguirá funcionando después de la actualización </p> ]]></key>
         <key alias="databaseUpgradeDone"><![CDATA[La base de datos ha sido actualizada a la versión 0%.<br />Pincha en <strong>Próximo</strong> para continuar. ]]></key>
@@ -652,7 +652,7 @@
     <key alias="permissionsSettingUpPermissions">Configurando los permisos de directorios</key>
         <key alias="permissionsText">Umbraco necesita permisos de lectura/escritura en algunos directorios para poder almacenar archivos tales como imágenes y PDFs. También almacena datos en la caché para mejorar el rendimiento de tu sitio web</key>
     <key alias="runwayFromScratch">Quiero empezar de cero</key>
-        <key alias="runwayFromScratchText"><![CDATA[Tu sitio web está completamente vacío en estos momentos, lo cual es perfecto si quieres empezar de cero y crear tus propios tipos de documentos y plantillas (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">aprende cómo</a>). Todavía podrás elegir instalar Runway más adelante. Por favor ve a la sección del Desarrollador y elige Paquetes.]]></key>
+        <key alias="runwayFromScratchText"><![CDATA[Tu sitio web está completamente vacío en estos momentos, lo cual es perfecto si quieres empezar de cero y crear tus propios tipos de documentos y plantillas (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">aprende cómo</a>). Todavía podrás elegir instalar Runway más adelante. Por favor ve a la sección del Desarrollador y elige Paquetes.]]></key>
     <key alias="runwayHeader">Acabas de configurar una nueva plataforma Umbraco. ¿Qué deseas hacer ahora?</key>
     <key alias="runwayInstalled">Se ha instalado Runway</key>
     <key alias="runwayInstalledText"><![CDATA[Tienes puestos los cimientos. Selecciona los módulos que desees instalar sobre ellos.<br /> Esta es nuestra lista de módulos recomendados, selecciona los que desees instalar, o mira la <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">lista completa de módulos</a> ]]></key>
@@ -696,7 +696,7 @@
     <key alias="greeting6">Resplandeciente sábado</key>
     <key alias="instruction">Iniciar sesión</key>
     <key alias="timeout">La sesión ha caducado</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">¿Olvidaste tu contraseña?</key>
     <key alias="forgottenPasswordInstruction">Enviaremos un email a la dirección especificada con un enlace para restaurar tu contraseña</key>
         <key alias="requestPasswordResetConfirmation">Un email con instrucciones para restaurar tu contraseña será enviado a la dirección especificada si ésta está registrada.</key>
@@ -1526,7 +1526,7 @@
     <key alias="validation">Validación</key>
     <key alias="validateAsEmail">Validar como email</key>
     <key alias="validateAsNumber">Validar como número</key>
-    <key alias="validateAsUrl">Validar como Url</key>
+    <key alias="validateAsUrl">Validar como URL</key>
         <key alias="enterCustomValidation">...o introduce tu propia validación</key>
     <key alias="fieldIsMandatory">Campo obligatorio</key>
     <key alias="validationRegExp">Introduce una expresión regular</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
index b5d1c8feb2..88c6458a31 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
@@ -12,8 +12,8 @@
     <key alias="copy">Copier</key>
     <key alias="create">Créer</key>
     <key alias="export">Exporter</key>
-    <key alias="createGroup">Créer un groupe</key>
     <key alias="createPackage">Créer un package</key>
+    <key alias="createGroup">Créer un groupe</key>
     <key alias="delete">Supprimer</key>
     <key alias="disable">Désactiver</key>
     <key alias="emptyRecycleBin">Vider la corbeille</key>
@@ -30,17 +30,21 @@
     <key alias="unpublish">Dépublier</key>
     <key alias="refreshNode">Rafraîchir</key>
     <key alias="republish">Republier le site tout entier</key>
+    <key alias="rename" version="7.3.0">Renommer</key>
     <key alias="restore" version="7.3.0">Récupérer</key>
     <key alias="SetPermissionsForThePage">Spécifiez les permissions pour la page %0%</key>
+    <key alias="chooseWhereToCopy">Choisissez où copier</key>
     <key alias="chooseWhereToMove">Choisissez où déplacer</key>
     <key alias="toInTheTreeStructureBelow">dans l'arborescence ci-dessous</key>
+    <key alias="wasMovedTo">a été déplacé vers</key>
+    <key alias="wasCopiedTo">a été copié vers</key>
+    <key alias="wasDeleted">a été supprimé</key>
     <key alias="rights">Permissions</key>
     <key alias="rollback">Version antérieure</key>
     <key alias="sendtopublish">Envoyer pour publication</key>
     <key alias="sendToTranslate">Envoyer pour traduction</key>
     <key alias="setGroup">Spécifier le groupe</key>
     <key alias="sort">Trier</key>
-    <key alias="toPublish">Envoyer pour publication</key>
     <key alias="translate">Traduire</key>
     <key alias="update">Mettre à jour</key>
     <key alias="setPermissions">Spécifier les permissions</key>
@@ -65,6 +69,7 @@
     <key alias="move">Permettre de déplacer un noeud</key>
     <key alias="protect">Permettre de définir et modifier l'accès public à un noeud</key>
     <key alias="publish">Permettre de publier un noeud</key>
+    <key alias="unpublish">Permettre d'annuler la publication d'un noeud</key>
     <key alias="rights">Permettre de modifier les permissions pour un noeud</key>
     <key alias="rollback">Permettre de revenir à une situation antérieure</key>
     <key alias="sendtopublish">Permettre d'envoyer un noeud pour approbation avant publication</key>
@@ -74,6 +79,10 @@
     <key alias="update">Permettre de sauvegarder un noeud</key>
     <key alias="createblueprint">Permettre la création d'un Modèle de Contenu</key>
   </area>
+  <area alias="apps">
+    <key alias="umbContent">Contenu</key>
+    <key alias="umbInfo">Info</key>
+  </area>
   <area alias="assignDomain">
     <key alias="permissionDenied">Permission refusée.</key>
     <key alias="addNew">Ajouter un nouveau domaine</key>
@@ -88,15 +97,15 @@
     <key alias="domainExists">Domaine '%0%' déjà assigné</key>
     <key alias="domainUpdated">Domaine '%0%' mis à jour</key>
     <key alias="orEdit">Editer les domaines actuels</key>
+    <key alias="domainHelpWithVariants">
+    	<![CDATA[Noms de domaines valides: "example.com", "www.example.com", "example.com:8080", ou "https://www.example.com/".
+     De plus, les chemins d'un niveau sous le domaine sont également supportés, eg. "example.com/en" ou "/en".]]></key>
     <key alias="inherit">Hériter</key>
     <key alias="setLanguage">Culture</key>
     <key alias="setLanguageHelp"><![CDATA[Définir la culture pour les noeuds enfants du noeud courant,<br /> ou hériter de la culture des noeuds parents. S'appliquera aussi<br />
       au noeud courant, à moins qu'un domaine ci-dessous soit aussi d'application.]]></key>
     <key alias="setDomains">Domaines</key>
   </area>
-  <area alias="auditTrails">
-    <key alias="atViewingFor">Aperçu pour</key>
-  </area>
   <area alias="buttons">
     <key alias="clearSelection">Vider la sélection</key>
     <key alias="select">Choisir</key>
@@ -117,25 +126,66 @@
     <key alias="listNumeric">Liste numérique</key>
     <key alias="macroInsert">Insérer une macro</key>
     <key alias="pictureInsert">Insérer une image</key>
+    <key alias="publishAndClose">Publier et fermer</key>
+    <key alias="publishDescendants">Publier avec les descendants</key>
     <key alias="relations">Editer les relations</key>
     <key alias="returnToList">Retourner à la liste</key>
     <key alias="save">Sauver</key>
+    <key alias="saveAndClose">Sauver et fermer</key>
     <key alias="saveAndPublish">Sauver et publier</key>
     <key alias="saveAndSchedule">Sauver et planifier</key>
     <key alias="saveToPublish">Sauver et envoyer pour approbation</key>
     <key alias="saveListView">Sauver la mise en page de la liste</key>
+    <key alias="schedulePublish">Planifier</key>
     <key alias="saveAndPreview">Prévisualiser</key>
+    <key alias="showPage">Prévisualiser</key>    
     <key alias="showPageDisabled">La prévisualisation est désactivée car aucun modèle n'a été assigné.</key>
     <key alias="styleChoose">Choisir un style</key>
     <key alias="styleShow">Afficher les styles</key>
     <key alias="tableInsert">Insérer un tableau</key>
+    <key alias="generateModelsAndClose">Générer les modèles et fermer</key>
     <key alias="saveAndGenerateModels">Sauver et générer les modèles</key>
     <key alias="undo">Défaire</key>
     <key alias="redo">Refaire</key>
+    <key alias="rollback">Restaurer</key>
+    <key alias="deleteTag">Supprimer un tag</key>
+    <key alias="confirmActionCancel">Annuler</key>
+    <key alias="confirmActionConfirm">Confirmer</key>
+	<key alias="morePublishingOptions">Options de publication supplémentaires</key>
+  </area>
+  <area alias="auditTrails">
+    <key alias="atViewingFor">Aperçu pour</key>
+    <key alias="delete">Contenu supprimé</key>
+    <key alias="unpublish">Contenu dé-publié</key>
+    <key alias="unpublishvariant">Contenu dé-publié pour les langues : %0% </key>
+    <key alias="publish">Contenu publié</key>
+    <key alias="publishvariant">Contenu publié pour les langues : %0% </key>
+    <key alias="save">Contenu sauvegardé</key>
+    <key alias="savevariant">Contenu sauvegardé pour les langues : %0%</key>
+    <key alias="move">Contenu déplacé</key>
+    <key alias="copy">Contenu copié</key>
+    <key alias="rollback">Contenu restauré</key>
+    <key alias="sendtopublish">Contenu envoyé pour publication</key>
+    <key alias="sendtopublishvariant">Contenu envoyé pour publication pour les langues : %0%</key>
+    <key alias="sort">Ordonnancement des sous-éléments réalisé par l'utilisateur</key>
+    <key alias="smallCopy">Copier</key>
+    <key alias="smallPublish">Publier</key>
+    <key alias="smallPublishVariant">Publier</key>
+    <key alias="smallMove">Déplacer</key>
+    <key alias="smallSave">Sauvegarder</key>
+    <key alias="smallSaveVariant">Sauvegarder</key>
+    <key alias="smallDelete">Supprimer</key>
+    <key alias="smallUnpublish">Annuler publication</key>
+    <key alias="smallUnpublishVariant">Annuler publication</key>
+    <key alias="smallRollBack">Restaurer</key>
+    <key alias="smallSendToPublish">Envoyer pour publication</key>
+    <key alias="smallSendToPublishVariant">Envoyer pour publication</key>
+    <key alias="smallSort">Ordonner</key>
+    <key alias="historyIncludingVariants">Historique (toutes variantes)</key>
   </area>
   <area alias="changeDocType">
     <key alias="changeDocTypeInstruction">Pour changer le type de document du contenu séléctionné, faites d'abord un choix dans la liste des types valides à cet endroit.</key>
-    <key alias="changeDocTypeInstruction2">Puis modifiez si nécessaire la correspondance des propriétés du type actuel vers le nouveau, et cliquez sur Sauver.</key>
+    <key alias="changeDocTypeInstruction2">Puis confirmez et/ou modifiez la correspondance des propriétés du type actuel vers le nouveau, et cliquez sur Sauver.</key>
     <key alias="contentRepublished">Le contenu a été republié.</key>
     <key alias="currentProperty">Propriété actuelle</key>
     <key alias="currentType">Type actuel</key>
@@ -153,6 +203,12 @@
     <key alias="validationErrorPropertyWithMoreThanOneMapping">Impossible de terminer la correspondance des propriétés car une ou plusieurs propriétés ont plus d'une correspondance définie.</key>
     <key alias="validDocTypesNote">Seuls les types de documents valides à cet endroit sont affichés.</key>
   </area>
+  <area alias="codefile">
+    <key alias="createFolderFailedById">Echec de la création d'un dossier sous le parent avec l'ID %0%</key>
+    <key alias="createFolderFailedByName">Echec de la création d'un dossier sous le parent avec le nom %0%</key>
+    <key alias="createFolderIllegalChars">Le nom du dossier ne peut pas contenir de caractères illégaux.</key>
+    <key alias="deleteItemFailed">Echec de la suppression de l'élément : %0%</key>
+  </area>
   <area alias="content">
     <key alias="isPublished" version="7.2">A été publié</key>
     <key alias="about">A propos de cette page</key>
@@ -184,15 +240,20 @@
     <key alias="noDate">Aucune date choisie</key>
     <key alias="nodeName">Titre de la page</key>
     <key alias="noMediaLink">Ce média n'a pas de lien</key>
+    <key alias="noProperties">Aucun contenu ne peut être ajouté pour cet élément</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>
-    <key alias="getUrlException">Oups: impossible d'obtenir cet url (erreur interne - voir fichier log)</key>
-    <key alias="routeError">Oups: ce document est publié mais son url entrerait en collision avec le contenu %0%</key>
+    <key alias="parentCultureNotPublished">Cette culture est publiée mais n'est pas visible car elle n'est pas publiée pour le parent '%0%'</key>
+    <key alias="parentNotPublishedAnomaly">Ce document est publié mais n'est pas présent dans le cache</key>
+    <key alias="getUrlException">Oups: impossible d'obtenir cet URL (erreur interne - voir fichier log)</key>
+    <key alias="routeError">Ce document est publié mais son URL entrerait en collision avec le contenu %0%</key>
+    <key alias="routeErrorCannotRoute">Ce document est publié mais son URL ne peut pas être routé</key>
     <key alias="publish">Publier</key>
     <key alias="published">Publié</key>
     <key alias="publishedPendingChanges">Publié (changements en cours)</key>
     <key alias="publishStatus">Statut de publication</key>
+    <key alias="publishDescendantsHelp"><![CDATA[Cliquez sur <em>Publier avec ses descendants</em> pour publier <strong>%0%</strong> et tous les éléments de contenu en-dessous, rendant de ce fait leur contenu accessible publiquement.]]></key>
+    <key alias="publishDescendantsWithVariantsHelp"><![CDATA[Cliquez sur <em>Publier avec ses descendants</em> pour publier <strong>les langues sélectionnées</strong> et les mêmes langues des éléments de contenu en-dessous, rendant de ce fait leur contenu accessible publiquement.]]></key>
     <key alias="releaseDate">Publié le</key>
     <key alias="unpublishDate">Dépublié le</key>
     <key alias="removeDate">Supprimer la date</key>
@@ -202,9 +263,11 @@
     <key alias="statistics">Statistiques</key>
     <key alias="titleOptional">Titre (optionnel)</key>
     <key alias="altTextOptional">Texte alternatif (optionnel)</key>
+    <key alias="captionTextOptional">Légende (optionnel)</key>
     <key alias="type">Type</key>
     <key alias="unpublish">Dépublier</key>
     <key alias="unpublished">Dépublié</key>
+    <key alias="notCreated">Non créé</key>
     <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>
@@ -215,13 +278,35 @@
     <key alias="target" version="7.0">Cible</key>
     <key alias="scheduledPublishServerTime">Ceci se traduit par l'heure suivante sur le serveur :</key>
     <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">Qu'est-ce que cela signifie?</a>]]></key>
-    <key alias="nestedContentDeleteItem">Etes-vous certain(e) de vouloir supprimer cet éléménent?</key>
+    <key alias="nestedContentDeleteItem">Etes-vous certain(e) de vouloir supprimer cet élément?</key>
+	<key alias="nestedContentDeleteAllItems">Etes-vous certain(e) de vouloir supprimer tous les éléments?</key>
     <key alias="nestedContentEditorNotSupported">La propriété %0% utilise l'éditeur %1% qui n'est pas supporté par Nested Content.</key>
+    <key alias="nestedContentNoContentTypes">Aucun type de contenu n'est configuré pour cette propriété.</key>
+    <key alias="nestedContentAddElementType">Ajouter un type d'élément</key>
+    <key alias="nestedContentSelectElementTypeModalTitle">Sélectionner un type d'élément</key>
     <key alias="addTextBox">Ajouter un autre champ texte</key>
     <key alias="removeTextBox">Enlever ce champ texte</key>
     <key alias="contentRoot">Racine du contenu</key>
+    <key alias="includeUnpublished">Inclure les brouillons : publier également les éléments de contenu non publiés.</key>
     <key alias="isSensitiveValue">Cette valeur est masquée. Si vous avez besoin de pouvoir accéder à cette valeur, veuillez prendre contact avec l'administrateur du site web.</key>
     <key alias="isSensitiveValue_short">Cette valeur est masquée.</key>
+    <key alias="languagesToPublishForFirstTime">Quelles langues souhaitez-vous publier? Toutes les langues ayant du contenu ont été sauvegardées!</key>
+    <key alias="languagesToPublish">Quelles langues souhaitez-vous publier?</key>
+    <key alias="languagesToSave">Quelles langues souhaitez-vous sauvegarder?</key>
+    <key alias="languagesToSaveForFirstTime">Toutes les langues avec du contenu sont sauvegardées lors de la création!</key>
+    <key alias="languagesToSendForApproval">Quells langues souhaitez-vous envoyer pour approbation?</key>
+    <key alias="languagesToSchedule">Quelles langues souhaitez-vous planifier?</key>
+    <key alias="languagesToUnpublish">Sélectionnez les langues à dépublier. La dépublication d'une langue obligatoire provoquera la dépublication de toutes les langues.</key>
+    <key alias="publishedLanguages">Langues publiées</key>
+    <key alias="unpublishedLanguages">Langues non publiées</key>
+    <key alias="unmodifiedLanguages">Langues non modifiées</key>
+    <key alias="untouchedLanguagesForFirstTime">Ces langues n'ont pas été créées</key>
+    <key alias="readyToPublish">Prêt.e à publier?</key>
+    <key alias="readyToSave">Prêt.e à sauvegarder?</key>
+    <key alias="sendForApproval">Envoyer pour approbation</key>
+    <key alias="schedulePublishHelp">Sélectionnez la date et l'heure de publication/dépublication de l'élément de contenu.</key>
+    <key alias="createEmpty">Créer nouveau</key>
+    <key alias="createFromClipboard">Copier du clipboard</key>
   </area>
   <area alias="blueprints">
     <key alias="createBlueprintFrom">Créer un nouveau Modèle de Contenu à partir de '%0%'</key>
@@ -235,22 +320,38 @@
   <area alias="media">
     <key alias="clickToUpload">Cliquez pour télécharger</key>
     <key alias="orClickHereToUpload">ou cliquez ici pour choisir un fichier</key>
+	<key alias="dragFilesHereToUpload">Vous pouvez faire glisser des fichiers ici pour télécharger.</key>
     <key alias="disallowedFileType">Ce fichier ne peut pas ête chargé, il n'est pas d'un type de fichier autorisé.</key>
     <key alias="maxFileSize">La taille maximum de fichier est</key>
     <key alias="mediaRoot">Racine du média</key>
+    <key alias="moveFailed">Echec du déplacement du média</key>
+    <key alias="moveToSameFolderFailed">Les dossiers parent et destination ne peuvent pas être identiques</key>
+    <key alias="copyFailed">Echec de la copie du media</key>
+    <key alias="createFolderFailed">Echec de la création d'un dossier sous le parent avec l'id %0%</key>
+    <key alias="renameFolderFailed">Echec du changement de nom du dossier avec l'id %0%</key>
+    <key alias="dragAndDropYourFilesIntoTheArea">Glissez et déposez vos fichiers dans la zone</key>
   </area>
   <area alias="member">
     <key alias="createNewMember">Créer un nouveau membre</key>
     <key alias="allMembers">Tous les membres</key>
+    <key alias="memberGroupNoProperties">Les groupes de membres n'ont pas de propriétés supplémentaires modifiables.</key>
   </area>
   <area alias="create">
     <key alias="chooseNode">Où voulez-vous créer le nouveau %0%</key>
     <key alias="createUnder">Créer un élément sous</key>
     <key alias="createContentBlueprint">Sélectionnez le type de document pour lequel vous souhaitez créer un modèle de contenu</key>
+    <key alias="enterFolderName">Introduisez un nom de dossier</key>
     <key alias="updateData">Choisissez un type et un titre</key>
-    <key alias="noDocumentTypes" version="7.0"><![CDATA[Il n'y a aucun type de document disponible. Vous devez d'abord les activer dans la section Paramètres, dans <strong>"Types de documents"</strong>.]]></key>
-    <key alias="noMediaTypes" version="7.0"><![CDATA[Il n'y a aucun type de média disponible. Vous devez d'abord les activer dans la section Paramètres, dans <strong>"Types de médias"</strong>.]]></key>
-    <key alias="documentTypeWithoutTemplate">Type de document sans modèle</key>
+    <key alias="noDocumentTypes" version="7.0"><![CDATA[Il n'y a aucun type de document disponible pour créer du contenu ici. Vous devez d'abord les activer dans <strong>Types de documents</strong> sous la section <strong>Paramètres</strong>, en modifiant les <strong>Types de noeuds enfants autorisés</strong> sous les <strong>Permissions</strong>.]]></key>
+    <key alias="noDocumentTypesAtRoot"><![CDATA[Il n'y a aucun type de document disponible pour créer du contenu ici. Vous devez d'abord les activer dans <strong>Types de documents</strong> sous la section <strong>Paramètres</strong>.]]></key>
+    <key alias="noDocumentTypesWithNoSettingsAccess">La page sélectionnée dans l'arborescence de contenu n'autorise pas la création de pages sous elle.</key>
+    <key alias="noDocumentTypesEditPermissions">Modifier les permissions pour ce type de document</key>
+    <key alias="noDocumentTypesCreateNew">Créer un nouveau type de document</key>
+    <key alias="noDocumentTypesAllowedAtRoot"><![CDATA[Il n'y a aucun type de document disponible pour créer du contenu ici. Vous devez d'abord les activer dans <strong>Types de documents</strong> sous la section <strong>Paramètres</strong>, en modifiant l'option <strong>Autoriser comme racine</strong> sous les <strong>Permissions</strong>.]]></key>
+    <key alias="noMediaTypes" version="7.0"><![CDATA[Il n'y a aucun type de média disponible pour créer un media ici. Vous devez d'abord les activer dans <strong>Types de médias</strong> dans la section <strong>Paramètres</strong>, en modifiant les <strong>Types de noeuds enfants autorisés</strong> sous les <strong>Permissions</strong>.]]></key>
+    <key alias="noMediaTypesWithNoSettingsAccess">Le media sélectionné dans l'arborescence n'autorise pas la création d'un autre media sous lui.</key>
+    <key alias="noMediaTypesEditPermissions">Modifier les permissions pour ce type de media</key>
+	<key alias="documentTypeWithoutTemplate">Type de document sans modèle</key>
     <key alias="newFolder">Nouveau répertoire</key>
     <key alias="newDataType">Nouveau type de données</key>
     <key alias="newJavascriptFile">Nouveau fichier javascript</key>
@@ -259,6 +360,8 @@
     <key alias="newPartialViewFromSnippet">Nouvelle vue partielle à partir d'un snippet</key>
     <key alias="newPartialViewMacroFromSnippet">Nouvelle macro pour vue partielle à partir d'un snippet</key>
     <key alias="newPartialViewMacroNoMacro">Nouvelle macro pour vue partielle (sans macro)</key>
+    <key alias="newStyleSheetFile">Nouveau fichier de feuille de style</key>
+    <key alias="newRteStyleSheetFile">Nouveau fichier de feuille de style pour l'éditeur de texte</key>
   </area>
   <area alias="dashboard">
     <key alias="browser">Parcourir votre site</key>
@@ -274,7 +377,10 @@
     <key alias="discardChanges">Invalider les changements</key>
     <key alias="unsavedChanges">Vous avez des changements en cours</key>
     <key alias="unsavedChangesWarning">Etes-vous certain(e) de vouloir quitter cette page? - vous avez des changements en cours</key>
-    <key alias="confirmUnpublish">La dépublication va supprimer du site cette page ainsi que tous ses descendants.</key>
+    <key alias="confirmListViewPublish">La publication rendra les éléments sélectionnés visibles sur le site.</key>
+    <key alias="confirmListViewUnpublish">La suppression de la publication supprimera du site les éléments sélectionnés et tous leurs descendants.</key>
+    <key alias="confirmUnpublish">La suppression de la publication supprimera du site cette page ainsi que tous ses descendants.</key>
+    <key alias="doctypeChangeWarning">Vous avez des modifications en cours. Modifier le Type de Document fera disparaître ces modifications.</key>
   </area>
   <area alias="bulk">
     <key alias="done">Terminé</key>
@@ -302,8 +408,8 @@
   <area alias="defaultdialogs">
     <key alias="nodeNameLinkPicker">Titre du lien</key>
     <key alias="urlLinkPicker">Lien</key>
+    <key alias="anchorLinkPicker">Ancrage / requête</key>
     <key alias="anchorInsert">Nom</key>
-    <key alias="assignDomain">Gérer les noms d'hôtes</key>
     <key alias="closeThisWindow">Fermer cette fenêtre</key>
     <key alias="confirmdelete">Êtes-vous certain(e) de vouloir supprimer</key>
     <key alias="confirmdisable">Êtes-vous certain(e) de vouloir désactiver</key>
@@ -312,6 +418,7 @@
     <key alias="cut">Couper</key>
     <key alias="editdictionary">Editer une entrée du Dictionnaire</key>
     <key alias="editlanguage">Modifier la langue</key>
+    <key alias="editSelectedMedia">Modifier le media sélectionné</key>
     <key alias="insertAnchor">Insérer un lien local (ancre)</key>
     <key alias="insertCharacter">Insérer un caractère</key>
     <key alias="insertgraphicheadline">Insérer un entête graphique</key>
@@ -319,22 +426,25 @@
     <key alias="insertlink">Insérer un lien</key>
     <key alias="insertMacro">Insérer une macro</key>
     <key alias="inserttable">Insérer un tableau</key>
+    <key alias="languagedeletewarning">Ceci supprimera la langue</key>
+    <key alias="languageChangeWarning">Modifier la culture d'une langue peut être une opération lourde qui aura pour conséquence la réinitialisation de la cache de contenu et des index</key>
     <key alias="lastEdited">Dernière modification</key>
     <key alias="link">Lien</key>
     <key alias="linkinternal">Lien interne :</key>
     <key alias="linklocaltip">Si vous utilisez des ancres, insérez # au début du lien</key>
     <key alias="linknewwindow">Ouvrir dans une nouvelle fenêtre?</key>
+	<key alias="macroContainerSettings">Paramètres de la macro</key>
     <key alias="macroDoesNotHaveProperties">Cette macro ne contient aucune propriété éditable</key>
     <key alias="paste">Coller</key>
     <key alias="permissionsEdit">Editer les permissions pour</key>
     <key alias="permissionsSet">Définir les permissions pour</key>
     <key alias="permissionsSetForGroup">Définir les permissions pour %0% pour le groupe d'utilisateurs %1%</key>
     <key alias="permissionsHelp">Sélectionnez les groupes d'utilisateurs pour lesquels vous souhaitez définir les permissions</key>
-    <key alias="recycleBinDeleting">Les éléments dans la corbeille sont en cours de suppression. Ne fermez pas cette fenêtre avant que cette opération soit terminée.</key>
+    <key alias="recycleBinDeleting">Les éléments dans la corbeille sont en cours de suppression. Veuillez ne pas fermer cette fenêtre avant que cette opération ne soit terminée.</key>
     <key alias="recycleBinIsEmpty">La corbeille est maintenant vide</key>
     <key alias="recycleBinWarning">Les éléments supprimés de la corbeille seront supprimés définitivement</key>
     <key alias="regexSearchError"><![CDATA[Le webservice <a target='_blank' href='http://regexlib.com'>regexlib.com</a> rencontre actuellement des problèmes sur lesquels nous n'avons aucun contrôle. Nous sommes sincèrement désolés pour le désagrément.]]></key>
-    <key alias="regexSearchHelp">Rechercher une expression régulière à ajouter pour la validation d'un champ de formulaire. Exemple: 'email, 'zip-code', 'url'</key>
+    <key alias="regexSearchHelp">Rechercher une expression régulière à ajouter pour la validation d'un champ de formulaire. Exemple: 'email, 'zip-code', 'URL'.</key>
     <key alias="removeMacro">Supprimer la macro</key>
     <key alias="requiredField">Champ obligatoire</key>
     <key alias="sitereindexed">Le site a été réindéxé</key>
@@ -353,14 +463,17 @@
     <key alias="linkToMedia">Lier à un media</key>
     <key alias="selectContentStartNode">Sélectionner le noeud de base du contenu</key>
     <key alias="selectMedia">Sélectionner le media</key>
+    <key alias="selectMediaType">Sélectionner le type de media</key>
     <key alias="selectIcon">Sélectionner l'icône</key>
     <key alias="selectItem">Sélectionner l'élément</key>
     <key alias="selectLink">Sélectionner le lien</key>
     <key alias="selectMacro">Sélectionner la macro</key>
     <key alias="selectContent">Sélectionner le contenu</key>
+    <key alias="selectContentType">Sélectionner le type de contenu</key>
     <key alias="selectMediaStartNode">Sélectionner le noeud de base des media</key>
     <key alias="selectMember">Sélectionner le membre</key>
     <key alias="selectMemberGroup">Sélectionner le groupe de membres</key>
+    <key alias="selectMemberType">Sélectionner le type de membre</key>
     <key alias="selectNode">Sélectionner le noeud</key>
     <key alias="selectSections">Sélectionner les sections</key>
     <key alias="selectUsers">Sélectionner les utilisateurs</key>
@@ -376,10 +489,14 @@
     <key alias="account">compte</key>
     <key alias="selectEditor">Sélectionner un éditeur</key>
     <key alias="selectSnippet">Selectionner un snippet</key>
+    <key alias="variantdeletewarning">Ceci supprimera le noeud et toutes ses langues. Si vous souhaitez supprimer une langue spécifique, vous devriez plutôt supprimer la publication du noeud dans cette langue-là.</key>
+  </area>
+  <area alias="dictionary">
+    <key alias="noItems">Il n'y a pas d'éléments dans le dictionnaire.</key>
   </area>
   <area alias="dictionaryItem">
     <key alias="description"><![CDATA[
-      Editez les différentes versions de langues pour l'élément de dictionaire '<em>%0%</em>' ci-dessous.
+      Editez les différentes versions de langues pour l'élément de dictionnaire '<em>%0%</em>' ci-dessous.
    ]]></key>
     <key alias="displayName">Nom de Culture</key>
     <key alias="changeKeyError"><![CDATA[
@@ -387,6 +504,34 @@
    ]]></key>
     <key alias="overviewTitle">Aperçu du dictionaire</key>
   </area>
+  <area alias="examineManagement">
+    <key alias="configuredSearchers">Recherches configurées</key>
+    <key alias="configuredSearchersDescription">Affiche les propriétés et les outils de chaque Recherche configurée (e.g. une recherche multi-index)</key>
+    <key alias="fieldValues">Valeurs du champ</key>
+    <key alias="healthStatus">Etat de santé</key>
+    <key alias="healthStatusDescription">L'état de santé de l'index et s'il peut être lu</key>
+    <key alias="indexers">Indexeurs</key>
+    <key alias="indexInfo">Info Index</key>
+    <key alias="indexInfoDescription">Liste les propriétés de l'index</key>
+    <key alias="manageIndexes">Gérer les index d'Examine</key>
+    <key alias="manageIndexesDescription">Vous permet de voir les détails de chaque index et fournit des outils pour gérer les index</key>
+    <key alias="rebuildIndex">Reconstruire l'index</key>
+    <key alias="rebuildIndexWarning"><![CDATA[
+      Ceci provoquera la reconstruction de l'index.<br />
+      Cela pourrait prendre un certain temps en fonction de la quantité de contenu présente dans votre site.<br />
+      Il est déconseillé de reconstruire un index pendant les périodes de trafic intense sur le site web ou quand les éditeurs sont en train d'éditer du contenu.
+     ]]>
+    </key>
+    <key alias="searchers">Recherches</key>
+    <key alias="searchDescription">Rechercher dans l'index et afficher les résultats</key>
+    <key alias="tools">Outils</key>
+    <key alias="toolsDescription">Outils pour gérer l'index</key>
+    <key alias="fields">champs</key>
+    <key alias="indexCannotRead">L'index ne peut pas être lu et devra être reconstruit</key>
+    <key alias="processIsTakingLonger">Le processus dure plus de temps que prévu, vérifiez les logs Umbraco afin de voir s'il y a eu des erreurs pendant cette opératon</key>
+    <key alias="indexCannotRebuild">Cet index ne peut pas être reconstruit parce qu'on ne lui a pas assigné de</key>
+    <key alias="iIndexPopulator">IIndexPopulator</key>
+  </area>
   <area alias="placeholders">
     <key alias="username">Votre nom d'utilisateur</key>
     <key alias="password">Votre mot de passe</key>
@@ -403,10 +548,18 @@
     <key alias="email">Entrez votre email</key>
     <key alias="enterMessage">Entrez un message...</key>
     <key alias="usernameHint">Votre nom d'utilisateur est généralement votre adresse email</key>
+    <key alias="anchor">#value ou ?key=value</key>
+    <key alias="enterAlias">Introduisez l'alias...</key>
+    <key alias="generatingAlias">Génération de l'alias...</key>
+    <key alias="a11yCreateItem">Créer un élément</key>
+	<key alias="a11yCreate">Créer</key>
+    <key alias="a11yEdit">Modifier</key>
+    <key alias="a11yName">Nom</key>
   </area>
   <area alias="editcontenttype">
     <key alias="createListView" version="7.2">Créer une liste personnalisée</key>
     <key alias="removeListView" version="7.2">Supprimer la liste personnalisée</key>
+    <key alias="aliasAlreadyExists">Il existe déjà un type de contenu, un tye de media ou un type de membre avec cet alias</key>
   </area>
   <area alias="renamecontainer">
     <key alias="renamed">Renommé</key>
@@ -432,9 +585,11 @@
     <key alias="selectFolder">Sélectionnez le répertoire où déplacer</key>
     <key alias="inTheTree">dans l'arborescence ci-dessous</key>
     <key alias="wasMoved">a été déplacé sous</key>
+    <key alias="hasReferencesDeleteConsequence"><![CDATA[La suppression de <strong>%0%</strong> supprimera les propriétés et leurs données des éléments suivants]]></key>
+    <key alias="acceptDeleteConsequence">Je comprends que cette action va supprimer les propriétés et les données basées sur ce Type de Données</key>
   </area>
   <area alias="errorHandling">
-    <key alias="errorButDataWasSaved">Vos données ont été sauvegardées, mais avant de pouvoir publier votre page, il y a des erreurs que vous devez corriger :</key>
+    <key alias="errorButDataWasSaved">Vos données ont été sauvegardées, mais avant de pouvoir publier votre page, il y a des erreurs que vous devez d'abord corriger :</key>
     <key alias="errorChangingProviderPassword">Le Membership Provider n'autorise pas le changement des mots de passe (EnablePasswordRetrieval doit être défini à true)</key>
     <key alias="errorExistsWithoutTab">%0% existe déjà</key>
     <key alias="errorHeader">Des erreurs sont survenues :</key>
@@ -459,8 +614,9 @@
     <key alias="startNodeDoesNotExists">Noeud de départ supprimé, contactez votre administrateur</key>
     <key alias="stylesMustMarkBeforeSelect">Veuillez sélectionner du contenu avant de changer le style</key>
     <key alias="stylesNoStylesOnPage">Aucun style actif disponible</key>
-    <key alias="tableColMergeLeft">Veuillez placer le curseur à gauche des deux cellules que vous voulez fusionner</key>
+    <key alias="tableColMergeLeft">Veuillez placer le curseur à la gauche des deux cellules que vous voulez fusionner</key>
     <key alias="tableSplitNotSplittable">Vous ne pouvez pas scinder une cellule qui n'a pas été fusionnée.</key>
+    <key alias="propertyHasErrors">Cette propriété n'est pas valide</key>
   </area>
   <area alias="general">
     <key alias="options">Options</key>
@@ -472,6 +628,7 @@
     <key alias="all">Tout</key>
     <key alias="areyousure">Êtes-vous certain(e)?</key>
     <key alias="back">Retour</key>
+    <key alias="backToOverview">Retour à l'aperçu</key>
     <key alias="border">Bord</key>
     <key alias="by">par</key>
     <key alias="cancel">Annuler</key>
@@ -483,6 +640,7 @@
     <key alias="confirm">Confirmer</key>
     <key alias="constrain">Conserver</key>
     <key alias="constrainProportions">Conserver les proportions</key>
+    <key alias="content">Contenu</key>
     <key alias="continue">Continuer</key>
     <key alias="copy">Copier</key>
     <key alias="create">Créer</key>
@@ -502,16 +660,21 @@
     <key alias="elements">Eléments</key>
     <key alias="email">Email</key>
     <key alias="error">Erreur</key>
+    <key alias="field">Champ</key>
     <key alias="findDocument">Trouver</key>
     <key alias="first">Premier</key>
+    <key alias="focalPoint">Point focal</key>
     <key alias="general">Général</key>
     <key alias="groups">Groupes</key>
+    <key alias="group">Groupe</key>
     <key alias="height">Hauteur</key>
     <key alias="help">Aide</key>
     <key alias="hide">Cacher</key>
     <key alias="history">Historique</key>
     <key alias="icon">Icône</key>
+    <key alias="id">Id</key>
     <key alias="import">Importer</key>
+    <key alias="includeFromsubFolders">Inclure les sous-dossiers dans la recherche</key>
     <key alias="info">Info</key>
     <key alias="innerMargin">Marge intérieure</key>
     <key alias="insert">Insérer</key>
@@ -548,9 +711,11 @@
     <key alias="pleasewait">Un moment s'il vous plaît...</key>
     <key alias="previous">Précédent</key>
     <key alias="properties">Propriétés</key>
+    <key alias="rebuild">Reconstruire</key>
     <key alias="reciept">Email de réception des données de formulaire</key>
     <key alias="recycleBin">Corbeille</key>
     <key alias="recycleBinEmpty">Votre corbeille est vide</key>
+    <key alias="reload">Rafraîchir</key>
     <key alias="remaining">Restant</key>
     <key alias="remove">Enlever</key>
     <key alias="rename">Renommer</key>
@@ -564,6 +729,7 @@
     <key alias="searchNoResult">Désolé, nous ne pouvons pas trouver ce que vous recherchez</key>
     <key alias="noItemsInList">Aucun élément n'a été ajouté</key>
     <key alias="server">Serveur</key>
+    <key alias="settings">Paramètres</key>
     <key alias="show">Montrer</key>
     <key alias="showPageOnSend">Afficher la page à l'envoi</key>
     <key alias="size">Taille</key>
@@ -572,11 +738,12 @@
     <key alias="submit">Envoyer</key>
     <key alias="type">Type</key>
     <key alias="typeToSearch">Rechercher...</key>
+    <key alias="under">sous</key>
     <key alias="up">Haut</key>
     <key alias="update">Mettre à jour</key>
     <key alias="upgrade">Upgrader</key>
     <key alias="upload">Télécharger</key>
-    <key alias="url">Url</key>
+    <key alias="url">URL</key>
     <key alias="user">Utilisateur</key>
     <key alias="username">Nom d'utilisateur</key>
     <key alias="value">Valeur</key>
@@ -596,6 +763,7 @@
     <key alias="current">actuel</key>
     <key alias="embed">Intégrer</key>
     <key alias="selected">sélectionné</key>
+    <key alias="avatar">Avatar de</key>
   </area>
   <area alias="colors">
     <key alias="blue">Bleu</key>
@@ -611,8 +779,8 @@
     <key alias="navigateSections">Parcourir les sections</key>
     <key alias="shortcut">Raccourcis</key>
     <key alias="showShortcuts">afficher les raccourcis</key>
-    <key alias="toggleListView">Passer à la vue en liste</key>
-    <key alias="toggleAllowAsRoot">Basculer vers l'autorisation comme racine</key>
+    <key alias="toggleListView">Activer / Désactiver la vue en liste</key>
+    <key alias="toggleAllowAsRoot">Activer / Désactiver l'autorisation comme racine</key>
     <key alias="commentLine">Commenter/Décommenter les lignes</key>
     <key alias="removeLine">Supprimer la ligne</key>
     <key alias="copyLineUp">Copier les lignes vers le haut</key>
@@ -621,6 +789,7 @@
     <key alias="moveLineDown">Déplacer les lignes vers le bas</key>
     <key alias="generalHeader">Général</key>
     <key alias="editorHeader">Editeur</key>
+    <key alias="toggleAllowCultureVariants">Activer / Désactiver les variantes de culture</key>
   </area>
   <area alias="graphicheadline">
     <key alias="backgroundcolor">Couleur de fond</key>
@@ -645,7 +814,7 @@
               <p>Pour poursuivre, veuillez éditer le fichier "web.config" (avec Visual Studio ou votre éditeur de texte favori), scroller jusqu'en bas, ajouter le "connection string" pour votre base de données dans la ligne avec la clé "umbracoDbDSN" et sauvegarder le fichier.</p>
               <p>
               Cliquez sur le bouton <strong>Réessayer</strong> lorsque cela est fait.
-              <br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
+              <br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">
 			              Plus d'informations sur l'édition du fichier web.config ici.</a></p>]]></key>
     <key alias="databaseText"><![CDATA[Pour réaliser cette étape, vous devez d'abord connaître des informations concernant votre serveur de base de données ("connection string").<br />
         Veuillez contacter votre fournisseur de services internet si nécessaire.
@@ -693,7 +862,7 @@
     <key alias="runwayFromScratch">Je veux démarrer "from scratch"</key>
     <key alias="runwayFromScratchText"><![CDATA[
         Votre site est vide pour le moment, ce qui est parfait si vous voulez commencer "from scratch" et créer vos propres types de documents et modèles d'affichage.
-        (<a href="http://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">Apprenez comment</a>)
+        (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">Apprenez comment</a>)
         Vous pouvez toujours choisir d'installer Runway plus tard. Pour cela, allez dans la section "Développeur" et sélectionnez "Packages".
       ]]></key>
     <key alias="runwayHeader">Vous venez de mettre en place une plateforme Umbraco toute nette. Que voulez-vous faire ensuite ?</key>
@@ -761,7 +930,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="instruction">Connectez-vous ci-dessous</key>
     <key alias="signInWith">Identifiez-vous avec</key>
     <key alias="timeout">La session a expiré</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">Mot de passe oublié?</key>
     <key alias="forgottenPasswordInstruction">Un email contenant un lien pour ré-initialiser votre mot de passe sera envoyé à l'adresse spécifiée</key>
     <key alias="requestPasswordResetConfirmation">Un email contenant les instructions de ré-initialisation de votre mot de passe sera envoyée à l'adresse spécifiée si elle correspond à nos informations.</key>
@@ -875,6 +1044,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
   </area>
   <area alias="notifications">
     <key alias="editNotifications">Editez vos notifications pour %0%</key>
+    <key alias="notificationsSavedFor">Paramètres de notification enregistrés pour</key>
     <key alias="mailBody"><![CDATA[
       Hello %0%
 
@@ -888,6 +1058,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
 
       Avec les salutations du Robot Umbraco
     ]]></key>
+    <key alias="mailBodyVariantSummary">Les langues suivantes ont été modifiées : %0%</key>
     <key alias="mailBodyHtml"><![CDATA[
 		<html>
 			<head>
@@ -966,29 +1137,50 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
 			</body>
 		</html>
 		]]></key>
+    <key alias="mailBodyVariantHtmlSummary"><![CDATA[<p>Les langues suivantes ont été modifiées :</p>
+        %0%
+    ]]></key>
     <key alias="mailSubject">La notification [%0%] à propos de %1% a été executée sur %2%</key>
     <key alias="notifications">Notifications</key>
   </area>
   <area alias="packager">
+    <key alias="actions">Actions</key>
+    <key alias="created">Créé</key>
+    <key alias="createPackage">Créer un package</key>
     <key alias="chooseLocalPackageText"><![CDATA[
       Choisissez un package sur votre ordinateur en cliquant sur le bouton Parcourir <br />
 	et localisez le package. Les packages Umbraco ont généralement une extension ".umb" ou ".zip".
       ]]></key>
+    <key alias="deletewarning">Ceci va supprimer le package</key>
     <key alias="dropHere">Déposez pour uploader</key>
+    <key alias="includeAllChildNodes">Inclure tous les noeuds enfant</key>
     <key alias="orClickHereToUpload">ou cliquez ici pour choisir les fichiers</key>
     <key alias="uploadPackage">Uploader un package</key>
     <key alias="localPackageDescription">Installez un package local en le sélectionnant sur votre ordinateur. Installez uniquement des packages de sources fiables que vous connaissez</key>
     <key alias="uploadAnother">Uploader un autre package</key>
     <key alias="cancelAndUploadAnother">Annuler et uploader un autre package</key>
-    <key alias="packageLicense">Licence</key>
     <key alias="accept">J'accepte</key>
     <key alias="termsOfUse">les conditions d'utilisation</key>
-    <key alias="packageInstall">Installer le package</key>
-    <key alias="installFinish">Terminer</key>
+    <key alias="pathToFile">Chemin du fichier</key>
+    <key alias="pathToFileDescription">Le chemin absolu du fichier (eg: /bin/umbraco.bin)</key>
+    <key alias="installed">Installé</key>
     <key alias="installedPackages">Packages installés</key>
+    <key alias="installLocal">Installer localement</key>
+    <key alias="installFinish">Terminer</key>
+    <key alias="noConfigurationView">Ce package n'a pas de vue de configuration</key>
+    <key alias="noPackagesCreated">Aucun package n'a encore été créé</key>
     <key alias="noPackages">Vous n'avez aucun package installé</key>
     <key alias="noPackagesDescription"><![CDATA[Vous n'avez pas de package installé. Veuillez soit installer un package local en le sélectionnant sur votre ordinateur, soit naviguer dans la liste des packages disponibles en utilisant l'icone <strong>'Packages'</strong> en haut à droite de votre écran]]></key>
-    <key alias="packageSearch">Chercher des packages</key>
+    <key alias="packageActions">Actions du package</key>
+    <key alias="packageAuthorUrl">URL de l'auteur</key>
+    <key alias="packageContent">Contenu du package</key>
+    <key alias="packageFiles">Fichiers du package</key>
+    <key alias="packageIconUrl">URL de l'icone</key>
+    <key alias="packageInstall">Installer le package</key>
+    <key alias="packageLicense">Licence</key>
+    <key alias="packageLicenseUrl">URL de la licence</key>
+    <key alias="packageProperties">Propriétés du package</key>
+	<key alias="packageSearch">Chercher des packages</key>
     <key alias="packageSearchResults">Résultats pour</key>
     <key alias="packageNoResults">Nous n'avons rien pu trouver pour</key>
     <key alias="packageNoResultsDescription">Veuillez essayer de chercher un autre package ou naviguez à travers les catégories</key>
@@ -1025,6 +1217,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
       <span style="color: Red; font-weight: bold;">Remarque :</span> tous les documents, media etc. dépendant des éléments que vous supprimez vont cesser de fonctionner, ce qui peut provoquer une instabilité du système,
       désinstallez donc avec prudence. En cas de doute, contactez l'auteur du package.]]></key>
     <key alias="packageVersion">Version du package</key>
+    <key alias="packageVersionUpgrade">Mise à jour à partir de la version</key>
     <key alias="packageAlreadyInstalled">Package déjà installé</key>
     <key alias="targetVersionMismatch">Ce package ne peut pas être installé, il nécessite au minimum la version Umbraco %0%</key>
     <key alias="installStateUninstalling">Désinstallation...</key>
@@ -1043,24 +1236,29 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="removeSpecialFormattering">Coller, mais supprimer le formatage (recommandé)</key>
   </area>
   <area alias="publicAccess">
-    <key alias="paAdvanced">Protection basée sur les rôles</key>
-    <key alias="paAdvancedHelp"><![CDATA[Si vous souhaitez contrôler l'accès à la page en utilisant l'authentification basée sur les rôles utilisateurs,<br /> via les groupes de membres Umbraco.]]></key>
-    <key alias="paAdvancedNoGroups">Vous devez créer un groupe avant de pouvoir utiliser l'authentification basée sur les rôles</key>
+    <key alias="paGroups">Protection basée sur les groupes</key>
+    <key alias="paGroupsHelp">Si vous souhaitez donner accès à tous les utilisateurs de groupes de membres spécifiques</key>
+    <key alias="paGroupsNoGroups">Vous devez créer un groupe de membres avant de pouvoir utiliser la protection basée sur les groupes</key>
     <key alias="paErrorPage">Page d'erreur</key>
     <key alias="paErrorPageHelp">Utilisé pour les personnes connectées, mais qui n'ont pas accès</key>
-    <key alias="paHowWould">Choisissez comment restreindre l'accès à cette page</key>
-    <key alias="paIsProtected">%0% est maintenant protégée</key>
-    <key alias="paIsRemoved">Protection supprimée de %0%</key>
+    <key alias="paHowWould"><![CDATA[Choisissez comment restreindre l'accès à la page <strong>%0%</strong>]]></key>
+    <key alias="paIsProtected"><![CDATA[<strong>%0%</strong> est maintenant protégée]]></key>
+    <key alias="paIsRemoved"><![CDATA[Protection de <strong>%0%</strong> supprimée]]></key>
     <key alias="paLoginPage">Page de connexion</key>
     <key alias="paLoginPageHelp">Choisissez la page qui contient le formulaire de connexion</key>
-    <key alias="paRemoveProtection">Supprimer la protection</key>
+    <key alias="paRemoveProtection">Supprimer la protection...</key>
+    <key alias="paRemoveProtectionConfirm"><![CDATA[Etes-vous certain.e de vouloir supprimer la protection de la page <strong>%0%</strong>?]]></key>
     <key alias="paSelectPages">Choisissez les pages qui contiennent le formulaire de connexion et les messages d'erreur</key>
-    <key alias="paSelectRoles">Choisissez les rôles qui ont accès à cette page</key>
-    <key alias="paSetLogin">Définissez l'identifiant et le mot de passe pour cette page</key>
-    <key alias="paSimple">Protection utilisateur unique</key>
-    <key alias="paSimpleHelp">Si vous souhaitez mettre en place une protection simple utilisant un identifiant et un mot de passe uniques</key>
+    <key alias="paSelectGroups"><![CDATA[Sélectionnez les groupes qui ont accès à la page <strong>%0%</strong>]]></key>
+    <key alias="paSelectMembers"><![CDATA[Sélectionnez les membres qui ont accès à la page <strong>%0%</strong>]]></key>
+    <key alias="paMembers">Protection pour des membres spécifiques</key>
+    <key alias="paMembersHelp">Si vous souhaitez donner accès à des membres spécifiques</key>
   </area>
   <area alias="publish">
+    <key alias="invalidPublishBranchPermissions">Permissions utilisateur insuffisantes pour publier tous les documents enfants.</key>
+    <key alias="contentPublishedFailedIsTrashed"><![CDATA[
+      %0% n'a pas pu être publié car cet élément est dans la corbeille.
+    ]]></key>
     <key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
       %0% n'a pas pu être publié car cet élément est programmé pour être publié bientôt.
     ]]></key>
@@ -1076,7 +1274,8 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="contentPublishedFailedByParent"><![CDATA[
       %0% ne peut pas être publié car une page parente n'est pas publiée.
     ]]></key>
-    <key alias="includeUnpublished">Inclure les pages enfant non publiées</key>
+    <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% ne peut pas être publié, parce qu'il n'a pas de nom.]]></key>
+    <key alias="contentPublishedFailedReqCultureValidationError">La validation a échoué pour la langue obligatoire '%0%'. Cette langue a été sauvegardée mais pas publiée.</key>
     <key alias="inProgress">Publication en cours - veuillez patienter...</key>
     <key alias="inProgressCounter">%0% pages sur %1% ont été publiées...</key>
     <key alias="nodePublish">%0% a été publié</key>
@@ -1090,12 +1289,15 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="noColors">Vous n'avez configuré aucune couleur approuvée</key>
   </area>
   <area alias="contentPicker">
+   <key alias="allowedItemTypes">Vous pouvez uniquement sélectionner des éléments du(des) type(s) : %0%</key>
     <key alias="pickedTrashedItem">Vous avez choisi un élément de contenu actuellement supprimé ou dans la corbeille</key>
     <key alias="pickedTrashedItems">Vous avez choisi des éléments de contenu actuellement supprimés ou dans la corbeille</key>
   </area>
   <area alias="mediaPicker">
+    <key alias="deletedItem">Elément supprimé</key>
     <key alias="pickedTrashedItem">Vous avez choisi un élément media actuellement supprimé ou dans la corbeille</key>
     <key alias="pickedTrashedItems">Vous avez choisi des éléments media actuellement supprimés ou dans la corbeille</key>
+    <key alias="trashed">Mis dans la corbeille</key>
   </area>
   <area alias="relatedlinks">
     <key alias="enterExternal">introduire un lien externe</key>
@@ -1108,11 +1310,13 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
   </area>
   <area alias="imagecropper">
     <key alias="reset">Réinitialiser</key>
-    <key alias="defineCrop">Définir le recadrage</key>
     <key alias="saveCrop">Sauvegarder le recadrage</key>
     <key alias="addCrop">Ajouter un nouveau recadrage</key>
+	<key alias="updateEditCrop">Terminé</key>
+	<key alias="undoEditCrop">Annuler les modifications</key>
   </area>
   <area alias="rollback">
+    <key alias="headline">Sélectionnez une version à comparer avec la version actuelle</key>
     <key alias="currentVersion">Version actuelle</key>
     <key alias="diffHelp"><![CDATA[Ceci affiche les différences entre la version actuelle et la version choisie<br />Le texte en <del>Rouge</del> signifie qu'il a été supprimé de la version choisie, <ins>vert signifie ajouté</ins>]]></key>
     <key alias="documentRolledBack">Le document a été restauré à une version antérieure</key>
@@ -1125,20 +1329,14 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="editscript">Editer le fichier de script</key>
   </area>
   <area alias="sections">
-    <key alias="concierge">Concierge</key>
     <key alias="content">Contenu</key>
-    <key alias="courier">Courier</key>
-    <key alias="developer">Développeur</key>
-    <key alias="installer">Assistant de configuration Umbraco</key>
+    <key alias="forms">Formulaires</key>
     <key alias="media">Medias</key>
     <key alias="member">Membres</key>
-    <key alias="newsletters">Newsletters</key>
+    <key alias="packages">Packages</key>
     <key alias="settings">Configuration</key>
-    <key alias="statistics">Statistiques</key>
     <key alias="translation">Traduction</key>
     <key alias="users">Utilisateurs</key>
-    <key alias="help" version="7.0">Aide</key>
-    <key alias="forms">Formulaires</key>
   </area>
   <area alias="help">
     <key alias="theBestUmbracoVideoTutorials">Les meilleurs tutoriels vidéo Umbraco</key>
@@ -1158,24 +1356,26 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="contentTypeUses">Ce type de contenu utilise</key>
     <key alias="asAContentMasterType">en tant que type de contenu de base. Les onglets du type de contenu de base ne sont pas affichés et peuvent seulement être modifiés à partir du type de contenu de base lui-même.</key>
     <key alias="noPropertiesDefinedOnTab">Aucune propriété définie dans cet onglet. Cliquez sur le lien "Ajouter une nouvelle propriété" en-haut pour créer une nouvelle propriété.</key>
+    <key alias="createMatchingTemplate">Créer le template correspondant</key>
     <key alias="addIcon">Ajouter une icône</key>
   </area>
   <area alias="sort">
     <key alias="sortOrder">Ordre de tri</key>
     <key alias="sortCreationDate">Date de création</key>
     <key alias="sortDone">Tri achevé.</key>
-    <key alias="sortHelp">Faites glisser les différents éléments vers le haut ou vers le bas pour définir la manière dont ils doivent être organisés. Ou cliquez sur les entêtes de colonnes pour trier la collection complète d'éléments</key>
+    <key alias="sortHelp">Faites glisser les différents éléments vers le haut ou vers le bas pour définir la manière dont ils doivent être organisés. Ou cliquez sur les en-têtes de colonnes pour trier la collection complète d'éléments</key>
     <key alias="sortPleaseWait"><![CDATA[Veuillez patienter. Les éléments sont en cours de tri, cela peut prendre un moment.]]></key>
+    <key alias="sortEmptyState">Ce noeud n'a aucun noeud enfant à trier</key>
   </area>
   <area alias="speechBubbles">
     <key alias="validationFailedHeader">Validation</key>
     <key alias="validationFailedMessage">Les erreurs de validation doivent être corrigées avant de pouvoir sauvegarder l'élément</key>
     <key alias="operationFailedHeader">Echec</key>
     <key alias="operationSavedHeader">Sauvegardé</key>
+    <key alias="operationSavedHeaderReloadUser">Sauvegardé. Veuillez rafraîchir votre navigateur pour voir les changements</key>
     <key alias="invalidUserPermissionsText">Permissions utilisateur insuffisantes, l'opération n'a pas pu être complétée</key>
     <key alias="operationCancelledHeader">Annulation</key>
     <key alias="operationCancelledText">L'opération a été annulée par une extension tierce</key>
-    <key alias="contentPublishedFailedByEvent">La publication a été annulée par une extension tierce.</key>
     <key alias="contentTypeDublicatePropertyType">Le type de propriété existe déjà</key>
     <key alias="contentTypePropertyTypeCreated">Type de propriété créé</key>
     <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Nom : %0% <br /> Type de données : %1%]]></key>
@@ -1189,16 +1389,22 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="cssSavedText">Feuille de style sauvegardée sans erreurs</key>
     <key alias="dataTypeSaved">Type de données sauvegardé</key>
     <key alias="dictionaryItemSaved">Elément de dictionnaire sauvegardé</key>
-    <key alias="editContentPublishedFailedByParent">La publication a échoué car la page parent n'est pas publiée</key>
     <key alias="editContentPublishedHeader">Contenu publié</key>
     <key alias="editContentPublishedText">et visible sur le site</key>
+    <key alias="editMultiContentPublishedText">%0% documents publiés et visibles sur le site web</key>
+    <key alias="editVariantPublishedText">%0% publié et visible sur le site web</key>
+    <key alias="editMultiVariantPublishedText">%0% documents publiés pour la langue %1% et visibles sur le site web</key>
     <key alias="editContentSavedHeader">Contenu sauvegardé</key>
     <key alias="editContentSavedText">N'oubliez pas de publier pour rendre les modifications visibles</key>
+    <key alias="editContentScheduledSavedText">Un planning de publication a été mis à jour</key>
+    <key alias="editVariantSavedText">%0% sauvegardé</key>
     <key alias="editContentSendToPublish">Envoyer pour approbation</key>
     <key alias="editContentSendToPublishText">Les modifications ont été envoyées pour approbation</key>
+    <key alias="editVariantSendToPublishText">%0% modifications ont été envoyées pour approbation</key>
     <key alias="editMediaSaved">Media sauvegardé</key>
     <key alias="editMediaSavedText">Media sauvegardé sans erreurs</key>
     <key alias="editMemberSaved">Membre sauvegardé</key>
+    <key alias="editMemberGroupSaved">Groupe de membres sauvegardé</key>
     <key alias="editStylesheetPropertySaved">Propriété de feuille de style sauvegardée</key>
     <key alias="editStylesheetSaved">Feuille de style sauvegardée</key>
     <key alias="editTemplateSaved">Modèle sauvegardé</key>
@@ -1213,11 +1419,14 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="languageSaved">Langue sauvegardée</key>
     <key alias="mediaTypeSavedHeader">Type de média sauvegardé</key>
     <key alias="memberTypeSavedHeader">Type de membre sauvegardé</key>
+    <key alias="memberGroupSavedHeader">Groupe de membres sauvegardé</key>
     <key alias="templateErrorHeader">Modèle non sauvegardé</key>
     <key alias="templateErrorText">Assurez-vous de ne pas avoir 2 modèles avec le même alias.</key>
     <key alias="templateSavedHeader">Modèle sauvegardé</key>
     <key alias="templateSavedText">Modèle sauvegardé sans aucune erreurs !</key>
     <key alias="contentUnpublished">Contenu publié</key>
+    <key alias="contentCultureUnpublished">Variation de contenu %0% dépubliée</key>
+    <key alias="contentMandatoryCultureUnpublished">La langue obligatoire '%0%' a été dépubliée. Toutes les langues pour cet éléménent de contenu sont maintenant dépubliées.</key>
     <key alias="partialViewSavedHeader">Vue partielle sauvegardée</key>
     <key alias="partialViewSavedText">Vue partielle sauvegardée sans erreurs !</key>
     <key alias="partialViewErrorHeader">Vue partielle non sauvegardée</key>
@@ -1237,16 +1446,35 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="deleteUserSuccess">L'utilisateur %0% a été supprimé</key>
     <key alias="resendInviteHeader">Inviter l'utilisateur</key>
     <key alias="resendInviteSuccess">L'invitation a été envoyée à nouveau à %0%</key>
+    <key alias="contentReqCulturePublishError">Impossible de publier le document car la langue obligatoire '%0%' n'est pas publiée</key>
+    <key alias="contentCultureValidationError">La validation a échoué pour la langue '%0%'</key>
+    <key alias="documentTypeExportedSuccess">Le Type de Document a été exporté dans le fichier</key>
+    <key alias="documentTypeExportedError">Une erreur est survenue durant l'export du type de document</key>
+    <key alias="scheduleErrReleaseDate1">La date de publication ne peut pas être dans le passé</key>
+    <key alias="scheduleErrReleaseDate2">Impossible de planifier la publication du document car la langue obligatoire '%0%' n'est pas publiée</key>
+    <key alias="scheduleErrReleaseDate3">Impossible de planifier la publication du document car la langue obligatoire '%0%' a une date de publication postérieure à celle d'une langue non obligatoire</key>
+    <key alias="scheduleErrExpireDate1">La date d'expiration ne peut pas être dans le passé</key>
+    <key alias="scheduleErrExpireDate2">La date d'expiration ne peut pas être antérieure à la date de publication</key>
   </area>
   <area alias="stylesheet">
-    <key alias="aliasHelp">Utilise la syntaxe CSS. Ex : h1, .redHeader, .blueTex</key>
+    <key alias="addRule">Ajouter un style</key>
+    <key alias="editRule">Modifier un style</key>
+    <key alias="editorRules">Styles pour l'éditeur de texte</key>
+    <key alias="editorRulesHelp">Definir les styles qui doivent êtres disponibles dans l'éditeur de texte pour cette feuille de style</key>
     <key alias="editstylesheet">Editer la feuille de style</key>
     <key alias="editstylesheetproperty">Editer la propriété de feuille de style</key>
     <key alias="nameHelp">Donner un nom pour identifier la propriété dans le Rich Text Editor</key>
     <key alias="preview">Prévisualiser</key>
+    <key alias="previewHelp">L'apparence qu'aura le text dans l'éditeur de texte.</key>
+    <key alias="selector">Sélecteur</key>
+    <key alias="selectorHelp">Utilise la syntaxe CSS. Ex : "h1" ou ".redHeader"</key>
     <key alias="styles">Styles</key>
+    <key alias="stylesHelp">Le CSS qui devrait être appliqué dans l'éditeur de texte, e.g. "color:red;"</key>
+    <key alias="tabCode">Code</key>
+    <key alias="tabRules">Editeur de Texte</key>
   </area>
   <area alias="template">
+    <key alias="deleteByIdFailed">Echec de la suppression du modèle avec l'ID %0%</key>
     <key alias="edittemplate">Editer le modèle</key>
     <key alias="insertSections">Sections</key>
     <key alias="insertContentArea">Insérer une zone de contenu</key>
@@ -1293,6 +1521,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     </key>
     <key alias="queryBuilder">Générateur de requêtes</key>
     <key alias="itemsReturned">éléments trouvés, en</key>
+    <key alias="copyToClipboard">copier dans le clipboard</key>
     <key alias="iWant">Je veux</key>
     <key alias="allContent">tout le contenu</key>
     <key alias="contentOfType">le contenu du type "%0%"</key>
@@ -1363,7 +1592,9 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
   </area>
   <area alias="contentTypeEditor">
     <key alias="compositions">Compositions</key>
-    <key alias="noGroups">Vous n'avez pas ajouté d'onglet</key>
+    <key alias="group">Groupe</key>
+    <key alias="noGroups">Vous n'avez pas ajouté de groupe</key>
+    <key alias="addGroup">Ajouter un groupe</key>
     <key alias="inheritedFrom">Hérité de</key>
     <key alias="addProperty">Ajouter une propriété</key>
     <key alias="requiredLabel">Label requis</key>
@@ -1371,7 +1602,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="enableListViewDescription">Configure l'élément de contenu de manière à afficher ses éléments enfants sous forme d'une liste que l'on peut trier et filtrer, les enfants ne seront pas affichés dans l'arborescence</key>
     <key alias="allowedTemplatesHeading">Modèles autorisés</key>
     <key alias="allowedTemplatesDescription">Sélectionnez les modèles que les éditeurs sont autorisés à utiliser pour du contenu de ce type.</key>
-    <key alias="allowAsRootHeading">Autorisé comme racine</key>
+    <key alias="allowAsRootHeading">Autoriser comme racine</key>
     <key alias="allowAsRootDescription">Autorisez les éditeurs à créer du contenu de ce type à la racine de l'arborescence de contenu.</key>
     <key alias="childNodesHeading">Types de noeuds enfants autorisés</key>
     <key alias="childNodesDescription">Autorisez la création de contenu des types spécifiés sous le contenu de ce type-ci</key>
@@ -1379,6 +1610,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="compositionsDescription">Hériter des onglets et propriétés d'un type de document existant. De nouveaux onglets seront ajoutés au type de document actuel, ou fusionnés s'il existe un onglet avec un nom sililaire.</key>
     <key alias="compositionInUse">Ce type de contenu est utilisé dans une composition, et ne peut donc pas être lui-même un composé.</key>
     <key alias="noAvailableCompositions">Il n'y a pas de type de contenu disponible à utiliser dans une composition.</key>
+    <key alias="compositionRemoveWarning">La suppression d'une composition supprimera les données de toutes les propriétés associées. Une fois que vous sauvegardez le type de document, il n'y a plus moyen de faire marche arrière.</key>
     <key alias="availableEditors">Editeurs disponibles</key>
     <key alias="reuse">Réutiliser</key>
     <key alias="editorSettings">Configuration de l'éditeur</key>
@@ -1407,6 +1639,35 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="tabHasNoSortOrder">l'onglet n'a pas d'ordre de tri</key>
     <key alias="compositionUsageHeading">Où cette composition est-elle utilisée?</key>
     <key alias="compositionUsageSpecification">Cette composition est actuellement utilisée dans la composition des types de contenu suivants :</key>
+    <key alias="variantsHeading">Permettre une variation par culture</key>
+    <key alias="variantsDescription">Permettre aux éditeurs de créer du contenu de ce type dans différentes langues.</key>
+    <key alias="allowVaryByCulture">Permettre une variation par culture</key>
+    <key alias="elementType">Type de l'Elément</key>
+    <key alias="elementHeading">Est un Type d'Elément</key>
+    <key alias="elementDescription">Un Type d'Elément est destiné à être utilisé par exemple dans Nested Content, et pas dans l'arborescence.</key>
+    <key alias="elementDoesNotSupport">Ceci n'est pas d'application pour un Type d'Elément</key>
+    <key alias="propertyHasChanges">Vous avez apporté des modifications à cette propriété. Etes-vous certain.e de vouloir les annuler?</key>
+  </area>
+  <area alias="languages">
+    <key alias="addLanguage">Ajouter une langue</key>
+    <key alias="mandatoryLanguage">Langue obligatoire</key>
+    <key alias="mandatoryLanguageHelp">Les propriétés doivent être remplies dans cette langue avant que le noeud ne puisse être publié.</key>
+    <key alias="defaultLanguage">Langue par défaut</key>
+    <key alias="defaultLanguageHelp">Un site Umbraco ne peut avoir qu'une seule langue par défaut définie.</key>
+    <key alias="changingDefaultLanguageWarning">Changer la langue par défaut peut amener à ce que du contenu par défaut soit manquant.</key>
+    <key alias="fallsbackToLabel">Retombe sur</key>
+    <key alias="noFallbackLanguageOption">Pas de langue alternative</key>
+    <key alias="fallbackLanguageDescription">Pour permettre à un site multi-langue de retomber sur une autre langue dans le cas où il n'existe pas dans la langue demandée, sélectionnez-là ici.</key>
+    <key alias="fallbackLanguage">Langue alternative</key>
+    <key alias="none">aucune</key>
+  </area>
+  <area alias="macro">
+    <key alias="addParameter">Ajouter un paramètre</key>
+    <key alias="editParameter">Modifier le paramètre</key>
+    <key alias="enterMacroName">Introduire le nom de la macro</key>
+    <key alias="parameters">Paramètres</key>
+    <key alias="parametersDescription">Définir les paramètres qui devraient être disponibles lorsque l'on utilise cette macro.</key>
+    <key alias="selectViewFile">Sélectionner le fichier de vue partielle de la macro</key>
   </area>
   <area alias="modelsBuilder">
     <key alias="buildingModels">Fabrication des modèles</key>
@@ -1427,7 +1688,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="chooseField">Choisir un champ</key>
     <key alias="convertLineBreaks">Convertir les sauts de ligne</key>
     <key alias="convertLineBreaksDescription">Oui, convertir les sauts de ligne</key>
-    <key alias="convertLineBreaksHelp">Remplace les sauts de ligne avec des balises &amp;lt;br&amp;gt;</key>
+    <key alias="convertLineBreaksHelp">Remplace les sauts de ligne avec des balises 'br'</key>
     <key alias="customFields">Champs particuliers</key>
     <key alias="dateOnly">Oui, la date seulement</key>
     <key alias="formatAndEncoding">Format et encodage</key>
@@ -1449,7 +1710,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="standardFields">Champs standards</key>
     <key alias="uppercase">Majuscules</key>
     <key alias="urlEncode">Encode pour URL</key>
-    <key alias="urlEncodeHelp">Formatera les caractères spéciaux de manière à ce qu'ils soient reconnus dans une URL</key>
+    <key alias="urlEncodeHelp">Formatera les caractères spéciaux dans les URL</key>
     <key alias="usedIfAllEmpty">Sera seulement utilisé si toutes les valeurs des champs ci-dessus sont vides</key>
     <key alias="usedIfEmpty">Ce champ sera utilisé seulement si le champ initial est vide</key>
     <key alias="withTime">Oui, avec l'heure. Séparateur: </key>
@@ -1519,14 +1780,17 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="scripts">Scripts</key>
     <key alias="stylesheets">Feuilles de style</key>
     <key alias="templates">Modèles</key>
+    <key alias="logViewer">Visualisation des Log</key>
     <key alias="users">Utilisateurs</key>
-    <key alias="analytics">Analytique</key>
+    <key alias="settingsGroup">Configuration</key>
+    <key alias="templatingGroup">Modélisation</key>
+    <key alias="thirdPartyGroup">Parties Tierces</key>
   </area>
   <area alias="update">
     <key alias="updateAvailable">Nouvelle mise à jour disponible</key>
     <key alias="updateDownloadText">%0% est disponible, cliquez ici pour télécharger</key>
     <key alias="updateNoServer">Aucune connexion au serveur</key>
-    <key alias="updateNoServerError">Erreur lors de la recherche de mises à jour. Veuillez vérifier le stack trace pour obtenir plus d'informations sur l'erreur.</key>
+    <key alias="updateNoServerError">Erreur lors de la recherche de mises à jour. Veuillez vérifier le stack trace pour obtenir plus d'informations.</key>
   </area>
   <area alias="user">
     <key alias="access">Accès</key>
@@ -1554,7 +1818,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="goToProfile">Voir le profil de l'utilisateur</key>
     <key alias="groupsHelp">Ajouter des groupes pour donner les accès et permissions</key>
     <key alias="inviteAnotherUser">Inviter un autre utilisateur</key>
-    <key alias="inviteUserHelp">Inviter de nouveaux utilisateurs pour leur donner accès à Umbraco. Un email d'invitation sera envoyé à chaque utilisateur avec des informations concernant la connexion à Umbraco.</key>
+    <key alias="inviteUserHelp">Inviter de nouveaux utilisateurs pour leur donner accès à Umbraco. Un email d'invitation sera envoyé à chaque utilisateur avec des informations concernant la connexion à Umbraco. Les invitations sont valables pendant 72 heures.</key>
     <key alias="language">Langue</key>
     <key alias="languageHelp">Spécifiez la langue dans laquelle vous souhaitez voir les menus et dialogues</key>
     <key alias="lastLockoutDate">Date du dernier bloquage</key>
@@ -1606,7 +1870,8 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="userInvited">a été invité</key>
     <key alias="userInvitedSuccessHelp">Une invitation a été envoyée au nouvel utilisateur avec les détails concernant la connexion à Umbraco.</key>
     <key alias="userinviteWelcomeMessage">Bien le bonjour et bienvenue dans Umbraco! Vous serez prêt.e dans moins d'1 minute, vous devez encore simplement configurer votre mot de passe et ajouter une photo pour votre avatar.</key>
-    <key alias="userinviteAvatarMessage">Chargez une photo afin que les autres utilisateurs puissent vous reconnaître facilement.</key>
+    <key alias="userinviteExpiredMessage">Bienvenue dans Umbraco! Malheureusement, votre invitation a expiré. Veuillez contacter votre administrateur et demandez-lui de vous l'envoyer à nouveau.</key>
+    <key alias="userinviteAvatarMessage">Chargez une photo afin que les autres utilisateurs puissent vous reconnaître facilement. Cliquez sur le cercle ci-dessus pour charger votre photo.</key>
     <key alias="writer">Rédacteur</key>
     <key alias="change">Modifier</key>
     <key alias="yourProfile" version="7.0">Votre profil</key>
@@ -1712,15 +1977,28 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="defaultInvitationMessage">Nouvel envoi de l'invitation en cours...</key>
     <key alias="deleteUser">Supprimer l'Utilisateur</key>
     <key alias="deleteUserConfirmation">Etes-vous certain(e) de vouloir supprimer le compte de cet utilisateur?</key>
+    <key alias="stateAll">Tous</key>
+    <key alias="stateActive">Actif</key>
+    <key alias="stateDisabled">Désactivé</key>
+    <key alias="stateLockedOut">Bloqué</key>
+    <key alias="stateInvited">Invité</key>
+    <key alias="stateInactive">Inactif</key>
+    <key alias="sortNameAscending">Nom (A-Z)</key>
+    <key alias="sortNameDescending">Nom (Z-A)</key>
+    <key alias="sortCreateDateAscending">Plus récent</key>
+    <key alias="sortCreateDateDescending">Plus ancien</key>
+    <key alias="sortLastLoginDateDescending">Dernière connexion</key>
   </area>
   <area alias="validation">
     <key alias="validation">Validation</key>
     <key alias="validateAsEmail">Valider comme email</key>
     <key alias="validateAsNumber">Valider comme nombre</key>
-    <key alias="validateAsUrl">Valider comme Url</key>
+    <key alias="validateAsUrl">Valider comme URL</key>
     <key alias="enterCustomValidation">...ou introduisez une validation spécifique</key>
     <key alias="fieldIsMandatory">Champ obligatoire</key>
+    <key alias="mandatoryMessage">Introduisez un message d'erreur de validation personnalisé (optionnel)</key>
     <key alias="validationRegExp">Introduisez une expression régulière</key>
+    <key alias="validationRegExpMessage">Introduisez un message d'erreur de validation personnalisé (optionnel)</key>
     <key alias="minCount">Vous devez ajouter au moins</key>
     <key alias="maxCount">Vous ne pouvez avoir que</key>
     <key alias="items">éléments</key>
@@ -1728,6 +2006,12 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="invalidDate">Date non valide</key>
     <key alias="invalidNumber">Pas un nombre</key>
     <key alias="invalidEmail">Email non valide</key>
+    <key alias="invalidNull">La valeur ne peut pas être null</key>
+    <key alias="invalidEmpty">La valeur ne peut pas être vide</key>
+    <key alias="invalidPattern">Valeur non valide, elle ne correspond pas au modèle correct</key>
+    <key alias="customValidation">Validation personnalisée</key>
+    <key alias="entriesShort"><![CDATA[Minimum %0% éléments, en nécessite <strong>%1%</strong> supplémentaires.]]></key>
+    <key alias="entriesExceed"><![CDATA[Maximum %0% éléments, <strong>%1%</strong> en trop.]]></key>
   </area>
   <area alias="healthcheck">
     <!-- The following keys get these tokens passed in:
@@ -1835,13 +2119,17 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
   <area alias="redirectUrls">
     <key alias="disableUrlTracker">Désactiver URL tracker</key>
     <key alias="enableUrlTracker">Activer URL tracker</key>
+    <key alias="culture">Culture</key>
     <key alias="originalUrl">URL original</key>
     <key alias="redirectedTo">Redirigé Vers</key>
+    <key alias="redirectUrlManagement">Gestion des redirections d'URL</key>
+    <key alias="panelInformation">Les URLs suivants redirigent vers cet élément de contenu :</key>
     <key alias="noRedirects">Aucune redirection n'a été créée</key>
     <key alias="noRedirectsDescription">Lorsqu'une page publiée est renommée ou déplacée, une redirection sera automatiquement créée vers la nouvelle page.</key>
     <key alias="confirmRemove">Etes-vous certain(e) de vouloir supprimer la redirection de '%0%' vers '%1%'?</key>
     <key alias="redirectRemoved">Redirection d'URL supprimée.</key>
     <key alias="redirectRemoveError">Erreur lors de la suppression de la redirection d'URL.</key>
+    <key alias="redirectRemoveWarning">Ceci supprimera la redirection</key>
     <key alias="confirmDisable">Etes-vous certain(e) de vouloir désactiver le URL tracker?</key>
     <key alias="disabledConfirm">URL tracker est maintenant désactivé.</key>
     <key alias="disableError">Erreur lors de la désactivation de l'URL tracker, plus d'information disponible dans votre fichier log.</key>
@@ -1852,6 +2140,222 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="emptyDictionaryTree">Pas d'élément de dictionaire à choisir</key>
   </area>
   <area alias="textbox">
-    <key alias="characters_left">caractères restant</key>
+    <key alias="characters_left"><![CDATA[<strong>%0%</strong> caractères restant.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maximum %0% caractères, <strong>%1%</strong> en trop.]]></key>
+  </area>
+  <area alias="recycleBin">
+    <key alias="contentTrashed">Suppression du contenu avec l'Id : {0} lié au contenu parent original avec l'Id : {1}</key>
+    <key alias="mediaTrashed">Suppression du media avec l'Id : {0} lié à l'élément media parent original avec l'Id : {1}</key>
+    <key alias="itemCannotBeRestored">Cet élément ne peut pas être restauré automatiquement</key>
+    <key alias="itemCannotBeRestoredHelpText">Il n'y a aucun endroit où cet élément peut être restauré automatiquement. Vous pouvez déplacer l'élément manuellement en utilisant l'arborescence ci-dessous.</key>
+    <key alias="wasRestored">a été restauré sous</key>
+  </area>
+  <area alias="relationType">
+    <key alias="direction">Direction</key>
+    <key alias="parentToChild">Parent vers enfant</key>
+    <key alias="bidirectional">Bi-directionnel</key>
+    <key alias="parent">Parent</key>
+    <key alias="child">Enfant</key>
+    <key alias="count">Nombre</key>
+    <key alias="relations">Relations</key>
+    <key alias="created">Création</key>
+    <key alias="comment">Remarque</key>
+    <key alias="name">Nom</key>
+    <key alias="noRelations">Aucune relation pour ce type de relation.</key>
+    <key alias="tabRelationType">Type de Relation</key>
+    <key alias="tabRelations">Relations</key>
+  </area>
+  <area alias="dashboardTabs">
+    <key alias="contentIntro">Pour Commencer</key>
+    <key alias="contentRedirectManager">Gestion des redirections d'URL</key>
+    <key alias="mediaFolderBrowser">Contenu</key>
+    <key alias="settingsWelcome">Bienvenue</key>
+    <key alias="settingsExamine">Gestion d'Examine</key>
+    <key alias="settingsPublishedStatus">Statut Publié</key>
+    <key alias="settingsModelsBuilder">Models Builder</key>
+    <key alias="settingsHealthCheck">Health Check</key>
+    <key alias="settingsProfiler">Profilage</key>
+    <key alias="memberIntro">Pour Commencer</key>
+    <key alias="formsInstall">Installer Umbraco Forms</key>
+  </area>
+  <area alias="visuallyHiddenTexts">
+    <key alias="goBack">Retour</key>
+    <key alias="activeListLayout">Layouts actifs :</key>
+    <key alias="jumpTo">Aller à</key>
+    <key alias="group">groupe</key>
+    <key alias="passed">passé</key>
+    <key alias="warning">avertissement</key>
+    <key alias="failed">échoué</key>
+    <key alias="suggestion">suggestion</key>
+    <key alias="checkPassed">Vérifier les succès</key>
+    <key alias="checkFailed">Vérifier les échecs</key>
+    <key alias="openBackofficeSearch">Ouvrir la recherche backoffice</key>
+    <key alias="openCloseBackofficeHelp">Ouvrir/Fermer l'aide backoffice</key>
+    <key alias="openCloseBackofficeProfileOptions">Ouvrir/Fermer vos options de profil</key>
+    <key alias="openContextMenu">Ouvrir le menu de contexte pour</key>
+    <key alias="currentLanguage">Langue actuelle</key>
+    <key alias="switchLanguage">Changer la langue vers</key>
+    <key alias="createNewFolder">Créer un nouveau dossier</key>
+    <key alias="newPartialView">Partial View</key>
+    <key alias="newPartialViewMacro">Macro de Partial View</key>
+    <key alias="newMember">Membre</key>
+  </area>
+  <area alias="references">
+    <key alias="tabName">Références</key>
+    <key alias="DataTypeNoReferences">Ce Type de Données n'a pas de références.</key>
+    <key alias="labelUsedByDocumentTypes">Utilisé dans des Types de Document</key>
+    <key alias="noDocumentTypes">Pas de référence vers des Types de Document.</key>
+    <key alias="labelUsedByMediaTypes">Utilisé dans les Types de Media</key>
+    <key alias="noMediaTypes">Pas de référence vers des Types de Media.</key>
+    <key alias="labelUsedByMemberTypes">Utilisé dans les Types de Membre</key>
+    <key alias="noMemberTypes">Pas de référence vers des Types de Membre.</key>
+    <key alias="usedByProperties">Utilisé par</key>
+  </area>
+  <area alias="logViewer">
+      <key alias="logLevels">Niveaux de Log</key>
+      <key alias="savedSearches">Recherches sauvegardées</key>
+      <key alias="totalItems">Nombre total d'éléments</key>
+      <key alias="timestamp">Date</key>
+      <key alias="level">Niveau</key>
+      <key alias="machine">Machine</key>
+      <key alias="message">Message</key>
+      <key alias="exception">Exception</key>
+      <key alias="properties">Propriétés</key>
+      <key alias="searchWithGoogle">Chercher avec Google</key>
+      <key alias="searchThisMessageWithGoogle">Chercher ce message avec Google</key>
+      <key alias="searchWithBing">Chercher avec Bing</key>
+      <key alias="searchThisMessageWithBing">Chercher ce message avec Bing</key>
+      <key alias="searchOurUmbraco">Chercher dans Our Umbraco</key>
+      <key alias="searchThisMessageOnOurUmbracoForumsAndDocs">Chercher ce message dans les forums et docs de Our Umbraco</key>
+      <key alias="searchOurUmbracoWithGoogle">Chercher dans Our Umbraco avec Google</key>
+      <key alias="searchOurUmbracoForumsUsingGoogle">Chercher dans les forums de Our Umbraco en utilisant Google</key>
+      <key alias="searchUmbracoSource">Chercher dans les Sources Umbraco</key>
+      <key alias="searchWithinUmbracoSourceCodeOnGithub">Chercher dans le code source d'Umbraco sur Github</key>
+      <key alias="searchUmbracoIssues">Chercher dans les Umbraco Issues</key>
+      <key alias="searchUmbracoIssuesOnGithub">Chercher dans les Umbraco Issues sur Github</key>
+      <key alias="deleteThisSearch">Supprimer cette recherche</key>
+      <key alias="findLogsWithRequestId">Trouver les Logs avec la Request ID</key>
+      <key alias="findLogsWithNamespace">Trouver les Logs avec le Namespace</key>
+      <key alias="findLogsWithMachineName">Trouver les logs avec le Nom de Machine</key>
+      <key alias="open">Ouvrir</key>
+  </area>
+  <area alias="clipboard">
+    <key alias="labelForCopyAllEntries">Copier %0%</key>
+    <key alias="labelForArrayOfItemsFrom">%0% de %1%</key>
+	<key alias="labelForRemoveAllEntries">Supprimer tous les éléments</key>
+  </area>
+  <area alias="propertyActions">
+    <key alias="tooltipForPropertyActionsMenu">Ouvrir les Property Actions</key>
+  </area>
+  <area alias="nuCache">
+    <key alias="wait">Attendez</key>
+    <key alias="refreshStatus">Rafraîchir le Statut</key>
+    <key alias="memoryCache">Cache Mémoire</key>
+    <key alias="memoryCacheDescription">
+        <![CDATA[
+			Ce bouton vous permet de recharger la cache en mémoire, en la rechargeant entièrement à partir de la cache
+	en base de données (mais sans reconstruire cette cache en base de données). C'est une opération relativement rapide.
+	Utilisez-le lorsque vous pensez que la cache en mémoire n'a pas été rafraîchie convenablement, après que certains
+	événements ont été déclenchés&mdash;ce qui indiquerait un problème mineur dans Umbraco.
+	(remarque: ceci déclenche le rechargement sur tous les serveurs dans un environnement LB).
+    ]]>
+    </key>
+    <key alias="reload">Recharger</key>
+    <key alias="databaseCache">Cache en Base de Données</key>
+    <key alias="databaseCacheDescription">
+        <![CDATA[
+	Ce bouton vous permet de reconstruire la cache en base de données, càd le contenu de la table cmsContentNu.
+    <strong>La reconstruction peut être une opération lourde.</strong>
+	Utilisez-le lorsque le rechargement ne suffit pas, et que vous pensez que la cache en base de données n'a pas été
+	générée convenablement&mdash;ce qui indiquerait des problèmes critiques dans Umbraco.
+    ]]>
+    </key>
+    <key alias="rebuild">Reconstruire</key>
+    <key alias="internals">Opérations Internes</key>
+    <key alias="internalsDescription">
+        <![CDATA[
+	Ce bouton vous permet de déclencher une collection de snapshots NuCache (après exécution d'un fullCLR GC).
+	A moins que vous sachiez ce que cela signifie, vous n'avez probablement <em>pas</em> besoin de l'utiliser.
+    ]]>
+    </key>
+    <key alias="collect">Collecter</key>
+    <key alias="publishedCacheStatus">Statut de la Cache Publiée</key>
+    <key alias="caches">Caches</key>
+  </area>
+  <area alias="profiling">
+    <key alias="performanceProfiling">Profilage de performances</key>
+    <key alias="performanceProfilingDescription">
+        <![CDATA[
+                <p>
+				   Umbraco est actuellement exécuté en mode debug. Cela signifie que vous pouvez utiliser le profileur de performances intégré pour évaluer les performance lors du rendu des pages.
+                </p>
+                <p>
+                    Si vous souhaitez activer le profileur pour le rendu d'une page spécifique, ajoutez simplement <b>umbDebug=true</b> au querystring lorsque vous demandez la page.
+                </p>
+                <p>
+                    Si vous souhaitez que le profileur soit activé par défaut pour tous les rendus de pages, vous pouvez utiliser le bouton bascule ci-dessous.
+					Cela créera un cookie dans votre browser, qui activera alors le profileur automatiquement.
+                    En d'autres termes, le profileur ne sera activé par défaut que dans <i>votre</i> browser - pas celui des autres.
+                </p>
+        ]]>
+    </key>
+    <key alias="activateByDefault">Activer le profileur par défaut</key>
+    <key alias="reminder">Rappel amical</key>
+    <key alias="reminderDescription">
+        <![CDATA[
+            <p>
+                Vous ne devriez jamais laisser un site de production s'exécuer en mode debug. Le mode Debug est désactivé en indiquant <b>debug="false"</b> dans l'élément <b>&lt;compilation /&gt;</b> du fichier web.config.
+            </p>
+        ]]>
+    </key>
+    <key alias="profilerEnabledDescription">
+        <![CDATA[
+            <p>
+                Umbraco n'est pour l'instant pas exécuté en mode debug, vous ne pouvez donc pas utiliser le profileur intégré. Il devrait en être ainsi pour un site de production.
+            </p>
+            <p>
+                Le mode Debug est activé en indiquant <b>debug="true"</b> dans l'élément <b>&lt;compilation /&gt;</b> du fichier web.config.
+            </p>
+        ]]>
+    </key>
+  </area>
+  <area alias="settingsDashboardVideos">
+    <key alias="trainingHeadline">Des heures de vidéos de formation Umbraco ne sont qu'à un clic d'ici</key>
+    <key alias="trainingDescription">
+        <![CDATA[
+        <p>Vous voulez maîtriser Umbraco? Passez quelques minutes à apprendre certaines des meilleures pratiques en regardant une de ces vidéos à propos de l'utilisation d'Umbraco. Et visitez <a href="http://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a> pour encore plus de vidéos Umbraco</p>
+    ]]>
+    </key>
+    <key alias="getStarted">Pour démarrer</key>
+  </area>
+  <area alias="settingsDashboard">
+    <key alias="start">Commencer ici</key>
+    <key alias="startDescription">Cette section contient les blocs fondamentaux pour votre site Umbraco. Suivez les liens ci-dessous pour en apprendre d'avantage sur la façon de travailler avec les éléments de la section Settings</key>
+    <key alias="more">En savoir plus</key>
+    <key alias="bulletPointOne">
+        <![CDATA[
+            Lisez-en plus sur la façon de travailler avec les éléments dans la section Settings <a class="btn-link -underline" href="https://our.umbraco.com/documentation/Getting-Started/Backoffice/Sections/" target="_blank" rel="noopener">dans la section Documentation</a> de Our Umbraco
+        ]]>
+    </key>
+    <key alias="bulletPointTwo">
+        <![CDATA[
+            Posez une question dans le <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank" rel="noopener">Community Forum</a>
+        ]]>
+    </key>
+    <key alias="bulletPointThree">
+        <![CDATA[
+            Regardez nos <a class="btn-link -underline" href="https://umbraco.tv" target="_blank" rel="noopener">tutoriels vidéos</a> (certains sont gratuits, certains nécessitent un abonnement)
+        ]]>
+    </key>
+    <key alias="bulletPointFour">
+        <![CDATA[
+            Découvrez nos <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank" rel="noopener">outils d'amélioration de productivité et notre support commercial</a>
+        ]]>
+    </key>
+    <key alias="bulletPointFive">
+        <![CDATA[
+            Découvrez nos possibilités de <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank" rel="noopener">formations et certifications</a>
+        ]]>
+    </key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
index e100cb4301..fcc9cfb8ad 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
@@ -361,8 +361,8 @@
               <p>To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file. </p>
               <p>
               Click the <strong>retry</strong> button when
-              done.<br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
-			              More information on editing web.config here.</a></p>]]></key>
+              done.<br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">
+			              More information on editing web.config here</a>.</p>]]></key>
     <key alias="databaseText"><![CDATA[To complete this step, you must know some information regarding your database server ("connection string").<br />
         Please contact your ISP if necessary.
         If you're installing on a local machine or server you might need information from your system administrator.]]></key>
@@ -409,7 +409,7 @@
     <key alias="runwayFromScratch">אני רוצה להתחיל מאתר ריק</key>
     <key alias="runwayFromScratchText"><![CDATA[
         Your website is completely empty at the moment, so that’s perfect if you want to start from scratch and create your own document types and templates.
-        (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
+        (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
         You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
       ]]></key>
     <key alias="runwayHeader">סיימת להתקין את מערכת אומברקו, מה ברצונך לעשות כעת?</key>
@@ -467,7 +467,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="renewSession">יש לבצע חידוש פעילות על מנת לשמור על התוכן</key>
   </area>
   <area alias="login">
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
   </area>
   <area alias="main">
     <key alias="dashboard">לוח הבקרה</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
index 4866fff843..812da01703 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
@@ -187,7 +187,7 @@
     <key alias="recycleBinIsEmpty"><![CDATA[Il cestino è vuoto]]></key>
     <key alias="recycleBinWarning"><![CDATA[Gli elementi cancellati dal cestino non potranno essere recuperati.]]></key>
     <key alias="regexSearchError"><![CDATA[Il webservice <a target='_blank' href='http://regexlib.com'>regexlib.com</a> ha attualmente qualche problema, di cui non abbiamo il controllo. Siamo spiacevoli dell'inconveniente.]]></key>
-    <key alias="regexSearchHelp"><![CDATA[Ricerca un'espressione regolare da aggiungere al campo della form per poter validare il contenuto. Esempio: 'email, 'zip-code' 'url']]></key>
+    <key alias="regexSearchHelp"><![CDATA[Ricerca un'espressione regolare da aggiungere al campo della form per poter validare il contenuto. Esempio: 'email, 'zip-code', 'URL'.]]></key>
     <key alias="removeMacro">Elimina Macro</key>
     <key alias="requiredField">Campo obbligatorio</key>
     <key alias="sitereindexed"><![CDATA[Il sito è stato reindicizzato]]></key>
@@ -330,7 +330,7 @@
     <key alias="update">Aggiorna</key>
     <key alias="upgrade">Aggiornamento</key>
     <key alias="upload">Carica</key>
-    <key alias="url">Url</key>
+    <key alias="url">URL</key>
     <key alias="user">Utente</key>
     <key alias="username"><![CDATA[Username]]></key>
     <key alias="value">Valore</key>
@@ -359,7 +359,7 @@
     <key alias="databaseInstall"><![CDATA[Premi il tasto <strong>installa</strong> per installare il database Umbraco %0% ]]></key>
     <key alias="databaseInstallDone"><![CDATA[Umbraco %0% è stato copiato nel tuo database. Premi <strong>Avanti</strong> per proseguire.]]></key>
     <key alias="databaseNotFound"><![CDATA[<p>Database non trovato! Perfavore, controlla che le informazioni della stringa di connessione nel file "web.config" siano corrette.</p>
-<p>Per procedere, edita il file "web.config" (utilizzando Visual Studio o l'editor di testo che preferisci), scorri in basso, aggiungi la stringa di connessione per il database chiamato "umbracoDbDSN" e salva il file.</p><p>Clicca il tasto <strong>riprova</strong> quando hai finito.<br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank"> Maggiori dettagli per la modifica del file web.config qui.</a></p>]]></key>
+<p>Per procedere, edita il file "web.config" (utilizzando Visual Studio o l'editor di testo che preferisci), scorri in basso, aggiungi la stringa di connessione per il database chiamato "umbracoDbDSN" e salva il file.</p><p>Clicca il tasto <strong>riprova</strong> quando hai finito.<br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener"> Maggiori dettagli per la modifica del file web.config qui</a>.</p>]]></key>
     <key alias="databaseText"><![CDATA[Per completare questo passaggio, devi conoscere alcune informazioni riguardanti il tuo database server ("connection string"). Se è necessario contatta il tuo ISP per reperire le informazioni necessarie. Se stai effettuando l'installazione in locale o su un server, puoi richiederle al tuo amministratore di sistema]]></key>
     <key alias="databaseUpgrade"><![CDATA[<p>Premi il tasto <strong>aggiorna</strong> per aggiornare il database ad Umbraco %0%</p><p>Non preoccuparti, il contenuto non verrà perso e tutto continuerà a funzionare dopo l'aggiornamento!</p>]]></key>
     <key alias="databaseUpgradeDone"><![CDATA[Il tuo database è stato aggiornato all'ultima versione %0%.<br />Premi il tasto <strong>Avanti</strong> per continuare.]]></key>
@@ -386,7 +386,7 @@
     <key alias="permissionsSettingUpPermissions"><![CDATA[Impostazione dei permessi delle cartelle]]></key>
     <key alias="permissionsText"><![CDATA[per poter archiviare file come immagini e PDF, Umbraco deve avere accesso in scrittura/modifica ad alcune directory. Inoltre per incrementare le prestazioni del tuo sito, deve essere possibile memorizzare informazioni temporanee (es: cache).]]></key>
     <key alias="runwayFromScratch"><![CDATA[Voglio partire da zero]]></key>
-    <key alias="runwayFromScratchText"><![CDATA[Il tuo sito al momento è completamente vuoto, e questo è il punto di partenza ideale per creare da zero i tuoi tipi documento e i tuoi templates. (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">Guarda come</a>) Puoi anche installare eventuali Runway in un secondo momento. Vai nella sezione Developer e scegli Pacchetti.]]></key>
+    <key alias="runwayFromScratchText"><![CDATA[Il tuo sito al momento è completamente vuoto, e questo è il punto di partenza ideale per creare da zero i tuoi tipi documento e i tuoi templates. (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">Guarda come</a>) Puoi anche installare eventuali Runway in un secondo momento. Vai nella sezione Developer e scegli Pacchetti.]]></key>
     <key alias="runwayHeader"><![CDATA[Hai configurato una versione pulita della piattaforma Umbraco. Cosa vuoi fare adesso?]]></key>
     <key alias="runwayInstalled">Runway è installato</key>
     <key alias="runwayInstalledText"><![CDATA[
@@ -440,7 +440,7 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
     <key alias="renewSession">Riconnetti adesso per salvare il tuo lavoro</key>
   </area>
   <area alias="login">
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
   </area>
   <area alias="main">
     <key alias="dashboard">Dashboard</key>
@@ -742,7 +742,7 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
     <key alias="standardFields">Campi Standard</key>
     <key alias="uppercase">Maiuscolo</key>
     <key alias="urlEncode"><![CDATA[Codifica URL]]></key>
-    <key alias="urlEncodeHelp"><![CDATA[Andrà a sostituire i caratteri speciali con il loro equivalente negli url.]]></key>
+    <key alias="urlEncodeHelp"><![CDATA[Andrà a sostituire i caratteri speciali con il loro equivalente negli URL.]]></key>
     <key alias="usedIfAllEmpty"><![CDATA[Sarà usato solo se i valori dei campi sopra sono vuoti]]></key>
     <key alias="usedIfEmpty"><![CDATA[Questo campo sarà usato soltanto se il campo primario è vuoto]]></key>
     <key alias="withTime"><![CDATA[Si, aggiungi l'ora. Separatore: ]]></key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
index 21559f915a..80aad2c301 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
@@ -247,7 +247,7 @@
     <key alias="recycleBinIsEmpty">ごみ箱は空です</key>
     <key alias="recycleBinWarning">ごみ箱から削除すると復活させることはできません</key>
     <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>のウェブサービスに現在問題が起きているかもしれず、操作できませんでした。大変申し訳ありませんがこの機能は使用できません。]]></key>
-    <key alias="regexSearchHelp">フォームのフィールドを正規表現で検証できます。例: 'email, 'zip-code' 'url'</key>
+    <key alias="regexSearchHelp">フォームのフィールドを正規表現で検証できます。例: 'email, 'zip-code' 'URL'</key>
     <key alias="removeMacro">マクロを削除</key>
     <key alias="requiredField">必須フィールド</key>
     <key alias="sitereindexed">サイトは再インデックスされました</key>
@@ -493,7 +493,7 @@
               <p>続行するには"web.config"ファイルを編集(Visual Studioないし使い慣れたテキストエディタで)し、下の方にスクロールし、"umbracoDbDSN"という名前のキーでデータベースの接続文字列を追加して保存します。</p>
               <p>
               <strong>再施行</strong>ボタンをクリックして
-              続けます。<br /><a href="http://umbraco.org/redir/installWebConfig" target="_blank">
+              続けます。<br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">
 			              より詳細にはこちらの web.config を編集します。</a></p>]]></key>
     <key alias="databaseText"><![CDATA[このステップを完了するには、データベースサーバー(の"接続文字列")について把握していなければなりません。<br />
         必要ならISPに連絡するなどしてみてください。
@@ -541,7 +541,7 @@
     <key alias="runwayFromScratch">スクラッチから始めたい</key>
     <key alias="runwayFromScratchText"><![CDATA[
         ウェブサイトはさしあたり完全に空っぽで、必要なドキュメント型やテンプレートを作成するところから始められます。
-        (<a href="http://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">どうしたらいいの？</a>)
+        (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">どうしたらいいの？</a>)
         後からRunwayをインストールする事もできます。そうしたくなった時は、Developerセクションのパッケージへどうぞ。
       ]]></key>
     <key alias="runwayHeader">Umbracoプラットフォームのクリーンセットアップが完了しました。この後はどうしますか？</key>
@@ -608,7 +608,7 @@ Runwayをインストールして作られた新しいウェブサイトがど
     <key alias="greeting6">ハッピー土曜日</key>
     <key alias="instruction">ウェブサイトにログインします。</key>
     <key alias="timeout">セッションタイムアウトしました。</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.org" style="text-decoration: none" target="_blank">umbraco.org</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.org</a></p> ]]></key>
   </area>
   <area alias="main">
     <key alias="dashboard">ダッシュボード</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
index a87f6f1410..02f50e73b2 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
@@ -181,7 +181,7 @@
     <key alias="recycleBinIsEmpty">휴지통이 비었습니다.</key>
     <key alias="recycleBinWarning">휴지통에서 삭제하시면 완전히 삭제됩니다.</key>
     <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>의 웹서비스는 현재 제어할 수 없는 몇가지 문제점이 보고되었습니다. 불편을 드려 대단히 죄송합니다.]]></key>
-    <key alias="regexSearchHelp">필드 유효성검사를 위해 정규표현식을 검색합니다. 예: 'email, 'zip-code' 'url'</key>
+    <key alias="regexSearchHelp">필드 유효성검사를 위해 정규표현식을 검색합니다. 예: 'email, 'zip-code' 'URL'</key>
     <key alias="removeMacro">매크로 삭제</key>
     <key alias="requiredField">필수 필드</key>
     <key alias="sitereindexed">사이트의 색인이 재생성되었습니다.</key>
@@ -326,7 +326,7 @@
     <key alias="update">업데이트</key>
     <key alias="upgrade">업그레이드</key>
     <key alias="upload">업로드</key>
-    <key alias="url">Url</key>
+    <key alias="url">URL</key>
     <key alias="user">사용자</key>
     <key alias="username">사용자</key>
     <key alias="value">값</key>
@@ -357,8 +357,8 @@
     <key alias="databaseNotFound"><![CDATA[<p>데이터베이스를 찾을 수 없습니다. “web.config”파일의 "connection string"이 바르게 설정되었는지 확인하세요.</p>
             <p>"web.config" 파일에 맨아래에 ,키네임을 "UmbracoDbDSN"로 하여 사용하시는 데이터베이스의 connection string 정보를 입력하시고 파일을 저장하세요. </p>
             <p>
-            완료 후<strong>재시도</strong>버튼을 누르세요.<br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
-		               web.config의 더많은 정보는 여기에 있습니다.</a></p>]]></key>
+            완료 후<strong>재시도</strong>버튼을 누르세요.<br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">
+		               web.config의 더많은 정보는 여기에 있습니다</a>.</p>]]></key>
     <key alias="databaseText"><![CDATA[이과정을 위해선, 당신의 DB서버 정보에 대해서 알고 계셔야합니다.("connection string").<br />
       필요하시다면 사용하시는 ISP쪽에 문의하시기 바랍니다..
       로컬 머신이나 서버에 설치되어 있다면 해당 시스템 관리자에게 문의하시기 바랍니다.]]></key>
@@ -395,7 +395,7 @@
     <key alias="runwayFromScratch">scratch를 시작하기 원합니다.</key>
     <key alias="runwayFromScratchText"><![CDATA[
       사이트가 완전히 비어있는 상태입니다. 스크래치를 시작하시거나 문서유형, 템플릿을 만드시기에 완벽한 상태입니다.
-      (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
+      (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
       Runway설치를 나중에 실행하실 수 있습니다. 개발도구 부분에서 패키지를 선택하세요.
     ]]></key>
     <key alias="runwayHeader">여러분은 Umbraco 플랫폼 설치를 완료하였습니다. 다음엔 어떤 작업을 원하십니까?</key>
@@ -452,7 +452,7 @@
     <key alias="renewSession">TRANSLATE ME: 'Renew now to save your work'</key>
   </area>
   <area alias="login">
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
   </area>
   <area alias="main">
     <key alias="dashboard">대시보드</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
index 731aea4a20..cc0b46f200 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
@@ -241,7 +241,7 @@
     <key alias="recycleBinIsEmpty">Papirkurven er nå tom</key>
     <key alias="recycleBinWarning">Når elementer blir slettet fra papirkurven vil de være slettet for alltid</key>
     <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a> tjenesten opplever for tiden problemer som vi ikke har kontroll over. Vi beklager denne ubeleiligheten.]]></key>
-    <key alias="regexSearchHelp">Søk etter et regulært uttrykk for å legge inn validering til et felt. Eksempel: 'email, 'zip-code' 'url'</key>
+    <key alias="regexSearchHelp">Søk etter et regulært uttrykk for å legge inn validering til et felt. Eksempel: 'email, 'zip-code', 'URL'.</key>
     <key alias="removeMacro">Fjern makro</key>
     <key alias="requiredField">Obligatorisk</key>
     <key alias="sitereindexed">Nettstedet er indeksert</key>
@@ -330,6 +330,7 @@
     <key alias="continue">Fortsett</key>
     <key alias="copy">Kopier</key>
     <key alias="create">Opprett</key>
+    <key alias="cropSection">Utsnitt</key>
     <key alias="database">Database</key>
     <key alias="date">Dato</key>
     <key alias="default">Standard</key>
@@ -397,7 +398,7 @@
     <key alias="update">Oppdater</key>
     <key alias="upgrade">Oppgrader</key>
     <key alias="upload">Last opp</key>
-    <key alias="url">Url</key>
+    <key alias="url">URL</key>
     <key alias="user">Bruker</key>
     <key alias="username">Brukernavn</key>
     <key alias="value">Verdi</key>
@@ -436,7 +437,7 @@
     <key alias="databaseHeader">Databasekonfigurasjon</key>
     <key alias="databaseInstall"><![CDATA[Klikk <strong>installer</strong>-knappen for å installere Umbraco %0% databasen]]></key>
     <key alias="databaseInstallDone"><![CDATA[Umbraco %0% har nå blitt kopiert til din database. Trykk <strong>Neste</strong> for å fortsette.]]></key>
-    <key alias="databaseNotFound"><![CDATA[<p>Databasen ble ikke funnet! Vennligst sjekk at informasjonen i "connection string" i "web.config"-filen er korrekt.</p><p>For å fortsette, vennligst rediger "web.config"-filen (bruk Visual Studio eller din favoritteditor), rull ned til bunnen, og legg til tilkoblingsstrengen for din database i nøkkelen "umbracoDbDSN" og lagre filen.</p><p>Klikk <strong>prøv på nytt</strong> når du er ferdig.<br /> <a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">Mer informasjon om redigering av web.config her.</a></p>]]></key>
+    <key alias="databaseNotFound"><![CDATA[<p>Databasen ble ikke funnet! Vennligst sjekk at informasjonen i "connection string" i "web.config"-filen er korrekt.</p><p>For å fortsette, vennligst rediger "web.config"-filen (bruk Visual Studio eller din favoritteditor), rull ned til bunnen, og legg til tilkoblingsstrengen for din database i nøkkelen "umbracoDbDSN" og lagre filen.</p><p>Klikk <strong>prøv på nytt</strong> når du er ferdig.<br /> <a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">Mer informasjon om redigering av web.config her</a>.</p>]]></key>
     <key alias="databaseText"><![CDATA[For å fullføre dette steget, må du vite en del informasjon om din database server ("tilkoblingsstreng").<br/> Vennligst kontakt din ISP om nødvendig. Hvis du installerer på en lokal maskin eller server, må du kanskje skaffe informasjonen fra din systemadministrator.]]></key>
     <key alias="databaseUpgrade"><![CDATA[<p> Trykk på knappen <strong>oppgrader</strong> for å oppgradere databasen din til Umbraco %0%</p> <p> Ikke vær urolig - intet innhold vil bli slettet og alt vil fortsette å virke etterpå! </p>]]></key>
     <key alias="databaseUpgradeDone"><![CDATA[Databasen din har blitt oppgradert til den siste utgaven, %0%.<br/>Trykk <strong>Neste</strong> for å fortsette.]]></key>
@@ -463,7 +464,7 @@
     <key alias="permissionsSettingUpPermissions">Konfigurerer mappetillatelser</key>
     <key alias="permissionsText"><![CDATA[Umbraco trenger skrive/endre tilgang til enkelte mapper for å kunne lagre filer som bilder og PDF-dokumenter. Den lagrer også midlertidig data (aka: hurtiglager) for å øke ytelsen på websiden din.]]></key>
     <key alias="runwayFromScratch">Jeg ønsker å starte fra bunnen.</key>
-    <key alias="runwayFromScratchText"><![CDATA[Din website er helt tom for øyeblikket. Dette er perfekt hvis du vil begynne helt forfra og lage dine egne dokumenttyper og maler. (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">lær hvordan</a>) Du kan fortsatt velge å installere Runway senere. Vennligst gå til Utvikler-seksjonen og velg Pakker.]]></key>
+    <key alias="runwayFromScratchText"><![CDATA[Din website er helt tom for øyeblikket. Dette er perfekt hvis du vil begynne helt forfra og lage dine egne dokumenttyper og maler. (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">lær hvordan</a>) Du kan fortsatt velge å installere Runway senere. Vennligst gå til Utvikler-seksjonen og velg Pakker.]]></key>
     <key alias="runwayHeader">Du har akkurat satt opp en ren Umbraco plattform. Hva vil du gjøre nå?</key>
     <key alias="runwayInstalled">Runway er installert</key>
     <key alias="runwayInstalledText"><![CDATA[Du har nå fundamentet på plass. Velg hvilke moduler du ønsker å installer på toppen av det.<br/> Dette er vår liste av anbefalte moduler- Kryss av de du ønsker å installere, eller se den<a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">fulle listen av moduler</a> ]]></key>
@@ -508,7 +509,7 @@
     <key alias="instruction">Logg på nedenfor</key>
     <key alias="signInWith">Logg på med</key>
     <key alias="timeout">Din sesjon er utløpt</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
   </area>
   <area alias="main">
     <key alias="dashboard">Skrivebord</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
index 601626d896..11049a279c 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <language alias="nl" intName="Dutch" localName="Nederlands" lcid="19" culture="nl-NL">
   <creator>
     <name>The Umbraco community</name>
@@ -8,13 +8,18 @@
     <key alias="assignDomain">Beheer domeinnamen</key>
     <key alias="auditTrail">Documentgeschiedenis</key>
     <key alias="browse">Node bekijken</key>
-    <key alias="changeDocType">Wijzig documenttype</key>
+    <key alias="changeDocType">Documenttype wijzigen</key>
+    <key alias="changeDataType">Datatype aanpassen</key>
     <key alias="copy">Kopiëren</key>
     <key alias="create">Nieuw</key>
+    <key alias="export">Export</key>
     <key alias="createPackage">Nieuwe package</key>
+    <key alias="createGroup">Groep maken</key>
     <key alias="delete">Verwijderen</key>
     <key alias="disable">Uitschakelen</key>
+    <key alias="editSettings">Instellingen wijzigen</key>
     <key alias="emptyRecycleBin">Prullenbak leegmaken</key>
+    <key alias="enable">Inschakelen</key>
     <key alias="exportDocumentType">Documenttype exporteren</key>
     <key alias="importDocumentType">Documenttype importeren</key>
     <key alias="importPackage">Package importeren</key>
@@ -27,20 +32,62 @@
     <key alias="unpublish">Depubliceren</key>
     <key alias="refreshNode">Nodes opnieuw inladen</key>
     <key alias="republish">Herpubliceer de site</key>
-    <key alias="SetPermissionsForThePage">Stel rechten voor pagina %0% in</key>
+    <key alias="remove">Verwijder</key>
+    <key alias="rename" version="7.3.0">Hernoem</key>
     <key alias="restore" version="7.3.0">Herstellen</key>
+    <key alias="SetPermissionsForThePage">Stel rechten voor pagina %0% in</key>
+    <key alias="chooseWhereToCopy">Kies waar u wilt kopiëren</key>
+    <key alias="chooseWhereToMove">Kies waar u wilt verplaatsen</key>
+    <key alias="toInTheTreeStructureBelow">naar de boomstructuur hieronder</key>
+    <key alias="infiniteEditorChooseWhereToCopy">Kies waar u de geselecteerde item(s) naartoe wilt kopiëren</key>
+    <key alias="infiniteEditorChooseWhereToMove">Kies waar u de geselecteerde item(s) naartoe wilt verplaatsen</key>
+    <key alias="wasMovedTo">was verplaatst naar</key>
+    <key alias="wasCopiedTo">was gekopieerd naar</key>
+    <key alias="wasDeleted">was verwijderd</key>
     <key alias="rights">Rechten</key>
     <key alias="rollback">Vorige versies</key>
     <key alias="sendtopublish">Klaar voor publicatie</key>
     <key alias="sendToTranslate">Klaar voor vertalen</key>
+    <key alias="setGroup">Groep instellen</key>
     <key alias="sort">Sorteren</key>
     <key alias="translate">Vertalen</key>
     <key alias="update">Bijwerken</key>
     <key alias="setPermissions">Rechten instellen</key>
     <key alias="unlock">Deblokkeer</key>
-    <key alias="createblueprint">Content template aanmaken</key>
+    <key alias="createblueprint">Inhoudssjabloon aanmaken</key>
     <key alias="resendInvite">Uitnodiging opnieuw versturen</key>
   </area>
+  <area alias="actionCategories">
+    <key alias="content">Inhoud</key>
+    <key alias="administration">Administratie</key>
+    <key alias="structure">Structuur</key>
+    <key alias="other">Andere</key>
+  </area>
+  <area alias="actionDescriptions">
+    <key alias="assignDomain">Toegang toestaan om cultuur- en hostnamen toe te wijzen</key>
+    <key alias="auditTrail">Toegang toestaan om het geschiedenislogboek van een node te bekijken</key>
+    <key alias="browse">Toegang toestaan om een node te bekijken</key>
+    <key alias="changeDocType">Toegang toestaan om het documenttype van een node te wijzigen</key>
+    <key alias="copy">Toegang toestaan om een node te kopiëren</key>
+    <key alias="create">Toegang toestaan om nodes aan te maken</key>
+    <key alias="delete">Toegang toestaan om nodes te verwijderen</key>
+    <key alias="move">Toegang toestaan om een node te verplaatsen.</key>
+    <key alias="protect">Toegang toestaan om openbare toegang voor een node in te stellen en te wijzigen</key>
+    <key alias="publish">Toegang toestaan om een node te publiceren</key>
+    <key alias="unpublish">Toegang toestaan om een node te depubliceren</key>
+    <key alias="rights">Toegang toestaan om de machtigingen van een node te wijzigen</key>
+    <key alias="rollback">Toegang toestaan om een node terug te draaien naar een vorige status</key>
+    <key alias="sendtopublish">Toegang toestaan om een node te verzenden voor goedkeuring voor publicatie</key>
+    <key alias="sendToTranslate">Toegang toestaan om een node te verzenden voor vertaling</key>
+    <key alias="sort">Toegang toestaan om de volgorde van nodes te wijzigen</key>
+    <key alias="translate">Toegang toestaan om een node te vertalen</key>
+    <key alias="update">Toegang toestaan om een node op te slaan</key>
+    <key alias="createblueprint">Toegang toestaan om Inhoudssjabloon aan te maken</key>
+  </area>
+  <area alias="apps">
+    <key alias="umbContent">Inhoud</key>
+    <key alias="umbInfo">Info</key>
+  </area>
   <area alias="assignDomain">
     <key alias="permissionDenied">Toegang geweigerd.</key>
     <key alias="addNew">Nieuw domein toevoegen</key>
@@ -56,6 +103,10 @@
     <key alias="domainUpdated">Domein '%0%' is bijgewerkt</key>
     <key alias="orEdit">Bewerk huidige domeinen</key>
     <key alias="inherit">Overerven</key>
+    <key alias="domainHelpWithVariants">
+        <![CDATA[Geldige domeinnamen zijn: "example.com", "www.example.com", "example.com:8080" of "https://www.example.com/".
+    Verder worden ook paden op één niveau in domeinen ondersteund, bv. "example.com/en" of "/en".]]>
+    </key>
     <key alias="setLanguage">Cultuur</key>
     <key alias="setLanguageHelp"><![CDATA[Zet de cultuur voor de nodes onder de huidige node,<br /> of erf de cultuur over van de oudernodes. Zal ook van toepassing <br />
       zijn op de huidige node, tenzij een domein hieronder ook van toepassing is.]]></key>
@@ -63,6 +114,35 @@
   </area>
   <area alias="auditTrails">
     <key alias="atViewingFor">Tonen voor</key>
+    <key alias="delete">Inhoud verwijderd</key>
+    <key alias="unpublish">Inhoud gedepubliceerd</key>
+    <key alias="unpublishvariant">Inhoud gedepubliceerd voor talen: %0% </key>
+    <key alias="publish">Inhoud gepubliceerd</key>
+    <key alias="publishvariant">Inhoud gepubliceerd voor talen: %0% </key>
+    <key alias="save">Inhoud bewaard</key>
+    <key alias="savevariant">Inhoud bewaard voor talen: %0%</key>
+    <key alias="move">Inhoud verplaatst</key>
+    <key alias="copy">Inhoud gekopieerd</key>
+    <key alias="rollback">Inhoud teruggezet</key>
+    <key alias="sendtopublish">Inhoud verzonden voor publicatie</key>
+    <key alias="sendtopublishvariant">Inhoud verzonden voor publicatie voor talen: %0%</key>
+    <key alias="sort">Sorteer onderliggende items door de gebruiker uitgevoerd</key>
+    <key alias="custom">%0%</key>
+    <key alias="smallCopy">Kopieer</key>
+    <key alias="smallPublish">Publiceer</key>
+    <key alias="smallPublishVariant">Publiceer</key>
+    <key alias="smallMove">Verplaats</key>
+    <key alias="smallSave">Bewaar</key>
+    <key alias="smallSaveVariant">Bewaar</key>
+    <key alias="smallDelete">Verwijder</key>
+    <key alias="smallUnpublish">Depubliceer</key>
+    <key alias="smallUnpublishVariant">Depubliceer</key>
+    <key alias="smallRollBack">Terugzetten</key>
+    <key alias="smallSendToPublish">Verzenden voor publicatie</key>
+    <key alias="smallSendToPublishVariant">Verzenden voor publicatie</key>
+    <key alias="smallSort">Sorteer</key>
+    <key alias="smallCustom">Aangepast</key>
+    <key alias="historyIncludingVariants">Geschiedenis (alle varianten)</key>
   </area>
   <area alias="buttons">
     <key alias="clearSelection">Selectie ongedaan maken</key>
@@ -84,18 +164,34 @@
     <key alias="listNumeric">Nummering</key>
     <key alias="macroInsert">Macro invoegen</key>
     <key alias="pictureInsert">Afbeelding invoegen</key>
+    <key alias="publishAndClose">Publiceren en sluiten</key>
+    <key alias="publishDescendants">Publiceren met onderliggende nodes</key>
     <key alias="relations">Relaties wijzigen</key>
     <key alias="returnToList">Terug naar overzicht</key>
     <key alias="save">Opslaan</key>
+    <key alias="saveAndClose">Opslaan en sluiten</key>
     <key alias="saveAndPublish">Opslaan en publiceren</key>
+    <key alias="saveAndSchedule">Opslaan en plannen</key>
     <key alias="saveToPublish">Opslaan en verzenden voor goedkeuring</key>
-    <key alias="saveListView">Sla list view op</key>
-    <key alias="saveAndPreview">voorbeeld bekijken</key>
-    <key alias="showPageDisabled">Voorbeeld bekijken is uitgeschakeld omdat er geen template is geselecteerd</key>
+    <key alias="saveListView">Lijstweergave opslaan</key>
+    <key alias="schedulePublish">Planning</key>
+    <key alias="showPage">Voorbeeld</key>
+    <key alias="saveAndPreview">Opslaan en voorbeeld bekijken</key>
+    <key alias="showPageDisabled">Voorbeeld bekijken is uitgeschakeld omdat er geen sjabloon is geselecteerd</key>
     <key alias="styleChoose">Stijl kiezen</key>
     <key alias="styleShow">Stijlen tonen</key>
     <key alias="tableInsert">Tabel invoegen</key>
+    <key alias="generateModelsAndClose">Models genereren en sluiten</key>
     <key alias="saveAndGenerateModels">Opslaan en models genereren</key>
+    <key alias="undo">Ongedaan maken</key>
+    <key alias="redo">Herhalen</key>
+    <key alias="rollback">Terugzetten</key>
+    <key alias="deleteTag">Tag verwijderen</key>
+    <key alias="confirmActionCancel">Annuleren</key>
+    <key alias="confirmActionConfirm">Bevestigen</key>
+    <key alias="morePublishingOptions">Meer publicatie opties</key>
+    <key alias="submitChanges">Indienen</key>
+    <key alias="submitChangesAndClose">Indienen en sluiten</key>
   </area>
   <area alias="changeDocType">
     <key alias="changeDocTypeInstruction">Om het documenttype voor de geselecteerde inhoud te wijzigen, selecteert u eerst uit de lijst van geldige types voor deze locatie.</key>
@@ -107,7 +203,7 @@
     <key alias="docTypeChanged">Documenttype gewijzigd</key>
     <key alias="mapProperties">Eigenschappen toewijzen</key>
     <key alias="mapToProperty">Toewijzen aan eigenschap</key>
-    <key alias="newTemplate">Nieuwe template</key>
+    <key alias="newTemplate">Nieuw sjabloon</key>
     <key alias="newType">Nieuw type</key>
     <key alias="none">geen</key>
     <key alias="selectedContent">Inhoud</key>
@@ -117,6 +213,12 @@
     <key alias="validationErrorPropertyWithMoreThanOneMapping">Toewijzen van eigenschappen kan niet worden afgerond, omdat één of meer eigenschappen meer dan één toewijzing hebben.</key>
     <key alias="validDocTypesNote">Alleen alternatieve types geldig voor de huidige locatie worden weergegeven.</key>
   </area>
+  <area alias="codefile">
+    <key alias="createFolderFailedById">Het maken van een map onder de bovenliggende map met ID %0% is mislukt</key>
+    <key alias="createFolderFailedByName">Het maken van een map onder de bovenliggende map met de naam %0% is mislukt</key>
+    <key alias="createFolderIllegalChars">De mapnaam mag geen ongeldige tekens bevatten.</key>
+    <key alias="deleteItemFailed">Verwijderen van item is mislukt: %0%</key>
+  </area>
   <area alias="content">
     <key alias="isPublished" version="7.2">Is gepubliceerd</key>
     <key alias="about">Over deze pagina</key>
@@ -137,23 +239,35 @@
     <key alias="lastPublished">Laatst gepubliceerd op</key>
     <key alias="noItemsToShow">Er zijn geen items om weer te geven</key>
     <key alias="listViewNoItems" version="7.1.5">Er zijn geen items om weer te geven.</key>
+    <key alias="listViewNoContent">Er zijn geen subitems toegevoegd</key>
+    <key alias="listViewNoMembers">Er zijn geen leden toegevoegd</key>
     <key alias="mediatype">Mediatype</key>
     <key alias="mediaLinks">Link naar media item(s)</key>
     <key alias="membergroup">Ledengroep</key>
     <key alias="memberrole">Rol</key>
     <key alias="membertype">Ledentype</key>
+    <key alias="noChanges">Er zijn geen wijzigingen aangebracht</key>
     <key alias="noDate">Geen datum gekozen</key>
     <key alias="nodeName">Pagina Titel</key>
+    <key alias="noMediaLink">Dit media item heeft geen link</key>
+    <key alias="noProperties">Inhoud kan niet worden toegevoegd aan dit item</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="parentNotPublished">Dit document is gepubliceerd maar niet zichtbaar omdat de bovenliggende pagina '%0%' niet gepubliceerd is</key>
+    <key alias="parentCultureNotPublished">Deze cultuur is gepubliceerd maar is niet zichtbaar omdat het niet gepubliceerd is op de bovenliggende pagina '%0%'</key>
     <key alias="parentNotPublishedAnomaly">Dit document is gepubliceerd, maar het staat niet in de cache (interne serverfout)</key>
-    <key alias="getUrlException">Kan de Url niet ophalen</key>
-    <key alias="routeError">Dit document is gepubliceerd, maar de Url conflicteert met %0%</key>
+    <key alias="getUrlException">Kan de URL niet ophalen</key>
+    <key alias="routeError">Dit document is gepubliceerd maar de URL conflicteert met %0%</key>
+    <key alias="routeErrorCannotRoute">Dit document is gepubliceerd maar de URL kan niet worden gerouteerd</key>
     <key alias="publish">Publiceren</key>
+    <key alias="published">Gepubliceerd</key>
+    <key alias="publishedPendingChanges">Gepubliceerd (hangende wijzigingen)</key>
     <key alias="publishStatus">Publicatiestatus</key>
+    <key alias="publishDescendantsHelp"><![CDATA[Publiceer <strong>%0%</strong> en alle onderliggende content items en maak daarmee de inhoud openbaar.]]></key>
+    <key alias="publishDescendantsWithVariantsHelp"><![CDATA[Publiceer varianten en varianten van hetzelfde onderliggende type en maak daarmee de inhoud openbaar.]]></key>
     <key alias="releaseDate">Publiceren op</key>
     <key alias="unpublishDate">Depubliceren op</key>
     <key alias="removeDate">Verwijderdatum</key>
+    <key alias="setDate">Datum instellen</key>
     <key alias="sortDone">De sorteervolgorde is gewijzigd</key>
     <key alias="sortHelp">Om nodes te sorteren, sleep de nodes of klik op één van de kolomtitels. Je kan meerdere nodes tegelijk selecteren door de "shift"- of "control"knop in te drukken tijdens het selecteren.</key>
     <key alias="statistics">Statistieken</key>
@@ -161,43 +275,119 @@
     <key alias="altTextOptional">Alternatieve tekst (optioneel)</key>
     <key alias="type">Type</key>
     <key alias="unpublish">Depubliceren</key>
+    <key alias="unpublished">Concept</key>
+    <key alias="notCreated">Niet gemaakt</key>
     <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="uploadClearImageContext">Klik hier om de afbeelding van het media item te verwijderen</key>
+    <key alias="uploadClearFileContext">Klik hier om het bestand van het media item te verwijderen</key>
     <key alias="urls">Link naar het document</key>
     <key alias="memberof">Lid van groep(en)</key>
     <key alias="notmemberof">Geen lid van groep(en)</key>
     <key alias="childItems" version="7.0">Subitems</key>
     <key alias="target" version="7.0">Doel</key>
     <key alias="scheduledPublishServerTime">Dit betekend de volgende tijd op de server:</key>
-    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">Wat houd dit in?</a>]]></key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank" rel="noopener">Wat houd dit in?</a>]]></key>
     <key alias="nestedContentDeleteItem">Ben je er zeker van dat je dit item wilt verwijderen?</key>
+    <key alias="nestedContentDeleteAllItems">Ben je zeker dat je alle items wilt verwijderen?</key>
     <key alias="nestedContentEditorNotSupported">Eigenschap %0% gebruikt editor %1% welke niet wordt ondersteund door Nested Content.</key>
+    <key alias="nestedContentNoContentTypes">Er zijn geen content types geconfigureerd voor deze eigenschap.</key>
+    <key alias="nestedContentAddElementType">Element type toevoegen</key>
+    <key alias="nestedContentSelectElementTypeModalTitle">Selecteer een element type</key>
+    <key alias="nestedContentGroupHelpText">Selecteer de groep waarvan je de eigenschappen wil tonen. Indien je niets selecteert, wordt de eerste groep van het elementtype gebruikt.</key>
+    <key alias="nestedContentTemplateHelpTextPart1">Voer een angular expressie in om te evalueren tegen de naam van elk item. Gebruik</key>
+    <key alias="nestedContentTemplateHelpTextPart2">om de itemindex weer te geven</key>
     <key alias="addTextBox">Voeg nog een tekstvak toe</key>
     <key alias="removeTextBox">Verwijder dit tekstvak</key>
     <key alias="contentRoot">Content root</key>
+    <key alias="includeUnpublished">Inclusief niet-gepubliceerde inhoudsitems.</key>
     <key alias="isSensitiveValue">Deze waarde is verborgen. Indien u toegang nodig heeft om deze waarde te bekijken, neem dan contact op met uw websitebeheerder.</key>
     <key alias="isSensitiveValue_short">Deze waarde is verborgen</key>
+    <key alias="languagesToPublishForFirstTime">Welke talen wil je publiceren? Alle talen met inhoud zijn opgeslagen!</key>
+    <key alias="languagesToPublish">Welke talen wil je publiceren?</key>
+    <key alias="languagesToSave">Welke talen wil je opslaan?</key>
+    <key alias="languagesToSaveForFirstTime">Alle talen met inhoud zijn opgeslagen bij het aanmaken!</key>
+    <key alias="languagesToSendForApproval">Welke talen wil je ter goedkeuring verzenden?</key>
+    <key alias="languagesToSchedule">Welke talen wil je plannen?</key>
+    <key alias="languagesToUnpublish">Selecteer de talen om te depubliceren. Een verplichte taal depubliceren zal alle talen depubliceren.</key>
+    <key alias="publishedLanguages">Gepubliceerde talen</key>
+    <key alias="unpublishedLanguages">Niet-gepubliceerde talen</key>
+    <key alias="unmodifiedLanguages">Ongewijzigde talen</key>
+    <key alias="untouchedLanguagesForFirstTime">Deze talen zijn nog niet gemaakt</key>
+
+    <key alias="variantsWillBeSaved">Alle nieuwe varianten worden opgeslagen.</key>
+    <key alias="variantsToPublish">Welke varianten wil je publiceren?</key>
+    <key alias="variantsToSave">Kies welke varianten u wilt opslaan.</key>
+    <key alias="variantsToSendForApproval">Kies varianten om ter goedkeuring te verzenden.</key>
+    <key alias="variantsToSchedule">Geplande publicatie instellen...</key>
+    <key alias="variantsToUnpublish">Selecteer de varianten om te depubliceren. Een verplichte taal depubliceren zal alle varianten depubliceren.</key>
+    <key alias="publishRequiresVariants">De volgende varianten zijn vereist om te kunnen publiceren:</key>
+
+    <key alias="notReadyToPublish">We zijn niet klaar om te publiceren</key>
+    <key alias="readyToPublish">Klaar om te publiceren?</key>
+    <key alias="readyToSave">Klaar om op te slaan?</key>
+    <key alias="sendForApproval">Ter goedkeuring verzenden</key>
+    <key alias="schedulePublishHelp">Selecteer de datum en tijd om het content item te publiceren en/of depubliceren.</key>
+    <key alias="createEmpty">Maak nieuw</key>
+    <key alias="createFromClipboard">Plakken vanaf het klembord</key>
+    <key alias="nodeIsInTrash">Dit item is in de prullenbak</key>
+  </area>
+  <area alias="blueprints">
+    <key alias="createBlueprintFrom">Nieuw Inhoudssjabloon aanmaken voor '%0%'</key>
+    <key alias="blankBlueprint">Leeg</key>
+    <key alias="selectBlueprint">Selecteer een Inhoudssjabloon</key>
+    <key alias="createdBlueprintHeading">Inhoudssjabloon aangemaakt</key>
+    <key alias="createdBlueprintMessage">Inhoudssjabloon is aangemaakt voor '%0%'</key>
+    <key alias="duplicateBlueprintMessage">Er bestaat al een Inhoudssjabloon met dezelfde naam</key>
+    <key alias="blueprintDescription">Een inhoudssjabloon is voorgedefinieerde inhoud die een editor kan selecteren om te gebruiken als basis voor het maken van nieuwe inhoud</key>
   </area>
   <area alias="media">
     <key alias="clickToUpload">Klik om te uploaden</key>
     <key alias="orClickHereToUpload">Of klik hier om bestanden te kiezen</key>
-    <key alias="disallowedFileType">Dit bestand heeft niet het juiste file-type. Dit bestand kan niet geupload worden.</key>
+    <key alias="dragFilesHereToUpload">Je kan bestanden hier naartoe slepen om te uploaden.</key>
+    <key alias="disallowedFileType">Kan dit bestand niet uploaden, het heeft niet het juiste bestandstype.</key>
     <key alias="maxFileSize">Maximale bestandsgrootte is</key>
+    <key alias="mediaRoot">Media root</key>
+    <key alias="moveFailed">Het is niet gelukt om de media te verplaatsen</key>
+    <key alias="moveToSameFolderFailed">De bovenliggende map en de doelmap kunnen niet hetzelfde zijn</key>
+    <key alias="copyFailed">Kan media niet kopiëren</key>
+    <key alias="createFolderFailed">Kan de map onder de bovenliggende map met id %0% niet aanmaken</key>
+    <key alias="renameFolderFailed">Kan de map met id %0% niet hernoemen</key>
+    <key alias="dragAndDropYourFilesIntoTheArea">Sleep en zet je bestand(en) neer in dit gebied</key>
+    <key alias="uploadNotAllowed">Upload is niet toegelaten in deze locatie.</key>
   </area>
   <area alias="member">
-    <key alias="createNewMember">Maak nieuwe member aan</key>
-    <key alias="allMembers">Alle Members</key>
+    <key alias="createNewMember">Maak nieuw lid aan</key>
+    <key alias="allMembers">Alle leden</key>
+    <key alias="memberGroupNoProperties">Ledengroepen hebben geen extra eigenschappen om te bewerken.</key>
   </area>
   <area alias="create">
     <key alias="chooseNode">Waar wil je de nieuwe %0% aanmaken?</key>
     <key alias="createUnder">Aanmaken onder</key>
+    <key alias="createContentBlueprint">Selecteer een documenttype waarvoor je een Inhoudssjabloon wil maken</key>
+    <key alias="enterFolderName">Voer een mapnaam in</key>
     <key alias="updateData">Kies een type en een titel</key>
     <key alias="noDocumentTypes" version="7.0"><![CDATA[Er zijn geen toegestane ​​documenttypes beschikbaar. Schakel deze in in de sectie Instellingen onder <strong>"Documenttypes"</ strong>.]]></key>
+    <key alias="noDocumentTypesAtRoot"><![CDATA[Er zijn geen documenttypes beschikbaar om hier aan te maken. Je moet deze aanmaken bij <strong>Documenttypes</strong> in de sectie <strong>Instellingen</strong>.]]></key>
+    <key alias="noDocumentTypesWithNoSettingsAccess">De geselecteerde pagina in de boomstructuur laat geen nieuwe onderliggende paginas toe.</key>
+    <key alias="noDocumentTypesEditPermissions">Rechten aanpassen voor dit documenttype</key>
+    <key alias="noDocumentTypesCreateNew">Nieuw documenttype aanmaken</key>
+    <key alias="noDocumentTypesAllowedAtRoot"><![CDATA[Er zijn geen toegestane ​​documenttypes beschikbaar om hier aan te maken. Je moet deze inschakelen bij <strong>Documenttypes</strong> in de sectie <strong>Instellingen</strong>, de optie <strong>Toestaan op root-niveau</strong> onder <strong>Rechten</strong>.]]></key>
     <key alias="noMediaTypes" version="7.0"><![CDATA[Er zijn geen toegestande mediatypes beschikbaar. Schakel deze in in de sectie Instellingen onder <strong>"Mediatypes"</strong>.]]></key>
-    <key alias="documentTypeWithoutTemplate">Document Type zonder template</key>
+    <key alias="noMediaTypesWithNoSettingsAccess">De geselecteerde media in de boomstructuur laat niet toe dat er onderliggende media aangemaakt wordt.</key>
+    <key alias="noMediaTypesEditPermissions">Rechten aanpassen voor dit mediatype</key>
+    <key alias="documentTypeWithoutTemplate">Documenttype zonder sjabloon</key>
     <key alias="newFolder">Nieuwe map</key>
-    <key alias="newDataType">Nieuw data type</key>
+    <key alias="newDataType">Nieuw datatype</key>
+    <key alias="newJavascriptFile">Nieuw JavaScript bestand</key>
+    <key alias="newEmptyPartialView">Nieuwe lege partial view</key>
+    <key alias="newPartialViewMacro">Nieuwe partial view macro</key>
+    <key alias="newPartialViewFromSnippet">Nieuwe partial view van fragment</key>
+    <key alias="newPartialViewMacroFromSnippet">Nieuwe partial view macro van fragment</key>
+    <key alias="newPartialViewMacroNoMacro">Nieuwe partial view macro (zonder macro)</key>
+    <key alias="newStyleSheetFile">Nieuw style sheet bestand</key>
+    <key alias="newRteStyleSheetFile">Nieuw Rich Text Editor style sheet bestand</key>
   </area>
   <area alias="dashboard">
     <key alias="browser">Open je website</key>
@@ -212,8 +402,11 @@
     <key alias="stay">Blijf op deze pagina</key>
     <key alias="discardChanges">Negeer wijzigingen</key>
     <key alias="unsavedChanges">Wijzigingen niet opgeslagen</key>
-    <key alias="unsavedChangesWarning">Weet je zeker dat deze pagina wilt verlaten? - er zijn onopgeslagen wijzigingen</key>
-    <key alias="confirmUnpublish">Depubliceren zal deze pagina en alle onderliggende paginas verwijderen van de site.</key>
+    <key alias="unsavedChangesWarning">Weet je zeker dat deze pagina wilt verlaten? Er zijn onopgeslagen wijzigingen</key>
+    <key alias="confirmListViewPublish">Publiceren maakt de geselecteerde items zichtbaar op de site.</key>
+    <key alias="confirmListViewUnpublish">Depubliceren zal de geselecteerde items en alle onderliggende items verwijderen van de site.</key>
+    <key alias="confirmUnpublish">Depubliceren zal deze pagina en alle onderliggende pagina's verwijderen van de site.</key>
+    <key alias="doctypeChangeWarning">Wijzigingen niet opgeslagen. Aanpassingen aan het Documenttype zullen de wijzigingen ongedaan maken.</key>
   </area>
   <area alias="bulk">
     <key alias="done">Done</key>
@@ -241,16 +434,20 @@
   <area alias="defaultdialogs">
     <key alias="nodeNameLinkPicker">Link Titel</key>
     <key alias="urlLinkPicker">Link</key>
+    <key alias="anchorLinkPicker">Anker / querystring</key>
     <key alias="anchorInsert">Naam</key>
-    <key alias="assignDomain">Beheer domeinnamen</key>
     <key alias="closeThisWindow">Sluit dit venster</key>
     <key alias="confirmdelete">Weet je zeker dat je dit wilt verwijderen</key>
     <key alias="confirmdisable">Weet je zeker dat je dit wilt uitschakelen</key>
+    <key alias="confirmremove">Weet u zeker dat u wilt verwijderen</key>
+    <key alias="confirmremoveusageof"><![CDATA[Ben je zeker dat je het gebruik van <b>%0%</b> wil verwijderen]]></key>
+    <key alias="confirmremovereferenceto"><![CDATA[Ben je zeker dat je de referentie naar <b>%0%</b> wil verwijderen]]></key>
     <key alias="confirmlogout">Weet je het zeker?</key>
     <key alias="confirmSure">Weet je het zeker?</key>
     <key alias="cut">Knippen</key>
     <key alias="editdictionary">Pas woordenboekitem aan</key>
     <key alias="editlanguage">Taal aanpassen</key>
+    <key alias="editSelectedMedia">Geselecteerde media bewerken</key>
     <key alias="insertAnchor">Lokale link invoegen</key>
     <key alias="insertCharacter">Karakter invoegen</key>
     <key alias="insertgraphicheadline">Voeg grafische titel in</key>
@@ -258,24 +455,30 @@
     <key alias="insertlink">Link invoegen</key>
     <key alias="insertMacro">Klik om een Macro toe te voegen</key>
     <key alias="inserttable">Tabel invoegen</key>
+    <key alias="languagedeletewarning">Dit zal de taal verwijderen</key>
+    <key alias="languageChangeWarning">De cultuur veranderen voor een taal kan een langdurige operatie zijn en zal ertoe leiden dat de inhoudscache en indexen opnieuw worden opgebouwd</key>
     <key alias="lastEdited">Laatst aangepast op</key>
     <key alias="link">Link</key>
     <key alias="linkinternal">Interne link:</key>
     <key alias="linklocaltip">Plaats een hekje (“#”) voor voor interne links.</key>
     <key alias="linknewwindow">In nieuw venster openen?</key>
+    <key alias="macroContainerSettings">Macro instellingen</key>
     <key alias="macroDoesNotHaveProperties">Deze macro heeft geen eigenschappen die u kunt bewerken</key>
     <key alias="paste">Plakken</key>
     <key alias="permissionsEdit">Bewerk rechten voor</key>
+    <key alias="permissionsSet">Rechten instellen voor</key>
+    <key alias="permissionsSetForGroup">Rechten instellen voor %0% voor gebruikersgroepf %1%</key>
+    <key alias="permissionsHelp">Selecteer de gebruikersgroepen waarvoor u de rechten wilt instellen</key>
     <key alias="recycleBinDeleting">De items worden nu uit de prullenbak verwijderd. Sluit dit venster niet terwijl de actie nog niet voltooid is.</key>
     <key alias="recycleBinIsEmpty">De prullenbak is nu leeg.</key>
     <key alias="recycleBinWarning">Als items worden verwijderd uit de prullenbak, zijn ze voorgoed verwijderd.</key>
-    <key alias="regexSearchError"><![CDATA[De webservice van <a target='_blank' href='http://regexlib.com'>regexlib.com</a> ondervindt momenteel problemen waarover we geen controle hebben. Onze excuses voor het ongemak.]]></key>
-    <key alias="regexSearchHelp">Zoek naar een reguliere expressie om validatie aan een formulierveld toe te voegen. Voorbeeld: 'email, 'post-code' 'url'</key>
+    <key alias="regexSearchError"><![CDATA[De webservice van <a target='_blank' rel='noopener' href='https://regexlib.com'>regexlib.com</a> ondervindt momenteel problemen waarover we geen controle hebben. Onze excuses voor het ongemak.]]></key>
+    <key alias="regexSearchHelp">Zoek naar een reguliere expressie om validatie aan een formulierveld toe te voegen. Voorbeeld: 'email', 'postcode', 'URL'.</key>
     <key alias="removeMacro">Verwijder Macro</key>
     <key alias="requiredField">Verplicht veld</key>
     <key alias="sitereindexed">Site is opnieuw geïndexeerd</key>
     <key alias="siterepublished">De site is opnieuw gepubliceerd</key>
-    <key alias="siterepublishHelp">De cache zal worden vernieuwd. Alle gepubliceerde inhoud zal worden ge-update, terwijl ongepubliceerde inhoud ongepubliceerd zal blijven.</key>
+    <key alias="siterepublishHelp">De cache zal worden vernieuwd. Alle gepubliceerde inhoud zal worden bijgewerkt, terwijl ongepubliceerde inhoud ongepubliceerd zal blijven.</key>
     <key alias="tableColumns">Aantal kolommen</key>
     <key alias="tableRows">Aantal regels</key>
     <key alias="thumbnailimageclickfororiginal">Klik op de afbeelding voor volledige grootte</key>
@@ -283,19 +486,30 @@
     <key alias="viewCacheItem">Toon cache item</key>
     <key alias="relateToOriginalLabel">Relateer aan origineel</key>
     <key alias="includeDescendants">Onderliggende nodes meenemen</key>
-    <key alias="theFriendliestCommunity">De vriendelijkste community</key>
+    <key alias="theFriendliestCommunity">De vriendelijkste gemeenschap</key>
     <key alias="linkToPage">Link naar pagina</key>
     <key alias="openInNewWindow">Opent het gelinkte document in een nieuw venster of tab</key>
     <key alias="linkToMedia">Link naar media</key>
+    <key alias="selectContentStartNode">Selecteer content start node</key>
     <key alias="selectMedia">Selecteer media</key>
+    <key alias="selectMediaType">Selecteer media type</key>
     <key alias="selectIcon">Selecteer icoon</key>
     <key alias="selectItem">Selecteer item</key>
     <key alias="selectLink">Selecteer link</key>
     <key alias="selectMacro">Selecteer macro</key>
     <key alias="selectContent">Selecteer content</key>
+    <key alias="selectContentType">Selecteer content type</key>
+    <key alias="selectMediaStartNode">Selecteer media start node</key>
     <key alias="selectMember">Selecteer member</key>
-    <key alias="selectMemberGroup">Selecteer member group</key>
+    <key alias="selectMemberGroup">Selecteer lid groep</key>
+    <key alias="selectMemberType">Selecteer lid type</key>
+    <key alias="selectNode">Selecteer node</key>
+    <key alias="selectSections">Selecteer secties</key>
+    <key alias="selectUser">Selecteer gebruiker</key>
+    <key alias="selectUsers">Selecteer gebruikers</key>
+    <key alias="noIconsFound">Geen iconen gevonden</key>
     <key alias="noMacroParams">Er zijn geen parameters voor deze macro</key>
+    <key alias="noMacros">Er zijn geen macro's beschikbaar om in te voegen</key>
     <key alias="externalLoginProviders">Externe login providers</key>
     <key alias="exceptionDetail">Error details</key>
     <key alias="stacktrace">Stacktrace</key>
@@ -304,15 +518,53 @@
     <key alias="unLinkYour">De-Link je</key>
     <key alias="account">account</key>
     <key alias="selectEditor">Selecteer editor</key>
+    <key alias="selectEditorConfiguration">Selecteer configuratie</key>
+    <key alias="selectSnippet">Selecteer fragment</key>
+    <key alias="variantdeletewarning">Dit zal de node en al zijn talen verwijderen. Als je slechts één taal wil verwijderen, moet je de node in die taal depubliceren.</key>
+    <key alias="propertyuserpickerremovewarning"><![CDATA[Dit zal de gebruiker <b>%0%</b> verwijderen.]]></key>
+    <key alias="userremovewarning"><![CDATA[Dit zal de gebruiker <b>%0%</b> verwijderen van de <b>%1%</b> groep]]></key>
+    <key alias="yesRemove">Ja, verwijderen</key>
+  </area>
+  <area alias="dictionary">
+    <key alias="noItems">Er zijn geen woordenboekitems.</key>
   </area>
   <area alias="dictionaryItem">
     <key alias="description"><![CDATA[
       Wijzig de verschillende taalversies voor het woordenboek item '%0%'. Je kunt extra talen toevoegen bij 'talen' in het menu links
-   ]]></key>
+    ]]></key>
     <key alias="displayName">Cultuurnaam</key>
     <key alias="changeKeyError"><![CDATA[
       De key '%0%' bestaat al.
-   ]]></key>
+    ]]></key>
+    <key alias="overviewTitle">Woordenboek overzicht</key>
+  </area>
+  <area alias="examineManagement">
+    <key alias="configuredSearchers">Ingestelde Zoekers</key>
+    <key alias="configuredSearchersDescription">Toont eigenschappen en hulpmiddelen voor elke geconfigureerde Zoeker (bijv. zoals een multi-indexzoeker)</key>
+    <key alias="fieldValues">Veldwaarden</key>
+    <key alias="healthStatus">Gezondheidsstatus</key>
+    <key alias="healthStatusDescription">De gezondheidsstatus van de index en of het kan gelezen worden</key>
+    <key alias="indexers">Indexeerders</key>
+    <key alias="indexInfo">Index info</key>
+    <key alias="indexInfoDescription">De eigenschappen oplijsten van de index</key>
+    <key alias="manageIndexes">Beheer de indexen van Examine</key>
+    <key alias="manageIndexesDescription">Bekijk de details van elke index en gebruik hulpmiddelen voor het beheer er van</key>
+    <key alias="rebuildIndex">Index opnieuw bouwen</key>
+    <key alias="rebuildIndexWarning"><![CDATA[
+      Hierdoor wordt de index opnieuw opgebouwd.<br />
+      Afhankelijk van hoeveel inhoud er op je site staat, kan dit even duren.<br />
+      Het wordt niet aanbevolen om een index opnieuw op te bouwen terwijl er veel verkeer op de website is of wanneer editors inhoud bewerken.
+     ]]>
+    </key>
+    <key alias="searchers">Zoekers</key>
+    <key alias="searchDescription">Zoek in de index en bekijk de resultaten</key>
+    <key alias="tools">Hulpmiddelen</key>
+    <key alias="toolsDescription">Hulpmiddelen om de index te beheren</key>
+    <key alias="fields">velden</key>
+    <key alias="indexCannotRead">De index kan niet gelezen worden en moet opnieuw worden gebouwd</key>
+    <key alias="processIsTakingLonger">Het proces duurt langer dan verwacht, controleer het Umbraco logboek om te kijken of er geen fouten waren tijdens deze operatie</key>
+    <key alias="indexCannotRebuild">Deze index kan niet opnieuw worden opgebouwd want het heeft geen toegewezen</key>
+    <key alias="iIndexPopulator">IIndexPopulator</key>
   </area>
   <area alias="placeholders">
     <key alias="username">Typ jouw gebruikersnaam</key>
@@ -320,30 +572,54 @@
     <key alias="confirmPassword">Bevestig jouw wachtwoord</key>
     <key alias="nameentity">Benoem de %0%...</key>
     <key alias="entername">Typ een naam...</key>
+    <key alias="enteremail">Voer een e-mailadres in</key>
+    <key alias="enterusername">Voer een gebruikersnaam in...</key>
     <key alias="label">Label...</key>
     <key alias="enterDescription">Voer een omschrijving in...</key>
     <key alias="search">Typ om te zoeken...</key>
     <key alias="filter">Typ om te filteren...</key>
-    <key alias="enterTags">Typ om tags toe te voegen (druk op enter na elke tag)...</key>
-    <key alias="email">Voer jouw email in</key>
-    <key alias="usernameHint">Jouw gebruikersnaam is meestal jouw email</key>
+    <key alias="enterTags">Typ om tags toe te voegen (druk op Enter na elke tag)...</key>
+    <key alias="email">Voer jouw e-mailadres in</key>
+    <key alias="enterMessage">Voer een bericht in ...</key>
+    <key alias="usernameHint">Jouw gebruikersnaam is meestal jouw e-mailadres</key>
+    <key alias="anchor">#value of ?key=value</key>
+    <key alias="enterAlias">Voer een alias in...</key>
+    <key alias="generatingAlias">Alias genereren...</key>
+    <key alias="a11yCreateItem">Item aanmaken</key>
+    <key alias="a11yEdit">Bewerken</key>
+    <key alias="a11yName">Naam</key>
   </area>
   <area alias="editcontenttype">
     <key alias="createListView" version="7.2">Maak een aangepaste lijstweergave</key>
     <key alias="removeListView" version="7.2">Verwijder aangepaste lijstweergave</key>
+    <key alias="aliasAlreadyExists">Een content type, media type of member type met deze alias bestaat al</key>
+  </area>
+  <area alias="renamecontainer">
+    <key alias="renamed">Hernoemd</key>
+    <key alias="enterNewFolderName">Voer een nieuwe mapnaam in</key>
+    <key alias="folderWasRenamed">%0% is hernoemd naar %1%</key>
   </area>
   <area alias="editdatatype">
     <key alias="addPrevalue">Prevalue toevoegen</key>
-    <key alias="dataBaseDatatype">Datebase datatype</key>
+    <key alias="dataBaseDatatype">Database datatype</key>
     <key alias="guid">Data Editor GUID</key>
     <key alias="renderControl">Render control</key>
-    <key alias="rteButtons">Buttons</key>
+    <key alias="rteButtons">Knoppen</key>
     <key alias="rteEnableAdvancedSettings">Geavanceerde instellingen inschakelen voor</key>
     <key alias="rteEnableContextMenu">Context menu inschakelen</key>
     <key alias="rteMaximumDefaultImgSize">Maximum standaard grootte van afbeeldingen</key>
     <key alias="rteRelatedStylesheets">Gerelateerde stylesheets</key>
     <key alias="rteShowLabel">Toon label</key>
     <key alias="rteWidthAndHeight">Breedte en hoogte</key>
+    <key alias="allPropTypes">Alle eigenschap types &amp; eigenschap data</key>
+    <key alias="willBeDeleted">die dit datatype gebruiken zullen permanent verwijderd worden, bevestig dat u deze ook wilt verwijderen</key>
+    <key alias="yesDelete">Ja, verwijderen</key>
+    <key alias="andAllRelated">en alle eigenschap types &amp; eigenschap data die dit datatype gebruiken</key>
+    <key alias="selectFolder">Selecteer een map om te verplaatsen</key>
+    <key alias="inTheTree">naar in de boomstructuur hieronder</key>
+    <key alias="wasMoved">werd eronder verplaatst</key>
+    <key alias="hasReferencesDeleteConsequence"><![CDATA[Door <strong>%0%</strong> te verwijderen zullen alle eigenschappen en de data verwijderd worden van de volgende items:]]></key>
+    <key alias="acceptDeleteConsequence">Ik begrijp dat deze actie alle eigenschappen en data zal verwijderen die gebaseerd is op dit datatype.</key>
   </area>
   <area alias="errorHandling">
     <key alias="errorButDataWasSaved">Je data is opgeslagen, maar voordat je deze pagina kunt publiceren moet je eerst aan paar problemen oplossen:</key>
@@ -373,8 +649,11 @@
     <key alias="stylesNoStylesOnPage">Geen actieve stijlen beschikbaar</key>
     <key alias="tableColMergeLeft">Plaats de cursor links van de twee cellen die je wilt samenvoegen</key>
     <key alias="tableSplitNotSplittable">Je kunt een cel die is samengevoegd niet delen</key>
+    <key alias="propertyHasErrors">Deze eigenschap is ongeldig</key>
+    <key alias="errorPropertyEditorNotSupportedInElementTypes">Eigenschap '%0%' gebruikt editor '%1%' die niet ondersteund wordt in Element Types.</key>
   </area>
   <area alias="general">
+    <key alias="options">Opties</key>
     <key alias="about">Over</key>
     <key alias="action">Actie</key>
     <key alias="actions">Acties</key>
@@ -383,19 +662,24 @@
     <key alias="all">Alles</key>
     <key alias="areyousure">Weet je het zeker?</key>
     <key alias="back">Terug</key>
-    <key alias="border">Border</key>
+    <key alias="backToOverview">Terug naar overzicht</key>
+    <key alias="border">Rand</key>
     <key alias="by">bij</key>
-    <key alias="cancel">Cancel</key>
+    <key alias="cancel">Annuleren</key>
     <key alias="cellMargin">Cel marge</key>
     <key alias="choose">Kies</key>
-    <key alias="close">Sluit</key>
+    <key alias="clear">Wissen</key>
+    <key alias="close">Sluiten</key>
     <key alias="closewindow">Sluit venster</key>
     <key alias="comment">Comment</key>
     <key alias="confirm">Bevestig</key>
+    <key alias="constrain">Beperken</key>
     <key alias="constrainProportions">Verhoudingen behouden</key>
-    <key alias="continue">Ga verder</key>
-    <key alias="copy">Copy</key>
+    <key alias="content">Inhoud</key>
+    <key alias="continue">Doorgaan</key>
+    <key alias="copy">Kopiëren</key>
     <key alias="create">Aanmaken</key>
+    <key alias="cropSection">Sectie bijsnijden</key>
     <key alias="database">Database</key>
     <key alias="date">Datum</key>
     <key alias="default">Standaard</key>
@@ -403,27 +687,43 @@
     <key alias="deleted">Verwijderd</key>
     <key alias="deleting">Aan het verwijderen...</key>
     <key alias="design">Ontwerp</key>
+    <key alias="dictionary">Woordenboek</key>
     <key alias="dimensions">Afmetingen</key>
+    <key alias="discard">Gooi weg</key>
     <key alias="down">Omlaag</key>
     <key alias="download">Download</key>
-    <key alias="edit">Bewerk</key>
+    <key alias="edit">Bewerken</key>
     <key alias="edited">Bewerkt</key>
     <key alias="elements">Elementen</key>
-    <key alias="email">Email</key>
+    <key alias="email">E-mail</key>
     <key alias="error">Fout</key>
-    <key alias="findDocument">Vind</key>
+    <key alias="field">Veld</key>
+    <key alias="findDocument">Zoeken</key>
+    <key alias="first">Eerste</key>
+    <key alias="focalPoint">Focus punt</key>
+    <key alias="general">Algemeen</key>
+    <key alias="groups">Groepen</key>
+    <key alias="group">Groep</key>
     <key alias="height">Hoogte</key>
     <key alias="help">Help</key>
+    <key alias="hide">Verbergen</key>
+    <key alias="history">Geschiedenis</key>
     <key alias="icon">Icoon</key>
+    <key alias="id">Id</key>
     <key alias="import">Import</key>
+    <key alias="includeFromsubFolders">Ook in onderliggende mappen zoeken</key>
+    <key alias="excludeFromSubFolders">Alleen in deze map zoeken</key>
+    <key alias="info">Info</key>
     <key alias="innerMargin">Binnenste marge</key>
     <key alias="insert">Invoegen</key>
     <key alias="install">Installeren</key>
     <key alias="invalid">Ongeldig</key>
-    <key alias="justify">Justify</key>
+    <key alias="justify">Uitvullen</key>
     <key alias="label">Label</key>
     <key alias="language">Taal</key>
+    <key alias="last">Laatste</key>
     <key alias="layout">Layout</key>
+    <key alias="links">Links</key>
     <key alias="loading">Aan het laden</key>
     <key alias="locked">Gesloten</key>
     <key alias="login">Inloggen</key>
@@ -431,37 +731,50 @@
     <key alias="logout">Uitloggen</key>
     <key alias="macro">Macro</key>
     <key alias="mandatory">Verplicht</key>
+    <key alias="message">Bericht</key>
     <key alias="move">Verplaats</key>
     <key alias="name">Naam</key>
     <key alias="new">Nieuw</key>
     <key alias="next">Volgende</key>
     <key alias="no">Nee</key>
     <key alias="of">of</key>
+    <key alias="off">Uit</key>
     <key alias="ok">OK</key>
     <key alias="open">Open</key>
+    <key alias="on">Aan</key>
     <key alias="or">of</key>
+    <key alias="orderBy">Sorteren op</key>
     <key alias="password">Wachtwoord</key>
     <key alias="path">Pad</key>
     <key alias="pleasewait">Een ogenblik geduld aub...</key>
     <key alias="previous">Vorige</key>
     <key alias="properties">Eigenschappen</key>
-    <key alias="reciept">Email om formulier resultaten te ontvangen</key>
+    <key alias="rebuild">Opnieuw opbouwen</key>
+    <key alias="reciept">E-mail om formulier resultaten te ontvangen</key>
     <key alias="recycleBin">Prullenbak</key>
     <key alias="recycleBinEmpty">De prullenbak is leeg</key>
+    <key alias="reload">Vernieuwen</key>
     <key alias="remaining">Overblijvend</key>
+    <key alias="remove">Verwijderen</key>
     <key alias="rename">Hernoem</key>
     <key alias="renew">Vernieuw</key>
     <key alias="required" version="7.0">Verplicht</key>
+    <key alias="retrieve">Ophalen</key>
     <key alias="retry">Opnieuw proberen</key>
     <key alias="rights">Rechten</key>
+    <key alias="scheduledPublishing">Geplande publicatie</key>
     <key alias="search">Zoeken</key>
     <key alias="searchNoResult">We konden helaas niet vinden wat je zocht</key>
+    <key alias="noItemsInList">Er zijn geen items toegevoegd</key>
     <key alias="server">Server</key>
+    <key alias="settings">Instellingen</key>
     <key alias="show">Toon</key>
     <key alias="showPageOnSend">Toon pagina na verzenden</key>
     <key alias="size">Grootte</key>
     <key alias="sort">Sorteer</key>
+    <key alias="status">Status</key>
     <key alias="submit">Verstuur</key>
+    <key alias="success">Succes</key>
     <key alias="type">Typen</key>
     <key alias="typeToSearch">Typ om te zoeken...</key>
     <key alias="under">onder</key>
@@ -469,7 +782,7 @@
     <key alias="update">Update</key>
     <key alias="upgrade">Upgrade</key>
     <key alias="upload">Upload</key>
-    <key alias="url">Url</key>
+    <key alias="url">URL</key>
     <key alias="user">Gebruiker</key>
     <key alias="username">Gebruikersnaam</key>
     <key alias="value">Waarde</key>
@@ -489,23 +802,38 @@
     <key alias="current">huidig</key>
     <key alias="embed">Embed</key>
     <key alias="selected">geselecteerd</key>
+    <key alias="other">Andere</key>
+    <key alias="articles">Artikels</key>
+    <key alias="videos">Videos</key>
+    <key alias="installing">Installeren</key>
+    <key alias="avatar">Avatar van</key>
   </area>
   <area alias="colors">
     <key alias="blue">Blauw</key>
   </area>
   <area alias="shortcuts">
     <key alias="addGroup">Groep toevoegen</key>
-    <key alias="addProperty">Property toevoegen</key>
+    <key alias="addProperty">Eigenschap toevoegen</key>
     <key alias="addEditor">Editor toevoegen</key>
-    <key alias="addTemplate">Template toevoegen</key>
+    <key alias="addTemplate">Sjabloon toevoegen</key>
     <key alias="addChildNode">Child node toevoegen</key>
     <key alias="addChild">Child toevoegen</key>
-    <key alias="editDataType">Data type bewerken</key>
+    <key alias="editDataType">Datatype bewerken</key>
     <key alias="navigateSections">Secties navigeren</key>
-    <key alias="shortcut">Shortcuts</key>
-    <key alias="showShortcuts">Toon shortcuts</key>
-    <key alias="toggleListView">Toggle lijstweergave</key>
-    <key alias="toggleAllowAsRoot">Toggle toestaan op root-niveau</key>
+    <key alias="shortcut">Snelkoppeling</key>
+    <key alias="showShortcuts">Toon snelkoppelingen</key>
+    <key alias="toggleListView">Lijstweergave in/uitschakelen</key>
+    <key alias="toggleAllowAsRoot">Toestaan op root-niveau in/uitschakelen</key>
+    <key alias="commentLine">Regel in/uit commentaar zetten</key>
+    <key alias="removeLine">Regel verwijderen</key>
+    <key alias="copyLineUp">Kopieer Regels Omhoog</key>
+    <key alias="copyLineDown">Kopieer Regels Omlaag</key>
+    <key alias="moveLineUp">Verplaats Regels Omhoog</key>
+    <key alias="moveLineDown">Verplaats Regels Omlaag</key>
+    <key alias="generalHeader">Algemeen</key>
+    <key alias="editorHeader">Editor</key>
+    <key alias="toggleAllowCultureVariants">Cultuur varianten toestaan in/uitschakelen</key>
+    <key alias="toggleAllowSegmentVariants">Segmentatie toestaan in/uitschakelen</key>
   </area>
   <area alias="graphicheadline">
     <key alias="backgroundcolor">Achtergrondkleur</key>
@@ -524,7 +852,7 @@
     <key alias="databaseHeader">Database configuratie </key>
     <key alias="databaseInstall"><![CDATA[Druk op de knop <strong>installeren</strong> om de Umbraco %0% database te installeren]]></key>
     <key alias="databaseInstallDone"><![CDATA[Umbraco %0% is nu gekopieerd naar je database. Druk op <strong>Volgende</strong> om door te gaan.]]></key>
-    <key alias="databaseNotFound"><![CDATA[<p>De database kon niet gevonden worden! Gelieve na te kijken of de informatie in de "connection string" van het "web.config" bestand correct is.</p><p> Om door te gaan, gelieve het "web.config" bestand aan te passen (met behulp van Visual Studio of je favoriete tekstverwerker), scroll in het bestand naar beneden, voeg de connection string voor je database toe in de key met naam "umbracoDbDSN" en sla het bestand op.</p><p>Klik op de knop <strong>opnieuw proberen</strong> als je hiermee klaar bent. <br/> <a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">Meer informatie over het aanpassen van de web.config vind je hier.</a></p>]]></key>
+    <key alias="databaseNotFound"><![CDATA[<p>De database kon niet gevonden worden! Gelieve na te kijken of de informatie in de "connection string" van het "web.config" bestand correct is.</p><p> Om door te gaan, gelieve het "web.config" bestand aan te passen (met behulp van Visual Studio of je favoriete tekstverwerker), scroll in het bestand naar beneden, voeg de connection string voor je database toe in de key met naam "umbracoDbDSN" en sla het bestand op.</p><p>Klik op de knop <strong>opnieuw proberen</strong> als je hiermee klaar bent. <br/> <a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">Meer informatie over het aanpassen van de web.config vind je hier.</a></p>]]></key>
     <key alias="databaseText"><![CDATA[Om deze stap te voltooien moet je enkele gegevens weten over je database server ("connection string").<br/> Gelieve contact op te nemen met je ISP indien nodig. Wanneer je installeert op een lokale computer of server, dan heb je waarschijnlijk informatie nodig van je systeembeheerder.]]></key>
     <key alias="databaseUpgrade"><![CDATA[<p> Klik de <strong>upgrade</strong> knop om je database te upgraden naar Umbraco %0%</p> <p> Maak je geen zorgen - er zal geen inhoud worden gewist en alles blijft gewoon werken! </p>]]></key>
     <key alias="databaseUpgradeDone"><![CDATA[Je database is geupgrade naar de definitieve versie %0%.<br />Klik <strong>Volgende</strong> om verder te gaan.]]></key>
@@ -553,7 +881,7 @@
     <key alias="permissionsSettingUpPermissions">Machtigingen worden aangepast</key>
     <key alias="permissionsText">Umbraco heeft write/modify toegang nodig op bepaalde mappen om bestanden zoals plaatjes en PDF's op te slaan. Het slaat ook tijdelijke data (ook bekend als 'de cache') op om de snelheid van je website te verbeteren.</key>
     <key alias="runwayFromScratch">Ik wil met een lege website beginnen</key>
-    <key alias="runwayFromScratchText"><![CDATA[Je website is momenteel helemaal leeg. Dat is prima als je vanaf nul wilt beginnen en je eigen documenttypes en templates wilt maken (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">leer hoe</a>). Je kunt er later alsnog voor kiezen om Runway te installeren. Ga dan naar de Ontwikkelaar sectie en kies Packages.]]></key>
+    <key alias="runwayFromScratchText"><![CDATA[Je website is momenteel helemaal leeg. Dat is prima als je vanaf nul wilt beginnen en je eigen documenttypes en templates wilt maken (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">leer hoe</a>). Je kunt er later alsnog voor kiezen om Runway te installeren. Ga dan naar de Ontwikkelaar sectie en kies Packages.]]></key>
     <key alias="runwayHeader">Je hebt zojuist een blanco Umbraco platform geinstalleerd. Wat wil je nu doen?</key>
     <key alias="runwayInstalled">Runway is geinstalleerd</key>
     <key alias="runwayInstalledText"><![CDATA[Je hebt de basis geinstalleerd. Kies welke modules je er op wilt installeren.<br /> Dit is onze lijst van aanbevolen modules. Vink de modules die je wilt installeren, of bekijk de <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">volledige lijst modules</a>]]></key>
@@ -591,20 +919,22 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="renewSession">Vernieuw je sessie om je wijzigingen te behouden</key>
   </area>
   <area alias="login">
-    <key alias="greeting0">Goede zondag</key>
-    <key alias="greeting1">Fijne maandag</key>
+    <key alias="greeting0">Fijne super zondag</key>
+    <key alias="greeting1">Fijne manische maandag</key>
     <key alias="greeting2">Fijne dinsdag</key>
-    <key alias="greeting3">Fijne woensdag</key>
-    <key alias="greeting4">Fijne donderdag</key>
-    <key alias="greeting5">Fijne vrijdag</key>
+    <key alias="greeting3">Fijne geweldige woensdag</key>
+    <key alias="greeting4">Fijne donderende donderdag</key>
+    <key alias="greeting5">Fijne funky vrijdag</key>
     <key alias="greeting6">Fijne zaterdag</key>
     <key alias="instruction">log hieronder in</key>
     <key alias="signInWith">Inloggen met</key>
     <key alias="timeout">Sessie is verlopen</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p>]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank" rel="noopener">umbraco.com</a></p>]]></key>
     <key alias="forgottenPassword">Wachtwoord vergeten?</key>
-    <key alias="forgottenPasswordInstruction">Er zal een email worden gestuurd naar het emailadres van jouw account. Hierin staat een link om je wachtwoord te resetten</key>
-    <key alias="requestPasswordResetConfirmation">Een email met daarin de wachtwoord reset uitleg zal worden gestuurd als het emailadres in onze database voorkomt.</key>
+    <key alias="forgottenPasswordInstruction">Er zal een e-mail worden gestuurd naar het e-mailadres van jouw account. Hierin staat een link om je wachtwoord te resetten</key>
+    <key alias="requestPasswordResetConfirmation">Een e-mail met daarin de wachtwoord reset uitleg zal worden gestuurd als het e-mailadres in onze database voorkomt.</key>
+    <key alias="showPassword">Wachtwoord tonen</key>
+    <key alias="hidePassword">Wacthwoord verbergen</key>
     <key alias="returnToLogin">Terug naar loginformulier</key>
     <key alias="setPasswordInstruction">Geef alsjeblieft een nieuw wachtwoord op</key>
     <key alias="setPasswordConfirmation">Je wachtwoord is aangepast</key>
@@ -633,21 +963,23 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
   </area>
   <area alias="notifications">
     <key alias="editNotifications">Bewerk de notificatie voor %0%</key>
+    <key alias="notificationsSavedFor">Notificatie instellingen opgeslagen voor</key>
     <key alias="mailBody"><![CDATA[
-      Hallo %0%,
+    Hallo %0%,
 
-      Dit is een geautomatiseerd bericht om u te informeren dat de taak '%1%'
-      is uitgevoerd op pagina '%2%'
-      door gebruiker '%3%'.
+    Dit is een geautomatiseerd bericht om u te informeren dat de taak '%1%'
+    is uitgevoerd op pagina '%2%'
+    door gebruiker '%3%'.
 
-      Ga naar http://%4%/#/content/content/edit/%5% om dit te bewerken.
+    Ga naar http://%4%/#/content/content/edit/%5% om dit te bewerken.
 
-      Een prettige dag!
+    Een prettige dag!
 
-      Dit is een bericht van uw Content Management Systeem.
+    Dit is een bericht van uw Content Management Systeem.
 
-        ]]></key>
-    <key alias="mailBodyHtml"><![CDATA[<p>Hi %0%</p>
+    ]]></key>
+    <key alias="mailBodyVariantSummary">De volgende talen zijn gewijzigd %0%</key>
+      <key alias="mailBodyHtml"><![CDATA[<p>Hi %0%</p>
 
 		  <p>Dit is een geautomatiseerde mail om u op de hoogte te brengen dat de taak <strong>'%1%'</strong>
 		  is uitgevoerd op pagina <a href="http://%4%/actions/preview.aspx?id=%5%"><strong>'%2%'</strong></a>
@@ -675,11 +1007,65 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
 			  Dit is een bericht van uw Content Management Systeem.
 		  </p>
         ]]></key>
+    <key alias="mailBodyVariantHtmlSummary"><![CDATA[<p>De volgende talen zijn gewijzigd:</p>
+        %0%
+    ]]></key>
     <key alias="mailSubject">[%0%] Notificatie over %1% uitgevoerd op %2%</key>
     <key alias="notifications">Notificaties</key>
   </area>
   <area alias="packager">
+    <key alias="actions">Acties</key>
+    <key alias="created">Aangemaakt</key>
+    <key alias="createPackage">Package aanmaken</key>
     <key alias="chooseLocalPackageText">Kies een package op je computer door op "Bladeren" te klikken en de package te selecteren. Umbraco packages hebben meestal ".umb" of ".zip" als extensie.</key>
+    <key alias="deletewarning">Dit zal de package verwijderen</key>
+    <key alias="dropHere">Neerzetten om te uploaden</key>
+    <key alias="includeAllChildNodes">Inclusief alle onderliggende nodes</key>
+    <key alias="orClickHereToUpload">of klik hier om een package bestand te kiezen</key>
+    <key alias="uploadPackage">Package uploaden</key>
+    <key alias="localPackageDescription">Installeer een lokale package door het op je computer te selecteren. Installeer alleen packages van bronnen die je vertrouwt.</key>
+    <key alias="uploadAnother">Nog een package uploaden</key>
+    <key alias="cancelAndUploadAnother">Annuleren en een andere package uploaden</key>
+    <key alias="accept">Accepteren</key>
+    <key alias="termsOfUse">gebruiksvoorwaarden</key>
+    <key alias="pathToFile">Pad naar bestand</key>
+    <key alias="pathToFileDescription">Absoluut pad naar bestand (bv: /bin/umbraco.bin)</key>
+    <key alias="installed">Geïnstalleerd</key>
+    <key alias="installedPackages">Geïnstalleerde packages</key>
+    <key alias="installLocal">Lokaal installeren</key>
+    <key alias="installFinish">Voltooien</key>
+    <key alias="noConfigurationView">Deze package heeft geen instellingen</key>
+    <key alias="noPackagesCreated">Er zijn nog geen packages aangemaakt</key>
+    <key alias="noPackages">Er zijn geen packages geïnstalleerd</key>
+    <key alias="noPackagesDescription"><![CDATA[Je hebt geen packages geïnstalleerd. Installeer een lokale package door het op je computer te selecteren of blader door beschikbare packages met het pictogram <strong>'Packages'</strong> rechtsboven in je scherm.]]></key>
+    <key alias="packageActions">Package Acties</key>
+    <key alias="packageAuthorUrl">Auteur URL</key>
+    <key alias="packageContent">Package Inhoud</key>
+    <key alias="packageFiles">Package Bestanden</key>
+    <key alias="packageIconUrl">Icoon URL</key>
+    <key alias="packageInstall">Package installeren</key>
+    <key alias="packageLicense">Licentie</key>
+    <key alias="packageLicenseUrl">Licentie URL</key>
+    <key alias="packageProperties">Package Eigenschappen</key>
+    <key alias="packageSearch">Zoeken naar packages</key>
+    <key alias="packageSearchResults">Resultaten voor</key>
+    <key alias="packageNoResults">We konden niets vinden voor</key>
+    <key alias="packageNoResultsDescription">Probeer een ander pakket te zoeken of blader door de categorieën</key>
+    <key alias="packagesPopular">Populair</key>
+    <key alias="packagesNew">Nieuwe releases</key>
+    <key alias="packageHas">heeft</key>
+    <key alias="packageKarmaPoints">karma punten</key>
+    <key alias="packageInfo">Informatie</key>
+    <key alias="packageOwner">Eigenaar</key>
+    <key alias="packageContrib">Bijdragers</key>
+    <key alias="packageCreated">Aangemaakt</key>
+    <key alias="packageCurrentVersion">Huidige versie</key>
+    <key alias="packageNetVersion">.NET versie</key>
+    <key alias="packageDownloads">Downloads</key>
+    <key alias="packageLikes">Likes</key>
+    <key alias="packageCompatibility">Compatibiliteit</key>
+    <key alias="packageCompatibilityDescription">Deze package is compatibel met de volgende versies van Umbraco, zoals gerapporteerd door de communityleden. Volledige compatibiliteit kan niet worden gegarandeerd voor versies die voor minder dan 100% worden gerapporteerd</key>
+    <key alias="packageExternalSources">Externe bronnen</key>
     <key alias="packageAuthor">Auteur</key>
     <key alias="packageDocumentation">Documentatie</key>
     <key alias="packageMetaData">Package meta data</key>
@@ -700,15 +1086,17 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
       wees dus voorzichtig met verwijderen. Als je het niet zeker weet, neem dan contact op met de auteur van de package.
     ]]></key>
     <key alias="packageVersion">Package versie</key>
-    <key alias="packageAlreadyInstalled">Package reeds geinstalleerd</key>
+    <key alias="packageVersionUpgrade">Upgraden van versie</key>
+    <key alias="packageAlreadyInstalled">Package is reeds geinstalleerd</key>
     <key alias="targetVersionMismatch">Deze package kan niet worden geinstalleerd omdat minimaal Umbraco versie %0% benodigd is.</key>
-    <key alias="installStateUninstalling">Aan het deinstalleren...</key>
-    <key alias="installStateDownloading">Aan het downloaden...</key>
-    <key alias="installStateImporting">Aan het importeren...</key>
-    <key alias="installStateInstalling">Aan het installeren...</key>
-    <key alias="installStateRestarting">Aan het herstarten, een ongenblik geduld aub...</key>
-    <key alias="installStateComplete">Geinstalleerd! Je browser zal nu automatisch ververst worden...</key>
-    <key alias="installStateCompleted">Klik op "finish" om de installatie te voltooien en de pagina te verversen.</key>
+    <key alias="installStateUninstalling">Deïnstalleren...</key>
+    <key alias="installStateDownloading">Downloaden...</key>
+    <key alias="installStateImporting">Importeren...</key>
+    <key alias="installStateInstalling">Installeren...</key>
+    <key alias="installStateRestarting">Aan het herstarten, een ogenblik geduld aub...</key>
+    <key alias="installStateComplete">Geïnstalleerd! Je browser zal nu automatisch ververst worden...</key>
+    <key alias="installStateCompleted">Klik op "Voltooien" om de installatie te voltooien en de pagina te vernieuwen.</key>
+    <key alias="installStateUploading">Package uploaden...</key>
   </area>
   <area alias="paste">
     <key alias="doNothing">Plakken met alle opmaak (Niet aanbevolen)</key>
@@ -717,24 +1105,30 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="removeSpecialFormattering">Plakken, en verwijder de opmaak (aanbevolen)</key>
   </area>
   <area alias="publicAccess">
-    <key alias="paAdvanced">Geavanceerd: Beveilig door de Member Groups te selecteren die toegang hebben op de pagina</key>
-    <key alias="paAdvancedHelp"><![CDATA[Als je toegang tot pagina's wilt regelen met behulp van role-based authenticatie,<br /> gebruik makend van Umbraco's member groups.]]></key>
-    <key alias="paAdvancedNoGroups">Je moet eerst een membergroup maken voordat je kunt werken met role-based authentication.</key>
-    <key alias="paErrorPage">Error Pagina</key>
+    <key alias="paGroups">Groepsgebaseerde beveiliging</key>
+    <key alias="paGroupsHelp">Als je toegang wilt verlenen aan alle leden van specifieke ledengroepen</key>
+    <key alias="paGroupsNoGroups">Je moet een ledengroep maken voordat je op groep gebaseerde authenticatie kunt gebruiken</key>
+    <key alias="paErrorPage">Foutpagina</key>
     <key alias="paErrorPageHelp">Gebruikt om te tonen als een gebruiker is ingelogd, maar geen rechten heeft om de pagina te bekijken</key>
-    <key alias="paHowWould">Hoe wil je de pagina beveiligen?</key>
-    <key alias="paIsProtected">%0% is nu beveiligd</key>
-    <key alias="paIsRemoved">Beveiliging verwijderd van %0%</key>
+    <key alias="paHowWould"><![CDATA[Hoe wil je de pagina <strong>%0%</strong> beveiligen?]]></key>
+    <key alias="paIsProtected"><![CDATA[<strong>%0%</strong> is nu beveiligd]]></key>
+    <key alias="paIsRemoved"><![CDATA[Beveiliging verwijderd van <strong>%0%</strong>]]></key>
     <key alias="paLoginPage">Login Pagina</key>
     <key alias="paLoginPageHelp">Kies de pagina met het login-formulier</key>
-    <key alias="paRemoveProtection">Verwijder beveiliging</key>
+    <key alias="paRemoveProtection">Beveiliging verwijderen</key>
+    <key alias="paRemoveProtectionConfirm"><![CDATA[Weet je zeker dat je de bescherming van de pagina <strong>%0%</strong> wilt verwijderen?]]></key>
     <key alias="paSelectPages">Kies de pagina's die het login-formulier en de error-berichten bevatten</key>
-    <key alias="paSelectRoles">Kies de roles die toegang hebben tot deze pagina</key>
-    <key alias="paSetLogin">Geef de gebruikersnaam en wachtwoord voor deze pagina</key>
-    <key alias="paSimple">Eenvoudig: Beveilig door middel van gebruikersnaam en wachtwoord</key>
-    <key alias="paSimpleHelp">Als je eenvoudige beveiliging wilt gebruiken met behulp van een enkele gebruikersnaam en wachtwoord</key>
+      <key alias="paSelectGroups"><![CDATA[Selecteer de groepen die toegang hebben tot de pagina <strong>%0%</strong>]]></key>
+      <key alias="paSelectMembers"><![CDATA[Selecteer de leden die toegang hebben tot de pagina <strong>%0%</strong>]]></key>
+    <key alias="paMembers">Specifieke bescherming voor leden</key>
+    <key alias="paMembersHelp">Als je toegang wilt verlenen aan bepaalde leden</key>
   </area>
   <area alias="publish">
+    <key alias="invalidPublishBranchPermissions">Onvoldoende gebruikersmachtigingen om alle onderliggende documenten te publiceren</key>
+    <key alias="contentPublishedFailedIsTrashed"><![CDATA[
+      %0% kon niet gepubliceerd worden omdat het item zich in de prullenbak bevindt.
+    ]]>
+    </key>
     <key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
       %0% kan niet worden gepubliceerd omdat het item is gepland voor release.
     ]]></key>
@@ -742,15 +1136,16 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
       %0% kon niet gepubliceerd worden omdat het item niet meer geldig is.
     ]]></key>
     <key alias="contentPublishedFailedInvalid"><![CDATA[
-      %0% kan niet worden gepubliceerd, omdat de eigenschappen:%1% de validatieregels niet hebben doorstaan.
+      %0% kan niet worden gepubliceerd omdat de eigenschappen: %1% de validatieregels niet hebben doorstaan.
     ]]></key>
     <key alias="contentPublishedFailedByEvent"><![CDATA[
-      %0% kon niet worden gepubliceerd doordat een 3rd party extensie het heeft geannuleerd.
-        ]]></key>
-    <key alias="contentPublishedFailedByParent"><![CDATA[
-      %0% kon niet gepubliceerd worden, omdat de parent pagina niet gepubliceerd is.
+      %0% kon niet worden gepubliceerd omdat een invoegtoepassing van een derde partij de actie heeft geannuleerd.
     ]]></key>
-    <key alias="includeUnpublished">Inclusief ongepubliceerde subitems</key>
+    <key alias="contentPublishedFailedByParent"><![CDATA[
+      %0% kon niet gepubliceerd worden omdat de bovenliggende pagina niet gepubliceerd is.
+    ]]></key>
+    <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% kan niet worden gepubliceerd omdat de naam ontbreekt.]]></key>
+    <key alias="contentPublishedFailedReqCultureValidationError">Validatie mislukt voor de vereiste taal '%0%'. Deze taal werd opgeslagen maar is niet gepubliceerd.</key>
     <key alias="inProgress">Publicatie in uitvoering - even geduld...</key>
     <key alias="inProgressCounter">%0% van %1% pagina’s zijn gepubliceerd...</key>
     <key alias="nodePublish">%0% is gepubliceerd</key>
@@ -758,11 +1153,22 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="publishAll">Publiceer %0% en alle subitems</key>
     <key alias="publishHelp"><![CDATA[Klik <em>ok</em> om <strong>%0%</strong> te publiceren en de wijzigingen zichtbaar te maken voor bezoekers.<br/><br />
       Je kunt deze pagina publiceren en alle onderliggende sub-pagina's door <em>publiceer alle subitems</em> aan te vinken hieronder.
-      ]]></key>
+    ]]></key>
   </area>
   <area alias="colorpicker">
     <key alias="noColors">Je hebt geen goedgekeurde kleuren geconfigureerd</key>
   </area>
+  <area alias="contentPicker">
+    <key alias="allowedItemTypes">Je kan alleen items van de volgende type(s) selecteren: %0%</key>
+    <key alias="pickedTrashedItem">Je hebt een content-item geselecteerd dat op dit ogenblik verwijderd of in the prullenbak is</key>
+    <key alias="pickedTrashedItems">Je hebt content-items geselecteerd die op dit ogenblik verwijderd of in the prullenbak zijn</key>
+  </area>
+  <area alias="mediaPicker">
+    <key alias="deletedItem">Verwijderd item</key>
+    <key alias="pickedTrashedItem">Je hebt een media-item geselecteerd dat op dit ogenblik verwijderd of in the prullenbak is</key>
+    <key alias="pickedTrashedItems">Je hebt media-items geselecteerd die op dit ogenblik verwijderd of in the prullenbak zijn</key>
+    <key alias="trashed">Weggegooid</key>
+  </area>
   <area alias="relatedlinks">
     <key alias="enterExternal">Externe link toevoegen</key>
     <key alias="chooseInternal">Interne link toevoegen</key>
@@ -773,9 +1179,17 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="externalLinkPlaceholder">Voer de link in</key>
   </area>
   <area alias="imagecropper">
-    <key alias="reset">Reset</key>
+    <key alias="reset">Uitsnede resetten</key>
+    <key alias="saveCrop">Uitsnede opslaan</key>
+    <key alias="addCrop">Nieuwe uitsnede toevoegen</key>
+    <key alias="updateEditCrop">Klaar</key>
+    <key alias="undoEditCrop">Aanpassingen ongedaan maken</key>
+    <key alias="customCrop">Gebruiker gedefinieerd</key>
   </area>
   <area alias="rollback">
+    <key alias="changes">Wijzigingen</key>
+    <key alias="created">Aangemaakt</key>
+    <key alias="headline">Selecteer een versie om te vergelijken met de huidige versie</key>
     <key alias="currentVersion">Huidige versie</key>
     <key alias="diffHelp"><![CDATA[Hier worden de verschillen getoond tussen de huidige en de geselecteerde versie<br /><del>Rode</del> tekst wordt niet getoond in de geselecteerde versie, <ins>groen betekent toegevoegd</ins>]]></key>
     <key alias="documentRolledBack">Document is teruggezet</key>
@@ -788,23 +1202,20 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="editscript">Bewerk script-bestand</key>
   </area>
   <area alias="sections">
-    <key alias="concierge">Concierge</key>
     <key alias="content">Inhoud</key>
-    <key alias="courier">Courier</key>
-    <key alias="developer">Ontwikkelaar</key>
-    <key alias="installer">Umbraco configuratiewizard</key>
+    <key alias="forms">Formulieren</key>
     <key alias="media">Media</key>
     <key alias="member">Leden</key>
-    <key alias="newsletters">Nieuwsbrieven</key>
+    <key alias="packages">Packages</key>
     <key alias="settings">Instellingen</key>
-    <key alias="statistics">Statistieken</key>
     <key alias="translation">Vertaling</key>
     <key alias="users">Gebruikers</key>
-    <key alias="help" version="7.0">Help</key>
-    <key alias="forms">Formulieren</key>
   </area>
   <area alias="help">
+    <key alias="tours">Rondleidingen</key>
     <key alias="theBestUmbracoVideoTutorials">De beste Umbraco video tutorials</key>
+    <key alias="umbracoForum">Bezoek our.umbraco.com</key>
+    <key alias="umbracoTv">Bezoek umbraco.tv</key>
   </area>
   <area alias="settings">
     <key alias="defaulttemplate">Standaard template</key>
@@ -821,26 +1232,29 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="contentTypeUses">Dit inhoudstype gebruikt</key>
     <key alias="asAContentMasterType">als basis inhoudstype. Tabs van basis inhoudstypes worden niet getoond en kunnen alleen worden aangepast op het basis inhoudstype zelf</key>
     <key alias="noPropertiesDefinedOnTab">Geen eigenschappen gedefinieerd op dit tabblad. Klik op de link "voeg een nieuwe eigenschap" aan de bovenkant om een ​​nieuwe eigenschap te creëren.</key>
-    <key alias="addIcon">Icon toevoegen</key>
+    <key alias="createMatchingTemplate">Maak een bijpassende sjabloon</key>
+    <key alias="addIcon">Icoon toevoegen</key>
   </area>
   <area alias="sort">
-    <key alias="sortOrder">Sort order</key>
-    <key alias="sortCreationDate">Creation date</key>
+    <key alias="sortOrder">Sorteer volgorde</key>
+    <key alias="sortCreationDate">Aanmaakdatum</key>
     <key alias="sortDone">Sorteren gereed.</key>
-    <key alias="sortHelp">Sleep de pagina's omhoog of omlaag om de volgorde te veranderen. Of klik op de kolom-header om alle pagina's daarop te sorteren.</key>
+    <key alias="sortHelp">Sleep de pagina's omhoog of omlaag om de volgorde te veranderen. Of klik op de kolomkop om alle pagina's daarop te sorteren.</key>
     <key alias="sortPleaseWait"><![CDATA[Een ogenblik geduld. Paginas worden gesorteerd, dit kan even duren.]]></key>
+    <key alias="sortEmptyState">Dit item heeft geen subitems om te sorteren</key>
   </area>
   <area alias="speechBubbles">
     <key alias="validationFailedHeader">Validatie</key>
     <key alias="validationFailedMessage">Validatiefouten moeten worden opgelost voor dit item kan worden opgeslagen</key>
     <key alias="operationFailedHeader">Mislukt</key>
-    <key alias="invalidUserPermissionsText">Wegens onvoldoende rechten kon deze handeling kon niet worden uitegevoerd </key>
+    <key alias="operationSavedHeader">Opgeslagen</key>
+    <key alias="operationSavedHeaderReloadUser">Opgeslagen. Gelieve uw browser te herladen om de aanpassingen te zien</key>
+    <key alias="invalidUserPermissionsText">Wegens onvoldoende rechten kon deze handeling kon niet worden uitgevoerd </key>
     <key alias="operationCancelledHeader">Geannuleerd</key>
-    <key alias="operationCancelledText">Uitvoering is g eannuleerd door de plugin van een 3e partij</key>
-    <key alias="contentPublishedFailedByEvent">Publicatie werd geannuleerd door een plugin van een 3e partij</key>
+    <key alias="operationCancelledText">Uitvoering is geannuleerd door de plugin van een 3e partij</key>
     <key alias="contentTypeDublicatePropertyType">Eigenschappentype bestaat al</key>
     <key alias="contentTypePropertyTypeCreated">Eigenschappentype aangemaakt</key>
-    <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Naam: %0% <br /> Data type: %1%]]></key>
+    <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Naam: %0% <br /> Datatype: %1%]]></key>
     <key alias="contentTypePropertyTypeDeleted">Eigenschappentype verwijderd</key>
     <key alias="contentTypeSavedHeader">Inhoudstype opgeslagen</key>
     <key alias="contentTypeTabCreated">Tab aangemaakt</key>
@@ -851,45 +1265,58 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="cssSavedText">Stylesheet opgeslagen zonder fouten</key>
     <key alias="dataTypeSaved">Datatype opgeslagen</key>
     <key alias="dictionaryItemSaved">Woordenboek item opgeslagen</key>
-    <key alias="editContentPublishedFailedByParent">Publicatie is mislukt omdat de bovenliggende pagina niet gepubliceerd is</key>
     <key alias="editContentPublishedHeader">Inhoud gepubliceerd</key>
     <key alias="editContentPublishedText">en zichtbaar op de website</key>
+    <key alias="editMultiContentPublishedText">%0% documenten gepubliceerd en zichtbaar op de website</key>
+    <key alias="editVariantPublishedText">%0% gepubliceerd en zichtbaar op de website</key>
+    <key alias="editMultiVariantPublishedText">%0% documenten gepubliceerd voor de talen languages %1% en zichtbaar op de website</key>
     <key alias="editContentSavedHeader">Inhoud opgeslagen</key>
     <key alias="editContentSavedText">Vergeet niet te publiceren om de wijzigingen zichtbaar te maken</key>
+    <key alias="editContentScheduledSavedText">Een planning voor publicatie is bijgewerkt</key>
+    <key alias="editVariantSavedText">%0% bewaard</key>
     <key alias="editContentSendToPublish">Verzend voor goedkeuring</key>
-    <key alias="editContentSendToPublishText">Verandering zijn verstuurd voor goedkeuring</key>
+    <key alias="editContentSendToPublishText">Aanpassingen zijn verstuurd voor goedkeuring</key>
+    <key alias="editVariantSendToPublishText">%0% aanpassingen zijn verstuurd voor goedkeuring</key>
     <key alias="editMediaSaved">Media opgeslagen</key>
     <key alias="editMediaSavedText">Media opgeslagen zonder fouten</key>
     <key alias="editMemberSaved">Lid opgeslagen</key>
+    <key alias="editMemberGroupSaved">Ledengroep opgeslagen</key>
     <key alias="editStylesheetPropertySaved">Stijlsheet eigenschap opgeslagen</key>
     <key alias="editStylesheetSaved">Stijlsheet opgeslagen</key>
     <key alias="editTemplateSaved">Template opgeslagen</key>
     <key alias="editUserError">Fout bij opslaan gebruiker (zie logboek)</key>
     <key alias="editUserSaved">Gebruiker opgeslagen</key>
     <key alias="editUserTypeSaved">Gebruikerstype opgeslagen</key>
+    <key alias="editUserGroupSaved">Gebruikersgroep opgeslagen</key>
+    <key alias="editCulturesAndHostnamesSaved">Cultuur en hostnaam opgeslagen</key>
+    <key alias="editCulturesAndHostnamesError">Fout bij opslaan culturen en hostnamen</key>
     <key alias="fileErrorHeader">Bestand niet opgeslagen</key>
     <key alias="fileErrorText">bestand kon niet worden opgeslagen. Controleer de bestandsbeveiliging</key>
     <key alias="fileSavedHeader">Bestand opgeslagen</key>
     <key alias="fileSavedText">Bestand opgeslagen zonder fouten</key>
     <key alias="languageSaved">Taal opgeslagen</key>
-    <key alias="mediaTypeSavedHeader">Media Type opgeslagen</key>
-    <key alias="memberTypeSavedHeader">Member Type opgeslagen</key>
-    <key alias="templateErrorHeader">Template niet opgeslagen</key>
-    <key alias="templateErrorText">Controleer dat je geen 2 tamplates met dezelfde naam hebt</key>
-    <key alias="templateSavedHeader">Template opgeslagen</key>
-    <key alias="templateSavedText">Template opgeslagen zonder fouten!</key>
+    <key alias="mediaTypeSavedHeader">Mediatype opgeslagen</key>
+    <key alias="memberTypeSavedHeader">Ledentype opgeslagen</key>
+    <key alias="memberGroupSavedHeader">Ledengroep opgeslagen</key>
+    <key alias="templateErrorHeader">Sjabloon niet opgeslagen</key>
+    <key alias="templateErrorText">Controleer dat je geen 2 sjablonen met dezelfde naam hebt</key>
+    <key alias="templateSavedHeader">Sjabloon opgeslagen</key>
+    <key alias="templateSavedText">Sjabloon opgeslagen zonder fouten!</key>
     <key alias="contentUnpublished">Inhoud gedepubliceerd</key>
+    <key alias="contentCultureUnpublished">Inhoud variatie %0% gedepubliceerd</key>
+    <key alias="contentMandatoryCultureUnpublished">De verplichte taal '%0%' is gedepubliceerd. Alle talen voor deze inhoud zijn nu gedepubliceerd.</key>
     <key alias="partialViewSavedHeader">Partial view opgeslagen</key>
     <key alias="partialViewSavedText">Partial view opgeslagen zonder fouten!</key>
     <key alias="partialViewErrorHeader">Partial view niet opgeslagen</key>
     <key alias="partialViewErrorText">Er is een fout opgetreden bij het opslaan van het bestand.</key>
+    <key alias="permissionsSavedFor">Rechten opgeslagen voor</key>
     <key alias="deleteUserGroupsSuccess">%0% gebruikersgroepen verwijderd</key>
     <key alias="deleteUserGroupSuccess">%0% is verwijderd</key>
     <key alias="enableUsersSuccess">%0% gebruikers geactiveerd</key>
-    <key alias="disableUsersSuccess">%0% users gedeactiveerd</key>
+    <key alias="disableUsersSuccess">%0% gebruikers gedeactiveerd</key>
     <key alias="enableUserSuccess">%0% is nu geactiveerd</key>
     <key alias="disableUserSuccess">%0% is nu gedeactiveerd</key>
-    <key alias="setUserGroupOnUsersSuccess">Gebruikers groepen zijn ingesteld</key>
+    <key alias="setUserGroupOnUsersSuccess">Gebruikersgroepen zijn ingesteld</key>
     <key alias="unlockUsersSuccess">%0% gebruikers gedeblokkeerd</key>
     <key alias="unlockUserSuccess">%0% is nu gedeblokkeerd</key>
     <key alias="memberExportedSuccess">Lid is geexporteerd naar een bestand</key>
@@ -897,33 +1324,127 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="deleteUserSuccess">Gebruiker %0% is verwijderd</key>
     <key alias="resendInviteHeader">Gebruiker uitnodigen</key>
     <key alias="resendInviteSuccess">Uitnodiging is opnieuw gestuurd naar gebruiker %0%</key>
+    <key alias="contentReqCulturePublishError">Kan het document niet publiceren omdat de vereiste '%0%' niet is gepubliceerd</key>
+    <key alias="contentCultureValidationError">Validatie is mislukt voor de taal '%0%'</key>
+    <key alias="documentTypeExportedSuccess">Documenttype is geëxporteerd naar een bestand</key>
+    <key alias="documentTypeExportedError">Er is een fout gebeurd tijdens het exporteren van het documenttype</key>
+    <key alias="scheduleErrReleaseDate1">De publicatiedatum kan niet in het verleden liggen</key>
+    <key alias="scheduleErrReleaseDate2">Kan het document niet plannen voor publicatie omdat de vereiste '%0%' niet is gepubliceerd</key>
+    <key alias="scheduleErrReleaseDate3">Kan het document niet plannen voor publicatie omdat de vereiste '%0%' een publicatiedatum heeft die later is dan een niet-verplichte taal</key>
+    <key alias="scheduleErrExpireDate1">De vervaldatum kan niet in het verleden liggen</key>
+    <key alias="scheduleErrExpireDate2">De vervaldatum kan niet voor de publicatiedatum liggen</key>
   </area>
   <area alias="stylesheet">
-    <key alias="aliasHelp">Gebruik CSS syntax bijv: h1, .redHeader, .blueTex</key>
-    <key alias="editstylesheet">Stijlsheet aanpassen</key>
-    <key alias="editstylesheetproperty">Bewerk stylesheet eigenschap</key>
+    <key alias="addRule">Stijl toevoegen</key>
+    <key alias="editRule">Stijl bewerken</key>
+    <key alias="editorRules">Rich text editor stijlen</key>
+    <key alias="editorRulesHelp">Definieer de stijlen die beschikbaar moeten zijn in de rich text editor voor deze stylesheet</key>
+    <key alias="editstylesheet">Stylesheet bewerken</key>
+    <key alias="editstylesheetproperty">Stylesheet eigenschap bewerken</key>
     <key alias="nameHelp">Naam waarmee de stijl in de editor te kiezen is</key>
     <key alias="preview">Voorbeeld</key>
+    <key alias="previewHelp">Hoe de tekst er zal uitzien in de rich text editor.</key>
+    <key alias="selector">Selector</key>
+    <key alias="selectorHelp">Gebruik CSS syntax, bv. "h1" or ".redHeader"</key>
     <key alias="styles">Stijlen</key>
+    <key alias="stylesHelp">De CSS die moet toegepast worden in de rich text editor, bv. "color:red;"</key>
+    <key alias="tabCode">Code</key>
+    <key alias="tabRules">Rich Text Editor</key>
   </area>
   <area alias="template">
-    <key alias="edittemplate">Template aanpassen</key>
-    <key alias="insertContentArea">Invoegen inhoudsgebied</key>
-    <key alias="insertContentAreaPlaceHolder">Invoegen inhoudsgebied placeholder</key>
-    <key alias="insertDictionaryItem">Invoegen dictionary item</key>
-    <key alias="insertMacro">Invoegen Macro</key>
-    <key alias="insertPageField">Invoegen Umbraco page field</key>
-    <key alias="mastertemplate">Basistemplate</key>
-    <key alias="quickGuide">Quick Guide voor Umbraco template tags</key>
-    <key alias="template">Template</key>
+    <key alias="deleteByIdFailed">Kan sjabloon met ID %0% niet verwijderen</key>
+    <key alias="edittemplate">Sjabloon aanpassen</key>
+    <key alias="insertSections">Secties</key>
+    <key alias="insertContentArea">Inhoudsgebied invoegen</key>
+    <key alias="insertContentAreaPlaceHolder">Een tijdelijke aanduiding voor het inhoudsgebied invoegen</key>
+    <key alias="insert">Invoegen</key>
+    <key alias="insertDesc">Kies wat je wil invoegen in het sjabloon</key>
+    <key alias="insertDictionaryItem">Woordenboek item invoegen</key>
+    <key alias="insertDictionaryItemDesc">Een woordenboekitem is een tijdelijke aanduiding voor een vertaalbaar stuk tekst, waardoor het gemakkelijk is om ontwerpen voor meertalige websites te maken.</key>
+    <key alias="insertMacro">Macro invoegen</key>
+    <key alias="insertMacroDesc">
+        Een Macro is een configureerbaar component die gebruikt kan worden voor
+        herbruikbare delen van je ontwerp, waar je de optie nodig hebt om parameters op te geven,
+        zoals bij gallerijen, formulieren en lijsten.
+    </key>
+    <key alias="insertPageField">Umbraco pagina veld invoegen</key>
+    <key alias="insertPageFieldDesc">Toont de waarde van een benoemd veld van de huidige pagina, met opties om de waarde te wijzigen of terug te vallen op alternatieve waarden.</key>
+    <key alias="insertPartialView">Partial view</key>
+    <key alias="insertPartialViewDesc">
+        Een partial view is een apart sjabloon dat kan gerendered worden in een ander sjabloon,
+        het is geschikt voor het hergebruiken van HTML of voor het scheiden van complexe sjablonen in afzonderlijke bestanden.
+    </key>
+    <key alias="mastertemplate">Hoofdsjabloon</key>
+    <key alias="noMaster">Geen hoofdsjabloon</key>
+    <key alias="renderBody">Render onderliggend sjabloon</key>
+    <key alias="renderBodyDesc">
+    <![CDATA[
+        Rendert de inhoud van een onderliggend sjabloon, door
+        <code>@RenderBody()</code> in te voegen.
+    ]]>
+    </key>
+    <key alias="defineSection">Definieer een benoemde sectie</key>
+    <key alias="defineSectionDesc">
+    <![CDATA[
+        Definieert een deel van uw sjabloon als een benoemde sectie door deze in
+        <code>@section { ... }</code> te omwikkelen. Dit kan worden weergegeven
+        in een specifiek gebied van de bovenliggende sjabloon door <code>@RenderSection</code> te gebruiken.
+    ]]>
+    </key>
+    <key alias="renderSection">Render een benoemde sectie</key>
+    <key alias="renderSectionDesc">
+    <![CDATA[
+      Rendert een benoemd gebied van een onderliggend sjabloon, door een tijdelijke aanduiding <code>@RenderSection(name)</code> in te voegen.
+      This renders an area of a child template which is wrapped in a corresponding <code>@section [name]{ ... }</code> definition.
+      ]]>
+    </key>
+    <key alias="sectionName">Sectienaam</key>
+    <key alias="sectionMandatory">Sectie is verplicht</key>
+    <key alias="sectionMandatoryDesc">
+    <![CDATA[
+        Indien verplicht, moet het onderliggend sjabloon <code>@section</code> definiëren, anders wordt een fout getoond.
+    ]]>
+    </key>
+    <key alias="queryBuilder">Querybouwer</key>
+    <key alias="itemsReturned">items gevonden, in</key>
+    <key alias="copyToClipboard">kopiëren naar klembord</key>
+    <key alias="iWant">Ik wil</key>
+    <key alias="allContent">alle inhoud</key>
+    <key alias="contentOfType">inhoud van het type "%0%"</key>
+    <key alias="from">van</key>
+    <key alias="websiteRoot">mijn website</key>
+    <key alias="where">waar</key>
+    <key alias="and">en</key>
+    <key alias="is">is</key>
+    <key alias="isNot">is niet</key>
+    <key alias="before">voor</key>
+    <key alias="beforeIncDate">voor (inclusief geselecteerde datum)</key>
+    <key alias="after">na</key>
+    <key alias="afterIncDate">na (inclusief geselecteerde datum)</key>
+    <key alias="equals">is gelijk aan</key>
+    <key alias="doesNotEqual">is niet gelijk aan</key>
+    <key alias="contains">bevat</key>
+    <key alias="doesNotContain">bevat niet</key>
+    <key alias="greaterThan">groter dan</key>
+    <key alias="greaterThanEqual">groter dan of gelijk aan</key>
+    <key alias="lessThan">kleiner dan</key>
+    <key alias="lessThanEqual">kleiner of gelijk aan</key>
+    <key alias="id">Id</key>
+    <key alias="name">Naam</key>
+    <key alias="createdDate">Datum aangemaakt</key>
+    <key alias="lastUpdatedDate">Datum gewijzigd</key>
+    <key alias="orderBy">sorteren op</key>
+    <key alias="ascending">oplopend</key>
+    <key alias="descending">aflopend</key>
+    <key alias="template">Sjabloon</key>
   </area>
   <area alias="grid">
-    <key alias="media">Image</key>
+    <key alias="media">Afbeelding</key>
     <key alias="macro">Macro</key>
     <key alias="insertControl">Item toevoegen</key>
     <key alias="chooseLayout">Kies de indeling</key>
     <key alias="addRows">Kies een indeling voor deze pagina om content toe te kunnen voegen</key>
-    <key alias="addElement"><![CDATA[<i class="icon icon-add blue"></i> Plaats een (extra) content blok]]></key>
+    <key alias="addElement">Plaats een (extra) content blok</key>
     <key alias="dropElement">Drop content</key>
     <key alias="settingsApplied">Instellingen toegepast</key>
     <key alias="contentNotAllowed">Deze content is hier niet toegestaan</key>
@@ -931,15 +1452,18 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="clickToEmbed">Klik om een item te embedden</key>
     <key alias="clickToInsertImage">Klik om een afbeelding in te voegen</key>
     <key alias="placeholderImageCaption">Afbeelding ondertitel...</key>
-    <key alias="placeholderWriteHere">Typ hier......</key>
+    <key alias="placeholderWriteHere">Typ hier...</key>
     <key alias="gridLayouts">Grid lay-outs</key>
     <key alias="gridLayoutsDetail">Lay-outs zijn het globale werkgebied voor de grid editor. Je hebt meestal maar één of twee verschillende lay-outs nodig</key>
-    <key alias="addGridLayout">Een grid layout toevoegen</key>
+    <key alias="addGridLayout">Een grid lay-out toevoegen</key>
+    <key alias="editGridLayout">Grid lay-out aanpassen</key>
     <key alias="addGridLayoutDetail">De lay-out aanpassen door de kolombreedte aan te passen en extra kolommen toe te voegen</key>
     <key alias="rowConfigurations">Rijconfiguratie</key>
     <key alias="rowConfigurationsDetail">Rijen zijn voorgedefinieerde cellen die horizontaal zijn gerangschikt</key>
     <key alias="addRowConfiguration">Een rijconfiguratie toevoegen</key>
+    <key alias="editRowConfiguration">Rijconfiguratie aanpassen</key>
     <key alias="addRowConfigurationDetail">De rijconfiguratie aanpassen door de breedte van de cel in te stellen en extra cellen toe te voegen</key>
+    <key alias="noConfiguration">Geen verdere instellingen beschikbaar</key>
     <key alias="columns">Kolommen</key>
     <key alias="columnsDetails">Het totaal aantal gecombineerde kolommen in de grid layout</key>
     <key alias="settings">Instellingen</key>
@@ -954,29 +1478,38 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="chooseExtra">Kies extra</key>
     <key alias="chooseDefault">Kies standaard</key>
     <key alias="areAdded">zijn toegevoegd</key>
+    <key alias="warning">Waarschuwing</key>
+    <key alias="youAreDeleting">Je gaat de rijconfiguratie verwijderen</key>
+    <key alias="deletingARow">
+        Een rijconfiguratienaam verwijderen zal er voor zorgen dat bestaande inhoud verloren gaat die gebaseerd is op deze configuratie.
+    </key>
   </area>
   <area alias="contentTypeEditor">
     <key alias="compositions">Composities</key>
+    <key alias="group">Groep</key>
     <key alias="noGroups">Er zijn nog geen groepen toegevoegd</key>
-    <key alias="addGroup">Voeg groep toe</key>
+    <key alias="addGroup">Groep toevoegen</key>
     <key alias="inheritedFrom">Inherited van</key>
-    <key alias="addProperty">Voeg property toe</key>
+    <key alias="addProperty">Eigenschap toevoegen</key>
     <key alias="requiredLabel">Verplicht label</key>
-    <key alias="enableListViewHeading">Zet list view aan</key>
-    <key alias="enableListViewDescription">Laat de child nodes van het content item zien als een sorteer- en doorzoekbare lijstweergave zien. Deze child nodes worden dan niet in de boomstructuur getoond.</key>
-    <key alias="allowedTemplatesHeading">Toegestane Templates</key>
-    <key alias="allowedTemplatesDescription">Kies welke templates toegestaan zijn om door de editors op dit content-type gebruikt te worden</key>
-    <key alias="allowAsRootHeading">Sta toe op root-niveau</key>
-    <key alias="allowAsRootDescription">Sta editors toe om content van dit type aan te maken op root-niveau</key>
-    <key alias="childNodesHeading">Toegestane child node types</key>
-    <key alias="childNodesDescription">Sta content van een bepaald type toe om onder dit type aangemaakt te kunnen worden</key>
-    <key alias="chooseChildNode">Kies child node</key>
+    <key alias="enableListViewHeading">Lijstweergave inschakelen</key>
+    <key alias="enableListViewDescription">Laat de onderliggende nodes van het content item zien als een sorteer- en doorzoekbare lijstweergave. Deze onderliggende nodes worden dan niet in de boomstructuur getoond.</key>
+    <key alias="allowedTemplatesHeading">Toegestane Sjablonen</key>
+    <key alias="allowedTemplatesDescription">Kies welke sjablonen toegestaan zijn om door de editors op dit contenttype gebruikt te worden</key>
+    <key alias="allowAsRootHeading">Sta toe op hoofdniveau</key>
+    <key alias="allowAsRootDescription">Sta editors toe om inhoud van dit type aan te maken op hoofdniveau</key>
+    <key alias="childNodesHeading">Toegestane onderliggende node types</key>
+    <key alias="childNodesDescription">Sta inhoud van een bepaald type toe om onder dit type aangemaakt te kunnen worden</key>
+    <key alias="chooseChildNode">Kies onderliggende node</key>
     <key alias="compositionsDescription">Overgeërfde tabs en properties van een bestaand documenttype. Nieuwe tabs worden toegevoegd aan het huidige documenttype of samengevoegd als een tab met dezelfde naam al bestaat.</key>
     <key alias="compositionInUse">Dit contenttype wordt gebruikt in een compositie en kan daarom niet zelf een compositie worden.</key>
     <key alias="noAvailableCompositions">Er zijn geen contenttypen beschikbaar om als compositie te gebruiken.</key>
+    <key alias="compositionRemoveWarning">Een compositie verwijderen zal alle bijbehorende eigenschapsdata ook verwijderen. Zodra je het documenttype hebt opgeslagen is er geen weg meer terug.</key>
     <key alias="availableEditors">Beschikbare editors</key>
     <key alias="reuse">Herbruik</key>
     <key alias="editorSettings">Editor instellingen</key>
+    <key alias="searchResultSettings">Beschikbare configuraties</key>
+    <key alias="searchResultEditors">Nieuwe configuration aanmaken</key>
     <key alias="configuration">Configuratie</key>
     <key alias="yesDelete">Ja, verwijder</key>
     <key alias="movedUnderneath">is naar onder geplaatst</key>
@@ -988,8 +1521,8 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="allDocuments">Alle documenten</key>
     <key alias="allMediaItems">Alle media items</key>
     <key alias="usingThisDocument">die gebruik maken van dit documenttype zullen permanent verwijderd worden. Bevestig aub dat je deze ook wilt verwijderen.</key>
-    <key alias="usingThisMedia">die gebruik maken van dit media type zullen permanent verwijderd worden. Bevestig aub dat je deze ook wilt verwijderen.</key>
-    <key alias="usingThisMember">die gebruik maken van dit member type zullen permanent verwijderd worden. Bevestig aub dat je deze ook wilt verwijderen.</key>
+    <key alias="usingThisMedia">die gebruik maken van dit mediatype zullen permanent verwijderd worden. Bevestig aub dat je deze ook wilt verwijderen.</key>
+    <key alias="usingThisMember">die gebruik maken van dit lidtype zullen permanent verwijderd worden. Bevestig aub dat je deze ook wilt verwijderen.</key>
     <key alias="andAllDocuments">en alle documenten van dit type</key>
     <key alias="andAllMediaItems">en alle media items van dit type</key>
     <key alias="andAllMembers">en alle leden van dit type</key>
@@ -1000,6 +1533,45 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="showOnMemberProfile">Toon in het profiel van leden</key>
     <key alias="showOnMemberProfileDescription">Toelaten dat deze eigenschap wordt getoond op de profiel pagina van het lid.</key>
     <key alias="tabHasNoSortOrder">tab heeft geen sorteervolgorde</key>
+    <key alias="compositionUsageHeading">Waar wordt deze compositie gebruikt?</key>
+    <key alias="compositionUsageSpecification">Deze samenstelling wordt momenteel gebruikt bij de samenstelling van de volgende inhoudstypen:</key>
+    <key alias="variantsHeading">Variaties toestaan</key>
+    <key alias="cultureVariantHeading">Variëren per cultuur toestaan</key>
+    <key alias="segmentVariantHeading">Segmentatie toestaan</key>
+    <key alias="cultureVariantLabel">Varieer per cultuur</key>
+    <key alias="segmentVariantLabel">Varieer per segment</key>
+    <key alias="variantsDescription">Editors toestaan om nieuwe inhoud aan te maken van dit type in verschillende talen.</key>
+    <key alias="cultureVariantDescription">Editors toestaan om nieuwe inhoud in verschillende talen te creëren</key>
+    <key alias="segmentVariantDescription">Editors toestaan om nieuwe segmenten van deze inhoud te creëren.</key>
+    <key alias="allowVaryByCulture">Variaties per cultuur toestaan</key>
+    <key alias="allowVaryBySegment">Segmentatie toestaan</key>
+    <key alias="elementType">Elementtype</key>
+    <key alias="elementHeading">Is een elementtype</key>
+    <key alias="elementDescription">Een elementtype is bedoeld om bijvoorbeeld in geneste inhoud gebruikt te worden en niet in de boomstructuur.</key>
+    <key alias="elementCannotToggle">Een documenttype kan niet worden gewijzigd in een elementtype nadat het is gebruikt om een of meer contentitems te maken.</key>
+    <key alias="elementDoesNotSupport">Dit is niet van toepassing op een elementtype</key>
+    <key alias="propertyHasChanges">Je hebt wijzigingen aangebracht aan deze eigenschap. Ben je zeker dat je ze wil weggooien?</key>
+  </area>
+  <area alias="languages">
+    <key alias="addLanguage">Taal toevoegen</key>
+    <key alias="mandatoryLanguage">Verplichte taal</key>
+    <key alias="mandatoryLanguageHelp">Eigenschappen van deze taal moeten worden ingevuld voordat de node kan worden gepubliceerd.</key>
+    <key alias="defaultLanguage">Standaard taal</key>
+    <key alias="defaultLanguageHelp">Een Umbraco site kan maar één standaardtaal hebben.</key>
+    <key alias="changingDefaultLanguageWarning">Als u de standaardtaal wijzigt, kan er standaardinhoud ontbreken.</key>
+    <key alias="fallsbackToLabel">Valt terug naar</key>
+    <key alias="noFallbackLanguageOption">Geen terugvaltaal</key>
+    <key alias="fallbackLanguageDescription">Om meertalige inhoud terug te laten vallen naar een andere taal als deze niet aanwezig is in de gevraagde taal, selecteert u deze hier.</key>
+    <key alias="fallbackLanguage">Terugvaltaal</key>
+    <key alias="none">Geen</key>
+  </area>
+  <area alias="macro">
+    <key alias="addParameter">Parameter toevoegen</key>
+    <key alias="editParameter">Parameter bewerken</key>
+    <key alias="enterMacroName">Macro naam invoeren</key>
+    <key alias="parameters">Parameters</key>
+    <key alias="parametersDescription">Definieer de parameters die beschikbaar moeten zijn bij het gebruik van deze macro.</key>
+    <key alias="selectViewFile">Selecteer een partial view macro bestand</key>
   </area>
   <area alias="modelsBuilder">
     <key alias="buildingModels">Models aan het gereneren</key>
@@ -1009,25 +1581,36 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="modelsExceptionInUlog">Models generatie is mislukt, kijk in de Umbraco log voor details</key>
   </area>
   <area alias="templateEditor">
+    <key alias="addFallbackField">Terugval veld toevoegen</key>
+    <key alias="fallbackField">Terugval veld</key>
+    <key alias="addDefaultValue">Standaardwaarde toevoegen</key>
+    <key alias="defaultValue">Standaardwaarde</key>
     <key alias="alternativeField">Alternatief veld</key>
     <key alias="alternativeText">Alternatieve tekst</key>
     <key alias="casing">Kapitalisatie</key>
-    <key alias="encoding">Encoding</key>
+    <key alias="encoding">Codering</key>
     <key alias="chooseField">Selecteer veld</key>
     <key alias="convertLineBreaks">Converteer regelafbreking</key>
-    <key alias="convertLineBreaksHelp"><![CDATA[Vervang regelafbrekingen met html-tag <br>]]></key>
+    <key alias="convertLineBreaksDescription">Ja, converteer regeleinden</key>
+    <key alias="convertLineBreaksHelp"><![CDATA[Vervang regelafbrekingen met HTML-tag<br>]]></key>
     <key alias="customFields">Aangepaste velden</key>
     <key alias="dateOnly">Ja, alleen datum</key>
+    <key alias="formatAndEncoding">Opmaak en codering</key>
     <key alias="formatAsDate">Opmaken als datum</key>
+    <key alias="formatAsDateDescr">Format the value as a date, or a date with time, according to the active culture</key>
     <key alias="htmlEncode">HTML-encoderen</key>
     <key alias="htmlEncodeHelp">Speciale karakters worden geëncodeerd naar HTML.</key>
     <key alias="insertedAfter">Zal worden ingevoegd na de veld waarde</key>
     <key alias="insertedBefore">Zal worden ingevoegd voor de veld waarde</key>
     <key alias="lowercase">Kleine letters</key>
+    <key alias="modifyOutput">Uitvoer wijzigen</key>
     <key alias="none">Geen</key>
+    <key alias="outputSample">Uitvoervoorbeeld</key>
     <key alias="postContent">Invoegen na veld</key>
     <key alias="preContent">Invoegen voor veld</key>
     <key alias="recursive">Recursief</key>
+    <key alias="recursiveDescr">Ja, recursief maken</key>
+    <key alias="separator">Scheidingsteken</key>
     <key alias="standardFields">Standaard velden</key>
     <key alias="uppercase">Hoofdletters</key>
     <key alias="urlEncode">URL-encoderen</key>
@@ -1069,6 +1652,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="uploadTranslationXml">Vertaald XML-document uploaden</key>
   </area>
   <area alias="treeHeaders">
+    <key alias="content">Inhoud</key>
+    <key alias="contentBlueprints">Inhoudssjablonen</key>
+    <key alias="media">Media</key>
     <key alias="cacheBrowser">Cachebrowser</key>
     <key alias="contentRecycleBin">Prullenbak</key>
     <key alias="createdPackages">Gemaakte packages</key>
@@ -1085,17 +1671,24 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="memberGroups">Ledengroepen</key>
     <key alias="memberRoles">Rollen</key>
     <key alias="memberTypes">Ledentypes</key>
-    <key alias="documentTypes">Documenttypen</key>
+    <key alias="documentTypes">Documenttypes</key>
     <key alias="relationTypes">RelatieTypen</key>
     <key alias="packager">Packages</key>
     <key alias="packages">Packages</key>
-    <key alias="repositories">Installeer uit repository</key>
+    <key alias="partialViews">Partial Views</key>
+    <key alias="partialViewMacros">Partial View Macro Bestanden</key>
+    <key alias="repositories">Installeer vanuit repository</key>
     <key alias="runway">Installeer Runway</key>
     <key alias="runwayModules">Runway modules</key>
     <key alias="scripting">Script bestanden</key>
     <key alias="scripts">Scripts</key>
     <key alias="stylesheets">Stylesheets</key>
     <key alias="templates">Sjablonen</key>
+    <key alias="logViewer">Logboeken</key>
+    <key alias="users">Gebruikers</key>
+    <key alias="settingsGroup">Instellingen</key>
+    <key alias="templatingGroup">Sjabloon</key>
+    <key alias="thirdPartyGroup">Derde partij</key>
   </area>
   <area alias="update">
     <key alias="updateAvailable">Nieuwe update beschikbaar</key>
@@ -1123,7 +1716,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="descriptionField">Omschrijving</key>
     <key alias="disabled">Geblokkeerde gebruiker</key>
     <key alias="documentType">Documenttype</key>
-    <key alias="editors">Redacteur</key>
+    <key alias="editors">Editor</key>
     <key alias="excerptField">Samenvattingsveld</key>
     <key alias="failedPasswordAttempts">Foute wachtwoord pogingen</key>
     <key alias="goToProfile">Ga naar gebruikersprofiel</key>
@@ -1147,6 +1740,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="password">Wachtwoord</key>
     <key alias="resetPassword">Reset wachtwoord</key>
     <key alias="passwordChanged">Je wachtwoord is veranderd!</key>
+    <key alias="passwordChangedGeneric">Wachtwoord aangepast</key>
     <key alias="passwordConfirm">Herhaal nieuwe wachtwoord</key>
     <key alias="passwordEnterNew">Voer nieuwe wachtwoord in</key>
     <key alias="passwordIsBlank">Je nieuwe wachtwoord mag niet leeg zijn!</key>
@@ -1167,10 +1761,10 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="selectUserGroups">Selecteer een gebruikersgroep</key>
     <key alias="noStartNode">Geen startnode geselecteerd</key>
     <key alias="noStartNodes">Geen startnodes geselecteerd</key>
-    <key alias="startnode">Startnode in Content</key>
+    <key alias="startnode">Startnode in Inhoud</key>
     <key alias="startnodehelp">Beperk de content toegang tot een specifieke startnode</key>
-    <key alias="startnodes">Startnodes in Content</key>
-    <key alias="startnodeshelp">Beperk de content toegang tot specifieke startnodes</key>
+    <key alias="startnodes">Startnodes in Inhoud</key>
+    <key alias="startnodeshelp">Beperk de Inhoud tot specifieke startnodes</key>
     <key alias="updateDate">Laatste keer bijgewerkt</key>
     <key alias="userCreated">is aangemaakt</key>
     <key alias="userCreatedSuccessHelp">De gebruiker is aangemaakt. Om in te loggen in Umbraco gebruik je onderstaand wachtwoord.</key>
@@ -1181,6 +1775,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="userInvited">is uitgenodigd</key>
     <key alias="userInvitedSuccessHelp">Een uitnodiging is gestuurd naar de nieuwe gebruiker met informatie over hoe in te loggen in Umbraco</key>
     <key alias="userinviteWelcomeMessage">Hallo en welkom in Umbraco! Binnen ongeveer één minuut kan je aan de slag. Je moet enkel je wachtwoord instellen en een foto toevoegen.</key>
+    <key alias="userinviteExpiredMessage">Welkom bij Umbraco! Helaas is je uitnodiging vervallen. Vraag aan je administrator om de uitnodiging opnieuw te versturen.</key>
     <key alias="userinviteAvatarMessage">Wijzig je foto zodat andere gebruikers je makkelijk kunnen herkennen.</key>
     <key alias="writer">Auteur</key>
     <key alias="change">Wijzig</key>
@@ -1247,7 +1842,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
 																			<tbody>
 																				<tr>
 																					<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
-																						<a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																						<a href='%3%' target='_blank' rel='noopener' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
 																							Klik hier om de uitnodiging te accepteren
 																						</a>
 																					</td>
@@ -1287,14 +1882,45 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="defaultInvitationMessage">Uitnodiging opnieuw aan het versturen...</key>
     <key alias="deleteUser">Verwijder gebruiker</key>
     <key alias="deleteUserConfirmation">Weet je zeker dat je deze gebruiker wil verwijderen?</key>
+    <key alias="stateAll">Alles</key>
+    <key alias="stateActive">Actief</key>
+    <key alias="stateDisabled">Uitgeschakeld</key>
+    <key alias="stateLockedOut">Vergrendeld</key>
+    <key alias="stateInvited">Uitgenodigd</key>
+    <key alias="stateInactive">Inactief</key>
+    <key alias="sortNameAscending">Naam (A-Z)</key>
+    <key alias="sortNameDescending">Naam (Z-A)</key>
+    <key alias="sortCreateDateAscending">Nieuwste</key>
+    <key alias="sortCreateDateDescending">Oudste</key>
+    <key alias="sortLastLoginDateDescending">Laatste login</key>
+    <key alias="noUserGroupsAdded">Er zijn geen gebruikersgroepen toegevoegd</key>
   </area>
   <area alias="validation">
     <key alias="validation">Validatie</key>
-    <key alias="validateAsEmail">Valideer als email</key>
+    <key alias="validateAsEmail">Valideer als e-mailadres</key>
     <key alias="validateAsNumber">Valideer als nummer</key>
-    <key alias="validateAsUrl">Valideer als Url</key>
-    <key alias="enterCustomValidation">...of gebruik custom validatie</key>
+    <key alias="validateAsUrl">Valideer als URL</key>
+    <key alias="enterCustomValidation">...of gebruik aangepaste validatie</key>
     <key alias="fieldIsMandatory">Veld is verplicht</key>
+    <key alias="mandatoryMessage">Voer een foutmelding in voor de aangepaste validatie (optioneel)</key>
+    <key alias="validationRegExp">Voer een reguliere expressie in</key>
+    <key alias="validationRegExpMessage">Voer een foutmelding in voor de aangepaste validatie (optioneel)</key>
+    <key alias="minCount">Je hebt minstens</key>
+    <key alias="maxCount">Je mag maximum</key>
+    <key alias="addUpTo">Geef maximum</key>
+    <key alias="items">items</key>
+    <key alias="urls">URL(s)</key>
+    <key alias="urlsSelected">URL(s) geselecteerd</key>
+    <key alias="itemsSelected">items geselecteerd</key>
+    <key alias="invalidDate">Ongeldige datum</key>
+    <key alias="invalidNumber">Geen nummer</key>
+    <key alias="invalidEmail">Ongeldig e-mailadres</key>
+    <key alias="invalidNull">Waarde mag niet null zijn</key>
+    <key alias="invalidEmpty">Waarde mag niet leeg zijn</key>
+    <key alias="invalidPattern">Ongeldige waarde, het komt niet overeen met het correcte patroon</key>
+    <key alias="customValidation">Aangepaste validatie</key>
+    <key alias="entriesShort"><![CDATA[Minimum %0% items, nog <strong>%1%</strong> nodig.]]></key>
+    <key alias="entriesExceed"><![CDATA[Maximum %0% items, <strong>%1%</strong> te veel.]]></key>
   </area>
   <area alias="healthcheck">
     <!-- The following keys get these tokens passed in:
@@ -1322,15 +1948,20 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
 		   1: Recommended value
 		   2: Server version
 	  -->
-    <key alias="trySkipIisCustomErrorsCheckSuccessMessage">Try Skip IIS Custom foutmeldingen is ingesteld op '%0%'. IIS versie '%1%' wordt gebruikt.</key>
-    <key alias="trySkipIisCustomErrorsCheckErrorMessage">Try Skip IIS Custom foutmeldingen is ingesteld op '%0%'. Het wordt voor de gebruikte IIS versie (%2%) aangeraden deze in te stellen op '%1%'.</key>
-    <key alias="trySkipIisCustomErrorsCheckRectifySuccessMessage">Try Skip IIS Custom foutmeldingen ingesteld op '%0%'.</key>
+    <key alias="trySkipIisCustomErrorsCheckSuccessMessage">trySkipIisCustomErrors is ingesteld op '%0%'. IIS versie '%1%' wordt gebruikt.</key>
+    <key alias="trySkipIisCustomErrorsCheckErrorMessage">trySkipIisCustomErrors is ingesteld op '%0%'. Het wordt voor de gebruikte IIS versie (%2%) aangeraden deze in te stellen op '%1%'.</key>
+    <key alias="trySkipIisCustomErrorsCheckRectifySuccessMessage">trySkipIisCustomErrors ingesteld op '%0%'.</key>
     <!-- The following keys get predefined tokens passed in that are not all the same, like above -->
     <key alias="configurationServiceFileNotFound">Het volgende bestand bestaat niet: '%0%'.</key>
     <key alias="configurationServiceNodeNotFound"><![CDATA[<strong>'%0%'</strong> kon niet gevonden worden in configuratie bestand <strong>'%1%'</strong>.]]></key>
     <key alias="configurationServiceError">Er is een fout opgetreden. Bekijk de log file voor de volledige fout: %0%.</key>
+    <key alias="databaseSchemaValidationCheckDatabaseOk">Database - Het database schema is correct voor deze versie van Umbraco</key>
+    <key alias="databaseSchemaValidationCheckDatabaseErrors">%0% problemen zijn gevonden met het databaseschema (Controleer het logboek voor details)</key>
+    <key alias="databaseSchemaValidationCheckDatabaseLogMessage">Enkele fouten zijn gevonden tijdens het valideren van het databaseschema tegen de huidige versie van Umbraco.</key>
     <key alias="httpsCheckValidCertificate">Het cerficaat van de website is ongeldig.</key>
     <key alias="httpsCheckInvalidCertificate">Cerficaat validatie foutmelding: '%0%'</key>
+    <key alias="httpsCheckExpiredCertificate">Het SSL certificaat van de website is vervallen.</key>
+    <key alias="httpsCheckExpiringCertificate">Het SSL certificaat van de website zal vervallen binnen %0% dagen.</key>
     <key alias="healthCheckInvalidUrl">Fout bij pingen van URL %0% - '%1%'</key>
     <key alias="httpsCheckIsCurrentSchemeHttps">De site wordt momenteel %0% bekeken via HTTPS.</key>
     <key alias="httpsCheckConfigurationRectifyNotPossible">De appSetting 'Umbraco.Core.UseHttps' in web.config staat op 'false'. Indien HTTPS gebruikt wordt moet deze op 'true' staan.</key>
@@ -1350,57 +1981,403 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="traceModeCheckSuccessMessage">Trace mode staat uit.</key>
     <key alias="traceModeCheckErrorMessage">Trace mode staat momenteel aan. Wij raden aan deze instelling uit te zetten voor livegang.</key>
     <key alias="traceModeCheckRectifySuccessMessage">Trace mode uitgezet.</key>
-    <key alias="folderPermissionsCheckMessage">Alle mappen hebben de juiste permissie-instellingen!</key>
+    <key alias="folderPermissionsCheckMessage">Alle mappen hebben de juiste rechten.</key>
     <!-- The following keys get these tokens passed in:
 	    0: Comma delimitted list of failed folder paths
-  	-->
+    -->
     <key alias="requiredFolderPermissionFailed"><![CDATA[De volgende bestanden moeten wijzig-rechten krijgen om Umbraco goed te laten werken: <strong>%0%</strong>.]]></key>
     <key alias="optionalFolderPermissionFailed"><![CDATA[Aangeraden wordt de volgende bestanden wijzig-rechten te geven om Umbraco goed te laten werken: <strong>%0%</strong>. Als deze niet in gebruik zijn voor deze omgeving hoeft er geen actie te worden ondernomen.]]></key>
-    <key alias="filePermissionsCheckMessage">All files have the correct permissions set.</key>
+    <key alias="filePermissionsCheckMessage">Alle bestanden hebben de juiste rechten.</key>
     <!-- The following keys get these tokens passed in:
 	    0: Comma delimitted list of failed folder paths
   	-->
-    <key alias="requiredFilePermissionFailed"><![CDATA[De volgende bestanden moeten schrijf-rechten krijgen om Umbraco goed te laten werken: <strong>%0%</strong>.]]></key>
-    <key alias="optionalFilePermissionFailed"><![CDATA[Aangeraden wordt de volgende bestanden schrijf-rechten te geven om Umbraco goed te laten werken: <strong>%0%</strong>. Als deze niet in gebruik zijn voor deze omgeving hoeft er geen actie te worden ondernomen.]]></key>
+    <key alias="requiredFilePermissionFailed"><![CDATA[De volgende bestanden moeten schrijfrechten krijgen om Umbraco goed te laten werken: <strong>%0%</strong>.]]></key>
+    <key alias="optionalFilePermissionFailed"><![CDATA[Het wordt aangeraden om de volgende bestanden schrijfrechten te geven om Umbraco goed te laten werken: <strong>%0%</strong>. Als deze niet in gebruik zijn voor deze omgeving hoeft er geen actie te worden ondernomen.]]></key>
     <key alias="clickJackingCheckHeaderFound"><![CDATA[De <strong>X-Frame-Options</strong> header of meta-tag om IFRAMEing door andere websites te voorkomen is aanwezig!]]></key>
     <key alias="clickJackingCheckHeaderNotFound"><![CDATA[De <strong>X-Frame-Options</strong> header of meta-tag om IFRAMEing door andere websites te voorkomen is NIET aanwezig.]]></key>
     <key alias="setHeaderInConfig">Voorkom IFRAMEing via web.config</key>
     <key alias="clickJackingSetHeaderInConfigDescription">Voegt de instelling toe aan de httpProtocol/customHeaders section in web.config om IFRAMEing door andere websites te voorkomen.</key>
     <key alias="clickJackingSetHeaderInConfigSuccess">De instelling om IFRAMEing door andere websites te voorkomen is toegevoegd aan de web.config!</key>
     <key alias="setHeaderInConfigError">Web.config kon niet aangepast worden door error: %0%</key>
-    <!-- The following key get these tokens passed in:
+    <key alias="noSniffCheckHeaderFound"><![CDATA[De header of meta-tag <strong>X-Content-Type-Options</strong> die beveiligt tegen MIME sniffing kwetsbaarheden is gevonden.]]></key>
+    <key alias="noSniffCheckHeaderNotFound"><![CDATA[De header of meta-tag <strong>X-Content-Type-Options</strong> die beveiligt tegen MIME sniffing kwetsbaarheden is niet gevonden.]]></key>
+    <key alias="noSniffSetHeaderInConfigDescription">Voegt een waarde toe in de httpProtocol/customHeaders sectie van de web.config om te beveiligen tegen MIME sniffing kwetsbaarheden.</key>
+    <key alias="noSniffSetHeaderInConfigSuccess">Een instelling om een header toe te voegen die beveiligt tegen MIME sniffing kwetsbaarheden is toegevoegd aan de web.config.</key>
+    <key alias="hSTSCheckHeaderFound"><![CDATA[De <strong>Strict-Transport-Security</strong> header, ook bekend als de HSTS-header, is gevonden.]]></key>
+    <key alias="hSTSCheckHeaderNotFound"><![CDATA[De <strong>Strict-Transport-Security</strong>header is niet gevonden.]]></key>
+    <key alias="hSTSSetHeaderInConfigDescription">Voegt de 'Strict-Transport-Security' header toe met de waarde 'max-age=10886400' aan de httpProtocol/customHeaders sectie van het web.config bestand. Gebruik deze fix alleen als HTTPS ingeschakeld is op de domeinen gedurende minstens 18 weken.</key>
+    <key alias="hSTSSetHeaderInConfigSuccess">De HSTS header is toegevoegd aan de web.config file.</key>
+    <key alias="xssProtectionCheckHeaderFound"><![CDATA[De header <strong>X-XSS-Protection</strong> is gevonden.]]></key>
+    <key alias="xssProtectionCheckHeaderNotFound"><![CDATA[De header <strong>X-XSS-Protection</strong> is niet gevonden.]]></key>
+    <key alias="xssProtectionSetHeaderInConfigDescription">Voegt de 'X-XSS-Protection' header toe met de waarde '1; mode=block' aan de httpProtocol/customHeaders sectie van de web.config.</key>
+    <key alias="xssProtectionSetHeaderInConfigSuccess">De X-XSS-Protection header is toegevoegd aan de web.config.</key>
+      <!-- The following key get these tokens passed in:
 	    0: Comma delimitted list of headers found
   	-->
-    <key alias="excessiveHeadersFound"><![CDATA[De volgende header welke informatie tonen over de gebruikte website technologie zijn aangetroffen: <strong>%0%</strong>.]]></key>
-    <key alias="excessiveHeadersNotFound">Er zijn geen headers gevonden die informatie prijsgeven over de gebruikte website technologie!</key>
+    <key alias="excessiveHeadersFound"><![CDATA[De volgende headers die informatie tonen over de gebruikte website technologieën zijn aangetroffen: <strong>%0%</strong>.]]></key>
+    <key alias="excessiveHeadersNotFound">Er zijn geen headers gevonden die informatie vrijgeven over de gebruikte website technologie!</key>
     <key alias="smtpMailSettingsNotFound">In de Web.config werd system.net/mailsettings niet gevonden</key>
     <key alias="smtpMailSettingsHostNotConfigured">In de Web.config sectie system.net/mailsettings is de host niet geconfigureerd.</key>
     <key alias="smtpMailSettingsConnectionSuccess">SMTP instellingen zijn correct ingesteld en werken zoals verwacht.</key>
     <key alias="smtpMailSettingsConnectionFail">De SMTP server geconfigureerd met host '%0%' en poort '%1%' kon niet gevonden worden. Controleer of de SMTP instellingen in Web.config file system.net/mailsettings correct zijn.</key>
-    <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notificatie email is verzonden naar <strong>%0%</strong>.]]></key>
-    <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notificatie email staat nog steeds op de default waarde van <strong>%0%</strong>.]]></key>
+    <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notificatie e-mail is verzonden naar <strong>%0%</strong>.]]></key>
+    <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notificatie e-mail staat nog steeds op de standaard waarde van <strong>%0%</strong>.]]></key>
+    <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Resultaten van de geplande Umbraco Health Checks uitgevoerd op %0% op %1%:</p>%2%</body></html>]]></key>
+    <key alias="scheduledHealthCheckEmailSubject">Umbraco Health Check Status: %0%</key>
+    <key alias="checkAllGroups">Alle groepen controleren</key>
+    <key alias="checkGroup">Groep controleren</key>
+    <key alias="helpText">
+        <![CDATA[
+    <p>De health checker evalueert verschillende delen van de website voor best practice instellingen, configuratie, mogelijke problemen, enzovoort. U kunt problemen eenvoudig oplossen met een druk op de knop.
+    U kunt uw eigen health checks toevoegen, kijk even naar <a href="https://our.umbraco.com/documentation/Extending/Healthcheck/" target="_blank" rel="noopener" class="btn-link -underline">de documentatie voor meer informatie</a> over aangepaste health checks.</p>
+    ]]>
+    </key>
   </area>
   <area alias="redirectUrls">
-    <key alias="disableUrlTracker">URL tracker uitzetten</key>
-    <key alias="enableUrlTracker">URL tracker aanzetten</key>
+    <key alias="disableUrlTracker">URL tracker uitschakelen</key>
+    <key alias="enableUrlTracker">URL tracker inschakelen</key>
+    <key alias="culture">Cultuur</key>
     <key alias="originalUrl">Originele URL</key>
     <key alias="redirectedTo">Doorgestuurd naar</key>
+    <key alias="redirectUrlManagement">Redirect Url Beheer</key>
+    <key alias="panelInformation">De volgende URLs verwijzen naar dit content item:</key>
     <key alias="noRedirects">Er zijn geen redirects</key>
     <key alias="noRedirectsDescription">Er wordt automatisch een redirect aangemaakt als een gepubliceerde pagina hernoemd of verplaatst wordt.</key>
     <key alias="confirmRemove">Weet je zeker dat je de redirect van '%0%' naar '%1%' wilt verwijderen?</key>
     <key alias="redirectRemoved">Redirect URL verwijderd.</key>
     <key alias="redirectRemoveError">Fout bij verwijderen redirect URL.</key>
+    <key alias="redirectRemoveWarning">Dit zal de redirect verwijderen</key>
     <key alias="confirmDisable">Weet je zeker dat je de URL tracker wilt uitzetten?</key>
     <key alias="disabledConfirm">URL tracker staat nu uit.</key>
     <key alias="disableError">Fout bij het uitzetten van de URL Tracker. Meer informatie kan gevonden worden in de log file.</key>
     <key alias="enabledConfirm">URL tracker staat nu aan.</key>
     <key alias="enableError">Fout bij het aanzetten van de URL tracker. Meer informatie kan gevonden worden in de log file.</key>
   </area>
+  <area alias="emptyStates">
+    <key alias="emptyDictionaryTree">Geen woordenboekitems om uit te kiezen</key>
+  </area>
+  <area alias="textbox">
+    <key alias="characters_left"><![CDATA[<strong>%0%</strong> karakters resterend.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maximum %0% karakters, <strong>%1%</strong> te veel.]]></key>
+  </area>
   <area alias="recycleBin">
     <key alias="contentTrashed">Content verwijderd met id : {0} gerelateerd aan aan bovenliggend item met Id: {1}</key>
     <key alias="mediaTrashed">Media verwijderd met id: {0} gerelateerd aan aan bovenliggend item met Id: {1}</key>
     <key alias="itemCannotBeRestored">Kan dit item niet automatisch herstellen</key>
-    <key alias="noRestoreRelation">Er is geen 'herstel' relatie gevonden voor dit item. Gebruik de "Verplaats" optie om het manueel terug te zetten</key>
-    <key alias="restoreUnderRecycled">Het item dat u wil herstellen onder ('%0%') zit in de prullenbak. Gebruik de "Verplaats" optie om het manueel terug te zetten</key>
+    <key alias="itemCannotBeRestoredHelpText">Er is geen locatie waar dit item automatisch kan worden hersteld. U kunt het item handmatig verplaatsen met behulp van de onderstaande boomstructuur.</key>
+    <key alias="wasRestored">was hersteld onder</key>
+  </area>
+  <area alias="relationType">
+    <key alias="direction">Richting</key>
+    <key alias="parentToChild">Bovenliggend naar onderliggend</key>
+    <key alias="bidirectional">Bidirectioneel</key>
+    <key alias="parent">Bovenliggend</key>
+    <key alias="child">Onderliggend</key>
+    <key alias="count">Aantal</key>
+    <key alias="relations">Relaties</key>
+    <key alias="created">Gemaakt</key>
+    <key alias="comment">Commentaar</key>
+    <key alias="name">Naam</key>
+    <key alias="noRelations">Geen relaties voor dit relatietype.</key>
+    <key alias="tabRelationType">Relatietype</key>
+    <key alias="tabRelations">Relaties</key>
+  </area>
+  <area alias="dashboardTabs">
+    <key alias="contentIntro">Aan de slag</key>
+    <key alias="contentRedirectManager">Redirect URL Beheer</key>
+    <key alias="mediaFolderBrowser">Inhoud</key>
+    <key alias="settingsWelcome">Welkom</key>
+    <key alias="settingsExamine">Examine Beheer</key>
+    <key alias="settingsPublishedStatus">Publicatiestatus</key>
+    <key alias="settingsModelsBuilder">Models Builder</key>
+    <key alias="settingsHealthCheck">Gezondheidscontrole</key>
+    <key alias="settingsProfiler">Profilering</key>
+    <key alias="memberIntro">Aan de slag</key>
+    <key alias="formsInstall">Umbraco Forms installeren</key>
+  </area>
+  <area alias="visuallyHiddenTexts">
+    <key alias="goBack">Terug</key>
+    <key alias="activeListLayout">Actieve layout:</key>
+    <key alias="jumpTo">Spring naar</key>
+    <key alias="group">groep</key>
+    <key alias="passed">geslaagd</key>
+    <key alias="warning">Waarschuwing</key>
+    <key alias="failed">mislukt</key>
+    <key alias="suggestion">suggestie</key>
+    <key alias="checkPassed">Controle geslaagd</key>
+    <key alias="checkFailed">Controle mislukt</key>
+    <key alias="openBackofficeSearch">Backoffice zoeken openen</key>
+    <key alias="openCloseBackofficeHelp">Backoffice help openen/sluiten</key>
+    <key alias="openCloseBackofficeProfileOptions">Jouw profiel opties openen/sluiten</key>
+    <key alias="assignDomainDescription">Cultuur en Hostnamen instellen voor %0%</key>
+    <key alias="createDescription">Nieuwe node aanmaken onder %0%</key>
+    <key alias="protectDescription">Openbare toegang instellen op %0%</key>
+    <key alias="rightsDescription">Rechten instellen op %0%</key>
+    <key alias="sortDescription">Sorteervolgorde wijzigen voor %0%</key>
+    <key alias="createblueprintDescription">Maak een Inhoudssjabloon op basis van %0%</key>
+    <key alias="openContextMenu">Open context menu voor</key>
+    <key alias="currentLanguage">Huidige taal</key>
+    <key alias="switchLanguage">Taal wijzigen naar</key>
+    <key alias="createNewFolder">Map aanmaken</key>
+    <key alias="newPartialView">Partial View</key>
+    <key alias="newPartialViewMacro">Partial View Macro</key>
+    <key alias="newMember">Lid</key>
+    <key alias="newDataType">Datatype</key>
+    <key alias="redirectDashboardSearchLabel">Zoeken in het redirect dashboard</key>
+    <key alias="userGroupSearchLabel">Zoeken in de gebruikersgroep sectie</key>
+    <key alias="userSearchLabel">Zoeken in de gebruikers sectie</key>
+    <key alias="createItem">Item aanmaken</key>
+    <key alias="create">Aanmaken</key>
+    <key alias="edit">Bewerken</key>
+    <key alias="name">Naam</key>
+    <key alias="addNewRow">Rij toevoegen</key>
+    <key alias="tabExpand">Bekijk meer opties</key>
+    <key alias="hasTranslation">Vertaling aanwezig</key>
+    <key alias="noTranslation">Vertaling ontbreekt</key>
+    <key alias="dictionaryListCaption">Woordenboek items</key>
+  </area>
+  <area alias="references">
+    <key alias="tabName">Referenties</key>
+    <key alias="DataTypeNoReferences">Dit Datatype heeft geen referenties.</key>
+    <key alias="labelUsedByDocumentTypes">Gebruikt in Documenttypes</key>
+    <key alias="noDocumentTypes">Geen referenties naar Documenttypes.</key>
+    <key alias="labelUsedByMediaTypes">Gebruikt in Mediatypes</key>
+    <key alias="noMediaTypes">Geen referenties naar Mediatypes.</key>
+    <key alias="labelUsedByMemberTypes">Gebruikt in Ledentypes</key>
+    <key alias="noMemberTypes">Geen referenties naar Ledentypes.</key>
+    <key alias="usedByProperties">Gebruikt door</key>
+    <key alias="labelUsedByDocuments">Gebruikt in Documenten</key>
+    <key alias="labelUsedByMembers">Gebruikt in Leden</key>
+    <key alias="labelUsedByMedia">Gebruikt in Media</key>
+  </area>
+  <area alias="logViewer">
+    <key alias="deleteSavedSearch">Opgeslagen zoekopdracht verwijderen</key>
+    <key alias="logLevels">Log Niveaus</key>
+    <key alias="savedSearches">Opgeslagen Zoekopdrachten</key>
+    <key alias="saveSearch">Zoekopdracht opslaan</key>
+    <key alias="saveSearchDescription">Enter a friendly name for your search query</key>
+    <key alias="filterSearch">Zoekopdracht filteren</key>
+    <key alias="totalItems">Aantal items</key>
+    <key alias="timestamp">Tijdstempel</key>
+    <key alias="level">Niveau</key>
+    <key alias="machine">Machine</key>
+    <key alias="message">Bericht</key>
+    <key alias="exception">Uitzondering</key>
+    <key alias="properties">Eigenschappen</key>
+    <key alias="searchWithGoogle">Zoeken Met Google</key>
+    <key alias="searchThisMessageWithGoogle">Dit bericht met Google opzoeken</key>
+    <key alias="searchWithBing">Zoeken Met Bing</key>
+    <key alias="searchThisMessageWithBing">Dit bericht met Bing opzoeken</key>
+    <key alias="searchOurUmbraco">Zoeken in Our Umbraco</key>
+    <key alias="searchThisMessageOnOurUmbracoForumsAndDocs">Search this message on Our Umbraco forums and docs</key>
+    <key alias="searchOurUmbracoWithGoogle">Our Umbraco met Google doorzoeken</key>
+    <key alias="searchOurUmbracoForumsUsingGoogle">Our Umbraco forums met Google doorzoeken</key>
+    <key alias="searchUmbracoSource">Umbraco broncode doorzoeken</key>
+    <key alias="searchWithinUmbracoSourceCodeOnGithub">Zoeken in Umbraco broncode op Github</key>
+    <key alias="searchUmbracoIssues">Umbraco Issues doorzoeken</key>
+    <key alias="searchUmbracoIssuesOnGithub">Umbraco Issues op Github doorzoeken</key>
+    <key alias="deleteThisSearch">Zoekopdracht verwijderen</key>
+    <key alias="findLogsWithRequestId">Logs met Request ID zoeken</key>
+    <key alias="findLogsWithNamespace">Logs met Namespace zoeken</key>
+    <key alias="findLogsWithMachineName">Logs met Machine Naam zoeken</key>
+    <key alias="open">Openen</key>
+    <key alias="polling">Peilen</key>
+    <key alias="every2">Elke 2 seconden</key>
+    <key alias="every5">Elke 5 seconden</key>
+    <key alias="every10">Elke 10 seconden</key>
+    <key alias="every20">Elke 20 seconden</key>
+    <key alias="every30">Elke 30 seconden</key>
+    <key alias="pollingEvery2">Elke 2s peilen</key>
+    <key alias="pollingEvery5">Elke 5s peilen</key>
+    <key alias="pollingEvery10">Elke 10s peilen</key>
+    <key alias="pollingEvery20">Elke 20s peilen</key>
+    <key alias="pollingEvery30">Elke 30s peilen</key>
+  </area>
+  <area alias="clipboard">
+    <key alias="labelForCopyAllEntries">Kopieer %0%</key>
+    <key alias="labelForArrayOfItemsFrom">%0% van %1%</key>
+    <key alias="labelForRemoveAllEntries">Alle items verwijderen</key>
+    <key alias="labelForClearClipboard">Klembord leegmaken</key>
+  </area>
+  <area alias="propertyActions">
+    <key alias="tooltipForPropertyActionsMenu">Eigenschapsacties openen</key>
+    <key alias="tooltipForPropertyActionsMenuClose">Eigenschapsacties sluiten</key>
+  </area>
+  <area alias="nuCache">
+      <key alias="wait">Wachten</key>
+      <key alias="refreshStatus">Status vernieuwen</key>
+      <key alias="memoryCache">Geheugencache</key>
+      <key alias="memoryCacheDescription">
+          <![CDATA[
+          Deze knop vernieuwt de cache in het geheugen, door het volledig uit de cache in de database
+          te laden (maar het bouwt de cache in de database niet opnieuw op). Dit is relatief snel.
+          Gebruik het wanneer je denkt dat de geheugencache niet goed is vernieuwd nadat
+          enkele gebeurtenissen waren geactiveerd&mdash;wat zou duiden op een klein Umbraco-probleem.
+          (let op: activeert het herladen op alle servers in een LB-omgeving).
+          ]]>
+      </key>
+      <key alias="reload">Vernieuwen</key>
+      <key alias="databaseCache">Database Cache</key>
+      <key alias="databaseCacheDescription">
+          <![CDATA[
+          Met deze knop kunt u de databasecache opnieuw opbouwen, dwz de inhoud van de cmsContentNu-tabel.
+          <strong>Opnieuw bouwen kan duur zijn.</strong>
+          Gebruik het wanneer herladen niet genoeg is en u denkt dat de databasecache niet correct
+          is gegenereerd&mdash;wat zou duiden op een kritiek Umbraco-probleem.
+          ]]>
+      </key>
+      <key alias="rebuild">Opnieuw bouwen</key>
+      <key alias="internals">Interne onderdelen</key>
+      <key alias="internalsDescription">
+          <![CDATA[
+          Met deze knop activeer je een ophaling van NuCache-snapshots (na het uitvoeren van een fullCLR GC).
+          Tenzij je weet wat dat betekent, hoef je het waarschijnlijk <em>niet</em> te gebruiken.
+          ]]>
+      </key>
+      <key alias="collect">Verzamelen</key>
+      <key alias="publishedCacheStatus">Gepubliceerde Cachestatus</key>
+      <key alias="caches">Caches</key>
+  </area>
+  <area alias="profiling">
+      <key alias="performanceProfiling">Prestatieprofilering</key>
+      <key alias="performanceProfilingDescription">
+          <![CDATA[
+              <p>
+                  Umbraco wordt uitgevoerd in de foutopsporingsmodus. Dit betekent dat u de ingebouwde prestatieprofiler kunt gebruiken om de prestaties te beoordelen bij het renderen van pagina's.
+              </p>
+              <p>
+                  Als je de profiler voor een specifieke paginaweergave wilt activeren, voeg je <b>umbDebug=true</b> toe aan de querystring wanneer je de pagina opvraagt.
+              </p>
+              <p>
+                  Als je wil dat de profiler standaard wordt geactiveerd voor alle paginaweergaven, kun je de onderstaande schakelaar gebruiken.
+                  Het plaatst een cookie in je browser, die vervolgens de profiler automatisch activeert.
+                  Met andere woorden, de profiler zal alleen voor <i>jouw</i> browser actief zijn, niet voor andere bezoekers.
+              </p>
+      ]]>
+      </key>
+      <key alias="activateByDefault">Activeer de profiler standaard</key>
+      <key alias="reminder">Vriendelijke herinnering</key>
+      <key alias="reminderDescription">
+          <![CDATA[
+          <p>
+              Je mag een productiesite nooit in de foutopsporingsmodus laten uitvoeren. Je kan de foutopsporingsmodus uitschakelen door de instelling <b>debug="false"</b> uit het <b>&lt;compilation /&gt;</b> element te verwijderen in het web.config bestand.
+          </p>
+      ]]>
+      </key>
+      <key alias="profilerEnabledDescription">
+          <![CDATA[
+          <p>
+              Umbraco wordt op dit ogenblik niet uitgevoerd in de foutopsporingsmodus, dus je kan de ingebouwde profiler niet gebruiken. Dit is hoe het zou moeten zijn voor een productiewebsite.
+          </p>
+          <p>
+              De foutopsporingsmodus wordt ingeschakeld door <b>debug="true"</b> toe te voegen in het <b>&lt;compilation /&gt;</b> element in web.config.
+          </p>
+      ]]>
+      </key>
+  </area>
+  <area alias="settingsDashboardVideos">
+    <key alias="trainingHeadline">Je bent slechts een klik verwijderd van uren aan Umbraco trainingvideo's.</key>
+    <key alias="trainingDescription">
+        <![CDATA[
+        <p>Wil je Umbraco onder de knie krijgen? Besteed een paar minuten aan het leren van enkele best practices door een van deze video's over het gebruik van Umbraco te bekijken. Bezoek <a href="https://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a> voor meer Umbraco videos</p>
+    ]]>
+    </key>
+    <key alias="getStarted">Om je op weg te helpen</key>
+  </area>
+  <area alias="settingsDashboard">
+    <key alias="start">Start hier</key>
+    <key alias="startDescription">Deze sectie bevat de bouwstenen voor jouw Umbraco-site. Volg de onderstaande links voor meer informatie over het werken met de items in de sectie Instellingen</key>
+    <key alias="more">Meer te weten komen</key>
+    <key alias="bulletPointOne">
+        <![CDATA[
+            Lees meer over het werken met de items in de sectie Instellingen <a class="btn-link -underline" href="https://our.umbraco.com/documentation/Getting-Started/Backoffice/Sections/" target="_blank" rel="noopener">in het Documentatiegedeelte</a> van Our Umbraco
+        ]]>
+    </key>
+    <key alias="bulletPointTwo">
+        <![CDATA[
+            Stel een vraag op het <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank" rel="noopener">Community Forum</a>
+        ]]>
+    </key>
+    <key alias="bulletPointThree">
+        <![CDATA[
+            Bekijk onze <a class="btn-link -underline" href="https://umbraco.tv" target="_blank" rel="noopener">instructievideo's</a> (sommige zijn gratis, andere vereisen een abonnement)
+        ]]>
+    </key>
+    <key alias="bulletPointFour">
+        <![CDATA[
+            Lees meer over onze <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank" rel="noopener">productiviteitsverhogende programma's en commerciële ondersteuning</a>
+        ]]>
+    </key>
+    <key alias="bulletPointFive">
+        <![CDATA[
+            Lees meer over real-life <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank" rel="noopener">training en certificering</a> opportuniteiten
+        ]]>
+    </key>
+  </area>
+  <area alias="startupDashboard">
+    <key alias="fallbackHeadline">Welkom bij Het Vriendelijke CMS</key>
+    <key alias="fallbackDescription">Bedankt om voor Umbraco te kiezen - We denken dat dit het begin van iets moois is. Hoewel het in het begin misschien overweldigend aanvoelt, hebben we er veel aan gedaan om de leercurve zo soepel en snel mogelijk te laten verlopen.</key>
+  </area>
+  <area alias="formsDashboard">
+      <key alias="formsHeadline">Umbraco Forms</key>
+      <key alias="formsDescription">Maak formulieren met behulp van een intuïtieve interface. Van eenvoudige contactformulieren die e-mails versturen tot geavanceerde vragenlijsten die integreren met CRM-systemen. Je klanten zullen er dol op zijn!</key>
+    </area>
+  <area alias="blockEditor">
+      <key alias="headlineCreateBlock">Nieuwe blok aanmaken</key>
+      <key alias="headlineAddSettingsElementType">Instellingensectie toevoegen</key>
+      <key alias="headlineAddCustomView">Weergave selecteren</key>
+      <key alias="headlineAddCustomStylesheet">Stylesheet selecteren</key>
+      <key alias="headlineAddThumbnail">Miniatuur kiezen</key>
+      <key alias="labelcreateNewElementType">Nieuwe aanmaken</key>
+      <key alias="labelCustomStylesheet">Aangepaste stylesheet</key>
+      <key alias="addCustomStylesheet">Stylesheet toevoegen</key>
+      <key alias="headlineEditorAppearance">Editor uiterlijk</key>
+      <key alias="headlineDataModels">Data modellen</key>
+      <key alias="headlineCatalogueAppearance">Catalogus uiterlijk</key>
+      <key alias="labelBackgroundColor">Achtergrondkleur</key>
+      <key alias="labelIconColor">Icoon kleur</key>
+      <key alias="labelContentElementType">Inhoud model</key>
+      <key alias="labelLabelTemplate">Label</key>
+      <key alias="labelCustomView">Aangepaste weergave</key>
+      <key alias="labelCustomViewInfoTitle">Aangepaste weergave-omschrijving tonen</key>
+      <key alias="labelCustomViewDescription">Overschrijf hoe dit blok wordt weergegeven in de BackOffice-gebruikersinterface. Kies een .html-bestand met je presentatie.</key>
+      <key alias="labelSettingsElementType">Instellingen model</key>
+      <key alias="labelEditorSize">Grootte van overlay-editor</key>
+      <key alias="addCustomView">Aangepaste weergave toevoegen</key>
+      <key alias="addSettingsElementType">Instellingen toevoegen</key>
+      <key alias="labelTemplatePlaceholder">Label sjabloon overschrijven</key>
+      <key alias="confirmDeleteBlockMessage"><![CDATA[Weet je zeker dat je blok <strong>%0%</strong> wil verwijderen?]]></key>
+      <key alias="confirmDeleteBlockTypeMessage"><![CDATA[Weet je zeker dat je blok instellingen <strong>%0%</strong> wil verwijderen?]]></key>
+      <key alias="confirmDeleteBlockTypeNotice">De inhoud van dit blok is nog steeds aanwezig, bewerken van deze inhoud is niet langer mogelijk en wordt weergegeven als niet-ondersteunde inhoud.</key>
+      <key alias="blockConfigurationOverlayTitle"><![CDATA[Configuratie van '%0%']]></key>
+      <key alias="thumbnail">Miniatuur</key>
+      <key alias="addThumbnail">Miniatuur toevoegen</key>
+      <key alias="tabCreateEmpty">Lege aanmaken</key>
+      <key alias="tabClipboard">Klembord</key>
+      <key alias="tabBlockSettings">Instellingen</key>
+      <key alias="headlineAdvanced">Geavanceerd</key>
+      <key alias="forceHideContentEditor">Inhoudseditor geforceerd verbergen</key>
+      <key alias="blockHasChanges">Je hebt aanpassingen gemaakt aan deze inhoud. Wil je deze wijzigingen verwerpen?</key>
+      <key alias="confirmCancelBlockCreationHeadline">Wijzigingen opslaan?</key>
+      <key alias="confirmCancelBlockCreationMessage"><![CDATA[Ben je zeker dat je deze wijzigingen wil verwerpen?]]></key>
+      <key alias="elementTypeDoesNotExistHeadline">Fout!</key>
+      <key alias="elementTypeDoesNotExistDescription">Het Elementtype van dit blok bestaat niet meer</key>
+    </area>
+  <area alias="contentTemplatesDashboard">
+    <key alias="whatHeadline">Wat zijn Inhoudssjablonen?</key>
+    <key alias="whatDescription">Inhoudssjablonen is vooraf gedefinieerde inhoud die kan worden geselecteerd bij het maken van een nieuwe node.</key>
+    <key alias="createHeadline">Hoe maak ik een Inhoudssjabloon?</key>
+    <key alias="createDescription">
+        <![CDATA[
+        <p>Er zijn 2 manieren om Inhoudssjablonen te maken:</p>
+        <ul>
+            <li>Klik met de rechtermuisknop op een inhoudsnode en selecteer "Inhoudssjabloon aanmaken" om een nieuwe Inhoudssjabloon te maken.</li>
+            <li>Klik met de rechtermuisknop op Inhoudssjablonen in de boomstructuur in de sectie Instellingen en selecteer het documenttype waarvoor je een Inhoudssjabloon wilt maken.</li>
+        </ul>
+        <p>Nadat de Inhoudssjabloon een naam heeft, kunnen redacteuren ze gaan gebruiken als basis voor hun nieuwe pagina.</p>
+    ]]>
+    </key>
+    <key alias="manageHeadline">Hoe beheer ik Inhoudssjablonen?</key>
+    <key alias="manageDescription">U kunt Inhoudssjablonen bewerken en verwijderen vanuit de boomstructuur "inhoudssjablonen" in de sectie Instellingen. Vouw het documenttype uit waarop de Inhoudssjabloon is gebaseerd en klik erop om het te bewerken of te verwijderen.</key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
index fd806041c5..7b3e8f1b04 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
@@ -322,7 +322,7 @@
     <key alias="recycleBinIsEmpty">Zawartość kosza została usunięta</key>
     <key alias="recycleBinWarning">Usunięcie elementów z kosza powoduje ich trwałe i nieodwracalne skasowanie</key>
     <key alias="regexSearchError"><![CDATA[Serwis <a target='_blank' href='http://regexlib.com'>regexlib.com</a> aktualnie nie jest dostępny, na co nie mamy wpływu. Bardzo przepraszamy za te utrudnienia.]]></key>
-    <key alias="regexSearchHelp">Przeszukaj dla wyrażeń regularnych, aby dodać regułę sprawdzającą do formularza. Np. 'email' 'url'</key>
+    <key alias="regexSearchHelp">Przeszukaj dla wyrażeń regularnych, aby dodać regułę sprawdzającą do formularza. Np. 'email' 'URL'</key>
     <key alias="removeMacro">Usuń Makro</key>
     <key alias="requiredField">Pole wymagane</key>
     <key alias="sitereindexed">Strona została przeindeksowana</key>
@@ -612,8 +612,8 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
                 <p>Aby kontynuować, dokonaj edycji pliku "web.config" (używając Visual Studio lub dowolnego edytora tekstu), przemieść kursor na koniec pliku, dodaj parametry połączenia do Twojej bazy danych w kluczu o nazwie "umbracoDbDSN" i zapisz plik.</p>
                 <p>
                 Kliknij <strong>ponów próbę</strong> kiedy
-                skończysz.<br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
-                Tu znajdziesz więcej informacji na temat edycji pliku "web.config".</a></p>]]></key>
+                skończysz.<br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">
+                Tu znajdziesz więcej informacji na temat edycji pliku "web.config"</a>.</p>]]></key>
     <key alias="databaseText"><![CDATA[Aby zakończyć ten etap instalacji, będziesz musiał podać parametry połączenia do Twojego serwera baz danych ("connection string").<br />
                 Skontaktuj się z Twoim dostawą usług internetowych jeśli zajdzie taka potrzeba.
                 W przypadku instalacji na lokalnej maszynie lub serwerze możesz potrzebować pomocy administratora.]]></key>
@@ -660,7 +660,7 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
     <key alias="runwayFromScratch">Chcę zacząć od zera</key>
     <key alias="runwayFromScratchText"><![CDATA[
                 Twoja strona jest obecnie pusta. To idealna sytuacja, jeśli chcesz zacząć od zera i stworzyć własne typy dokumentów i szablony.
-                (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">dowiedz się jak</a>)
+                (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">dowiedz się jak</a>)
                 Ciągle możesz wybrać, aby zainstalować Runway w późniejszym terminie. W tym celu przejdź do sekcji Deweloper i wybierz Pakiety.
                 ]]></key>
     <key alias="runwayHeader">Właśnie stworzyłeś czystą instalację platformy Umbraco. Co chcesz zrobić teraz?</key>
@@ -728,7 +728,7 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
     <key alias="instruction">Zaloguj się poniżej</key>
     <key alias="signInWith">Zaloguj się z</key>
     <key alias="timeout">Sesja wygasła</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">Zapomniałeś hasła?</key>
     <key alias="forgottenPasswordInstruction">E-mail z linkiem do zresetowania hasła zostanie wysłany na podany adres</key>
     <key alias="requestPasswordResetConfirmation">E-mail z instrukcjami do zresetowania hasła zostanie wysłany, jeśli zgadza się z naszą bazą danych</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
index 9fd4696c28..0091cde73c 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
@@ -181,7 +181,7 @@
     <key alias="recycleBinIsEmpty">A lixeira agora está vazia</key>
     <key alias="recycleBinWarning">Quando itens são removidos da lixeira estes somem para sempre</key>
     <key alias="regexSearchError"><![CDATA[O serviço web <a target='_blank' href='http://regexlib.com'>regexlib.com</a> está no momento sofrendo dificuldades dos quais não temos controle. Pedimos desculpas pela inconveniência.]]></key>
-    <key alias="regexSearchHelp">Busque por uma expressão regular para adicionar validação à um campo de formulário. Exemplo: 'email', 'zip-code' (código postal), 'url'</key>
+    <key alias="regexSearchHelp">Busque por uma expressão regular para adicionar validação à um campo de formulário. Exemplo: 'email', 'zip-code' (código postal), 'URL'</key>
     <key alias="removeMacro">Remover Macro</key>
     <key alias="requiredField">Campo obrigatório</key>
     <key alias="sitereindexed">Site foi re-indexado</key>
@@ -324,7 +324,7 @@
     <key alias="update">Atualizar</key>
     <key alias="upgrade">Atualizar</key>
     <key alias="upload">Subir (Upload)</key>
-    <key alias="url">Url</key>
+    <key alias="url">URL</key>
     <key alias="user">Usuário</key>
     <key alias="username">Usuário</key>
     <key alias="value">Valor</key>
@@ -354,8 +354,8 @@
     <key alias="databaseInstallDone"><![CDATA[Umbraco %0% agora foi copiado para seu banco de dados. Pressione <strong>Próximo</strong> para prosseguir.]]></key>
     <key alias="databaseNotFound"><![CDATA[<p>Banco de dados não encontrado! Favor checar se a informação no "connection string" do "web.config" esteja correta. </p>
 <p>Para prosseguir, favor editar o arquivo "web.config" (usando Visual Studio ou seu editor de texto favorito), role até embaixo, adicione a connection string para seu banco de dados com a chave de nome "UmbracoDbDSN" e salve o arquivo </p>
-<p>Clique o botão <strong>tentar novamente</strong> quando terminar. <br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
-			              Mais informações em como editar o web.config aqui.</a></p>]]></key>
+<p>Clique o botão <strong>tentar novamente</strong> quando terminar. <br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">
+			              Mais informações em como editar o web.config aqui</a>.</p>]]></key>
     <key alias="databaseText"><![CDATA[Para completar este passo, você deve saber algumas informações relativas ao seu servidor de banco de dados ("connection string"). <br /> Favor contatar seu provedor de internet ou hospedagem web se necessário. Se você estiver instalando em uma máquina ou servidor local é possível que você precise dessas informações por um administrador de sistema.]]></key>
     <key alias="databaseUpgrade"><![CDATA[<p>
       Pressione o botão <strong>atualizar</strong> para atualizar seu banco de dados para Umbraco %0%</p>
@@ -394,7 +394,7 @@ Para correr Umbraco você vai precisar atualizar as configurações de permissõ
 Também guarda informações temporárias (cache) para melhorar a performance do seu website.]]></key>
     <key alias="runwayFromScratch">Eu quero começar do zero</key>
     <key alias="runwayFromScratchText"><![CDATA[Seu site está completamente vazio no momento, então isso é perfeito se você deseja começar do zero e criar seus próprios documentos e modelos.
-        (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
+        (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
         Você ainda pode escolher instalar Runway mais tarde. Favor ir à seção Desenvolvedor e selecione pacotes.]]></key>
     <key alias="runwayHeader">Você acabou de configurar uma plataforma Umbraco limpa. O que deseja fazer a seguir?</key>
     <key alias="runwayInstalled">Runway está instalado</key>
@@ -445,7 +445,7 @@ Pressione <strong>"próximo"</strong> para iniciar o assistente.]]></key>
     <key alias="renewSession">Renovar agora para salvar seu trabalho</key>
   </area>
   <area alias="login">
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
   </area>
   <area alias="main">
     <key alias="dashboard">Painel</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
index 7a3e099262..a430b53165 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
@@ -372,7 +372,7 @@
     <key alias="recycleBinIsEmpty">Корзина пуста</key>
     <key alias="recycleBinWarning">Вы больше не сможете восстановить элементы, удаленные из корзины</key>
     <key alias="regexSearchError"><![CDATA[Сервис <a target='_blank' href='http://regexlib.com'>regexlib.com</a> испытывает в настоящее время некоторые трудности, не зависящие от нас. Просим извинить за причиненные неудобства.]]></key>
-    <key alias="regexSearchHelp">Используйте поиск регулярных выражений для добавления сервиса проверки к полю Вашей формы. Например: 'email, 'zip-code', 'url'</key>
+    <key alias="regexSearchHelp">Используйте поиск регулярных выражений для добавления сервиса проверки к полю Вашей формы. Например: 'email, 'zip-code', 'URL'</key>
     <key alias="removeMacro">Удалить макрос</key>
     <key alias="requiredField">Обязательное поле</key>
     <key alias="sitereindexed">Сайт переиндексирован</key>
@@ -783,8 +783,7 @@
 		<p>Для настройки откройте файл "web.config" с помощью любого текстового редактора и добавьте нужную информацию в строку подключения (параметр "UmbracoDbDSN"),
 		затем сохраните файл.</p>
 		<p>Нажмите кнопку "Повторить" когда все будет готово<br />
-		<a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7"
-		target="_blank">Более подробно о внесении изменений в файл "web.config" рассказано здесь.</a></p>]]></key>
+		<a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">Более подробно о внесении изменений в файл "web.config" рассказано здесь</a>.</p>]]></key>
     <key alias="databaseText"><![CDATA[Для завершения данного шага Вам нужно располагать некоторой информацией о Вашем сервере базы данных
 		(строка подключения "connection string")<br />
 		Пожалуйста, свяжитесь с Вашим хостинг-провайдером, если есть необходимость, а если устанавливаете на локальную рабочую станцию или сервер, то получите информацию у Вашего системного администратора.]]></key>
@@ -831,7 +830,7 @@
     <key alias="runwayFromScratchText"><![CDATA[
 		В настоящий момент Ваш сайт абсолютно пустой, что является наилучшим вариантом для старта
 		"с чистого листа", чтобы начать создавать свои собственные типы документов и шаблоны.
-		(<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">Здесь можно узнать об этом подробнее</a>) Вы также можете отложить установку "Runway" на более позднее время. Перейдите к разделу "Разработка" и выберите пункт "Пакеты".
+		(<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">Здесь можно узнать об этом подробнее</a>) Вы также можете отложить установку "Runway" на более позднее время. Перейдите к разделу "Разработка" и выберите пункт "Пакеты".
 		]]></key>
     <key alias="runwayHeader">Вы только что установили чистую платформу Umbraco. Какой шаг будет следующим?</key>
     <key alias="runwayInstalled">"Runway" установлен</key>
@@ -888,7 +887,7 @@
     <key alias="renewSession">Обновите сейчас, чтобы сохранить сделанные изменения</key>
   </area>
   <area alias="login">
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p>]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p>]]></key>
     <key alias="greeting0">Сегодня же выходной!</key>
     <key alias="greeting1">Понедельник — день тяжелый...</key>
     <key alias="greeting2">Вот уже вторник...</key>
@@ -1829,7 +1828,7 @@
     <key alias="validation">Валидация</key>
     <key alias="validateAsEmail">Валидация по формату email</key>
     <key alias="validateAsNumber">Валидация числового значения</key>
-    <key alias="validateAsUrl">Валидация по формату Url</key>
+    <key alias="validateAsUrl">Валидация по формату URL</key>
     <key alias="enterCustomValidation">...или указать свои правила валидации</key>
     <key alias="fieldIsMandatory">Обязательно к заполнению</key>
     <key alias="validationRegExp">Задайте регулярное выражение</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
index e7e7abe2cd..511765e604 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
@@ -243,10 +243,10 @@
     <key alias="formsInstall">Installera Umbraco Forms</key>
   </area>
   <area alias="prompt">
-    <key alias="stay">Stay</key>
-    <key alias="discardChanges">Discard changes</key>
-    <key alias="unsavedChanges">You have unsaved changes</key>
-    <key alias="unsavedChangesWarning">Are you sure you want to navigate away from this page? - you have unsaved changes</key>
+    <key alias="stay">Stanna</key>
+    <key alias="discardChanges">Ignorera ändringar</key>
+    <key alias="unsavedChanges">Du har ändringar som inte är sparade</key>
+    <key alias="unsavedChangesWarning">Vill du verkligen lämna sidan? Du har ändringar som inte är sparade</key>
   </area>
   <area alias="bulk">
     <key alias="done">Klar</key>
@@ -301,7 +301,7 @@
     <key alias="recycleBinIsEmpty">Papperskorgen är nu tom</key>
     <key alias="recycleBinWarning">Om du tömmer papperskorgen kommer allt som ligger i den att tas bort permanent</key>
     <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webbtjänst har för närvarande driftsstörningar. Tyvärr kan vi inte göra något åt detta.]]></key>
-    <key alias="regexSearchHelp">Sök efter en regular expression som kan validera ett formulärsfält. t.ex. 'email' eller 'url'</key>
+    <key alias="regexSearchHelp">Sök efter en regular expression som kan validera ett formulärsfält. t.ex. 'email' eller 'URL'</key>
     <key alias="removeMacro">Ta bort makro</key>
     <key alias="requiredField">Obligatoriskt formulärsfält</key>
     <key alias="sitereindexed">Webbplatsen har indexerats</key>
@@ -504,7 +504,7 @@
     <key alias="databaseHeader">Databaskonfiguration</key>
     <key alias="databaseInstall"><![CDATA[För att installera Umbraco %0% databasen, tryck på knappen <strong>installera</strong>]]></key>
     <key alias="databaseInstallDone"><![CDATA[Nu har Umbraco %0% kopierats till din databas. Tryck <strong>Nästa</strong> för att fortsätta.]]></key>
-    <key alias="databaseNotFound"><![CDATA[<p>Databasen kunde inte hittas! Kontrollera att informationen i databasanslutnings-inställningarna i filen "web.config" är rätt.</p> <p>För att fortsätta måste du redigera filen "web.config" (du kan använda Visual Studio eller din favorit text-redigerare), bläddra till slutet, lägg till databasanslutnings-inställningarna för din databas i fältet som heter "umbracoDbDSN" och spara filen. </p> <p> Klicka på <strong>Försök igen</strong> knappen när du är klar.<br />><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank"> Mer information om att redigera web.config hittar du här.</a></p>]]></key>
+    <key alias="databaseNotFound"><![CDATA[<p>Databasen kunde inte hittas! Kontrollera att informationen i databasanslutnings-inställningarna i filen "web.config" är rätt.</p> <p>För att fortsätta måste du redigera filen "web.config" (du kan använda Visual Studio eller din favorit text-redigerare), bläddra till slutet, lägg till databasanslutnings-inställningarna för din databas i fältet som heter "umbracoDbDSN" och spara filen. </p> <p> Klicka på <strong>Försök igen</strong> knappen när du är klar.<br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">Mer information om att redigera web.config hittar du här</a>.</p>]]></key>
     <key alias="databaseText"><![CDATA[För att avsluta det här steget måste du veta lite information om din databasserver ("connection string").<br /> Eventuellt kan du behöva kontakta ditt webb-hotell. Om du installerar på en lokal maskin eller server kan du få informationen från din systemadministratör.]]></key>
     <key alias="databaseUpgrade"><![CDATA[<p> Tryck <strong>Uppgradera</strong> knappen för att uppgradera din databas till Umbraco %0%</p> <p> Du behöver inte vara orolig. Inget innehåll kommer att raderas och efteråt kommer allt att fungera som vanligt! </p>]]></key>
     <key alias="databaseUpgradeDone"><![CDATA[Din databas har nu uppgraderats till den senaste versionen %0%.<br />Tryck <strong>Nästa</strong> för att fortsätta.]]></key>
@@ -532,7 +532,7 @@
     <key alias="permissionsSettingUpPermissions">Konfigurerar mapprättigheter</key>
     <key alias="permissionsText">Umbraco behöver skriv/ändra rättigheter till vissa mappar för att spara filer som bilder och PDFer. Umbraco sparar också temporär data (så kallad cache) för att öka prestandan på din webbplats.</key>
     <key alias="runwayFromScratch">Jag vill börja från början</key>
-    <key alias="runwayFromScratchText"><![CDATA[Just nu är din webbplats för fullständigt tom och det är ju perfekt om du vill börja från början med att skapa dina egna dokumentyper och mallar. (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">lär dig hur</a>) Du kan fortfarande välja att installera Runway senare. Gå in i Utvecklarsektionen och välj Paket.]]></key>
+    <key alias="runwayFromScratchText"><![CDATA[Just nu är din webbplats för fullständigt tom och det är ju perfekt om du vill börja från början med att skapa dina egna dokumentyper och mallar. (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">lär dig hur</a>) Du kan fortfarande välja att installera Runway senare. Gå in i Utvecklarsektionen och välj Paket.]]></key>
     <key alias="runwayHeader">Du har just installerat en ren Umbraco platform. Vad vill du göra härnäst?</key>
     <key alias="runwayInstalled">Runway är installerat</key>
     <key alias="runwayInstalledText"><![CDATA[Du har nu grunden på plats. Välj vilka moduler du vill installera ovanpå den.<br /> Det här är vår lista över rekommenderade moduler, markera de moduler du vill installera, eller visa den <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">fullständiga listan</a>]]></key>
@@ -567,7 +567,7 @@
     <key alias="renewSession">Förnya nu för att spara ditt arbete</key>
   </area>
   <area alias="login">
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
     <key alias="greeting0">Happy super Sunday</key>
     <key alias="greeting1">Happy manic Monday</key>
     <key alias="greeting2">Happy tremendous Tuesday</key>
@@ -589,6 +589,11 @@
     <key alias="orClickHereToUpload">eller klicka här för att välja filer</key>
       <key alias="dragAndDropYourFilesIntoTheArea">Drag och släpp dina filer i denna yta</key>
   </area>
+  <area alias="member">
+        <key alias="createNewMember">Skapa en ny medlem</key>
+        <key alias="allMembers">Alla medlemmar</key>
+        <key alias="memberGroupNoProperties">Medlemsgrupper har inga extra egenskaper för redigering.</key>
+  </area>
   <area alias="moveOrCopy">
     <key alias="choose">Välj sida ovan...</key>
     <key alias="copyDone">%0% har kopierats till %1%</key>
@@ -736,8 +741,8 @@
     <key alias="tabs">Flikar</key>
   </area>
   <area alias="sort">
-    <key alias="sortOrder">Sort order</key>
-    <key alias="sortCreationDate">Creation date</key>
+    <key alias="sortOrder">Sortera ordningen</key>
+    <key alias="sortCreationDate">Skapandedatum</key>
     <key alias="sortDone">Sortering klar</key>
     <key alias="sortHelp">Välj i vilken ordning du vill ha sidorna genom att dra dem upp eller ner i listan. Du kan också klicka på kolumnrubrikerna för att sortera grupper av sidor</key>
     <key alias="sortPleaseWait"><![CDATA[Vänta medan sidorna sorteras. Det kan ta en stund.]]></key>
@@ -810,12 +815,12 @@
   </area>
   <area alias="grid">
     <key alias="media">Bild</key>
-    <key alias="macro">Macro</key>
+    <key alias="macro">Makro</key>
     <key alias="insertControl">Lägg till</key>
-    <key alias="chooseLayout">Choose layout</key>
+    <key alias="chooseLayout">Välj utformning</key>
     <key alias="addRows">Lägg till rad</key>
-    <key alias="addElement">Add content</key>
-    <key alias="dropElement">Drop content</key>
+    <key alias="addElement">Lägg till innehåll</key>
+    <key alias="dropElement">Släpp innehåll</key>
     <key alias="contentNotAllowed">Indholdet er ikke tilladt her</key>
     <key alias="contentAllowed">Indholdet er tilladt her</key>
     <key alias="clickToEmbed">Klicka för att lägga in</key>
@@ -842,7 +847,7 @@
   <area alias="templateEditor">
     <key alias="alternativeField">Alternativt fält</key>
     <key alias="alternativeText">Alternativ text</key>
-    <key alias="casing">Casing</key>
+    <key alias="casing">Hölje</key>
     <key alias="chooseField">Välj fält</key>
     <key alias="convertLineBreaks">Konvertera radbrytningar</key>
     <key alias="convertLineBreaksHelp">Byter radbrytningar mot html-taggen &amp;lt;br&amp;gt;</key>
@@ -864,7 +869,7 @@
     <key alias="standardFields">Standardfält</key>
     <key alias="uppercase">Versaler</key>
     <key alias="urlEncode">URL-koda</key>
-    <key alias="urlEncodeHelp">Om fältets innehåll skall sändas till en url, skall detta slås på så att specialtecken kodas</key>
+    <key alias="urlEncodeHelp">Om fältets innehåll skall sändas till en URL, skall detta slås på så att specialtecken kodas</key>
     <key alias="usedIfAllEmpty">Texten kommer användas om ovanstående fält är tomma</key>
     <key alias="usedIfEmpty">Fältet kommer användas om det primära fältet ovan är tomt</key>
     <key alias="withTime">Ja, med tid. Separator:</key>
@@ -958,7 +963,7 @@
     <key alias="lastLockoutDate">Senast utlåst</key>
     <key alias="lastLogin">Senast inloggad</key>
     <key alias="lastPasswordChangeDate">Lösenordet ändrades</key>
-    <key alias="loginname">Login</key>
+    <key alias="loginname">Logga in</key>
     <key alias="mediastartnode">Startnod i mediabiblioteket</key>
     <key alias="mediastartnodehelp">Begränsa media sectionen till en specifik startnod</key>
     <key alias="mediastartnodes">Media startnoder</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
index f998080b06..fa0f909bfb 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
@@ -5,365 +5,776 @@
     <link>https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files</link>
   </creator>
   <area alias="actions">
-    <key alias="assignDomain">Kültür ve Hostnames</key>
-    <key alias="auditTrail">Denetim Trail</key>
-    <key alias="browse">Düğüm Araştır</key>
-    <key alias="changeDocType">Belge Türü Değiştir</key>
-    <key alias="copy">Kopya</key>
+    <key alias="assignDomain">Kültür ve Ana Bilgisayar Adları</key>
+    <key alias="auditTrail">Denetim Yolu</key>
+    <key alias="browse">Düğüme Göz At</key>
+    <key alias="changeDocType">Belge Türünü Değiştir</key>
+    <key alias="copy">Kopyala</key>
     <key alias="create">Oluştur</key>
+    <key alias="export">Dışa Aktar</key>
     <key alias="createPackage">Paket Oluştur</key>
+    <key alias="createGroup">Grup oluştur</key>
     <key alias="delete">Sil</key>
     <key alias="disable">Devre Dışı Bırak</key>
-    <key alias="emptyRecycleBin">Geri Dönüşümü Boşat</key>
-    <key alias="exportDocumentType">Belge Türü Çıkart</key>
-    <key alias="importDocumentType">Belge Türü Al</key>
-    <key alias="importPackage">Paket Ekle</key>
-    <key alias="liveEdit">Tuval Düzele</key>
+    <key alias="editSettings">Ayarları düzenle</key>
+    <key alias="emptyRecycleBin">Geri dönüşüm kutusunu boşalt</key>
+    <key alias="enable">Etkinleştir</key>
+    <key alias="exportDocumentType">Belge Türünü Dışa Aktar</key>
+    <key alias="importDocumentType">Belge Türünü İçe Aktar</key>
+    <key alias="importPackage">Paketi İçe Aktar</key>
+    <key alias="liveEdit">Kanvas'ta Düzenle</key>
     <key alias="logout">Çıkış</key>
     <key alias="move">Taşı</key>
     <key alias="notify">Bildirimler</key>
-    <key alias="protect">Genel Erişim</key>
+    <key alias="protect">Genel erişim</key>
     <key alias="publish">Yayımla</key>
     <key alias="unpublish">Yayından Kaldır</key>
     <key alias="refreshNode">Yeniden Yükle</key>
-    <key alias="republish">Siteleri Yeniden Yayınla</key>
-    <key alias="restore" version="7.3.0">Düzelt</key>
+    <key alias="republish">Tüm siteyi yeniden yayınla</key>
+    <key alias="remove">Kaldır</key>
+    <key alias="rename" version="7.3.0">Yeniden adlandır</key>
+    <key alias="restore" version="7.3.0">Geri Yükle</key>
+    <key alias="SetPermissionsForThePage">%0% sayfası için izinleri ayarlayın</key>
+    <key alias="chooseWhereToCopy">Nereye kopyalayacağınızı seçin</key>
+    <key alias="chooseWhereToMove">Taşınacağınız yeri seçin</key>
+    <key alias="toInTheTreeStructureBelow">aşağıdaki ağaç yapısına</key>
+    <key alias="infiniteEditorChooseWhereToCopy">Seçili öğelerin nereye kopyalanacağını seçin</key>
+    <key alias="infiniteEditorChooseWhereToMove">Seçili öğelerin nereye taşınacağını seçin</key>
+    <key alias="wasMovedTo">konumuna taşındı,</key>
+    <key alias="wasCopiedTo">kopyalandı,</key>
+    <key alias="wasDeleted">silindi,</key>
     <key alias="rights">İzinler</key>
-    <key alias="rollback">Rollback</key>
-    <key alias="sendtopublish">Yayın için Gönder</key>
-    <key alias="sendToTranslate">Çeviri Gönder</key>
+    <key alias="rollback">Geri al</key>
+    <key alias="sendtopublish">Yayınlamak İçin Gönder</key>
+    <key alias="sendToTranslate">Çeviriye Gönder</key>
+    <key alias="setGroup">Grup ayarla</key>
     <key alias="sort">Sırala</key>
-    <key alias="toPublish">Yayına Gönder</key>
     <key alias="translate">Çevir</key>
     <key alias="update">Güncelle</key>
-    <key alias="defaultValue">Varsayılan Değer</key>
+    <key alias="setPermissions">İzinleri ayarlayın</key>
+    <key alias="unlock">Kilidi Aç</key>
+    <key alias="createblueprint">İçerik Şablonu Oluşturun</key>
+    <key alias="resendInvite">Daveti Yeniden Gönder</key>
+  </area>
+  <area alias="actionCategories">
+    <key alias="content">İçerik</key>
+    <key alias="administration">Yönetim</key>
+    <key alias="structure">Yapı</key>
+    <key alias="other">Diğer</key>
+  </area>
+  <area alias="actionDescriptions">
+    <key alias="assignDomain">Kültür ve ana bilgisayar adları atamak için erişime izin ver</key>
+    <key alias="auditTrail">Bir düğümün geçmiş günlüğünü görüntülemek için erişime izin ver</key>
+    <key alias="browse">Bir düğümü görüntülemek için erişime izin verin</key>
+    <key alias="changeDocType">Bir düğüm için belge türünü değiştirmek üzere erişime izin ver</key>
+    <key alias="copy">Bir düğümü kopyalamak için erişime izin ver</key>
+    <key alias="create">Düğüm oluşturmak için erişime izin verin</key>
+    <key alias="delete">Düğümleri silmek için erişime izin ver</key>
+    <key alias="move">Bir düğümü taşımak için erişime izin ver</key>
+    <key alias="protect">Erişime, bir düğüm için genel erişimi ayarlama ve değiştirme izni verme</key>
+    <key alias="publish">Bir düğüm yayınlamak için erişime izin verin</key>
+    <key alias="unpublish">Bir düğümü yayından kaldırmak için erişime izin ver</key>
+    <key alias="rights">Bir düğüm için izinleri değiştirmek üzere erişime izin ver</key>
+    <key alias="rollback">Bir düğümü önceki bir duruma geri döndürmek için erişime izin ver</key>
+    <key alias="sendtopublish">Yayınlamadan önce onay için bir düğüm gönderme erişimine izin ver</key>
+    <key alias="sendToTranslate">Çeviri için bir düğüm gönderme erişimine izin ver</key>
+    <key alias="sort">Düğümler için sıralama düzenini değiştirmek için erişime izin ver</key>
+    <key alias="translate">Bir düğümü çevirmek için erişime izin ver</key>
+    <key alias="update">Bir düğümü kaydetme erişimine izin ver</key>
+    <key alias="createblueprint">İçerik Şablonu oluşturma erişimine izin verin</key>
+  </area>
+  <area alias="apps">
+    <key alias="umbContent">İçerik</key>
+    <key alias="umbInfo">Bilgi</key>
   </area>
   <area alias="assignDomain">
     <key alias="permissionDenied">İzin reddedildi.</key>
-    <key alias="addNew">Yeni Domain ekle</key>
+    <key alias="addNew">Yeni Alan Ekle</key>
     <key alias="remove">kaldır</key>
-    <key alias="invalidNode">Geçersiz node.</key>
-    <key alias="invalidDomain">Geçersiz domain biçimi.</key>
-    <key alias="duplicateDomain">Domain zaten eklenmiş.</key>
+    <key alias="invalidNode">Geçersiz düğüm.</key>
+    <key alias="invalidDomain">Bir veya daha fazla alanın biçimi geçersiz.</key>
+    <key alias="duplicateDomain">Etki alanı zaten atanmış.</key>
     <key alias="language">Dil</key>
-    <key alias="domain">Domain</key>
-    <key alias="domainCreated">Yeni domain '%0%' oluşturuldu</key>
-    <key alias="domainDeleted">Domain '%0%' silindi</key>
-    <key alias="domainExists">Domain '%0%' zaten atanmış</key>
-    <key alias="domainUpdated">Domain '%0%' güncellendi</key>
-    <key alias="orEdit">Geçerli domain düzenle</key>
-    <key alias="inherit">Miras Al</key>
+    <key alias="domain">Alan</key>
+    <key alias="domainCreated">Yeni '%0%' etki alanı oluşturuldu</key>
+    <key alias="domainDeleted">'%0%' alan adı silindi</key>
+    <key alias="domainExists">'%0%' etki alanı zaten atanmış</key>
+    <key alias="domainUpdated">'%0%' etki alanı güncellendi</key>
+    <key alias="orEdit">Mevcut Etki Alanlarını Düzenle</key>
+    <key alias="domainHelpWithVariants">
+      <![CDATA[Geçerli alan adları: "example.com", "www.example.com", "example.com:8080" veya "https://www.example.com/".
+     Ayrıca, alanlardaki tek seviyeli yollar da desteklenir, örn. "example.com/tr" veya "/en".]]>
+    </key>
+    <key alias="inherit">Devral</key>
     <key alias="setLanguage">Kültür</key>
-    <key alias="setLanguageHelp"><![CDATA[Geçerli düğümün altındaki düğümler için kültür Set <br /> veya üst düğümleri kültürünü devralır. Ayrıca <br /> geçerli olacaktır
-      Geçerli düğümün , bir etki altında çok uygulanmadığı sürece .]]></key>
-    <key alias="setDomains">Domainler</key>
+    <key alias="setLanguageHelp">
+      <![CDATA[Geçerli düğümün altındaki düğümler için kültürü ayarlayın, <br /> veya kültürü üst düğümlerden devralın. Ayrıca <br /> 
+        aşağıdaki alan da geçerli değilse geçerli düğüme.]]>
+    </key>
+    <key alias="setDomains">Alanlar</key>
+  </area>
+  <area alias="buttons">
+    <key alias="clearSelection">Seçimi temizle</key>
+    <key alias="select">Seç</key>
+    <key alias="somethingElse">Başka bir şey yapın</key>
+    <key alias="bold">Kalın</key>
+    <key alias="deindent">Paragraf Girintisini İptal Et</key>
+    <key alias="formFieldInsert">Form alanı ekle</key>
+    <key alias="graphicHeadline">Grafik başlığı ekle</key>
+    <key alias="htmlEdit">Html'yi Düzenle</key>
+    <key alias="indent">Paragrafı Girintile</key>
+    <key alias="italic">İtalik</key>
+    <key alias="justifyCenter">Ortala</key>
+    <key alias="justifyLeft">Sola Yasla</key>
+    <key alias="justifyRight">Sağa Yasla</key>
+    <key alias="linkInsert">Bağlantı Ekle</key>
+    <key alias="linkLocal">Yerel bağlantı ekle (bağlantı)</key>
+    <key alias="listBullet">Madde İşareti Listesi</key>
+    <key alias="listNumeric">Sayısal Liste</key>
+    <key alias="macroInsert">Makro ekle</key>
+    <key alias="pictureInsert">Resim ekle</key>
+    <key alias="publishAndClose">Yayınlayın ve kapatın</key>
+    <key alias="publishDescendants">Nesillerle yayınlayın</key>
+    <key alias="relations">İlişkileri düzenle</key>
+    <key alias="returnToList">Listeye dön</key>
+    <key alias="save">Kaydet</key>
+    <key alias="saveAndClose">Kaydet ve kapat</key>
+    <key alias="saveAndPublish">Kaydet ve yayınla</key>
+    <key alias="saveAndSchedule">Kaydet ve planla</key>
+    <key alias="saveToPublish">Kaydet ve onaya gönder</key>
+    <key alias="saveListView">Liste görünümünü kaydet</key>
+    <key alias="schedPublish">Planla</key>
+    <key alias="showPage">Önizleme</key>
+    <key alias="saveAndPreview">Kaydet ve önizle</key>
+    <key alias="showPageDisabled">Atanmış şablon olmadığından önizleme devre dışı bırakıldı</key>
+    <key alias="styleChoose">Stil seçin</key>
+    <key alias="styleShow">Stilleri göster</key>
+    <key alias="tableInsert">Tablo ekle</key>
+    <key alias="saveAndGenerateModels">Modelleri kaydedin ve oluşturun</key>
+    <key alias="undo">Geri Al</key>
+    <key alias="redo">Yeniden yap</key>
+    <key alias="deleteTag">Etiketi sil</key>
+    <key alias="confirmActionCancel">İptal</key>
+    <key alias="confirmActionConfirm">Onayla</key>
+    <key alias="morePublishingOptions">Daha fazla yayınlama seçeneği</key>
+    <key alias="submitChanges">Gönder</key>
+    <key alias="submitChangesAndClose">Gönder ve kapat</key>
   </area>
   <area alias="auditTrails">
     <key alias="atViewingFor">Görüntüleniyor</key>
-  </area>
-  <area alias="buttons">
-    <key alias="select">Seç</key>
-    <key alias="somethingElse">Başka birşey yapın</key>
-    <key alias="bold">Kalın</key>
-    <key alias="deindent">Paragraf girinti iptal</key>
-    <key alias="formFieldInsert">Form alanı ekle</key>
-    <key alias="graphicHeadline">Grafik başlık ekle</key>
-    <key alias="htmlEdit">Html Düzenle</key>
-    <key alias="indent">Paragraf girintisi</key>
-    <key alias="italic">Yatık</key>
-    <key alias="justifyCenter">Ortalı</key>
-    <key alias="justifyLeft">Sola Yasla</key>
-    <key alias="justifyRight">Sağa Yasla</key>
-    <key alias="linkInsert">Link ekle</key>
-    <key alias="linkLocal">Yerel bağlantı ekle</key>
-    <key alias="listBullet">Bulet listesi</key>
-    <key alias="listNumeric">Sayısal Liste</key>
-    <key alias="macroInsert">Macro ekle</key>
-    <key alias="pictureInsert">Resim ekle</key>
-    <key alias="relations">Düzenleme ilişkileri</key>
-    <key alias="returnToList">Listeye Dön</key>
-    <key alias="save">Kaydet</key>
-    <key alias="saveAndPublish">Kaydet ve Yayınla</key>
-    <key alias="saveToPublish">Kaydet ve Onay için gönder</key>
-    <key alias="saveAndPreview">Önizle</key>
-    <key alias="showPageDisabled">Önizleme kapalı, Atanmış şablon yok</key>
-    <key alias="styleChoose">Stili seçin</key>
-    <key alias="styleShow">Stilleri Göster</key>
-    <key alias="tableInsert">Tablo Ekle</key>
+    <key alias="delete">İçerik silindi</key>
+    <key alias="unpublish">Yayınlanmamış içerik</key>
+    <key alias="publish">Kaydedilen ve Yayınlanan İçerik</key>
+    <key alias="publishvariant">Diller için kaydedilen ve yayınlanan içerik: %0%</key>
+    <key alias="save">İçerik kaydedildi</key>
+    <key alias="savevariant">Diller için kaydedilen içerik: %0%</key>
+    <key alias="move">İçerik taşındı</key>
+    <key alias="copy">İçerik kopyalandı</key>
+    <key alias="rollback">İçerik geri alındı ​​</key>
+    <key alias="sendtopublish">Yayınlanmak için gönderilen içerik</key>
+    <key alias="sendtopublishvariant">Diller için yayınlanmak üzere gönderilen içerik: %0%</key>
+    <key alias="sort">Kullanıcı tarafından gerçekleştirilen alt öğeleri sıralama</key>
+    <key alias="custom">%0%</key>
+    <key alias="smallCopy">Kopyala</key>
+    <key alias="smallPublish">Yayınla</key>
+    <key alias="smallPublishVariant">Yayınla</key>
+    <key alias="smallMove">Taşı</key>
+    <key alias="smallSave">Kaydet</key>
+    <key alias="smallSaveVariant">Kaydet</key>
+    <key alias="smallDelete">Sil</key>
+    <key alias="smallUnpublish">Yayından Kaldır</key>
+    <key alias="smallRollBack">Geri Al</key>
+    <key alias="smallSendToPublish">Yayınlamak İçin Gönder</key>
+    <key alias="smallSendToPublishVariant">Yayınlamak İçin Gönder</key>
+    <key alias="smallSort">Sırala</key>
+    <key alias="smallCustom">Özel</key>
+    <key alias="historyIncludingVariants">Geçmiş (tüm varyantlar)</key>
   </area>
   <area alias="changeDocType">
-    <key alias="changeDocTypeInstruction">Seçilen içerik için belge türünü değiştirmek için , öncelikle bu konum için geçerli türleri listesinden seçim yapın.</key>
-    <key alias="changeDocTypeInstruction2">Ardından onaylamak ve / veya yeni akım tip özellikleri haritalama değişiklik ve Kaydet'i tıklatın .</key>
-    <key alias="contentRepublished">İçerik yeniden yayımlanmıştır .</key>
-    <key alias="currentProperty">Güncel Mülkiyet</key>
-    <key alias="currentType">Güncel tip</key>
-    <key alias="docTypeCannotBeChanged">Bu konum için geçerli hiçbir alternatifi olduğu gibi belge türü , değiştirilemez . Seçilen içerik öğesinin ebeveyn altında izin verilir ve mevcut tüm alt içerik öğeleri altında oluşturulacak izin eğer bir alternatif geçerli olacaktır .</key>
-    <key alias="docTypeChanged">Belge Türü değiştirildi</key>
-    <key alias="mapProperties">harita Özellikleri</key>
-    <key alias="mapToProperty">Mülkiyet Harita</key>
+    <key alias="changeDocTypeInstruction">Seçilen içeriğin belge türünü değiştirmek için, önce bu konum için geçerli türler listesinden seçin.</key>
+    <key alias="changeDocTypeInstruction2">Ardından, mevcut türden özellik eşlemesini onaylayın ve / veya yenisiyle değiştirin ve Kaydet'i tıklayın.</key>
+    <key alias="contentRepublished">İçerik yeniden yayınlandı.</key>
+    <key alias="currentProperty">Mevcut Mülk</key>
+    <key alias="currentType">Mevcut tür</key>
+    <key alias="docTypeCannotBeChanged">Bu konum için geçerli bir alternatif olmadığından belge türü değiştirilemez. Seçilen içerik öğesinin üst öğesi altında izin verilirse ve mevcut tüm alt içerik öğelerinin onun altında oluşturulmasına izin verilirse bir alternatif geçerli olacaktır.</key>
+    <key alias="docTypeChanged">Doküman Türü Değiştirildi</key>
+    <key alias="mapProperties">Harita Özellikleri</key>
+    <key alias="mapToProperty">Mülke Eşle</key>
     <key alias="newTemplate">Yeni Şablon</key>
-    <key alias="newType">Yeni Tip</key>
+    <key alias="newType">Yeni Tür</key>
     <key alias="none">Hiçbiri</key>
     <key alias="selectedContent">İçerik</key>
-    <key alias="selectNewDocType">Yeni Belge Tipi Seçiniz</key>
-    <key alias="successMessage">Seçilen içeriğin belge türü başarıyla [ yeni tip ] değişti ve aşağıdaki özellikleri eşleştirilmiş edilmiştir :</key>
+    <key alias="selectNewDocType">Yeni Belge Türünü Seçin</key>
+    <key alias="successMessage">Seçilen içeriğin belge türü başarıyla [yeni tür] olarak değiştirildi ve aşağıdaki özellikler eşlendi:</key>
     <key alias="to">için</key>
-    <key alias="validationErrorPropertyWithMoreThanOneMapping">Bir veya daha fazla özellikleri olarak mülkiyet haritalama tamamlayamadı birden fazla eşleme tanımlanmış var.</key>
-    <key alias="validDocTypesNote">Bulunduğunuz yerin için geçerli Sadece alternatif türleri görüntülenir.</key>
+    <key alias="validationErrorPropertyWithMoreThanOneMapping">Bir veya daha fazla özelliğin tanımlanmış birden fazla eşlemesi olduğundan özellik eşlemesi tamamlanamadı.</key>
+    <key alias="validDocTypesNote">Yalnızca mevcut konum için geçerli olan alternatif türler görüntülenir.</key>
+  </area>
+  <area alias="codefile">
+    <key alias="createFolderFailedById">%0% kimliğine sahip ebeveyn altında klasör oluşturulamadı</key>
+    <key alias="createFolderFailedByName">%0% adıyla ebeveyn altında klasör oluşturulamadı</key>
+    <key alias="createFolderIllegalChars">Klasör adı geçersiz karakterler içeremez.</key>
+    <key alias="deleteItemFailed">Öğe silinemedi: %0%</key>
   </area>
   <area alias="content">
-    <key alias="isPublished" version="7.2">Yayımlandı</key>
+    <key alias="isPublished" version="7.2">Yayınlandı</key>
     <key alias="about">Bu sayfa hakkında</key>
-    <key alias="alias">takma ad</key>
-    <key alias="alternativeTextHelp">( nasıl telefon üzerinden resim anlatırsınız )</key>
-    <key alias="alternativeUrls">Alternatif Linkler</key>
+    <key alias="alias">Takma ad</key>
+    <key alias="alternativeTextHelp">(resmi telefonda nasıl tarif edersiniz)</key>
+    <key alias="alternativeUrls">Alternatif Bağlantılar</key>
     <key alias="clickToEdit">Bu öğeyi düzenlemek için tıklayın</key>
-    <key alias="createBy">Tarafından yaratıldı</key>
-    <key alias="createByDesc" version="7.0">orijinal yazar</key>
-    <key alias="updatedBy" version="7.0">tarafından güncellendi</key>
-    <key alias="createDate">oluşturuldu</key>
-    <key alias="createDateDesc" version="7.0">Bu belgenin oluşturulduğu tarih / zaman</key>
+    <key alias="createBy">Oluşturan</key>
+    <key alias="createByDesc" version="7.0">Orijinal yazar</key>
+    <key alias="updatedBy" version="7.0">Güncelleyen</key>
+    <key alias="createDate">Oluşturuldu</key>
+    <key alias="createDateDesc" version="7.0">Bu belgenin oluşturulduğu tarih / saat</key>
     <key alias="documentType">Belge Türü</key>
-    <key alias="editing">kurgu</key>
-    <key alias="expireDate">en kaldır</key>
-    <key alias="itemChanged">Bu madde yayınlanmasından sonra değiştirildi</key>
+    <key alias="editing">Düzenle</key>
+    <key alias="expireDate">Kaldır</key>
+    <key alias="itemChanged">Bu öğe yayınlandıktan sonra değiştirildi</key>
     <key alias="itemNotPublished">Bu öğe yayınlanmadı</key>
     <key alias="lastPublished">Son yayınlanan</key>
+    <key alias="noItemsToShow">Gösterilecek öğe yok</key>
     <key alias="listViewNoItems" version="7.1.5">Listede gösterilecek öğe yok.</key>
+    <key alias="listViewNoContent">Hiçbir içerik eklenmedi</key>
+    <key alias="listViewNoMembers">Üye eklenmedi</key>
     <key alias="mediatype">Medya Türü</key>
-    <key alias="mediaLinks">Medya öğesinin bağlantı ( lar)</key>
+    <key alias="mediaLinks">Medya öğelerine bağlantı</key>
     <key alias="membergroup">Üye Grubu</key>
-    <key alias="memberrole">rol</key>
+    <key alias="memberrole">Rol</key>
     <key alias="membertype">Üye Türü</key>
-    <key alias="noDate">Hiçbir tarih seçildi</key>
+    <key alias="noChanges">Hiçbir değişiklik yapılmadı</key>
+    <key alias="noDate">Tarih seçilmedi</key>
     <key alias="nodeName">Sayfa başlığı</key>
+    <key alias="noMediaLink">Bu medya öğesinin bağlantısı yok</key>
     <key alias="otherElements">Özellikler</key>
-    <key alias="parentNotPublished">Ebeveyn ' %0% ' yayımlanmamış olduğu için bu belge yayınladı ama görünür değildir</key>
-    <key alias="parentNotPublishedAnomaly">Hata : Bu ​​belge yayınlandı ancak önbellek ( iç hata ) değil</key>
-    <key alias="publish">yayınlamak</key>
-    <key alias="publishStatus">Yayın Durum</key>
-    <key alias="releaseDate">en Yayınla</key>
-    <key alias="unpublishDate">en yayından</key>
-    <key alias="removeDate">temizle tarihi</key>
-    <key alias="sortDone">Sıralama güncellenir</key>
-    <key alias="sortHelp">Düğümlerini sıralamak için, sadece düğümleri sürükleyin veya sütun başlıkları birini tıklatın . Seçerken " shift " veya " kontrol " tuşunu basılı tutarak birden fazla düğüm seçebilirsiniz</key>
-    <key alias="statistics">istatistik</key>
+    <key alias="parentNotPublished">Bu belge yayınlandı, ancak '%0%' üst öğesi yayından kaldırıldığı için görünmüyor</key>
+    <key alias="parentCultureNotPublished">Bu kültür yayınlandı, ancak '%0%' üst öğe üzerinde yayınlanmadığı için görünmüyor</key>
+    <key alias="parentNotPublishedAnomaly">Bu belge yayınlandı, ancak önbellekte yok</key>
+    <key alias="getUrlException">URL alınamadı</key>
+    <key alias="routeError">Bu belge yayınlandı, ancak url'si %0% içeriğiyle çakışacak</key>
+    <key alias="routeErrorCannotRoute">Bu belge yayınlandı, ancak url'si yönlendirilemez</key>
+    <key alias="publish">Yayınla</key>
+    <key alias="published">Yayınlandı</key>
+    <key alias="publishedPendingChanges">Yayınlandı (bekleyen değişiklikler)</key>
+    <key alias="publishStatus">Yayın Durumu</key>
+    <key alias="publishDescendantsHelp"><![CDATA[<strong>%0%</strong> ve altındaki tüm içerik öğelerini yayınlayın ve böylece içeriğini herkese açık hale getirin.]]></key>
+    <key alias="publishDescendantsWithVariantsHelp"><![CDATA[Altında aynı türdeki varyantları ve varyantları yayınlayın ve böylece içeriklerini herkese açık hale getirin.]]></key>
+    <key alias="releaseDate">Yayınla</key>
+    <key alias="unpublishDate">Yayından kaldır</key>
+    <key alias="removeDate">Tarihi Temizle</key>
+    <key alias="setDate">Tarihi ayarla</key>
+    <key alias="sortDone">Sıralayıcı güncellendi</key>
+    <key alias="sortHelp">Düğümleri sıralamak için, düğümleri sürükleyin veya sütun başlıklarından birine tıklayın. Seçerken "shift" veya "kontrol" tuşunu basılı tutarak birden fazla düğüm seçebilirsiniz</key>
+    <key alias="statistics">İstatistikler</key>
     <key alias="titleOptional">Başlık (isteğe bağlı)</key>
     <key alias="altTextOptional">Alternatif metin (isteğe bağlı)</key>
-    <key alias="type">tip</key>
-    <key alias="unpublish">Yayından</key>
+    <key alias="type">Tür</key>
+    <key alias="unpublish">Yayından Kaldır</key>
+    <key alias="unpublished">Yayınlanmadı</key>
     <key alias="updateDate">Son düzenleme</key>
-    <key alias="updateDateDesc" version="7.0">Bu belgenin düzenlendiği tarih / zaman</key>
-    <key alias="uploadClear">Dosya(ları) kaldırın</key>
-    <key alias="urls">Belgeye Bağlantı</key>
-    <key alias="memberof">Grubun Üyesi(leri)</key>
-    <key alias="notmemberof">Grubun bir üyesi değil</key>
-    <key alias="childItems" version="7.0">Çocuk öğeleri</key>
-    <key alias="target" version="7.0">hedef</key>
+    <key alias="updateDateDesc" version="7.0">Bu belgenin düzenlendiği tarih / saat</key>
+    <key alias="uploadClear">Dosyaları kaldırın</key>
+    <key alias="uploadClearImageContext">Resmi medya öğesinden kaldırmak için burayı tıklayın</key>
+    <key alias="uploadClearFileContext">Dosyayı medya öğesinden kaldırmak için burayı tıklayın</key>
+    <key alias="urls">Belgeye bağlantı</key>
+    <key alias="memberof">Grup(lar) ın üyesi</key>
+    <key alias="notmemberof">Grup(lar) ın üyesi değil</key>
+    <key alias="childItems" version="7.0">Alt öğeler</key>
+    <key alias="target" version="7.0">Hedef</key>
+    <key alias="scheduledPublishServerTime">Bu, sunucuda şu zamana çevrilir:</key>
+    <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.com/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_ blank">Ne bu ne anlama geliyor? </a>]]></key>
+    <key alias="nestedContentDeleteItem">Bu öğeyi silmek istediğinizden emin misiniz?</key>
+    <key alias="nestedContentEditorNotSupported">%0% özelliği,%1% düzenleyiciyi kullanıyor ve bu, Yuvalanmış İçerik tarafından desteklenmiyor.</key>
+    <key alias="nestedContentDeleteAllItems">Tüm öğeleri silmek istediğinizden emin misiniz?</key>
+    <key alias="nestedContentNoContentTypes">Bu özellik için hiçbir içerik türü yapılandırılmadı.</key>
+    <key alias="nestedContentAddElementType">Öğe türü ekle</key>
+    <key alias="nestedContentSelectElementTypeModalTitle">Öğe türünü seçin</key>
+    <key alias="nestedContentGroupHelpText">Özelliklerinin görüntülenmesi gereken grubu seçin. Boş bırakılırsa, eleman türündeki ilk grup kullanılacaktır.</key>
+    <key alias="nestedContentTemplateHelpTextPart1">Adını her bir öğeyle karşılaştırmak için açısal bir ifade girin. kullanın </key>
+    <key alias="nestedContentTemplateHelpTextPart2">öğe dizinini görüntülemek için</key>
+    <key alias="addTextBox">Başka bir metin kutusu ekle</key>
+    <key alias="removeTextBox">Bu metin kutusunu kaldırın</key>
+    <key alias="contentRoot">İçerik Kökü</key>
+    <key alias="includeUnpublished">Yayınlanmamış içerik öğelerini dahil edin.</key>
+    <key alias="isSensitiveValue">Bu değer gizlidir. Bu değeri görüntülemek için erişime ihtiyacınız varsa, lütfen web sitesi yöneticinizle iletişime geçin.</key>
+    <key alias="isSensitiveValue_short">Bu değer gizlidir.</key>
+    <key alias="languagesToPublishForFirstTime">Hangi dilleri yayınlamak istersiniz? İçeriği olan tüm diller kaydedilir!</key>
+    <key alias="languagesToPublish">Hangi dilleri yayınlamak istersiniz?</key>
+    <key alias="languagesToSave">Hangi dilleri kaydetmek istersiniz?</key>
+    <key alias="languagesToSaveForFirstTime">İçeriği olan tüm diller oluşturma sırasında kaydedilir!</key>
+    <key alias="languagesToSendForApproval">Onay için hangi dilleri göndermek istersiniz?</key>
+    <key alias="languagesToSchedule">Hangi dilleri planlamak istersiniz?</key>
+    <key alias="languagesToUnpublish">Yayından kaldırılacak dilleri seçin. Zorunlu bir dilin yayından kaldırılması tüm dilleri yayından kaldırır.</key>
+    <key alias="publishedLanguages">Yayınlanan Diller</key>
+    <key alias="unpublishedLanguages">Yayınlanmamış Diller</key>
+    <key alias="unmodifiedLanguages">Değiştirilmemiş Diller</key>
+    <key alias="untouchedLanguagesForFirstTime">Bu diller oluşturulmadı</key>
+
+    <key alias="variantsWillBeSaved">Tüm yeni varyantlar kaydedilecektir.</key>
+    <key alias="variantsToPublish">Hangi çeşitleri yayınlamak istersiniz?</key>
+    <key alias="variantsToSave">Hangi değişkenlerin kaydedileceğini seçin.</key>
+    <key alias="variantsToSendForApproval">Onaya gönderilecek çeşitleri seçin.</key>
+    <key alias="variantsToSchedule">Planlanmış yayınlamayı ayarlayın...</key>
+    <key alias="variantsToUnpublish">Yayından kaldırılacak varyantları seçin. Zorunlu bir dilin yayından kaldırılması tüm değişkenleri yayından kaldıracaktır.</key>
+    <key alias="publishRequiresVariants">Yayınlamanın gerçekleşmesi için aşağıdaki varyantlar gereklidir:</key>
+
+    <key alias="notReadyToPublish">Yayınlamaya hazır değiliz</key>
+    <key alias="readyToPublish">Yayınlamaya hazır mısınız?</key>
+    <key alias="readyToSave">Kaydetmeye Hazır mısınız?</key>
+    <key alias="sendForApproval">Onaya gönder</key>
+    <key alias="schedulePublishHelp">İçerik öğesini yayınlamak ve / veya yayından kaldırmak için tarih ve saati seçin.</key>
+    <key alias="createEmpty">Yeni oluştur</key>
+    <key alias="createFromClipboard">Panodan yapıştır</key>
+    <key alias="nodeIsInTrash">Bu öğe Geri Dönüşüm Kutusu'nda</key>
+  </area>
+  <area alias="blueprints">
+    <key alias="createBlueprintFrom">'%0%' den yeni bir İçerik Şablonu oluşturun</key>
+    <key alias="blankBlueprint">Boş</key>
+    <key alias="selectBlueprint">Bir İçerik Şablonu Seçin</key>
+    <key alias="createdBlueprintHeading">İçerik Şablonu oluşturuldu</key>
+    <key alias="createdBlueprintMessage">'%0%' üzerinden bir İçerik Şablonu oluşturuldu</key>
+    <key alias="duplicateBlueprintMessage">Aynı ada sahip başka bir İçerik Şablonu zaten var</key>
+    <key alias="blueprintDescription">İçerik Şablonu, bir düzenleyicinin yeni içerik oluşturmak için temel olarak kullanmak üzere seçebileceği önceden tanımlanmış içeriktir</key>
   </area>
   <area alias="media">
     <key alias="clickToUpload">Yüklemek için tıklayın</key>
+    <key alias="orClickHereToUpload">veya dosyaları seçmek için burayı tıklayın</key>
+    <key alias="dragFilesHereToUpload">Dosyaları yüklemek için buraya sürükleyebilirsiniz</key>
+    <key alias="disallowedFileType">Bu dosya yüklenemiyor, onaylanmış bir dosya türüne sahip değil</key>
+    <key alias="maxFileSize">Maksimum dosya boyutu</key>
+    <key alias="mediaRoot">Medya kökü</key>
+    <key alias="moveFailed">Medya taşınamadı</key>
+    <key alias="copyFailed">Medya kopyalanamadı</key>
+    <key alias="createFolderFailed">%0% üst kimliği altında klasör oluşturulamadı</key>
+    <key alias="renameFolderFailed">%0% kimliğine sahip klasör yeniden adlandırılamadı</key>
+    <key alias="dragAndDropYourFilesIntoTheArea">Dosyalarınızı alana sürükleyip bırakın</key>
+  </area>
+  <area alias="member">
+    <key alias="createNewMember">Yeni üye oluştur</key>
+    <key alias="allMembers">Tüm Üyeler</key>
+    <key alias="memberGroupNoProperties">Üye gruplarının düzenlenecek ek özellikleri yoktur.</key>
   </area>
   <area alias="create">
-    <key alias="chooseNode">Nerede yeni %0% yaratmak istiyorsun</key>
+    <key alias="chooseNode">Yeni %0% 'i nerede oluşturmak istiyorsunuz</key>
     <key alias="createUnder">Altında bir öğe oluşturun</key>
-    <key alias="updateData">Bir tür ve bir başlık seçin</key>
-    <key alias="noDocumentTypes" version="7.0"><![CDATA[Hiçbir izin belge türleri mevcut. Sen altında ayarlar bölümünde bu etkinleştirmeniz gerekir <strong>"belge türleri"</strong>.]]></key>
-    <key alias="noMediaTypes" version="7.0"><![CDATA[Hiçbir izin verilen ortam tipi mevcuttur . Sen altında ayarlar bölümünde bu etkinleştirmeniz gerekir <strong>"ortam türleri"</strong>.]]></key>
+    <key alias="createContentBlueprint">İçerik şablonu yapmak istediğiniz belge türünü seçin</key>
+    <key alias="enterFolderName">Bir klasör adı girin</key>
+    <key alias="updateData">Bir tür ve başlık seçin</key>
+    <key alias="noDocumentTypes" version="7.0"><![CDATA[Burada içerik oluşturmak için izin verilen doküman türü yok. Bunları, <strong>İzinler</strong> altında <strong>İzin verilen alt düğüm türlerini</strong> düzenleyerek <strong>Ayarlar</strong> bölümündeki <strong>Belge Türleri</strong> 'nde etkinleştirmelisiniz.]]></key>
+    <key alias="noDocumentTypesAtRoot"><![CDATA[Burada içerik oluşturmak için uygun belge türü yok. Bunları <strong>Ayarlar</strong> bölümündeki <strong>Belge Türleri</strong> 'nde oluşturmanız gerekir.]]></key>
+    <key alias="noDocumentTypesWithNoSettingsAccess">İçerik ağacında seçilen sayfa, altında herhangi bir sayfanın oluşturulmasına izin vermiyor.</key>
+    <key alias="noDocumentTypesEditPermissions">Bu belge türü için izinleri düzenleyin</key>
+    <key alias="noDocumentTypesCreateNew">Yeni bir belge türü oluşturun</key>
+    <key alias="noDocumentTypesAllowedAtRoot"><![CDATA[Burada içerik oluşturmak için izin verilen belge türü yok. Bunları, <strong>İzinler</strong> altında <strong>Kök olarak izin ver</strong> seçeneğini değiştirerek, <strong>Ayarlar</strong> bölümündeki <strong>Belge Türleri</strong> 'nde etkinleştirmeniz gerekir. ]]></key>
+    <key alias="noMediaTypes" version="7.0"><![CDATA[Burada medya oluşturmak için izin verilen medya türü yok. Bunları, <strong>İzinler</strong> altında <strong>İzin verilen alt düğüm türlerini</strong> düzenleyerek <strong>Ayarlar</strong> bölümündeki <strong>Medya Türleri</strong> 'nde etkinleştirmelisiniz. .]]></key>
+    <key alias="noMediaTypesWithNoSettingsAccess">Ağaçtaki seçili ortam, altında başka bir ortamın oluşturulmasına izin vermiyor.</key>
+    <key alias="noMediaTypesEditPermissions">Bu medya türü için izinleri düzenleyin</key>
+    <key alias="documentTypeWithoutTemplate">Şablonsuz Belge Türü</key>
+    <key alias="newFolder">Yeni klasör</key>
+    <key alias="newDataType">Yeni veri türü</key>
+    <key alias="newJavascriptFile">Yeni JavaScript dosyası</key>
+    <key alias="newEmptyPartialView">Yeni boş kısmi görünüm</key>
+    <key alias="newPartialViewMacro">Yeni kısmi görünüm makrosu</key>
+    <key alias="newPartialViewFromSnippet">Ön bilgiden yeni kısmi görünüm</key>
+    <key alias="newPartialViewMacroFromSnippet">Snippet'ten yeni kısmi görünüm makrosu</key>
+    <key alias="newPartialViewMacroNoMacro">Yeni kısmi görünüm makrosu (makrosuz)</key>
+    <key alias="newStyleSheetFile">Yeni stil sayfası dosyası</key>
+    <key alias="newRteStyleSheetFile">Yeni Zengin Metin Düzenleyicisi stil sayfası dosyası</key>
   </area>
   <area alias="dashboard">
-    <key alias="browser">Web sitenizi tarayın</key>
-    <key alias="dontShowAgain">- gizle</key>
-    <key alias="nothinghappens">CMS açılış değilse , bu siteden pop-up izin gerekebilir</key>
-    <key alias="openinnew">Yeni bir pencere açtı</key>
-    <key alias="restart">Tekrar başlat</key>
-    <key alias="visit">ziyaret</key>
-    <key alias="welcome">hoşgeldiniz</key>
+    <key alias="browser">Web sitenize göz atın</key>
+    <key alias="dontShowAgain">- Gizle</key>
+    <key alias="nothinghappens">Umbraco açılmıyorsa, bu siteden pop-up'lara izin vermeniz gerekebilir</key>
+    <key alias="openinnew">yeni bir pencerede açıldı</key>
+    <key alias="restart">Yeniden Başlat</key>
+    <key alias="visit">Ziyaret edin</key>
+    <key alias="welcome">Hoş geldiniz</key>
+  </area>
+  <area alias="prompt">
+    <key alias="stay">Kal</key>
+    <key alias="discardChanges">Değişiklikleri sil</key>
+    <key alias="unsavedChanges">Kaydedilmemiş değişiklikleriniz var</key>
+    <key alias="unsavedChangesWarning">Bu sayfadan ayrılmak istediğinizden emin misiniz? - kaydedilmemiş değişiklikleriniz var</key>
+    <key alias="confirmListViewPublish">Yayınlama, seçili öğelerin sitede görünür olmasını sağlar.</key>
+    <key alias="confirmListViewUnpublish">Yayından kaldırıldığında, seçili öğeler ve bunların tüm alt öğeleri siteden kaldırılır.</key>
+    <key alias="confirmUnpublish">Yayından kaldırıldığında bu sayfa ve tüm soyundan gelenler siteden kaldırılır.</key>
+    <key alias="doctypeChangeWarning">Kaydedilmemiş değişiklikleriniz var. Belge Türünde değişiklik yapmak değişiklikleri geçersiz kılacaktır.</key>
+  </area>
+  <area alias="bulk">
+    <key alias="done">Bitti</key>
+    <key alias="deletedItem">%0% öğe silindi</key>
+    <key alias="deletedItems">%0% öğe silindi</key>
+    <key alias="deletedItemOfItem">%1% öğeden %0% silindi</key>
+    <key alias="deletedItemOfItems">%1% öğeden %0% silindi</key>
+    <key alias="publishedItem">%0% öğe yayınlandı</key>
+    <key alias="publishedItems">%0% öğe yayınlandı</key>
+    <key alias="publishedItemOfItem">%1% öğeden %0% yayınlandı</key>
+    <key alias="publishedItemOfItems">%1% öğeden %0% yayınlandı</key>
+    <key alias="unpublishedItem">Yayınlanmamış %0% öğe</key>
+    <key alias="unpublishedItems">Yayınlanmamış %0% öğe</key>
+    <key alias="unpublishedItemOfItem">Yayınlanmamış%1% öğeden %0%</key>
+    <key alias="unpublishedItemOfItems">Yayınlanmamış%1% öğeden %0%</key>
+    <key alias="movedItem">%0% öğe taşındı</key>
+    <key alias="movedItems">%0% öğe taşındı</key>
+    <key alias="movedItemOfItem">%0%,%1% öğeden taşındı</key>
+    <key alias="movedItemOfItems">%1% öğeden %0% oranında taşındı</key>
+    <key alias="copiedItem">%0% öğe kopyalandı</key>
+    <key alias="copiedItems">%0% öğe kopyalandı</key>
+    <key alias="copiedItemOfItem">%1% öğeden %0% kopyalandı</key>
+    <key alias="copiedItemOfItems">%1% öğeden %0% kopyalandı</key>
   </area>
   <area alias="defaultdialogs">
-    <key alias="anchorInsert">isim</key>
-    <key alias="assignDomain">konak yönetin</key>
-    <key alias="closeThisWindow">Bu pencereyi kapatın</key>
-    <key alias="confirmdelete">Silmek istediğine emin misin</key>
-    <key alias="confirmdisable">Eğer devre dışı bırakmak istediğinizden emin misiniz</key>
+    <key alias="nodeNameLinkPicker">Bağlantı başlığı</key>
+    <key alias="urlLinkPicker">Bağlantı</key>
+    <key alias="anchorLinkPicker">Bağlayıcı / sorgu dizesi</key>
+    <key alias="anchorInsert">Ad</key>
+    <key alias="assignDomain">Ana bilgisayar adlarını yönet</key>
+    <key alias="closeThisWindow">Bu pencereyi kapat</key>
+    <key alias="confirmdelete">Silmek istediğinizden emin misiniz</key>
+    <key alias="confirmdeleteXofX">%1% temelinde %0% 'ı silmek istediğinizden emin misiniz</key>
+    <key alias="confirmdisable">Devre dışı bırakmak istediğinizden emin misiniz</key>
+    <key alias="confirmremove">Kaldırmak istediğinizden emin misiniz</key>
+    <key alias="confirmremoveusageof"><![CDATA[<b>%0%</b> kullanımını kaldırmak istediğinizden emin misiniz?]]></key>
+    <key alias="confirmremovereferenceto"><![CDATA[<b>%0%</b> başvurusunu kaldırmak istediğinizden emin misiniz?]]></key>
     <key alias="confirmlogout">Emin misiniz?</key>
     <key alias="confirmSure">Emin misiniz?</key>
     <key alias="cut">Kes</key>
-    <key alias="editdictionary">Düzenleme Sözlük Öğe</key>
-    <key alias="editlanguage">Dil Düzenleme</key>
-    <key alias="insertAnchor">Yerel bağlantı ekleme</key>
-    <key alias="insertCharacter">Karakter Ekle</key>
-    <key alias="insertgraphicheadline">Grafik başlığı ekleyin</key>
+    <key alias="editdictionary">Sözlük Öğesini Düzenle</key>
+    <key alias="editlanguage">Dili Düzenle</key>
+    <key alias="editSelectedMedia">Seçili medyayı düzenle</key>
+    <key alias="insertAnchor">Yerel bağlantı ekle</key>
+    <key alias="insertCharacter">Karakter ekle</key>
+    <key alias="insertgraphicheadline">Grafik başlığı ekle</key>
     <key alias="insertimage">Resim ekle</key>
-    <key alias="insertlink">Link Ekle</key>
-    <key alias="insertMacro"> Bir makro eklemek için tıklayın</key>
-    <key alias="inserttable">Tablo Ekle</key>
-    <key alias="lastEdited">Son DÜzenleme</key>
+    <key alias="insertlink">Link ekle</key>
+    <key alias="insertMacro">Makro eklemek için tıklayın</key>
+    <key alias="inserttable">Tablo ekle</key>
+    <key alias="languagedeletewarning">Bu, dili silecek</key>
+    <key alias="languageChangeWarning">Bir dil için kültürü değiştirmek pahalı bir işlem olabilir ve içerik önbelleğinin ve dizinlerin yeniden oluşturulmasına neden olabilir</key>
+    <key alias="lastEdited">Son Düzenleme</key>
     <key alias="link">Bağlantı</key>
-    <key alias="linkinternal">İç Bağlantı:</key>
-    <key alias="linklocaltip">Yerel bağlantıları kullanırken, bağlantının önündeki "# " insert</key>
-    <key alias="linknewwindow">Yeni pencerede aç</key>
-    <key alias="macroDoesNotHaveProperties">Düzenleyebileceğiniz Bu makro herhangi bir özellikleri içermiyor</key>
+    <key alias="linkinternal">Dahili bağlantı:</key>
+    <key alias="linklocaltip">Yerel bağlantıları kullanırken, bağlantının önüne "#" ekleyin</key>
+    <key alias="linknewwindow">Yeni pencerede açılsın mı?</key>
+    <key alias="macroContainerSettings">Makro Ayarları</key>
+    <key alias="macroDoesNotHaveProperties">Bu makro düzenleyebileceğiniz herhangi bir özellik içermiyor</key>
     <key alias="paste">Yapıştır</key>
-    <key alias="permissionsEdit">İzinleri düzenle</key>
-    <key alias="recycleBinDeleting">Geri dönüşüm kutusu öğeleri şimdi siliniyor. Bu işlem gerçekleşirken bu pencereyi kapatın etmeyiniz</key>
+    <key alias="permissionsEdit">için izinleri düzenle</key>
+    <key alias="permissionsSet">için izinleri ayarlayın</key>
+    <key alias="permissionsSetForGroup">%1% kullanıcı grubu için %0% için izinleri ayarla</key>
+    <key alias="permissionsHelp">İzinlerini ayarlamak istediğiniz kullanıcı gruplarını seçin</key>
+    <key alias="recycleBinDeleting">Geri dönüşüm kutusundaki öğeler artık siliniyor. Lütfen bu işlem yapılırken bu pencereyi kapatmayın</key>
     <key alias="recycleBinIsEmpty">Geri dönüşüm kutusu artık boş</key>
-    <key alias="recycleBinWarning">Öğeleri geri dönüşüm kutusu silindiğinde, onlar sonsuza kadar gitmiş olacak</key>
-    <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>'s webcoder şu anda üzerinde hiçbir kontrole sahip bazı sorunları, yaşanıyor. Bu rahatsızlıktan dolayı çok üzgünüz.]]></key>
-    <key alias="regexSearchHelp">Bir düzenli ifade arama form alanına doğrulama ekleyin. Örnek: 'E-posta', zip code 'url'</key>
-    <key alias="removeMacro">Makro kaldır</key>
-    <key alias="requiredField">Gerekli alan</key>
-    <key alias="sitereindexed">Site yeniden indekslendi</key>
-    <key alias="siterepublished">Web sitesi yenilendi önbelleği olmuştur. Tüm içerik güncel artık yayımlamak. Tüm yayınlanmamış içeriği hala yayınlanmamış olmakla birlikte</key>
-    <key alias="siterepublishHelp">Web sitesi önbelleği yenilenir olacaktır. Yayınlanmamış içerik yayınlanmamış kalacak ise tüm yayınlanan içerik, güncellenecektir.</key>
-    <key alias="tableColumns">Sütün sayısı</key>
+    <key alias="recycleBinWarning">Öğeler geri dönüşüm kutusundan silindiğinde sonsuza kadar kaybolacaklar</key>
+    <key alias="regexSearchError"><![CDATA[<a target='_ blank' href='http: //regexlib.com'> regexlib.com </a> 'un web hizmeti şu anda bazı sorunlar yaşıyor ve biz üzerinde kontrol yok. Bu rahatsızlıktan dolayı çok üzgünüz.]]></key>
+    <key alias="regexSearchHelp">Bir form alanına doğrulama eklemek için normal ifade arayın. Örnek: 'e-posta,'posta kodu','URL'</key>
+    <key alias="removeMacro">Makroyu Kaldır</key>
+    <key alias="requiredField">Gerekli Alan</key>
+    <key alias="sitereindexed">Site yeniden dizine eklendi</key>
+    <key alias="siterepublished">Web sitesi önbelleği yenilendi. Tüm yayın içeriği artık güncel. Yayınlanmamış içeriğin tamamı hâlâ yayınlanmamış olsa da</key>
+    <key alias="siterepublishHelp">Web sitesi önbelleği yenilenecek. Yayınlanan tüm içerik güncellenecek, yayınlanmamış içerik ise yayınlanmayacak.</key>
+    <key alias="tableColumns">Sütun sayısı</key>
     <key alias="tableRows">Satır sayısı</key>
-    <key alias="thumbnailimageclickfororiginal">Tam boyutta görmek için resmin üzerine tıklayın</key>
-    <key alias="treepicker">öğeyi seçin</key>
-    <key alias="viewCacheItem">Görünüm Önbellek Öğe</key>
+    <key alias="thumbnailimageclickfororiginal">Tam boyutta görmek için resmi tıklayın</key>
+    <key alias="treepicker">Öğe seçin</key>
+    <key alias="viewCacheItem">Önbellek Öğesini Görüntüle</key>
+    <key alias="relateToOriginalLabel">Orijinalle ilişkilendir</key>
+    <key alias="includeDescendants">Torunları dahil et</key>
+    <key alias="theFriendliestCommunity">En arkadaş canlısı topluluk</key>
+    <key alias="linkToPage">Sayfaya bağla</key>
+    <key alias="openInNewWindow">Bağlı belgeyi yeni bir pencerede veya sekmede açar</key>
+    <key alias="linkToMedia">Medyaya bağlantı</key>
+    <key alias="selectContentStartNode">İçerik başlangıç ​​düğümünü seçin</key>
+    <key alias="selectMedia">Medya seçin</key>
+    <key alias="selectMediaType">Ortam türünü seçin</key>
+    <key alias="selectIcon">Simge seçin</key>
+    <key alias="selectItem">Öğeyi seçin</key>
+    <key alias="selectLink">Bağlantı seçin</key>
+    <key alias="selectMacro">Makro seçin</key>
+    <key alias="selectContent">İçerik seçin</key>
+    <key alias="selectContentType">İçerik türünü seçin</key>
+    <key alias="selectMediaStartNode">Medya başlangıç ​​düğümünü seçin</key>
+    <key alias="selectMember">Üye seç</key>
+    <key alias="selectMemberGroup">Üye grubu seçin</key>
+    <key alias="selectMemberType">Üye türünü seçin</key>
+    <key alias="selectNode">Düğüm seçin</key>
+    <key alias="selectSections">Bölümleri seçin</key>
+    <key alias="selectUser">Kullanıcı seçin</key>
+    <key alias="selectUsers">Kullanıcıları seçin</key>
+    <key alias="noIconsFound">​​Simge bulunamadı</key>
+    <key alias="noMacroParams">Bu makro için parametre yok</key>
+    <key alias="noMacros">Eklenecek makro yok</key>
+    <key alias="externalLoginProviders">Harici giriş sağlayıcıları</key>
+    <key alias="exceptionDetail">İstisna Ayrıntıları</key>
+    <key alias="stacktrace">Yığın İzleme</key>
+    <key alias="innerException">İç İstisna</key>
+    <key alias="linkYour">Bağlayın</key>
+    <key alias="unLinkYour">Bağlantınızı kaldırın</key>
+    <key alias="account">hesap</key>
+    <key alias="selectEditor">Düzenleyici seçin</key>
+    <key alias="selectSnippet">Snippet seçin</key>
+    <key alias="variantdeletewarning">Bu, düğümü ve tüm dillerini silecektir. Yalnızca bir dili silmek istiyorsanız, bunun yerine düğümü o dilde yayından kaldırmalısınız.</key>
+    <key alias="propertyuserpickerremovewarning"><![CDATA[Bu, <b>%0%</b> kullanıcısını kaldıracaktır.]]></key>
+    <key alias="userremovewarning"><![CDATA[Bu, <b>%0% </b> kullanıcısını <b>%1%</b> grubundan kaldıracak]]></key>
+    <key alias="yesRemove">Evet, kaldır</key>
+  </area>
+  <area alias="dictionary">
+    <key alias="noItems">Sözlük öğesi yok.</key>
   </area>
   <area alias="dictionaryItem">
-    <key alias="description"><![CDATA[
-      Sözlük öğe için farklı dil sürümlerini düzenle '<em>%0%</em>' aşağıda<br/>Sol taraftaki menüden 'diller' başlığı altında ek dil ekleyebilirsiniz
-   ]]></key>
-    <key alias="displayName">Kültür adı</key>
+    <key alias="description">
+      <![CDATA[
+      Aşağıdaki sözlük öğesi '<em>%0%</em>' için farklı dil sürümlerini düzenleyin
+   ]]>
+    </key>
+    <key alias="displayName">Kültür Adı</key>
+    <key alias="changeKeyError">
+      <![CDATA[
+      '%0%' anahtarı zaten var.
+   ]]>
+    </key>
+    <key alias="overviewTitle">Sözlüğe genel bakış</key>
+  </area>
+  <area alias="examineManagement">
+    <key alias="configuredSearchers">Yapılandırılmış Arayıcılar</key>
+    <key alias="configuredSearchersDescription">Yapılandırılmış herhangi bir Searcher için özellikleri ve araçları gösterir (yani, çoklu dizin arayıcı gibi)</key>
+    <key alias="fieldValues">Alan değerleri</key>
+    <key alias="healthStatus">Sağlık durumu</key>
+    <key alias="healthStatusDescription">Dizinin sağlık durumu ve okunabiliyorsa</key>
+    <key alias="indexers">Dizin oluşturucular</key>
+    <key alias="indexInfo">Dizin bilgisi</key>
+    <key alias="indexInfoDescription">Dizinin özelliklerini listeler</key>
+    <key alias="manageIndexes">İnceleme dizinlerini yönetin</key>
+    <key alias="manageIndexesDescription">Her dizinin ayrıntılarını görüntülemenizi sağlar ve dizinleri yönetmek için bazı araçlar sağlar</key>
+    <key alias="rebuildIndex">Dizini yeniden oluştur</key>
+    <key alias="rebuildIndexWarning">
+      <![CDATA[
+      Bu, dizinin yeniden oluşturulmasına neden olacaktır. <br />
+      Sitenizde ne kadar içerik olduğuna bağlı olarak bu biraz zaman alabilir. <br />
+      Yüksek web sitesi trafiğinin olduğu zamanlarda veya editörler içeriği düzenlerken bir dizinin yeniden oluşturulması önerilmez.
+     ]]>
+    </key>
+    <key alias="searchers">Arayanlar</key>
+    <key alias="searchDescription">Dizini arayın ve sonuçları görüntüleyin</key>
+    <key alias="tools">Araçlar</key>
+    <key alias="toolsDescription">Dizini yönetmek için araçlar</key>
+    <key alias="fields">alanlar</key>
+    <key alias="indexCannotRead">Dizin okunamıyor ve yeniden oluşturulması gerekecek</key>
+    <key alias="processIsTakingLonger">İşlem beklenenden uzun sürüyor, bu işlem sırasında herhangi bir hata olup olmadığını görmek için umbraco günlüğünü kontrol edin</key>
+    <key alias="indexCannotRebuild">Bu dizin, atanmış olmadığı için yeniden oluşturulamaz</key>
+    <key alias="iIndexPopulator">IIndexPopulator</key>
   </area>
   <area alias="placeholders">
-    <key alias="username">Kullanıcı adınızı giriniz</key>
-    <key alias="password">Parolanızı giriniz</key>
-    <key alias="nameentity">Ad %0%...</key>
-    <key alias="entername">Adınızı girin...</key>
-    <key alias="search">Aramak için yazın...</key>
-    <key alias="filter">Filtrelemek için yazın...</key>
-    <key alias="enterTags">(Basın, her etiketinden sonra girin) etiket eklemek için yazın ...</key>
+    <key alias="username">Kullanıcı adınızı girin</key>
+    <key alias="password">Şifrenizi girin</key>
+    <key alias="confirmPassword">Şifrenizi onaylayın</key>
+    <key alias="nameentity">%0% olarak adlandırın ...</key>
+    <key alias="entername">Bir ad girin ...</key>
+    <key alias="enteremail">Bir e-posta girin ...</key>
+    <key alias="enterusername">Bir kullanıcı adı girin ...</key>
+    <key alias="label">Etiket ...</key>
+    <key alias="enterDescription">Bir açıklama girin ...</key>
+    <key alias="search">Aramak için yazın ...</key>
+    <key alias="filter">Filtrelemek için yazın ...</key>
+    <key alias="enterTags">Etiket eklemek için yazın (her etiketten sonra enter tuşuna basın) ...</key>
+    <key alias="email">E-postanızı girin</key>
+    <key alias="enterMessage">Bir mesaj girin ...</key>
+    <key alias="usernameHint">Kullanıcı adınız genellikle e-postanızdır</key>
+    <key alias="anchor"># değer veya? anahtar=değer</key>
+    <key alias="enterAlias">Takma ad girin ...</key>
+    <key alias="generatingAlias">Takma ad oluşturuluyor ...</key>
+    <key alias="a11yCreateItem">Öğe oluştur</key>
+    <key alias="a11yCreate">Oluştur</key>
+    <key alias="a11yEdit">Düzenle</key>
+    <key alias="a11yName">Ad</key>
   </area>
   <area alias="editcontenttype">
-    <key alias="createListView" version="7.2">Özel liste görünüm oluşturun</key>
-    <key alias="removeListView" version="7.2">Özel liste görünümü kaldır</key>
+    <key alias="createListView" version="7.2">Özel liste görünümü oluştur</key>
+    <key alias="removeListView" version="7.2">Özel liste görünümünü kaldır</key>
+    <key alias="aliasAlreadyExists">Bu takma ada sahip bir içerik türü, medya türü veya üye türü zaten var</key>
+  </area>
+  <area alias="renamecontainer">
+    <key alias="renamed">Yeniden adlandırıldı</key>
+    <key alias="enterNewFolderName">Buraya yeni bir klasör adı girin</key>
+    <key alias="folderWasRenamed">%0%,%1% olarak yeniden adlandırıldı</key>
   </area>
   <area alias="editdatatype">
     <key alias="addPrevalue">Ön değer ekle</key>
-    <key alias="dataBaseDatatype">Veritabanı veritürü</key>
-    <key alias="guid">Mülkiyet editörü GUID</key>
-    <key alias="renderControl">Mülkiyet editörü</key>
+    <key alias="dataBaseDatatype">Veritabanı veri türü</key>
+    <key alias="guid">Özellik düzenleyici GUID</key>
+    <key alias="renderControl">Mülk düzenleyici</key>
     <key alias="rteButtons">Düğmeler</key>
-    <key alias="rteEnableAdvancedSettings">Gelişmiş ayarları etkinleştir...</key>
+    <key alias="rteEnableAdvancedSettings">için gelişmiş ayarları etkinleştir</key>
     <key alias="rteEnableContextMenu">Bağlam menüsünü etkinleştir</key>
-    <key alias="rteMaximumDefaultImgSize">Eklenen görüntülerin maksimum varsayılan boyutu</key>
-    <key alias="rteRelatedStylesheets">İlgili stil</key>
+    <key alias="rteMaximumDefaultImgSize">Eklenen resimlerin maksimum varsayılan boyutu</key>
+    <key alias="rteRelatedStylesheets">İlgili stil sayfaları</key>
     <key alias="rteShowLabel">Etiketi göster</key>
-    <key alias="rteWidthAndHeight">Yükseklik ve Genişlik</key>
+    <key alias="rteWidthAndHeight">Genişlik ve yükseklik</key>
+    <key alias="allPropTypes">Tüm mülk türleri &amp; emlak verileri</key>
+    Bu veri türünü kullanan <key alias="willBeDeleted">kalıcı olarak silinecek, lütfen bunları da silmek istediğinizi onaylayın</key>
+    <key alias="yesDelete">Evet, sil</key>
+    <key alias="andAllRelated">ve tüm mülk türleri &amp; bu veri türünü kullanan mülk verileri</key>
+    <key alias="selectFolder">Taşınacak klasörü seçin</key>
+    <key alias="inTheTree">aşağıdaki ağaç yapısına</key>
+    <key alias="wasMoved">altına taşındı</key>
   </area>
   <area alias="errorHandling">
-    <key alias="errorButDataWasSaved">Verileriniz kaydedildi, ancak bu sayfayı yayınlamak için önce ilk düzeltmek için gereken bazı hatalar vardır:</key>
-    <key alias="errorChangingProviderPassword">Geçerli üyelik sağlayıcısı değişen şifreyi desteklemiyor (EnablePasswordRetrieval doğru olması gerekir)</key>
-    <key alias="errorExistsWithoutTab">%0%  zaten var</key>
+    <key alias="errorButDataWasSaved">Verileriniz kaydedildi, ancak bu sayfayı yayınlamadan önce düzeltmeniz gereken bazı hatalar var:</key>
+    <key alias="errorChangingProviderPassword">Mevcut üyelik sağlayıcısı, şifre değiştirmeyi desteklemiyor (EnablePasswordRetrieval'in doğru olması gerekiyor)</key>
+    <key alias="errorExistsWithoutTab">%0% zaten var</key>
     <key alias="errorHeader">Hatalar vardı:</key>
     <key alias="errorHeaderWithoutTab">Hatalar vardı:</key>
-    <key alias="errorInPasswordFormat">Şifre %0% karakter uzunluğunda en az olması ve en az %1% non-alfa sayısal karakter (ler) içermelidir</key>
-    <key alias="errorIntegerWithoutTab">%0% bir tamsayı olmalıdır</key>
-    <key alias="errorMandatory">%1% sekmesinde %0% alan zorunludur</key>
+    <key alias="errorInPasswordFormat">Parola minimum %0% karakter uzunluğunda olmalı ve en az%1% alfa olmayan sayısal karakter (ler) içermelidir</key>
+    <key alias="errorIntegerWithoutTab">%0% tam sayı olmalıdır</key>
+    <key alias="errorMandatory">%1% sekmesindeki %0% alanı zorunludur</key>
     <key alias="errorMandatoryWithoutTab">%0% zorunlu bir alandır</key>
-    <key alias="errorRegExp">%0% - %1% bir doğru biçimde değil</key>
-    <key alias="errorRegExpWithoutTab">%0% Bir doğru biçimde değil</key>
+    <key alias="errorRegExp">%1% konumunda %0% doğru biçimde değil</key>
+    <key alias="errorRegExpWithoutTab">%0% doğru biçimde değil</key>
+    <key alias="errorPropertyEditorNotSupportedInElementTypes">'%0%' özelliği, Öğe Türlerinde desteklenmeyen '%1%' düzenleyicisini kullanıyor.</key>
   </area>
   <area alias="errors">
-    <key alias="dissallowedMediaType">Belirtilen dosya türü yönetici tarafından izin verilmeyen olmuştur</key>
-    <key alias="codemirroriewarning">NOT! CodeMirror yapılandırma tarafından etkin olsa bile yeterince kararlı değil, çünkü Internet Explorer'da devre dışı bırakılır.</key>
-    <key alias="contentTypeAliasAndNameNotNull">Yeni özellik tipine takma adını ve hem de doldurunuz!</key>
-    <key alias="filePermissionsError">Belirli bir dosya veya klasör için okuma / yazma erişimi olan bir sorun var</key>
-    <key alias="macroErrorLoadingPartialView">Error loading Partial View script (Dosya: %0%)</key>
+    <key alias="receivedErrorFromServer">Sunucudan bir hata aldı</key>
+    <key alias="dissallowedMediaType">Belirtilen dosya türüne yönetici tarafından izin verilmedi</key>
+    <key alias="codemirroriewarning">NOT! CodeMirror yapılandırma ile etkinleştirilmiş olsa da, yeterince kararlı olmadığı için Internet Explorer'da devre dışı bırakılmıştır.</key>
+    <key alias="contentTypeAliasAndNameNotNull">Lütfen yeni özellik türünde hem takma adı hem de adı girin!</key>
+    <key alias="filePermissionsError">Belirli bir dosya veya klasöre okuma/yazma erişiminde sorun var</key>
+    <key alias="macroErrorLoadingPartialView">Kısmi Görünüm komut dosyası yüklenirken hata oluştu (dosya: %0%)</key>
     <key alias="missingTitle">Lütfen bir başlık girin</key>
     <key alias="missingType">Lütfen bir tür seçin</key>
-    <key alias="pictureResizeBiggerThanOrg">Orijinal boyutundan daha resmi büyütmek üzereyiz. Devam etmek istediğinizden emin misiniz?</key>
-    <key alias="startNodeDoesNotExists">Silinen düğüm başlatın, lütfen yöneticinize başvurun</key>
-    <key alias="stylesMustMarkBeforeSelect">Tarzı değiştirmeden önce içerik işaretleyiniz</key>
-    <key alias="stylesNoStylesOnPage">Henüz aktif stilleri</key>
-    <key alias="tableColMergeLeft">Birleştirmek istediğiniz iki hücre solundaki imleci Lütfen</key>
-    <key alias="tableSplitNotSplittable">Sen birleştirilmiş henüz bir hücreyi bölemezsiniz.</key>
+    <key alias="pictureResizeBiggerThanOrg">Resmi orijinal boyutundan daha büyük yapmak üzeresiniz. Devam etmek istediğinizden emin misiniz?</key>
+    <key alias="startNodeDoesNotExists">Başlangıç ​​düğümü silindi, lütfen yöneticinizle iletişime geçin</key>
+    <key alias="stylesMustMarkBeforeSelect">Lütfen stili değiştirmeden önce içeriği işaretleyin</key>
+    <key alias="stylesNoStylesOnPage">Etkin stil yok</key>
+    <key alias="tableColMergeLeft">Lütfen imleci birleştirmek istediğiniz iki hücrenin soluna yerleştirin</key>
+    <key alias="tableSplitNotSplittable">Birleştirilmemiş bir hücreyi bölemezsiniz.</key>
+    <key alias="propertyHasErrors">Bu özellik geçersiz</key>
   </area>
   <area alias="general">
     <key alias="about">Hakkında</key>
-    <key alias="action">Eylem</key>
-    <key alias="actions">Eylemler</key>
+    <key alias="action">İşlem</key>
+    <key alias="actions">İşlemler</key>
     <key alias="add">Ekle</key>
-    <key alias="alias">Takma ad</key>
+    <key alias="alias">Takma reklam</key>
+    <key alias="all">Tümü</key>
     <key alias="areyousure">Emin misiniz?</key>
-    <key alias="border">Sınır</key>
-    <key alias="by">tarafında</key>
+    <key alias="back">Geri</key>
+    <key alias="backToOverview">Genel bakışa dön</key>
+    <key alias="border">Kenarlık</key>
+    <key alias="border">yazan</key>
     <key alias="cancel">İptal</key>
-    <key alias="cellMargin">hücre marjı</key>
-    <key alias="choose">Seçim</key>
+    <key alias="cellMargin">Hücre kenar boşluğu</key>
+    <key alias="choose">Seçin</key>
+    <key alias="clear">Temizle</key>
     <key alias="close">Kapat</key>
-    <key alias="closewindow">Pencereyi kapat</key>
-    <key alias="comment">Açıklama</key>
+    <key alias="closewindow">Pencereyi Kapat</key>
+    <key alias="comment">Yorum</key>
     <key alias="confirm">Onayla</key>
-    <key alias="constrainProportions">oranları sınırlamak</key>
+    <key alias="constrain">Sınırla</key>
+    <key alias="constrainProportions">Oranları sınırlayın</key>
+    <key alias="content">İçerik</key>
     <key alias="continue">Devam et</key>
     <key alias="copy">Kopyala</key>
     <key alias="create">Oluştur</key>
     <key alias="database">Veritabanı</key>
     <key alias="date">Tarih</key>
-    <key alias="default">Standart</key>
+    <key alias="default">Varsayılan</key>
     <key alias="delete">Sil</key>
     <key alias="deleted">Silindi</key>
-    <key alias="deleting">Siliniyor...</key>
-    <key alias="design">Dizayn</key>
+    <key alias="deleting">Siliniyor ...</key>
+    <key alias="design">Tasarım</key>
+    <key alias="dictionary">Sözlük</key>
     <key alias="dimensions">Boyutlar</key>
+    <key alias="discard">Sil</key>
     <key alias="down">Aşağı</key>
     <key alias="download">İndir</key>
     <key alias="edit">Düzenle</key>
     <key alias="edited">Düzenlendi</key>
-    <key alias="elements">Elemanları</key>
-    <key alias="email">E-Posta</key>
+    <key alias="elements">Öğeler</key>
+    <key alias="email">E-posta</key>
     <key alias="error">Hata</key>
+    <key alias="field">Alan</key>
     <key alias="findDocument">Bul</key>
+    <key alias="first">İlk</key>
+    <key alias="focalPoint">Odak noktası</key>
+    <key alias="general">Genel</key>
+    <key alias="groups">Gruplar</key>
+    <key alias="group">Grup</key>
     <key alias="height">Yükseklik</key>
     <key alias="help">Yardım</key>
-    <key alias="icon">İkon</key>
-    <key alias="import">İthalat</key>
-    <key alias="innerMargin">İç Marj</key>
+    <key alias="hide">Gizle</key>
+    <key alias="history">Geçmiş</key>
+    <key alias="icon">Simge</key>
+    <key alias="id">Kimlik</key>
+    <key alias="import">İçe Aktar</key>
+    <key alias="includeFromsubFolders">Alt klasörleri aramaya dahil et</key>
+    <key alias="excludeFromSubFolders">Yalnızca bu klasörü ara</key>
+    <key alias="info">Bilgi</key>
+    <key alias="innerMargin">İç kenar boşluğu</key>
     <key alias="insert">Ekle</key>
-    <key alias="install">Kur</key>
-    <key alias="justify">Satır Uzunluğu</key>
+    <key alias="install">Yükle</key>
+    <key alias="invalid">Geçersiz</key>
+    <key alias="justify">Yasla</key>
+    <key alias="label">Etiket</key>
     <key alias="language">Dil</key>
+    <key alias="last">Son</key>
     <key alias="layout">Düzen</key>
+    <key alias="links">Bağlantılar</key>
     <key alias="loading">Yükleniyor</key>
     <key alias="locked">Kilitli</key>
-    <key alias="login">Giriş yap</key>
-    <key alias="logoff">Oturum Kapat</key>
-    <key alias="logout">Çıkış yap</key>
+    <key alias="login">Giriş</key>
+    <key alias="logoff">Oturumu kapat</key>
+    <key alias="logout">Çıkış</key>
     <key alias="macro">Makro</key>
+    <key alias="mandatory">Zorunlu</key>
+    <key alias="message">Mesaj</key>
     <key alias="move">Taşı</key>
     <key alias="name">Ad</key>
     <key alias="new">Yeni</key>
     <key alias="next">Sonraki</key>
     <key alias="no">Hayır</key>
     <key alias="of">arasında</key>
-    <key alias="ok">TAMAM</key>
+    <key alias="off">Kapalı</key>
+    <key alias="ok">Tamam</key>
     <key alias="open">Aç</key>
+    <key alias="options">Seçenekler</key>
+    <key alias="on">Açık</key>
     <key alias="or">veya</key>
-    <key alias="password">Parola</key>
+    <key alias="orderBy">Sıralama ölçütü</key>
+    <key alias="password">Şifre</key>
     <key alias="path">Yol</key>
-    <key alias="pleasewait">Bir dakika lütfen...</key>
+    <key alias="pleasewait">Bir dakika lütfen ...</key>
     <key alias="previous">Önceki</key>
     <key alias="properties">Özellikler</key>
+    <key alias="rebuild">Yeniden Oluştur</key>
     <key alias="reciept">Form verilerini almak için e-posta</key>
-    <key alias="recycleBin">Geridönüşüm kutusu</key>
+    <key alias="recycleBin">Geri Dönüşüm Kutusu</key>
+    <key alias="recycleBinEmpty">Geri dönüşüm kutunuz boş</key>
+    <key alias="reload">Yeniden yükle</key>
     <key alias="remaining">Kalan</key>
-    <key alias="rename">Adını Değiştir</key>
+    <key alias="remove">Kaldır</key>
+    <key alias="rename">Yeniden adlandır</key>
     <key alias="renew">Yenile</key>
     <key alias="required" version="7.0">Gerekli</key>
-    <key alias="retry">Tekrar dene</key>
-    <key alias="rights">İzinler</key>
-    <key alias="search">Arama</key>
+    <key alias="retrieve">Al</key>
+    <key alias="retry">Yeniden dene</key>
+    <key alias="rights">daha</key>
+    <key alias="scheduledPublishing">Planlanmış Yayınlama</key>
+    <key alias="search">Ara</key>
+    <key alias="searchNoResult">Üzgünüz, aradığınızı bulamıyoruz.</key>
+    <key alias="noItemsInList">Hiçbir öğe eklenmedi</key>
     <key alias="server">Sunucu</key>
+    <key alias="settings">Ayarlar</key>
     <key alias="show">Göster</key>
-    <key alias="showPageOnSend">Gönder sayfasını göster</key>
+    <key alias="showPageOnSend">Sayfayı Gönderildiğinde Göster</key>
     <key alias="size">Boyut</key>
     <key alias="sort">Sırala</key>
-    <key alias="type">Tip</key>
-    <key alias="typeToSearch">Aramak için yazın...</key>
+    <key alias="status">Durum</key>
+    <key alias="submit">Gönder</key>
+    <key alias="success">Başarılı</key>
+    <key alias="type">Tür</key>
+    <key alias="typeToSearch">Aramak için yazın ...</key>
+    <key alias="under">altında</key>
     <key alias="up">Yukarı</key>
     <key alias="update">Güncelle</key>
     <key alias="upgrade">Yükselt</key>
@@ -372,18 +783,60 @@
     <key alias="user">Kullanıcı</key>
     <key alias="username">Kullanıcı adı</key>
     <key alias="value">Değer</key>
-    <key alias="view">Görünüm</key>
-    <key alias="welcome">Hoşgeldiniz...</key>
+    <key alias="view">Görüntüle</key>
+    <key alias="welcome">Hoş geldiniz ...</key>
     <key alias="width">Genişlik</key>
     <key alias="yes">Evet</key>
     <key alias="folder">Klasör</key>
-    <key alias="searchResults">Arama Sonuçları</key>
+    <key alias="searchResults">Arama sonuçları</key>
+    <key alias="reorder">Yeniden sırala</key>
+    <key alias="reorderDone">Yeniden sıralamayı tamamladım</key>
+    <key alias="preview">Önizleme</key>
+    <key alias="changePassword">Şifreyi değiştir</key>
+    <key alias="to">için</key>
+    <key alias="listView">Liste görünümü</key>
+    <key alias="saving">Kaydediliyor ...</key>
+    <key alias="current">mevcut</key>
+    <key alias="embed">Göm</key>
+    <key alias="selected">seçildi</key>
+    <key alias="other">Diğer</key>
+    <key alias="articles">Makaleler</key>
+    <key alias="videos">Videolar</key>
+    <key alias="clear">Temizle</key>
+    <key alias="installing">Kuruluyor</key>
+  </area>
+  <area alias="colors">
+    <key alias="blue">Mavi</key>
+  </area>
+  <area alias="shortcuts">
+    <key alias="addGroup">Grup ekle</key>
+    <key alias="addProperty">Mülk ekle</key>
+    <key alias="addEditor">Düzenleyici ekle</key>
+    <key alias="addTemplate">Şablon ekle</key>
+    <key alias="addChildNode">Alt düğüm ekle</key>
+    <key alias="addChild">Çocuk ekle</key>
+    <key alias="editDataType">Veri türünü düzenle</key>
+    <key alias="navigateSections">Bölümlere git</key>
+    <key alias="shortcut">Kısayollar</key>
+    <key alias="showShortcuts">kısayolları göster</key>
+    <key alias="toggleListView">Liste görünümünü değiştir</key>
+    <key alias="toggleAllowAsRoot">Kök olarak izin ver arasında geçiş yap</key>
+    <key alias="commentLine">Yorum / Yorum kaldırma satırları</key>
+    <key alias="removeLine">Satırı kaldır</key>
+    <key alias="copyLineUp">Satırları Yukarı Kopyala</key>
+    <key alias="copyLineDown">Satırları Aşağı Kopyala</key>
+    <key alias="moveLineUp">Satırları Yukarı Taşı</key>
+    <key alias="moveLineDown">Satırları Aşağı Taşı</key>
+    <key alias="generalHeader">Genel</key>
+    <key alias="editorHeader">Düzenleyici</key>
+    <key alias="toggleAllowCultureVariants">Kültür varyantlarına izin ver </key>
+    <key alias="toggleAllowSegmentVariants">Bölümlemeye izin vermeyi aç/kapat</key>
   </area>
   <area alias="graphicheadline">
     <key alias="backgroundcolor">Arka plan rengi</key>
     <key alias="bold">Kalın</key>
-    <key alias="color">Metin Rengi</key>
-    <key alias="font">Yazı</key>
+    <key alias="color">Metin rengi</key>
+    <key alias="font">Yazı Tipi</key>
     <key alias="text">Metin</key>
   </area>
   <area alias="headers">
@@ -391,570 +844,1753 @@
   </area>
   <area alias="installer">
     <key alias="databaseErrorCannotConnect">Yükleyici veritabanına bağlanamıyor.</key>
-    <key alias="databaseErrorWebConfig">Web.config dosyasını kaydedilemedi. El bağlantı dizesini değiştirin lütfen.</key>
-    <key alias="databaseFound">Web.config dosyasını kaydedilemedi. El bağlantı dizesini değiştirin lütfen....</key>
+    <key alias="databaseErrorWebConfig">web.config dosyası kaydedilemedi. Lütfen bağlantı dizesini manuel olarak değiştirin.</key>
+    <key alias="databaseFound">​​Veritabanınız bulundu ve tanımlandı</key>
     <key alias="databaseHeader">Veritabanı yapılandırması</key>
-    <key alias="databaseInstall"><![CDATA[
-      <strong>Kurulum</strong> için dğümeye basın %0% veritabanı
-    ]]></key>
-    <key alias="databaseInstallDone"><![CDATA[CMS %0% Şimdi veritabanına kopyalandı. <strong>Sonraki</strong> Devam için.]]></key>
-    <key alias="databaseNotFound"><![CDATA[<p>Veritabanı bulunamadı! "Web.config" nin "bağlantı dizesinde" bilgi dosyası doğru olup olmadığını kontrol edin.</p>
-              <p>Devam etmek için, (Visual Studio veya sevdiğiniz metin editörü kullanarak) "web.config" dosyasını düzenlemek lütfen, altına gidin "UmbracoDbDSN" adlı anahtarı veritabanınız için bağlantı dizesini eklemek ve dosyayı kaydedin. </p>
+    <key alias="databaseInstall">
+      <![CDATA[
+      Umbraco %0% veritabanını yüklemek için <strong>kur</strong> düğmesine basın
+    ]]>
+    </key>
+    <key alias="databaseInstallDone"><![CDATA[Umbraco %0% artık veritabanınıza kopyalandı. Devam etmek için <strong>İleri</strong>'ye basın.]]></key>
+    <key alias="databaseNotFound">
+      ​​<![CDATA[<p> Veritabanı bulunamadı! Lütfen "web.config" dosyasının "bağlantı dizesindeki" bilgilerin doğru olup olmadığını kontrol edin. </p>
+              <p> Devam etmek için lütfen "web.config" dosyasını düzenleyin (Visual Studio veya favori metin düzenleyicinizi kullanarak), en alta kaydırın, veritabanınız için "UmbracoDbDSN" adlı anahtara bağlantı dizesini ekleyin ve dosyayı kaydedin. </p>
               <p>
-              <strong>Tekrar dene</strong>.
-              <br />
-              <a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
-			              Burada düzenleme web.config Hakkında Daha Fazla Bilgi.</a></p>]]></key>
-    <key alias="databaseText"><![CDATA[Bu adımı tamamlamak için, veritabanı sunucusu ("bağlantı dizesi") ile ilgili bazı bilgileri bilmeniz gerekir.<br />
-        Gerekirse ISS'nize irtibata geçiniz.
-        Eğer yerel makine veya sunucu üzerinde yükleme ediyorsanız, sistem yöneticinizden bilgi gerekebilir.]]></key>
-    <key alias="databaseUpgrade"><![CDATA[
+              <strong> Yeniden dene </strong> düğmesini tıklayın.
+              bitti. <br /> <a href=https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank">
+                                                        Web.config'i düzenleme hakkında daha fazla bilgi burada. </a> </p>]]>
+    </key>
+    <key alias="databaseText">
+      <![CDATA[Bu adımı tamamlamak için, veritabanı sunucunuzla ilgili bazı bilgileri bilmeniz gerekir ("bağlantı dizesi"). <br />
+        Lütfen gerekirse ISS'niz ile iletişime geçin.
+        Yerel bir makineye veya sunucuya kurulum yapıyorsanız, sistem yöneticinizden bilgi almanız gerekebilir.]]>
+    </key>
+    <key alias="databaseUpgrade">
+      <![CDATA[
       <p>
-      CMS %0% için veritabanını <strong>yükseltme</strong> için yükseltme düğmesine basın
+      Veritabanınızı Umbraco %0% sürümüne yükseltmek için <strong> yükselt </strong> düğmesine basın </p>
+      <p>
+      Endişelenmeyin - hiçbir içerik silinmeyecek ve daha sonra her şey çalışmaya devam edecek!
       </p>
+      ]]>
+    </key>
+    <key alias="databaseUpgradeDone">
+      <![CDATA[Veritabanınız son sürüme %0% yükseltildi. <br /> için <strong> İleri </strong> 'ye basın
+      ilerlemek. ]]>
+    </key>
+    <key alias="databaseUpToDate"><![CDATA[Mevcut veritabanınız güncel !. Yapılandırma sihirbazına devam etmek için <strong> ileri </strong> 'yi tıklayın]]></key>
+    <key alias="defaultUserChangePass"><![CDATA[<strong> Varsayılan kullanıcıların şifresinin değiştirilmesi gerekiyor! </strong>]]></key>
+    <key alias="defaultUserDisabled"><![CDATA[<strong> Varsayılan kullanıcı devre dışı bırakıldı veya Umbraco'ya erişimi yok! </strong> </p> <p> Başka işlem yapılmasına gerek yok. Devam etmek için <b> İleri </b> 'yi tıklayın.]]></key>
+    <key alias="defaultUserPassChanged"><![CDATA[<strong> Varsayılan kullanıcının şifresi kurulumdan bu yana başarıyla değiştirildi! </strong> </p> <p> Başka işlem yapılmasına gerek yok. Devam etmek için <strong> İleri </strong> 'yi tıklayın.]]></key>
+    <key alias="defaultUserPasswordChanged">Şifre değiştirildi!</key>
+    <key alias="greatStart">Harika bir başlangıç ​​yapın, tanıtım videolarımızı izleyin</key>
+    <key alias="licenseText">Sonraki düğmeye tıklayarak (veya web.config'deki umbracoConfigurationStatus'u değiştirerek), bu yazılımın lisansını aşağıdaki kutuda belirtildiği şekilde kabul etmiş olursunuz. Bu Umbraco dağıtımının iki farklı lisanstan oluştuğuna dikkat edin, çerçeve için açık kaynak MIT lisansı ve kullanıcı arayüzünü kapsayan ücretsiz Umbraco lisansı.</key>
+    <key alias="None">Henüz yüklenmedi.</key>
+    <key alias="permissionsAffectedFolders">Etkilenen dosyalar ve klasörler</key>
+    <key alias="permissionsAffectedFoldersMoreInfo">Umbraco için izinlerin ayarlanmasıyla ilgili daha fazla bilgiyi burada bulabilirsiniz</key>
+    <key alias="permissionsAffectedFoldersText">Aşağıdaki dosyalara / klasörlere ASP.NET değiştirme izinleri vermeniz gerekiyor</key>
+    <key alias="permissionsAlmostPerfect">
+      <![CDATA[<strong> İzin ayarlarınız neredeyse mükemmel! </strong> <br /> <br />
+        Umbraco'yu sorunsuz bir şekilde çalıştırabilirsiniz, ancak Umbraco'dan tam olarak yararlanmanız için önerilen paketleri kuramazsınız.]]>
+    </key>
+    <key alias="permissionsHowtoResolve">Nasıl Çözümlenir</key>
+    <key alias="permissionsHowtoResolveLink">Metin sürümünü okumak için burayı tıklayın</key>
+    <key alias="permissionsHowtoResolveText"><![CDATA[Umbraco için klasör izinlerinin ayarlanmasıyla ilgili <strong> eğitim videosunu </strong> izleyin veya metin sürümünü okuyun.]]></key>
+    <key alias="permissionsMaybeAnIssue">
+      <![CDATA[<strong> İzin ayarlarınız bir sorun olabilir! </strong>
+      <br/> <br />
+      Umbraco'yu sorunsuz bir şekilde çalıştırabilirsiniz, ancak Umbraco'dan tam olarak yararlanmanız için önerilen klasörler oluşturamaz veya paketleri yükleyemezsiniz.]]>
+    </key>
+    <key alias="permissionsNotReady">
+      <![CDATA[<strong> İzin ayarlarınız Umbraco için hazır değil! </strong>
+          <br /> <br />
+          Umbraco'yu çalıştırmak için izin ayarlarınızı güncellemeniz gerekir.]]>
+    </key>
+    <key alias="permissionsPerfect">
+      <![CDATA[<strong> İzin ayarlarınız mükemmel! </strong> <br /> <br />
+              Umbraco'yu çalıştırmaya ve paketleri kurmaya hazırsınız!]]>
+    </key>
+    <key alias="permissionsResolveFolderIssues">Klasör sorununu çözme</key>
+    <key alias="permissionsResolveFolderIssuesLink">ASP.NET ile ilgili sorunlar ve klasör oluşturma hakkında daha fazla bilgi için bu bağlantıyı izleyin</key>
+    <key alias="permissionsSettingUpPermissions">Klasör izinlerini ayarlama</key>
+    <key alias="permissionsText">
+      <![CDATA[
+      Resimler ve PDF'ler gibi dosyaları depolamak için Umbraco'nun belirli dizinlere yazma / değiştirme erişimine ihtiyacı vardır.
+      Ayrıca, web sitenizin performansını artırmak için geçici verileri (aka: önbellek) depolar.
+    ]]>
+    </key>
+    <key alias="runwayFromScratch">Sıfırdan başlamak istiyorum</key>
+    <key alias="runwayFromScratchText">
+      <![CDATA[
+        Web siteniz şu anda tamamen boş, bu nedenle sıfırdan başlamak ve kendi belge türlerinizi ve şablonlarınızı oluşturmak istiyorsanız bu mükemmel.
+        (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">nasıl yapılacağını öğrenin </a>)
+        Yine de Runway'i daha sonra kurmayı seçebilirsiniz. Lütfen Geliştirici bölümüne gidin ve Paketleri seçin.
+      ]]>
+    </key>
+    <key alias="runwayHeader">Temiz bir Umbraco platformu kurdunuz. Bundan sonra ne yapmak istiyorsunuz?</key>
+    <key alias="runwayInstalled">Runway yüklendi</key>
+    <key alias="runwayInstalledText">
+      <![CDATA[
+      Temeliniz yerinde. Üzerine yüklemek istediğiniz modülleri seçin. <br />
+      Bu, önerilen modüller listemizdir, yüklemek istediklerinizi işaretleyin veya <a href="#" onclick="toggleModules (); return false;" id="toggleModuleList">modüllerin tam listesi </a>
+      ]]>
+    </key>
+    <key alias="runwayOnlyProUsers">Yalnızca deneyimli kullanıcılar için önerilir</key>
+    <key alias="runwaySimpleSite">Basit bir web sitesiyle başlamak istiyorum</key>
+    <key alias="runwaySimpleSiteText">
+      <![CDATA[
       <p>
-      Merak etmeyin - hiçbir içerik silinmeyecek ve her şey sonradan çalışmaya devam edecektir!
-      </p>
-      ]]></key>
-    <key alias="databaseUpgradeDone"><![CDATA[Sizin veritabanı son sürüme yükseltilmiş oldu %0%.<br />  <strong>Sonraki</strong> işlem. ]]></key>
-    <key alias="databaseUpToDate"><![CDATA[Your current database is up-to-date!. Click <strong>next</strong> to continue the configuration wizard]]></key>
-    <key alias="defaultUserChangePass"><![CDATA[<strong>The Default users' password needs to be changed!</strong>]]></key>
-    <key alias="defaultUserDisabled"><![CDATA[<strong>The Default user has been disabled or has no access to Umbraco!</strong></p><p>No further actions needs to be taken. Click <b>Next</b> to proceed.]]></key>
-    <key alias="defaultUserPassChanged"><![CDATA[<strong>The Default user's password has been successfully changed since the installation!</strong></p><p>No further actions needs to be taken. Click <strong>Next</strong> to proceed.]]></key>
-    <key alias="defaultUserPasswordChanged">The password is changed!</key>
-    <key alias="greatStart">Get a great start, watch our introduction videos</key>
-    <key alias="licenseText">By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI.</key>
-    <key alias="None">Not installed yet.</key>
-    <key alias="permissionsAffectedFolders">Affected files and folders</key>
-    <key alias="permissionsAffectedFoldersMoreInfo">More information on setting up permissions for Umbraco here</key>
-    <key alias="permissionsAffectedFoldersText">You need to grant ASP.NET modify permissions to the following files/folders</key>
-    <key alias="permissionsAlmostPerfect"><![CDATA[<strong>Your permission settings are almost perfect!</strong><br /><br />
-        You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]></key>
-    <key alias="permissionsHowtoResolve">How to Resolve</key>
-    <key alias="permissionsHowtoResolveLink">Click here to read the text version</key>
-    <key alias="permissionsHowtoResolveText"><![CDATA[Watch our <strong>video tutorial</strong> on setting up folder permissions for Umbraco or read the text version.]]></key>
-    <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>Your permission settings might be an issue!</strong>
-      <br/><br />
-      You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]></key>
-    <key alias="permissionsNotReady"><![CDATA[<strong>Your permission settings are not ready for Umbraco!</strong>
-          <br /><br />
-          In order to run Umbraco, you'll need to update your permission settings.]]></key>
-    <key alias="permissionsPerfect"><![CDATA[<strong>Your permission settings are perfect!</strong><br /><br />
-              You are ready to run Umbraco and install packages!]]></key>
-    <key alias="permissionsResolveFolderIssues">Resolving folder issue</key>
-    <key alias="permissionsResolveFolderIssuesLink">Follow this link for more information on problems with ASP.NET and creating folders</key>
-    <key alias="permissionsSettingUpPermissions">Setting up folder permissions</key>
-    <key alias="permissionsText"><![CDATA[
-      Umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's.
-      It also stores temporary data (aka: cache) for enhancing the performance of your website.
-    ]]></key>
-    <key alias="runwayFromScratch">Baştan başlamak istiyorum</key>
-    <key alias="runwayFromScratchText"><![CDATA[
-        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates.
-        (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">learn how</a>)
-        You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
-      ]]></key>
-    <key alias="runwayHeader">You've just set up a clean Umbraco platform. What do you want to do next?</key>
-    <key alias="runwayInstalled">Runway is installed</key>
-    <key alias="runwayInstalledText"><![CDATA[
-      You have the foundation in place. Select what modules you wish to install on top of it.<br />
-      This is our list of recommended modules, check off the ones you would like to install, or view the <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">full list of modules</a>
-      ]]></key>
-    <key alias="runwayOnlyProUsers">Only recommended for experienced users</key>
-    <key alias="runwaySimpleSite">I want to start with a simple website</key>
-    <key alias="runwaySimpleSiteText"><![CDATA[
-      <p>
-      "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
-        but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
-        Runway offers an easy foundation based on best practices to get you started faster than ever.
-        If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.
+      "Runway", bazı temel belge türlerini ve şablonlarını sunan basit bir web sitesidir. Yükleyici sizin için otomatik olarak Runway kurabilir,
+        ancak kolayca düzenleyebilir, genişletebilir veya kaldırabilirsiniz. Bu gerekli değildir ve Umbraco'yu onsuz mükemmel bir şekilde kullanabilirsiniz. Ancak,
+        Runway, her zamankinden daha hızlı başlamanız için en iyi uygulamalara dayalı kolay bir temel sunar.
+        Runway'i kurmayı seçerseniz, Runway sayfalarınızı geliştirmek için isteğe bağlı olarak Pist Modülleri adı verilen temel yapı bloklarını seçebilirsiniz.
         </p>
         <small>
-        <em>Included with Runway:</em> Home page, Getting Started page, Installing Modules page.<br />
-        <em>Optional Modules:</em> Top Navigation, Sitemap, Contact, Gallery.
+        <em> Runway'e Dahildir: </em> Ana sayfa, Başlarken sayfası, Modülleri Takma sayfası. <br />
+        <em> İsteğe Bağlı Modüller: </em> Üst Gezinme, Site Haritası, İletişim, Galeri.
         </small>
-      ]]></key>
-    <key alias="runwayWhatIsRunway">What is Runway</key>
-    <key alias="step1">Step 1/5 Accept license</key>
-    <key alias="step2">Step 2/5: Database configuration</key>
-    <key alias="step3">Step 3/5: Validating File Permissions</key>
-    <key alias="step4">Step 4/5: Check Umbraco security</key>
-    <key alias="step5">Step 5/5: Umbraco is ready to get you started</key>
-    <key alias="thankYou">Thank you for choosing Umbraco</key>
-    <key alias="theEndBrowseSite"><![CDATA[<h3>Browse your new site</h3>
-You installed Runway, so why not see how your new website looks.]]></key>
-    <key alias="theEndFurtherHelp"><![CDATA[<h3>Further help and information</h3>
-Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]></key>
-    <key alias="theEndHeader">Umbraco %0% is installed and ready for use</key>
-    <key alias="theEndInstallFailed"><![CDATA[To finish the installation, you'll need to
-        manually edit the <strong>/web.config file</strong> and update the AppSetting key <strong>UmbracoConfigurationStatus</strong> in the bottom to the value of <strong>'%0%'</strong>.]]></key>
-    <key alias="theEndInstallSuccess"><![CDATA[You can get <strong>started instantly</strong> by clicking the "Launch Umbraco" button below. <br />If you are <strong>new to Umbraco</strong>,
-you can find plenty of resources on our getting started pages.]]></key>
-    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Launch Umbraco</h3>
-To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]></key>
-    <key alias="Unavailable">Connection to database failed.</key>
-    <key alias="Version3">Umbraco Version 3</key>
-    <key alias="Version4">Umbraco Version 4</key>
-    <key alias="watch">Watch</key>
-    <key alias="welcomeIntro"><![CDATA[This wizard will guide you through the process of configuring <strong>Umbraco %0%</strong> for a fresh install or upgrading from version 3.0.
-                                <br /><br />
-                                Press <strong>"next"</strong> to start the wizard.]]></key>
+      ]]>
+    </key>
+    <key alias="runwayWhatIsRunway">Runway Nedir</key>
+    <key alias="step1">Adım 1/5 Lisansı kabul edin</key>
+    <key alias="step2">Adım 2/5: Veritabanı yapılandırması</key>
+    <key alias="step3">Adım 3/5: Dosya İzinlerini Doğrulama</key>
+    <key alias="step4">4. Adım: Umbraco güvenliğini kontrol edin</key>
+    <key alias="step5">Adım 5/5: Umbraco başlamanıza hazır</key>
+    <key alias="thankYou">Umbraco'yu seçtiğiniz için teşekkür ederiz</key>
+    <key alias="theEndBrowseSite">
+      <![CDATA[<h3> Yeni sitenize göz atın </h3>
+Runway'i kurdunuz, öyleyse neden yeni web sitenizin nasıl göründüğüne bakmıyorsunuz.]]>
+    </key>
+    <key alias="theEndFowseHelp">
+      <![CDATA[<h3> Daha fazla yardım ve bilgi </h3>
+Ödüllü topluluğumuzdan yardım alın, belgelere göz atın veya basit bir sitenin nasıl oluşturulacağı, paketlerin nasıl kullanılacağı ve Umbraco terminolojisine yönelik hızlı bir kılavuzla ilgili bazı ücretsiz videolar izleyin]]>
+    </key>
+    <key alias="theEndHeader">Umbraco %0% yüklendi ve kullanıma hazır</key>
+    <key alias="theEndInstallFailed">
+      <![CDATA[Kurulumu bitirmek için yapmanız gerekenler
+        <strong> /web.config dosyasını </strong> manuel olarak düzenleyin ve alttaki AppSetting anahtarını <strong> UmbracoConfigurationStatus </strong> <strong> '%0%' </strong> değerine güncelleyin.]]>
+    </key>
+    <key alias="theEndInstallSuccess">
+      <![CDATA[Aşağıdaki "Umbraco'yu Başlat" düğmesini tıklayarak <strong> anında başlayabilirsiniz </strong>. <br /> <strong> Umbraco'da yeniyseniz </strong>,
+başlangıç ​​sayfalarımızda birçok kaynak bulabilirsiniz.]]>
+    </key>
+    <key alias="theEndOpenUmbraco">
+      <![CDATA[<h3> Umbraco’yu Başlat </h3>
+Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemeye başlayın, şablonları ve stil sayfalarını güncelleyin veya yeni işlevler ekleyin]]>
+    </key>
+    <key alias="Unavailable">Veritabanına bağlantı başarısız oldu.</key>
+    <key alias="Version3">Umbraco Sürüm 3</key>
+    <key alias="Version4">Umbraco Sürüm 4</key>
+    <key alias="watch">İzle</key>
+    <key alias="welcomeIntro">
+      <![CDATA[Bu sihirbaz, yeni bir yükleme veya sürüm 3.0'dan yükseltme için <strong> Umbraco %0% </strong> 'u yapılandırma sürecinde size yol gösterecektir.
+                                <br /> <br />
+                                Sihirbazı başlatmak için <strong> "ileri" </strong> seçeneğine basın.]]>
+    </key>
   </area>
   <area alias="language">
     <key alias="cultureCode">Kültür Kodu</key>
     <key alias="displayName">Kültür Adı</key>
   </area>
   <area alias="lockout">
-    <key alias="lockoutWillOccur">Sen boşta oldum ve çıkış otomatik olarak gerçekleşecek</key>
-    <key alias="renewSession">İşinizi kaydetmek için şimdi Yenile</key>
+    <key alias="lockoutWillOccur">Boştaydınız ve çıkış otomatik olarak içinde gerçekleşecek</key>
+    <key alias="renewSession">Çalışmanızı kaydetmek için şimdi yenileyin</key>
   </area>
   <area alias="login">
-    <key alias="greeting0">Pazar</key>
-    <key alias="greeting1">Pazartesi </key>
-    <key alias="greeting2">Salı</key>
-    <key alias="greeting3">Çarşamba</key>
-    <key alias="greeting4">Perşembe</key>
-    <key alias="greeting5">Cuma</key>
-    <key alias="greeting6">İçerik Yönetim Sistemi</key>
-    <key alias="instruction">Giriş Yapın</key>
+    <key alias="greeting0">Mutlu Pazarlar</key>
+    <key alias="greeting1">Mutlu manik Pazartesi</key>
+    <key alias="greeting2">Mutlu salı günleri</key>
+    <key alias="greeting3">Harika Çarşamba Günleri</key>
+    <key alias="greeting4">Mutlu, gök gürültülü Perşembe</key>
+    <key alias="greeting5">Mutlu Cuma Günü</key>
+    <key alias="greeting6">Mutlu Yıllar</key>
+    <key alias="instruction">Aşağıda oturum açın</key>
+    <key alias="signInWith">ile oturum açın</key>
     <key alias="timeout">Oturum zaman aşımına uğradı</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2015 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align: right;">&copy; 2015 - %0% <br /> <a href="https://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com </a> </p>]]></key>
+    <key alias="forgottenPassword">Şifrenizi mi unuttunuz?</key>
+    <key alias="forgottenPasswordInstruction">Parolanızı sıfırlamak için bir bağlantıyla belirtilen adrese bir e-posta gönderilecektir</key>
+    <key alias="requestPasswordResetConfirmation">Kayıtlarımızla eşleşirse, şifre sıfırlama talimatlarını içeren bir e-posta, belirtilen adrese gönderilecektir</key>
+    <key alias="showPassword">Şifreyi göster</key>
+    <key alias="hidePassword">Şifreyi gizle</key>
+    <key alias="returnToLogin">Giriş formuna dön</key>
+    <key alias="setPasswordInstruction">Lütfen yeni bir şifre girin</key>
+    <key alias="setPasswordConfirmation">Şifreniz güncellendi</key>
+    <key alias="resetCodeExpired">Tıkladığınız bağlantı geçersiz veya süresi dolmuş</key>
+    <key alias="resetPasswordEmailCopySubject">Umbraco: Şifreyi Sıfırla</key>
+    <key alias="resetPasswordEmailCopyFormat">
+      <![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+			<body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Şifre sıfırlama istendi
+														</h1>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															Umbraco arka ofisinde oturum açmak için kullanıcı adınız: <strong>%0%</strong>
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
+																<tbody>
+																	<tr>
+																		<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																			<a href='%1%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+																				Şifrenizi sıfırlamak için bu bağlantıyı tıklayın
+																			</a>
+																		</td>
+																	</tr>
+																</tbody>
+															</table>
+														</p>
+														<p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>Bağlantıya tıklayamazsanız, bu URL'yi kopyalayıp tarayıcı pencerenize yapıştırın:</p>
+															<table border='0' cellpadding='0' cellspacing='0'>
+																<tr>
+																	<td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
+																		<font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
+																			<a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%1%'>%1%</a>
+																		</font>
+																	</td>
+																</tr>
+															</table>
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+		</html>              
+  ]]>
+    </key>
   </area>
   <area alias="main">
-    <key alias="dashboard">Gösterge Paneli</key>
+    <key alias="dashboard">Dashboard</key>
     <key alias="sections">Bölümler</key>
     <key alias="tree">İçerik</key>
   </area>
   <area alias="moveOrCopy">
-    <key alias="choose">Choose page above...</key>
-    <key alias="copyDone">%0% has been copied to %1%</key>
-    <key alias="copyTo">Select where the document %0% should be copied to below</key>
-    <key alias="moveDone">%0% has been moved to %1%</key>
-    <key alias="moveTo">Select where the document %0% should be moved to below</key>
-    <key alias="nodeSelected">has been selected as the root of your new content, click 'ok' below.</key>
-    <key alias="noNodeSelected">No node selected yet, please select a node in the list above before clicking 'ok'</key>
-    <key alias="notAllowedByContentType">The current node is not allowed under the chosen node because of its type</key>
-    <key alias="notAllowedByPath">The current node cannot be moved to one of its subpages</key>
-    <key alias="notAllowedAtRoot">The current node cannot exist at the root</key>
-    <key alias="notValid">The action isn't allowed since you have insufficient permissions on 1 or more child documents.</key>
-    <key alias="relateToOriginal">Relate copied items to original</key>
+    <key alias="choose">Yukarıdaki sayfayı seçin ...</key>
+    <key alias="copyDone">%0%,%1% konumuna kopyalandı</key>
+    <key alias="copyTo">%0% belgesinin aşağıya kopyalanacağı yeri seçin</key>
+    <key alias="moveDone">%0%,%1% konumuna taşındı</key>
+    <key alias="moveTo">%0% belgesinin aşağıya taşınacağı yeri seçin</key>
+    <key alias="nodeSelected">, yeni içeriğinizin kökü olarak seçildi, aşağıdaki 'tamam'ı tıklayın.</key>
+    <key alias="noNodeSelected">Henüz düğüm seçilmedi, lütfen 'tamam'ı tıklamadan önce yukarıdaki listeden bir düğüm seçin</key>
+    <key alias="notAllowedByContentType">Geçerli düğüme, türü nedeniyle seçilen düğüm altında izin verilmiyor</key>
+    <key alias="notAllowedByPath">Geçerli düğüm, alt sayfalarından birine taşınamaz</key>
+    <key alias="notAllowedAtRoot">Geçerli düğüm kökte bulunamaz</key>
+    <key alias="notValid">1 veya daha fazla alt belge üzerinde yetersiz izniniz olduğundan işleme izin verilmiyor.</key>
+    <key alias="relateToOriginal">Kopyalanan öğeleri orijinalle ilişkilendir</key>
   </area>
   <area alias="notifications">
-    <key alias="editNotifications">Edit your notification for %0%</key>
-    <key alias="mailBody"><![CDATA[
-      Hi %0%
-
-      This is an automated mail to inform you that the task '%1%'
-      has been performed on the page '%2%'
-      by the user '%3%'
-
-      Go to http://%4%/#/content/content/edit/%5% to edit.
-
-      Have a nice day!
-
-      Cheers from the Umbraco robot
-    ]]></key>
-    <key alias="mailBodyHtml"><![CDATA[<p>Hi %0%</p>
-
-		  <p>This is an automated mail to inform you that the task <strong>'%1%'</strong>
-		  has been performed on the page <a href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a>
-		  by the user <strong>'%3%'</strong>
-	  </p>
-		  <div style="margin: 8px 0; padding: 8px; display: block;">
-				<br />
-				<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EDIT&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp;
-				<br />
-		  </div>
-		  <p>
-			  <h3>Update summary:</h3>
-			  <table style="width: 100%;">
-						   %6%
+    <key alias="editNotifications"><![CDATA[<strong>%0%</strong>]]> için bildiriminizi seçin</key>
+    <key alias="notificationSavedFor">için bildirim ayarları kaydedildi</key>
+    <key alias="mailBody">
+      <![CDATA[
+      Merhaba %0%
+ 
+      Bu, '%1%' görevinin size bildirilmesi için otomatik bir postadır.
+      '%2%' sayfasında gerçekleştirildi
+      '%3%' kullanıcısı tarafından
+ 
+      Düzenlemek için http://%4%/#/content/content/edit/%5% adresine gidin.
+ 
+      %6%
+ 
+      İyi günler!
+ 
+      Umbraco robotundan teşekkürler
+    ]]>
+    </key>
+    <key alias="mailBodyVariantSummary">Aşağıdaki diller %0% değiştirildi</key>
+    <key alias="mailBodyHtml">
+      <![CDATA[
+        <html>
+			<head>
+				<meta name='viewport' content='width=device-width'>
+				<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+			</head>
+        <body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+				<style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+				<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+					<tr>
+						<td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+							<table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+								<tr>
+									<td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+										<!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+										<div> </div>
+										<!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+									</td>
+									<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
 				</table>
-			 </p>
-
-		  <div style="margin: 8px 0; padding: 8px; display: block;">
-				<br />
-				<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EDIT&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp;
-				<br />
-		  </div>
-
-		  <p>Have a nice day!<br /><br />
-			  Cheers from the Umbraco robot
-		  </p>]]></key>
-    <key alias="mailSubject">[%0%] Notification about %1% performed on %2%</key>
-    <key alias="notifications">Notifications</key>
+				<table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+					<tr>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+						<td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+							<div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+								<br>
+								<table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+									<tr>
+										<td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+											<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+												<tr>
+													<td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+														<h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+															Merhaba %0%,
+														</h1>
+                                                        <p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+                                                            Bu, <strong>'%1%'</strong> görevinin <a style="color: #392F54; text-decoration: none; -ms-word-break: break-all; word-break: break-all;" href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> sayfasında <strong>'%3%'</strong> kullanıcısı tarafından gerçekleştirildiğini size bildirmek için otomatik bir postadır.
+														</p>
+														<table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
+															<tbody>
+																<tr>
+																	<td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
+																		<table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'><tbody><tr>
+																			<td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+																				<a href='http://%4%/#/content/content/edit/%5%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>DÜZENLE</a> </td> </tr></tbody></table>
+																	</td>
+																</tr>
+															</tbody>
+														</table>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															<h3>Güncelleme Özeti:</h3>
+															%6%
+														</p>
+														<p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+															İyi günler dilerim!<br /><br />
+															Umbraco robotundan teşekkürler
+														</p>
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+								<br><br><br>
+							</div>
+						</td>
+						<td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+					</tr>
+				</table>
+			</body>
+		</html>  
+	]]>
+    </key>
+    <key alias="mailBodyVariantHtmlSummary">
+      <![CDATA[<p> Aşağıdaki diller değiştirildi: </p>
+       %0%
+    ]]>
+    </key>
+    <key alias="mailSubject">[ %0%]%1% ile ilgili bildirim%2% üzerinde gerçekleştirildi</key>
+    <key alias="notifications">Bildirimler</key>
   </area>
   <area alias="packager">
-    <key alias="chooseLocalPackageText"><![CDATA[
-      Choose Package from your machine, by clicking the Browse<br />
-         button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension.
-      ]]></key>
-    <key alias="packageAuthor">Author</key>
-    <key alias="packageDocumentation">Documentation</key>
-    <key alias="packageMetaData">Package meta data</key>
-    <key alias="packageName">Package name</key>
-    <key alias="packageNoItemsHeader">Package doesn't contain any items</key>
-    <key alias="packageNoItemsText"><![CDATA[This package file doesn't contain any items to uninstall.<br/><br/>
-      You can safely remove this from the system by clicking "uninstall package" below.]]></key>
-    <key alias="packageOptions">Package options</key>
-    <key alias="packageReadme">Package readme</key>
-    <key alias="packageRepository">Package repository</key>
-    <key alias="packageUninstallConfirm">Confirm uninstall</key>
-    <key alias="packageUninstalledHeader">Package was uninstalled</key>
-    <key alias="packageUninstalledText">The package was successfully uninstalled</key>
-    <key alias="packageUninstallHeader">Uninstall package</key>
-    <key alias="packageUninstallText"><![CDATA[You can unselect items you do not wish to remove, at this time, below. When you click "confirm uninstall" all checked-off items will be removed.<br />
-      <span style="color: Red; font-weight: bold;">Notice:</span> any documents, media etc depending on the items you remove, will stop working, and could lead to system instability,
-      so uninstall with caution. If in doubt, contact the package author.]]></key>
-    <key alias="packageVersion">Package version</key>
+    <key alias="actions">İşlemler</key>
+    <key alias="created">Oluşturuldu</key>
+    <key alias="createPackage">Paket oluştur</key>
+    <key alias="chooseLocalPackageText">
+      <![CDATA[
+      Gözat düğmesine tıklayarak ve paketi bularak makinenizden Paketi seçin. <br/>
+      Umbraco paketleri genellikle ".umb" veya ".zip" uzantısına sahiptir.
+      ]]>
+    </key>
+    <key alias="deletewarning">Bu, paketi silecek</key>
+    <key alias="dropHere">Yüklemek için bırakın</key>
+    <key alias="includeAllChildNodes">Tüm alt düğümleri dahil et</key>
+    <key alias="orClickHereToUpload">veya paket dosyasını seçmek için burayı tıklayın</key>
+    <key alias="uploadPackage">Paketi yükle</key>
+    <key alias="localPackageDescription">Makinenizden seçerek yerel bir paket kurun. Yalnızca bildiğiniz ve güvendiğiniz kaynaklardan paket yükleyin</key>
+    <key alias="uploadAnother">Başka bir paket yükleyin</key>
+    <key alias="cancelAndUploadAnother">İptal edin ve başka bir paketi yükleyin</key>
+    <key alias="accept">Kabul ediyorum</key>
+    <key alias="termsOfUse">kullanım şartları</key>
+
+    <key alias="pathToFile">Dosyaya giden yol</key>
+    <key alias="pathToFileDescription">Dosyaya giden mutlak yol (yani: /bin/umbraco.bin)</key>
+    <key alias="installed">Yüklendi</key>
+    <key alias="installedPackages">Yüklü paketler</key>
+    <key alias="installLocal">Yerel yükle</key>
+    <key alias="installFinish">Bitir</key>
+    <key alias="noConfigurationView">Bu pakette yapılandırma görünümü yok</key>
+    <key alias="noPackagesCreated">Henüz paket oluşturulmadı</key>
+    <key alias="noPackages">Kurulu paketiniz yok</key>
+    <key alias="noPackagesDescription"><![CDATA[Kurulu paketiniz yok. Makinenizden seçerek yerel bir paket kurun veya ekranınızın sağ üst kısmındaki <strong>'Paketler'</strong> simgesini kullanarak mevcut paketlere göz atın]]></key>
+    <key alias="packageActions">Paket İşlemleri</key>
+    <key alias="packageAuthorUrl">Yazar URL'si</key>
+    <key alias="packageContent">Paket İçeriği</key>
+    <key alias="packageFiles">Paket Dosyaları</key>
+    <key alias="packageIconUrl">Simge URL'si</key>
+    <key alias="packageInstall">Paketi yükle</key>
+    <key alias="packageLicense">Lisans</key>
+    <key alias="packageLicenseUrl">Lisans URL'si</key>
+    <key alias="packageProperties">Paket Özellikleri</key>
+    <key alias="packageSearch">Paket arayın</key>
+    <key alias="packageSearchResults">Sonuçlar</key>
+    <key alias="packageNoResults">için hiçbir şey bulamadık</key>
+    <key alias="packageNoResultsDescription">Lütfen başka bir paket aramayı deneyin veya kategorilere göz atın</key>
+    <key alias="packagesPopular">Popüler</key>
+    <key alias="packagesNew">Yeni sürümler</key>
+    <key alias="packageHas">vardır</key>
+    <key alias="packageKarmaPoints">karma noktaları</key>
+    <key alias="packageInfo">Bilgi</key>
+    <key alias="packageOwner">Sahip</key>
+    <key alias="packageContrib">Katkıda bulunanlar</key>
+    <key alias="packageCreated">Oluşturuldu</key>
+    <key alias="packageCurrentVersion">Mevcut sürüm</key>
+    <key alias="packageNetVersion">. NET sürümü</key>
+    <key alias="packageDownloads">İndirmeler</key>
+    <key alias="packageLikes">Beğeniler</key>
+    <key alias="packageCompatibility">Uyumluluk</key>
+    <key alias="packageCompatibilityDescription">Bu paket, topluluk üyeleri tarafından bildirildiği üzere aşağıdaki Umbraco sürümleriyle uyumludur. % 100'ün altında rapor edilen sürümler için tam uyumluluk garanti edilemez</key>
+    <key alias="packageExternalSources">Harici kaynaklar</key>
+    <key alias="packageAuthor">Yazar</key>
+    <key alias="packageDocumentation">Belgeler</key>
+    <key alias="packageMetaData">Meta verilerini paketle</key>
+    <key alias="packageName">Paket adı</key>
+    <key alias="packageNoItemsHeader">Paket herhangi bir öğe içermiyor</key>
+    <key alias="packageNoItemsText">
+      <![CDATA[Bu paket dosyası kaldırılacak hiçbir öğe içermiyor.<br /><br/>
+      Aşağıdaki "Paketi kaldır"'ı tıklayarak bunu sistemden güvenle kaldırabilirsiniz.]]>
+    </key>
+    <key alias="packageOptions">Paket seçenekleri</key>
+    <key alias="packageReadme">Paketi beni oku</key>
+    <key alias="packageRepository">Paket deposu</key>
+    <key alias="packageUninstallConfirm">Paketi kaldırmayı onayla</key>
+    <key alias="packageUninstalledHeader">Paket kaldırıldı</key>
+    <key alias="packageUninstalledText">Paket başarıyla kaldırıldı</key>
+    <key alias="packageUninstallHeader">Paketi kaldır</key>
+    <key alias="packageUninstallText">
+      <![CDATA[Şu anda aşağıda, kaldırmak istemediğiniz öğelerin seçimini kaldırabilirsiniz. "Kaldırmayı onayla" yı tıkladığınızda işaretlenen tüm öğeler kaldırılacaktır. <br />
+      <span style="color: Red; font-weight: bold;">Uyarı:</span> kaldırdığınız öğelere bağlı olarak herhangi bir belge, ortam vb. çalışmayı durdurur ve sistem kararsızlığına neden olabilir,
+      bu yüzden dikkatli bir şekilde kaldırın. Şüpheniz varsa, paket yazarıyla iletişime geçin.]]>
+    </key>
+    <key alias="packageVersion">Paket versiyonu</key>
+    <key alias="packageAlreadyInstalled">Paket zaten yüklü</key>
+    <key alias="targetVersionMismatch">Bu paket kurulamaz, minimum Umbraco sürümü gerektirir</key>
+    <key alias="installStateUninstalling">Kaldırılıyor ...</key>
+    <key alias="installStateDownloading">İndiriliyor ...</key>
+    <key alias="installStateImporting">İçe Aktarılıyor ...</key>
+    <key alias="installStateInstalling">Kuruluyor ...</key>
+    <key alias="installStateRestarting">Yeniden başlatılıyor, lütfen bekleyin ...</key>
+    <key alias="installStateComplete">Her şey tamam, tarayıcınız şimdi yenilenecek, lütfen bekleyin ...</key>
+    <key alias="installStateCompleted">Kurulumu tamamlamak ve sayfayı yeniden yüklemek için lütfen 'Bitir'i tıklayın.</key>
+    <key alias="installStateUploading">Paket yükleniyor ...</key>
   </area>
   <area alias="paste">
-    <key alias="doNothing">Paste with full formatting (Not recommended)</key>
-    <key alias="errorMessage">The text you're trying to paste contains special characters or formatting. This could be caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so the pasted content will be more suitable for the web.</key>
-    <key alias="removeAll">Paste as raw text without any formatting at all</key>
-    <key alias="removeSpecialFormattering">Paste, but remove formatting (Recommended)</key>
+    <key alias="doNothing">Tam biçimlendirmeyle yapıştırın (Önerilmez)</key>
+    <key alias="errorMessage">Yapıştırmaya çalıştığınız metin özel karakterler veya biçimlendirme içeriyor. Bunun nedeni Microsoft Word'den metin kopyalanması olabilir. Umbraco, özel karakterleri veya biçimlendirmeyi otomatik olarak kaldırabilir, böylece yapıştırılan içerik web için daha uygun olacaktır.</key>
+    <key alias="removeAll">Hiçbir biçimlendirme olmadan ham metin olarak yapıştırın</key>
+    <key alias="removeSpecialFormattering">Yapıştır, ancak biçimlendirmeyi kaldırın (Önerilir)</key>
   </area>
   <area alias="publicAccess">
-    <key alias="paAdvanced">Role based protection</key>
-    <key alias="paAdvancedHelp"><![CDATA[If you wish to control access to the page using role-based authentication,<br /> using Umbraco's member groups.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[You need to create a membergroup before you can use <br />role-based authentication.]]></key>
-    <key alias="paErrorPage">Error Page</key>
-    <key alias="paErrorPageHelp">Used when people are logged on, but do not have access</key>
-    <key alias="paHowWould">Choose how to restrict access to this page</key>
-    <key alias="paIsProtected">%0% is now protected</key>
-    <key alias="paIsRemoved">Protection removed from %0%</key>
-    <key alias="paLoginPage">Login Page</key>
-    <key alias="paLoginPageHelp">Choose the page that contains the login form</key>
-    <key alias="paRemoveProtection">Remove Protection</key>
-    <key alias="paSelectPages">Select the pages that contain login form and error messages</key>
-    <key alias="paSelectRoles">Pick the roles who have access to this page</key>
-    <key alias="paSetLogin">Set the login and password for this page</key>
-    <key alias="paSimple">Single user protection</key>
-    <key alias="paSimpleHelp">If you just want to setup simple protection using a single login and password</key>
+    <key alias="paGroups">Grup tabanlı koruma</key>
+    <key alias="paGroupsHelp">Belirli üye gruplarının tüm üyelerine erişim vermek istiyorsanız</key>
+    <key alias="paGroupsNoGroups">Grup tabanlı kimlik doğrulamasını kullanmadan önce bir üye grubu oluşturmanız gerekir</key>
+    <key alias="paErrorPage">Hata Sayfası</key>
+    <key alias="paErrorPageHelp">Kişiler oturum açtığında ancak erişimi olmadığında kullanılır</key>
+    <key alias="paHowWould"><![CDATA[Sayfaya erişimi nasıl kısıtlayacağınızı seçin <strong>%0%</strong>]]></key>
+    <key alias="paIsProtected"><![CDATA[<strong>%0%</strong> artık korumalı]]></key>
+    <key alias="paIsRemoved"><![CDATA[Koruma, <strong>%0%</strong>]]> sayfasından kaldırılmıştır.</key>
+    <key alias="paLoginPage">Giriş Sayfası</key>
+    <key alias="paLoginPageHelp">Giriş formunu içeren sayfayı seçin</key>
+    <key alias="paRemoveProtection">Korumayı kaldır ...</key>
+    <key alias="paRemoveProtectionConfirm"><![CDATA[Korumayı <strong>%0%</strong> sayfasından kaldırmak istediğinizden emin misiniz?]]> </key>
+    <key alias="paSelectPages">Giriş formu ve hata mesajları içeren sayfaları seçin</key>
+    <key alias="paSelectGroups"><![CDATA[<strong>%0%</strong> sayfasına erişimi olan grupları seçin]]></key>
+    <key alias="paSelectMembers"><![CDATA[<strong>%0%</strong> sayfasına erişimi olan üyeleri seçin]]></key>
+    <key alias="paMembers">Belirli üyelerin korunması</key>
+    <key alias="paMembersHelp">Belirli üyelere erişim vermek istiyorsanız</key>
   </area>
   <area alias="publish">
-    <key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
-      %0% could not be published because the item is scheduled for release.
-    ]]></key>
-    <key alias="contentPublishedFailedInvalid"><![CDATA[
-      %0% could not be published because these properties:  %1%  did not pass validation rules.
-    ]]></key>
-    <key alias="contentPublishedFailedByEvent"><![CDATA[
-      %0% could not be published, a 3rd party add-in cancelled the action.
-    ]]></key>
-    <key alias="contentPublishedFailedByParent"><![CDATA[
-      %0% can not be published, because a parent page is not published.
-    ]]></key>
-    <key alias="includeUnpublished">Include unpublished child pages</key>
-    <key alias="inProgress">Publishing in progress - please wait...</key>
-    <key alias="inProgressCounter">%0% out of %1% pages have been published...</key>
-    <key alias="nodePublish">%0% has been published</key>
-    <key alias="nodePublishAll">%0% and subpages have been published</key>
-    <key alias="publishAll">Publish %0% and all its subpages</key>
-    <key alias="publishHelp"><![CDATA[Click <em>ok</em> to publish <strong>%0%</strong> and thereby making its content publicly available.<br/><br />
-      You can publish this page and all it's sub-pages by checking <em>publish all children</em> below.
-      ]]></key>
+    <key alias="contentPublishedFailedAwaitingRelease">
+      <![CDATA[
+     %0%, öğenin yayınlanması planlandığından yayınlanamadı.
+    ]]>
+    </key>
+    <key alias="contentPublishedFailedExpired">
+      <![CDATA[
+      Öğenin süresi dolduğu için %0% yayınlanamadı.
+    ]]>
+    </key>
+    <key alias="contentPublishedFailedInvalid">
+      <![CDATA[
+     %0%, şu özellikler nedeniyle yayınlanamadı:%1% doğrulama kurallarını geçemedi.
+    ]]>
+    </key>
+    <key alias="contentPublishedFailedByEvent">
+      <![CDATA[
+     %0% yayınlanamadı, 3. taraf eklenti işlemi iptal etti.
+    ]]>
+    </key>
+    <key alias="contentPublishedFailedByParent">
+      <![CDATA[
+      Bir üst sayfa yayınlanmadığı için %0% yayınlanamaz.
+    ]]>
+    </key>
+    <key alias="contentPublishedFailedByMissingName"><![CDATA[ %0%, adı eksik olduğu için yayınlanamaz.]]></key>
+    <key alias="includeUnpublished">Yayınlanmamış alt sayfaları dahil et</key>
+    <key alias="inProgress">Yayınlanıyor - lütfen bekleyin ...</key>
+    <key alias="inProgressCounter">%1% sayfadan %0% yayınlandı ...</key>
+    <key alias="nodePublish">%0% yayınlandı</key>
+    <key alias="nodePublishAll">%0% ve alt sayfalar yayınlandı</key>
+    <key alias="publishAll">%0% ve tüm alt sayfalarını yayınlayın</key>
+    <key alias="publishHelp">
+      <![CDATA[<strong>%0%</strong> yayınlamak ve böylece içeriğini herkese açık hale getirmek için <em>Yayınla</em>'yı tıklayın. <br/><br />
+      Aşağıdaki <em>Yayınlanmamış alt sayfaları ekle</em> 'yi işaretleyerek bu sayfayı ve tüm alt sayfalarını yayınlayabilirsiniz.
+      ]]>
+    </key>
   </area>
   <area alias="colorpicker">
-    <key alias="noColors">You have not configured any approved colours</key>
+    <key alias="noColors">Onaylanmış herhangi bir renk yapılandırmadınız</key>
+  </area>
+  <area alias="contentPicker">
+    <key alias="allowedItemTypes">Yalnızca şu türdeki öğeleri seçebilirsiniz: %0%</key>
+    <key alias="pickedTrashedItem">Şu anda silinmiş veya geri dönüşüm kutusunda bulunan bir içerik öğesini seçtiniz</key>
+    <key alias="pickedTrashedItems">Şu anda silinmiş veya geri dönüşüm kutusunda bulunan içerik öğelerini seçtiniz</key>
+  </area>
+  <area alias="mediaPicker">
+    <key alias="deletedItem">Silinen öğe</key>
+    <key alias="pickedTrashedItem">Şu anda silinmiş veya geri dönüşüm kutusunda bulunan bir medya öğesini seçtiniz</key>
+    <key alias="pickedTrashedItems">Şu anda silinmiş veya geri dönüşüm kutusunda bulunan medya öğelerini seçtiniz</key>
+    <key alias="trashed">Çöp kutusuna gönderildi</key>
   </area>
   <area alias="relatedlinks">
-    <key alias="enterExternal">harici bağlantı gir</key>
-    <key alias="chooseInternal">iç sayfa seç</key>
-    <key alias="caption">Altyazı</key>
+    <key alias="enterExternal">harici bağlantı girin</key>
+    <key alias="chooseInternal">dahili sayfayı seç</key>
+    <key alias="caption">Başlık</key>
     <key alias="link">Bağlantı</key>
-    <key alias="newWindow">yeni pencere</key>
-    <key alias="captionPlaceholder">Yeni altyazı gir</key>
-    <key alias="externalLinkPlaceholder">Bağlantı gir</key>
+    <key alias="newWindow">Yeni pencerede aç</key>
+    <key alias="captionPlaceholder">ekran başlığını girin</key>
+    <key alias="externalLinkPlaceholder">Bağlantıyı girin</key>
   </area>
   <area alias="imagecropper">
-    <key alias="reset">Sıfırla</key>
+    <key alias="reset">Kırpmayı sıfırla</key>
+    <key alias="saveCrop">Kırpmayı kaydet</key>
+    <key alias="addCrop">Yeni kırpma ekle</key>
+    <key alias="updateEditCrop">Bitti</key>
+    <key alias="undoEditCrop">Düzenlemeleri geri alın</key>
+    <key alias="customCrop">Kullanıcı tanımlı</key>
   </area>
   <area alias="rollback">
-    <key alias="currentVersion">Varolan versiyon</key>
-    <key alias="diffHelp"><![CDATA[This shows the differences between the current version and the selected version<br /><del>Red</del> text will not be shown in the selected version. , <ins>green means added</ins>]]></key>
-    <key alias="documentRolledBack">Document has been rolled back</key>
-    <key alias="htmlHelp">This displays the selected version as HTML, if you wish to see the difference between 2 versions at the same time, use the diff view</key>
-    <key alias="rollbackTo">Rollback to</key>
-    <key alias="selectVersion">Versiyon seç</key>
-    <key alias="view">Görünüm</key>
+    <key alias="changes">Değişiklikler</key>
+    <key alias="created">Oluşturuldu</key>
+    <key alias="currentVersion">Mevcut sürüm</key>
+    <key alias="diffHelp"><![CDATA[Bu, mevcut sürüm ile seçili sürüm arasındaki farkları gösterir <br /> <del> Kırmızı </del> metin seçili sürümde gösterilmeyecektir. , <ins> yeşil eklendi demektir </ins>]]></key>
+    <key alias="documentRolledBack">Belge geri alındı ​​</key>
+    <key alias="headline">Mevcut sürümle karşılaştırmak için bir sürüm seçin</key>
+    <key alias="htmlHelp">Bu, seçilen sürümü HTML olarak görüntüler, 2 sürüm arasındaki farkı aynı anda görmek isterseniz, fark görünümünü kullanın</key>
+    <key alias="rollbackTo">Geri alın</key>
+    <key alias="selectVersion">Sürüm seçin</key>
+    <key alias="view">Görüntüle</key>
   </area>
   <area alias="scripts">
-    <key alias="editscript">Düzenleme komut dosyası</key>
+    <key alias="editscript">Komut dosyasını düzenle</key>
   </area>
   <area alias="sections">
-    <key alias="concierge">Kapıcı</key>
+    <key alias="concierge">Konsiyerj</key>
     <key alias="content">İçerik</key>
-    <key alias="courier">Kurya</key>
+    <key alias="courier">Kurye</key>
     <key alias="developer">Geliştirici</key>
-    <key alias="installer">CMS Yapılandırma Sihirbazı</key>
+    <key alias="forms">Formlar</key>
+    <key alias="help" version="7.0">Yardım</key>
+    <key alias="installer">Umbraco Yapılandırma Sihirbazı</key>
     <key alias="media">Medya</key>
     <key alias="member">Üyeler</key>
-    <key alias="newsletters">Haber Bültenleri</key>
+    <key alias="newsletters">Bültenler</key>
+    <key alias="packages">Paketler</key>
     <key alias="settings">Ayarlar</key>
-    <key alias="statistics">İstatistik</key>
+    <key alias="statistics">İstatistikler</key>
     <key alias="translation">Çeviri</key>
     <key alias="users">Kullanıcılar</key>
-    <key alias="help" version="7.0">Yardım</key>
-    <key alias="forms">Formlar</key>
   </area>
   <area alias="help">
-    <key alias="theBestUmbracoVideoTutorials">Kayadata</key>
+    <key alias="tours">Turlar</key>
+    <key alias="theBestUmbracoVideoTutorials">En iyi Umbraco video eğitimleri</key>
+    <key alias="umbracoForum">our.umbraco.com adresini ziyaret edin</key>
+    <key alias="umbracoTv">umbraco.tv'yi ziyaret edin</key>
   </area>
   <area alias="settings">
-    <key alias="defaulttemplate">Varsayılan şablonu</key>
-    <key alias="importDocumentTypeHelp">To import a document type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen)</key>
-    <key alias="newtabname">New Tab Title</key>
-    <key alias="nodetype">Node type</key>
-    <key alias="objecttype">Type</key>
-    <key alias="stylesheet">Stylesheet</key>
-    <key alias="script">Script</key>
-    <key alias="tab">Tab</key>
-    <key alias="tabname">Tab Title</key>
-    <key alias="tabs">Tabs</key>
-    <key alias="contentTypeEnabled">Master Content Type enabled</key>
-    <key alias="contentTypeUses">This Content Type uses</key>
-    <key alias="asAContentMasterType">as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself</key>
-    <key alias="noPropertiesDefinedOnTab">No properties defined on this tab. Click on the "add a new property" link at the top to create a new property.</key>
-  </area>
+    <key alias="defaulttemplate">Varsayılan şablon</key>
+    <key alias="importDocumentTypeHelp">
+      Bir belge türünü içe aktarmak için, "Gözat" düğmesini tıklayarak bilgisayarınızda ".udt" dosyasını bulun ve "İçe Aktar" ı tıklayın (sonraki ekranda onay vermeniz istenir) </key>
+    <key alias="newtabname">Yeni Sekme Başlığı</key>
+      <key alias="nodetype">Düğüm türü</key>
+      <key alias="objecttype">Tür</key>
+      <key alias="stylesheet">Stil Sayfası</key>
+      <key alias="script">Komut Dosyası</key>
+      <key alias="tab">Sekme</key>
+      <key alias="tabname">Sekme Başlığı</key>
+      <key alias="tabs">Sekmeler</key>
+      <key alias="contentTypeEnabled">Ana İçerik Türü etkinleştirildi</key>
+      <key alias="contentTypeUses">Bu İçerik Türü kullanır</key>
+      Ana İçerik Türü olarak <key alias="asAContentMasterType">. Ana İçerik Türlerinden sekmeler gösterilmez ve yalnızca Ana İçerik Türünün kendisinde düzenlenebilir</key>
+      <key alias="noPropertiesDefinedOnTab">Bu sekmede tanımlanmış özellik yok. Yeni bir mülk oluşturmak için üstteki "yeni mülk ekle" bağlantısını tıklayın.</key>
+      <key alias="createMatchingTemplate">Eşleşen şablon oluştur</key>
+      <key alias="addIcon">Simge ekle</key>
+    </area>
   <area alias="sort">
-    <key alias="sortDone">Sorting complete.</key>
-    <key alias="sortHelp">Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items</key>
-    <key alias="sortPleaseWait"><![CDATA[ Please wait. Items are being sorted, this can take a while.]]></key>
+    <key alias="sortOrder">Sıralama düzeni</key>
+    <key alias="sortCreationDate">Oluşturma tarihi</key>
+    <key alias="sortDone">Sıralama tamamlandı.</key>
+    <key alias="sortHelp">Nasıl düzenleneceklerini ayarlamak için farklı öğeleri aşağı veya yukarı sürükleyin. Veya tüm öğe koleksiyonunu sıralamak için sütun başlıklarını tıklayın</key>
+    <key alias="sortPleaseWait"><![CDATA[Lütfen bekleyin. Öğeler sıralanıyor, bu biraz zaman alabilir.]]></key>
   </area>
   <area alias="speechBubbles">
-    <key alias="operationFailedHeader">Hata</key>
-    <key alias="invalidUserPermissionsText">Kullanıcı izniniz yeterli olmadığı için, işleminiz gerçekleştirilmedi.</key>
+    <key alias="validationFailedHeader">Doğrulama</key>
+    <key alias="validationFailedMessage">Öğe kaydedilmeden önce doğrulama hataları düzeltilmelidir</key>
+    <key alias="operationFailedHeader">Başarısız</key>
+    <key alias="operationSavedHeader">Kaydedildi</key>
+    <key alias="invalidUserPermissionsText">Yetersiz kullanıcı izni, işlemi tamamlayamadı</key>
     <key alias="operationCancelledHeader">İptal Edildi</key>
-    <key alias="operationCancelledText">İşleminiz 3.Parti yazılım tarafından iptal edildi.</key>
-    <key alias="contentPublishedFailedByEvent">Sayfa yayınlama 3.Parti yazılım tarafından iptal edildi.</key>
-    <key alias="contentTypeDublicatePropertyType">Property type zaten bulunuyor</key>
-    <key alias="contentTypePropertyTypeCreated">Property type oluşturuldu</key>
-    <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Name: %0% <br /> DataType: %1%]]></key>
-    <key alias="contentTypePropertyTypeDeleted">Propertytype silindi</key>
-    <key alias="contentTypeSavedHeader">Döküman Tipi kaydedildi</key>
-    <key alias="contentTypeTabCreated">Tab oluşturuldu</key>
-    <key alias="contentTypeTabDeleted">Tab silindi</key>
-    <key alias="contentTypeTabDeletedText">Tab id: %0% silindi</key>
-    <key alias="cssErrorHeader">Stylesheet kaydedilmedi</key>
-    <key alias="cssSavedHeader">Stylesheet kaydedildi</key>
-    <key alias="cssSavedText">Stylesheet sorunsuz kaydedildi</key>
-    <key alias="dataTypeSaved">Data tipi kaydedildi</key>
-    <key alias="dictionaryItemSaved">Sözlük elemanı kaydedildi</key>
-    <key alias="editContentPublishedFailedByParent">Bağlı olduğu sayfa yayınlanmadığından dolayı işlem başarısız oldu.</key>
+    <key alias="operationCancelledText">İşlem, üçüncü taraf bir eklenti tarafından iptal edildi</key>
+    <key alias="contentPublishedFailedByEvent">Yayınlama, üçüncü taraf bir eklenti tarafından iptal edildi</key>
+    <key alias="contentTypeDublicatePropertyType">Mülk türü zaten var</key>
+    <key alias="contentTypePropertyTypeCreated">Mülk türü oluşturuldu</key>
+    <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Ad: %0% <br /> DataType:%1%]]></key>
+    <key alias="contentTypePropertyTypeDeleted">Mülk türü silindi</key>
+    <key alias="contentTypeSavedHeader">Belge Türü kaydedildi</key>
+    <key alias="contentTypeTabCreated">Sekme oluşturuldu</key>
+    <key alias="contentTypeTabDeleted">Sekme silindi</key>
+    <key alias="contentTypeTabDeletedText">Şu kimliğe sahip sekme: %0% silindi</key>
+    <key alias="cssErrorHeader">Stil sayfası kaydedilmedi</key>
+    <key alias="cssSavedHeader">Stil sayfası kaydedildi</key>
+    <key alias="cssSavedText">Stil sayfası hatasız kaydedildi</key>
+    <key alias="dataTypeSaved">Veri türü kaydedildi</key>
+    <key alias="dictionaryItemSaved">Sözlük öğesi kaydedildi</key>
+    <key alias="editContentPublishedFailedByParent">Üst sayfa yayınlanmadığı için yayınlama başarısız oldu</key>
     <key alias="editContentPublishedHeader">İçerik yayınlandı</key>
-    <key alias="editContentPublishedText">ve web sitesinde görülebilir.</key>
-    <key alias="editContentSavedHeader">İçeirk kaydedildi.</key>
-    <key alias="editContentSavedText">Remember to publish to make changes visible</key>
-    <key alias="editContentSendToPublish">Onaya gönder</key>
-    <key alias="editContentSendToPublishText">Değişiklikler onaya gönderildi</key>
+    <key alias="editContentPublishedText">ve web sitesinde görünür</key>
+    <key alias="editContentSavedHeader">İçerik kaydedildi</key>
+    <key alias="editContentSavedText">Değişiklikleri görünür kılmak için yayınlamayı unutmayın</key>
+    <key alias="editContentSendToPublish">Onay İçin Gönderildi</key>
+    <key alias="editContentSendToPublishText">Değişiklikler onay için gönderildi</key>
     <key alias="editMediaSaved">Medya kaydedildi</key>
-    <key alias="editMediaSavedText">Medya sorunsuz kaydedildi</key>
+    <key alias="editMemberGroupSaved">Üye grubu kaydedildi</key>
+    <key alias="editMediaSavedText">Medya hatasız kaydedildi</key>
     <key alias="editMemberSaved">Üye kaydedildi</key>
-    <key alias="editStylesheetPropertySaved">Stylesheet Property kaydedildi</key>
-    <key alias="editStylesheetSaved">Stylesheet kaydedildi</key>
-    <key alias="editTemplateSaved">Template kaydedildi</key>
-    <key alias="editUserError">Kullanıcı kaydedilirken hata oluştu (log kontrol)</key>
-    <key alias="editUserSaved">Kullanıcı kaydedildi</key>
-    <key alias="editUserTypeSaved">Kullanıcı tipi kaydedildi</key>
-    <key alias="fileErrorHeader">Dosya kaydedilemedi</key>
-    <key alias="fileErrorText">dosya kaydedilemedi. Lütfen dosya izinlerini kontrol edin</key>
+    <key alias="editStylesheetPropertySaved">Stil Sayfası Özelliği Kaydedildi</key>
+    <key alias="editStylesheetSaved">Stil Sayfası kaydedildi</key>
+    <key alias="editTemplateSaved">Şablon kaydedildi</key>
+    <key alias="editUserError">Kullanıcı kaydedilirken hata oluştu (günlüğü kontrol edin)</key>
+    <key alias="editUserSaved">Kullanıcı Kaydedildi</key>
+    <key alias="editUserTypeSaved">Kullanıcı türü kaydedildi</key>
+    <key alias="editUserGroupSaved">Kullanıcı grubu kaydedildi</key>
+    <key alias="editCulturesAndHostnamesSaved">Kaydedilen kültürler ve ana bilgisayar adları</key>
+    <key alias="editCulturesAndHostnamesError">Kültürleri ve ana bilgisayar adlarını kaydetme hatası</key>
+    <key alias="fileErrorHeader">Dosya kaydedilmedi</key>
+    <key alias="fileErrorText">dosyası kaydedilemedi. Lütfen dosya izinlerini kontrol edin</key>
     <key alias="fileSavedHeader">Dosya kaydedildi</key>
-    <key alias="fileSavedText">Dosya sorunsuz kaydedildi</key>
+    <key alias="fileSavedText">Dosya hatasız kaydedildi</key>
     <key alias="languageSaved">Dil kaydedildi</key>
-    <key alias="templateErrorHeader">Template kaydedilmedi</key>
-    <key alias="templateErrorText">Aynı isim ile 2 template bulunmadığından emin olun</key>
-    <key alias="templateSavedHeader">Template kaydedildi</key>
-    <key alias="templateSavedText">Template sorunsuz kaydedildi!</key>
-    <key alias="contentUnpublished">İçerik yayından kaldırıldı</key>
-    <key alias="partialViewSavedHeader">Partial view kaydedildi</key>
-    <key alias="partialViewSavedText">Partial view sorunsuz kaydedildi!</key>
-    <key alias="partialViewErrorHeader">Partial view kaydedilmedi</key>
-    <key alias="partialViewErrorText">Dosya kaydedilirken bir hata oluştu.</key>
+    <key alias="mediaTypeSavedHeader">Medya Türü kaydedildi</key>
+    <key alias="memberTypeSavedHeader">Üye Türü kaydedildi</key>
+    <key alias="memberGroupSavedHeader">Üye Grubu kaydedildi</key>
+    <key alias="templateErrorHeader">Şablon kaydedilmedi</key>
+    <key alias="templateErrorText">Lütfen aynı takma ada sahip 2 şablonunuz olmadığından emin olun</key>
+    <key alias="templateSavedHeader">Şablon kaydedildi</key>
+    <key alias="templateSavedText">Şablon hatasız kaydedildi!</key>
+    <key alias="contentUnpublished">Yayınlanmamış içerik</key>
+    <key alias="partialViewSavedHeader">Kısmi görünüm kaydedildi</key>
+    <key alias="partialViewSavedText">Kısmi görünüm, herhangi bir hata olmadan kaydedildi!</key>
+    <key alias="smallerViewErrorHeader">Kısmi görünüm kaydedilmedi</key>
+    <key alias="partialViewErrorText">Dosyayı kaydederken bir hata oluştu.</key>
+    <key alias="permissionsSavedFor">için kaydedilen izinler</key>
+    <key alias="deleteUserGroupsSuccess">%0% kullanıcı grubu silindi</key>
+    <key alias="deleteUserGroupSuccess">%0% silindi</key>
+    <key alias="enableUsersSuccess">%0% kullanıcı etkinleştirildi</key>
+    <key alias="disableUsersSuccess">%0% kullanıcı devre dışı bırakıldı</key>
+    <key alias="enableUserSuccess">%0% artık etkinleştirildi</key>
+    <key alias="disableUserSuccess">%0% artık devre dışı</key>
+    <key alias="setUserGroupOnUsersSuccess">Kullanıcı grupları ayarlandı</key>
+    <key alias="unlockUsersSuccess">%0% kullanıcının kilidi kaldırıldı</key>
+    <key alias="unlockUserSuccess">%0% artık kilitli</key>
+    <key alias="memberExportedSuccess">Üye dosyaya aktarıldı</key>
+    <key alias="memberExportedError">Üyeyi dışa aktarırken bir hata oluştu</key>
+    <key alias="deleteUserSuccess">Kullanıcı %0% silindi</key>
+    <key alias="resendInviteHeader">Kullanıcıyı davet et</key>
+    <key alias="resendInviteSuccess">Davet %0% 'a yeniden gönderildi</key>
+    <key alias="documentTypeExportedSuccess">Belge türü dosyaya aktarıldı</key>
+    <key alias="documentTypeExportedError">Belge türü dışa aktarılırken bir hata oluştu</key>
   </area>
   <area alias="stylesheet">
-    <key alias="aliasHelp">CSS sözdizimi kullanımları. örneğin: h1, .redHeader, .blueTex</key>
-    <key alias="editstylesheet">Stil dosyası düzenle</key>
-    <key alias="editstylesheetproperty">Stil dosyası özelliği düzenle</key>
-    <key alias="nameHelp">Name to identify the style property in the rich text editor</key>
-    <key alias="preview">Ön izleme</key>
+    <key alias="addRule">Stil ekle</key>
+    <key alias="editRule">Stili düzenle</key>
+    <key alias="editorRules">Zengin metin düzenleyici stilleri</key>
+    <key alias="editorRulesHelp">Bu stil sayfası için zengin metin düzenleyicide bulunması gereken stilleri tanımlayın</key>
+    <key alias="editstylesheet">Stil sayfasını düzenle</key>
+    <key alias="editstylesheetproperty">Stil sayfası özelliğini düzenle</key>
+    <key alias="nameHelp">Düzenleyici stili seçicide görüntülenen ad</key>
+    <key alias="preview">Önizleme</key>
+    <key alias="previewHelp">Zengin metin düzenleyicide metin nasıl görünecek.</key>
+    <key alias="selector">Seçici</key>
+    <key alias="selectorHelp">CSS sözdizimini kullanır, ör. "h1" veya ".redHeader"</key>
     <key alias="styles">Stiller</key>
+    <key alias="stylesHelp">Zengin metin düzenleyicide uygulanması gereken CSS, ör. "color: red;"</key>
+    <key alias="tabCode">Kod</key>
+    <key alias="tabRules">Düzenleyici</key>
   </area>
   <area alias="template">
-    <key alias="edittemplate">Edit template</key>
-    <key alias="insertContentArea">Insert content area</key>
-    <key alias="insertContentAreaPlaceHolder">Insert content area placeholder</key>
-    <key alias="insertDictionaryItem">Insert dictionary item</key>
-    <key alias="insertMacro">Insert Macro</key>
-    <key alias="insertPageField">Insert Umbraco page field</key>
-    <key alias="mastertemplate">Master template</key>
-    <key alias="quickGuide">Quick Guide to Umbraco template tags</key>
-    <key alias="template">Template</key>
+    <key alias="deleteByIdFailed">%0% kimliğine sahip şablon silinemedi</key>
+    <key alias="edittemplate">Şablonu düzenle</key>
+    <key alias="insertSections">Bölümler</key>
+    <key alias="insertContentArea">İçerik alanı ekle</key>
+    <key alias="insertContentAreaPlaceHolder">İçerik alanı yer tutucusu ekle</key>
+    <key alias="insert">Ekle</key>
+    <key alias="insertDesc">Şablonunuza ne ekleyeceğinizi seçin</key>
+    <key alias="insertDictionaryItem">Sözlük öğesi</key>
+    <key alias="insertDictionaryItemDesc">Sözlük öğesi, çevrilebilir bir metin parçası için yer tutucudur ve çok dilli web siteleri için tasarımlar oluşturmayı kolaylaştırır.</key>
+    <key alias="insertMacro">Makro</key>
+    <key alias="insertMacroDesc">
+      Makro, yapılandırılabilir bir bileşendir ve aşağıdakiler için idealdir:
+      parametreler sağlama seçeneğine ihtiyaç duyduğunuz tasarımınızın yeniden kullanılabilir parçaları,
+      galeriler, formlar ve listeler gibi.
+    </key>
+    <key alias="insertPageField">Değer</key>
+    <key alias="insertPageFieldDesc">Geçerli sayfadaki adlandırılmış bir alanın değerini, değeri değiştirme veya alternatif değerlere geri dönüş seçenekleri ile birlikte görüntüler.</key>
+    <key alias="insertPartialView">Kısmi görünüm</key>
+    <key alias="insertPartialViewDesc">
+      Kısmi görünüm, başka bir şablonun içinde oluşturulabilen ayrı bir şablon dosyasıdır.
+      şablonu, işaretlemeyi yeniden kullanmak veya karmaşık şablonları ayrı dosyalara ayırmak için harikadır.
+    </key>
+    <key alias="mastertemplate">Ana şablon</key>
+    <key alias="noMaster">Ana yok</key>
+    <key alias="renderBody">Alt şablonu oluştur</key>
+    <key alias="renderBodyDesc">
+      <![CDATA[
+     Ekleyerek bir alt şablonun içeriğini işler
+     <code>@RenderBody()</code> yer tutucusu.
+      ]]>
+    </key>
+    <key alias="defineSection">Adlandırılmış bir bölüm tanımlayın</key>
+    <key alias="defineSectionDesc">
+      <![CDATA[
+         Şablonunuzun bir bölümünü, içine sararak adlandırılmış bir bölüm olarak tanımlar
+          <code>@section { ... }</code>. Bu bir
+          <code>@RenderSection</code> kullanarak bu şablonun üst öğesinin belirli bir alanı.
+      ]]>
+    </key>
+    <key alias="renderSection">Adlandırılmış bir bölüm oluşturun</key>
+    <key alias="renderSectionDesc">
+      <![CDATA[
+      Bir <code>@RenderSection(ad)</code> yer tutucusu ekleyerek bir alt şablonun adlandırılmış alanını oluşturur.
+      Bu, karşılık gelen bir <code>@section [ad] {...}</code> tanımına sarılmış bir alt şablon alanını oluşturur.
+      ]]>
+    </key>
+    <key alias="sectionName">Bölüm Adı</key>
+    <key alias="sectionMandatory">Bölüm zorunludur</key>
+    <key alias="sectionMandatoryDesc">
+      Zorunlu ise, alt şablon bir <code>@section</code> tanımı içermelidir, aksi takdirde bir hata gösterilir.
+    </key>
+    <key alias="queryBuilder">Sorgu oluşturucu</key>
+    <key alias="itemsReturned">öğe iade edildi,</key>
+    <key alias="copyToClipboard">panoya kopyala</key>
+    <key alias="iWant">istiyorum</key>
+    <key alias="allContent">tüm içerik</key>
+    <key alias="contentOfType">"%0%" türünde içerik</key>
+    <key alias="from">dan</key>
+    <key alias="websiteRoot">web sitem</key>
+    <key alias="where">nerede</key>
+    <key alias="and">ve</key>
+    <key alias="is">=</key>
+    <key alias="isNot">değil</key>
+    <key alias="before">önce</key>
+    <key alias="beforeIncDate">önce (seçilen tarih dahil)</key>
+    <key alias="after">sonra</key>
+    <key alias="afterIncDate">sonra (seçilen tarih dahil)</key>
+    <key alias="equals">şuna eşittir</key>
+    <key alias="doesNotEqual">eşit değildir</key>
+    <key alias="contains">içerir</key>
+    <key alias="doesNotContain">içermez</key>
+    <key alias="greaterThan">büyüktür</key>
+    <key alias="greatThanEqual">büyük veya eşittir</key>
+    <key alias="lessThan">küçüktür</key>
+    <key alias="lessThanEqual">küçüktür veya eşittir</key>
+    <key alias="id">kimlik</key>
+    <key alias="name">Ad</key>
+    <key alias="createdDate">Oluşturulma Tarihi</key>
+    <key alias="lastUpdatedDate">Son Güncelleme Tarihi</key>
+    <key alias="orderBy">sırala</key>
+    <key alias="ascending">artan</key>
+    <key alias="descending">azalan</key>
+    <key alias="template">Şablon</key>
   </area>
   <area alias="grid">
-    <key alias="media">Image</key>
-    <key alias="macro">Macro</key>
-    <key alias="insertControl">Insert control</key>
-    <key alias="addRows">Choose a layout for the page</key>
-    <key alias="addElement"><![CDATA[To start, click the <i class="icon icon-add blue"></i> below and add your first element]]></key>
-    <key alias="clickToEmbed">Click to embed</key>
-    <key alias="clickToInsertImage">Click to insert image</key>
-    <key alias="placeholderImageCaption">Image caption...</key>
-    <key alias="placeholderWriteHere">Write here...</key>
-    <key alias="gridLayouts">Grid layouts</key>
-    <key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
-    <key alias="addGridLayout">Add grid layout</key>
-    <key alias="addGridLayoutDetail">Adjust the layout by setting column widths and adding additional sections</key>
-    <key alias="rowConfigurations">Row configurations</key>
-    <key alias="rowConfigurationsDetail">Rows are predefined cells arranged horizontally</key>
-    <key alias="addRowConfiguration">Add row configuration</key>
-    <key alias="addRowConfigurationDetail">Adjust the row by setting cell widths and adding additional cells</key>
-    <key alias="columns">Columns</key>
-    <key alias="columnsDetails">Total combined number of columns in the grid layout</key>
-    <key alias="settings">Settings</key>
-    <key alias="settingsDetails">Configure what settings editors can change</key>
-    <key alias="styles">Styles</key>
-    <key alias="stylesDetails">Configure what styling editors can change</key>
-    <key alias="allowAllEditors">Allow all editors</key>
-    <key alias="allowAllRowConfigurations">Allow all row configurations</key>
+    <key alias="media">Resim</key>
+    <key alias="macro">Makro</key>
+    <key alias="insertControl">İçerik türünü seçin</key>
+    <key alias="chooseLayout">Bir düzen seçin</key>
+    <key alias="addRows">Satır ekle</key>
+    <key alias="addElement">İçerik ekle</key>
+    <key alias="dropElement">İçeriği bırak</key>
+    <key alias="settingsApplied">Ayarlar uygulandı</key>
+    <key alias="contentNotAllowed">Bu içeriğe burada izin verilmiyor</key>
+    <key alias="contentAllowed">Bu içeriğe burada izin verilir</key>
+    <key alias="clickToEmbed">Yerleştirmek için tıklayın</key>
+    <key alias="clickToInsertImage">Resim eklemek için tıklayın</key>
+    <key alias="placeholderImageCaption">Resim yazısı ...</key>
+    <key alias="placeholderWriteHere">Buraya yazın ...</key>
+    <key alias="gridLayouts">Izgara Düzenleri</key>
+    <key alias="gridLayoutsDetail">Düzenler, ızgara düzenleyicinin genel çalışma alanıdır, genellikle yalnızca bir veya iki farklı düzene ihtiyacınız vardır</key>
+    <key alias="addGridLayout">Izgara Düzeni Ekle</key>
+    <key alias="editGridLayout">Izgara Düzenini Düzenle</key>
+    <key alias="addGridLayoutDetail">Sütun genişliklerini ayarlayarak ve ek bölümler ekleyerek düzeni ayarlayın</key>
+    <key alias="rowConfigurations">Satır yapılandırmaları</key>
+    <key alias="rowConfigurationsDetail">Satırlar, yatay olarak düzenlenmiş önceden tanımlanmış hücrelerdir</key>
+    <key alias="addRowConfiguration">Satır yapılandırması ekle</key>
+    <key alias="editRowConfiguration">Satır yapılandırmasını düzenle</key>
+    <key alias="addRowConfigurationDetail">Hücre genişliklerini ayarlayarak ve ilave hücreler ekleyerek satırı ayarlayın</key>
+    <key alias="columns">Sütunlar</key>
+    <key alias="columnsDetails">Izgara düzenindeki toplam birleşik sütun sayısı</key>
+    <key alias="settings">Ayarlar</key>
+    <key alias="settingsDetails">Hangi ayarları düzenleyicilerin değiştirebileceğini yapılandırın</key>
+    <key alias="styles">Stiller</key>
+    <key alias="stylesDetails">Stil editörlerinin neleri değiştirebileceğini yapılandırma</key>
+    <key alias="allowAllEditors">Tüm düzenleyicilere izin ver</key>
+    <key alias="allowAllRowConfigurations">Tüm satır yapılandırmalarına izin ver</key>
+    <key alias="maxItems">Maksimum öğe</key>
+    <key alias="maxItemsDescription">Boş bırakın veya sınırsız için 0 olarak ayarlayın</key>
+    <key alias="setAsDefault">Varsayılan olarak ayarla</key>
+    <key alias="chooseExtra">Fazladan birini seçin</key>
+    <key alias="chooseDefault">Varsayılanı seçin</key>
+    <key alias="areAdded">eklendi</key>
+    <key alias="warning">Uyarı</key>
+    <key alias="youAreDeleting">Satır yapılandırmasını siliyorsunuz</key>
+    <key alias="deletingARow">
+      Bir satır yapılandırma adının silinmesi, bu yapılandırmaya dayalı mevcut herhangi bir içerik için veri kaybına neden olur.
+    </key>
+  </area>
+  <area alias="contentTypeEditor">
+    <key alias="compositions">Kompozisyonlar</key>
+    <key alias="grup">Grup</key>
+    <key alias="noGroups">Hiçbir grup eklemediniz</key>
+    <key alias="addGroup">Grup ekle</key>
+    <key alias="inheritedFrom">devralındı ​​</key>
+    <key alias="addProperty">Mülk ekle</key>
+    <key alias="requiredLabel">Gerekli etiket</key>
+    <key alias="enableListViewHeading">Liste görünümünü etkinleştir</key>
+    <key alias="enableListViewDescription">İçerik öğesini, alt öğelerinin sıralanabilir ve aranabilir bir listesini gösterecek şekilde yapılandırır, alt öğeler ağaçta gösterilmez</key>
+    <key alias="allowTemplatesHeading">İzin Verilen Şablonlar</key>
+    <key alias="allowTemplatesDescription">Bu tür içerik üzerinde hangi şablon düzenleyicilerinin kullanmasına izin verileceğini seçin</key>
+    <key alias="allowAsRootHeading">Kök olarak izin ver</key>
+    <key alias="allowAsRootDescription">Düzenleyicilerin, içerik ağacının kök dizininde bu türden içerik oluşturmasına izin verin.</key>
+    <key alias="childNodesHeading">İzin verilen alt düğüm türleri</key>
+    <key alias="childNodesDescription">Belirtilen türlerdeki içeriğin, bu tür içeriğin altında oluşturulmasına izin verin.</key>
+    <key alias="chooseChildNode">Alt düğümü seçin</key>
+    <key alias="CompositionDescription">Mevcut bir belge türünden sekmeleri ve özellikleri devralın. Mevcut belge türüne yeni sekmeler eklenecek veya aynı ada sahip bir sekme varsa birleştirilecektir.</key>
+    <key alias="CompositionInUse">Bu içerik türü bir bestede kullanıldığından kendi başına oluşturulamaz.</key>
+    <key alias="noAvailableCompositions">Beste olarak kullanılabilecek içerik türü yok.</key>
+    <key alias="CompositionRemoveWarning">Bir kompozisyonun kaldırılması, ilişkili tüm özellik verilerini silecektir. Belge türünü kaydettikten sonra geri dönüş yoktur.</key>
+    <key alias="availableEditors">Yeni oluştur</key>
+    <key alias="reuse">Mevcut olanı kullan</key>
+    <key alias="editorSettings">Düzenleyici ayarları</key>
+    <key alias="configuration">Yapılandırma</key>
+    <key alias="yesDelete">Evet, sil</key>
+    <key alias="moveUnderneath">altına taşındı</key>
+    <key alias="copiedUnderneath">altına kopyalandı</key>
+    <key alias="folderToMove">Taşınacak klasörü seçin</key>
+    <key alias="folderToCopy">Kopyalanacak klasörü seçin</key>
+    <key alias="structureBelow">aşağıdaki ağaç yapısına</key>
+    <key alias="allDocumentTypes">Tüm Belge türleri</key>
+    <key alias="allDocuments">Tüm Belgeler</key>
+    <key alias="allMediaItems">Tüm medya öğeleri</key>
+    <key alias="usingThisDocument">bu belge türünün kullanılması kalıcı olarak silinecektir, lütfen bunları da silmek istediğinizi onaylayın.</key>
+    <key alias="usingThisMedia">bu medya türünün kullanılması kalıcı olarak silinecek, lütfen bunları da silmek istediğinizi onaylayın.</key>
+    <key alias="usingThisMember">bu üye türünün kullanılması kalıcı olarak silinecek, lütfen bunları da silmek istediğinizi onaylayın</key>
+    <key alias="andAllDocuments">ve bu türü kullanan tüm belgeler</key>
+    <key alias="andAllMediaItems">ve bu türü kullanan tüm medya öğeleri</key>
+    <key alias="andAllMembers">ve bu türü kullanan tüm üyeler</key>
+    <key alias="memberCanEdit">Üye düzenleyebilir</key>
+    <key alias="memberCanEditDescription">Bu özellik değerinin üye tarafından profil sayfasında düzenlenmesine izin ver</key>
+    <key alias="isSensitiveData">Hassas verilerdir</key>
+    <key alias="isSensitiveDataDescription">Bu özellik değerini, hassas bilgileri görüntüleme erişimi olmayan içerik düzenleyicilerinden gizleyin</key>
+    <key alias="showOnMemberProfile">Üye profilinde göster</key>
+    <key alias="showOnMemberProfileDescription">Bu özellik değerinin üye profil sayfasında görüntülenmesine izin ver</key>
+    <key alias="tabHasNoSortOrder">sekmesinde sıralama düzeni yok</key>
+    <key alias="CompositionUsageHeading">Bu beste nerede kullanılıyor?</key>
+    <key alias="CompositionUsageSpecification">Bu beste şu anda aşağıdaki içerik türlerinin oluşturulmasında kullanılmaktadır:</key>
+    <key alias="değişkenHeading">Varyasyonlara izin ver</key>
+    <key alias="cultureVariantHeading">Kültüre göre değişikliklere izin ver</key>
+    <key alias="segmentVariantHeading">Segmentasyona izin ver</key>
+    <key alias="cultureVariantLabel">Kültüre göre değişiklik yapın</key>
+    <key alias="segmentVariantLabel">Segmentlere göre değişiklik yapın</key>
+    <key alias="değişkenDescription">Düzenleyenlerin bu türden içeriği farklı dillerde oluşturmasına izin verin.</key>
+    <key alias="cultureVariantDescription">Düzenleyenlerin farklı dillerde içerik oluşturmasına izin ver.</key>
+    <key alias="segmentVariantDescription">Editörlerin bu içeriğin segmentlerini oluşturmasına izin ver.</key>
+    <key alias="allowVaryByCulture">Kültüre göre değişiklik yapmaya izin ver</key>
+    <key alias="allowVaryBySegment">Segmentasyona izin ver</key>
+    <key alias="elementType">Öğe türü</key>
+    <key alias="elementHeading">Bir Öğe türüdür</key>
+    <key alias="elementDescription">Bir Öğe türü, ağaçta değil, örneğin Yuvalanmış İçerikte kullanılmak üzere tasarlanmıştır.</key>
+    <key alias="elementCannotToggle">Bir belge türü, bir veya daha fazla içerik öğesi oluşturmak için kullanıldıktan sonra Öğe türü olarak değiştirilemez.</key>
+    <key alias="elementDoesNotSupport">Bu, bir Öğe türü için geçerli değildir</key>
+    <key alias="propertyHasChanges">Bu özellikte değişiklikler yaptınız. Onları atmak istediğinizden emin misiniz?</key>
+  </area>
+  <area alias="languages">
+    <key alias="addLanguage">Dil ekle</key>
+    <key alias="mandatoryLanguage">Zorunlu dil</key>
+    <key alias="mandatoryLanguageHelp">Düğüm yayınlanmadan önce bu dildeki özelliklerin doldurulması gerekir.</key>
+    <key alias="defaultLanguage">Varsayılan dil</key>
+    <key alias="defaultLanguageHelp">Bir Umbraco sitesinde yalnızca bir varsayılan dil ayarı olabilir.</key>
+    <key alias="changingDefaultLanguageWarning">Varsayılan dili değiştirmek, varsayılan içeriğin kaybolmasına neden olabilir.</key>
+    <key alias="fallsbackToLabel">Geri döner</key>
+    <key alias="noFallbackLanguageOption">Geri dönüş dili yok</key>
+    <key alias="fallbackLanguageDescription">Çok dilli içeriğin, istenen dilde yoksa başka bir dile geri dönmesine izin vermek için, buradan seçin.</key>
+    <key alias="fallbackLanguage">Geri dönüş dili</key>
+    <key alias="none">yok</key>
+  </area>
+
+  <area alias="macro">
+    <key alias="addParameter">Parametre ekle</key>
+    <key alias="editParameter">Parametreyi düzenle</key>
+    <key alias="enterMacroName">Makro adını girin</key>
+    <key alias="parameters">Parametreler</key>
+    <key alias="parametersDescription">Bu makroyu kullanırken mevcut olması gereken parametreleri tanımlayın.</key>
+    <key alias="selectViewFile">Kısmi görünüm makro dosyasını seçin</key>
+  </area>
+  <area alias="modelsBuilder">
+    <key alias="buildingModels">Model oluşturma</key>
+    <key alias="waitingMessage">bu biraz zaman alabilir, endişelenmeyin</key>
+    <key alias="modelsGenerated">Oluşturulan modeller</key>
+    <key alias="modelsGeneratedError">Modeller oluşturulamadı</key>
+    <key alias="modelsExceptionInUlog">Model oluşturma başarısız oldu, U günlüğünde istisnaya bakın</key>
   </area>
   <area alias="templateEditor">
-    <key alias="alternativeField">Alternative field</key>
-    <key alias="alternativeText">Alternative Text</key>
-    <key alias="casing">Casing</key>
-    <key alias="encoding">Encoding</key>
-    <key alias="chooseField">Choose field</key>
-    <key alias="convertLineBreaks">Convert line breaks</key>
-    <key alias="convertLineBreaksHelp">Replaces line breaks with html-tag &amp;lt;br&amp;gt;</key>
-    <key alias="customFields">Custom Fields</key>
-    <key alias="dateOnly">Yes, Date only</key>
-    <key alias="formatAsDate">Format as date</key>
-    <key alias="htmlEncode">HTML encode</key>
-    <key alias="htmlEncodeHelp">Will replace special characters by their HTML equivalent.</key>
-    <key alias="insertedAfter">Will be inserted after the field value</key>
-    <key alias="insertedBefore">Will be inserted before the field value</key>
-    <key alias="lowercase">Lowercase</key>
-    <key alias="none">None</key>
-    <key alias="postContent">Insert after field</key>
-    <key alias="preContent">Insert before field</key>
-    <key alias="recursive">Recursive</key>
-    <key alias="removeParagraph">Remove Paragraph tags</key>
-    <key alias="removeParagraphHelp">Will remove any &amp;lt;P&amp;gt; in the beginning and end of the text</key>
-    <key alias="standardFields">Standard Fields</key>
-    <key alias="uppercase">Uppercase</key>
-    <key alias="urlEncode">URL encode</key>
-    <key alias="urlEncodeHelp">Will format special characters in URLs</key>
-    <key alias="usedIfAllEmpty">Will only be used when the field values above are empty</key>
-    <key alias="usedIfEmpty">This field will only be used if the primary field is empty</key>
-    <key alias="withTime">Yes, with time. Separator: </key>
+    <key alias="addFallbackField">Yedek alanı ekle</key>
+    <key alias="fallbackField">Yedek alanı</key>
+    <key alias="addDefaultValue">Varsayılan değer ekle</key>
+    <key alias="defaultValue">Varsayılan değer</key>
+    <key alias="alternativeField">Yedek alanı</key>
+    <key alias="alternativeText">Varsayılan değer</key>
+    <key alias="casing">Kasa</key>
+    <key alias="encoding">Kodlama</key>
+    <key alias="chooseField">Alan seçin</key>
+    <key alias="convertLineBreaks">Satır sonlarını dönüştür</key>
+    <key alias="convertLineBreaksDescription">Evet, satır sonlarını dönüştür</key>
+    <key alias="convertLineBreaksHelp">Satır sonlarını 'br' html etiketiyle değiştirir</key>
+    <key alias="customFields">Özel Alanlar</key>
+    <key alias="dateOnly">Yalnızca tarih</key>
+    <key alias="formatAndEncoding">Biçim ve kodlama</key>
+    <key alias="formatAsDate">Tarih olarak biçimlendir</key>
+    <key alias="formatAsDateDescr">Değeri, aktif kültüre göre tarih veya saatli tarih olarak biçimlendirin</key>
+    <key alias="htmlEncode">HTML kodlama</key>
+    <key alias="htmlEncodeHelp">Özel karakterleri HTML eşdeğerleriyle değiştirir.</key>
+    <key alias="insertedAfter">Alan değerinden sonra eklenecek</key>
+    <key alias="insertedBefore">Alan değerinden önce eklenecek</key>
+    <key alias="lowercase">Küçük harf</key>
+    <key alias="modifyOutput">Çıktıyı değiştir</key>
+    <key alias="none">Yok</key>
+    <key alias="outputSample">Çıktı örneği</key>
+    <key alias="postContent">Alanın sonrasına ekle</key>
+    <key alias="preContent">Alanın önüne ekle</key>
+    <key alias="recursive">Özyinelemeli</key>
+    <key alias="recursiveDescr">Evet, yinelemeli yap</key>
+    <key alias="separator">Ayırıcı</key>
+    <key alias="standardFields">Standart Alanlar</key>
+    <key alias="uppercase">Büyük harf</key>
+    <key alias="urlEncode">URL kodlama</key>
+    <key alias="urlEncodeHelp">URL'lerdeki özel karakterleri biçimlendirecek</key>
+    <key alias="usedIfAllEmpty">Yalnızca yukarıdaki alan değerleri boş olduğunda kullanılacaktır</key>
+    <key alias="usedIfEmpty">Bu alan yalnızca birincil alan boşsa kullanılacaktır</key>
+    <key alias="withTime">Tarih ve saat</key>
   </area>
   <area alias="translation">
-    <key alias="details">Translation details</key>
-    <key alias="DownloadXmlDTD">Download XML DTD</key>
-    <key alias="fields">Fields</key>
-    <key alias="includeSubpages">Include subpages</key>
-    <key alias="mailBody"><![CDATA[
-      Hi %0%
-
-      This is an automated mail to inform you that the document '%1%'
-      has been requested for translation into '%5%' by %2%.
-
-      Go to http://%3%/translation/details.aspx?id=%4% to edit.
-
-      Or log into Umbraco to get an overview of your translation tasks
+    <key alias="details">Çeviri ayrıntıları</key>
+    <key alias="DownloadXmlDTD">XML DTD'yi İndir</key>
+    <key alias="fields">Alanlar</key>
+    <key alias="includeSubpages">Alt sayfaları dahil et</key>
+    <key alias="mailBody">
+      <![CDATA[
+      Merhaba %0%
+ 
+      Bu, '%1%' belgesinin size bildirilmesi için otomatik bir postadır.
+      %2% tarafından '%5%' e çevrilmesi istendi.
+ 
+      Düzenlemek için http://%3%/translation/details.aspx?id=%4% adresine gidin.
+ 
+      Veya çeviri görevlerinize genel bir bakış için Umbraco'da oturum açın
       http://%3%
-
-      Have a nice day!
-
-      Cheers from the Umbraco robot
-    ]]></key>
-    <key alias="noTranslators">No translator users found. Please create a translator user before you start sending content to translation</key>
-    <key alias="pageHasBeenSendToTranslation">The page '%0%' has been send to translation</key>
-    <key alias="sendToTranslate">Send the page '%0%' to translation</key>
+ 
+      İyi günler!       
+      
+      Umbraco robotdan teşekkürler    
+      ]]>
+    </key>
+    <key alias="noTranslators">Çevirmen kullanıcısı bulunamadı. Lütfen çeviriye içerik göndermeye başlamadan önce bir çevirmen kullanıcısı oluşturun</key>
+    <key alias="pageHasBeenSendToTranslation">'%0%' sayfası çeviriye gönderildi</key>
+    <key alias="sendToTranslate">'%0%' sayfasını çeviriye gönder</key>
     <key alias="totalWords">Toplam kelime</key>
-    <key alias="translateTo">Translate to</key>
+    <key alias="translateTo">Şu dile çevir</key>
     <key alias="translationDone">Çeviri tamamlandı.</key>
-    <key alias="translationDoneHelp">You can preview the pages, you've just translated, by clicking below. If the original page is found, you will get a comparison of the 2 pages.</key>
-    <key alias="translationFailed">Translation failed, the XML file might be corrupt</key>
-    <key alias="translationOptions">Çeviri opsiyonları</key>
+    <key alias="translationDoneHelp">Aşağıya tıklayarak yeni çevirdiğiniz sayfaların önizlemesini yapabilirsiniz. Orijinal sayfa bulunursa, 2 sayfanın bir karşılaştırmasını alacaksınız.</key>
+    <key alias="translationFailed">Çeviri başarısız oldu, XML dosyası bozulmuş olabilir</key>
+    <key alias="translationOptions">Çeviri seçenekleri</key>
     <key alias="translator">Çevirmen</key>
-    <key alias="uploadTranslationXml">Upload translation XML</key>
+    <key alias="uploadTranslationXml">Çeviri XML'sini yükle</key>
   </area>
   <area alias="treeHeaders">
-    <key alias="cacheBrowser">Cache Browser</key>
-    <key alias="contentRecycleBin">Çöp Kutusu</key>
-    <key alias="createdPackages">Oluşturulan Paketler</key>
-    <key alias="datatype">Data Tipleri</key>
+    <key alias="content">İçerik</key>
+    <key alias="contentBlueprints">İçerik Şablonları</key>
+    <key alias="media">Medya</key>
+    <key alias="cacheBrowser">Önbellek Tarayıcısı</key>
+    <key alias="contentRecycleBin">Geri Dönüşüm Kutusu</key>
+    <key alias="createdPackages">Oluşturulan paketler</key>
+    <key alias="dataTypes">Veri Türleri</key>
     <key alias="dictionary">Sözlük</key>
-    <key alias="installedPackages">Kurulu paketler</key>
-    <key alias="installSkin">Görünüm kur</key>
-    <key alias="installStarterKit">Başlangıç kiti kur</key>
+    <key alias="installedPackages">Yüklü paketler</key>
+    <key alias="installSkin">Dış görünümü yükleyin</key>
+    <key alias="installStarterKit">Başlangıç ​​kitini yükleyin</key>
     <key alias="languages">Diller</key>
-    <key alias="localPackage">Yerel paket yükle</key>
+    <key alias="localPackage">Yerel paketi yükle</key>
     <key alias="macros">Makrolar</key>
-    <key alias="mediaTypes">Medya Tipleri</key>
+    <key alias="mediaTypes">Medya Türleri</key>
     <key alias="member">Üyeler</key>
-    <key alias="memberGroup">Üye Grupları</key>
-    <key alias="memberRoles">Roller</key>
-    <key alias="memberType">Üye Tipleri</key>
-    <key alias="nodeTypes">Döküman Tipleri</key>
+    <key alias="memberGroups">Üye Grupları</key>
+    <key alias="memberRoles">Üye Rolleri</key>
+    <key alias="memberTypes">Üye Türleri</key>
+    <key alias="documentTypes">Belge Türleri</key>
+    <key alias="relationTypes">İlişki Türleri</key>
     <key alias="packager">Paketler</key>
     <key alias="packages">Paketler</key>
-    <key alias="repositories">Depodan kurulum yap</key>
-    <key alias="runway">Install Runway</key>
+    <key alias="partialViews">Kısmi Görünümler</key>
+    <key alias="partialViewMacros">Makro Dosyalarını Kısmi Görüntüle</key>
+    <key alias="repositories">Depodan yükle</key>
+    <key alias="runway">Runway'i Kur</key>
     <key alias="runwayModules">Runway modülleri</key>
-    <key alias="scripting">Scripting Dosyaları</key>
-    <key alias="scripts">Scriptler</key>
-    <key alias="stylesheets">Stil dosyaları</key>
+    <key alias="scripting">Komut Dosyası Dosyaları</key>
+    <key alias="scripts">Komut Dosyaları</key>
+    <key alias="stylesheets">Stil Sayfaları</key>
     <key alias="templates">Şablonlar</key>
+    <key alias="logViewer">Günlük Görüntüleyici</key>
+    <key alias="users">Kullanıcılar</key>
+    <key alias="settingsGroup">Ayarlar</key>
+    <key alias="templatingGroup">Şablon Oluşturma</key>
+    <key alias="thirdPartyGroup">Üçüncü Taraf</key>
   </area>
   <area alias="update">
-    <key alias="updateAvailable">Yeni bir güncelleme geldi</key>
-    <key alias="updateDownloadText">%0% hazır, indirimek için tıklayın</key>
-    <key alias="updateNoServer">Sunucu bağlantısı yok</key>
-    <key alias="updateNoServerError">Güncelleme için kontrol hatası. Daha fazla bilgi için iz yığını gözden geçirin.</key>
+    <key alias="updateAvailable">Yeni güncelleme hazır</key>
+    <key alias="updateDownloadText">%0% hazır, indirmek için burayı tıklayın</key>
+    <key alias="updateNoServer">Sunucuyla bağlantı yok</key>
+    <key alias="updateNoServerError">Güncelleme için hata denetimi. Daha fazla bilgi için lütfen izleme yığınını inceleyin</key>
   </area>
   <area alias="user">
-    <key alias="administrators">Yöneticiler</key>
+    <key alias="access">Erişim</key>
+    <key alias="accessHelp">Atanan gruplara ve başlangıç ​​düğümlerine bağlı olarak, kullanıcının aşağıdaki düğümlere erişimi vardır</key>
+    <key alias="assignAccess">Erişim ata</key>
+    <key alias="administrators">Yönetici</key>
     <key alias="categoryField">Kategori alanı</key>
-    <key alias="changePassword">Şifreni değiştir</key>
+    <key alias="createDate">Kullanıcı oluşturuldu</key>
+    <key alias="changePassword">Şifrenizi değiştirin</key>
+    <key alias="changePhoto">Fotoğrafı değiştir</key>
     <key alias="newPassword">Yeni şifre</key>
-    <key alias="confirmNewPassword">Yeni şifreyi onayla</key>
-    <key alias="changePasswordDescription">Aşağıdaki formu doldurarak CMS Geri Office'i erişmek için parolanızı değiştirmeniz ve ' Şifre Değiştir ' düğmesine tıklayabilirsiniz</key>
+    <key alias="noLockouts">kilitlenmedi</key>
+    <key alias="noPasswordChange">Şifre değiştirilmedi</key>
+    <key alias="confirmNewPassword">Yeni şifreyi onaylayın</key>
+    <key alias="changePasswordDescription">Aşağıdaki formu doldurarak ve 'Şifreyi Değiştir' düğmesini tıklayarak Umbraco Arka Ofisine erişim şifrenizi değiştirebilirsiniz</key>
     <key alias="contentChannel">İçerik Kanalı</key>
+    <key alias="createAnotherUser">Başka bir kullanıcı oluşturun</key>
+    <key alias="createUserHelp">Umbraco'ya erişim sağlamak için yeni kullanıcılar oluşturun. Yeni bir kullanıcı oluşturulduğunda, kullanıcıyla paylaşabileceğiniz bir şifre oluşturulacaktır.</key>
     <key alias="descriptionField">Açıklama alanı</key>
-    <key alias="disabled">Kullanıcıyı devre dışı bırak</key>
-    <key alias="documentType">Döküman Tipi</key>
-    <key alias="editors">editör</key>
-    <key alias="excerptField">Alıntı alan</key>
+    <key alias="disabled">Kullanıcıyı Devre Dışı Bırak</key>
+    <key alias="documentType">Belge Türü</key>
+    <key alias="editors">Düzenleyici</key>
+    <key alias="excerptField">Alıntı alanı</key>
+    <key alias="failedPasswordAttempts">Başarısız giriş denemeleri</key>
+    <key alias="goToProfile">Kullanıcı profiline gidin</key>
+    <key alias="groupsHelp">Erişim ve izinler atamak için gruplar ekleyin</key>
+    <key alias="inviteAnotherUser">Başka bir kullanıcıyı davet edin</key>
+    <key alias="inviteUserHelp">Yeni kullanıcıları Umbraco'ya erişim vermeleri için davet edin. Kullanıcıya, Umbraco'da nasıl oturum açılacağına dair bilgiler içeren bir davet e-postası gönderilecektir. Davetler 72 saat sürer.</key>
     <key alias="language">Dil</key>
-    <key alias="loginname">Kullanıcı adı</key>
-    <key alias="mediastartnode">Medya kütüphane düğüm başlatın</key>
+    <key alias="languageHelp">Menülerde ve iletişim kutularında göreceğiniz dili ayarlayın</key>
+    <key alias="lastLockoutDate">Son kilitlenme tarihi</key>
+    <key alias="lastLogin">Son giriş</key>
+    <key alias="lastPasswordChangeDate">Parola son değiştirildi</key>
+    <key alias="loginname">Kullanıcı Adı</key>
+    <key alias="mediastartnode">Medya başlangıç ​​düğümü</key>
+    <key alias="mediastartnodehelp">Medya kitaplığını belirli bir başlangıç ​​düğümüyle sınırlayın</key>
+    <key alias="mediastartnodes">Medya başlangıç ​​düğümleri</key>
+    <key alias="mediastartnodeshelp">Medya kitaplığını belirli başlangıç ​​düğümleriyle sınırlayın</key>
     <key alias="modules">Bölümler</key>
-    <key alias="noConsole">CMS Erişim devre dışı bırakma</key>
-    <key alias="password">Parola</key>
-    <key alias="resetPassword">Şifrenizi sıfırlayın</key>
+    <key alias="noConsole">Umbraco Erişimini Devre Dışı Bırak</key>
+    <key alias="noLogin">henüz giriş yapmadı</key>
+    <key alias="oldPassword">Eski şifre</key>
+    <key alias="password">Şifre</key>
+    <key alias="resetPassword">Şifreyi sıfırla</key>
     <key alias="passwordChanged">Şifreniz değiştirildi!</key>
-    <key alias="passwordConfirm">Yeni parolayı onaylayın</key>
+    <key alias="passwordChangedGeneric">Şifre değiştirildi</key>
+    <key alias="passwordConfirm">Lütfen yeni şifreyi onaylayın</key>
     <key alias="passwordEnterNew">Yeni şifrenizi girin</key>
-    <key alias="passwordIsBlank">Yeni şifre boş olamaz!</key>
-    <key alias="passwordCurrent">Mevcut Şifre</key>
-    <key alias="passwordInvalid">Geçersiz şifre</key>
-    <key alias="passwordIsDifferent">Yeni şifre ile teyit şifre arasında bir fark yoktu. Lütfen tekrar deneyin!</key>
-    <key alias="passwordMismatch">Teyit şifre yeni bir şifre eşleşmiyor !</key>
-    <key alias="permissionReplaceChildren">Alt düğümü izinlerini değiştirin</key>
-    <key alias="permissionSelectedPages">Şu anda sayfaları için izinleri değiştiriyorsunuz:</key>
-    <key alias="permissionSelectPages">Onların izinlerini değiştirmek için sayfaları seçin</key>
-    <key alias="searchAllChildren">Tüm alt düğümlerde ara</key>
-    <key alias="startnode">içerikte düğüm başlat</key>
-    <key alias="username">Kullanıcı adı</key>
+    <key alias="passwordIsBlank">Yeni şifreniz boş olamaz!</key>
+    <key alias="passwordCurrent">Mevcut şifre</key>
+    <key alias="passwordInvalid">Geçersiz mevcut şifre</key>
+    <key alias="passwordIsDifferent">Yeni parola ile onaylanan parola arasında bir fark vardı. Lütfen tekrar deneyin!</key>
+    <key alias="passwordMismatch">Onaylanan şifre yeni şifreyle eşleşmiyor!</key>
+    <key alias="permissionReplaceChildren">Alt düğüm izinlerini değiştirin</key>
+    <key alias="permissionSelectedPages">Şu anda sayfaların izinlerini değiştiriyorsunuz:</key>
+    <key alias="permissionSelectPages">İzinlerini değiştirmek için sayfaları seçin</key>
+    <key alias="removePhoto">Fotoğrafı kaldır</key>
+    <key alias="permissionsDefault">Varsayılan izinler</key>
+    <key alias="permissionsGranular">Ayrıntılı izinler</key>
+    <key alias="permissionsGranularHelp">Belirli düğümler için izinleri ayarlayın</key>
+    <key alias="profile">Profil</key>
+    <key alias="searchAllChildren">Tüm çocukları ara</key>
+    <key alias="sectionsHelp">Kullanıcılara erişim vermek için bölümler ekleyin</key>
+    <key alias="selectUserGroups">Kullanıcı gruplarını seçin</key>
+    <key alias="noStartNode">Seçili başlangıç ​​düğümü yok</key>
+    <key alias="noStartNodes">Seçili başlangıç ​​düğümü yok</key>
+    <key alias="startnode">İçerik başlangıç ​​düğümü</key>
+    <key alias="startnodehelp">İçerik ağacını belirli bir başlangıç ​​düğümüyle sınırlayın</key>
+    <key alias="startnodes">İçerik başlangıç ​​düğümleri</key>
+    <key alias="startnodeshelp">İçerik ağacını belirli başlangıç ​​düğümleriyle sınırlayın</key>
+    <key alias="updateDate">Kullanıcının son güncellenme tarihi</key>
+    <key alias="userCreated">oluşturuldu</key>
+    <key alias="userCreatedSuccessHelp">Yeni kullanıcı başarıyla oluşturuldu. Umbraco'da oturum açmak için aşağıdaki şifreyi kullanın.</key>
+    <key alias="userManagement">Kullanıcı yönetimi</key>
+    <key alias="username">Ad</key>
     <key alias="userPermissions">Kullanıcı izinleri</key>
-    <key alias="usertype">Kullanıcı türü</key>
-    <key alias="userTypes">Kullanıcı tipleri</key>
+    <key alias="usergroup">Kullanıcı grubu</key>
+    <key alias="userInvited">davet edildi</key>
+    <key alias="userInvitedSuccessHelp">Yeni kullanıcıya, Umbraco'da nasıl oturum açılacağına ilişkin ayrıntıları içeren bir davetiye gönderildi.</key>
+    <key alias="userinviteWelcomeMessage">Merhabalar, Umbraco'ya hoş geldiniz! Sadece 1 dakika içinde hazır olacaksınız, sadece bir şifre belirlemeniz ve avatarınız için bir resim eklemeniz gerekiyor.</key>
+    <key alias="userinviteExpiredMessage">Umbraco'ya hoş geldiniz! Maalesef davetinizin süresi doldu. Lütfen yöneticinizle iletişime geçin ve yeniden göndermesini isteyin.</key>
+    <key alias="userinviteAvatarMessage">Kendi fotoğrafınızı yüklemek, diğer kullanıcıların sizi tanımasını kolaylaştıracaktır. Fotoğrafınızı yüklemek için yukarıdaki daireyi tıklayın.</key>
     <key alias="writer">Yazar</key>
     <key alias="change">Değiştir</key>
     <key alias="yourProfile" version="7.0">Profiliniz</key>
-    <key alias="yourHistory" version="7.0">Son tarih</key>
+    <key alias="yourHistory" version="7.0">Yakın geçmişiniz</key>
     <key alias="sessionExpires" version="7.0">Oturum sona eriyor</key>
+    <key alias="inviteUser">Kullanıcıyı davet et</key>
+    <key alias="createUser">Kullanıcı oluştur</key>
+    <key alias="sendInvite">Davet gönder</key>
+    <key alias="backToUsers">Kullanıcılara dön</key>
+    <key alias="inviteEmailCopySubject">Umbraco: Davet</key>
+    <key alias="inviteEmailCopyFormat">
+      <![CDATA[
+    <html>
+    <head>
+        <meta name='viewport' content='width=device-width'>
+        <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+    </head>
+    <body class='' style='font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; color: #392F54; line-height: 22px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background: #1d1333; margin: 0; padding: 0;' bgcolor='#1d1333'>
+        <style type='text/css'> @media only screen and (max-width: 620px) {table[class=body] h1 {font-size: 28px !important; margin-bottom: 10px !important; } table[class=body] .wrapper {padding: 32px !important; } table[class=body] .article {padding: 32px !important; } table[class=body] .content {padding: 24px !important; } table[class=body] .container {padding: 0 !important; width: 100% !important; } table[class=body] .main {border-left-width: 0 !important; border-radius: 0 !important; border-right-width: 0 !important; } table[class=body] .btn table {width: 100% !important; } table[class=body] .btn a {width: 100% !important; } table[class=body] .img-responsive {height: auto !important; max-width: 100% !important; width: auto !important; } } .btn-primary table td:hover {background-color: #34495e !important; } .btn-primary a:hover {background-color: #34495e !important; border-color: #34495e !important; } .btn  a:visited {color:#FFFFFF;} </style>
+        <table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;" bgcolor="#1d1333">
+            <tr>
+                <td style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding: 24px;" valign="top">
+                    <table style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                        <tr>
+                            <td background="https://umbraco.com/umbraco/assets/img/application/logo.png" bgcolor="#1d1333" width="28" height="28" valign="top" style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+                                <!--[if gte mso 9]> <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:30px;height:30px;"> <v:fill type="tile" src="https://umbraco.com/umbraco/assets/img/application/logo.png" color="#1d1333" /> <v:textbox inset="0,0,0,0"> <![endif]-->
+                                <div> </div>
+                                <!--[if gte mso 9]> </v:textbox> </v:rect> <![endif]-->
+                            </td>
+                            <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top"></td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
+        <table border='0' cellpadding='0' cellspacing='0' class='body' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #1d1333;' bgcolor='#1d1333'>
+            <tr>
+                <td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+                <td class='container' style='font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 560px; width: 560px; margin: 0 auto; padding: 10px;' valign='top'>
+                    <div class='content' style='box-sizing: border-box; display: block; max-width: 560px; margin: 0 auto; padding: 10px;'>
+                        <br>
+                        <table class='main' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px; background: #FFFFFF;' bgcolor='#FFFFFF'>
+                            <tr>
+                                <td class='wrapper' style='font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 50px;' valign='top'>
+                                    <table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;'>
+                                        <tr>
+                                            <td style='line-height: 24px; font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'>
+                                                <h1 style='color: #392F54; font-family: sans-serif; font-weight: bold; line-height: 1.4; font-size: 24px; text-align: left; text-transform: capitalize; margin: 0 0 30px;' align='left'>
+                                                    Merhaba %0%,
+                                                </h1>
+                                                <p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+                                                    <a href="mailto:%4%" style="text-decoration: underline; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a> tarafından Umbraco Arka Ofisine davet edildiniz.
+                                                </p>
+                                                <p style='color: #392F54; font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 15px;'>
+                                                    <a href="mailto:%1%" style="text-decoration: none; color: #392F54; -ms-word-break: break-all; word-break: break-all;">%1%</a> tarafından gönderilen mesaj:
+                                                    <br/>
+                                                    <em>%2%</em>
+                                                </p>
+                                                <table border='0' cellpadding='0' cellspacing='0' class='btn btn-primary' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;'>
+                                                    <tbody>
+                                                        <tr>
+                                                            <td align='left' style='font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;' valign='top'>
+                                                                <table border='0' cellpadding='0' cellspacing='0' style='border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;'>
+                                                                    <tbody>
+                                                                        <tr>
+                                                                            <td style='font-family: sans-serif; font-size: 14px; vertical-align: top; border-radius: 5px; text-align: center; background: #35C786;' align='center' bgcolor='#35C786' valign='top'>
+                                                                                <a href='%3%' target='_blank' style='color: #FFFFFF; text-decoration: none; -ms-word-break: break-all; word-break: break-all; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; text-transform: capitalize; background: #35C786; margin: 0; padding: 12px 30px; border: 1px solid #35c786;'>
+                                                                                    Daveti Kabul Etmek İçin Bu Bağlantıyı Tıklayın
+                                                                                </a>
+                                                                            </td>
+                                                                        </tr>
+                                                                    </tbody>
+                                                                </table>
+                                                            </td>
+                                                        </tr>
+                                                    </tbody>
+                                                </table>
+                                                <p style='max-width: 400px; display: block; color: #392F54; font-family: sans-serif; font-size: 14px; line-height: 20px; font-weight: normal; margin: 15px 0;'>Bağlantıya tıklayamazsanız, bu URL'yi kopyalayıp tarayıcı pencerenize yapıştırın:</p>
+                                                    <table border='0' cellpadding='0' cellspacing='0'>
+                                                        <tr>
+                                                            <td style='-ms-word-break: break-all; word-break: break-all; font-family: sans-serif; font-size: 11px; line-height:14px;'>
+                                                                <font style="-ms-word-break: break-all; word-break: break-all; font-size: 11px; line-height:14px;">
+                                                                    <a style='-ms-word-break: break-all; word-break: break-all; color: #392F54; text-decoration: underline; font-size: 11px; line-height:15px;' href='%3%'>%3%</a>
+                                                                </font>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </p>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                        <br><br><br>
+                    </div>
+                </td>
+                <td style='font-family: sans-serif; font-size: 14px; vertical-align: top;' valign='top'> </td>
+            </tr>
+        </table>
+    </body>                           
+</html>]]>
+    </key>
+    <key alias="invite">Davet Et</key>
+    <key alias="defaultInvitationMessage">Davetiye yeniden gönderiliyor ...</key>
+    <key alias="deleteUser">Kullanıcıyı Sil</key>
+    <key alias="deleteUserConfirmation">Bu kullanıcı hesabını silmek istediğinizden emin misiniz?</key>
+    <key alias="stateAll">Tümü</key>
+    <key alias="stateActive">Etkin</key>
+    <key alias="stateDisabled">Devre Dışı</key>
+    <key alias="stateLockedOut">Kilitlendi</key>
+    <key alias="stateInvited">Davet edildi</key>
+    <key alias="stateInactive">Etkin Değil</key>
+    <key alias="sortNameAscending">Ad (AZ)</key>
+    <key alias="sortNameDescending">Ad (ZA)</key>
+    <key alias="sortCreateDateAscending">En yeni</key>
+    <key alias="sortCreateDateDescending">En eski</key>
+    <key alias="sortLastLoginDateDescending">Son giriş</key>
+    <key alias="noUserGroupsAdded">Hiçbir kullanıcı grubu eklenmedi</key>
+  </area>
+  <area alias="validation">
+    <key alias="validation">Doğrulama</key>
+    <key alias="noValidation">Doğrulama yok</key>
+    <key alias="validateAsEmail">E-posta adresi olarak doğrula</key>
+    <key alias="validateAsNumber">Sayı olarak doğrula</key>
+    <key alias="validateAsUrl">URL olarak doğrula</key>
+    <key alias="enterCustomValidation">... veya özel bir doğrulama girin</key>
+    <key alias="fieldIsMandatory">Alan zorunludur</key>
+    <key alias="mandatoryMessage">Özel bir doğrulama hata mesajı girin (isteğe bağlı)</key>
+    <key alias="validationRegExp">Bir normal ifade girin</key>
+    <key alias="validationRegExpMessage">Özel bir doğrulama hata mesajı girin (isteğe bağlı)</key>
+    <key alias="minCount">En az eklemeniz gerekiyor</key>
+    <key alias="maxCount">Yalnızca sahip olabilirsiniz</key>
+    <key alias="addUpTo">En fazla ekle</key>
+
+    <key alias="items">öğeler</key>
+    <key alias="urls">url(ler)</key>
+    <key alias="urlsSelected">url(ler) seçildi</key>
+    <key alias="itemsSelected">öğe seçildi</key>
+    <key alias="invalidDate">Geçersiz tarih</key>
+    <key alias="invalidNumber">Sayı değil</key>
+    <key alias="invalidEmail">Geçersiz e-posta</key>
+    <key alias="customValidation">Özel doğrulama</key>
+    <key alias="entriesShort"><![CDATA[Minimum %0% giriş, <strong>%1% </strong> daha fazla gerektirir.]]></key>
+    <key alias="entriesExceed"><![CDATA[Maksimum %0% giriş, <strong>%1% </strong> çok fazla.]]></key>
+  </area>
+  <area alias="healthcheck">
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+		   2: XPath
+		   3: Configuration file path
+	  -->
+    <key alias="checkSuccessMessage">Değer, önerilen değere ayarlandı: '%0%'.</key>
+    <key alias="rectifySuccessMessage">Değer, '%3%' yapılandırma dosyasındaki XPath '%2%' için '%1%' olarak ayarlandı.</key>
+    <key alias="checkErrorMessageDifferentExpectedValue">'%3%' yapılandırma dosyasında '%2%' için '%1%' değeri bekleniyordu, ancak '%0%' bulundu.</key>
+    <key alias="checkErrorMessageUnexpectedValue">'%3%' yapılandırma dosyasında '%2%' için beklenmeyen '%0%' değeri bulundu.</key>
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+	  -->
+    <key alias="customErrorsCheckSuccessMessage">Özel hatalar '%0%' olarak ayarlandı.</key>
+    <key alias="customErrorsCheckErrorMessage">Özel hatalar şu anda '%0%' olarak ayarlı. Yayınlanmadan önce bunun '%1%' olarak ayarlanması önerilir.</key>
+    <key alias="customErrorsCheckRectifySuccessMessage">Özel hatalar başarıyla '%0%' olarak ayarlandı.</key>
+    <key alias="macroErrorModeCheckSuccessMessage">Makro Hatalar '%0%' olarak ayarlandı.</key>
+    <key alias="macroErrorModeCheckErrorMessage">MacroErrors, makrolarda herhangi bir hata olması durumunda sitenizdeki bazı veya tüm sayfaların tamamen yüklenmesini önleyecek olan '%0%' olarak ayarlanmıştır. Bunu düzeltmek, değeri "%1%" olarak ayarlayacaktır.</key>
+    <key alias="macroErrorModeCheckRectifySuccessMessage">Makro Hatalar artık '%0%' olarak ayarlandı.</key>
+    <!-- The following keys get these tokens passed in:
+	     0: Current value
+		   1: Recommended value
+		   2: Server version
+	  -->
+    <key alias="trySkipIisCustomErrorsCheckSuccessMessage">Deneyin IIS Özel Hatalarını Atla '%0%' olarak ayarlandı ve '%1%' IIS sürümünü kullanıyorsunuz.</key>
+    <key alias="trySkipIisCustomErrorsCheckErrorMessage">IIS'yi Atlamayı Deneyin Özel Hataları şu anda '%0%'. IIS sürümünüz (%2%) için bunu '%1%' olarak ayarlamanız önerilir.</key>
+    <key alias="trySkipIisCustomErrorsCheckRectifySuccessMessage">IIS Özel Hatalarını Atlamayı deneyin başarıyla '%0%' olarak ayarlandı.</key>
+    <!-- The following keys get predefined tokens passed in that are not all the same, like above -->
+    <key alias="configurationServiceFileNotFound">​​Dosya mevcut değil: '%0%'.</key>
+    <key alias="configurationServiceNodeNotFound">​​<![CDATA[<strong> '%1%' </strong> yapılandırma dosyasında <strong> '%0%' </strong> bulunamadı.]]> </key>
+    <key alias="configurationServiceError">Bir hata oluştu, tam hata için günlüğü kontrol edin: %0%.</key>
+    <key alias="databaseSchemaValidationCheckDatabaseOk">Veritabanı - Veritabanı şeması, Umbraco'nun bu sürümü için doğru</key>
+    <key alias="databaseSchemaValidationCheckDatabaseErrors">Veritabanı şemanızda %0% sorun algılandı (Ayrıntılar için günlüğe bakın)</key>
+    <key alias="databaseSchemaValidationCheckDatabaseLogMessage">Umbraco'nun mevcut sürümüne göre veritabanı şeması doğrulanırken bazı hatalar tespit edildi.</key>
+    <key alias="httpsCheckValidCertificate">Web sitenizin sertifikası geçerlidir.</key>
+    <key alias="httpsCheckInvalidCertificate">Sertifika doğrulama hatası: '%0%'</key>
+    <key alias="httpsCheckExpiredCertificate">Web sitenizin SSL sertifikasının süresi doldu.</key>
+    <key alias="httpsCheckExpiringCertificate">Web sitenizin SSL sertifikasının süresi %0% gün içinde doluyor.</key>
+    <key alias="healthCheckInvalidUrl">URL %0% - '%1%' pinglenirken hata oluştu</key>
+    <key alias="httpsCheckIsCurrentSchemeHttps">Şu anda HTTPS şemasını kullanarak siteyi %0% görüntülüyorsunuz.</key>
+    <key alias="httpsCheckConfigurationRectifyNotPossible">appSetting 'Umbraco.Core.Https' web.config dosyanızda 'false' olarak ayarlandı. Bu siteye HTTPS şemasını kullanarak eriştiğinizde, bu 'doğru' olarak ayarlanmalıdır.</key>
+    <key alias="httpsCheckConfigurationCheckResult">appSetting 'Umbraco.Core.Https' web.config dosyanızda '%0%' olarak ayarlandı, çerezleriniz%1% güvenli olarak işaretlendi.</key>
+    <key alias="httpsCheckEnableHttpsError">Web.config dosyanızdaki 'Umbraco.Core.Https' ayarı güncellenemedi. Hata: %0%</key>
+
+    <!-- The following keys don't get tokens passed in -->
+    <key alias="httpsCheckEnableHttpsButton">HTTPS'yi etkinleştir</key>
+    <key alias="httpsCheckEnableHttpsDescription">web.config dosyasının appSettings öğesinde umbracoSSL ayarını true olarak ayarlar.</key>
+    <key alias="httpsCheckEnableHttpsSuccess">appSetting 'Umbraco.Core.Https' artık web.config dosyanızda 'true' olarak ayarlandı, çerezleriniz güvenli olarak işaretlenecek.</key>
+    <key alias="rectifyButton">Düzelt</key>
+    <key alias="cannotRectifyShouldNotEqual">Değer karşılaştırma türü 'ShouldNotEqual' olan bir kontrol düzeltilemez.</key>
+    <key alias="cannotRectifyShouldEqualWithValue">Sağlanan bir değere sahip 'ShouldEqual' değer karşılaştırma türüne sahip bir kontrol düzeltilemez.</key>
+    <key alias="valueToRectifyNotProvided">Düzeltilecek değer kontrolü sağlanmadı.</key>
+    <key alias="compilationDebugCheckSuccessMessage">Hata ayıklama derleme modu devre dışı.</key>
+    <key alias="compilationDebugCheckErrorMessage">Hata ayıklama derleme modu şu anda etkin. Yayınlanmadan önce bu ayarı devre dışı bırakmanız önerilir.</key>
+    <key alias="compilationDebugCheckRectifySuccessMessage">Hata ayıklama derleme modu başarıyla devre dışı bırakıldı.</key>
+    <key alias="traceModeCheckSuccessMessage">İzleme modu devre dışı.</key>
+    <key alias="traceModeCheckErrorMessage">İzleme modu şu anda etkin. Yayınlanmadan önce bu ayarı devre dışı bırakmanız önerilir.</key>
+    <key alias="traceModeCheckRectifySuccessMessage">İzleme modu başarıyla devre dışı bırakıldı.</key>
+    <key alias="folderPermissionsCheckMessage">Tüm klasörler doğru izinlere sahip.</key>
+    <!-- The following keys get these tokens passed in:
+	    0: Comma delimitted list of failed folder paths
+  	-->
+    <key alias="requiredFolderPermissionFailed"><![CDATA[Aşağıdaki klasörler, değiştirme izinleriyle ayarlanmalıdır, ancak erişilemez: <strong>%0%</strong>]]></key>
+    <key alias="optionalFolderPermissionFailed"><![CDATA[Aşağıdaki klasörler, belirli Umbraco işlemlerinin çalışması için değiştirme izinleriyle ayarlanmalıdır, ancak erişilemez: <strong>%0% </strong>. Yazılmıyorsa herhangi bir işlem yapılmasına gerek yoktur.]]></key>
+    <key alias="filePermissionsCheckMessage">Tüm dosyalar doğru izinlere sahip.</key>
+    <!-- The following keys get these tokens passed in:
+	    0: Comma delimitted list of failed folder paths
+  	-->
+    <key alias="requiredFilePermissionFailed"><![CDATA[Aşağıdaki dosyalar yazma izinleriyle ayarlanmalıdır, ancak erişilemez: <strong>%0%</strong>]]></key>
+    <key alias="optionalFilePermissionFailed"><![CDATA[Aşağıdaki dosyalar, belirli Umbraco işlemlerinin çalışması için yazma izinleriyle ayarlanmalıdır, ancak erişilemez: <strong>%0% </strong>. Yazılmıyorsa herhangi bir işlem yapılmasına gerek yoktur.]]></key>
+    <key alias="clickJackingCheckHeaderFound">
+      ​​<![CDATA[Bir sitenin başka bir site tarafından IFRAMEd olup olmadığını kontrol etmek için kullanılan başlık veya meta etiketi <strong> X-Frame-Options </strong>.]]> </key>
+      <key alias="clickJackingCheckHeaderNotFound">
+        ​​<![CDATA[Bir sitenin başka bir site tarafından IFRAMEd olup olmadığını kontrol etmek için kullanılan başlık veya meta etiketi <strong> X-Frame-Options </strong> bulunamadı.]]> </key>
+    <key alias="setHeaderInConfig">Yapılandırmada Üstbilgiyi Ayarla</key>
+        <key alias="clickJackingSetHeaderInConfigDescription">Sitenin diğer web siteleri tarafından IFRAMEd olmasını önlemek için web.config’in httpProtocol / customHeaders bölümüne bir değer ekler.</key>
+        <key alias="clickJackingSetHeaderInConfigSuccess">Web.config dosyanıza, sitenin diğer web siteleri tarafından IFRAMEing yapılmasını engelleyen bir başlık oluşturma ayarı eklendi.</key>
+        <key alias="setHeaderInConfigError">web.config dosyası güncellenemedi. Hata: %0%</key>
+        <key alias="noSniffCheckHeaderFound">​​<![CDATA[MIME koklama güvenlik açıklarına karşı koruma sağlamak için kullanılan başlık veya meta etiketi <strong> X-Content-Type-Options </strong> bulundu.]]></key>
+        <key alias="noSniffCheckHeaderNotFound">​​<![CDATA[MIME koklama güvenlik açıklarına karşı koruma sağlamak için kullanılan başlık veya meta etiketi <strong> X-Content-Type-Options </strong> bulunamadı.]]> </key>
+
+        <key alias="noSniffSetHeaderInConfigDescription">MIME koklama güvenlik açıklarına karşı koruma sağlamak için web.config’in httpProtocol / customHeaders bölümüne bir değer ekler.</key>
+        <key alias="noSniffSetHeaderInConfigSuccess">Web.config dosyanıza MIME koklama güvenlik açıklarına karşı koruma sağlayan bir üstbilgi oluşturma ayarı eklendi.</key>
+        <key alias="hSTSCheckHeaderFound">​​<![CDATA[HSTS başlığı olarak da bilinen <strong> Strict-Transport-Security </strong> başlığı bulundu.]]></key>
+        <key alias="hSTSCheckHeaderNotFound">​​<![CDATA[<strong> Strict-Transport-Security </strong> başlığı bulunamadı.]]></key>
+        <key alias="hSTSSetHeaderInConfigDescription">Web.config'in httpProtocol / customHeaders bölümüne 'max-age=10886400' değerine sahip 'Strict-Transport-Security' başlığını ekler. Bu düzeltmeyi yalnızca alanlarınız önümüzdeki 18 hafta boyunca (minimum) https ile çalışacaksa kullanın.</key>
+        <key alias="hSTSSetHeaderInConfigSuccess">HSTS başlığı web.config dosyanıza eklendi.</key>
+        <key alias="xssProtectionCheckHeaderFound">​​<![CDATA[<strong> X-XSS-Protection </strong> başlığı bulundu.]]></key>
+        <key alias="xssProtectionCheckHeaderNotFound">​​<![CDATA[<strong> X-XSS-Protection </strong> başlığı bulunamadı.]]></key>
+        <key alias="xssProtectionSetHeaderInConfigDescription">'X-XSS-Protection' başlığını '1; mode=block 'web.config'in httpProtocol / customHeaders bölümüne.</key>
+        <key alias="xssProtectionSetHeaderInConfigSuccess">X-XSS-Protection başlığı web.config dosyanıza eklendi.</key>
+        <!-- The following key get these tokens passed in:
+	    0: Comma delimitted list of headers found
+  	-->
+        <key alias="excessiveHeadersFound">​​<![CDATA[Web sitesi teknolojisi hakkında bilgi veren şu başlıklar bulundu: <strong>%0%</strong>.]]></key>
+        <key alias="excessiveHeadersNotFound">​​Web sitesi teknolojisi hakkında bilgi veren hiçbir başlık bulunamadı.</key>
+        <key alias="smtpMailSettingsNotFound">​​Web.config dosyasında system.net/mailsettings bulunamadı.</key>
+        <key alias="smtpMailSettingsHostNotConfigured">Web.config dosyası system.net/mailsettings bölümünde, ana bilgisayar yapılandırılmamış.</key>
+        <key alias="smtpMailSettingsConnectionSuccess">SMTP ayarları doğru yapılandırıldı ve hizmet beklendiği gibi çalışıyor.</key>
+        <key alias="smtpMailSettingsConnectionFail">'%0%' ana bilgisayarı ve '%1%' bağlantı noktası ile yapılandırılan SMTP sunucusuna ulaşılamadı. Lütfen Web.config dosyasındaki system.net/mailsettings içindeki SMTP ayarlarının doğruluğunu kontrol edin.</key>
+        <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Bildirim e-postası <strong>%0%</strong> olarak ayarlandı]]></key>
+        <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Bildirim e-postası hâlâ varsayılan değer olan <strong>%0%</strong>.]]></key>
+        <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>%0% tarihinde %1% ile çalıştırılan planlanmış Umbraco Sağlık Kontrollerinin sonuçları aşağıdaki gibidir: </p>%2%</body></html>]]></key>
+        <key alias="scheduledHealthCheckEmailSubject">Umbraco Sağlık Kontrolü Durumu: %0%</key>
+        <key alias="checkAllGroups">Tüm Grupları Kontrol Edin</key>
+        <key alias="checkGroup">Grubu kontrol et</key>
+        <key alias="helpText">
+          <![CDATA[
+        <p> Durum denetleyicisi, sitenizin çeşitli alanlarını en iyi uygulama ayarları, yapılandırma, olası sorunlar vb. için değerlendirir. Sorunları bir düğmeye basarak kolayca düzeltebilirsiniz.
+        Kendi sağlık kontrollerinizi ekleyebilir, <a href="https://our.umbraco.com/documentation/Extending/Healthcheck/" target="_blank" class="btn-link -underline">özel durum kontrolleri hakkında daha fazla bilgi için belgeler </a>. </p>
+        ]]>
+        </key>
+      </area>
+  <area alias="redirectUrls">
+    <key alias="disableUrlTracker">URL izleyiciyi devre dışı bırakın</key>
+    <key alias="enableUrlTracker">URL izleyiciyi etkinleştir</key>
+    <key alias="originalUrl">Orijinal URL</key>
+    <key alias="redirectedTo">Yönlendirildi</key>
+    <key alias="redirectUrlManagement">URL Yönetimini Yeniden Yönlendir</key>
+    <key alias="panelInformation">Aşağıdaki URL'ler bu içerik öğesine yönlendiriyor:</key>
+    <key alias="noRedirects">Yönlendirme yapılmadı</key>
+    <key alias="noRedirectsDescription">Yayınlanan bir sayfa yeniden adlandırıldığında veya taşındığında, yeni sayfaya otomatik olarak bir yönlendirme yapılır.</key>
+    <key alias="confirmRemove">'%0%' dan '%1%' e yönlendirmeyi kaldırmak istediğinizden emin misiniz?</key>
+    <key alias="redirectRemoved">Yönlendirme URL'si kaldırıldı.</key>
+    <key alias="redirectRemoveError">Yönlendirme URL'sini kaldırma hatası.</key>
+    <key alias="redirectRemoveWarning">Bu, yönlendirmeyi kaldırır</key>
+    <key alias="confirmDisable">URL izleyiciyi devre dışı bırakmak istediğinizden emin misiniz?</key>
+    <key alias="disabledConfirm">URL izleyici artık devre dışı bırakıldı.</key>
+    <key alias="disableError">URL izleyici devre dışı bırakılırken hata oluştu, günlük dosyanızda daha fazla bilgi bulunabilir.</key>
+    <key alias="enabledConfirm">URL izleyici artık etkinleştirildi.</key>
+    <key alias="enableError">URL izleyici etkinleştirilirken hata oluştu, günlük dosyanızda daha fazla bilgi bulunabilir.</key>
+  </area>
+  <area alias="emptyStates">
+    <key alias="emptyDictionaryTree">Aralarından seçim yapabileceğiniz Sözlük öğesi yok</key>
+  </area>
+  <area alias="textbox">
+    <key alias="characters_left"><![CDATA[<strong>%0% </strong> karakter kaldı.]]></key>
+    <key alias="characters_exceed"><![CDATA[Maksimum %0% karakter, <strong>%1% </strong> çok fazla.]]></key>
+  </area>
+  <area alias="recycleBin">
+    <key alias="contentTrashed">Çöp kutusuna gönderilmiş içerik: {0} Şu kimliğe sahip orijinal ana içerikle ilgili: {1}</key>
+    <key alias="mediaTrashed">Şu kimliğe sahip çöp kutusuna gönderilen medya: {0} Şu kimliğe sahip orijinal ana medya öğesiyle ilgili: {1}</key>
+    <key alias="itemCannotBeRestored">Bu öğe otomatik olarak geri yüklenemez</key>
+    <key alias="itemCannotBeRestoredHelpText">Bu öğenin otomatik olarak geri yüklenebileceği bir yer yok. Aşağıdaki ağacı kullanarak öğeyi manuel olarak taşıyabilirsiniz.</key>
+    <key alias="wasRestored">altında geri yüklendi ,</key>
+  </area>
+  <area alias="relationType">
+    <key alias="direction">Yön</key>
+    <key alias="parentToChild">Ebeveynden alt öğeye</key>
+    <key alias="bidirectional">Çift yönlü</key>
+    <key alias="parent">Üst</key>
+    <key alias="child">Çocuk</key>
+    <key alias="count">Sayım</key>
+    <key alias="relations">İlişkiler</key>
+    <key alias="created">Oluşturuldu</key>
+    <key alias="comment">Yorum</key>
+    <key alias="name">Adı</key>
+    <key alias="noRelations">Bu ilişki türü için ilişki yok.</key>
+    <key alias="tabRelationType">İlişki Türü</key>
+    <key alias="tabRelations">İlişkiler</key>
+  </area>
+  <area alias="dashboardTabs">
+    <key alias="contentIntro">Başlarken</key>
+    <key alias="contentRedirectManager">Yeniden Yönlendirme URL Yönetimi</key>
+    <key alias="mediaFolderBrowser">İçerik</key>
+    <key alias="settingsWelcome">Hoş Geldiniz</key>
+    <key alias="settingsExamine">Yönetimi İnceleyin</key>
+    <key alias="settingsPublishedStatus">Yayınlanma Durumu</key>
+    <key alias="settingsModelsBuilder">Model Oluşturucu</key>
+    <key alias="settingsHealthCheck">Durum Kontrolü</key>
+    <key alias="settingsProfiler">Profil oluşturma</key>
+    <key alias="memberIntro">Başlarken</key>
+    <key alias="formsInstall">Umbraco Formlarını Yükleyin</key>
+  </area>
+  <area alias="visuallyHiddenTexts">
+    <key alias="goBack">Geri dön</key>
+    <key alias="activeListLayout">Etkin düzen:</key>
+    <key alias="jumpTo">Git</key>
+    <key alias="group">grup</key>
+    <key alias="passed">geçti</key>
+    <key alias="warning">uyarı</key>
+    <key alias="failed">başarısız oldu</key>
+    <key alias="suggestion">öneri</key>
+    <key alias="checkPassed">Kontrol geçti</key>
+    <key alias="checkFailed">Kontrol başarısız oldu</key>
+    <key alias="openBackofficeSearch">Arka ofis aramasını aç</key>
+    <key alias="openCloseBackofficeHelp">Backoffice yardımını Aç / Kapat</key>
+    <key alias="openCloseBackofficeProfileOptions">Profil seçeneklerinizi açın / kapatın</key>
+    <key alias="assignDomainDescription">%0% için Kurulum Kültürü ve Ana Bilgisayar Adları</key>
+    <key alias="createDescription">%0% altında yeni düğüm oluştur</key>
+    <key alias="protectDescription">%0% üzerinde genel erişim kurun</key>
+    <key alias="rightsDescription">%0% için Kurulum İzinleri</key>
+    <key alias="sortDescription">%0% için sıralama düzenini değiştir</key>
+    <key alias="createblueprintDescription">%0% temelinde İçerik Şablonu oluşturun</key>
+    <key alias="openContextMenu">için bağlam menüsünü aç</key>
+    <key alias="currentLanguage">Mevcut dil</key>
+    <key alias="switchLanguage">Dili değiştir</key>
+    <key alias="createNewFolder">Yeni klasör oluştur</key>
+    <key alias="newPartialView">Kısmi Görünüm</key>
+    <key alias="newPartialViewMacro">Kısmi Görünüm Makrosu</key>
+    <key alias="newMember">Üye</key>
+    <key alias="newDataType">Veri türü</key>
+    <key alias="redirectDashboardSearchLabel">Yönlendirme kontrol panelinde ara</key>
+    <key alias="userGroupSearchLabel">Kullanıcı grubu bölümünde ara</key>
+    <key alias="userSearchLabel">Kullanıcılar bölümünde ara</key>
+    <key alias="createItem">Öğe oluştur</key>
+    <key alias="create">Oluştur</key>
+    <key alias="edit">Düzenle</key>
+    <key alias="name">Reklam</key>
+    <key alias="addNewRow">Yeni satır ekle</key>
+    <key alias="tabExpand">Diğer seçenekleri görüntüleyin</key>
+    <key alias="hasTranslation">Çeviri var</key>
+    <key alias="noTranslation">Eksik çeviri</key>
+    <key alias="dictionaryListCaption">Sözlük öğeleri</key>
+  </area>
+  <area alias="references">
+    <key alias="tabName">Referanslar</key>
+    <key alias="DataTypeNoReferences">Bu Veri Türünde referans yok.</key>
+    <key alias="labelUsedByDocumentTypes">Belge Türlerinde Kullanılır</key>
+    <key alias="noDocumentTypes">Belge Türlerine referans yok.</key>
+    <key alias="labelUsedByMediaTypes">Medya Türlerinde Kullanılır</key>
+    <key alias="noMediaTypes">Medya Türlerine referans yok.</key>
+    <key alias="labelUsedByMemberTypes">Üye Türlerinde Kullanılır</key>
+    <key alias="noMemberTypes">Üye Türlerine referans yok.</key>
+    <key alias="usedByProperties">Kullanan</key>
+    <key alias="labelUsedByDocuments">Belgelerde Kullanıldı</key>
+    <key alias="labelUsedByMembers">Üyelerde Kullanıldı</key>
+    <key alias="labelUsedByMedia">Medyada Kullanıldı</key>
+  </area>
+  <area alias="logViewer">
+    <key alias="deleteSavedSearch">Kaydedilmiş Aramayı Sil</key>
+    <key alias="logLevels">Günlük Düzeyleri</key>
+    <key alias="savedSearches">Kaydedilmiş Aramalar</key>
+    <key alias="saveSearch">Aramayı Kaydet</key>
+    <key alias="saveSearchDescription">Arama sorgunuz için kolay bir ad girin</key>
+    <key alias="filterSearch">Aramayı Filtrele</key>
+    <key alias="totalItems">Toplam Öğeler</key>
+    <key alias="timestamp">Zaman damgası</key>
+    <key alias="level">Seviye</key>
+    <key alias="machine">Makine</key>
+    <key alias="message">Mesaj</key>
+    <key alias="exception">İstisna</key>
+    <key alias="properties">Özellikler</key>
+    <key alias="searchWithGoogle">Google ile Ara</key>
+    <key alias="searchThisMessageWithGoogle">Bu mesajı Google ile ara</key>
+    <key alias="searchWithBing">Bing ile Ara</key>
+    <key alias="searchThisMessageWithBing">Bu iletiyi Bing ile ara</key>
+    <key alias="searchOurUmbraco">Umbraco'yu Arayın</key>
+    <key alias="searchThisMessageOnOurUmbracoForumsAndDocs">Bu iletiyi Umbraco forumlarımızda ve belgelerimizde arayın</key>
+    <key alias="searchOurUmbracoWithGoogle">Google ile Umbraco'muzda arama yapın</key>
+    <key alias="searchOurUmbracoForumsUsingGoogle">Umbraco forumlarımızda Google'ı kullanarak arama yapın</key>
+    <key alias="searchUmbracoSource">Umbraco Kaynağını Ara</key>
+    <key alias="searchWithinUmbracoSourceCodeOnGithub">Github'da Umbraco kaynak kodu içinde arama</key>
+    <key alias="searchUmbracoIssues">Umbraco Sorunlarını Ara</key>
+    <key alias="searchUmbracoIssuesOnGithub">Github'da Umbraco Sorunlarını Ara</key>
+    <key alias="deleteThisSearch">Bu aramayı sil</key>
+    <key alias="findLogsWithRequestId">İstek Kimliği Olan Günlükleri Bul</key>
+    <key alias="findLogsWithNamespace">Ad Alanına Sahip Günlükleri Bul</key>
+    <key alias="findLogsWithMachineName">Makine Adına Sahip Günlükleri Bul</key>
+    <key alias="open">Aç</key>
+  </area>
+  <area alias="clipboard">
+    <key alias="labelForCopyAllEntries">%0% Kopyala</key>
+    <key alias="labelForArrayOfItemsFrom">%0%, %1%'den</key>
+    <key alias="labelForRemoveAllEntries">Tüm öğeleri kaldır</key>
+    <key alias="labelForClearClipboard">Panoyu temizle</key>
+  </area>
+  <area alias="propertyActions">
+    <key alias="tooltipForPropertyActionsMenu">Mülk Eylemlerini Aç</key>
+    <key alias="tooltipForPropertyActionsMenuClose">Özellik Eylemlerini Kapat</key>
+  </area>
+  <area alias="nuCache">
+    <key alias="wait">Bekle</key>
+    <key alias="refreshStatus">Durumu yenile</key>
+    <key alias="memoryCache">Bellek Önbelleği</key>
+    <key alias="memoryCacheDescription">
+      <![CDATA[
+            Bu düğme, bellek içi önbelleği veritabanından tamamen yeniden yükleyerek yeniden yüklemenizi sağlar.
+    önbellek (ancak bu veritabanı önbelleğini yeniden oluşturmaz). Bu nispeten hızlıdır.
+    Bazı olaylardan sonra önbelleğin düzgün şekilde yenilenmediğini düşündüğünüzde kullanın.
+    küçük bir Umbraco sorununu gösterecek olan & mdash;
+    (not: bir LB ortamındaki tüm sunucularda yeniden yüklemeyi tetikler).
+    ]]>
+    </key>
+    <key alias="reload">Yeniden yükle</key>
+    <key alias="databaseCache">Veritabanı Önbelleği</key>
+    <key alias="databaseCacheDescription">
+      <![CDATA[
+    Bu düğme, veritabanı önbelleğini, yani cmsContentNu tablosunun içeriğini yeniden oluşturmanıza olanak sağlar.
+    <strong> Yeniden oluşturmak pahalı olabilir. </strong>
+    Yeniden yükleme yeterli olmadığında ve veritabanı önbelleğinin yüklenmediğini düşündüğünüzde kullanın.
+    uygun şekilde oluşturulmuş&mdash; bu bazı kritik Umbraco sorunlarına işaret eder.
+    ]]>
+    </key>
+    <key alias="rebuild">Yeniden Oluştur</key>
+    <key alias="internals">Dahili</key>
+    <key alias="internalsDescription">
+      <![CDATA[
+    Bu düğme, bir NuCache anlık görüntü koleksiyonunu tetiklemenizi sağlar (bir fullCLR GC çalıştırdıktan sonra).
+    Bunun ne anlama geldiğini bilmiyorsanız, muhtemelen kullanmanız <em>gerekmez</em>.
+    ]]>
+    </key>
+    <key alias="collect">Topla</key>
+    <key alias="publishedCacheStatus">Yayınlanmış Önbellek Durumu</key>
+    <key alias="caches">Önbellekler</key>
+  </area>
+  <area alias="profiling">
+    <key alias="performanceProfiling">Performans profili oluşturma</key>
+    <key alias="performanceProfilingDescription">
+      <![CDATA[
+            <p>
+                Umbraco şu anda hata ayıklama modunda çalışıyor. Bu, sayfaları işlerken performansı değerlendirmek için yerleşik performans profilleyicisini kullanabileceğiniz anlamına gelir.
+            </p>
+            <p>
+                Profil oluşturucuyu belirli bir sayfa oluşturma için etkinleştirmek istiyorsanız, sayfayı talep ederken sorgu dizesine <b> umbDebug=true </b> eklemeniz yeterlidir.
+            </p>
+            <p>
+                Profilcinin tüm sayfa görüntülemeleri için varsayılan olarak etkinleştirilmesini istiyorsanız, aşağıdaki geçişi kullanabilirsiniz.
+                Tarayıcınızda, profil oluşturucuyu otomatik olarak etkinleştiren bir çerez ayarlayacaktır.
+                Başka bir deyişle, profil oluşturucu yalnızca <i>tarayıcınızda</i> varsayılan olarak etkin olacaktır - diğer herkesin değil.
+            </p>
+    ]]>
+    </key>
+    <key alias="activateByDefault">Profil oluşturucuyu varsayılan olarak etkinleştirin</key>
+    <key alias="reminder">Kolay hatırlatma</key>
+    <key alias="reminderDescription">
+      <![CDATA[
+        <p>
+            Bir üretim sitesinin hata ayıklama modunda çalışmasına asla izin vermemelisiniz. Web.config içindeki <b>&lt;compilation /&gt;</b> öğesinde <b> debug="false" </b> ayarlanarak hata ayıklama modu kapatılır.
+        </p>
+    ]]>
+    </key>
+    <key alias="profilerEnabledDescription">
+      <![CDATA[
+        <p>
+            Umbraco şu anda hata ayıklama modunda çalışmadığından yerleşik profil oluşturucuyu kullanamazsınız. Bir üretim sahası için böyle olması gerekir.
+        </p>
+        <p>
+            Hata ayıklama modu, web.config'deki <b>&lt;compilation /&gt;</b> öğesinde <b>debug="true"</b> ayarlanarak etkinleştirilir.
+        </p>
+    ]]>
+    </key>
+  </area>
+  <area alias="settingsDashboardVideos">
+    <key alias="trainingHeadline">Umbraco eğitim videolarının saatleri yalnızca bir tıklama uzaklıkta</key>
+    <key alias="trainingDescription">
+      <![CDATA[
+            <p> Umbraco'da ustalaşmak mı istiyorsunuz? Umbraco'nun kullanımıyla ilgili bu videolardan birini izleyerek en iyi uygulamaları öğrenmek için birkaç dakikanızı ayırın. Daha da fazla Umbraco videosu için <a href="http://umbraco.tv" target="_blank">umbraco.tv </a> adresini ziyaret edin </p>
+        ]]>
+    </key>
+    <key alias="getStarted">Başlamak için</key>
+  </area>
+  <area alias="settingsDashboard">
+    <key alias="start">Buradan başlayın</key>
+    <key alias="startDescription">Bu bölüm, Umbraco siteniz için yapı taşlarını içerir. Ayarlar bölümündeki öğelerle çalışma hakkında daha fazla bilgi edinmek için aşağıdaki bağlantıları izleyin</key>
+    <key alias="more">Daha fazla bilgi edinin</key>
+    <key alias="bulletPointOne">
+      <![CDATA[
+        Ayarlar <a class="btn-link -underline" href="https://our.umbraco.com/documentation/Getting-Started/Backoffice/Sections/" target="_blank">öğelerle çalışma hakkında daha fazla bilgi edinin Our Umbraco'nun Dokümantasyon bölümünde </a>
+    ]]>
+    </key>
+    <key alias="bulletPointTwo">
+      <![CDATA[
+        <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank">Topluluk Forumu</a>'nda bir soru sorun
+    ]]>
+    </key>
+    <key alias="bulletPointThree">
+      <![CDATA[
+        <a class="btn-link -underline" href="https://umbraco.tv" target="_blank">Eğitici videolarımızı</a> izleyin (bazıları ücretsiz, bazıları abonelik gerektirir)
+    ]]>
+    </key>
+    <key alias="bulletPointFour">
+      <![CDATA[
+        <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank">Üretkenliği artıran araçlarımız ve ticari desteğimiz </a> hakkında bilgi edinin
+    ]]>
+    </key>
+    <key alias="bulletPointFive">
+      <![CDATA[
+        Gerçek hayattaki <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank">eğitim ve sertifika </a> fırsatları hakkında bilgi edinin
+    ]]>
+    </key>
+  </area>
+  <area alias="startupDashboard">
+    <key alias="fallbackHeadline">Dost Canlısı CMS'e Hoş Geldiniz</key>
+    <key alias="fallbackDescription">Umbraco'yu seçtiğiniz için teşekkür ederiz - bunun güzel bir şeyin başlangıcı olabileceğini düşünüyoruz. İlk başta bunaltıcı gibi görünse de, öğrenme eğrisini olabildiğince sorunsuz ve hızlı hale getirmek için çok şey yaptık.</key>
+  </area>
+  <area alias="formsDashboard">
+    <key alias="formsHeadline">Umbraco Formları</key>
+    <key alias="formsDescription">Sezgisel bir sürükle ve bırak arayüzü kullanarak formlar oluşturun. E-postalar gönderen basit iletişim formlarından CRM sistemleriyle entegre olan gelişmiş anketlere kadar. Müşterileriniz buna bayılacak!</key>
+  </area>
+  <area alias="blockEditor">
+    <key alias="headlineCreateBlock">Yeni blok oluştur</key>
+    <key alias="headlineAddSettingsElementType">Bir ayarlar bölümü ekleyin</key>
+    <key alias="headlineAddCustomView">Görünümü seçin</key>
+    <key alias="headlineAddCustomStylesheet">Stil sayfasını seçin</key>
+    <key alias="headlineAddThumbnail">Küçük resim seçin</key>
+    <key alias="labelcreateNewElementType">Yeni oluştur</key>
+    <key alias="labelCustomStylesheet">Özel stil sayfası</key>
+    <key alias="addCustomStylesheet">Stil sayfası ekle</key>
+    <key alias="headlineEditorAppearance">Düzenleyici görünümü</key>
+    <key alias="headlineDataModels">Veri modelleri</key>
+    <key alias="headlineCatalogueAppearance">Katalog görünümü</key>
+    <key alias="labelBackgroundColor">Arka plan rengi</key>
+    <key alias="labelIconColor">Simge rengi</key>
+    <key alias="labelContentElementType">İçerik modeli</key>
+    <key alias="labelLabelTemplate">Etiket</key>
+    <key alias="labelCustomView">Özel görünüm</key>
+    <key alias="labelSettingsElementType">Ayarlar modeli</key>
+    <key alias="labelEditorSize">Yer paylaşımı düzenleyici boyutu</key>
+    <key alias="addCustomView">Özel görünüm ekle</key>
+    <key alias="addSettingsElementType">Ayarları ekle</key>
+    <key alias="labelTemplatePlaceholder">Etiket şablonunun üzerine yaz</key>
+    <key alias="confirmDeleteBlockMessage"><![CDATA[<strong>%0%</strong> içeriğini silmek istediğinizden emin misiniz?]]></key>
+    <key alias="confirmDeleteBlockTypeMessage"><![CDATA[<strong>%0%</strong> blok yapılandırmasını silmek istediğinizden emin misiniz?]]></key>
+    <key alias="confirmDeleteBlockTypeNotice">Bu bloğun içeriği hala mevcut olacak, bu içeriğin düzenlenmesi artık kullanılamayacak ve desteklenmeyen içerik olarak gösterilecek.</key>
+    <key alias="blockConfigurationOverlayTitle"><![CDATA['%0%' Konfigürasyonu]]></key>
+    <key alias="thumbnail">Küçük Resim</key>
+    <key alias="addThumbnail">Küçük resim ekle</key>
+    <key alias="tabCreateEmpty">Boş oluştur</key>
+    <key alias="tabClipboard">Pano</key>
+    <key alias="tabBlockSettings">Ayarlar</key>
+    <key alias="headlineAdvanced">Gelişmiş</key>
+    <key alias="forceHideContentEditor">İçerik düzenleyiciyi gizlemeye zorla</key>
+    <key alias="blockHasChanges">Bu içerikte değişiklikler yaptınız. Onları atmak istediğinizden emin misiniz?</key>
+    <key alias="confirmCancelBlockCreationHeadline">Oluşturma iptal edilsin mi?</key>
+    <key alias="confirmCancelBlockCreationMessage"><![CDATA[Oluşturmayı iptal etmek istediğinizden emin misiniz.]]></key>
+    <key alias="elementTypeDoesNotExistHeadline">Hata!</key>
+    <key alias="elementTypeDoesNotExistDescription">Bu bloğun ElementType'ı artık mevcut değil</key>
+  </area>
+  <area alias="contentTemplatesDashboard">
+    <key alias="whatHeadline">İçerik Şablonları Nedir?</key>
+    <key alias="whatDescription">İçerik Şablonları, yeni bir içerik düğümü oluştururken seçilebilen önceden tanımlanmış içeriklerdir.</key>
+    <key alias="createHeadline">Nasıl İçerik Şablonu oluşturabilirim?</key>
+    <key alias="createDescription">
+      <![CDATA[
+            <p> İçerik Şablonu oluşturmanın iki yolu vardır: </p>
+            <ul>
+                <li> Bir içerik düğümünü sağ tıklayın ve yeni bir İçerik Şablonu oluşturmak için "İçerik Şablonu Oluştur" u seçin. </li>
+                <li> Ayarlar bölümündeki İçerik Şablonları ağacını sağ tıklayın ve İçerik Şablonu oluşturmak istediğiniz Belge Türünü seçin. </li>
+            </ul>
+            <p> Bir ad verildiğinde, editörler İçerik Şablonunu yeni sayfalarının temeli olarak kullanmaya başlayabilir. </p>
+        ]]>
+    </key>
+    <key alias="manageHeadline">İçerik Şablonlarını nasıl yönetirim?</key>
+    <key alias="manageDescription">Ayarlar bölümündeki "İçerik Şablonları" ağacından İçerik Şablonlarını düzenleyebilir ve silebilirsiniz. İçerik Şablonunun dayandığı Belge Türünü genişletin ve düzenlemek veya silmek için tıklayın.</key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
index 5210b46bcc..6344efe0bc 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
@@ -146,8 +146,8 @@
     <key alias="otherElements">属性</key>
     <key alias="parentNotPublished">该文档不可见，因为其上级 '%0%' 未发布。</key>
     <key alias="parentNotPublishedAnomaly">该文档已发布，但是没有更新至缓存（内部错误）</key>
-    <key alias="getUrlException">Could not get the url</key>
-    <key alias="routeError">This document is published but its url would collide with content %0%</key>
+    <key alias="getUrlException">Could not get the URL</key>
+    <key alias="routeError">This document is published but its URL would collide with content %0%</key>
     <key alias="publish">发布</key>
     <key alias="publishStatus">发布状态</key>
     <key alias="releaseDate">发布于</key>
@@ -258,7 +258,7 @@
     <key alias="recycleBinIsEmpty">回收站已清空</key>
     <key alias="recycleBinWarning">从回收站删除的项目将不可恢复</key>
     <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>的服务暂时出现问题。]]></key>
-    <key alias="regexSearchHelp">查找正则表达式来验证输入，如: 'email、'zip-code'、'url'。</key>
+    <key alias="regexSearchHelp">查找正则表达式来验证输入，如: 'email、'zip-code'、'URL'。</key>
     <key alias="removeMacro">移除宏</key>
     <key alias="requiredField">必填项</key>
     <key alias="sitereindexed">站点已重建索引</key>
@@ -514,7 +514,7 @@
     <key alias="databaseNotFound"><![CDATA[<p>数据库未找到！请检查数据库连接串设置。</p>
               <p>您可以自行编辑“web.config”文件，键名为 “UmbracoDbDSN”</p>
               <p>
-             当自行编辑后，单击<strong>重试</strong>按钮<br /><a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">。
+             当自行编辑后，单击<strong>重试</strong>按钮<br /><a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">。
                                     如何编辑web.config</a></p>
     ]]></key>
     <key alias="databaseText"><![CDATA[完成本步，需要配置一个正确的连接字符串（“connection string”）。<br />
@@ -562,7 +562,7 @@
     <key alias="runwayFromScratch">我要从头开始</key>
     <key alias="runwayFromScratchText"><![CDATA[
        此时您的网站是全空的,您应该首先建立您的文档类型和模板
-        (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">如何操作？</a>)
+        (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">如何操作？</a>)
        您也可以安装晚一些安装“Runway”。
     ]]></key>
     <key alias="runwayHeader">您刚刚安装了一个干净的系统，要继续吗？</key>
@@ -630,7 +630,7 @@
     <key alias="instruction">在下方登录</key>
     <key alias="signInWith">登录</key>
     <key alias="timeout">会话超时</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">忘记密码?</key>
     <key alias="forgottenPasswordInstruction">电子邮件将发送到地址指定的链接, 以重置您的密码</key>
     <key alias="requestPasswordResetConfirmation">如果电子邮件与我们的记录相符, 则将发送带有密码重置指令的邮件</key>
@@ -1156,7 +1156,7 @@
     <key alias="validation">验证</key>
     <key alias="validateAsEmail">验证为电子邮件</key>
     <key alias="validateAsNumber">验证为数字</key>
-    <key alias="validateAsUrl">验证为 url</key>
+    <key alias="validateAsUrl">验证为 URL</key>
     <key alias="enterCustomValidation">...或输入自定义验证</key>
     <key alias="fieldIsMandatory">字段是强制性的</key>
   </area>
@@ -1245,19 +1245,19 @@
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notification email is still set to the default value of <strong>%0%</strong>.]]></key>
   </area>
   <area alias="redirectUrls">
-    <key alias="disableUrlTracker">禁用 url 跟踪程序</key>
-    <key alias="enableUrlTracker">启用 url 跟踪程序</key>
+    <key alias="disableUrlTracker">禁用 URL 跟踪程序</key>
+    <key alias="enableUrlTracker">启用 URL 跟踪程序</key>
     <key alias="originalUrl">原始网址</key>
     <key alias="redirectedTo">已重定向至</key>
     <key alias="noRedirects">未进行重定向</key>
     <key alias="noRedirectsDescription">当已发布的页重命名或移动时, 将自动对新页进行重定向。</key>
     <key alias="confirmRemove">确实要删除 "%0%" 到 "%1%" 的重定向吗？</key>
     <key alias="redirectRemoved">重定向URL已删除。</key>
-    <key alias="redirectRemoveError">删除重定向 url 时出错.</key>
-    <key alias="confirmDisable">是否确实要禁用 url 跟踪程序?</key>
-    <key alias="disabledConfirm">url 跟踪器现在已被禁用。</key>
-    <key alias="disableError">禁用 url 跟踪程序时出错, 可以在日志文件中找到更多信息。</key>
-    <key alias="enabledConfirm">现在已启用 url 跟踪程序。</key>
-    <key alias="enableError">启用 url 跟踪程序时出错, 可以在日志文件中找到更多信息。</key>
+    <key alias="redirectRemoveError">删除重定向 URL 时出错.</key>
+    <key alias="confirmDisable">是否确实要禁用 URL 跟踪程序?</key>
+    <key alias="disabledConfirm">URL 跟踪器现在已被禁用。</key>
+    <key alias="disableError">禁用 URL 跟踪程序时出错, 可以在日志文件中找到更多信息。</key>
+    <key alias="enabledConfirm">现在已启用 URL 跟踪程序。</key>
+    <key alias="enableError">启用 URL 跟踪程序时出错, 可以在日志文件中找到更多信息。</key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
index 320c3f63d8..c912daa56e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
@@ -255,7 +255,7 @@
     <key alias="recycleBinIsEmpty">回收站已清空</key>
     <key alias="recycleBinWarning">從回收站刪除的項目將不可恢復</key>
     <key alias="regexSearchError"><![CDATA[<a target='_blank' href='http://regexlib.com'>regexlib.com</a>的網站服務目前出現些狀況，而我們無能為力。我們對此不便感到十分抱歉。]]></key>
-    <key alias="regexSearchHelp">查找規則運算式來驗證輸入，如: 'email、'zip-code'、'url'。</key>
+    <key alias="regexSearchHelp">查找規則運算式來驗證輸入，如: 'email、'zip-code'、'URL'。</key>
     <key alias="removeMacro">移除巨集</key>
     <key alias="requiredField">必填項目</key>
     <key alias="sitereindexed">網站已重建索引</key>
@@ -507,7 +507,7 @@
               <p>請編輯檔案"web.config" (例如使用Visual Studio或您喜歡的編輯器)，移動到檔案底部，並在名稱為"UmbracoDbDSN"的字串中設定資料庫連結資訊，並存檔。</p>
               <p>
               點選<strong>重試</strong>按鈕當上述步驟完成。<br />
-              <a href="https://our.umbraco.com/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">
+              <a href="https://our.umbraco.com/documentation/Reference/Config/webconfig/" target="_blank" rel="noopener">
 			              在此查詢更多編輯web.config的資訊。</a></p>]]></key>
     <key alias="databaseText"><![CDATA[要完成此步驟，您必須瞭解連結資料庫伺服器的重要資訊("connection string")。<br />
         若需要時，請聯繫您的網路公司。如果您在本地機器或伺服器安裝的話，您也許需要聯絡系統管理者。]]></key>
@@ -553,7 +553,7 @@
     <key alias="runwayFromScratch">我要從頭開始</key>
     <key alias="runwayFromScratchText"><![CDATA[
         您的網站目前完全沒有資料，所以如果您想要從頭開始並增添您自己的文檔種類和範本，現在正是絕佳時機。
-        (<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">學習該怎麼做</a>)
+        (<a href="https://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">學習該怎麼做</a>)
         您晚點仍可以選擇安裝Runway，請至開發者區域選擇安裝。
       ]]></key>
     <key alias="runwayHeader">您剛剛安裝了一個乾淨的系統，要繼續嗎？</key>
@@ -619,7 +619,7 @@
     <key alias="instruction">下方登入</key>
     <key alias="signInWith">登入使用</key>
     <key alias="timeout">連線時間過了</key>
-    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
+    <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="https://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">忘記密碼？</key>
     <key alias="forgottenPasswordInstruction">一封內有重設密碼連結的電子郵件已經寄出給您</key>
     <key alias="requestPasswordResetConfirmation">一封內有重設密碼連結的電子郵件已經寄到此信箱</key>
diff --git a/src/Umbraco.Web.UI/Views/Partials/BlockList/Default.cshtml b/src/Umbraco.Web.UI/Views/Partials/BlockList/Default.cshtml
new file mode 100644
index 0000000000..c94a51f6d9
--- /dev/null
+++ b/src/Umbraco.Web.UI/Views/Partials/BlockList/Default.cshtml
@@ -0,0 +1,13 @@
+@inherits UmbracoViewPage<BlockListModel>
+@using Umbraco.Core.Models.Blocks
+@{
+    if (!Model.Any()) { return; }
+}
+<div class="umb-block-list">
+    @foreach (var block in Model)
+    {
+        if (block?.ContentUdi == null) { continue; }
+        var data = block.Content;
+        @Html.Partial("BlockList/Components/" + data.ContentType.Alias, block)        
+    }
+</div>
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
index 23fee33043..c30feb2165 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
@@ -36,7 +36,9 @@
 
 @helper renderRow(dynamic row, bool singleColumn){
     <div @RenderElementAttributes(row)>
-        @Html.If(singleColumn, "<div class='container'>")
+        @if (singleColumn) {
+            @:<div class="container">
+        }
         <div class="row clearfix">
             @foreach ( var area in row.areas ) {
             <div class="col-md-@area.grid column">
@@ -49,7 +51,9 @@
                 </div>
             </div>}
         </div>
-        @Html.If(singleColumn, "</div>")
+        @if (singleColumn) {
+            @:</div>
+        }
     </div>
 }
 
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 e20b717ed5..dc879fb244 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
@@ -1,21 +1,50 @@
 @model dynamic
-@using Umbraco.Web.Templates
+@using Umbraco.Core.PropertyEditors.ValueConverters
 
 @if (Model.value != null)
 {
     var url = Model.value.image;
     if(Model.editor.config != null && Model.editor.config.size != null){
-        url = ImageCropperTemplateExtensions.GetCropUrl(url,
-            width: Model.editor.config.size.width,
-            height: Model.editor.config.size.height,
-            cropDataSet: Model.value.focalPoint == null ? null : new Umbraco.Core.PropertyEditors.ValueConverters.ImageCropperValue
-            {
-                FocalPoint = new Umbraco.Core.PropertyEditors.ValueConverters.ImageCropperValue.ImageCropperFocalPoint
+        if (Model.value.coordinates != null)
+        {
+            url = ImageCropperTemplateExtensions.GetCropUrl(
+                (string)url,
+                width: (int)Model.editor.config.size.width,
+                height: (int)Model.editor.config.size.height,
+                cropAlias: "default",
+                cropDataSet: new ImageCropperValue
                 {
-                    Top = Model.value.focalPoint.top,
-                    Left = Model.value.focalPoint.left
-                }
-            });
+                    Crops = new[]
+                    {
+                        new ImageCropperValue.ImageCropperCrop
+                        {
+                            Alias = "default",
+                            Coordinates = new ImageCropperValue.ImageCropperCropCoordinates
+                            {
+                                X1 = (decimal)Model.value.coordinates.x1,
+                                Y1 = (decimal)Model.value.coordinates.y1,
+                                X2 = (decimal)Model.value.coordinates.x2,
+                                Y2 = (decimal)Model.value.coordinates.y2
+                            }
+                        }
+                    }
+                });
+        }
+        else
+        {
+            url = ImageCropperTemplateExtensions.GetCropUrl(
+                (string)url,
+                width: (int)Model.editor.config.size.width,
+                height: (int)Model.editor.config.size.height,
+                cropDataSet: new ImageCropperValue
+                {
+                    FocalPoint = new ImageCropperValue.ImageCropperFocalPoint
+                    {
+                        Top = Model.value.focalPoint == null ? 0.5m : Model.value.focalPoint.top,
+                        Left = Model.value.focalPoint == null ? 0.5m : Model.value.focalPoint.left
+                    }
+                });
+        }
     }
 
     var altText = Model.value.altText ?? Model.value.caption ?? string.Empty;
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
index 34bb744596..8364958448 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
@@ -2,8 +2,12 @@
 @using Umbraco.Web.Composing
 @using Umbraco.Web.Templates
 @{
-    var value = TemplateUtilities.ParseInternalLinks(Model.value.ToString(), Current.UmbracoContext.UrlProvider);
-    value = TemplateUtilities.ResolveUrlsFromTextString(value);
-    value = TemplateUtilities.ResolveMediaFromTextString(value);
+    var htmlLocalLinkParser = Current.Factory.GetInstance<HtmlLocalLinkParser>();
+    var htmlUrlParser = Current.Factory.GetInstance<HtmlUrlParser>();
+    var htmlImageSourceParser = Current.Factory.GetInstance<HtmlImageSourceParser>();
+
+    var value = htmlLocalLinkParser.EnsureInternalLinks(Model.value.ToString());
+    value = htmlUrlParser.EnsureUrls(value);
+    value = htmlImageSourceParser.EnsureImageSources(value);
 }
 @Html.Raw(value)
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 1001d10ec6..0f40a1ebe4 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
@@ -5,7 +5,7 @@
 @if (Model.editor.config.markup != null)
 {
     string markup = Model.editor.config.markup.ToString();
-    markup = markup.Replace("#value#", Html.ReplaceLineBreaksForHtml(HttpUtility.HtmlEncode((string)Model.value.ToString())).ToString());
+    markup = markup.Replace("#value#", Html.ReplaceLineBreaks((string)Model.value.ToString()).ToString());
 
     if (Model.editor.config.style != null)
     {
diff --git a/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json b/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
index 3709e703d9..75797f78e7 100644
--- a/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
+++ b/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
@@ -200,7 +200,7 @@
                 "event": "click"
             },
             {
-                "element": "[data-element='editor-data-type-picker'] [data-element='datatypeconfig-Textarea'] > a",
+                "element": "[data-element='editor-data-type-picker'] [data-element='datatypeconfig-Textarea']",
                 "title": "Editor settings",
                 "content": "Each property editor can have individual settings. For the textarea editor you can set a character limit but in this case it is not needed.",
                 "event": "click"
@@ -312,7 +312,7 @@
                 "event": "click",
                 "eventElement": "#tree [data-element='tree-item-templates'] [data-element='tree-item-expand']",
                 "view": "templatetree",
-                "skipStepIfVisible": "#tree [data-element='tree-item-templates'] > div > button[data-element=tree-item-expand].icon-navigation-down"
+                "skipStepIfVisible": "#tree [data-element='tree-item-templates'] > div > button[data-element=tree-item-expand] span.icon-navigation-down"
             },
             {
                 "element": "#tree [data-element='tree-item-templates'] [data-element='tree-item-Home Page']",
diff --git a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx b/src/Umbraco.Web.UI/config/splashes/noNodes.aspx
index 46a27a4eba..52abd04af0 100644
--- a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx
+++ b/src/Umbraco.Web.UI/config/splashes/noNodes.aspx
@@ -55,7 +55,5 @@
 
 </section>
 
-<script src="https://code.jquery.com/jquery-latest.min.js"></script>
-
 </body>
 </html>
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index fa998a9856..c20ef3038b 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -41,11 +41,11 @@
         <![CDATA[
             <div id="umbracoPreviewBadge" class="umbraco-preview-badge">
                 <span class="umbraco-preview-badge__header">Preview mode</span>
-                <a href="{0}/preview/?id={2}" class="umbraco-preview-badge__a open">
+                <a href="{0}/preview/?id={2}" class="umbraco-preview-badge__a open" title="Open preview in BackOffice">
                     …
                 </a>
-                <a href="{0}/preview/end?redir={1}" class="umbraco-preview-badge__a end">
-                    <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><title>Click to end</title><path fill="#fff" d="M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z"/><path fill="#fff" d="M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z"/><path fill="#fff" d="M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z"/><path fill="#fff" d="M42.7 2.5h14.6v49.4H42.7z"/></svg>
+                <a href="{0}/preview/end?redir={1}" class="umbraco-preview-badge__a end" title="End preview mode">
+                    <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><title>Click to end preview mode</title><path fill="#fff" d="M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z"/><path fill="#fff" d="M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z"/><path fill="#fff" d="M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z"/><path fill="#fff" d="M42.7 2.5h14.6v49.4H42.7z"/></svg>
                 </a>
             </div>
             <style type="text/css">
@@ -64,7 +64,7 @@
                     pointer-events:none;
                     left: 50%;
                     transform: translate(-50%, 40px);
-                    animation: umbraco-preview-badge--effect 10s 100ms ease both;
+                    animation: umbraco-preview-badge--effect 10s 1.2s ease both;
                     border-radius: 3px 3px 0 0;
                 }}
                 @keyframes umbraco-preview-badge--effect {{
@@ -91,20 +91,20 @@
                     3.5%,
                     6.5%,
                     8.5% {{
-                        transform: translate(-50%, 0px);
+                        transform: translate(-50%, 0);
                         animation-timing-function: ease-out;
                     }}
                     9.7% {{
-                        transform: translate(-50%, 0px);
+                        transform: translate(-50%, 0);
                         animation-timing-function: ease-out;
                     }}
                     10.0% {{
-                        transform: translate(-50%, 0px);
+                        transform: translate(-50%, 0);
                     }}
 
 
                     60% {{
-                        transform: translate(-50%, 0px);
+                        transform: translate(-50%, 0);
                         animation-timing-function: ease-out;
                     }}
                     61.5% {{
@@ -126,18 +126,18 @@
                     63.5%,
                     66.5%,
                     68.5% {{
-                        transform: translate(-50%, 0px);
+                        transform: translate(-50%, 0);
                         animation-timing-function: ease-out;
                     }}
                     69.7% {{
-                        transform: translate(-50%, 0px);
+                        transform: translate(-50%, 0);
                         animation-timing-function: ease-out;
                     }}
                     70.0% {{
-                        transform: translate(-50%, 0px);
+                        transform: translate(-50%, 0);
                     }}
                     100.0% {{
-                        transform: translate(-50%, 0px);
+                        transform: translate(-50%, 0);
                     }}
                 }}
                 .umbraco-preview-badge__header {{
@@ -170,6 +170,7 @@
                     width:1em;
                 }}
             </style>
+            <script type="text/javascript" data-umbraco-path="{0}" src="{0}/js/umbraco.websitepreview.js"></script>
         ]]>
     </PreviewBadge>
 
@@ -187,6 +188,8 @@
     <!-- You can specify your own background image for the login screen here. This path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/login.jpg -->
     <loginBackgroundImage>assets/img/login.jpg</loginBackgroundImage>
 
+    <!-- You can specify your own logo for the login screen here. This path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/application/umbraco_logo_white.svg -->
+    <loginLogoImage>assets/img/application/umbraco_logo_white.svg</loginLogoImage>
   </content>
 
   <security>
@@ -231,6 +234,14 @@
         By default you can call any content Id in the url and show the content with that id, for example:
         http://mysite.com/1092 or http://mysite.com/1092.aspx would render the content with id 1092. Setting
         this setting to true stops that behavior
+      @disableRedirectUrlTracking
+        When the URL changes for content, redirects are automatically created for redirect handling within the
+        request pipeline. Setting this setting to true stops the automatic creation of redirects. Note that this
+        does not stop the request pipeline from handling any previously created redirects.
+      @urlProviderMode
+        By default Umbraco automatically figures out if internal URLs should be rendered as relative or absolute,
+        depending on the current request and the configured domains. By setting this setting to "Relative" or
+        "Absolute" you can force Umbraco to always render URLs as either relative or absolute.
       @umbracoApplicationUrl
         The url of the Umbraco application. By default, Umbraco will figure it out from the first request.
         Configure it here if you need anything specific. Needs to be a complete url with scheme and umbraco
@@ -242,4 +253,17 @@
     umbracoApplicationUrl="">
   </web.routing>
 
+  <!--
+  keepAlive
+    @disableKeepAliveTask
+      Disables the periodic KeepAliveTask when set to "true".
+      Use this setting to disable the KeepAliveTask in case you already have an alternative.
+      For example, Azure App Service has keep alive functionality built-in.
+      Defaults to "false".
+    @keepAlivePingUrl
+      The url of the KeepAlivePing action. By default, the url will use the umbracoApplicationUrl setting as the basis.
+      Change this setting to specify an alternative url to reach the KeepAlivePing action. eg http://localhost/umbraco/api/keepalive/ping
+      Defaults to "{umbracoApplicationUrl}/api/keepalive/ping".
+  -->
+  <keepAlive disableKeepAliveTask="false" keepAlivePingUrl="{umbracoApplicationUrl}/api/keepalive/ping" />
 </settings>
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
deleted file mode 100644
index c3df6cfb41..0000000000
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<settings>
-
-  <!--
-    umbracoSettings.config configuration documentation can be found here:
-    https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/
-    Many of the optional settings are not explicitly listed here
-    but can be found in the online documentation.
-    -->
-
-    <backOffice>
-        <tours enable="true"></tours>
-    </backOffice>
-
-  <content>
-
-    <errors>
-      <error404>1</error404>
-      <!--
-        The value for error pages can be:
-        * A content item's GUID ID      (example: 26C1D84F-C900-4D53-B167-E25CC489DAC8)
-        * An XPath statement            (example: //errorPages[@nodeName='My cool error']
-        * A content item's integer ID   (example: 1234)
-      -->
-      <!--
-        <error404>
-            <errorPage culture="default">26C1D84F-C900-4D53-B167-E25CC489DAC8</errorPage>
-            <errorPage culture="en-US">D820E120-6865-4D88-BFFE-48801A6AC375</errorPage>
-        </error404>
-       -->
-    </errors>
-
-    <notifications>
-      <!-- the email that should be used as from mail when umbraco sends a notification -->
-      <!-- you can add a display name to the email like this: <email>Your display name here &lt;your@email.here&gt;</email> -->
-      <email>your@email.here</email>
-    </notifications>
-
-    <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
-    <PreviewBadge>
-        <![CDATA[
-            <div id="umbracoPreviewBadge" class="umbraco-preview-badge">
-                <span class="umbraco-preview-badge__header">Preview mode</span>
-                <a href="{0}/preview/?id={2}" class="umbraco-preview-badge__a open">
-                    …
-                </a>
-                <a href="{0}/preview/end?redir={1}" class="umbraco-preview-badge__a end">
-                    <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><title>Click to end</title><path fill="#fff" d="M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z"/><path fill="#fff" d="M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z"/><path fill="#fff" d="M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z"/><path fill="#fff" d="M42.7 2.5h14.6v49.4H42.7z"/></svg>
-                </a>
-            </div>
-            <style type="text/css">
-                .umbraco-preview-badge {{
-                    position: fixed;
-                    bottom: 0;
-                    display: inline-flex;
-                    background: rgba(27, 38, 79, 0.9);
-                    color: #fff;
-                    font-size: 12px;
-                    z-index: 99999999;
-                    justify-content: center;
-                    align-items: center;
-                    box-shadow: 0 5px 10px rgba(0, 0, 0, .2), 0 1px 2px rgba(0, 0, 0, .2);
-                    line-height: 1;
-                    pointer-events:none;
-                    left: 50%;
-                    transform: translate(-50%, 40px);
-                    animation: umbraco-preview-badge--effect 10s 100ms ease both;
-                    border-radius: 3px 3px 0 0;
-                }}
-                @keyframes umbraco-preview-badge--effect {{
-                    0% {{
-                        transform: translate(-50%, 40px);
-                        animation-timing-function: ease-out;
-                    }}
-                    1.5% {{
-                        transform: translate(-50%, -20px);
-                        animation-timing-function: ease-in;
-                    }}
-                    5.0% {{
-                        transform: translate(-50%, -8px);
-                        animation-timing-function: ease-in;
-                    }}
-                    7.5% {{
-                        transform: translate(-50%, -4px);
-                        animation-timing-function: ease-in;
-                    }}
-                    9.2% {{
-                        transform: translate(-50%, -2px);
-                        animation-timing-function: ease-in;
-                    }}
-                    3.5%,
-                    6.5%,
-                    8.5% {{
-                        transform: translate(-50%, 0px);
-                        animation-timing-function: ease-out;
-                    }}
-                    9.7% {{
-                        transform: translate(-50%, 0px);
-                        animation-timing-function: ease-out;
-                    }}
-                    10.0% {{
-                        transform: translate(-50%, 0px);
-                    }}
-
-
-                    60% {{
-                        transform: translate(-50%, 0px);
-                        animation-timing-function: ease-out;
-                    }}
-                    61.5% {{
-                        transform: translate(-50%, -20px);
-                        animation-timing-function: ease-in;
-                    }}
-                    65.0% {{
-                        transform: translate(-50%, -8px);
-                        animation-timing-function: ease-in;
-                    }}
-                    67.5% {{
-                        transform: translate(-50%, -4px);
-                        animation-timing-function: ease-in;
-                    }}
-                    69.2% {{
-                        transform: translate(-50%, -2px);
-                        animation-timing-function: ease-in;
-                    }}
-                    63.5%,
-                    66.5%,
-                    68.5% {{
-                        transform: translate(-50%, 0px);
-                        animation-timing-function: ease-out;
-                    }}
-                    69.7% {{
-                        transform: translate(-50%, 0px);
-                        animation-timing-function: ease-out;
-                    }}
-                    70.0% {{
-                        transform: translate(-50%, 0px);
-                    }}
-                    100.0% {{
-                        transform: translate(-50%, 0px);
-                    }}
-                }}
-                .umbraco-preview-badge__header {{
-                    padding: 1em;
-                    font-weight: bold;
-                    pointer-events:none;
-                }}
-                .umbraco-preview-badge__a {{
-                    width: 3em;
-                    padding: 1em;
-                    display: flex;
-                    flex-shrink: 0;
-                    align-items: center;
-                    align-self: stretch;
-                    color:white;
-                    text-decoration:none;
-                    font-weight: bold;
-                    border-left: 1px solid hsla(0,0%,100%,.25);
-                    pointer-events:all;
-                }}
-                .umbraco-preview-badge__a svg {{
-                    width: 1em;
-                    height:1em;
-                }}
-                .umbraco-preview-badge__a:hover {{
-                    background: #202d5e;
-                }}
-                .umbraco-preview-badge__end svg {{
-                    fill: #fff;
-                    width:1em;
-                }}
-            </style>
-        ]]>
-    </PreviewBadge>
-
-    <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
-         - inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
-         - silent - Silently suppress the error and do not render the offending macro.
-         - throw  - Throw an exception which can be caught by the global error handler defined in Application_OnError. If no such
-                    error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
-         Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
-    <MacroErrors>throw</MacroErrors>
-
-    <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
-    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,php,htaccess</disallowedUploadFiles>
-
-    <!-- You can specify your own background image for the login screen here. This path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/login.jpg -->
-    <loginBackgroundImage>assets/img/login.jpg</loginBackgroundImage>
-
-  </content>
-
-  <security>
-    <!-- set to true to auto update login interval (and there by disabling the lock screen -->
-    <keepUserLoggedIn>false</keepUserLoggedIn>
-    <!-- by default this is true and if not specified in config will be true. set to false to always show a separate username field in the back office user editor -->
-    <usernameIsEmail>true</usernameIsEmail>
-    <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->
-    <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
-  </security>
-
-  <requestHandler>
-    <!-- this ensures that all url segments are turned to ASCII as much as we can -->
-    <urlReplacing toAscii="try" />
-  </requestHandler>
-
-  <!--
-    web.routing
-      @trySkipIisCustomErrors
-        Tries to skip IIS custom errors.
-        Starting with IIS 7.5, this must be set to true for Umbraco 404 pages to show. Else, IIS will take
-        over and render its built-in error page. See MS doc for HttpResponseBase.TrySkipIisCustomErrors.
-        The default value is false, for backward compatibility reasons, which means that IIS _will_ take
-        over, and _prevent_ Umbraco 404 pages to show.
-      @internalRedirectPreservesTemplate
-        By default as soon as we're not displaying the initial document, we reset the template set by the
-        finder or by the alt. template. Set this option to true to preserve the template set by the finder
-        or by the alt. template, in case of an internal redirect.
-        (false by default, and in fact should remain false unless you know what you're doing)
-      @disableAlternativeTemplates
-        By default you can add a altTemplate querystring or append a template name to the current URL which
-        will make Umbraco render the content on the current page with the template you requested, for example:
-        http://mysite.com/about-us/?altTemplate=Home and http://mysite.com/about-us/Home would render the
-        "About Us" page with a template with the alias Home. Setting this setting to true stops that behavior
-      @validateAlternativeTemplates
-        By default you can add a altTemplate querystring or append a template name to the current URL which
-        will make Umbraco render the content on the current page with the template you requested, for example:
-        http://mysite.com/about-us/?altTemplate=Home and http://mysite.com/about-us/Home would render the
-        "About Us" page with a template with the alias Home. Setting this setting to true will ensure that
-        only templates that have been permitted on the document type will be allowed
-      @disableFindContentByIdPath
-        By default you can call any content Id in the url and show the content with that id, for example:
-        http://mysite.com/1092 or http://mysite.com/1092.aspx would render the content with id 1092. Setting
-        this setting to true stops that behavior
-      @disableRedirectUrlTracking
-        When the URL changes for content, redirects are automatically created for redirect handling within the
-        request pipeline. Setting this setting to true stops the automatic creation of redirects. Note that this
-        does not stop the request pipeline from handling any previously created redirects.
-      @urlProviderMode
-        By default Umbraco automatically figures out if internal URLs should be rendered as relative or absolute,
-        depending on the current request and the configured domains. By setting this setting to "Relative" or
-        "Absolute" you can force Umbraco to always render URLs as either relative or absolute.
-      @umbracoApplicationUrl
-        The url of the Umbraco application. By default, Umbraco will figure it out from the first request.
-        Configure it here if you need anything specific. Needs to be a complete url with scheme and umbraco
-        path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com".
-  -->
-  <web.routing
-    trySkipIisCustomErrors="true"
-    internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" validateAlternativeTemplates="false" disableFindContentByIdPath="false"
-    umbracoApplicationUrl="">
-  </web.routing>
-
-  <!--
-  keepAlive
-    @disableKeepAliveTask
-      Disables the periodic KeepAliveTask when set to "true".
-      Use this setting to disable the KeepAliveTask in case you already have an alternative.
-      For example, Azure App Service has keep alive functionality built-in.
-      Defaults to "false".
-    @keepAlivePingUrl
-      The url of the KeepAlivePing action. By default, the url will use the umbracoApplicationUrl setting as the basis.
-      Change this setting to specify an alternative url to reach the KeepAlivePing action. eg http://localhost/api/keepalive/ping
-      Defaults to "{umbracoApplicationUrl}/api/keepalive/ping".
-  -->
-  <keepAlive disableKeepAliveTask="false" keepAlivePingUrl="{umbracoApplicationUrl}/api/keepalive/ping" />
-</settings>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index b85c892e70..03f462fb9e 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-
     <!--
-    Define the web.config template, which is used when creating the initial web.config,
-    and then transforms from web.Template.[Debug|Release].config are applied. Documentation
-    for web.config at https://our.umbraco.com/documentation/using-umbraco/config-files/#webconfig
-  -->
+        Define the Web.config template, which is used when creating the initial Web.config,
+        and then transforms from web.Template.[Debug|Release].config are applied.
+        Documentation for Web.config at: https://our.umbraco.com/documentation/Reference/Config/webconfig/
+    -->
 
     <configSections>
         <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
@@ -31,7 +30,7 @@
 
     <appSettings>
         <add key="Umbraco.Core.ConfigurationStatus" value="" />
-	    <add key="Umbraco.Core.ReservedUrls" value="" />
+        <add key="Umbraco.Core.ReservedUrls" value="" />
         <add key="Umbraco.Core.ReservedPaths" value="" />
         <add key="Umbraco.Core.Path" value="~/umbraco" />
         <add key="Umbraco.Core.HideTopLevelNodeFromPath" value="true" />
@@ -52,9 +51,8 @@
     </appSettings>
 
     <!--
-    Important: If you're upgrading Umbraco, do not clear the connection
-    string / provider name during your web.config merge.
-  -->
+        Important: if you're upgrading Umbraco, do not clear the connectionString/providerName during your Web.config merge.
+    -->
     <connectionStrings>
         <remove name="umbracoDbDSN" />
         <add name="umbracoDbDSN" connectionString="" providerName="" />
@@ -70,11 +68,12 @@
     <system.net>
         <mailSettings>
             <!--
-            If you need Umbraco to send out system mails (like reset password and invite user),
-            you must configure your SMTP host here - for example:
-
-            <smtp from="noreply@example.com">
-                <network host="127.0.0.1" userName="username" password="password" />
+                If you need Umbraco to send out system mails (like reset password and invite user),
+                you must configure your SMTP settings here - for example:
+            -->
+            <!--
+            <smtp from="noreply@example.com" deliveryMethod="Network">
+                <network host="localhost" port="25" enableSsl="false" userName="" password="" />
             </smtp>
             -->
         </mailSettings>
@@ -145,7 +144,7 @@
             <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,Umbraco.Web" />
             <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
             <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-            <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
+            <!-- FormsAuthentication is needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
             <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />
             <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
         </modules>
@@ -175,9 +174,9 @@
             <remove fileExtension=".svg" />
             <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
             <remove fileExtension=".woff" />
-            <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
+            <mimeMap fileExtension=".woff" mimeType="font/woff" />
             <remove fileExtension=".woff2" />
-            <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" />
+            <mimeMap fileExtension=".woff2" mimeType="font/woff2" />
             <remove fileExtension=".less" />
             <mimeMap fileExtension=".less" mimeType="text/css" />
             <remove fileExtension=".mp4" />
@@ -201,14 +200,13 @@
         </security>
 
         <!--
-      If you wish to use IIS rewrite rules, see the documentation here:
-		  https://our.umbraco.com/documentation/Reference/Routing/IISRewriteRules
-    -->
+            If you wish to use IIS rewrite rules, see the documentation here: https://our.umbraco.com/documentation/Reference/Routing/IISRewriteRules
+        -->
         <!--
-    <rewrite>
-      <rules></rules>
-    </rewrite>
-    -->
+        <rewrite>
+            <rules></rules>
+        </rewrite>
+        -->
     </system.webServer>
 
     <runtime>
@@ -250,8 +248,8 @@
                 <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35"/>
-                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
+                <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
             </dependentAssembly>
         </assemblyBinding>
     </runtime>
@@ -275,14 +273,8 @@
 
     <system.codedom>
         <compilers>
-            <compiler language="c#;cs;csharp" extension=".cs"
-              type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
-              warningLevel="4"
-              compilerOptions="/langversion:7 /nowarn:1659;1699;1701" />
-            <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb"
-              type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
-              warningLevel="4"
-              compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
+            <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:7 /nowarn:1659;1699;1701" />
+            <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
         </compilers>
     </system.codedom>
 
diff --git a/src/Umbraco.Web/BlockListTemplateExtensions.cs b/src/Umbraco.Web/BlockListTemplateExtensions.cs
new file mode 100644
index 0000000000..6e105a24d6
--- /dev/null
+++ b/src/Umbraco.Web/BlockListTemplateExtensions.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Web.Mvc;
+using System.Web.Mvc.Html;
+using Umbraco.Core.Models.Blocks;
+using Umbraco.Core.Models.PublishedContent;
+using System.Web;
+
+namespace Umbraco.Web
+{
+    public static class BlockListTemplateExtensions
+    {
+        public const string DefaultFolder = "BlockList/";
+        public const string DefaultTemplate = "Default";
+
+        public static IHtmlString GetBlockListHtml(this HtmlHelper html, BlockListModel model, string template = DefaultTemplate)
+        {
+            if (model?.Count == 0) return new MvcHtmlString(string.Empty);
+
+            var view = DefaultFolder + template;
+            return html.Partial(view, model);
+        }
+
+        public static IHtmlString GetBlockListHtml(this HtmlHelper html, IPublishedProperty property, string template = DefaultTemplate) => GetBlockListHtml(html, property?.GetValue() as BlockListModel, template);
+
+        public static IHtmlString GetBlockListHtml(this HtmlHelper html, IPublishedContent contentItem, string propertyAlias) => GetBlockListHtml(html, contentItem, propertyAlias, DefaultTemplate);
+
+        public static IHtmlString GetBlockListHtml(this HtmlHelper html, IPublishedContent contentItem, string propertyAlias, string template)
+        {
+            if (propertyAlias == null) throw new ArgumentNullException(nameof(propertyAlias));
+            if (string.IsNullOrWhiteSpace(propertyAlias)) throw new ArgumentException("Value can't be empty or consist only of white-space characters.", nameof(propertyAlias));
+
+            var prop = contentItem.GetProperty(propertyAlias);
+            if (prop == null) throw new InvalidOperationException("No property type found with alias " + propertyAlias);
+
+            return GetBlockListHtml(html, prop?.GetValue() as BlockListModel, template);
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Cache/DistributedCacheBinder.cs b/src/Umbraco.Web/Cache/DistributedCacheBinder.cs
index 92ed7de881..5f8d77f3b2 100644
--- a/src/Umbraco.Web/Cache/DistributedCacheBinder.cs
+++ b/src/Umbraco.Web/Cache/DistributedCacheBinder.cs
@@ -39,7 +39,6 @@ namespace Umbraco.Web.Cache
 
         private static readonly Lazy<MethodInfo[]> CandidateHandlers = new Lazy<MethodInfo[]>(() =>
         {
-            var underscore = new[] { '_' };
 
             return typeof(DistributedCacheBinder)
                 .GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
@@ -47,7 +46,7 @@ namespace Umbraco.Web.Cache
                 {
                     if (x.Name.Contains("_") == false) return null;
 
-                    var parts = x.Name.Split(underscore, StringSplitOptions.RemoveEmptyEntries).Length;
+                    var parts = x.Name.Split(Constants.CharArrays.Underscore, StringSplitOptions.RemoveEmptyEntries).Length;
                     if (parts != 2) return null;
 
                     var parameters = x.GetParameters();
diff --git a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
index b00a4818f6..f360d37d03 100644
--- a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
+++ b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
@@ -128,15 +128,16 @@ namespace Umbraco.Web.Cache
 
         public static void RefreshMemberCache(this DistributedCache dc, params IMember[] members)
         {
-            dc.Refresh(MemberCacheRefresher.UniqueId, x => x.Id, members);
+            if (members.Length == 0) return;
+            dc.RefreshByPayload(MemberCacheRefresher.UniqueId, members.Select(x => new MemberCacheRefresher.JsonPayload(x.Id, x.Username)));
         }
 
         public static void RemoveMemberCache(this DistributedCache dc, params IMember[] members)
         {
-            dc.Remove(MemberCacheRefresher.UniqueId, x => x.Id, members);
+            if (members.Length == 0) return;
+            dc.RefreshByPayload(MemberCacheRefresher.UniqueId, members.Select(x => new MemberCacheRefresher.JsonPayload(x.Id, x.Username)));
         }
 
-
         #endregion
 
         #region MemberGroupCache
diff --git a/src/Umbraco.Web/Cache/MemberCacheRefresher.cs b/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
index 1565b1c849..736a858af3 100644
--- a/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
@@ -1,4 +1,6 @@
-using System;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
@@ -7,14 +9,30 @@ using Umbraco.Core.Services;
 
 namespace Umbraco.Web.Cache
 {
-    public sealed class MemberCacheRefresher : TypedCacheRefresherBase<MemberCacheRefresher, IMember>
+    public sealed class MemberCacheRefresher : PayloadCacheRefresherBase<MemberCacheRefresher, MemberCacheRefresher.JsonPayload>
     {
         private readonly IdkMap _idkMap;
+        private readonly LegacyMemberCacheRefresher _legacyMemberRefresher;
 
         public MemberCacheRefresher(AppCaches appCaches, IdkMap idkMap)
             : base(appCaches)
         {
             _idkMap = idkMap;
+            _legacyMemberRefresher = new LegacyMemberCacheRefresher(this, appCaches);
+        }
+
+        public class JsonPayload 
+        {
+            [JsonConstructor]
+            public JsonPayload(int id, string username)
+            {
+                Id = id;
+                Username = username;
+            }
+
+            public int Id { get; }
+            public string Username { get; }
+
         }
 
         #region Define
@@ -31,38 +49,45 @@ namespace Umbraco.Web.Cache
 
         #region Refresher
 
+        public override void Refresh(JsonPayload[] payloads)
+        {
+            ClearCache(payloads);
+            base.Refresh(payloads);
+        }
+
         public override void Refresh(int id)
         {
-            ClearCache(id);
+            ClearCache(new JsonPayload(id, null));
             base.Refresh(id);
         }
 
         public override void Remove(int id)
         {
-            ClearCache(id);
+            ClearCache(new JsonPayload(id, null));
             base.Remove(id);
         }
 
-        public override void Refresh(IMember instance)
-        {
-            ClearCache(instance.Id);
-            base.Refresh(instance);
-        }
+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
+        public void Refresh(IMember instance) => _legacyMemberRefresher.Refresh(instance);
 
-        public override void Remove(IMember instance)
-        {
-            ClearCache(instance.Id);
-            base.Remove(instance);
-        }
+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
+        public void Remove(IMember instance) => _legacyMemberRefresher.Remove(instance);
 
-        private void ClearCache(int id)
+        private void ClearCache(params JsonPayload[] payloads)
         {
-            _idkMap.ClearCache(id);
             AppCaches.ClearPartialViewCache();
-
             var memberCache = AppCaches.IsolatedCaches.Get<IMember>();
-            if (memberCache)
-                memberCache.Result.Clear(RepositoryCacheKeys.GetKey<IMember>(id));
+
+            foreach (var p in payloads)
+            {
+                _idkMap.ClearCache(p.Id);
+                if (memberCache)
+                {
+                    memberCache.Result.Clear(RepositoryCacheKeys.GetKey<IMember>(p.Id));
+                    memberCache.Result.Clear(RepositoryCacheKeys.GetKey<IMember>(p.Username));
+                }   
+            }
+            
         }
 
         #endregion
@@ -75,5 +100,38 @@ namespace Umbraco.Web.Cache
         }
 
         #endregion
+
+        #region Backwards Compat
+
+        // TODO: this is here purely for backwards compat but should be removed in netcore
+        private class LegacyMemberCacheRefresher : TypedCacheRefresherBase<MemberCacheRefresher, IMember>
+        {
+            private readonly MemberCacheRefresher _parent;
+
+            public LegacyMemberCacheRefresher(MemberCacheRefresher parent, AppCaches appCaches) : base(appCaches)
+            {
+                _parent = parent;
+            }
+
+            public override Guid RefresherUniqueId => _parent.RefresherUniqueId;
+
+            public override string Name => _parent.Name;
+
+            protected override MemberCacheRefresher This => _parent;
+
+            public override void Refresh(IMember instance)
+            {
+                _parent.ClearCache(new JsonPayload(instance.Id, instance.Username));
+                base.Refresh(instance.Id);
+            }
+
+            public override void Remove(IMember instance)
+            {
+                _parent.ClearCache(new JsonPayload(instance.Id, instance.Username));
+                base.Remove(instance);
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/src/Umbraco.Web/Compose/BackOfficeUserAuditEventsComponent.cs b/src/Umbraco.Web/Compose/BackOfficeUserAuditEventsComponent.cs
index 4244d575af..d0341ec3b6 100644
--- a/src/Umbraco.Web/Compose/BackOfficeUserAuditEventsComponent.cs
+++ b/src/Umbraco.Web/Compose/BackOfficeUserAuditEventsComponent.cs
@@ -35,7 +35,19 @@ namespace Umbraco.Web.Compose
         }
 
         public void Terminate()
-        { }
+        {
+            //BackOfficeUserManager.AccountLocked -= ;
+            //BackOfficeUserManager.AccountUnlocked -= ;
+            BackOfficeUserManager.ForgotPasswordRequested -= OnForgotPasswordRequest;
+            BackOfficeUserManager.ForgotPasswordChangedSuccess -= OnForgotPasswordChange;
+            BackOfficeUserManager.LoginFailed -= OnLoginFailed;
+            //BackOfficeUserManager.LoginRequiresVerification -= ;
+            BackOfficeUserManager.LoginSuccess -= OnLoginSuccess;
+            BackOfficeUserManager.LogoutSuccess -= OnLogoutSuccess;
+            BackOfficeUserManager.PasswordChanged -= OnPasswordChanged;
+            BackOfficeUserManager.PasswordReset -= OnPasswordReset;
+            //BackOfficeUserManager.ResetAccessFailedCount -= ;
+        }
 
         private IUser GetPerformingUser(int userId)
         {
diff --git a/src/Umbraco.Web/Compose/BlockEditorComponent.cs b/src/Umbraco.Web/Compose/BlockEditorComponent.cs
new file mode 100644
index 0000000000..a8b4cfb8ca
--- /dev/null
+++ b/src/Umbraco.Web/Compose/BlockEditorComponent.cs
@@ -0,0 +1,202 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Models.Blocks;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.Compose
+{
+    /// <summary>
+    /// A component for Block editors used to bind to events
+    /// </summary>
+    public class BlockEditorComponent : IComponent
+    {
+        private ComplexPropertyEditorContentEventHandler _handler;
+        private readonly BlockListEditorDataConverter _converter = new BlockListEditorDataConverter();
+
+        public void Initialize()
+        {
+            _handler = new ComplexPropertyEditorContentEventHandler(
+                Constants.PropertyEditors.Aliases.BlockList,
+                ReplaceBlockListUdis);
+        }
+
+        public void Terminate() => _handler?.Dispose();
+
+        private string ReplaceBlockListUdis(string rawJson, bool onlyMissingUdis)
+        {
+            // the block editor doesn't ever have missing UDIs so when this is true there's nothing to process
+            if (onlyMissingUdis) return rawJson;
+
+            return ReplaceBlockListUdis(rawJson, null);
+        }
+
+        // internal for tests
+        internal string ReplaceBlockListUdis(string rawJson, Func<Guid> createGuid = null)
+        {
+            // used so we can test nicely
+            if (createGuid == null)
+                createGuid = () => Guid.NewGuid();
+
+            if (string.IsNullOrWhiteSpace(rawJson) || !rawJson.DetectIsJson())
+                return rawJson;
+
+            // Parse JSON
+            // This will throw a FormatException if there are null UDIs (expected)
+            var blockListValue = _converter.Deserialize(rawJson);
+
+            UpdateBlockListRecursively(blockListValue, createGuid);
+
+            return JsonConvert.SerializeObject(blockListValue.BlockValue);
+        }
+
+        private void UpdateBlockListRecursively(BlockEditorData blockListData, Func<Guid> createGuid)
+        {
+            var oldToNew = new Dictionary<Udi, Udi>();
+            MapOldToNewUdis(oldToNew, blockListData.BlockValue.ContentData, createGuid);
+            MapOldToNewUdis(oldToNew, blockListData.BlockValue.SettingsData, createGuid);
+
+            for (var i = 0; i < blockListData.References.Count; i++)
+            {
+                var reference = blockListData.References[i];
+                var hasContentMap = oldToNew.TryGetValue(reference.ContentUdi, out var contentMap);
+                Udi settingsMap = null;
+                var hasSettingsMap = reference.SettingsUdi != null && oldToNew.TryGetValue(reference.SettingsUdi, out settingsMap);
+
+                if (hasContentMap)
+                {
+                    // replace the reference
+                    blockListData.References.RemoveAt(i);
+                    blockListData.References.Insert(i, new ContentAndSettingsReference(contentMap, hasSettingsMap ? settingsMap : null));
+                }
+            }
+
+            // build the layout with the new UDIs
+            var layout = (JArray)blockListData.Layout;
+            layout.Clear();
+            foreach (var reference in blockListData.References)
+            {
+                layout.Add(JObject.FromObject(new BlockListLayoutItem
+                {
+                    ContentUdi = reference.ContentUdi,
+                    SettingsUdi = reference.SettingsUdi
+                }));
+            }
+
+
+            RecursePropertyValues(blockListData.BlockValue.ContentData, createGuid);
+            RecursePropertyValues(blockListData.BlockValue.SettingsData, createGuid);
+        }
+
+        private void RecursePropertyValues(IEnumerable<BlockItemData> blockData, Func<Guid> createGuid)
+        {
+            foreach (var data in blockData)
+            {
+                // check if we need to recurse (make a copy of the dictionary since it will be modified)
+                foreach (var propertyAliasToBlockItemData in new Dictionary<string, object>(data.RawPropertyValues))
+                {
+                    if (propertyAliasToBlockItemData.Value is JToken jtoken)
+                    {
+                        if (ProcessJToken(jtoken, createGuid, out var result))
+                        {
+                            // need to re-save this back to the RawPropertyValues
+                            data.RawPropertyValues[propertyAliasToBlockItemData.Key] = result;
+                        }
+                    }
+                    else
+                    {
+                        var asString = propertyAliasToBlockItemData.Value?.ToString();
+
+                        if (asString != null && asString.DetectIsJson())
+                        {
+                            // this gets a little ugly because there could be some other complex editor that contains another block editor
+                            // and since we would have no idea how to parse that, all we can do is try JSON Path to find another block editor
+                            // of our type
+                            var json = JToken.Parse(asString);
+                            if (ProcessJToken(json, createGuid, out var result))
+                            {
+                                // need to re-save this back to the RawPropertyValues
+                                data.RawPropertyValues[propertyAliasToBlockItemData.Key] = result;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private bool ProcessJToken(JToken json, Func<Guid> createGuid, out JToken result)
+        {
+            var updated = false;
+            result = json;
+
+            // select all tokens (flatten)
+            var allProperties = json.SelectTokens("$..*").Select(x => x.Parent as JProperty).WhereNotNull().ToList();
+            foreach (var prop in allProperties)
+            {
+                if (prop.Name == Constants.PropertyEditors.Aliases.BlockList)
+                {
+                    // get it's parent 'layout' and it's parent's container
+                    var layout = prop.Parent?.Parent as JProperty;
+                    if (layout != null && layout.Parent is JObject layoutJson)
+                    {
+                        // recurse
+                        var blockListValue = _converter.ConvertFrom(layoutJson);
+                        UpdateBlockListRecursively(blockListValue, createGuid);
+
+                        // set new value
+                        if (layoutJson.Parent != null)
+                        {
+                            // we can replace the object
+                            layoutJson.Replace(JObject.FromObject(blockListValue.BlockValue));
+                            updated = true;
+                        }
+                        else
+                        {
+                            // if there is no parent it means that this json property was the root, in which case we just return
+                            result = JObject.FromObject(blockListValue.BlockValue);
+                            return true;
+                        }
+                    }
+                }
+                else if (prop.Name != "layout" && prop.Name != "contentData" && prop.Name != "settingsData" && prop.Name != "contentTypeKey")
+                {
+                    // this is an arbitrary property that could contain a nested complex editor
+                    var propVal = prop.Value?.ToString();
+                    // check if this might contain a nested Block Editor
+                    if (!propVal.IsNullOrWhiteSpace() && propVal.DetectIsJson() && propVal.InvariantContains(Constants.PropertyEditors.Aliases.BlockList))
+                    {
+                        if (_converter.TryDeserialize(propVal, out var nestedBlockData))
+                        {
+                            // recurse
+                            UpdateBlockListRecursively(nestedBlockData, createGuid);
+                            // set the value to the updated one
+                            prop.Value = JObject.FromObject(nestedBlockData.BlockValue);
+                            updated = true;
+                        }
+                    }
+                }
+            }
+
+            return updated;
+        }
+
+        private void MapOldToNewUdis(Dictionary<Udi, Udi> oldToNew, IEnumerable<BlockItemData> blockData, Func<Guid> createGuid)
+        {
+            foreach (var data in blockData)
+            {
+                // This should never happen since a FormatException will be thrown if one is empty but we'll keep this here
+                if (data.Udi == null)
+                    throw new InvalidOperationException("Block data cannot contain a null UDI");
+
+                // replace the UDIs
+                var newUdi = GuidUdi.Create(Constants.UdiEntityType.Element, createGuid());
+                oldToNew[data.Udi] = newUdi;
+                data.Udi = newUdi;
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Compose/BlockEditorComposer.cs b/src/Umbraco.Web/Compose/BlockEditorComposer.cs
new file mode 100644
index 0000000000..e281bcb19f
--- /dev/null
+++ b/src/Umbraco.Web/Compose/BlockEditorComposer.cs
@@ -0,0 +1,12 @@
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Web.Compose
+{
+    /// <summary>
+    /// A composer for Block editors to run a component
+    /// </summary>
+    [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
+    public class BlockEditorComposer : ComponentComposer<BlockEditorComponent>, ICoreComposer
+    { }
+}
diff --git a/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
index 6dfad8c45b..2fa9d80779 100644
--- a/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
+++ b/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
@@ -218,7 +218,7 @@ namespace Umbraco.Web.Compose
                 }
                 catch (Exception e)
                 {
-                    _logger.Error<InstructionProcessTask>("Failed (will repeat).", e);
+                    _logger.Error<InstructionProcessTask>(e, "Failed (will repeat).");
                 }
                 return true; // repeat
             }
diff --git a/src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs b/src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
index 5794a2734e..633e814bd9 100644
--- a/src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
+++ b/src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
@@ -6,67 +6,32 @@ using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Web.PropertyEditors;
 
 namespace Umbraco.Web.Compose
 {
+
+    /// <summary>
+    /// A component for NestedContent used to bind to events
+    /// </summary>
     public class NestedContentPropertyComponent : IComponent
     {
+        private ComplexPropertyEditorContentEventHandler _handler;
+
         public void Initialize()
         {
-            ContentService.Copying += ContentService_Copying;
-            ContentService.Saving += ContentService_Saving;
+            _handler = new ComplexPropertyEditorContentEventHandler(
+                Constants.PropertyEditors.Aliases.NestedContent,
+                CreateNestedContentKeys);
         }
 
-        private void ContentService_Copying(IContentService sender, CopyEventArgs<IContent> e)
-        {
-            // When a content node contains nested content property
-            // Check if the copied node contains a nested content
-            var nestedContentProps = e.Copy.Properties.Where(x => x.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.NestedContent);
-            UpdateNestedContentProperties(nestedContentProps, false);
-        }
+        public void Terminate() => _handler?.Dispose();
 
-        private void ContentService_Saving(IContentService sender, ContentSavingEventArgs e)
-        {
-            // One or more content nodes could be saved in a bulk publish
-            foreach (var entity in e.SavedEntities)
-            {
-                // When a content node contains nested content property
-                // Check if the copied node contains a nested content
-                var nestedContentProps = entity.Properties.Where(x => x.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.NestedContent);
-                UpdateNestedContentProperties(nestedContentProps, true);
-            }
-        }
+        private string CreateNestedContentKeys(string rawJson, bool onlyMissingKeys) => CreateNestedContentKeys(rawJson, onlyMissingKeys, null);
 
-        public void Terminate()
-        {
-            ContentService.Copying -= ContentService_Copying;
-            ContentService.Saving -= ContentService_Saving;
-        }
-
-        private void UpdateNestedContentProperties(IEnumerable<Property> nestedContentProps, bool onlyMissingKeys)
-        {
-            // Each NC Property on a doctype
-            foreach (var nestedContentProp in nestedContentProps)
-            {
-                // A NC Prop may have one or more values due to cultures
-                var propVals = nestedContentProp.Values;
-                foreach (var cultureVal in propVals)
-                {
-                    // Remove keys from published value & any nested NC's
-                    var updatedPublishedVal = CreateNestedContentKeys(cultureVal.PublishedValue?.ToString(), onlyMissingKeys);
-                    cultureVal.PublishedValue = updatedPublishedVal;
-
-                    // Remove keys from edited/draft value & any nested NC's
-                    var updatedEditedVal = CreateNestedContentKeys(cultureVal.EditedValue?.ToString(), onlyMissingKeys);
-                    cultureVal.EditedValue = updatedEditedVal;
-                }
-            }
-        }
-
-        
         // internal for tests
         internal string CreateNestedContentKeys(string rawJson, bool onlyMissingKeys, Func<Guid> createGuid = null)
         {
@@ -77,7 +42,7 @@ namespace Umbraco.Web.Compose
             if (string.IsNullOrWhiteSpace(rawJson) || !rawJson.DetectIsJson())
                 return rawJson;
 
-            // Parse JSON            
+            // Parse JSON
             var complexEditorValue = JToken.Parse(rawJson);
 
             UpdateNestedContentKeysRecursively(complexEditorValue, onlyMissingKeys, createGuid);
@@ -98,7 +63,6 @@ namespace Umbraco.Web.Compose
                 {
                     // get it's sibling 'key' property
                     var ncKeyVal = prop.Parent["key"] as JValue;
-                    // TODO: This bool seems odd, if the key is null, shouldn't we fill it in regardless of onlyMissingKeys?
                     if ((onlyMissingKeys && ncKeyVal == null) || (!onlyMissingKeys && ncKeyVal != null))
                     {
                         // create or replace
diff --git a/src/Umbraco.Web/Compose/NestedContentPropertyComposer.cs b/src/Umbraco.Web/Compose/NestedContentPropertyComposer.cs
index 4c9d9dee1c..8e4cfbfffc 100644
--- a/src/Umbraco.Web/Compose/NestedContentPropertyComposer.cs
+++ b/src/Umbraco.Web/Compose/NestedContentPropertyComposer.cs
@@ -3,6 +3,9 @@ using Umbraco.Core.Composing;
 
 namespace Umbraco.Web.Compose
 {
+    /// <summary>
+    /// A composer for nested content to run a component
+    /// </summary>
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
     public class NestedContentPropertyComposer : ComponentComposer<NestedContentPropertyComponent>, ICoreComposer
     { }
diff --git a/src/Umbraco.Web/Compose/NotificationsComponent.cs b/src/Umbraco.Web/Compose/NotificationsComponent.cs
index 6fcc1269cb..ea5df65f74 100644
--- a/src/Umbraco.Web/Compose/NotificationsComponent.cs
+++ b/src/Umbraco.Web/Compose/NotificationsComponent.cs
@@ -32,42 +32,78 @@ namespace Umbraco.Web.Compose
         public void Initialize()
         {
             //Send notifications for the send to publish action
-            ContentService.SentToPublish += (sender, args) => _notifier.Notify(_actions.GetAction<ActionToPublish>(), args.Entity);
-
+            ContentService.SentToPublish += ContentService_SentToPublish;
             //Send notifications for the published action
-            ContentService.Published += (sender, args) => _notifier.Notify(_actions.GetAction<ActionPublish>(), args.PublishedEntities.ToArray());
-
+            ContentService.Published += ContentService_Published;
             //Send notifications for the saved action
-            ContentService.Sorted += (sender, args) => ContentServiceSorted(_notifier, sender, args, _actions);
-
+            ContentService.Sorted += ContentService_Sorted;
             //Send notifications for the update and created actions
-            ContentService.Saved += (sender, args) => ContentServiceSaved(_notifier, sender, args, _actions);
-
+            ContentService.Saved += ContentService_Saved;
             //Send notifications for the unpublish action
-            ContentService.Unpublished += (sender, args) => _notifier.Notify(_actions.GetAction<ActionUnpublish>(), args.PublishedEntities.ToArray());
-
+            ContentService.Unpublished += ContentService_Unpublished;
             //Send notifications for the move/move to recycle bin and restore actions
-            ContentService.Moved += (sender, args) => ContentServiceMoved(_notifier, sender, args, _actions);
-
+            ContentService.Moved += ContentService_Moved;
             //Send notifications for the delete action when content is moved to the recycle bin
-            ContentService.Trashed += (sender, args) => _notifier.Notify(_actions.GetAction<ActionDelete>(), args.MoveInfoCollection.Select(m => m.Entity).ToArray());
-            
+            ContentService.Trashed += ContentService_Trashed;
             //Send notifications for the copy action
-            ContentService.Copied += (sender, args) => _notifier.Notify(_actions.GetAction<ActionCopy>(), args.Original);
-			
+            ContentService.Copied += ContentService_Copied;
             //Send notifications for the rollback action
-            ContentService.RolledBack += (sender, args) => _notifier.Notify(_actions.GetAction<ActionRollback>(), args.Entity);	
-			
+            ContentService.RolledBack += ContentService_RolledBack;
             //Send notifications for the public access changed action
-            PublicAccessService.Saved += (sender, args) => PublicAccessServiceSaved(_notifier, sender, args, _contentService, _actions);
-			
-            UserService.UserGroupPermissionsAssigned += (sender, args) => UserServiceUserGroupPermissionsAssigned(_notifier, sender, args, _contentService, _actions);
+            PublicAccessService.Saved += PublicAccessService_Saved;
+
+            UserService.UserGroupPermissionsAssigned += UserService_UserGroupPermissionsAssigned;
         }
 
         public void Terminate()
-        { }
+        {
+            ContentService.SentToPublish -= ContentService_SentToPublish;
+            ContentService.Published -= ContentService_Published;
+            ContentService.Sorted -= ContentService_Sorted;
+            ContentService.Saved -= ContentService_Saved;
+            ContentService.Unpublished -= ContentService_Unpublished;
+            ContentService.Moved -= ContentService_Moved;
+            ContentService.Trashed -= ContentService_Trashed;
+            ContentService.Copied -= ContentService_Copied;
+            ContentService.RolledBack -= ContentService_RolledBack;
+            PublicAccessService.Saved -= PublicAccessService_Saved;
+            UserService.UserGroupPermissionsAssigned -= UserService_UserGroupPermissionsAssigned;
+        }
 
-        private void ContentServiceSorted(Notifier notifier, IContentService sender, Core.Events.SaveEventArgs<IContent> args, ActionCollection actions)
+        private void UserService_UserGroupPermissionsAssigned(IUserService sender, Core.Events.SaveEventArgs<EntityPermission> args)
+            => UserServiceUserGroupPermissionsAssigned(args, _contentService);
+
+        private void PublicAccessService_Saved(IPublicAccessService sender, Core.Events.SaveEventArgs<PublicAccessEntry> args)
+            => PublicAccessServiceSaved(args, _contentService);
+
+        private void ContentService_RolledBack(IContentService sender, Core.Events.RollbackEventArgs<IContent> args)
+            => _notifier.Notify(_actions.GetAction<ActionRollback>(), args.Entity);
+
+        private void ContentService_Copied(IContentService sender, Core.Events.CopyEventArgs<IContent> args)
+            => _notifier.Notify(_actions.GetAction<ActionCopy>(), args.Original);
+
+        private void ContentService_Trashed(IContentService sender, Core.Events.MoveEventArgs<IContent> args)
+            => _notifier.Notify(_actions.GetAction<ActionDelete>(), args.MoveInfoCollection.Select(m => m.Entity).ToArray());
+
+        private void ContentService_Moved(IContentService sender, Core.Events.MoveEventArgs<IContent> args)
+            => ContentServiceMoved(args);
+
+        private void ContentService_Unpublished(IContentService sender, Core.Events.PublishEventArgs<IContent> args)
+            => _notifier.Notify(_actions.GetAction<ActionUnpublish>(), args.PublishedEntities.ToArray());
+
+        private void ContentService_Saved(IContentService sender, Core.Events.ContentSavedEventArgs args)
+            => ContentServiceSaved(args);
+
+        private void ContentService_Sorted(IContentService sender, Core.Events.SaveEventArgs<IContent> args)
+            => ContentServiceSorted(sender, args);
+
+        private void ContentService_Published(IContentService sender, Core.Events.ContentPublishedEventArgs args)
+            => _notifier.Notify(_actions.GetAction<ActionPublish>(), args.PublishedEntities.ToArray());
+
+        private void ContentService_SentToPublish(IContentService sender, Core.Events.SendToPublishEventArgs<IContent> args)
+            => _notifier.Notify(_actions.GetAction<ActionToPublish>(), args.Entity);
+
+        private void ContentServiceSorted(IContentService sender, Core.Events.SaveEventArgs<IContent> args)
         {
             var parentId = args.SavedEntities.Select(x => x.ParentId).Distinct().ToList();
             if (parentId.Count != 1) return; // this shouldn't happen, for sorting all entities will have the same parent id
@@ -79,10 +115,10 @@ namespace Umbraco.Web.Compose
             var parent = sender.GetById(parentId[0]);
             if (parent == null) return; // this shouldn't happen
 
-            notifier.Notify(actions.GetAction<ActionSort>(), new[] { parent });
+            _notifier.Notify(_actions.GetAction<ActionSort>(), new[] { parent });
         }
 
-        private void ContentServiceSaved(Notifier notifier, IContentService sender, Core.Events.SaveEventArgs<IContent> args, ActionCollection actions)
+        private void ContentServiceSaved(Core.Events.SaveEventArgs<IContent> args)
         {
             var newEntities = new List<IContent>();
             var updatedEntities = new List<IContent>();
@@ -102,21 +138,21 @@ namespace Umbraco.Web.Compose
                     updatedEntities.Add(entity);
                 }
             }
-            notifier.Notify(actions.GetAction<ActionNew>(), newEntities.ToArray());
-            notifier.Notify(actions.GetAction<ActionUpdate>(), updatedEntities.ToArray());
+            _notifier.Notify(_actions.GetAction<ActionNew>(), newEntities.ToArray());
+            _notifier.Notify(_actions.GetAction<ActionUpdate>(), updatedEntities.ToArray());
         }
 
-        private void UserServiceUserGroupPermissionsAssigned(Notifier notifier, IUserService sender, Core.Events.SaveEventArgs<EntityPermission> args, IContentService contentService, ActionCollection actions)
+        private void UserServiceUserGroupPermissionsAssigned(Core.Events.SaveEventArgs<EntityPermission> args, IContentService contentService)
         {
             var entities = contentService.GetByIds(args.SavedEntities.Select(e => e.EntityId)).ToArray();
-            if(entities.Any() == false)
+            if (entities.Any() == false)
             {
                 return;
             }
-            notifier.Notify(actions.GetAction<ActionRights>(), entities);
+            _notifier.Notify(_actions.GetAction<ActionRights>(), entities);
         }
-                
-        private void ContentServiceMoved(Notifier notifier, IContentService sender, Core.Events.MoveEventArgs<IContent> args, ActionCollection actions)
+
+        private void ContentServiceMoved(Core.Events.MoveEventArgs<IContent> args)
         {
             // notify about the move for all moved items
             _notifier.Notify(_actions.GetAction<ActionMove>(), args.MoveInfoCollection.Select(m => m.Entity).ToArray());
@@ -126,22 +162,22 @@ namespace Umbraco.Web.Compose
                 .Where(m => m.OriginalPath.Contains(Constants.System.RecycleBinContentString))
                 .Select(m => m.Entity)
                 .ToArray();
-            if(restoredEntities.Any())
+            if (restoredEntities.Any())
             {
                 _notifier.Notify(_actions.GetAction<ActionRestore>(), restoredEntities);
             }
         }
 
-        private void PublicAccessServiceSaved(Notifier notifier, IPublicAccessService sender, Core.Events.SaveEventArgs<PublicAccessEntry> args, IContentService contentService, ActionCollection actions)
+        private void PublicAccessServiceSaved(Core.Events.SaveEventArgs<PublicAccessEntry> args, IContentService contentService)
         {
             var entities = contentService.GetByIds(args.SavedEntities.Select(e => e.ProtectedNodeId)).ToArray();
-            if(entities.Any() == false)
+            if (entities.Any() == false)
             {
                 return;
             }
-            notifier.Notify(actions.GetAction<ActionProtect>(), entities);
+            _notifier.Notify(_actions.GetAction<ActionProtect>(), entities);
         }
-		
+
         /// <summary>
         /// This class is used to send the notifications
         /// </summary>
@@ -206,7 +242,7 @@ namespace Umbraco.Web.Compose
                 if (sender == null) throw new ArgumentNullException(nameof(sender));
                 if (siteUri == null)
                 {
-                    _logger.Warn(typeof(Notifier), "Notifications can not be sent, no site url is set (might be during boot process?)");
+                    _logger.Warn(typeof(Notifier), "Notifications can not be sent, no site URL is set (might be during boot process?)");
                     return;
                 }
 
diff --git a/src/Umbraco.Web/Compose/PublicAccessComponent.cs b/src/Umbraco.Web/Compose/PublicAccessComponent.cs
index ef7532253b..dcf57ee984 100644
--- a/src/Umbraco.Web/Compose/PublicAccessComponent.cs
+++ b/src/Umbraco.Web/Compose/PublicAccessComponent.cs
@@ -14,7 +14,9 @@ namespace Umbraco.Web.Compose
         }
 
         public void Terminate()
-        { }
+        {
+            MemberGroupService.Saved -= MemberGroupService_Saved;
+        }
 
         static void MemberGroupService_Saved(IMemberGroupService sender, Core.Events.SaveEventArgs<Core.Models.IMemberGroup> e)
         {
diff --git a/src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs b/src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs
index 233db9bcb3..fba05a3d6a 100644
--- a/src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs
+++ b/src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs
@@ -14,6 +14,7 @@ namespace Umbraco.Web.Composing.CompositionExtensions
             composition.Register<NewInstallStep>(Lifetime.Scope);
             composition.Register<UpgradeStep>(Lifetime.Scope);
             composition.Register<FilePermissionsStep>(Lifetime.Scope);
+            composition.Register<TelemetryIdentifierStep>(Lifetime.Scope);
             composition.Register<ConfigureMachineKey>(Lifetime.Scope);
             composition.Register<DatabaseConfigureStep>(Lifetime.Scope);
             composition.Register<DatabaseInstallStep>(Lifetime.Scope);
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index 2419eaa6d4..14898d0c02 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -146,6 +146,9 @@ namespace Umbraco.Web.Composing
         public static ISectionService SectionService
             => Factory.GetInstance<ISectionService>();
 
+        public static IIconService IconService
+            => Factory.GetInstance<IIconService>();
+
         #endregion
 
         #region Web Constants
diff --git a/src/Umbraco.Web/Composing/ModuleInjector.cs b/src/Umbraco.Web/Composing/ModuleInjector.cs
index 57ef766dea..c0522a9f90 100644
--- a/src/Umbraco.Web/Composing/ModuleInjector.cs
+++ b/src/Umbraco.Web/Composing/ModuleInjector.cs
@@ -30,12 +30,21 @@ namespace Umbraco.Web.Composing
 
                 try
                 {
-                    runtimeState = Current.Factory.GetInstance<IRuntimeState>();
+                    runtimeState = Current.RuntimeState;
                 }
                 catch { /* don't make it worse */ }
 
                 if (runtimeState?.BootFailedException != null)
-                    BootFailedException.Rethrow(runtimeState.BootFailedException);
+                {
+                    // if we throw the exception here the HttpApplication.Application_Error method will never be hit
+                    // and our custom error page will not be shown, so we need to wait for the request to begin
+                    // before we throw the exception.
+                    context.BeginRequest += (sender, args) =>
+                    {
+                        BootFailedException.Rethrow(runtimeState.BootFailedException);
+                    };
+                    return;
+                }
 
                 // else... throw what we have
                 throw;
diff --git a/src/Umbraco.Web/CompositionExtensions.cs b/src/Umbraco.Web/CompositionExtensions.cs
index 27a56afc1e..18af4b6b8d 100644
--- a/src/Umbraco.Web/CompositionExtensions.cs
+++ b/src/Umbraco.Web/CompositionExtensions.cs
@@ -84,14 +84,14 @@ namespace Umbraco.Web
             => composition.WithCollectionBuilder<TourFilterCollectionBuilder>();
 
         /// <summary>
-        /// Gets the url providers collection builder.
+        /// Gets the URL providers collection builder.
         /// </summary>
         /// <param name="composition">The composition.</param>
         public static UrlProviderCollectionBuilder UrlProviders(this Composition composition)
             => composition.WithCollectionBuilder<UrlProviderCollectionBuilder>();
 
         /// <summary>
-        /// Gets the media url providers collection builder.
+        /// Gets the media URL providers collection builder.
         /// </summary>
         /// <param name="composition">The composition.</param>
         public static MediaUrlProviderCollectionBuilder MediaUrlProviders(this Composition composition)
diff --git a/src/Umbraco.Web/Controllers/UmbLoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs
index 88bc17abff..63968d99ca 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs
@@ -42,8 +42,8 @@ namespace Umbraco.Web.Controllers
             //if there is a specified path to redirect to then use it
             if (model.RedirectUrl.IsNullOrWhiteSpace() == false)
             {
-                // validate the redirect url
-                // if it's not a local url we'll redirect to the root of the current site
+                // validate the redirect URL
+                // if it's not a local URL we'll redirect to the root of the current site
                 return Redirect(Url.IsLocalUrl(model.RedirectUrl)
                     ? model.RedirectUrl
                     : CurrentPage.AncestorOrSelf(1).Url());
diff --git a/src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs b/src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs
index 36a417e957..1c05da8906 100644
--- a/src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs
+++ b/src/Umbraco.Web/Dashboards/DashboardCollectionBuilder.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
@@ -9,8 +10,22 @@ namespace Umbraco.Web.Dashboards
 {
     public class DashboardCollectionBuilder : WeightedCollectionBuilderBase<DashboardCollectionBuilder, DashboardCollection, IDashboard>
     {
+        private Dictionary<Type, int> _customWeights = new Dictionary<Type, int>();
+
         protected override DashboardCollectionBuilder This => this;
 
+        /// <summary>
+        /// Changes the default weight of a dashboard
+        /// </summary>
+        /// <typeparam name="T">The type of dashboard</typeparam>
+        /// <param name="weight">The new dashboard weight</param>
+        /// <returns></returns>
+        public DashboardCollectionBuilder SetWeight<T>(int weight) where T : IDashboard
+        {
+            _customWeights[typeof(T)] = weight;
+            return this;
+        }
+
         protected override IEnumerable<IDashboard> CreateItems(IFactory factory)
         {
             // get the manifest parser just-in-time - injecting it in the ctor would mean that
@@ -32,6 +47,12 @@ namespace Umbraco.Web.Dashboards
 
         private int GetWeight(IDashboard dashboard)
         {
+            var typeOfDashboard = dashboard.GetType();
+            if(_customWeights.ContainsKey(typeOfDashboard))
+            {
+                return _customWeights[typeOfDashboard];
+            }
+
             switch (dashboard)
             {
                 case ManifestDashboard manifestDashboardDefinition:
diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs
index c2c481e8e4..e2ab829427 100644
--- a/src/Umbraco.Web/Editors/AuthenticationController.cs
+++ b/src/Umbraco.Web/Editors/AuthenticationController.cs
@@ -26,6 +26,8 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Web.Composing;
 using IUser = Umbraco.Core.Models.Membership.IUser;
+using Umbraco.Web.Editors.Filters;
+using Microsoft.Owin.Security;
 
 namespace Umbraco.Web.Editors
 {
@@ -42,7 +44,7 @@ namespace Umbraco.Web.Editors
         private BackOfficeSignInManager _signInManager;
 
         public AuthenticationController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, Current.Mapper)
         {
         }
 
@@ -65,6 +67,7 @@ namespace Umbraco.Web.Editors
             return provider.GetConfiguration(Services.UserService);
         }
 
+
         /// <summary>
         /// Checks if a valid token is specified for an invited user and if so logs the user in and returns the user object
         /// </summary>
@@ -75,6 +78,7 @@ namespace Umbraco.Web.Editors
         /// This will also update the security stamp for the user so it can only be used once
         /// </remarks>
         [ValidateAngularAntiForgeryToken]
+        [DenyLocalLoginAuthorization]
         public async Task<UserDisplay> PostVerifyInvite([FromUri]int id, [FromUri]string token)
         {
             if (string.IsNullOrWhiteSpace(token))
@@ -110,6 +114,23 @@ namespace Umbraco.Web.Editors
         [ValidateAngularAntiForgeryToken]
         public async Task<HttpResponseMessage> PostUnLinkLogin(UnLinkLoginModel unlinkLoginModel)
         {
+            var owinContext = TryGetOwinContext().Result;
+            ExternalSignInAutoLinkOptions autoLinkOptions = null;
+            var authType = owinContext.Authentication.GetExternalAuthenticationTypes().FirstOrDefault(x => x.AuthenticationType == unlinkLoginModel.LoginProvider);
+            if (authType == null)
+            {
+                Logger.Warn<BackOfficeController>("Could not find external authentication provider registered: {LoginProvider}", unlinkLoginModel.LoginProvider);
+            }
+            else
+            {
+                autoLinkOptions = authType.GetExternalSignInAutoLinkOptions();
+                if (!autoLinkOptions.AllowManualLinking)
+                {
+                    // If AllowManualLinking is disabled for this provider we cannot unlink
+                    return Request.CreateResponse(HttpStatusCode.BadRequest);
+                }
+            }
+
             var result = await UserManager.RemoveLoginAsync(
                 User.Identity.GetUserId<int>(),
                 new UserLoginInfo(unlinkLoginModel.LoginProvider, unlinkLoginModel.ProviderKey));
@@ -205,7 +226,12 @@ namespace Umbraco.Web.Editors
         public async Task<Dictionary<string, string>> GetCurrentUserLinkedLogins()
         {
             var identityUser = await UserManager.FindByIdAsync(UmbracoContext.Security.GetUserId().ResultOr(0));
-            return identityUser.Logins.ToDictionary(x => x.LoginProvider, x => x.ProviderKey);
+            var result = new Dictionary<string, string>();
+            foreach (var l in identityUser.Logins)
+            {
+                result[l.LoginProvider] = l.ProviderKey;
+            }
+            return result;
         }
 
         /// <summary>
@@ -213,6 +239,7 @@ namespace Umbraco.Web.Editors
         /// </summary>
         /// <returns></returns>
         [SetAngularAntiForgeryTokens]
+        [DenyLocalLoginAuthorization]
         public async Task<HttpResponseMessage> PostLogin(LoginModel loginModel)
         {
             var http = EnsureHttpContext();
@@ -286,6 +313,7 @@ namespace Umbraco.Web.Editors
         /// </summary>
         /// <returns></returns>
         [SetAngularAntiForgeryTokens]
+        [DenyLocalLoginAuthorization]
         public async Task<HttpResponseMessage> PostRequestPasswordReset(RequestPasswordResetModel model)
         {
             // If this feature is switched off in configuration the UI will be amended to not make the request to reset password available.
@@ -476,7 +504,12 @@ namespace Umbraco.Web.Editors
             if (UserManager != null)
             {
                 int.TryParse(User.Identity.GetUserId(), out var userId);
-                UserManager.RaiseLogoutSuccessEvent(userId);
+                var args = UserManager.RaiseLogoutSuccessEvent(userId);
+                if (!args.SignOutRedirectUrl.IsNullOrWhiteSpace())
+                    return Request.CreateResponse(new
+                    {
+                        signOutRedirectUrl = args.SignOutRedirectUrl
+                    });
             }
 
             return Request.CreateResponse(HttpStatusCode.OK);
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index e77a1b70f2..458c76b3ae 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Web;
 using System.Web.Mvc;
 using System.Web.UI;
 using Microsoft.AspNet.Identity;
@@ -15,7 +13,6 @@ using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Models.Identity;
@@ -26,6 +23,7 @@ using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
 using Umbraco.Web.JavaScript;
 using Umbraco.Web.Security;
+using Umbraco.Web.Services;
 using Constants = Umbraco.Core.Constants;
 using JArray = Newtonsoft.Json.Linq.JArray;
 
@@ -42,15 +40,52 @@ namespace Umbraco.Web.Editors
         private readonly ManifestParser _manifestParser;
         private readonly UmbracoFeatures _features;
         private readonly IRuntimeState _runtimeState;
+        private readonly IIconService _iconService;
         private BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
         private BackOfficeSignInManager _signInManager;
 
-        public BackOfficeController(ManifestParser manifestParser, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
+        [Obsolete("Use the constructor that injects IIconService.")]
+        public BackOfficeController(
+            ManifestParser manifestParser,
+            UmbracoFeatures features,
+            IGlobalSettings globalSettings,
+            IUmbracoContextAccessor umbracoContextAccessor,
+            ServiceContext services,
+            AppCaches appCaches,
+            IProfilingLogger profilingLogger,
+            IRuntimeState runtimeState,
+            UmbracoHelper umbracoHelper)
+            : this(manifestParser,
+                features,
+                globalSettings,
+                umbracoContextAccessor,
+                services,
+                appCaches,
+                profilingLogger,
+                runtimeState,
+                umbracoHelper,
+                Current.IconService)
+        {
+
+        }
+
+        public BackOfficeController(
+            ManifestParser manifestParser,
+            UmbracoFeatures features,
+            IGlobalSettings globalSettings,
+            IUmbracoContextAccessor umbracoContextAccessor,
+            ServiceContext services,
+            AppCaches appCaches,
+            IProfilingLogger profilingLogger,
+            IRuntimeState runtimeState,
+            UmbracoHelper umbracoHelper,
+            IIconService iconService)
             : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, umbracoHelper)
         {
             _manifestParser = manifestParser;
             _features = features;
             _runtimeState = runtimeState;
+            _iconService = iconService;
         }
 
         protected BackOfficeSignInManager SignInManager => _signInManager ?? (_signInManager = OwinContext.GetBackOfficeSignInManager());
@@ -65,9 +100,10 @@ namespace Umbraco.Web.Editors
         /// <returns></returns>
         public async Task<ActionResult> Default()
         {
+            var backofficeModel = new BackOfficeModel(_features, GlobalSettings, _iconService);
             return await RenderDefaultOrProcessExternalLoginAsync(
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings)),
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings)));
+                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", backofficeModel),
+                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", backofficeModel));
         }
 
         [HttpGet]
@@ -76,7 +112,7 @@ namespace Umbraco.Web.Editors
             //if you are hitting VerifyInvite, you're already signed in as a different user, and the token is invalid
             //you'll exit on one of the return RedirectToAction("Default") but you're still logged in so you just get
             //dumped at the default admin view with no detail
-            if(Security.IsAuthenticated())
+            if (Security.IsAuthenticated())
             {
                 AuthenticationManager.SignOut(
                     Core.Constants.Security.BackOfficeAuthenticationType,
@@ -89,7 +125,7 @@ namespace Umbraco.Web.Editors
                 return RedirectToAction("Default");
             }
 
-            var parts = Server.UrlDecode(invite).Split('|');
+            var parts = Server.UrlDecode(invite).Split(Constants.CharArrays.VerticalTab);
 
             if (parts.Length != 2)
             {
@@ -150,7 +186,7 @@ namespace Umbraco.Web.Editors
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
                 //The default view to render when there is no external login info or errors
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings)),
+                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings, _iconService)),
                 //The ActionResult to perform if external login is successful
                 () => Redirect("/"));
         }
@@ -176,7 +212,7 @@ namespace Umbraco.Web.Editors
             {
                 var slashIndex = kv.Key.IndexOf('/');
                 var areaAlias = kv.Key.Substring(0, slashIndex);
-                var valueAlias = kv.Key.Substring(slashIndex+1);
+                var valueAlias = kv.Key.Substring(slashIndex + 1);
                 return new
                 {
                     areaAlias,
@@ -296,7 +332,7 @@ namespace Umbraco.Web.Editors
         }
 
         [HttpGet]
-        public async Task<ActionResult> ValidatePasswordResetCode([Bind(Prefix = "u")]int userId, [Bind(Prefix = "r")]string resetCode)
+        public async Task<ActionResult> ValidatePasswordResetCode([Bind(Prefix = "u")] int userId, [Bind(Prefix = "r")] string resetCode)
         {
             var user = UserManager.FindById(userId);
             if (user != null)
@@ -354,8 +390,9 @@ namespace Umbraco.Web.Editors
 
             ViewData.SetUmbracoPath(GlobalSettings.GetUmbracoMvcArea());
 
-            //check if there is the TempData with the any token name specified, if so, assign to view bag and render the view
-            if (ViewData.FromTempData(TempData, ViewDataExtensions.TokenExternalSignInError) ||
+            //check if there is the TempData or cookies with the any token name specified, if so, assign to view bag and render the view
+            if (ViewData.FromBase64CookieData<BackOfficeExternalLoginProviderErrors>(HttpContext, ViewDataExtensions.TokenExternalSignInError) ||
+                ViewData.FromTempData(TempData, ViewDataExtensions.TokenExternalSignInError) ||
                 ViewData.FromTempData(TempData, ViewDataExtensions.TokenPasswordResetCode))
                 return defaultResponse();
 
@@ -365,6 +402,17 @@ namespace Umbraco.Web.Editors
 
             if (loginInfo == null || loginInfo.ExternalIdentity.IsAuthenticated == false)
             {
+
+                // if the user is not logged in, check if there's any auto login redirects specified
+                if (UmbracoContext.Security.ValidateCurrentUser(false) != ValidateRequestAttempt.Success)
+                {
+                    var oauthRedirectAuthProvider = OwinContext.Authentication.GetAutoLoginProvider();
+                    if (!oauthRedirectAuthProvider.IsNullOrWhiteSpace())
+                    {
+                        return ExternalLogin(oauthRedirectAuthProvider);
+                    }
+                }
+
                 return defaultResponse();
             }
 
@@ -378,7 +426,7 @@ namespace Umbraco.Web.Editors
             if (response == null) throw new ArgumentNullException("response");
             ExternalSignInAutoLinkOptions autoLinkOptions = null;
 
-            //Here we can check if the provider associated with the request has been configured to allow
+            // Here we can check if the provider associated with the request has been configured to allow
             // new users (auto-linked external accounts). This would never be used with public providers such as
             // Google, unless you for some reason wanted anybody to be able to access the backend if they have a Google account
             // .... not likely!
@@ -389,19 +437,13 @@ namespace Umbraco.Web.Editors
             }
             else
             {
-                autoLinkOptions = authType.GetExternalAuthenticationOptions();
+                autoLinkOptions = authType.GetExternalSignInAutoLinkOptions();
             }
 
             // Sign in the user with this external login provider if the user already has a login
             var user = await UserManager.FindAsync(loginInfo.Login);
             if (user != null)
             {
-                // TODO: It might be worth keeping some of the claims associated with the ExternalLoginInfo, in which case we
-                // wouldn't necessarily sign the user in here with the standard login, instead we'd update the
-                // UseUmbracoBackOfficeExternalCookieAuthentication extension method to have the correct provider and claims factory,
-                // ticket format, etc.. to create our back office user including the claims assigned and in this method we'd just ensure
-                // that the ticket is created and stored and that the user is logged in.
-
                 var shouldSignIn = true;
                 if (autoLinkOptions != null && autoLinkOptions.OnExternalLogin != null)
                 {
@@ -422,7 +464,10 @@ namespace Umbraco.Web.Editors
             {
                 if (await AutoLinkAndSignInExternalAccount(loginInfo, autoLinkOptions) == false)
                 {
-                    ViewData.SetExternalSignInError(new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not been linked to an account" });
+                    ViewData.SetExternalSignInProviderErrors(
+                        new BackOfficeExternalLoginProviderErrors(
+                            loginInfo.Login.LoginProvider,
+                            new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not been linked to an account" }));
                 }
 
                 //Remove the cookie otherwise this message will keep appearing
@@ -446,15 +491,34 @@ namespace Umbraco.Web.Editors
             //we are allowing auto-linking/creating of local accounts
             if (loginInfo.Email.IsNullOrWhiteSpace())
             {
-                ViewData.SetExternalSignInError(new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not provided an email address, the account cannot be linked." });
+                ViewData.SetExternalSignInProviderErrors(
+                    new BackOfficeExternalLoginProviderErrors(
+                        loginInfo.Login.LoginProvider,
+                        new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not provided an email address, the account cannot be linked." }));
             }
             else
             {
                 //Now we need to perform the auto-link, so first we need to lookup/create a user with the email address
-                var foundByEmail = Services.UserService.GetByEmail(loginInfo.Email);
-                if (foundByEmail != null)
+                var autoLinkUser = UserManager.FindByEmail(loginInfo.Email);
+                if (autoLinkUser != null)
                 {
-                    ViewData.SetExternalSignInError(new[] { "A user with this email address already exists locally. You will need to login locally to Umbraco and link this external provider: " + loginInfo.Login.LoginProvider });
+                    try
+                    {
+                        //call the callback if one is assigned
+                        autoLinkOptions.OnAutoLinking?.Invoke(autoLinkUser, loginInfo);
+                    }
+                    catch (Exception ex)
+                    {
+                        var msg = "Could not link login provider " + loginInfo.Login.LoginProvider + ".";
+                        Logger.Error<BackOfficeController>(ex, msg);
+                        ViewData.SetExternalSignInProviderErrors(
+                            new BackOfficeExternalLoginProviderErrors(
+                                loginInfo.Login.LoginProvider,
+                                new[] { msg + " " + ex.Message }));
+                        return true;
+                    }
+
+                    await LinkUser(autoLinkUser, loginInfo);
                 }
                 else
                 {
@@ -463,7 +527,7 @@ namespace Umbraco.Web.Editors
 
                     var groups = Services.UserService.GetUserGroupsByAlias(autoLinkOptions.GetDefaultUserGroups(UmbracoContext, loginInfo));
 
-                    var autoLinkUser = BackOfficeIdentityUser.CreateNew(
+                    autoLinkUser = BackOfficeIdentityUser.CreateNew(
                         loginInfo.Email,
                         loginInfo.Email,
                         autoLinkOptions.GetDefaultCulture(UmbracoContext, loginInfo));
@@ -474,37 +538,33 @@ namespace Umbraco.Web.Editors
                     }
 
                     //call the callback if one is assigned
-                    if (autoLinkOptions.OnAutoLinking != null)
+                    try
                     {
-                        autoLinkOptions.OnAutoLinking(autoLinkUser, loginInfo);
+                        autoLinkOptions.OnAutoLinking?.Invoke(autoLinkUser, loginInfo);
+                    }
+                    catch (Exception ex)
+                    {
+                        var msg = "Could not link login provider " + loginInfo.Login.LoginProvider + ".";
+                        Logger.Error<BackOfficeController>(ex, msg);
+                        ViewData.SetExternalSignInProviderErrors(
+                            new BackOfficeExternalLoginProviderErrors(
+                                loginInfo.Login.LoginProvider,
+                                new[] { msg + " " + ex.Message }));
+                        return true;
                     }
 
                     var userCreationResult = await UserManager.CreateAsync(autoLinkUser);
 
                     if (userCreationResult.Succeeded == false)
                     {
-                        ViewData.SetExternalSignInError(userCreationResult.Errors);
+                        ViewData.SetExternalSignInProviderErrors(
+                            new BackOfficeExternalLoginProviderErrors(
+                                loginInfo.Login.LoginProvider,
+                                userCreationResult.Errors));
                     }
                     else
                     {
-                        var linkResult = await UserManager.AddLoginAsync(autoLinkUser.Id, loginInfo.Login);
-                        if (linkResult.Succeeded == false)
-                        {
-                            ViewData.SetExternalSignInError(linkResult.Errors);
-
-                            //If this fails, we should really delete the user since it will be in an inconsistent state!
-                            var deleteResult = await UserManager.DeleteAsync(autoLinkUser);
-                            if (deleteResult.Succeeded == false)
-                            {
-                                //DOH! ... this isn't good, combine all errors to be shown
-                                ViewData.SetExternalSignInError(linkResult.Errors.Concat(deleteResult.Errors));
-                            }
-                        }
-                        else
-                        {
-                            //sign in
-                            await SignInManager.SignInAsync(autoLinkUser, isPersistent: false, rememberBrowser: false);
-                        }
+                        await LinkUser(autoLinkUser, loginInfo);
                     }
                 }
 
@@ -512,6 +572,44 @@ namespace Umbraco.Web.Editors
             return true;
         }
 
+        private async Task LinkUser(BackOfficeIdentityUser autoLinkUser, ExternalLoginInfo loginInfo)
+        {
+            var existingLogins = await UserManager.GetLoginsAsync(autoLinkUser.Id);
+            var exists = existingLogins.FirstOrDefault(x => x.LoginProvider == loginInfo.Login.LoginProvider && x.ProviderKey == loginInfo.Login.ProviderKey);
+
+            // if it already exists (perhaps it was added in the AutoLink callbak) then we just continue
+            if (exists != null)
+            {
+                //sign in
+                await SignInManager.SignInAsync(autoLinkUser, isPersistent: false, rememberBrowser: false);
+                return;
+            }
+
+            var linkResult = await UserManager.AddLoginAsync(autoLinkUser.Id, loginInfo.Login);
+            if (linkResult.Succeeded)
+            {
+                //we're good! sign in
+                await SignInManager.SignInAsync(autoLinkUser, isPersistent: false, rememberBrowser: false);
+                return;
+            }
+
+            ViewData.SetExternalSignInProviderErrors(
+                   new BackOfficeExternalLoginProviderErrors(
+                       loginInfo.Login.LoginProvider,
+                       linkResult.Errors));
+
+            //If this fails, we should really delete the user since it will be in an inconsistent state!
+            var deleteResult = await UserManager.DeleteAsync(autoLinkUser);
+            if (!deleteResult.Succeeded)
+            {
+                //DOH! ... this isn't good, combine all errors to be shown
+                ViewData.SetExternalSignInProviderErrors(
+                    new BackOfficeExternalLoginProviderErrors(
+                        loginInfo.Login.LoginProvider,
+                        linkResult.Errors.Concat(deleteResult.Errors)));
+            }
+        }
+
         private ActionResult RedirectToLocal(string returnUrl)
         {
             if (Url.IsLocalUrl(returnUrl))
@@ -522,50 +620,8 @@ namespace Umbraco.Web.Editors
         }
 
         // Used for XSRF protection when adding external logins
-        private const string XsrfKey = "XsrfId";
+        public const string XsrfKey = "XsrfId";
 
-        private class ChallengeResult : HttpUnauthorizedResult
-        {
-            public ChallengeResult(string provider, string redirectUri, string userId = null)
-            {
-                LoginProvider = provider;
-                RedirectUri = redirectUri;
-                UserId = userId;
-            }
-
-            private string LoginProvider { get; set; }
-            private string RedirectUri { get; set; }
-            private string UserId { get; set; }
-
-            public override void ExecuteResult(ControllerContext context)
-            {
-                //Ensure the forms auth module doesn't do a redirect!
-                context.HttpContext.Response.SuppressFormsAuthenticationRedirect = true;
-
-                var owinCtx = context.HttpContext.GetOwinContext();
-
-                //First, see if a custom challenge result callback is specified for the provider
-                // and use it instead of the default if one is supplied.
-                var loginProvider = owinCtx.Authentication
-                    .GetExternalAuthenticationTypes()
-                    .FirstOrDefault(p => p.AuthenticationType == LoginProvider);
-                if (loginProvider != null)
-                {
-                    var providerChallengeResult = loginProvider.GetSignInChallengeResult(owinCtx);
-                    if (providerChallengeResult != null)
-                    {
-                        owinCtx.Authentication.Challenge(providerChallengeResult, LoginProvider);
-                        return;
-                    }
-                }
-
-                var properties = new AuthenticationProperties() { RedirectUri = RedirectUri.EnsureEndsWith('/') };
-                if (UserId != null)
-                {
-                    properties.Dictionary[XsrfKey] = UserId;
-                }
-                owinCtx.Authentication.Challenge(properties, LoginProvider);
-            }
-        }
     }
+
 }
diff --git a/src/Umbraco.Web/Editors/BackOfficeModel.cs b/src/Umbraco.Web/Editors/BackOfficeModel.cs
index 9833121301..cbdafd2e94 100644
--- a/src/Umbraco.Web/Editors/BackOfficeModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeModel.cs
@@ -1,4 +1,7 @@
-using Umbraco.Core.Configuration;
+using System;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
 
 namespace Umbraco.Web.Editors
@@ -6,13 +9,24 @@ namespace Umbraco.Web.Editors
 
     public class BackOfficeModel
     {
-        public BackOfficeModel(UmbracoFeatures features, IGlobalSettings globalSettings)
+
+
+        [Obsolete("Use the overload that injects IIconService.")]
+        public BackOfficeModel(UmbracoFeatures features, IGlobalSettings globalSettings) : this(features, globalSettings, Current.IconService)
+        {
+
+        }
+        public BackOfficeModel(UmbracoFeatures features, IGlobalSettings globalSettings, IIconService iconService)
         {
             Features = features;
             GlobalSettings = globalSettings;
+            IconCheckData = iconService.GetIcon("icon-check")?.SvgString;
+            IconDeleteData = iconService.GetIcon("icon-delete")?.SvgString;
         }
-        
+
         public UmbracoFeatures Features { get; }
         public IGlobalSettings GlobalSettings { get; }
+        public string IconCheckData { get; }
+        public string IconDeleteData { get; }
     }
 }
diff --git a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
index b66e432699..cc7356b687 100644
--- a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
@@ -1,6 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
 
 namespace Umbraco.Web.Editors
@@ -10,7 +13,21 @@ namespace Umbraco.Web.Editors
         private readonly UmbracoFeatures _features;
         public IEnumerable<ILanguage> Languages { get; }
 
-        public BackOfficePreviewModel(UmbracoFeatures features, IGlobalSettings globalSettings, IEnumerable<ILanguage> languages) : base(features, globalSettings)
+        [Obsolete("Use the overload that injects IIconService.")]
+        public BackOfficePreviewModel(
+            UmbracoFeatures features,
+            IGlobalSettings globalSettings,
+            IEnumerable<ILanguage> languages)
+            : this(features, globalSettings, languages, Current.IconService)
+        {
+        }
+
+        public BackOfficePreviewModel(
+            UmbracoFeatures features,
+            IGlobalSettings globalSettings,
+            IEnumerable<ILanguage> languages,
+            IIconService iconService)
+            : base(features, globalSettings, iconService)
         {
             _features = features;
             Languages = languages;
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 53865830d8..dd4dd67681 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -22,6 +22,7 @@ using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Profiling;
 using Umbraco.Web.PropertyEditors;
+using Umbraco.Web.Security;
 using Umbraco.Web.Trees;
 using Constants = Umbraco.Core.Constants;
 
@@ -58,8 +59,8 @@ namespace Umbraco.Web.Editors
             //this is the filter for the keys that we'll keep based on the full version of the server vars
             var keepOnlyKeys = new Dictionary<string, string[]>
             {
-                {"umbracoUrls", new[] {"authenticationApiBaseUrl", "serverVarsJs", "externalLoginsUrl", "currentUserApiBaseUrl"}},
-                {"umbracoSettings", new[] {"allowPasswordReset", "imageFileTypes", "maxFileSize", "loginBackgroundImage", "canSendRequiredEmail", "usernameIsEmail"}},
+                {"umbracoUrls", new[] {"authenticationApiBaseUrl", "serverVarsJs", "externalLoginsUrl", "currentUserApiBaseUrl", "iconApiBaseUrl"}},
+                {"umbracoSettings", new[] {"allowPasswordReset", "imageFileTypes", "maxFileSize", "loginBackgroundImage", "loginLogoImage", "canSendRequiredEmail", "usernameIsEmail"}},
                 {"application", new[] {"applicationPath", "cacheBuster"}},
                 {"isDebuggingEnabled", new string[] { }},
                 {"features", new [] {"disabledFeatures"}}
@@ -109,7 +110,7 @@ namespace Umbraco.Web.Editors
                     {
                         // TODO: Add 'umbracoApiControllerBaseUrl' which people can use in JS
                         // to prepend their URL. We could then also use this in our own resources instead of
-                        // having each url defined here explicitly - we can do that in v8! for now
+                        // having each URL defined here explicitly - we can do that in v8! for now
                         // for umbraco services we'll stick to explicitly defining the endpoints.
 
                         {"externalLoginsUrl", _urlHelper.Action("ExternalLogin", "BackOffice")},
@@ -281,7 +282,7 @@ namespace Umbraco.Web.Editors
                         {
                             "dictionaryApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<DictionaryController>(
                                 controller => controller.DeleteById(int.MaxValue))
-						},
+                        },
                         {
                             "nuCacheStatusBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<NuCacheStatusController>(
                                 controller => controller.GetStatus())
@@ -299,13 +300,17 @@ namespace Umbraco.Web.Editors
                                 controller => controller.GetAllLanguages())
                         },
                         {
-						    "relationTypeApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<RelationTypeController>(
+                            "relationTypeApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<RelationTypeController>(
                                 controller => controller.GetById(1))
                         },
-						{
+                        {
                             "logViewerApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<LogViewerController>(
                                 controller => controller.GetNumberOfErrors(null, null))
                         },
+                        {
+                            "iconApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<IconController>(
+                                controller => controller.GetIcon(""))
+                        },
                         {
                             "webProfilingBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<WebProfilingController>(
                                 controller => controller.GetStatus())
@@ -318,14 +323,18 @@ namespace Umbraco.Web.Editors
                             "imageUrlGeneratorApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<ImageUrlGeneratorController>(
                                 controller => controller.GetCropUrl(null, null, null, null, null))
                         },
+                        {
+                            "elementTypeApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<ElementTypeController>(
+                                controller => controller.GetAll())
+                        },
                     }
                 },
                 {
                     "umbracoSettings", new Dictionary<string, object>
                     {
                         {"umbracoPath", _globalSettings.Path},
-                        {"mediaPath", IOHelper.ResolveUrl(SystemDirectories.Media).TrimEnd('/')},
-                        {"appPluginsPath", IOHelper.ResolveUrl(SystemDirectories.AppPlugins).TrimEnd('/')},
+                        {"mediaPath", IOHelper.ResolveUrl(SystemDirectories.Media).TrimEnd(Constants.CharArrays.ForwardSlash)},
+                        {"appPluginsPath", IOHelper.ResolveUrl(SystemDirectories.AppPlugins).TrimEnd(Constants.CharArrays.ForwardSlash)},
                         {
                             "imageFileTypes",
                             string.Join(",", Current.Configs.Settings().Content.ImageFileTypes)
@@ -344,9 +353,10 @@ namespace Umbraco.Web.Editors
                         },
                         {"keepUserLoggedIn", Current.Configs.Settings().Security.KeepUserLoggedIn},
                         {"usernameIsEmail", Current.Configs.Settings().Security.UsernameIsEmail},
-                        {"cssPath", IOHelper.ResolveUrl(SystemDirectories.Css).TrimEnd('/')},
+                        {"cssPath", IOHelper.ResolveUrl(SystemDirectories.Css).TrimEnd(Constants.CharArrays.ForwardSlash)},
                         {"allowPasswordReset", Current.Configs.Settings().Security.AllowPasswordReset},
                         {"loginBackgroundImage",  Current.Configs.Settings().Content.LoginBackgroundImage},
+                        {"loginLogoImage", Current.Configs.Settings().Content.LoginLogoImage },
                         {"showUserInvite", EmailSender.CanSendRequiredEmail},
                         {"canSendRequiredEmail", EmailSender.CanSendRequiredEmail},
                         {"showAllowSegmentationForDocumentTypes", false},
@@ -371,8 +381,7 @@ namespace Umbraco.Web.Editors
                     "externalLogins", new Dictionary<string, object>
                     {
                         {
-                            "providers", _owinContext.Authentication.GetExternalAuthenticationTypes()
-                                .Where(p => p.Properties.ContainsKey("UmbracoBackOffice"))
+                            "providers", _owinContext.Authentication.GetBackOfficeExternalLoginProviders()
                                 .Select(p => new
                                 {
                                     authType = p.AuthenticationType, caption = p.Caption,
diff --git a/src/Umbraco.Web/Editors/Binders/BlueprintItemBinder.cs b/src/Umbraco.Web/Editors/Binders/BlueprintItemBinder.cs
index eb4d482b14..bd86d74f5d 100644
--- a/src/Umbraco.Web/Editors/Binders/BlueprintItemBinder.cs
+++ b/src/Umbraco.Web/Editors/Binders/BlueprintItemBinder.cs
@@ -11,8 +11,8 @@ namespace Umbraco.Web.Editors.Binders
         {
         }
 
-        public BlueprintItemBinder(ILogger logger, ServiceContext services, IUmbracoContextAccessor umbracoContextAccessor)
-            : base(logger, services, umbracoContextAccessor)
+        public BlueprintItemBinder(ServiceContext services)
+            : base(services)
         {
         }
 
diff --git a/src/Umbraco.Web/Editors/Binders/ContentItemBinder.cs b/src/Umbraco.Web/Editors/Binders/ContentItemBinder.cs
index a6cba6ce41..378865218c 100644
--- a/src/Umbraco.Web/Editors/Binders/ContentItemBinder.cs
+++ b/src/Umbraco.Web/Editors/Binders/ContentItemBinder.cs
@@ -17,16 +17,13 @@ namespace Umbraco.Web.Editors.Binders
     /// </summary>
     internal class ContentItemBinder : IModelBinder
     {
-        private readonly ContentModelBinderHelper _modelBinderHelper;
-
-        public ContentItemBinder() : this(Current.Logger, Current.Services, Current.UmbracoContextAccessor)
+        public ContentItemBinder() : this(Current.Services)
         {
         }
 
-        public ContentItemBinder(ILogger logger, ServiceContext services, IUmbracoContextAccessor umbracoContextAccessor)
+        public ContentItemBinder(ServiceContext services)
         {
             Services = services;
-            _modelBinderHelper = new ContentModelBinderHelper();
         }
 
         protected ServiceContext Services { get; }
@@ -39,10 +36,19 @@ namespace Umbraco.Web.Editors.Binders
         /// <returns></returns>
         public bool BindModel(HttpActionContext actionContext, ModelBindingContext bindingContext)
         {
-            var model = _modelBinderHelper.BindModelFromMultipartRequest<ContentItemSave>(actionContext, bindingContext);
+            var model = ContentModelBinderHelper.BindModelFromMultipartRequest<ContentItemSave>(actionContext, bindingContext);
             if (model == null) return false;
 
-            model.PersistedContent = ContentControllerBase.IsCreatingAction(model.Action) ? CreateNew(model) : GetExisting(model);
+            BindModel(model, ContentControllerBase.IsCreatingAction(model.Action) ? CreateNew(model) : GetExisting(model));
+
+            return true;
+        }
+
+        internal static void BindModel(ContentItemSave model, IContent persistedContent)
+        {
+            if (model is null) throw new ArgumentNullException(nameof(model));
+
+            model.PersistedContent = persistedContent;
 
             //create the dto from the persisted model
             if (model.PersistedContent != null)
@@ -60,11 +66,9 @@ namespace Umbraco.Web.Editors.Binders
                         });
 
                     //now map all of the saved values to the dto
-                    _modelBinderHelper.MapPropertyValuesFromSaved(variant, variant.PropertyCollectionDto);
+                    ContentModelBinderHelper.MapPropertyValuesFromSaved(variant, variant.PropertyCollectionDto);
                 }
             }
-
-            return true;
         }
 
         protected virtual IContent GetExisting(ContentItemSave model)
diff --git a/src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs b/src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
index b962de74ac..e0d39b5f65 100644
--- a/src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
+++ b/src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
@@ -15,9 +15,9 @@ namespace Umbraco.Web.Editors.Binders
     /// <summary>
     /// Helper methods to bind media/member models
     /// </summary>
-    internal class ContentModelBinderHelper
+    internal static class ContentModelBinderHelper
     {
-        public TModelSave BindModelFromMultipartRequest<TModelSave>(HttpActionContext actionContext, ModelBindingContext bindingContext)
+        public static TModelSave BindModelFromMultipartRequest<TModelSave>(HttpActionContext actionContext, ModelBindingContext bindingContext)
             where TModelSave : IHaveUploadedFiles
         {
             var result = actionContext.ReadAsMultipart(SystemDirectories.TempFileUploads);
@@ -29,7 +29,7 @@ namespace Umbraco.Web.Editors.Binders
             {
                 //The name that has been assigned in JS has 2 or more parts. The second part indicates the property id
                 // for which the file belongs, the remaining parts are just metadata that can be used by the property editor.
-                var parts = file.Headers.ContentDisposition.Name.Trim('\"').Split('_');
+                var parts = file.Headers.ContentDisposition.Name.Trim(Constants.CharArrays.DoubleQuote).Split(Constants.CharArrays.Underscore);
                 if (parts.Length < 2)
                 {
                     var response = actionContext.Request.CreateResponse(HttpStatusCode.BadRequest);
@@ -64,7 +64,7 @@ namespace Umbraco.Web.Editors.Binders
 
                 // TODO: anything after 4 parts we can put in metadata
 
-                var fileName = file.Headers.ContentDisposition.FileName.Trim('\"');
+                var fileName = file.Headers.ContentDisposition.FileName.Trim(Constants.CharArrays.DoubleQuote);
 
                 model.UploadedFiles.Add(new ContentPropertyFile
                 {
@@ -86,7 +86,7 @@ namespace Umbraco.Web.Editors.Binders
         /// </summary>
         /// <param name="saveModel"></param>
         /// <param name="dto"></param>
-        public void MapPropertyValuesFromSaved(IContentProperties<ContentPropertyBasic> saveModel, ContentPropertyCollectionDto dto)
+        public static void MapPropertyValuesFromSaved(IContentProperties<ContentPropertyBasic> saveModel, ContentPropertyCollectionDto dto)
         {
             //NOTE: Don't convert this to linq, this is much quicker
             foreach (var p in saveModel.Properties)
diff --git a/src/Umbraco.Web/Editors/Binders/MediaItemBinder.cs b/src/Umbraco.Web/Editors/Binders/MediaItemBinder.cs
index 1084aa16ea..bfd5c853d5 100644
--- a/src/Umbraco.Web/Editors/Binders/MediaItemBinder.cs
+++ b/src/Umbraco.Web/Editors/Binders/MediaItemBinder.cs
@@ -13,7 +13,6 @@ namespace Umbraco.Web.Editors.Binders
     /// </summary>
     internal class MediaItemBinder : IModelBinder
     {
-        private readonly ContentModelBinderHelper _modelBinderHelper;
         private readonly ServiceContext _services;
 
         public MediaItemBinder() : this(Current.Services)
@@ -23,7 +22,6 @@ namespace Umbraco.Web.Editors.Binders
         public MediaItemBinder(ServiceContext services)
         {
             _services = services;
-            _modelBinderHelper = new ContentModelBinderHelper();
         }
 
         /// <summary>
@@ -34,7 +32,7 @@ namespace Umbraco.Web.Editors.Binders
         /// <returns></returns>
         public bool BindModel(HttpActionContext actionContext, ModelBindingContext bindingContext)
         {
-            var model = _modelBinderHelper.BindModelFromMultipartRequest<MediaItemSave>(actionContext, bindingContext);
+            var model = ContentModelBinderHelper.BindModelFromMultipartRequest<MediaItemSave>(actionContext, bindingContext);
             if (model == null) return false;
 
             model.PersistedContent = ContentControllerBase.IsCreatingAction(model.Action) ? CreateNew(model) : GetExisting(model);
@@ -44,7 +42,7 @@ namespace Umbraco.Web.Editors.Binders
             {
                 model.PropertyCollectionDto = Current.Mapper.Map<IMedia, ContentPropertyCollectionDto>(model.PersistedContent);
                 //now map all of the saved values to the dto
-                _modelBinderHelper.MapPropertyValuesFromSaved(model, model.PropertyCollectionDto);
+                ContentModelBinderHelper.MapPropertyValuesFromSaved(model, model.PropertyCollectionDto);
             }
 
             model.Name = model.Name.Trim();
diff --git a/src/Umbraco.Web/Editors/Binders/MemberBinder.cs b/src/Umbraco.Web/Editors/Binders/MemberBinder.cs
index 60b4f85c21..bd51d268ee 100644
--- a/src/Umbraco.Web/Editors/Binders/MemberBinder.cs
+++ b/src/Umbraco.Web/Editors/Binders/MemberBinder.cs
@@ -20,7 +20,6 @@ namespace Umbraco.Web.Editors.Binders
     /// </summary>
     internal class MemberBinder : IModelBinder
     {
-        private readonly ContentModelBinderHelper _modelBinderHelper;
         private readonly ServiceContext _services;
 
         public MemberBinder() : this(Current.Services)
@@ -30,7 +29,6 @@ namespace Umbraco.Web.Editors.Binders
         public MemberBinder(ServiceContext services)
         {
             _services = services;
-            _modelBinderHelper = new ContentModelBinderHelper();
         }
 
         /// <summary>
@@ -41,7 +39,7 @@ namespace Umbraco.Web.Editors.Binders
         /// <returns></returns>
         public bool BindModel(HttpActionContext actionContext, ModelBindingContext bindingContext)
         {
-            var model = _modelBinderHelper.BindModelFromMultipartRequest<MemberSave>(actionContext, bindingContext);
+            var model = ContentModelBinderHelper.BindModelFromMultipartRequest<MemberSave>(actionContext, bindingContext);
             if (model == null) return false;
 
             model.PersistedContent = ContentControllerBase.IsCreatingAction(model.Action) ? CreateNew(model) : GetExisting(model);
@@ -51,7 +49,7 @@ namespace Umbraco.Web.Editors.Binders
             {
                 model.PropertyCollectionDto = Current.Mapper.Map<IMember, ContentPropertyCollectionDto>(model.PersistedContent);
                 //now map all of the saved values to the dto
-                _modelBinderHelper.MapPropertyValuesFromSaved(model, model.PropertyCollectionDto);
+                ContentModelBinderHelper.MapPropertyValuesFromSaved(model, model.PropertyCollectionDto);
             }
 
             model.Name = model.Name.Trim();
diff --git a/src/Umbraco.Web/Editors/ChallengeResult.cs b/src/Umbraco.Web/Editors/ChallengeResult.cs
new file mode 100644
index 0000000000..00c0aa187d
--- /dev/null
+++ b/src/Umbraco.Web/Editors/ChallengeResult.cs
@@ -0,0 +1,54 @@
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+using Microsoft.Owin.Security;
+using Umbraco.Core;
+using Umbraco.Web.Security;
+
+namespace Umbraco.Web.Editors
+{
+    public class ChallengeResult : HttpUnauthorizedResult
+    {
+        public ChallengeResult(string provider, string redirectUri, string userId = null)
+        {
+            LoginProvider = provider;
+            RedirectUri = redirectUri;
+            UserId = userId;
+        }
+
+        private string LoginProvider { get; set; }
+        private string RedirectUri { get; set; }
+        private string UserId { get; set; }
+
+        public override void ExecuteResult(ControllerContext context)
+        {
+            //Ensure the forms auth module doesn't do a redirect!
+            context.HttpContext.Response.SuppressFormsAuthenticationRedirect = true;
+
+            var owinCtx = context.HttpContext.GetOwinContext();
+
+            //First, see if a custom challenge result callback is specified for the provider
+            // and use it instead of the default if one is supplied.
+            var loginProvider = owinCtx.Authentication
+                .GetExternalAuthenticationTypes()
+                .FirstOrDefault(p => p.AuthenticationType == LoginProvider);
+            if (loginProvider != null)
+            {
+                var providerChallengeResult = loginProvider.GetSignInChallengeResult(owinCtx);
+                if (providerChallengeResult != null)
+                {
+                    owinCtx.Authentication.Challenge(providerChallengeResult, LoginProvider);
+                    return;
+                }
+            }
+
+            var properties = new AuthenticationProperties() { RedirectUri = RedirectUri.EnsureEndsWith('/') };
+            if (UserId != null)
+            {
+                properties.Dictionary[BackOfficeController.XsrfKey] = UserId;
+            }
+            owinCtx.Authentication.Challenge(properties, LoginProvider);
+        }
+    }
+
+}
diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index 5ddbb506c9..409cded781 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -23,6 +23,7 @@ using Umbraco.Web.WebApi.Filters;
 using Umbraco.Web.Trees;
 using Stylesheet = Umbraco.Core.Models.Stylesheet;
 using StylesheetRule = Umbraco.Web.Models.ContentEditing.StylesheetRule;
+using CharArrays = Umbraco.Core.Constants.CharArrays;
 
 namespace Umbraco.Web.Editors
 {
@@ -139,7 +140,7 @@ namespace Umbraco.Web.Editors
         /// Used to get a specific file from disk via the FileService
         /// </summary>
         /// <param name="type">This is a string but will be 'scripts' 'partialViews', 'partialViewMacros' or 'stylesheets'</param>
-        /// <param name="virtualPath">The filename or urlencoded path of the file to open</param>
+        /// <param name="virtualPath">The filename or URL encoded path of the file to open</param>
         /// <returns>The file and its contents from the virtualPath</returns>
         public CodeFileDisplay GetByPath(string type, string virtualPath)
         {
@@ -277,7 +278,7 @@ namespace Umbraco.Web.Editors
 
             if (id != Core.Constants.System.RootString)
             {
-                codeFileDisplay.VirtualPath += id.TrimStart("/").EnsureEndsWith("/");
+                codeFileDisplay.VirtualPath += id.TrimStart(CharArrays.ForwardSlash).EnsureEndsWith("/");
                 //if it's not new then it will have a path, otherwise it won't
                 codeFileDisplay.Path = Url.GetTreePathFromFilePath(id);
             }
@@ -291,7 +292,7 @@ namespace Umbraco.Web.Editors
         /// Used to delete a specific file from disk via the FileService
         /// </summary>
         /// <param name="type">This is a string but will be 'scripts' 'partialViews', 'partialViewMacros' or 'stylesheets'</param>
-        /// <param name="virtualPath">The filename or urlencoded path of the file to delete</param>
+        /// <param name="virtualPath">The filename or URL encoded path of the file to delete</param>
         /// <returns>Will return a simple 200 if file deletion succeeds</returns>
         [HttpDelete]
         [HttpPost]
@@ -473,7 +474,7 @@ namespace Umbraco.Web.Editors
                 data.Content = StylesheetHelper.ReplaceRule(data.Content, rule.Name, null);
             }
 
-            data.Content = data.Content.TrimEnd('\n', '\r');
+            data.Content = data.Content.TrimEnd(CharArrays.LineFeedCarriageReturn);
 
             // now add all the posted rules
             if (data.Rules != null && data.Rules.Any())
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 565eebf80e..6f85a08751 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -355,6 +355,29 @@ namespace Umbraco.Web.Editors
                 throw new HttpResponseException(HttpStatusCode.NotFound);
             }
 
+            return GetEmpty(contentType, parentId);
+        }
+
+
+        /// <summary>
+        /// Gets an empty content item for the document type.
+        /// </summary>
+        /// <param name="contentTypeKey"></param>
+        /// <param name="parentId"></param>
+        [OutgoingEditorModelEvent]
+        public ContentItemDisplay GetEmptyByKey(Guid contentTypeKey, int parentId)
+        {
+            var contentType = Services.ContentTypeService.Get(contentTypeKey);
+            if (contentType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            return GetEmpty(contentType, parentId);
+        }
+
+        private ContentItemDisplay GetEmpty(IContentType contentType, int parentId)
+        {
             var emptyContent = Services.ContentService.Create("", parentId, contentType.Alias, Security.GetUserId().ResultOr(0));
             var mapped = MapToDisplay(emptyContent);
             // translate the content type name if applicable
@@ -676,7 +699,7 @@ namespace Umbraco.Web.Editors
 
             //The default validation language will be either: The default languauge, else if the content is brand new and the default culture is
             // not marked to be saved, it will be the first culture in the list marked for saving.
-            var defaultCulture = _allLangs.Value.Values.FirstOrDefault(x => x.IsDefault)?.CultureName;
+            var defaultCulture = _allLangs.Value.Values.FirstOrDefault(x => x.IsDefault)?.IsoCode;
             var cultureForInvariantErrors = CultureImpact.GetCultureForInvariantErrors(
                 contentItem.PersistedContent,
                 contentItem.Variants.Where(x => x.Save).Select(x => x.Culture).ToArray(),
@@ -821,7 +844,7 @@ namespace Umbraco.Web.Editors
         /// <returns></returns>
         /// <remarks>
         /// For invariant, the variants collection count will be 1 and this will check if that invariant item has the critical values for persistence (i.e. Name)
-        /// 
+        ///
         /// For variant, each variant will be checked for critical data for persistence and if it's not there then it's flags will be reset and it will not
         /// be persisted. However, we also need to deal with the case where all variants don't pass this check and then there is nothing to save. This also deals
         /// with removing the Name validation keys based on data annotations validation for items that haven't been marked to be saved.
@@ -908,8 +931,8 @@ namespace Umbraco.Web.Editors
 
                     var savedWithoutErrors = contentItem.Variants
                         .Where(x => x.Save && !variantErrors.Contains((x.Culture, x.Segment)))
-                        .Select(x => (culture: x.Culture, segment: x.Segment));                       
-              
+                        .Select(x => (culture: x.Culture, segment: x.Segment));
+
                     foreach (var (culture, segment) in savedWithoutErrors)
                     {
                         var variantName = GetVariantName(culture, segment);
@@ -1258,7 +1281,7 @@ namespace Umbraco.Web.Editors
             //Now check if there are validation errors on each variant.
             //If validation errors are detected on a variant and it's state is set to 'publish', then we
             //need to change it to 'save'.
-            //It is a requirement that this is performed AFTER ValidatePublishingMandatoryLanguages.            
+            //It is a requirement that this is performed AFTER ValidatePublishingMandatoryLanguages.
             foreach (var variant in contentItem.Variants)
             {
                 if (variantErrors.Contains((variant.Culture, variant.Segment)))
@@ -1389,7 +1412,7 @@ namespace Umbraco.Web.Editors
         /// <param name="segment">Segment to assign the error to</param>
         /// <param name="localizationKey"></param>
         /// <param name="cultureToken">
-        /// The culture used in the localization message, null by default which means <see cref="culture"/> will be used. 
+        /// The culture used in the localization message, null by default which means <see cref="culture"/> will be used.
         /// </param>
         private void AddVariantValidationError(string culture, string segment, string localizationKey, string cultureToken = null)
         {
@@ -1402,7 +1425,7 @@ namespace Umbraco.Web.Editors
         }
 
         /// <summary>
-        /// Creates the human readable variant name based on culture and segment                
+        /// Creates the human readable variant name based on culture and segment
         /// </summary>
         /// <param name="culture">Culture</param>
         /// <param name="segment">Segment</param>
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index 4e1417fb03..5074a14782 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -7,6 +7,7 @@ using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using System.Web.Http;
+using System.Web.Http.Controllers;
 using System.Xml;
 using System.Xml.Linq;
 using Umbraco.Core;
@@ -44,6 +45,7 @@ namespace Umbraco.Web.Editors
     [PluginController("UmbracoApi")]
     [UmbracoTreeAuthorize(Constants.Trees.DocumentTypes)]
     [EnableOverrideAuthorization]
+    [ContentTypeControllerConfiguration]
     public class ContentTypeController : ContentTypeControllerBase<IContentType>
     {
         private readonly IEntityXmlSerializer _serializer;
@@ -65,6 +67,17 @@ namespace Umbraco.Web.Editors
             _scopeProvider = scopeProvider;
         }
 
+        /// <summary>
+        /// Configures this controller with a custom action selector
+        /// </summary>
+        private class ContentTypeControllerConfigurationAttribute : Attribute, IControllerConfiguration
+        {
+            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
+            {
+                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))));            }
+        }
+
         public int GetCount()
         {
             return Services.ContentTypeService.Count();
@@ -77,15 +90,58 @@ namespace Umbraco.Web.Editors
             return Services.ContentTypeService.HasContentNodes(id);
         }
 
+        /// <summary>
+        /// Gets the document type a given id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         public DocumentTypeDisplay GetById(int id)
         {
-            var ct = Services.ContentTypeService.Get(id);
-            if (ct == null)
+            var contentType = Services.ContentTypeService.Get(id);
+            if (contentType == null)
             {
                 throw new HttpResponseException(HttpStatusCode.NotFound);
             }
 
-            var dto = Mapper.Map<IContentType, DocumentTypeDisplay>(ct);
+            var dto = Mapper.Map<IContentType, DocumentTypeDisplay>(contentType);
+            return dto;
+        }
+
+        /// <summary>
+        /// Gets the document type a given guid
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public DocumentTypeDisplay GetById(Guid id)
+        {
+            var contentType = Services.ContentTypeService.Get(id);
+            if (contentType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var dto = Mapper.Map<IContentType, DocumentTypeDisplay>(contentType);
+            return dto;
+        }
+
+        /// <summary>
+        /// Gets the document type a given udi
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public DocumentTypeDisplay GetById(Udi id)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi == null)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+
+            var contentType = Services.ContentTypeService.Get(guidUdi.Guid);
+            if (contentType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var dto = Mapper.Map<IContentType, DocumentTypeDisplay>(contentType);
             return dto;
         }
 
@@ -226,91 +282,35 @@ namespace Umbraco.Web.Editors
                 : Request.CreateNotificationValidationErrorResponse(result.Exception.Message);
         }
 
-        public CreatedContentTypeCollectionResult PostCreateCollection(int parentId, string collectionName, bool collectionCreateTemplate, string collectionItemName, bool collectionItemCreateTemplate, string collectionIcon, string collectionItemIcon)
-        {
-            // create item doctype
-            var itemDocType = new ContentType(parentId);
-            itemDocType.Name = collectionItemName;
-            itemDocType.Alias = collectionItemName.ToSafeAlias(true);
-            itemDocType.Icon = collectionItemIcon;
-
-            // create item doctype template
-            if (collectionItemCreateTemplate)
-            {
-                var template = CreateTemplateForContentType(itemDocType.Alias, itemDocType.Name);
-                itemDocType.SetDefaultTemplate(template);
-            }
-
-            // save item doctype
-            Services.ContentTypeService.Save(itemDocType);
-
-            // create collection doctype
-            var collectionDocType = new ContentType(parentId);
-            collectionDocType.Name = collectionName;
-            collectionDocType.Alias = collectionName.ToSafeAlias(true);
-            collectionDocType.Icon = collectionIcon;
-            collectionDocType.IsContainer = true;
-            collectionDocType.AllowedContentTypes = new List<ContentTypeSort>()
-            {
-                new ContentTypeSort(itemDocType.Id, 0)
-            };
-
-            // create collection doctype template
-            if (collectionCreateTemplate)
-            {
-                var template = CreateTemplateForContentType(collectionDocType.Alias, collectionDocType.Name);
-                collectionDocType.SetDefaultTemplate(template);
-            }
-
-            // save collection doctype
-            Services.ContentTypeService.Save(collectionDocType);
-
-            // test if the parent exist and then allow the collection underneath
-            var parentCt = Services.ContentTypeService.Get(parentId);
-            if (parentCt != null)
-            {
-                var allowedCts = parentCt.AllowedContentTypes.ToList();
-                allowedCts.Add(new ContentTypeSort(collectionDocType.Id, allowedCts.Count()));
-                parentCt.AllowedContentTypes = allowedCts;
-                Services.ContentTypeService.Save(parentCt);
-            }
-
-            return new CreatedContentTypeCollectionResult
-            {
-                CollectionId = collectionDocType.Id,
-                ContainerId = itemDocType.Id
-            };
-        }
-
         public DocumentTypeDisplay PostSave(DocumentTypeSave contentTypeSave)
         {
-            //Before we send this model into this saving/mapping pipeline, we need to do some cleanup on variations.
-            //If the doc type does not allow content variations, we need to update all of it's property types to not allow this either
-            //else we may end up with ysods. I'm unsure if the service level handles this but we'll make sure it is updated here
+            //Before we send this model into this saving/mapping pipeline, we need to do some cleanup on variations.	
+            //If the doc type does not allow content variations, we need to update all of it's property types to not allow this either	
+            //else we may end up with ysods. I'm unsure if the service level handles this but we'll make sure it is updated here	
             if (!contentTypeSave.AllowCultureVariant)
             {
-                foreach(var prop in contentTypeSave.Groups.SelectMany(x => x.Properties))
+                foreach (var prop in contentTypeSave.Groups.SelectMany(x => x.Properties))
                 {
                     prop.AllowCultureVariant = false;
                 }
             }
 
             var savedCt = PerformPostSave<DocumentTypeDisplay, DocumentTypeSave, PropertyTypeBasic>(
-                contentTypeSave:    contentTypeSave,
-                getContentType:     i => Services.ContentTypeService.Get(i),
-                saveContentType:    type => Services.ContentTypeService.Save(type),
-                beforeCreateNew:    ctSave =>
+                contentTypeSave: contentTypeSave,
+                getContentType: i => Services.ContentTypeService.Get(i),
+                saveContentType: type => Services.ContentTypeService.Save(type),
+                beforeCreateNew: ctSave =>
                 {
-                    //create a default template if it doesn't exist -but only if default template is == to the content type
+                    //create a default template if it doesn't exist -but only if default template is == to the content type	
                     if (ctSave.DefaultTemplate.IsNullOrWhiteSpace() == false && ctSave.DefaultTemplate == ctSave.Alias)
                     {
                         var template = CreateTemplateForContentType(ctSave.Alias, ctSave.Name);
 
-                        // If the alias has been manually updated before the first save,
-                        // make sure to also update the first allowed template, as the
-                        // name will come back as a SafeAlias of the document type name,
-                        // not as the actual document type alias.
-                        // For more info: http://issues.umbraco.org/issue/U4-11059
+                        // If the alias has been manually updated before the first save,	
+                        // make sure to also update the first allowed template, as the	
+                        // name will come back as a SafeAlias of the document type name,	
+                        // not as the actual document type alias.	
+                        // For more info: http://issues.umbraco.org/issue/U4-11059	
                         if (ctSave.DefaultTemplate != template.Alias)
                         {
                             var allowedTemplates = ctSave.AllowedTemplates.ToArray();
@@ -319,7 +319,7 @@ namespace Umbraco.Web.Editors
                             ctSave.AllowedTemplates = allowedTemplates;
                         }
 
-                        //make sure the template alias is set on the default and allowed template so we can map it back
+                        //make sure the template alias is set on the default and allowed template so we can map it back	
                         ctSave.DefaultTemplate = template.Alias;
 
                     }
@@ -573,7 +573,7 @@ namespace Umbraco.Web.Editors
             var model = new ContentTypeImportModel();
 
             var file = result.FileData[0];
-            var fileName = file.Headers.ContentDisposition.FileName.Trim('\"');
+            var fileName = file.Headers.ContentDisposition.FileName.Trim(Constants.CharArrays.DoubleQuote);
             var ext = fileName.Substring(fileName.LastIndexOf('.') + 1).ToLower();
 
             var destFileName = root + "\\" + fileName;
diff --git a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
index 2b3990c7a1..d56820a549 100644
--- a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
@@ -53,7 +53,7 @@ namespace Umbraco.Web.Editors
         /// be looked up via the db, they need to be passed in.
         /// </param>
         /// <param name="contentTypeId"></param>
-        /// <param name="isElement">Wether the composite content types should be applicable for an element type</param>
+        /// <param name="isElement">Whether the composite content types should be applicable for an element type</param>
         /// <returns></returns>
         protected IEnumerable<Tuple<EntityBasic, bool>> PerformGetAvailableCompositeContentTypes(int contentTypeId,
             UmbracoObjectTypes type,
diff --git a/src/Umbraco.Web/Editors/DictionaryController.cs b/src/Umbraco.Web/Editors/DictionaryController.cs
index d132fdc201..f3246276b1 100644
--- a/src/Umbraco.Web/Editors/DictionaryController.cs
+++ b/src/Umbraco.Web/Editors/DictionaryController.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
+using System.Web.Http.Controllers;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
@@ -31,6 +32,7 @@ namespace Umbraco.Web.Editors
     [PluginController("UmbracoApi")]
     [UmbracoTreeAuthorize(Constants.Trees.Dictionary)]
     [EnableOverrideAuthorization]
+    [DictionaryControllerConfiguration]
     public class DictionaryController : BackOfficeNotificationsController
     {
         public DictionaryController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
@@ -38,6 +40,19 @@ namespace Umbraco.Web.Editors
         {
         }
 
+        /// <summary>
+        /// Configures this controller with a custom action selector
+        /// </summary>
+        private class DictionaryControllerConfigurationAttribute : Attribute, IControllerConfiguration
+        {
+            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
+            {
+                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))
+                ));
+            }
+        }
+
         /// <summary>
         /// Deletes a data type with a given ID
         /// </summary>
@@ -129,7 +144,52 @@ namespace Umbraco.Web.Editors
         public DictionaryDisplay GetById(int id)
         {
             var dictionary = Services.LocalizationService.GetDictionaryItemById(id);
+            if (dictionary == null)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
 
+            return Mapper.Map<IDictionaryItem, DictionaryDisplay>(dictionary);
+        }
+
+        /// <summary>
+        /// Gets a dictionary item by guid
+        /// </summary>
+        /// <param name="id">
+        /// The id.
+        /// </param>
+        /// <returns>
+        /// The <see cref="DictionaryDisplay"/>.
+        /// </returns>
+        /// <exception cref="HttpResponseException">
+        ///  Returns a not found response when dictionary item does not exist
+        /// </exception>
+        public DictionaryDisplay GetById(Guid id)
+        {
+            var dictionary = Services.LocalizationService.GetDictionaryItemById(id);
+            if (dictionary == null)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+
+            return Mapper.Map<IDictionaryItem, DictionaryDisplay>(dictionary);
+        }
+
+        /// <summary>
+        /// Gets a dictionary item by udi
+        /// </summary>
+        /// <param name="id">
+        /// The id.
+        /// </param>
+        /// <returns>
+        /// The <see cref="DictionaryDisplay"/>.
+        /// </returns>
+        /// <exception cref="HttpResponseException">
+        ///  Returns a not found response when dictionary item does not exist
+        /// </exception>
+        public DictionaryDisplay GetById(Udi id)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi == null)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+
+            var dictionary = Services.LocalizationService.GetDictionaryItemById(guidUdi.Guid);
             if (dictionary == null)
                 throw new HttpResponseException(HttpStatusCode.NotFound);
 
@@ -207,44 +267,31 @@ namespace Umbraco.Web.Editors
         /// </returns>
         public IEnumerable<DictionaryOverviewDisplay> GetList()
         {
-            var list = new List<DictionaryOverviewDisplay>();
+            var items = Services.LocalizationService.GetDictionaryItemDescendants(null).ToArray();
+            var list = new List<DictionaryOverviewDisplay>(items.Length);
 
-            const int level = 0;
-
-            foreach (var dictionaryItem in Services.LocalizationService.GetRootDictionaryItems().OrderBy(ItemSort()))
+            // recursive method to build a tree structure from the flat structure returned above
+            void BuildTree(int level = 0, Guid? parentId = null)
             {
-                var item = Mapper.Map<IDictionaryItem, DictionaryOverviewDisplay>(dictionaryItem);
-                item.Level = 0;
-                list.Add(item);
+                var children = items.Where(t => t.ParentId == parentId).ToArray();
+                if(children.Any() == false)
+                {
+                    return;
+                }
 
-                GetChildItemsForList(dictionaryItem, level + 1, list);
+                foreach(var child in children.OrderBy(ItemSort()))
+                {
+                    var display = Mapper.Map<IDictionaryItem, DictionaryOverviewDisplay>(child);
+                    display.Level = level;
+                    list.Add(display);
+
+                    BuildTree(level + 1, child.Key);
+                }                
             }
 
-            return list;
-        }
+            BuildTree();
 
-        /// <summary>
-        /// Get child items for list.
-        /// </summary>
-        /// <param name="dictionaryItem">
-        /// The dictionary item.
-        /// </param>
-        /// <param name="level">
-        /// The level.
-        /// </param>
-        /// <param name="list">
-        /// The list.
-        /// </param>
-        private void GetChildItemsForList(IDictionaryItem dictionaryItem, int level, ICollection<DictionaryOverviewDisplay> list)
-        {
-            foreach (var childItem in Services.LocalizationService.GetDictionaryItemChildren(dictionaryItem.Key).OrderBy(ItemSort()))
-            {
-                var item = Mapper.Map<IDictionaryItem, DictionaryOverviewDisplay>(childItem);
-                item.Level = level;
-                list.Add(item);
-
-                GetChildItemsForList(childItem, level + 1, list);
-            }
+            return list;            
         }
 
         private static Func<IDictionaryItem, string> ItemSort() => item => item.ItemKey;
diff --git a/src/Umbraco.Web/Editors/ElementTypeController.cs b/src/Umbraco.Web/Editors/ElementTypeController.cs
new file mode 100644
index 0000000000..e49a5eb214
--- /dev/null
+++ b/src/Umbraco.Web/Editors/ElementTypeController.cs
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Http;
+using Umbraco.Core.Services;
+using Umbraco.Web.Mvc;
+
+namespace Umbraco.Web.Editors
+{
+    [PluginController("UmbracoApi")]
+    public class ElementTypeController : UmbracoAuthorizedJsonController
+    {
+        [HttpGet]
+        public IEnumerable<object> GetAll()
+        {
+            return Services.ContentTypeService
+                .GetAllElementTypes()
+                .OrderBy(x => x.SortOrder)
+                .Select(x => new
+                {
+                    id = x.Id,
+                    key = x.Key,
+                    name = x.Name,
+                    description = x.Description,
+                    alias = x.Alias,
+                    icon = x.Icon
+                });
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 3938ae5ab8..fe78b29123 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -174,7 +174,7 @@ namespace Umbraco.Web.Editors
         {
             var foundContent = GetResultForId(id, type);
 
-            return foundContent.Path.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).Select(int.Parse);
+            return foundContent.Path.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).Select(int.Parse);
         }
 
         /// <summary>
@@ -187,7 +187,7 @@ namespace Umbraco.Web.Editors
         {
             var foundContent = GetResultForKey(id, type);
 
-            return foundContent.Path.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(int.Parse);
+            return foundContent.Path.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).Select(int.Parse);
         }
 
         /// <summary>
@@ -207,7 +207,7 @@ namespace Umbraco.Web.Editors
         }
 
         /// <summary>
-        /// Gets the url of an entity
+        /// Gets the URL of an entity
         /// </summary>
         /// <param name="udi">UDI of the entity to fetch URL for</param>
         /// <param name="culture">The culture to fetch the URL for</param>
@@ -236,7 +236,7 @@ namespace Umbraco.Web.Editors
         }
 
         /// <summary>
-        /// Gets the url of an entity
+        /// Gets the URL of an entity
         /// </summary>
         /// <param name="id">Int id of the entity to fetch URL for</param>
         /// <param name="type">The type of entity such as Document, Media, Member</param>
@@ -315,7 +315,7 @@ namespace Umbraco.Web.Editors
                 getPath: nodeid =>
                 {
                     var ent = Services.EntityService.Get(nodeid);
-                    return ent.Path.Split(',').Reverse();
+                    return ent.Path.Split(Constants.CharArrays.Comma).Reverse();
                 },
                 publishedContentExists: i => Umbraco.Content(i) != null);
         }
@@ -802,7 +802,7 @@ namespace Umbraco.Web.Editors
             {
                 // TODO: Need to check for Object types that support hierarchic here, some might not.
 
-                var ids = Services.EntityService.Get(id).Path.Split(',').Select(int.Parse).Distinct().ToArray();
+                var ids = Services.EntityService.Get(id).Path.Split(Constants.CharArrays.Comma).Select(int.Parse).Distinct().ToArray();
 
                 var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(queryStrings?.GetValue<Guid?>("dataTypeId"));
                 if (ignoreUserStartNodes == false)
@@ -1114,7 +1114,7 @@ namespace Umbraco.Web.Editors
         {
             if (postFilter.IsNullOrWhiteSpace()) return entities;
 
-            var postFilterConditions = postFilter.Split('&');
+            var postFilterConditions = postFilter.Split(Constants.CharArrays.Ampersand);
 
             foreach (var postFilterCondition in postFilterConditions)
             {
@@ -1131,9 +1131,7 @@ namespace Umbraco.Web.Editors
             return entities;
         }
 
-        private static QueryCondition BuildQueryCondition<T>(string postFilter)
-        {
-            var postFilterParts = postFilter.Split(new[]
+        private static readonly string[] _postFilterSplitStrings = new[]
             {
                 "=",
                 "==",
@@ -1143,7 +1141,10 @@ namespace Umbraco.Web.Editors
                 "<",
                 ">=",
                 "<="
-            }, 2, StringSplitOptions.RemoveEmptyEntries);
+            };
+        private static QueryCondition BuildQueryCondition<T>(string postFilter)
+        {
+            var postFilterParts = postFilter.Split(_postFilterSplitStrings, 2, StringSplitOptions.RemoveEmptyEntries);
 
             if (postFilterParts.Length != 2)
             {
diff --git a/src/Umbraco.Web/Editors/Filters/ContentModelValidator.cs b/src/Umbraco.Web/Editors/Filters/ContentModelValidator.cs
index 810c2d1bea..9de27248a6 100644
--- a/src/Umbraco.Web/Editors/Filters/ContentModelValidator.cs
+++ b/src/Umbraco.Web/Editors/Filters/ContentModelValidator.cs
@@ -1,15 +1,19 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http.Controllers;
 using System.Web.Http.ModelBinding;
+using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.PropertyEditors.Validation;
 
 namespace Umbraco.Web.Editors.Filters
 {
@@ -125,18 +129,6 @@ namespace Umbraco.Web.Editors.Filters
         {
             var properties = modelWithProperties.Properties.ToDictionary(x => x.Alias, x => x);
 
-            // Retrieve default messages used for required and regex validatation.  We'll replace these
-            // if set with custom ones if they've been provided for a given property.
-            var requiredDefaultMessages = new[]
-                {
-                    _textService.Localize("validation", "invalidNull"),
-                    _textService.Localize("validation", "invalidEmpty")
-                };
-            var formatDefaultMessages = new[]
-                {
-                    _textService.Localize("validation", "invalidPattern"),
-                };
-
             foreach (var p in dto.Properties)
             {
                 var editor = p.PropertyEditor;
@@ -156,7 +148,7 @@ namespace Umbraco.Web.Editors.Filters
 
                 var postedValue = postedProp.Value;
 
-                ValidatePropertyValue(model, modelWithProperties, editor, p, postedValue, modelState, requiredDefaultMessages, formatDefaultMessages);
+                ValidatePropertyValue(model, modelWithProperties, editor, p, postedValue, modelState);
     
             }
 
@@ -180,26 +172,29 @@ namespace Umbraco.Web.Editors.Filters
             IDataEditor editor,
             ContentPropertyDto property,
             object postedValue,
-            ModelStateDictionary modelState,
-            string[] requiredDefaultMessages,
-            string[] formatDefaultMessages)
+            ModelStateDictionary modelState)
         {
-            var valueEditor = editor.GetValueEditor(property.DataType.Configuration);
-            foreach (var r in valueEditor.Validate(postedValue, property.IsRequired, property.ValidationRegExp))
+            if (property is null) throw new ArgumentNullException(nameof(property));
+            if (property.DataType is null) throw new InvalidOperationException($"{nameof(property)}.{nameof(property.DataType)} cannot be null");
+
+            foreach (var validationResult in PropertyValidationService.ValidatePropertyValue(
+                _textService,  editor, property.DataType, postedValue, property.IsRequired,
+                property.ValidationRegExp, property.IsRequiredMessage, property.ValidationRegExpMessage))
             {
-                // If we've got custom error messages, we'll replace the default ones that will have been applied in the call to Validate().
-                if (property.IsRequired && !string.IsNullOrWhiteSpace(property.IsRequiredMessage) && requiredDefaultMessages.Contains(r.ErrorMessage, StringComparer.OrdinalIgnoreCase))
-                {
-                    r.ErrorMessage = property.IsRequiredMessage;
-                }
-
-                if (!string.IsNullOrWhiteSpace(property.ValidationRegExp) && !string.IsNullOrWhiteSpace(property.ValidationRegExpMessage) && formatDefaultMessages.Contains(r.ErrorMessage, StringComparer.OrdinalIgnoreCase))
-                {
-                    r.ErrorMessage = property.ValidationRegExpMessage;
-                }
-
-                modelState.AddPropertyError(r, property.Alias, property.Culture, property.Segment);
+                AddPropertyError(model, modelWithProperties, editor, property, validationResult, modelState);
             }
         }
+
+        protected virtual void AddPropertyError(
+            TModelSave model,
+            TModelWithProperties modelWithProperties,
+            IDataEditor editor,
+            ContentPropertyDto property,
+            ValidationResult validationResult,
+            ModelStateDictionary modelState)
+        {
+            modelState.AddPropertyError(validationResult, property.Alias, property.Culture, property.Segment);
+        }
+
     }
 }
diff --git a/src/Umbraco.Web/Editors/Filters/ContentSaveModelValidator.cs b/src/Umbraco.Web/Editors/Filters/ContentSaveModelValidator.cs
index 39bd6ab0f4..09995c1104 100644
--- a/src/Umbraco.Web/Editors/Filters/ContentSaveModelValidator.cs
+++ b/src/Umbraco.Web/Editors/Filters/ContentSaveModelValidator.cs
@@ -1,5 +1,8 @@
-using Umbraco.Core.Logging;
+using System.ComponentModel.DataAnnotations;
+using System.Web.Http.ModelBinding;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
 
@@ -13,5 +16,6 @@ namespace Umbraco.Web.Editors.Filters
         public ContentSaveModelValidator(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor, ILocalizedTextService textService) : base(logger, umbracoContextAccessor, textService)
         {
         }
+
     }
 }
diff --git a/src/Umbraco.Web/Editors/Filters/DenyLocalLoginAuthorizationAttribute.cs b/src/Umbraco.Web/Editors/Filters/DenyLocalLoginAuthorizationAttribute.cs
new file mode 100644
index 0000000000..89a67d8f78
--- /dev/null
+++ b/src/Umbraco.Web/Editors/Filters/DenyLocalLoginAuthorizationAttribute.cs
@@ -0,0 +1,18 @@
+using System.Web.Http;
+using System.Web.Http.Controllers;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.Security;
+
+namespace Umbraco.Web.Editors.Filters
+{
+    internal class DenyLocalLoginAuthorizationAttribute : AuthorizeAttribute
+    {
+        protected override bool IsAuthorized(HttpActionContext actionContext)
+        {
+            var owinContext = actionContext.Request.TryGetOwinContext().Result;
+
+            // no authorization if any external logins deny local login
+            return !owinContext.Authentication.HasDenyLocalLogin();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Editors/Filters/IsCurrentUserModelFilterAttribute.cs b/src/Umbraco.Web/Editors/Filters/IsCurrentUserModelFilterAttribute.cs
index b9c6eb45eb..61122e2b6e 100644
--- a/src/Umbraco.Web/Editors/Filters/IsCurrentUserModelFilterAttribute.cs
+++ b/src/Umbraco.Web/Editors/Filters/IsCurrentUserModelFilterAttribute.cs
@@ -22,9 +22,9 @@ namespace Umbraco.Web.Editors.Filters
             if (objectContent != null)
             {
                 var model = objectContent.Value as UserBasic;
-                if (model != null)
+                if (model != null && model.Id is int userId)
                 {
-                    model.IsCurrentUser = (int) model.Id == user.Id;
+                    model.IsCurrentUser = userId == user.Id;
                 }
                 else
                 {
@@ -33,7 +33,10 @@ namespace Umbraco.Web.Editors.Filters
                     {
                         foreach (var userBasic in collection)
                         {
-                            userBasic.IsCurrentUser = (int) userBasic.Id == user.Id;
+                            if (userBasic.Id is int uid)
+                            {
+                                userBasic.IsCurrentUser = uid == user.Id;
+                            }
                         }
                     }
                     else
@@ -43,7 +46,10 @@ namespace Umbraco.Web.Editors.Filters
                         {
                             foreach (var userBasic in paged.Items)
                             {
-                                userBasic.IsCurrentUser = (int)userBasic.Id == user.Id;
+                                if (userBasic.Id is int uid)
+                                {
+                                    userBasic.IsCurrentUser = uid == user.Id;
+                                }
                             }
                         }
                     }
diff --git a/src/Umbraco.Web/Editors/IconController.cs b/src/Umbraco.Web/Editors/IconController.cs
new file mode 100644
index 0000000000..87303a4e62
--- /dev/null
+++ b/src/Umbraco.Web/Editors/IconController.cs
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
+
+namespace Umbraco.Web.Editors
+{
+    [PluginController("UmbracoApi")]
+    public class IconController : UmbracoAuthorizedApiController
+    {
+        private readonly IIconService _iconService;
+
+        public IconController(IIconService iconService)
+        {
+            _iconService = iconService;
+        }
+
+        /// <summary>
+        /// Gets an IconModel containing the icon name and SvgString according to an icon name found at the global icons path
+        /// </summary>
+        /// <param name="iconName"></param>
+        /// <returns></returns>
+        public IconModel GetIcon(string iconName)
+        {
+            return _iconService.GetIcon(iconName);
+        }
+
+        /// <summary>
+        /// Gets a list of all svg icons found at at the global icons path.
+        /// </summary>
+        /// <returns></returns>
+        public IList<IconModel> GetAllIcons()
+        {
+            return _iconService.GetAllIcons();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Editors/LogController.cs b/src/Umbraco.Web/Editors/LogController.cs
index c3e3790378..2ed64245ed 100644
--- a/src/Umbraco.Web/Editors/LogController.cs
+++ b/src/Umbraco.Web/Editors/LogController.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Web.Models.ContentEditing;
@@ -61,7 +62,14 @@ namespace Umbraco.Web.Editors
                 Items = MapAvatarsAndNames(mapped)
             };
         }
-        
+
+        public IEnumerable<AuditLog> GetLog(AuditType logType, DateTime? sinceDate = null)
+        {
+            var result = Services.AuditService.GetLogs(Enum<AuditType>.Parse(logType.ToString()), sinceDate);
+            var mapped = Mapper.MapEnumerable<IAuditItem, AuditLog>(result);
+            return mapped;
+        }
+
         private IEnumerable<AuditLog> MapAvatarsAndNames(IEnumerable<AuditLog> items)
         {
             var mappedItems = items.ToList();
diff --git a/src/Umbraco.Web/Editors/LogViewerController.cs b/src/Umbraco.Web/Editors/LogViewerController.cs
index d48de8a00a..625c4524bb 100644
--- a/src/Umbraco.Web/Editors/LogViewerController.cs
+++ b/src/Umbraco.Web/Editors/LogViewerController.cs
@@ -6,6 +6,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Filters;
 
 namespace Umbraco.Web.Editors
 {
@@ -13,6 +14,7 @@ namespace Umbraco.Web.Editors
     /// Backoffice controller supporting the dashboard for viewing logs with some simple graphs & filtering
     /// </summary>
     [PluginController("UmbracoApi")]
+    [UmbracoApplicationAuthorize(Core.Constants.Applications.Settings)]
     public class LogViewerController : UmbracoAuthorizedJsonController
     {
         private readonly ILogViewer _logViewer;
diff --git a/src/Umbraco.Web/Editors/MacrosController.cs b/src/Umbraco.Web/Editors/MacrosController.cs
index 38103400d9..ec54cfdc04 100644
--- a/src/Umbraco.Web/Editors/MacrosController.cs
+++ b/src/Umbraco.Web/Editors/MacrosController.cs
@@ -399,7 +399,7 @@ namespace Umbraco.Web.Editors
 
             files.AddRange(
                 fileInfo.Select(file =>
-                    prefixVirtualPath.TrimEnd('/') + "/" + (path.Replace(orgPath, string.Empty).Trim('/') + "/" + file.Name).Trim('/')));
+                    prefixVirtualPath.TrimEnd(Constants.CharArrays.ForwardSlash) + "/" + (path.Replace(orgPath, string.Empty).Trim(Constants.CharArrays.ForwardSlash) + "/" + file.Name).Trim(Constants.CharArrays.ForwardSlash)));
 
             return files;
         }
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index c2561e334e..5fd59d0c9f 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -126,15 +126,15 @@ namespace Umbraco.Web.Editors
         [EnsureUserPermissionForMedia("id")]
         public MediaItemDisplay GetById(int id)
         {
-            var foundContent = GetObjectFromRequest(() => Services.MediaService.GetById(id));
+            var foundMedia = GetObjectFromRequest(() => Services.MediaService.GetById(id));
 
-            if (foundContent == null)
+            if (foundMedia == null)
             {
                 HandleContentNotFound(id);
                 //HandleContentNotFound will throw an exception
                 return null;
             }
-            return Mapper.Map<MediaItemDisplay>(foundContent);
+            return Mapper.Map<MediaItemDisplay>(foundMedia);
         }
 
         /// <summary>
@@ -146,15 +146,15 @@ namespace Umbraco.Web.Editors
         [EnsureUserPermissionForMedia("id")]
         public MediaItemDisplay GetById(Guid id)
         {
-            var foundContent = GetObjectFromRequest(() => Services.MediaService.GetById(id));
+            var foundMedia = GetObjectFromRequest(() => Services.MediaService.GetById(id));
 
-            if (foundContent == null)
+            if (foundMedia == null)
             {
                 HandleContentNotFound(id);
                 //HandleContentNotFound will throw an exception
                 return null;
             }
-            return Mapper.Map<MediaItemDisplay>(foundContent);
+            return Mapper.Map<MediaItemDisplay>(foundMedia);
         }
 
         /// <summary>
@@ -645,7 +645,7 @@ namespace Umbraco.Web.Editors
             if (result.FormData.ContainsKey("path"))
             {
 
-                var folders = result.FormData["path"].Split('/');
+                var folders = result.FormData["path"].Split(Constants.CharArrays.ForwardSlash);
 
                 for (int i = 0; i < folders.Length - 1; i++)
                 {
@@ -694,7 +694,7 @@ namespace Umbraco.Web.Editors
             //get the files
             foreach (var file in result.FileData)
             {
-                var fileName = file.Headers.ContentDisposition.FileName.Trim(new[] { '\"' }).TrimEnd();
+                var fileName = file.Headers.ContentDisposition.FileName.Trim(Constants.CharArrays.DoubleQuote).TrimEnd();
                 var safeFileName = fileName.ToSafeFileName();
                 var ext = safeFileName.Substring(safeFileName.LastIndexOf('.') + 1).ToLower();
 
@@ -774,10 +774,13 @@ namespace Umbraco.Web.Editors
             var total = long.MaxValue;
             while (page * pageSize < total)
             {
-                var children = Services.MediaService.GetPagedChildren(mediaId, page, pageSize, out total,
+                var children = Services.MediaService.GetPagedChildren(mediaId, page++, pageSize, out total,
                     SqlContext.Query<IMedia>().Where(x => x.Name == nameToFind));
-                foreach (var c in children)
-                    return c; //return first one if any are found
+                var match = children.FirstOrDefault(c => c.ContentType.Alias == contentTypeAlias);
+                if (match != null)
+                {
+                    return match;
+                }
             }
             return null;
         }
diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs
index 3a4026423a..d816f13c92 100644
--- a/src/Umbraco.Web/Editors/MediaTypeController.cs
+++ b/src/Umbraco.Web/Editors/MediaTypeController.cs
@@ -49,6 +49,7 @@ namespace Umbraco.Web.Editors
             public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
             {
                 controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi)),
                     new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetAllowedChildren", "contentId", typeof(int), typeof(Guid), typeof(Udi))));
             }
         }
@@ -58,21 +59,66 @@ namespace Umbraco.Web.Editors
             return Services.ContentTypeService.Count();
         }
 
+        /// <summary>
+        /// Gets the media type a given id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         [UmbracoTreeAuthorize(Constants.Trees.MediaTypes, Constants.Trees.Media)]
         public MediaTypeDisplay GetById(int id)
         {
-            var ct = Services.MediaTypeService.Get(id);
-            if (ct == null)
+            var mediaType = Services.MediaTypeService.Get(id);
+            if (mediaType == null)
             {
                 throw new HttpResponseException(HttpStatusCode.NotFound);
             }
 
-            var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(ct);
+            var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(mediaType);
             return dto;
         }
 
         /// <summary>
-        /// Deletes a media type with a given ID
+        /// Gets the media type a given guid
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [UmbracoTreeAuthorize(Constants.Trees.MediaTypes, Constants.Trees.Media)]
+        public MediaTypeDisplay GetById(Guid id)
+        {
+            var mediaType = Services.MediaTypeService.Get(id);
+            if (mediaType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(mediaType);
+            return dto;
+        }
+
+        /// <summary>
+        /// Gets the media type a given udi
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [UmbracoTreeAuthorize(Constants.Trees.MediaTypes, Constants.Trees.Media)]
+        public MediaTypeDisplay GetById(Udi id)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi == null)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+
+            var mediaType = Services.MediaTypeService.Get(guidUdi.Guid);
+            if (mediaType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(mediaType);
+            return dto;
+        }
+
+        /// <summary>
+        /// Deletes a media type with a given id
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
diff --git a/src/Umbraco.Web/Editors/MemberGroupController.cs b/src/Umbraco.Web/Editors/MemberGroupController.cs
index 67bd126e6e..ed11139e56 100644
--- a/src/Umbraco.Web/Editors/MemberGroupController.cs
+++ b/src/Umbraco.Web/Editors/MemberGroupController.cs
@@ -1,14 +1,18 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
+using System.Web.Http.Controllers;
 using System.Web.Security;
+using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 using Constants = Umbraco.Core.Constants;
 
@@ -19,10 +23,29 @@ namespace Umbraco.Web.Editors
     /// </summary>
     [PluginController("UmbracoApi")]
     [UmbracoTreeAuthorize(Constants.Trees.MemberGroups)]
+    [MemberGroupControllerConfiguration]
     public class MemberGroupController : UmbracoAuthorizedJsonController
     {
         private readonly MembershipProvider _provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
 
+        /// <summary>
+        /// Configures this controller with a custom action selector
+        /// </summary>
+        private class MemberGroupControllerConfigurationAttribute : Attribute, IControllerConfiguration
+        {
+            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
+            {
+                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))
+                ));
+            }
+        }
+
+        /// <summary>
+        /// Gets the member group json for the member group id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         public MemberGroupDisplay GetById(int id)
         {
             var memberGroup = Services.MemberGroupService.GetById(id);
@@ -31,8 +54,43 @@ namespace Umbraco.Web.Editors
                 throw new HttpResponseException(HttpStatusCode.NotFound);
             }
 
-            var dto = Mapper.Map<IMemberGroup, MemberGroupDisplay>(memberGroup);
-            return dto;
+            return Mapper.Map<IMemberGroup, MemberGroupDisplay>(memberGroup);
+        }
+
+        /// <summary>
+        /// Gets the member group json for the member group guid
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public MemberGroupDisplay GetById(Guid id)
+        {
+            var memberGroup = Services.MemberGroupService.GetById(id);
+            if (memberGroup == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            return Mapper.Map<IMemberGroup, MemberGroupDisplay>(memberGroup);
+        }
+
+        /// <summary>
+        /// Gets the member group json for the member group udi
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public MemberGroupDisplay GetById(Udi id)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi == null)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+
+            var memberGroup = Services.MemberGroupService.GetById(guidUdi.Guid);
+            if (memberGroup == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            return Mapper.Map<IMemberGroup, MemberGroupDisplay>(memberGroup);
         }
 
         public IEnumerable<MemberGroupDisplay> GetByIds([FromUri]int[] ids)
diff --git a/src/Umbraco.Web/Editors/MemberTypeController.cs b/src/Umbraco.Web/Editors/MemberTypeController.cs
index fffead9155..4bfea76eda 100644
--- a/src/Umbraco.Web/Editors/MemberTypeController.cs
+++ b/src/Umbraco.Web/Editors/MemberTypeController.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
+using System.Web.Http.Controllers;
 using System.Web.Security;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
@@ -16,6 +17,7 @@ using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 using Constants = Umbraco.Core.Constants;
 
@@ -27,6 +29,7 @@ namespace Umbraco.Web.Editors
     /// </summary>
     [PluginController("UmbracoApi")]
     [UmbracoTreeAuthorize(new string[] { Constants.Trees.MemberTypes, Constants.Trees.Members})]
+    [MemberTypeControllerConfiguration]
     public class MemberTypeController : ContentTypeControllerBase<IMemberType>
     {
         public MemberTypeController(ICultureDictionaryFactory cultureDictionaryFactory, IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
@@ -34,23 +37,80 @@ namespace Umbraco.Web.Editors
         {
         }
 
+        /// <summary>
+        /// Configures this controller with a custom action selector
+        /// </summary>
+        private class MemberTypeControllerConfigurationAttribute : Attribute, IControllerConfiguration
+        {
+            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
+            {
+                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))));
+            }
+        }
+
         private readonly MembershipProvider _provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
 
+        /// <summary>
+        /// Gets the member type a given id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         [UmbracoTreeAuthorize(Constants.Trees.MemberTypes)]
         public MemberTypeDisplay GetById(int id)
         {
-            var ct = Services.MemberTypeService.Get(id);
-            if (ct == null)
+            var memberType = Services.MemberTypeService.Get(id);
+            if (memberType == null)
             {
                 throw new HttpResponseException(HttpStatusCode.NotFound);
             }
 
-            var dto = Mapper.Map<IMemberType, MemberTypeDisplay>(ct);
+            var dto = Mapper.Map<IMemberType, MemberTypeDisplay>(memberType);
             return dto;
         }
 
         /// <summary>
-        /// Deletes a document type with a given ID
+        /// Gets the member type a given guid
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [UmbracoTreeAuthorize(Constants.Trees.MemberTypes)]
+        public MemberTypeDisplay GetById(Guid id)
+        {
+            var memberType = Services.MemberTypeService.Get(id);
+            if (memberType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var dto = Mapper.Map<IMemberType, MemberTypeDisplay>(memberType);
+            return dto;
+        }
+
+        /// <summary>
+        /// Gets the member type a given udi
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [UmbracoTreeAuthorize(Constants.Trees.MemberTypes)]
+        public MemberTypeDisplay GetById(Udi id)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi == null)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+
+            var memberType = Services.MemberTypeService.Get(guidUdi.Guid);
+            if (memberType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var dto = Mapper.Map<IMemberType, MemberTypeDisplay>(memberType);
+            return dto;
+        }
+
+        /// <summary>
+        /// Deletes a document type with a given id
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
diff --git a/src/Umbraco.Web/Editors/NuCacheStatusController.cs b/src/Umbraco.Web/Editors/NuCacheStatusController.cs
index 86dbdd4e01..589c763363 100644
--- a/src/Umbraco.Web/Editors/NuCacheStatusController.cs
+++ b/src/Umbraco.Web/Editors/NuCacheStatusController.cs
@@ -35,6 +35,11 @@ namespace Umbraco.Web.Editors
             service.RebuildContentDbCache();
             service.RebuildMediaDbCache();
             service.RebuildMemberDbCache();
+
+            // TODO: Shouldn't this just be ??
+            // service.Rebuild();
+
+
             return service.GetStatus();
         }
 
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index 1030498734..1d8f02dbf9 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -24,7 +24,7 @@ using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 using File = System.IO.File;
 using Notification = Umbraco.Web.Models.ContentEditing.Notification;
-
+using CharArrays = Umbraco.Core.Constants.CharArrays;
 namespace Umbraco.Web.Editors
 {
     /// <summary>
@@ -151,7 +151,7 @@ namespace Umbraco.Web.Editors
             //get the files
             foreach (var file in result.FileData)
             {
-                var fileName = file.Headers.ContentDisposition.FileName.Trim('\"');
+                var fileName = file.Headers.ContentDisposition.FileName.Trim(CharArrays.DoubleQuote);
                 var ext = fileName.Substring(fileName.LastIndexOf('.') + 1).ToLower();
 
                 if (ext.InvariantEquals("zip") || ext.InvariantEquals("umb"))
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index c1848419dc..f00805d2dc 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -12,6 +12,7 @@ using Umbraco.Web.JavaScript;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
+using Umbraco.Web.Services;
 using Constants = Umbraco.Core.Constants;
 
 namespace Umbraco.Web.Editors
@@ -24,28 +25,56 @@ namespace Umbraco.Web.Editors
         private readonly IPublishedSnapshotService _publishedSnapshotService;
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly ILocalizationService _localizationService;
+        private readonly IIconService _iconService;
 
+        [Obsolete("Use the constructor that injects IIconService.")]
         public PreviewController(
             UmbracoFeatures features,
             IGlobalSettings globalSettings,
             IPublishedSnapshotService publishedSnapshotService,
             IUmbracoContextAccessor umbracoContextAccessor,
             ILocalizationService localizationService)
+            :this(features,
+                globalSettings,
+                publishedSnapshotService,
+                umbracoContextAccessor,
+                localizationService,
+                Current.IconService)
+        {
+
+        }
+
+        public PreviewController(
+            UmbracoFeatures features,
+            IGlobalSettings globalSettings,
+            IPublishedSnapshotService publishedSnapshotService,
+            IUmbracoContextAccessor umbracoContextAccessor,
+            ILocalizationService localizationService,
+            IIconService iconService)
         {
             _features = features;
             _globalSettings = globalSettings;
             _publishedSnapshotService = publishedSnapshotService;
             _umbracoContextAccessor = umbracoContextAccessor;
             _localizationService = localizationService;
+            _iconService = iconService;
         }
 
         [UmbracoAuthorize(redirectToUmbracoLogin: true)]
         [DisableBrowserCache]
-        public ActionResult Index()
+        public ActionResult Index(int? id = null)
         {
             var availableLanguages = _localizationService.GetAllLanguages();
+            if (id.HasValue)
+            {
+                var content = _umbracoContextAccessor.UmbracoContext.Content.GetById(true, id.Value);
+                if (content is null)
+                    return HttpNotFound();
 
-            var model = new BackOfficePreviewModel(_features, _globalSettings, availableLanguages);
+                availableLanguages = availableLanguages.Where(language => content.Cultures.ContainsKey(language.IsoCode));
+            }
+
+            var model = new BackOfficePreviewModel(_features, _globalSettings, availableLanguages, _iconService);
 
             if (model.PreviewExtendedHeaderView.IsNullOrWhiteSpace() == false)
             {
@@ -58,7 +87,6 @@ namespace Umbraco.Web.Editors
 
             return View(_globalSettings.Path.EnsureEndsWith('/') + "Views/Preview/" + "Index.cshtml", model);
         }
-
         /// <summary>
         /// Returns the JavaScript file for preview
         /// </summary>
@@ -79,6 +107,16 @@ namespace Umbraco.Web.Editors
         /// <returns></returns>
         [UmbracoAuthorize]
         public ActionResult Frame(int id, string culture)
+        {
+            EnterPreview(id);
+
+            // use a numeric URL because content may not be in cache and so .Url would fail
+            var query = culture.IsNullOrWhiteSpace() ? string.Empty : $"?culture={culture}";
+            Response.Redirect($"../../{id}.aspx{query}", true);
+
+            return null;
+        }
+        public ActionResult EnterPreview(int id)
         {
             var user = _umbracoContextAccessor.UmbracoContext.Security.CurrentUser;
 
@@ -86,13 +124,8 @@ namespace Umbraco.Web.Editors
 
             Response.Cookies.Set(new HttpCookie(Constants.Web.PreviewCookieName, previewToken));
 
-            // use a numeric url because content may not be in cache and so .Url would fail
-            var query = culture.IsNullOrWhiteSpace() ? string.Empty : $"?culture={culture}";
-            Response.Redirect($"../../{id}.aspx{query}", true);
-
             return null;
         }
-
         public ActionResult End(string redir = null)
         {
             var previewToken = Request.GetPreviewCookieValue();
@@ -101,6 +134,9 @@ namespace Umbraco.Web.Editors
 
             System.Web.HttpContext.Current.ExpireCookie(Constants.Web.PreviewCookieName);
 
+            // Expire Client-side cookie that determines whether the user has accepted to be in Preview Mode when visiting the website.
+            System.Web.HttpContext.Current.ExpireCookie(Constants.Web.AcceptPreviewCookieName);
+
             if (Uri.IsWellFormedUriString(redir, UriKind.Relative)
                 && redir.StartsWith("//") == false
                 && Uri.TryCreate(redir, UriKind.Relative, out Uri url))
diff --git a/src/Umbraco.Web/Editors/RelationTypeController.cs b/src/Umbraco.Web/Editors/RelationTypeController.cs
index f12faf77cc..3e45600be9 100644
--- a/src/Umbraco.Web/Editors/RelationTypeController.cs
+++ b/src/Umbraco.Web/Editors/RelationTypeController.cs
@@ -17,6 +17,7 @@ using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 using Constants = Umbraco.Core.Constants;
+using System.Web.Http.Controllers;
 
 namespace Umbraco.Web.Editors
 {
@@ -26,6 +27,7 @@ namespace Umbraco.Web.Editors
     [PluginController("UmbracoApi")]
     [UmbracoTreeAuthorize(Constants.Trees.RelationTypes)]
     [EnableOverrideAuthorization]
+    [RelationTypeControllerConfiguration]
     public class RelationTypeController : BackOfficeNotificationsController
     {
         public RelationTypeController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
@@ -34,22 +36,65 @@ namespace Umbraco.Web.Editors
         }
 
         /// <summary>
-        /// Gets a relation type by ID.
+        /// Configures this controller with a custom action selector
+        /// </summary>
+        private class RelationTypeControllerConfigurationAttribute : Attribute, IControllerConfiguration
+        {
+            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
+            {
+                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))
+                ));
+            }
+        }
+
+        /// <summary>
+        /// Gets a relation type by id
         /// </summary>
         /// <param name="id">The relation type ID.</param>
         /// <returns>Returns the <see cref="RelationTypeDisplay"/>.</returns>
         public RelationTypeDisplay GetById(int id)
         {
             var relationType = Services.RelationService.GetRelationTypeById(id);
-
             if (relationType == null)
             {
                 throw new HttpResponseException(HttpStatusCode.NotFound);
             }
+            return Mapper.Map<IRelationType, RelationTypeDisplay>(relationType);
+        }
 
-            var display = Mapper.Map<IRelationType, RelationTypeDisplay>(relationType);
-            
-            return display;
+        /// <summary>
+        /// Gets a relation type by guid
+        /// </summary>
+        /// <param name="id">The relation type ID.</param>
+        /// <returns>Returns the <see cref="RelationTypeDisplay"/>.</returns>
+        public RelationTypeDisplay GetById(Guid id)
+        {
+            var relationType = Services.RelationService.GetRelationTypeById(id);
+            if (relationType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+            return Mapper.Map<IRelationType, RelationTypeDisplay>(relationType);
+        }
+
+        /// <summary>
+        /// Gets a relation type by udi
+        /// </summary>
+        /// <param name="id">The relation type ID.</param>
+        /// <returns>Returns the <see cref="RelationTypeDisplay"/>.</returns>
+        public RelationTypeDisplay GetById(Udi id)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi == null)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+
+            var relationType = Services.RelationService.GetRelationTypeById(guidUdi.Guid);
+            if (relationType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+            return Mapper.Map<IRelationType, RelationTypeDisplay>(relationType);
         }
 
         public PagedResult<RelationDisplay> GetPagedResults(int id, int pageNumber = 1, int pageSize = 100)
diff --git a/src/Umbraco.Web/Editors/TemplateController.cs b/src/Umbraco.Web/Editors/TemplateController.cs
index 903446d23c..63b137c2d1 100644
--- a/src/Umbraco.Web/Editors/TemplateController.cs
+++ b/src/Umbraco.Web/Editors/TemplateController.cs
@@ -1,8 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
+using System.Web.Http.Controllers;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
@@ -13,6 +15,7 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 using Constants = Umbraco.Core.Constants;
 
@@ -20,6 +23,7 @@ namespace Umbraco.Web.Editors
 {
     [PluginController("UmbracoApi")]
     [UmbracoTreeAuthorize(Constants.Trees.Templates)]
+    [TemplateControllerConfiguration]
     public class TemplateController : BackOfficeNotificationsController
     {
         public TemplateController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
@@ -27,6 +31,19 @@ namespace Umbraco.Web.Editors
         {
         }
 
+        /// <summary>
+        /// Configures this controller with a custom action selector
+        /// </summary>
+        private class TemplateControllerConfigurationAttribute : Attribute, IControllerConfiguration
+        {
+            public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
+            {
+                controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
+                    new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))
+                ));
+            }
+        }
+
         /// <summary>
         /// Gets data type by alias
         /// </summary>
@@ -48,7 +65,7 @@ namespace Umbraco.Web.Editors
         }
 
         /// <summary>
-        /// Gets the content json for the content id
+        /// Gets the template json for the template id
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -61,6 +78,40 @@ namespace Umbraco.Web.Editors
             return Mapper.Map<ITemplate, TemplateDisplay>(template);
         }
 
+        /// <summary>
+        /// Gets the template json for the template guid
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public TemplateDisplay GetById(Guid id)
+        {
+            var template = Services.FileService.GetTemplate(id);
+            if (template == null)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+
+            return Mapper.Map<ITemplate, TemplateDisplay>(template);
+        }
+
+        /// <summary>
+        /// Gets the template json for the template udi
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public TemplateDisplay GetById(Udi id)
+        {
+            var guidUdi = id as GuidUdi;
+            if (guidUdi == null)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+
+            var template = Services.FileService.GetTemplate(guidUdi.Guid);
+            if (template == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            return Mapper.Map<ITemplate, TemplateDisplay>(template);
+        }
+
         /// <summary>
         /// Deletes a template with a given ID
         /// </summary>
diff --git a/src/Umbraco.Web/Editors/TemplateQueryController.cs b/src/Umbraco.Web/Editors/TemplateQueryController.cs
index ed737e7749..1f07267802 100644
--- a/src/Umbraco.Web/Editors/TemplateQueryController.cs
+++ b/src/Umbraco.Web/Editors/TemplateQueryController.cs
@@ -71,7 +71,11 @@ namespace Umbraco.Web.Editors
                 QueryExpression = queryExpression.ToString(),
                 ResultCount = results.Count,
                 ExecutionTime = timer.ElapsedMilliseconds,
-                SampleResults = results.Take(20).Select(x => new TemplateQueryResult { Icon = "icon-file", Name = x.Name })
+                SampleResults = results.Take(20).Select(x => new TemplateQueryResult
+                {
+                    Icon = "icon-document",
+                    Name = x.Name
+                })
             };
         }
 
diff --git a/src/Umbraco.Web/Editors/TinyMceController.cs b/src/Umbraco.Web/Editors/TinyMceController.cs
index c6c1acd048..1d292c64fd 100644
--- a/src/Umbraco.Web/Editors/TinyMceController.cs
+++ b/src/Umbraco.Web/Editors/TinyMceController.cs
@@ -74,7 +74,7 @@ namespace Umbraco.Web.Editors
 
             // Really we should only have one file per request to this endpoint
             var file = result.FileData[0];
-            var fileName = file.Headers.ContentDisposition.FileName.Trim(new[] { '\"' }).TrimEnd();
+            var fileName = file.Headers.ContentDisposition.FileName.Trim(Constants.CharArrays.DoubleQuote).TrimEnd();
             var safeFileName = fileName.ToSafeFileName();
             var ext = safeFileName.Substring(safeFileName.LastIndexOf('.') + 1).ToLower();
 
diff --git a/src/Umbraco.Web/Editors/TourController.cs b/src/Umbraco.Web/Editors/TourController.cs
index 8991bcdd6a..943d5674a2 100644
--- a/src/Umbraco.Web/Editors/TourController.cs
+++ b/src/Umbraco.Web/Editors/TourController.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.IO;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Tour;
+using CharArrays = Umbraco.Core.Constants.CharArrays;
 
 namespace Umbraco.Web.Editors
 {
@@ -56,7 +57,7 @@ namespace Umbraco.Web.Editors
             {
                 foreach (var plugin in Directory.EnumerateDirectories(appPlugins))
                 {
-                    var pluginName = Path.GetFileName(plugin.TrimEnd('\\'));
+                    var pluginName = Path.GetFileName(plugin.TrimEnd(CharArrays.Backslash));
                     var pluginFilters = _filters.Where(x => x.PluginName != null && x.PluginName.IsMatch(pluginName))
                         .ToList();
 
@@ -138,7 +139,7 @@ namespace Umbraco.Web.Editors
                         {
                             return false;
                         }
-                        var contentTypes = x.ContentType.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(ct => ct.Trim());
+                        var contentTypes = x.ContentType.Split(CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).Select(ct => ct.Trim());
                         return contentTypes.Intersect(doctypeAliasWithCompositions).Any();
                     });
         }
diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs
index c27d7c9f48..3f29203819 100644
--- a/src/Umbraco.Web/Editors/UsersController.cs
+++ b/src/Umbraco.Web/Editors/UsersController.cs
@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Runtime.Serialization;
 using System.Security.Cryptography;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using System.Web.Http;
@@ -29,6 +31,7 @@ using Umbraco.Web.Editors.Filters;
 using Umbraco.Web.Models;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
+using Umbraco.Web.Security;
 using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 using Constants = Umbraco.Core.Constants;
@@ -49,7 +52,7 @@ namespace Umbraco.Web.Editors
         }
 
         /// <summary>
-        /// Returns a list of the sizes of gravatar urls for the user or null if the gravatar server cannot be reached
+        /// Returns a list of the sizes of gravatar URLs for the user or null if the gravatar server cannot be reached
         /// </summary>
         /// <returns></returns>
         public string[] GetCurrentUserAvatarUrls()
@@ -100,7 +103,7 @@ namespace Umbraco.Web.Editors
 
             //get the file info
             var file = result.FileData[0];
-            var fileName = file.Headers.ContentDisposition.FileName.Trim(new[] { '\"' }).TrimEnd();
+            var fileName = file.Headers.ContentDisposition.FileName.Trim(Constants.CharArrays.DoubleQuote).TrimEnd();
             var safeFileName = fileName.ToSafeFileName();
             var ext = safeFileName.Substring(safeFileName.LastIndexOf('.') + 1).ToLower();
 
@@ -178,6 +181,33 @@ namespace Umbraco.Web.Editors
             return result;
         }
 
+        /// <summary>
+        /// Get users by integer ids
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        [OutgoingEditorModelEvent]
+        [AdminUsersAuthorize]
+        public IEnumerable<UserDisplay> GetByIds([FromJsonPath]int[] ids)
+        {
+            if (ids == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            if (ids.Length == 0)
+                return Enumerable.Empty<UserDisplay>();
+
+            var users = Services.UserService.GetUsersById(ids);
+            if (users == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var result = Mapper.MapEnumerable<IUser, UserDisplay>(users);
+            return result;
+        }
+
         /// <summary>
         /// Returns a paged users collection
         /// </summary>
@@ -346,12 +376,6 @@ namespace Umbraco.Web.Editors
                 throw new HttpResponseException(Request.CreateErrorResponse(HttpStatusCode.BadRequest, ModelState));
             }
 
-            if (EmailSender.CanSendRequiredEmail == false)
-            {
-                throw new HttpResponseException(
-                    Request.CreateNotificationValidationErrorResponse("No Email server is configured"));
-            }
-
             IUser user;
             if (Current.Configs.Settings().Security.UsernameIsEmail)
             {
@@ -361,9 +385,17 @@ namespace Umbraco.Web.Editors
             else
             {
                 //first validate the username if we're showing it
-                user = CheckUniqueUsername(userSave.Username, u => u.LastLoginDate != default(DateTime) || u.EmailConfirmedDate.HasValue);
+                user = CheckUniqueUsername(userSave.Username, u => u.LastLoginDate != default || u.EmailConfirmedDate.HasValue);
+            }
+            user = CheckUniqueEmail(userSave.Email, u => u.LastLoginDate != default || u.EmailConfirmedDate.HasValue);
+
+            var userMgr = TryGetOwinContext().Result.GetBackOfficeUserManager();
+            
+            if (!EmailSender.CanSendRequiredEmail && !userMgr.HasSendingUserInviteEventHandler)
+            {
+                throw new HttpResponseException(
+                    Request.CreateNotificationValidationErrorResponse("No Email server is configured"));
             }
-            user = CheckUniqueEmail(userSave.Email, u => u.LastLoginDate != default(DateTime) || u.EmailConfirmedDate.HasValue);
 
             //Perform authorization here to see if the current user can actually save this user with the info being requested
             var authHelper = new UserEditorAuthorizationHelper(Services.ContentService, Services.MediaService, Services.UserService, Services.EntityService);
@@ -397,16 +429,48 @@ namespace Umbraco.Web.Editors
             //ensure the invited date is set
             user.InvitedDate = DateTime.Now;
 
-            //Save the updated user
+            //Save the updated user (which will process the user groups too)
             Services.UserService.Save(user);
             var display = Mapper.Map<UserDisplay>(user);
 
-            //send the email
+            var inviteArgs = new UserInviteEventArgs(
+                Request.TryGetHttpContext().Result.GetCurrentRequestIpAddress(),
+                performingUser: Security.GetUserId().Result,
+                userSave,
+                user);
 
-            await SendUserInviteEmailAsync(display, Security.CurrentUser.Name, Security.CurrentUser.Email, user, userSave.Message);
+            try
+            {
+                userMgr.RaiseSendingUserInvite(inviteArgs);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error<UsersController>(ex, "An error occurred in a custom event handler while inviting the user");
+                throw new HttpResponseException(
+                    Request.CreateNotificationValidationErrorResponse($"An error occurred inviting the user (check logs for more info): {ex.Message}"));
+            }
+
+            // If the event is handled then no need to send the email
+            if (inviteArgs.InviteHandled)
+            {
+                // if no user result was created then map the minimum args manually for the UI
+                if (!inviteArgs.ShowUserResult)
+                {
+                    display = new UserDisplay
+                    {
+                        Name = userSave.Name,
+                        Email = userSave.Email,
+                        Username = userSave.Username
+                    };
+                }                
+            }
+            else
+            {
+                //send the email
+                await SendUserInviteEmailAsync(display, Security.CurrentUser.Name, Security.CurrentUser.Email, user, userSave.Message);                
+            }
 
             display.AddSuccessNotification(Services.TextService.Localize("speechBubbles/resendInviteHeader"), Services.TextService.Localize("speechBubbles/resendInviteSuccess", new[] { user.Name }));
-
             return display;
         }
 
@@ -451,7 +515,7 @@ namespace Umbraco.Web.Editors
                 WebUtility.UrlEncode("|"),
                 token.ToUrlBase64());
 
-            // Get an mvc helper to get the url
+            // Get an mvc helper to get the URL
             var http = EnsureHttpContext();
             var urlHelper = new UrlHelper(http.Request.RequestContext);
             var action = urlHelper.Action("VerifyInvite", "BackOffice",
@@ -491,9 +555,9 @@ namespace Umbraco.Web.Editors
         /// <param name="userSave"></param>
         /// <returns></returns>
         [OutgoingEditorModelEvent]
-        public async Task<UserDisplay> PostSaveUser(UserSave userSave)
+        public UserDisplay PostSaveUser(UserSave userSave)
         {
-            if (userSave == null) throw new ArgumentNullException("userSave");
+            if (userSave == null) throw new ArgumentNullException(nameof(userSave));
 
             if (ModelState.IsValid == false)
             {
@@ -518,6 +582,14 @@ namespace Umbraco.Web.Editors
 
             var hasErrors = false;
 
+            // we need to check if there's any Deny Local login providers present, if so we need to ensure that the user's email address cannot be changed
+            var owinContext = Request.TryGetOwinContext().Result;
+            var hasDenyLocalLogin = owinContext.Authentication.HasDenyLocalLogin();
+            if (hasDenyLocalLogin)
+            {
+                userSave.Email = found.Email; // it cannot change, this would only happen if people are mucking around with the request
+            }
+
             var existing = Services.UserService.GetByEmail(userSave.Email);
             if (existing != null && existing.Id != userSave.Id)
             {
@@ -562,7 +634,15 @@ namespace Umbraco.Web.Editors
 
             var display = Mapper.Map<UserDisplay>(user);
 
-            display.AddSuccessNotification(Services.TextService.Localize("speechBubbles/operationSavedHeader"), Services.TextService.Localize("speechBubbles/editUserSaved"));
+            // determine if the user has changed their own language;
+            var userHasChangedOwnLanguage =
+                user.Id == Security.CurrentUser.Id && Security.CurrentUser.Language != user.Language;
+
+            var textToLocalise = userHasChangedOwnLanguage ? "speechBubbles/operationSavedHeaderReloadUser" : "speechBubbles/operationSavedHeader";
+            var culture = userHasChangedOwnLanguage
+                ? CultureInfo.GetCultureInfo(user.Language)
+                : Thread.CurrentThread.CurrentUICulture;
+            display.AddSuccessNotification(Services.TextService.Localize(textToLocalise, culture), Services.TextService.Localize("speechBubbles/editUserSaved", culture));
             return display;
         }
 
diff --git a/src/Umbraco.Web/FormDataCollectionExtensions.cs b/src/Umbraco.Web/FormDataCollectionExtensions.cs
index 52f86dcc59..aabf13ac9b 100644
--- a/src/Umbraco.Web/FormDataCollectionExtensions.cs
+++ b/src/Umbraco.Web/FormDataCollectionExtensions.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Web
             {
                 builder.Append(string.Format("{0}={1}&", i.Key, i.Value));
             }
-            return builder.ToString().TrimEnd('&');
+            return builder.ToString().TrimEnd(Constants.CharArrays.Ampersand);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
index 1d518fa1d3..466d6830c0 100644
--- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
@@ -9,11 +9,14 @@ using Umbraco.Core.Composing;
 using Umbraco.Web.Editors;
 using Umbraco.Web.Features;
 using Umbraco.Web.Models;
+using Umbraco.Core;
 
 namespace Umbraco.Web
 {
     using Core.Configuration;
+    using System;
     using Umbraco.Web.JavaScript;
+    using Umbraco.Web.Security;
 
     /// <summary>
     /// HtmlHelper extensions for the back office
@@ -26,7 +29,7 @@ namespace Umbraco.Web
         /// <param name="html"></param>
         /// <param name="uri"></param>
         /// <param name="externalLoginsUrl">
-        /// The post url used to sign in with external logins - this can change depending on for what service the external login is service.
+        /// The post URL used to sign in with external logins - this can change depending on for what service the external login is service.
         /// Example: normal back office login or authenticating upgrade login
         /// </param>
         /// <param name="features"></param>
@@ -56,10 +59,9 @@ namespace Umbraco.Web
         /// <param name="html"></param>
         /// <param name="externalLoginErrors"></param>
         /// <returns></returns>
-        public static IHtmlString AngularValueExternalLoginInfoScript(this HtmlHelper html, IEnumerable<string> externalLoginErrors)
+        public static IHtmlString AngularValueExternalLoginInfoScript(this HtmlHelper html, BackOfficeExternalLoginProviderErrors externalLoginErrors)
         {
-            var loginProviders = html.ViewContext.HttpContext.GetOwinContext().Authentication.GetExternalAuthenticationTypes()
-                .Where(p => p.Properties.ContainsKey("UmbracoBackOffice"))
+            var loginProviders = html.ViewContext.HttpContext.GetOwinContext().Authentication.GetBackOfficeExternalLoginProviders()
                 .Select(p => new
                 {
                     authType = p.AuthenticationType,
@@ -74,13 +76,15 @@ namespace Umbraco.Web
 
             if (externalLoginErrors != null)
             {
-                foreach (var error in externalLoginErrors)
+                foreach (var error in externalLoginErrors.Errors)
                 {
-                    sb.AppendFormat(@"errors.push(""{0}"");", error).AppendLine();
+                    sb.AppendFormat(@"errors.push(""{0}"");", error.ToSingleLine()).AppendLine();
                 }
             }
 
             sb.AppendLine(@"app.value(""externalLoginInfo"", {");
+            if (externalLoginErrors?.AuthenticationType != null)
+                sb.AppendLine($@"errorProvider: '{externalLoginErrors.AuthenticationType}',");
             sb.AppendLine(@"errors: errors,");
             sb.Append(@"providers: ");
             sb.AppendLine(JsonConvert.SerializeObject(loginProviders));
@@ -89,6 +93,12 @@ namespace Umbraco.Web
             return html.Raw(sb.ToString());
         }
 
+        [Obsolete("Use the other overload instead")]
+        public static IHtmlString AngularValueExternalLoginInfoScript(this HtmlHelper html, IEnumerable<string> externalLoginErrors)
+        {
+            return html.AngularValueExternalLoginInfoScript(new BackOfficeExternalLoginProviderErrors(string.Empty, externalLoginErrors));
+        }
+
         /// <summary>
         /// Used to render the script that will pass in the angular "resetPasswordCodeInfo" service/value on page load
         /// </summary>
diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
index 4b1de86bcf..e19ae883e9 100644
--- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
@@ -83,6 +83,12 @@ namespace Umbraco.Web
             Func<object, ViewDataDictionary, string> contextualKeyBuilder = null)
         {
             var cacheKey = new StringBuilder(partialViewName);
+             //let's always cache by the current culture to allow variants to have different cache results
+            var cultureName = System.Threading.Thread.CurrentThread.CurrentUICulture.Name;
+            if (!String.IsNullOrEmpty(cultureName))
+            {
+                cacheKey.AppendFormat("{0}-", cultureName);
+            }
             if (cacheByPage)
             {
                 if (Current.UmbracoContext == null)
diff --git a/src/Umbraco.Web/HttpCookieExtensions.cs b/src/Umbraco.Web/HttpCookieExtensions.cs
index 5f520653f5..d9294c7ff0 100644
--- a/src/Umbraco.Web/HttpCookieExtensions.cs
+++ b/src/Umbraco.Web/HttpCookieExtensions.cs
@@ -1,9 +1,11 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Web;
 using Microsoft.Owin;
+using Newtonsoft.Json;
 using Umbraco.Core;
 
 namespace Umbraco.Web
@@ -37,10 +39,10 @@ namespace Umbraco.Web
                 if (cookiesHeaderValue == null)
                     return null;
 
-                var cookieCollection = cookiesHeaderValue.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+                var cookieCollection = cookiesHeaderValue.Split(Constants.CharArrays.Semicolon, StringSplitOptions.RemoveEmptyEntries);
                 foreach (var cookieNameValue in cookieCollection)
                 {
-                    var parts = cookieNameValue.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntries);
+                    var parts = cookieNameValue.Split(Constants.CharArrays.EqualsChar, StringSplitOptions.RemoveEmptyEntries);
                     if (parts.Length != 2) continue;
                     if (parts[0].Trim().Equals(cookieName, StringComparison.InvariantCultureIgnoreCase))
                         return parts[1].Trim();
@@ -61,11 +63,11 @@ namespace Umbraco.Web
             http.Request.Cookies.Remove(cookieName);
 
             //expire from the response
-            var angularCookie = http.Response.Cookies[cookieName];
-            if (angularCookie != null)
+            var cookie = http.Response.Cookies[cookieName];
+            if (cookie != null)
             {
                 //this will expire immediately and be removed from the browser
-                angularCookie.Expires = DateTime.Now.AddYears(-1);
+                cookie.Expires = DateTime.Now.AddYears(-1);
             }
             else
             {
diff --git a/src/Umbraco.Web/ImageCropperTemplateCoreExtensions.cs b/src/Umbraco.Web/ImageCropperTemplateCoreExtensions.cs
index 7ac5578d75..f39b267e18 100644
--- a/src/Umbraco.Web/ImageCropperTemplateCoreExtensions.cs
+++ b/src/Umbraco.Web/ImageCropperTemplateCoreExtensions.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web
     public static class ImageCropperTemplateCoreExtensions
     {
         /// <summary>
-        /// Gets the ImageProcessor Url by the crop alias (from the "umbracoFile" property alias) on the IPublishedContent item
+        /// Gets the ImageProcessor URL by the crop alias (from the "umbracoFile" property alias) on the IPublishedContent item
         /// </summary>
         /// <param name="mediaItem">
         /// The IPublishedContent item.
@@ -21,7 +21,7 @@ namespace Umbraco.Web
         /// The crop alias e.g. thumbnail
         /// </param>
         /// <returns>
-        /// The ImageProcessor.Web Url.
+        /// The ImageProcessor.Web URL.
         /// </returns>
         public static string GetCropUrl(this IPublishedContent mediaItem, string cropAlias, IImageUrlGenerator imageUrlGenerator)
         {
@@ -29,7 +29,7 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// Gets the ImageProcessor Url by the crop alias using the specified property containing the image cropper Json data on the IPublishedContent item.
+        /// Gets the ImageProcessor URL by the crop alias using the specified property containing the image cropper Json data on the IPublishedContent item.
         /// </summary>
         /// <param name="mediaItem">
         /// The IPublishedContent item.
@@ -41,7 +41,7 @@ namespace Umbraco.Web
         /// The crop alias e.g. thumbnail
         /// </param>
         /// <returns>
-        /// The ImageProcessor.Web Url.
+        /// The ImageProcessor.Web URL.
         /// </returns>
         public static string GetCropUrl(this IPublishedContent mediaItem, string propertyAlias, string cropAlias, IImageUrlGenerator imageUrlGenerator)
         {
@@ -49,7 +49,7 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// Gets the ImageProcessor Url from the IPublishedContent item.
+        /// Gets the ImageProcessor URL from the IPublishedContent item.
         /// </summary>
         /// <param name="mediaItem">
         /// The IPublishedContent item.
@@ -156,10 +156,10 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// Gets the ImageProcessor Url from the image path.
+        /// Gets the ImageProcessor URL from the image path.
         /// </summary>
         /// <param name="imageUrl">
-        /// The image url.
+        /// The image URL.
         /// </param>
         /// <param name="width">
         /// The width of the output image.
@@ -238,13 +238,13 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// Gets the ImageProcessor Url from the image path.
+        /// Gets the ImageProcessor URL from the image path.
         /// </summary>
         /// <param name="imageUrl">
-        /// The image url.
+        /// The image URL.
         /// </param>
         /// <param name="imageUrlGenerator">
-        /// The generator that will process all the options and the image URL to return a full image urls with all processing options appended
+        /// The generator that will process all the options and the image URL to return a full image URLs with all processing options appended
         /// </param>
         /// <param name="cropDataSet"></param>
         /// <param name="width">
diff --git a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs
index f3833ba42a..26dd2a5d36 100644
--- a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs
+++ b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs
@@ -13,12 +13,12 @@ using Umbraco.Web.Models;
 namespace Umbraco.Web
 {
     /// <summary>
-    /// Provides extension methods for getting ImageProcessor Url from the core Image Cropper property editor
+    /// Provides extension methods for getting ImageProcessor URL from the core Image Cropper property editor
     /// </summary>
     public static class ImageCropperTemplateExtensions
     {
         /// <summary>
-        /// Gets the ImageProcessor Url by the crop alias (from the "umbracoFile" property alias) on the IPublishedContent item
+        /// Gets the ImageProcessor URL by the crop alias (from the "umbracoFile" property alias) on the IPublishedContent item
         /// </summary>
         /// <param name="mediaItem">
         /// The IPublishedContent item.
@@ -27,12 +27,12 @@ namespace Umbraco.Web
         /// The crop alias e.g. thumbnail
         /// </param>
         /// <returns>
-        /// The ImageProcessor.Web Url.
+        /// The ImageProcessor.Web URL.
         /// </returns>
         public static string GetCropUrl(this IPublishedContent mediaItem, string cropAlias) => ImageCropperTemplateCoreExtensions.GetCropUrl(mediaItem, cropAlias, Current.ImageUrlGenerator);
 
         /// <summary>
-        /// Gets the ImageProcessor Url by the crop alias using the specified property containing the image cropper Json data on the IPublishedContent item.
+        /// Gets the ImageProcessor URL by the crop alias using the specified property containing the image cropper Json data on the IPublishedContent item.
         /// </summary>
         /// <param name="mediaItem">
         /// The IPublishedContent item.
@@ -44,12 +44,12 @@ namespace Umbraco.Web
         /// The crop alias e.g. thumbnail
         /// </param>
         /// <returns>
-        /// The ImageProcessor.Web Url.
+        /// The ImageProcessor.Web URL.
         /// </returns>
         public static string GetCropUrl(this IPublishedContent mediaItem, string propertyAlias, string cropAlias) => ImageCropperTemplateCoreExtensions.GetCropUrl(mediaItem, propertyAlias, cropAlias, Current.ImageUrlGenerator);
 
         /// <summary>
-        /// Gets the ImageProcessor Url from the IPublishedContent item.
+        /// Gets the ImageProcessor URL from the IPublishedContent item.
         /// </summary>
         /// <param name="mediaItem">
         /// The IPublishedContent item.
@@ -118,10 +118,10 @@ namespace Umbraco.Web
              bool upScale = true) => ImageCropperTemplateCoreExtensions.GetCropUrl(mediaItem, Current.ImageUrlGenerator, width, height, propertyAlias, cropAlias, quality, imageCropMode, imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBuster, furtherOptions, ratioMode, upScale);
 
         /// <summary>
-        /// Gets the ImageProcessor Url from the image path.
+        /// Gets the ImageProcessor URL from the image path.
         /// </summary>
         /// <param name="imageUrl">
-        /// The image url.
+        /// The image URL.
         /// </param>
         /// <param name="width">
         /// The width of the output image.
@@ -187,10 +187,10 @@ namespace Umbraco.Web
             bool upScale = true) => ImageCropperTemplateCoreExtensions.GetCropUrl(imageUrl, Current.ImageUrlGenerator, width, height, imageCropperValue, cropAlias, quality, imageCropMode, imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBusterValue, furtherOptions, ratioMode, upScale);
 
         /// <summary>
-        /// Gets the ImageProcessor Url from the image path.
+        /// Gets the ImageProcessor URL from the image path.
         /// </summary>
         /// <param name="imageUrl">
-        /// The image url.
+        /// The image URL.
         /// </param>
         /// <param name="cropDataSet"></param>
         /// <param name="width">
diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs
index 902ebbcd53..fa40ea517c 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs
@@ -61,7 +61,7 @@ namespace Umbraco.Web.Install.Controllers
                 }
             }
 
-            // gen the install base url
+            // gen the install base URL
             ViewData.SetInstallApiBaseUrl(Url.GetUmbracoApiService("GetSetup", "InstallApi", "UmbracoInstall").TrimEnd("GetSetup"));
 
             // get the base umbraco folder
diff --git a/src/Umbraco.Web/Install/InstallHelper.cs b/src/Umbraco.Web/Install/InstallHelper.cs
index b74a20c27c..998e32d8ad 100644
--- a/src/Umbraco.Web/Install/InstallHelper.cs
+++ b/src/Umbraco.Web/Install/InstallHelper.cs
@@ -30,6 +30,18 @@ namespace Umbraco.Web.Install
         private readonly IInstallationService _installationService;
         private InstallationType? _installationType;
 
+
+        [Obsolete("Use the constructor with IInstallationService injected.")]
+        public InstallHelper(
+        IUmbracoContextAccessor umbracoContextAccessor,
+            DatabaseBuilder databaseBuilder,
+            ILogger logger,
+            IGlobalSettings globalSettings)
+            : this(umbracoContextAccessor, databaseBuilder, logger, globalSettings, Current.Factory.GetInstance<IInstallationService>())
+        {
+
+        }
+
         public InstallHelper(IUmbracoContextAccessor umbracoContextAccessor,
             DatabaseBuilder databaseBuilder,
             ILogger logger, IGlobalSettings globalSettings, IInstallationService installationService)
@@ -133,7 +145,7 @@ namespace Umbraco.Web.Install
                     return true;
                 }
 
-                return _databaseBuilder.HasSomeNonDefaultUser() == false;
+                return _databaseBuilder.IsUmbracoInstalled() == false;
             }
         }
 
diff --git a/src/Umbraco.Web/Install/InstallStepCollection.cs b/src/Umbraco.Web/Install/InstallStepCollection.cs
index 125572fef8..240a1dae8e 100644
--- a/src/Umbraco.Web/Install/InstallStepCollection.cs
+++ b/src/Umbraco.Web/Install/InstallStepCollection.cs
@@ -21,6 +21,7 @@ namespace Umbraco.Web.Install
                 a.OfType<NewInstallStep>().First(),
                 a.OfType<UpgradeStep>().First(),
                 a.OfType<FilePermissionsStep>().First(),
+                a.OfType<TelemetryIdentifierStep>().First(),
                 a.OfType<ConfigureMachineKey>().First(),
                 a.OfType<DatabaseConfigureStep>().First(),
                 a.OfType<DatabaseInstallStep>().First(),
diff --git a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
index 151265f394..aa445c04c6 100644
--- a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
@@ -12,6 +12,7 @@ using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Migrations.Install;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
 using Umbraco.Web.Install.Models;
 
@@ -124,31 +125,94 @@ namespace Umbraco.Web.Install.InstallSteps
         {
             get
             {
-                return RequiresExecution(null)
-              //the user UI
-                ? "user"
-              //the continue install UI
-              : "continueinstall";
+                return ShowView()
+                    // the user UI
+                    ? "user"
+                    // continue install UI
+                    : "continueinstall";
             }
         }
 
+        private InstallState GetInstallState()
+        {
+            var installState = InstallState.Unknown;
+
+            var databaseSettings = ConfigurationManager.ConnectionStrings[Constants.System.UmbracoConnectionName];
+
+            var hasVersion = !_globalSettings.ConfigurationStatus.IsNullOrWhiteSpace();
+            if (hasVersion)
+            {
+                installState = InstallState.HasVersion;
+            }
+
+            var hasConnString = databaseSettings != null && _databaseBuilder.IsDatabaseConfigured;
+            if (hasConnString)
+            {
+                installState = (installState | InstallState.HasConnectionString) & ~InstallState.Unknown;
+            }
+
+            var connStringConfigured = hasConnString ? _databaseBuilder.IsConnectionStringConfigured(databaseSettings) : false;
+            if (connStringConfigured)
+            {
+                installState = (installState | InstallState.ConnectionStringConfigured) & ~InstallState.Unknown;
+            }
+
+            var canConnect = connStringConfigured ? DbConnectionExtensions.IsConnectionAvailable(databaseSettings.ConnectionString, databaseSettings.ProviderName) : false;
+            if (canConnect)
+            {
+                installState = (installState | InstallState.CanConnect) & ~InstallState.Unknown;
+            }
+
+            var umbracoInstalled = canConnect ? _databaseBuilder.IsUmbracoInstalled() : false;
+            if (umbracoInstalled)
+            {
+                installState = (installState | InstallState.UmbracoInstalled) & ~InstallState.Unknown;
+            }
+
+            var hasNonDefaultUser = umbracoInstalled ? _databaseBuilder.HasSomeNonDefaultUser() : false;
+            if (hasNonDefaultUser)
+            {
+                installState = (installState | InstallState.HasNonDefaultUser) & ~InstallState.Unknown;
+            }
+
+            return installState;
+        }
+
+        private bool ShowView()
+        {
+            var installState = GetInstallState();
+
+            return installState.HasFlag(InstallState.Unknown)
+                || !installState.HasFlag(InstallState.UmbracoInstalled);
+        }
+
         public override bool RequiresExecution(UserModel model)
         {
-            //now we have to check if this is really a new install, the db might be configured and might contain data
-            var databaseSettings = ConfigurationManager.ConnectionStrings[Constants.System.UmbracoConnectionName];
+            var installState = GetInstallState();
 
-            //if there's already a version then there should def be a user but in some cases someone may have
-            // left a version number in there but cleared out their db conn string, in that case, it's really a new install.
-            if (_globalSettings.ConfigurationStatus.IsNullOrWhiteSpace() == false && databaseSettings != null) return false;
+            if (installState.HasFlag(InstallState.Unknown))
+            {
+                // In this one case when it's a brand new install and nothing has been configured, make sure the
+                // back office cookie is cleared so there's no old cookies lying around causing problems
+                _http.ExpireCookie(Current.Configs.Settings().Security.AuthCookieName);
+            }
 
-            if (_databaseBuilder.IsConnectionStringConfigured(databaseSettings) && _databaseBuilder.IsDatabaseConfigured)
-                return _databaseBuilder.HasSomeNonDefaultUser() == false;
+            return installState.HasFlag(InstallState.Unknown)
+                || !installState.HasFlag(InstallState.HasNonDefaultUser);
+        }
 
-            // In this one case when it's a brand new install and nothing has been configured, make sure the
-            // back office cookie is cleared so there's no old cookies lying around causing problems
-            _http.ExpireCookie(Current.Configs.Settings().Security.AuthCookieName);
-
-                return true;
+        [Flags]
+        private enum InstallState : short
+        {
+            // This is an easy way to avoid 0 enum assignment and not worry about
+            // manual calcs. https://www.codeproject.com/Articles/396851/Ending-the-Great-Debate-on-Enum-Flags
+            Unknown = 1,
+            HasVersion = 1 << 1,
+            HasConnectionString = 1 << 2,
+            ConnectionStringConfigured = 1 << 3,
+            CanConnect = 1 << 4,
+            UmbracoInstalled = 1 << 5,
+            HasNonDefaultUser = 1 << 6
         }
     }
 }
diff --git a/src/Umbraco.Web/Install/InstallSteps/TelemetryIdentifierStep.cs b/src/Umbraco.Web/Install/InstallSteps/TelemetryIdentifierStep.cs
new file mode 100644
index 0000000000..92fe70f7c5
--- /dev/null
+++ b/src/Umbraco.Web/Install/InstallSteps/TelemetryIdentifierStep.cs
@@ -0,0 +1,78 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Web.Install.Models;
+
+namespace Umbraco.Web.Install.InstallSteps
+{
+    [InstallSetupStep(InstallationType.NewInstall | InstallationType.Upgrade,
+        "TelemetryIdConfiguration", 0, "",
+        PerformsAppRestart = false)]
+    internal class TelemetryIdentifierStep : InstallSetupStep<object>
+    {
+        private readonly IProfilingLogger _logger;
+        private readonly IUmbracoSettingsSection _settings;
+
+        public TelemetryIdentifierStep(IProfilingLogger logger, IUmbracoSettingsSection settings)
+        {
+            _logger = logger;
+            _settings = settings;
+        }
+
+        public override Task<InstallSetupResult> ExecuteAsync(object model)
+        {
+            // Generate GUID
+            var telemetrySiteIdentifier = Guid.NewGuid();
+
+            // Modify the XML to add a new GUID site identifier
+            // hack: ensure this does not trigger a restart
+            using (ChangesMonitor.Suspended())
+            {
+                var umbracoSettingsPath = IOHelper.MapPath(SystemFiles.UmbracoSettings);
+                if(File.Exists(umbracoSettingsPath) == false)
+                {
+                    // Log an error
+                    _logger.Error<TelemetryIdentifierStep>("Unable to find umbracoSettings.config file to add telemetry site identifier");
+                    return Task.FromResult<InstallSetupResult>(null);
+                }
+
+                try
+                {
+                    var umbracoConfigXml = XDocument.Load(umbracoSettingsPath, LoadOptions.PreserveWhitespace);
+                    if (umbracoConfigXml.Root != null)
+                    {
+                        var backofficeElement = umbracoConfigXml.Root.Element("backOffice");
+                        if (backofficeElement == null)
+                            return Task.FromResult<InstallSetupResult>(null);
+
+                        // Will add ID attribute if it does not exist
+                        backofficeElement.SetAttributeValue("id", telemetrySiteIdentifier.ToString());
+
+                        // Save file back down
+                        umbracoConfigXml.Save(umbracoSettingsPath, SaveOptions.DisableFormatting);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.Error<TelemetryIdentifierStep>(ex, "Couldn't update umbracoSettings.config with a backoffice with a telemetry site identifier");
+                }
+            }
+
+            return Task.FromResult<InstallSetupResult>(null);
+        }
+
+        public override bool RequiresExecution(object model)
+        {
+            // Verify that XML attribute is not empty string
+            // Try & get a value stored in umbracoSettings.config on the backoffice XML element ID attribute
+            var backofficeIdentifierRaw = _settings.BackOffice.Id;
+
+            // No need to add Id again if already found
+            return string.IsNullOrEmpty(backofficeIdentifierRaw);
+        }
+    }
+}
diff --git a/src/Umbraco.Web/JavaScript/JsInitialize.js b/src/Umbraco.Web/JavaScript/JsInitialize.js
index 4b0a457b64..dda97a131e 100644
--- a/src/Umbraco.Web/JavaScript/JsInitialize.js
+++ b/src/Umbraco.Web/JavaScript/JsInitialize.js
@@ -27,12 +27,15 @@
 
     'lib/chart.js/chart.min.js',
     'lib/angular-chart.js/angular-chart.min.js',
+    'lib/wicg-inert/dist/inert.min.js',
 
     'lib/umbraco/Extensions.js',
 
     'lib/umbraco/NamespaceManager.js',
     'lib/umbraco/LegacySpeechBubble.js',
 
+    'js/utilities.js',
+
     'js/app.js',
 
     'js/umbraco.resources.js',
@@ -42,5 +45,5 @@
     'js/umbraco.interceptors.js',
     'js/umbraco.controllers.js',
     'js/routes.js',
-    'js/init.js'
+    'js/init.js'    
 ]
diff --git a/src/Umbraco.Web/JavaScript/PreviewInitialize.js b/src/Umbraco.Web/JavaScript/PreviewInitialize.js
index 0b0c24f378..644bf4ba35 100644
--- a/src/Umbraco.Web/JavaScript/PreviewInitialize.js
+++ b/src/Umbraco.Web/JavaScript/PreviewInitialize.js
@@ -3,6 +3,9 @@
     '../lib/angular/angular.js',
     '../lib/underscore/underscore-min.js',
     '../lib/umbraco/Extensions.js',
+
+    '../js/utilities.js',
+
     '../js/app.js',
     '../js/umbraco.resources.js',
     '../js/umbraco.services.js',
diff --git a/src/Umbraco.Web/Logging/WebProfiler.cs b/src/Umbraco.Web/Logging/WebProfiler.cs
index 512edb2296..740afba6a7 100755
--- a/src/Umbraco.Web/Logging/WebProfiler.cs
+++ b/src/Umbraco.Web/Logging/WebProfiler.cs
@@ -26,12 +26,16 @@ namespace Umbraco.Web.Logging
             _provider = new WebProfilerProvider();
 
             //see https://miniprofiler.com/dotnet/AspDotNet
-            MiniProfiler.Configure(new MiniProfilerOptions
+            var options = new MiniProfilerOptions
             {
                 SqlFormatter = new SqlServerFormatter(),
-                StackMaxLength = 5000, 
+                StackMaxLength = 5000,
                 ProfilerProvider = _provider
-            });
+            };
+            // this is a default path and by default it performs a 'contains' check which will match our content controller
+            // (and probably other requests) and ignore them.
+            options.IgnoredPaths.Remove("/content/"); 
+            MiniProfiler.Configure(options);
         }
 
         public void UmbracoApplicationBeginRequest(object sender, EventArgs e)
diff --git a/src/Umbraco.Web/Logging/WebProfilerComponent.cs b/src/Umbraco.Web/Logging/WebProfilerComponent.cs
index 2959e12ad7..e02f082aa9 100755
--- a/src/Umbraco.Web/Logging/WebProfilerComponent.cs
+++ b/src/Umbraco.Web/Logging/WebProfilerComponent.cs
@@ -1,11 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.Web;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Web.Logging
 {
-    internal sealed class WebProfilerComponent : IComponent
+    public sealed class WebProfilerComponent : IComponent
     {
         private readonly WebProfiler _profiler;
         private readonly bool _profile;
@@ -35,15 +36,22 @@ namespace Umbraco.Web.Logging
         }
 
         public void Terminate()
-        { }
+        {
+            UmbracoApplicationBase.ApplicationInit -= InitializeApplication;
+        }
 
         private void InitializeApplication(object sender, EventArgs args)
         {
             if (!(sender is HttpApplication app)) return;
 
-            // for *each* application (this will run more than once)
-            app.BeginRequest += (s, a) => _profiler.UmbracoApplicationBeginRequest(s, a);
-            app.EndRequest += (s, a) => _profiler.UmbracoApplicationEndRequest(s, a);
+            // NOTE: We do not unbind these events ... because you just can't do that for HttpApplication events, they will
+            // be removed when the app dies.
+            app.BeginRequest += BeginRequest;
+            app.EndRequest += EndRequest;
         }
+
+        private void BeginRequest(object s, EventArgs a) => _profiler.UmbracoApplicationBeginRequest(s, a);
+
+        private void EndRequest(object s, EventArgs a) => _profiler.UmbracoApplicationEndRequest(s, a);
     }
 }
diff --git a/src/Umbraco.Web/Logging/WebProfilerComposer.cs b/src/Umbraco.Web/Logging/WebProfilerComposer.cs
index 5834dd9dd4..af1d2376cb 100644
--- a/src/Umbraco.Web/Logging/WebProfilerComposer.cs
+++ b/src/Umbraco.Web/Logging/WebProfilerComposer.cs
@@ -2,6 +2,6 @@
 
 namespace Umbraco.Web.Logging
 {
-    internal class WebProfilerComposer : ComponentComposer<WebProfilerComponent>, ICoreComposer
+    public sealed class WebProfilerComposer : ComponentComposer<WebProfilerComponent>, ICoreComposer
     { }
 }
diff --git a/src/Umbraco.Web/Logging/WebProfilerProvider.cs b/src/Umbraco.Web/Logging/WebProfilerProvider.cs
index dbb81cf232..f38a606745 100755
--- a/src/Umbraco.Web/Logging/WebProfilerProvider.cs
+++ b/src/Umbraco.Web/Logging/WebProfilerProvider.cs
@@ -85,7 +85,11 @@ namespace Umbraco.Web.Logging
         public override MiniProfiler Start(string profilerName, MiniProfilerBaseOptions options)
         {
             var first = Interlocked.Exchange(ref _first, 1) == 0;
-            if (first == false) return base.Start(profilerName, options);
+            if (first == false)
+            {
+                var profiler = base.Start(profilerName, options);
+                return profiler;
+            }
 
             _startupProfiler = new MiniProfiler("StartupProfiler", options);
             CurrentProfiler = _startupProfiler;
diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs
index b4fd8c0d86..54ce640855 100755
--- a/src/Umbraco.Web/Macros/MacroRenderer.cs
+++ b/src/Umbraco.Web/Macros/MacroRenderer.cs
@@ -381,7 +381,7 @@ namespace Umbraco.Web.Macros
             if (attributeValue.StartsWith("[") == false)
                 return attributeValue;
 
-            var tokens = attributeValue.Split(',').Select(x => x.Trim()).ToArray();
+            var tokens = attributeValue.Split(Constants.CharArrays.Comma).Select(x => x.Trim()).ToArray();
 
             // ensure we only process valid input ie each token must be [?x] and not eg a json array
             // like [1,2,3] which we don't want to parse - however the last one can be a literal, so
diff --git a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
index 3bbc4a793b..b9f4650e36 100644
--- a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
+++ b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
@@ -100,7 +100,7 @@ namespace Umbraco.Web.Macros
             Elements.Add("createDate", createDate);
             Elements.Add("updateDate", updateDate);
             Elements.Add("path", path);
-            Elements.Add("splitpath", path.Split(','));
+            Elements.Add("splitpath", path.Split(Constants.CharArrays.Comma));
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Media/EmbedProviders/EmbedProviderBase.cs b/src/Umbraco.Web/Media/EmbedProviders/EmbedProviderBase.cs
index 9e34815def..6dc7c76d8e 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/EmbedProviderBase.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/EmbedProviderBase.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Web.Media.EmbedProviders
         public virtual string GetEmbedProviderUrl(string url, int maxWidth, int maxHeight)
         {
             if (Uri.IsWellFormedUriString(url, UriKind.RelativeOrAbsolute) == false)
-                throw new ArgumentException("Not a valid Url");
+                throw new ArgumentException("Not a valid URL.", nameof(url));
 
             var fullUrl = new StringBuilder();
 
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Instagram.cs b/src/Umbraco.Web/Media/EmbedProviders/Instagram.cs
deleted file mode 100644
index 1862d77cad..0000000000
--- a/src/Umbraco.Web/Media/EmbedProviders/Instagram.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Web.Media.EmbedProviders
-{
-    public class Instagram : EmbedProviderBase
-    {
-        public override string ApiEndpoint => "http://api.instagram.com/oembed";
-
-        public override string[] UrlSchemeRegex => new string[]
-        {
-            @"instagram.com\/p\/*",
-            @"instagr.am\/p\/*"
-        };
-
-        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>();
-
-        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
-        {
-            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
-            var oembed = base.GetJsonResponse<OEmbedResponse>(requestUrl);
-
-            return oembed.GetHtml();
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Media/Exif/ExifPropertyFactory.cs b/src/Umbraco.Web/Media/Exif/ExifPropertyFactory.cs
index 68769eb1f3..4373025eb9 100644
--- a/src/Umbraco.Web/Media/Exif/ExifPropertyFactory.cs
+++ b/src/Umbraco.Web/Media/Exif/ExifPropertyFactory.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Text;
+using Umbraco.Core;
 
 namespace Umbraco.Web.Media.Exif
 {
@@ -44,7 +45,7 @@ namespace Umbraco.Web.Media.Exif
                     return new ExifDateTime(ExifTag.DateTime, ExifBitConverter.ToDateTime(value));
                 else if (tag == 0x9c9b || tag == 0x9c9c ||  // Windows tags
                     tag == 0x9c9d || tag == 0x9c9e || tag == 0x9c9f)
-                    return new WindowsByteString(etag, Encoding.Unicode.GetString(value).TrimEnd('\0'));
+                    return new WindowsByteString(etag, Encoding.Unicode.GetString(value).TrimEnd(Constants.CharArrays.NullTerminator));
             }
             else if (ifd == IFD.EXIF)
             {
@@ -75,7 +76,7 @@ namespace Umbraco.Web.Media.Exif
                             hasenc = false;
                     }
 
-                    string val = (hasenc ? enc.GetString(value, 8, value.Length - 8) : enc.GetString(value)).Trim('\0');
+                    string val = (hasenc ? enc.GetString(value, 8, value.Length - 8) : enc.GetString(value)).Trim(Constants.CharArrays.NullTerminator);
 
                     return new ExifEncodedString(ExifTag.UserComment, val, enc);
                 }
diff --git a/src/Umbraco.Web/Media/Exif/MathEx.cs b/src/Umbraco.Web/Media/Exif/MathEx.cs
index 94cbccfbda..7489c21878 100644
--- a/src/Umbraco.Web/Media/Exif/MathEx.cs
+++ b/src/Umbraco.Web/Media/Exif/MathEx.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Text;
-
+using Umbraco.Core;
 namespace Umbraco.Web.Media.Exif
 {
     /// <summary>
@@ -694,7 +694,7 @@ namespace Umbraco.Web.Media.Exif
                 if (s == null)
                     throw new ArgumentNullException("s");
 
-                string[] sa = s.Split('/');
+                string[] sa = s.Split(Constants.CharArrays.ForwardSlash);
                 int numerator = 1;
                 int denominator = 1;
 
@@ -1322,7 +1322,7 @@ namespace Umbraco.Web.Media.Exif
                 if (s == null)
                     throw new ArgumentNullException("s");
 
-                string[] sa = s.Split('/');
+                string[] sa = s.Split(Constants.CharArrays.ForwardSlash);
                 uint numerator = 1;
                 uint denominator = 1;
 
diff --git a/src/Umbraco.Web/Media/UploadAutoFillProperties.cs b/src/Umbraco.Web/Media/UploadAutoFillProperties.cs
index 01ced179d6..60de03b450 100644
--- a/src/Umbraco.Web/Media/UploadAutoFillProperties.cs
+++ b/src/Umbraco.Web/Media/UploadAutoFillProperties.cs
@@ -67,7 +67,7 @@ namespace Umbraco.Web.Media
                 {
                     using (var filestream = _mediaFileSystem.OpenFile(filepath))
                     {
-                        var extension = (Path.GetExtension(filepath) ?? "").TrimStart('.');
+                        var extension = (Path.GetExtension(filepath) ?? "").TrimStart(Constants.CharArrays.Period);
                         var size = _contentSection.IsImageFile(extension) ? (Size?)ImageHelper.GetDimensions(filestream) : null;
                         SetProperties(content, autoFillConfig, size, filestream.Length, extension, culture, segment);
                     }
@@ -101,7 +101,7 @@ namespace Umbraco.Web.Media
             }
             else
             {
-                var extension = (Path.GetExtension(filepath) ?? "").TrimStart('.');
+                var extension = (Path.GetExtension(filepath) ?? "").TrimStart(Constants.CharArrays.Period);
                 var size = _contentSection.IsImageFile(extension) ? (Size?)ImageHelper.GetDimensions(filestream) : null;
                 SetProperties(content, autoFillConfig, size, filestream.Length, extension, culture, segment);
             }
diff --git a/src/Umbraco.Web/ModelStateExtensions.cs b/src/Umbraco.Web/ModelStateExtensions.cs
index 10b1b5dadd..e224a6122b 100644
--- a/src/Umbraco.Web/ModelStateExtensions.cs
+++ b/src/Umbraco.Web/ModelStateExtensions.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -6,6 +7,7 @@ using System.Web.Mvc;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
+using Umbraco.Web.PropertyEditors.Validation;
 
 namespace Umbraco.Web
 {
@@ -40,9 +42,9 @@ namespace Umbraco.Web
         {
             return state.Where(v => v.Key.StartsWith(prefix + ".")).All(v => !v.Value.Errors.Any());
         }
-        
+
         /// <summary>
-        /// Adds the error to model state correctly for a property so we can use it on the client side.
+        /// Adds an <see cref="ContentPropertyValidationResult"/> error to model state for a property so we can use it on the client side.
         /// </summary>
         /// <param name="modelState"></param>
         /// <param name="result"></param>
@@ -51,9 +53,24 @@ namespace Umbraco.Web
         internal static void AddPropertyError(this System.Web.Http.ModelBinding.ModelStateDictionary modelState,
             ValidationResult result, string propertyAlias, string culture = "", string segment = "")
         {
-            if (culture == null)
-                culture = "";
-            modelState.AddValidationError(result, "_Properties", propertyAlias,
+            modelState.AddPropertyValidationError(new ContentPropertyValidationResult(result, culture, segment), propertyAlias, culture, segment);
+        }
+
+        /// <summary>
+        /// Adds the <see cref="ValidationResult"/> to the model state with the appropriate keys for property errors
+        /// </summary>
+        /// <param name="modelState"></param>
+        /// <param name="result"></param>
+        /// <param name="propertyAlias"></param>
+        /// <param name="culture"></param>
+        /// <param name="segment"></param>
+        internal static void AddPropertyValidationError(this System.Web.Http.ModelBinding.ModelStateDictionary modelState,
+            ValidationResult result, string propertyAlias, string culture = "", string segment = "")
+        {
+            modelState.AddValidationError(
+                result,
+                "_Properties",
+                propertyAlias,
                 //if the culture is null, we'll add the term 'invariant' as part of the key
                 culture.IsNullOrWhiteSpace() ? "invariant" : culture,
                 // if the segment is null, we'll add the term 'null' as part of the key
@@ -90,7 +107,7 @@ namespace Umbraco.Web
             //Add any variant specific errors here
             var variantErrors = modelState.Keys
                 .Where(key => key.StartsWith("_Properties.")) //only choose _Properties errors
-                .Select(x => x.Split('.')) //split into parts
+                .Select(x => x.Split(Constants.CharArrays.Period)) //split into parts
                 .Where(x => x.Length >= 4 && !x[2].IsNullOrWhiteSpace() && !x[3].IsNullOrWhiteSpace())
                 .Select(x => (culture: x[2], segment: x[3]))
                 //if the culture is marked "invariant" than return the default language, this is because we can only edit invariant properties on the default language
@@ -128,7 +145,7 @@ namespace Umbraco.Web
                 .Select(x =>
                 {
                     // Format "<culture>_<segment>"
-                    var cs = x.Split(new[] { '_' });
+                    var cs = x.Split(Constants.CharArrays.Underscore);
                     return (culture: cs[0], segment: cs[1]);
                 })
                 .Where(x => !x.culture.IsNullOrWhiteSpace())
@@ -166,12 +183,12 @@ namespace Umbraco.Web
             var delimitedParts = string.Join(".", parts);
             foreach (var memberName in result.MemberNames)
             {
-                modelState.TryAddModelError($"{delimitedParts}.{memberName}", result.ErrorMessage);
+                modelState.TryAddModelError($"{delimitedParts}.{memberName}", result.ToString());
                 withNames = true;
             }
             if (!withNames)
             {
-                modelState.TryAddModelError($"{delimitedParts}", result.ErrorMessage);
+                modelState.TryAddModelError($"{delimitedParts}", result.ToString());
             }
                 
         }
@@ -236,5 +253,6 @@ namespace Umbraco.Web
                 };
         }
 
+       
     }
 }
diff --git a/src/Umbraco.Web/Models/ContentEditing/CodeFileDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/CodeFileDisplay.cs
index 8c89bf263e..36ad82444a 100644
--- a/src/Umbraco.Web/Models/ContentEditing/CodeFileDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/CodeFileDisplay.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Web.Models.ContentEditing
 
         /// <summary>
         /// Path represents the path used by the backoffice tree
-        /// For files stored on disk, this is a urlencoded, comma separated
+        /// For files stored on disk, this is a URL encoded, comma separated
         /// path to the file, always starting with -1.
         ///
         /// -1,Partials,Parials%2FFolder,Partials%2FFolder%2FFile.cshtml
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
index b6a90a93c3..1ef9207628 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
@@ -111,6 +111,9 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "contentTypeId")]
         public int ContentTypeId { get; set; }
 
+        [DataMember(Name = "contentTypeKey")]
+        public Guid ContentTypeKey { get; set; }
+
         [DataMember(Name = "contentTypeAlias", IsRequired = true)]
         [Required(AllowEmptyStrings = false)]
         public string ContentTypeAlias { get; set; }
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentItemSave.cs b/src/Umbraco.Web/Models/ContentEditing/ContentItemSave.cs
index 4dbbb1385a..aace4645dd 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentItemSave.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentItemSave.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Web.Models.ContentEditing
     [DataContract(Name = "content", Namespace = "")]
     public class ContentItemSave : IContentSave<IContent>
     {
-        protected ContentItemSave()
+        public ContentItemSave()
         {
             UploadedFiles = new List<ContentPropertyFile>();
             Variants = new List<ContentVariantSave>();
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDisplay.cs
index 39a4718dd0..9a07d29a02 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDisplay.cs
@@ -33,6 +33,9 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "hideLabel")]
         public bool HideLabel { get; set; }
 
+        [DataMember(Name = "labelOnTop")]
+        public bool LabelOnTop { get; set; }
+
         [DataMember(Name = "validation")]
         public PropertyTypeValidation Validation { get; set; }
 
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDto.cs b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDto.cs
index 83e5e2a9b2..9702202294 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDto.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDto.cs
@@ -18,6 +18,8 @@ namespace Umbraco.Web.Models.ContentEditing
 
         public bool IsRequired { get; set; }
 
+        public bool LabelOnTop { get; set; }
+
         public string IsRequiredMessage { get; set; }
 
         public string ValidationRegExp { get; set; }
diff --git a/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs b/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
index 6cb2ccffaf..502b603be6 100644
--- a/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
@@ -63,8 +63,7 @@ namespace Umbraco.Web.Models.ContentEditing
         /// The path of the entity
         /// </summary>
         [DataMember(Name = "path")]
-        public string Path { get; set; }
-
+        public string Path { get; set; }      
         /// <summary>
         /// A collection of extra data that is available for this specific entity/entity type
         /// </summary>
diff --git a/src/Umbraco.Web/Models/ContentEditing/MediaItemDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/MediaItemDisplay.cs
index 0118645b60..a5d538c6ac 100644
--- a/src/Umbraco.Web/Models/ContentEditing/MediaItemDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/MediaItemDisplay.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Models.ContentEditing;
 namespace Umbraco.Web.Models.ContentEditing
 {
     /// <summary>
-    /// A model representing a content item to be displayed in the back office
+    /// A model representing a media item to be displayed in the back office
     /// </summary>
     [DataContract(Name = "content", Namespace = "")]
     public class MediaItemDisplay : ListViewAwareContentItemDisplayBase<ContentPropertyDisplay>
diff --git a/src/Umbraco.Web/Models/ContentEditing/MemberDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/MemberDisplay.cs
index 3857731671..b3a606dad1 100644
--- a/src/Umbraco.Web/Models/ContentEditing/MemberDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/MemberDisplay.cs
@@ -19,6 +19,9 @@ namespace Umbraco.Web.Models.ContentEditing
             ContentApps = new List<ContentApp>();
         }
 
+        [DataMember(Name = "contentType")]
+        public ContentTypeBasic ContentType { get; set; }
+
         [DataMember(Name = "username")]
         public string Username { get; set; }
 
diff --git a/src/Umbraco.Web/Models/ContentEditing/PropertyTypeBasic.cs b/src/Umbraco.Web/Models/ContentEditing/PropertyTypeBasic.cs
index 5ff1744ea2..793e4e391d 100644
--- a/src/Umbraco.Web/Models/ContentEditing/PropertyTypeBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/PropertyTypeBasic.cs
@@ -48,6 +48,14 @@ namespace Umbraco.Web.Models.ContentEditing
         [ReadOnly(true)]
         public Guid DataTypeKey { get; set; }
 
+        [DataMember(Name = "dataTypeName")]
+        [ReadOnly(true)]
+        public string DataTypeName { get; set; }
+
+        [DataMember(Name = "dataTypeIcon")]
+        [ReadOnly(true)]
+        public string DataTypeIcon { get; set; }
+
         //SD: Is this really needed ?
         [DataMember(Name = "groupId")]
         public int GroupId { get; set; }
@@ -57,5 +65,8 @@ namespace Umbraco.Web.Models.ContentEditing
 
         [DataMember(Name = "allowSegmentVariant")]
         public bool AllowSegmentVariant { get; set; }
+
+        [DataMember(Name = "labelOnTop")]
+        public bool LabelOnTop { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/Models/Mapping/CommonMapper.cs b/src/Umbraco.Web/Models/Mapping/CommonMapper.cs
index 1276a2a405..f7db17ff74 100644
--- a/src/Umbraco.Web/Models/Mapping/CommonMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/CommonMapper.cs
@@ -49,18 +49,9 @@ namespace Umbraco.Web.Models.Mapping
 
         public ContentTypeBasic GetContentType(IContentBase source, MapperContext context)
         {
-            // TODO: We can resolve the UmbracoContext from the IValueResolver options!
-            // OMG
-            if (HttpContext.Current != null && Composing.Current.UmbracoContext != null && Composing.Current.UmbracoContext.Security.CurrentUser != null
-                && Composing.Current.UmbracoContext.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings)))
-            {
-                var contentType = _contentTypeBaseServiceProvider.GetContentTypeOf(source);
-                var contentTypeBasic = context.Map<IContentTypeComposition, ContentTypeBasic>(contentType);
-
-                return contentTypeBasic;
-            }
-            //no access
-            return null;
+            var contentType = _contentTypeBaseServiceProvider.GetContentTypeOf(source);
+            var contentTypeBasic = context.Map<IContentTypeComposition, ContentTypeBasic>(contentType);
+            return contentTypeBasic;
         }
 
         public string GetTreeNodeUrl<TController>(IContentBase source)
diff --git a/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
index 865057ba24..16465914cb 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
@@ -76,6 +76,7 @@ namespace Umbraco.Web.Models.Mapping
             target.AllowedTemplates = GetAllowedTemplates(source);
             target.ContentApps = _commonMapper.GetContentApps(source);
             target.ContentTypeId = source.ContentType.Id;
+            target.ContentTypeKey = source.ContentType.Key;
             target.ContentTypeAlias = source.ContentType.Alias;
             target.ContentTypeName = _localizedTextService.UmbracoDictionaryTranslate(source.ContentType.Name);
             target.DocumentType = _commonMapper.GetContentType(source, context);
@@ -172,7 +173,7 @@ namespace Umbraco.Web.Models.Mapping
             var umbracoContext = _umbracoContextAccessor.UmbracoContext;
 
             var urls = umbracoContext == null
-                ? new[] { UrlInfo.Message("Cannot generate urls without a current Umbraco Context") }
+                ? new[] { UrlInfo.Message("Cannot generate URLs without a current Umbraco Context") }
                 : source.GetContentUrls(_publishedRouter, umbracoContext, _localizationService, _localizedTextService, _contentService, _logger).ToArray();
 
             return urls;
@@ -252,7 +253,7 @@ namespace Umbraco.Web.Models.Mapping
             if (parent == null)
                 return false;
 
-            var pathParts = parent.Path.Split(',').Select(x => int.TryParse(x, out var i) ? i : 0).ToList();
+            var pathParts = parent.Path.Split(Constants.CharArrays.Comma).Select(x => int.TryParse(x, out var i) ? i : 0).ToList();
 
             // reduce the path parts so we exclude top level content items that
             // are higher up than a user's start nodes
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
index cf1bc3c253..2e035430df 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
@@ -44,6 +44,9 @@ namespace Umbraco.Web.Models.Mapping
                     property.PropertyType.PropertyEditorAlias);
 
                 editor = _propertyEditors[Constants.PropertyEditors.Aliases.Label];
+
+                if (editor == null)
+                    throw new InvalidOperationException($"Could not resolve the property editor {Constants.PropertyEditors.Aliases.Label}");
             }
 
             dest.Id = property.Id;
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs
index d81f81abe2..37fd2b2e28 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs
@@ -39,6 +39,7 @@ namespace Umbraco.Web.Models.Mapping
             dest.Description = originalProp.PropertyType.Description;
             dest.Label = originalProp.PropertyType.Name;
             dest.HideLabel = valEditor.HideLabel;
+            dest.LabelOnTop = originalProp.PropertyType.LabelOnTop;
 
             //add the validation information
             dest.Validation.Mandatory = originalProp.PropertyType.Mandatory;
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs
index fd57e4dd2e..64e2ea22a3 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs
@@ -27,6 +27,7 @@ namespace Umbraco.Web.Models.Mapping
             dest.Description = property.PropertyType.Description;
             dest.Label = property.PropertyType.Name;
             dest.DataType = DataTypeService.GetDataType(property.PropertyType.DataTypeId);
+            dest.LabelOnTop = property.PropertyType.LabelOnTop;
         }
     }
 }
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs
index e6290cc19e..baa9b7be69 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs
@@ -38,7 +38,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Id = source.Id;
             target.IsActive = true;
             target.Label = source.Name;
-}
+        }
 
         private void Map(Property source, ContentPropertyBasic target, MapperContext context)
         {
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
index 35b844ce95..7028518794 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
@@ -242,6 +242,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Alias = source.Alias;
             target.Description = source.Description;
             target.SortOrder = source.SortOrder;
+            target.LabelOnTop = source.LabelOnTop;
         }
 
         // no MapAll - take care
@@ -338,7 +339,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Properties = context.MapEnumerable<MemberPropertyTypeBasic, MemberPropertyTypeDisplay>(source.Properties);
         }
 
-        // Umbraco.Code.MapAll -Editor -View -Config -ContentTypeId -ContentTypeName -Locked
+        // Umbraco.Code.MapAll -Editor -View -Config -ContentTypeId -ContentTypeName -Locked -DataTypeIcon -DataTypeName
         private static void Map(PropertyTypeBasic source, PropertyTypeDisplay target, MapperContext context)
         {
             target.Alias = source.Alias;
@@ -353,9 +354,10 @@ namespace Umbraco.Web.Models.Mapping
             target.Label = source.Label;
             target.SortOrder = source.SortOrder;
             target.Validation = source.Validation;
+            target.LabelOnTop = source.LabelOnTop;
         }
 
-        // Umbraco.Code.MapAll -Editor -View -Config -ContentTypeId -ContentTypeName -Locked
+        // Umbraco.Code.MapAll -Editor -View -Config -ContentTypeId -ContentTypeName -Locked -DataTypeIcon -DataTypeName
         private static void Map(MemberPropertyTypeBasic source, MemberPropertyTypeDisplay target, MapperContext context)
         {
             target.Alias = source.Alias;
@@ -373,6 +375,7 @@ namespace Umbraco.Web.Models.Mapping
             target.MemberCanViewProperty = source.MemberCanViewProperty;
             target.SortOrder = source.SortOrder;
             target.Validation = source.Validation;
+            target.LabelOnTop = source.LabelOnTop;
         }
 
         // Umbraco.Code.MapAll -CreatorId -Level -SortOrder -Variations
@@ -558,7 +561,7 @@ namespace Umbraco.Web.Models.Mapping
                 return Enumerable.Empty<string>();
 
             var aliases = new List<string>();
-            var ancestorIds = parent.Path.Split(',').Select(int.Parse);
+            var ancestorIds = parent.Path.Split(Constants.CharArrays.Comma).Select(int.Parse);
             // loop through all content types and return ordered aliases of ancestors
             var allContentTypes = _contentTypeService.GetAll().ToArray();
             foreach (var ancestorId in ancestorIds)
diff --git a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
index ddff093aab..1c4ca6087c 100644
--- a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
@@ -42,6 +42,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Trashed = source.Trashed;
             target.Udi = Udi.Create(ObjectTypes.GetUdiType(source.NodeObjectType), source.Key);
 
+
             if (source is IContentEntitySlim contentSlim)
             {
                 source.AdditionalData["ContentTypeAlias"] = contentSlim.ContentTypeAlias;
@@ -54,6 +55,8 @@ namespace Umbraco.Web.Models.Mapping
 
             if (source is IMediaEntitySlim mediaSlim)
             {
+                //pass UpdateDate for MediaPicker ListView ordering
+                source.AdditionalData["UpdateDate"] = mediaSlim.UpdateDate;
                 source.AdditionalData["MediaPath"] = mediaSlim.MediaPath;
             }
 
@@ -183,12 +186,9 @@ namespace Umbraco.Web.Models.Mapping
                 target.Name = source.Values.ContainsKey($"nodeName_{culture}") ? source.Values[$"nodeName_{culture}"] : target.Name;
             }
 
-            if (source.Values.TryGetValue(UmbracoExamineIndex.UmbracoFileFieldName, out var umbracoFile))
+            if (source.Values.TryGetValue(UmbracoExamineIndex.UmbracoFileFieldName, out var umbracoFile) && umbracoFile.IsNullOrWhiteSpace() == false)
             {
-                if (umbracoFile != null)
-                {
-                    target.Name = $"{target.Name} ({umbracoFile})";
-                }
+                target.Name = $"{target.Name} ({umbracoFile})";
             }
 
             if (source.Values.ContainsKey(UmbracoExamineIndex.NodeKeyFieldName))
@@ -244,7 +244,7 @@ namespace Umbraco.Web.Models.Mapping
                     return memberEntity.ContentTypeIcon.IfNullOrWhiteSpace(Constants.Icons.Member);
                 case IContentEntitySlim contentEntity:
                     // NOTE: this case covers both content and media entities
-                    return contentEntity.ContentTypeIcon;                
+                    return contentEntity.ContentTypeIcon;
             }
 
             return null;
diff --git a/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
index 851f452244..f86e7eb1fc 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
@@ -77,6 +77,7 @@ namespace Umbraco.Web.Models.Mapping
         private void Map(IMember source, MemberDisplay target, MapperContext context)
         {
             target.ContentApps = _commonMapper.GetContentApps(source);
+            target.ContentType = _commonMapper.GetContentType(source, context);
             target.ContentTypeId = source.ContentType.Id;
             target.ContentTypeAlias = source.ContentType.Alias;
             target.ContentTypeName = source.ContentType.Name;
diff --git a/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs b/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
index 370a459279..33fce221b4 100644
--- a/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
@@ -222,6 +222,7 @@ namespace Umbraco.Web.Models.Mapping
                     Id = p.Id,
                     Alias = p.Alias,
                     Description = p.Description,
+                    LabelOnTop = p.LabelOnTop,
                     Editor = p.PropertyEditorAlias,
                     Validation = new PropertyTypeValidation
                         {
@@ -238,6 +239,8 @@ namespace Umbraco.Web.Models.Mapping
                     Inherited = inherited,
                     DataTypeId = p.DataTypeId,
                     DataTypeKey = p.DataTypeKey,
+                    DataTypeName = dataType.Name,
+                    DataTypeIcon = propertyEditor.Icon,
                     SortOrder = p.SortOrder,
                     ContentTypeId = contentType.Id,
                     ContentTypeName = contentType.Name,
diff --git a/src/Umbraco.Web/Models/PublishedContentBase.cs b/src/Umbraco.Web/Models/PublishedContentBase.cs
index d6a57a66d7..55e8a8687a 100644
--- a/src/Umbraco.Web/Models/PublishedContentBase.cs
+++ b/src/Umbraco.Web/Models/PublishedContentBase.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Web.Models
     /// <summary>
     /// Provide an abstract base class for <c>IPublishedContent</c> implementations.
     /// </summary>
-    /// <remarks>This base class does which (a) consistently resolves and caches the Url, (b) provides an implementation
+    /// <remarks>This base class does which (a) consistently resolves and caches the URL, (b) provides an implementation
     /// for this[alias], and (c) provides basic content set management.</remarks>
     [DebuggerDisplay("Content Id: {Id}")]
     public abstract class PublishedContentBase : IPublishedContent
diff --git a/src/Umbraco.Web/Models/Trees/MenuItem.cs b/src/Umbraco.Web/Models/Trees/MenuItem.cs
index 094c6b24ff..fb4dfb836c 100644
--- a/src/Umbraco.Web/Models/Trees/MenuItem.cs
+++ b/src/Umbraco.Web/Models/Trees/MenuItem.cs
@@ -165,7 +165,7 @@ namespace Umbraco.Web.Models.Trees
         }
 
         /// <summary>
-        /// Sets the menu item to display a dialog based on a url path in an iframe
+        /// Sets the menu item to display a dialog based on a URL path in an iframe
         /// </summary>
         /// <param name="url"></param>
         /// <param name="dialogTitle"></param>
diff --git a/src/Umbraco.Web/Models/Trees/TreeNode.cs b/src/Umbraco.Web/Models/Trees/TreeNode.cs
index dc383bd18b..fd7ef0d19d 100644
--- a/src/Umbraco.Web/Models/Trees/TreeNode.cs
+++ b/src/Umbraco.Web/Models/Trees/TreeNode.cs
@@ -64,13 +64,13 @@ namespace Umbraco.Web.Models.Trees
         public string RoutePath { get; set; }
 
         /// <summary>
-        /// The JSON url to load the nodes children
+        /// The JSON URL to load the nodes children
         /// </summary>
         [DataMember(Name = "childNodesUrl")]
         public string ChildNodesUrl { get; set; }
 
         /// <summary>
-        /// The JSON url to load the menu from
+        /// The JSON URL to load the menu from
         /// </summary>
         [DataMember(Name = "menuUrl")]
         public string MenuUrl { get; set; }
@@ -110,7 +110,7 @@ namespace Umbraco.Web.Models.Trees
 
                 //absolute path with or without tilde
                 if (Icon.StartsWith("~") || Icon.StartsWith("/"))
-                    return IOHelper.ResolveUrl("~" + Icon.TrimStart('~'));
+                    return IOHelper.ResolveUrl("~" + Icon.TrimStart(Constants.CharArrays.Tilde));
 
                 //legacy icon path
                 return string.Format("{0}images/umbraco/{1}", Current.Configs.Global().Path.EnsureEndsWith("/"), Icon);
diff --git a/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs b/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
index 493d9deed2..82a9c42235 100644
--- a/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
+++ b/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
@@ -66,11 +66,11 @@ namespace Umbraco.Web.Mvc
             //var meta = PluginController.GetMetadata(controllerType);
             if (isMvc)
             {
-                //create a new route with custom name, specified url, and the namespace of the controller plugin
+                //create a new route with custom name, specified URL, and the namespace of the controller plugin
                 controllerPluginRoute = routes.MapRoute(
                     //name
                     string.Format("umbraco-{0}-{1}", area.AreaName, controllerName),
-                    //url format
+                    //URL format
                     url,
                     //set the namespace of the controller to match
                     new[] {controllerType.Namespace});
@@ -89,7 +89,7 @@ namespace Umbraco.Web.Mvc
                 controllerPluginRoute = routes.MapHttpRoute(
                     //name
                     string.Format("umbraco-{0}-{1}-{2}", "api", area.AreaName, controllerName),
-                    //url format
+                    //URL format
                     url,
                     new {controller = controllerName, id = defaultId});
                 //web api routes don't set the data tokens object
diff --git a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
index 168da455e3..d0b95aafa9 100644
--- a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
+++ b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
@@ -103,7 +103,7 @@ namespace Umbraco.Web.Mvc
         {
             if (_contentId.HasValue)
             {
-                var content = Umbraco.Content(_contentId);
+                var content = Umbraco.Content(_contentId.Value);
                 if (content == null)
                 {
                     throw new InvalidOperationException("Could not resolve content with id " + _contentId);
diff --git a/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs b/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs
index 5f81ced3f0..712cb8fb72 100644
--- a/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs
@@ -6,7 +6,7 @@ using Umbraco.Core;
 using Umbraco.Web.Security;
 using Umbraco.Core.Composing;
 using Current = Umbraco.Web.Composing.Current;
-
+using CharArrays = Umbraco.Core.Constants.CharArrays;
 namespace Umbraco.Web.Mvc
 {
     /// <summary>
@@ -40,7 +40,7 @@ namespace Umbraco.Web.Mvc
                 AllowType = "";
 
             var members = new List<int>();
-            foreach (var s in AllowMembers.Split(','))
+            foreach (var s in AllowMembers.Split(CharArrays.Comma))
             {
                 if (int.TryParse(s, out var id))
                 {
@@ -49,7 +49,7 @@ namespace Umbraco.Web.Mvc
             }
 
             var helper = Current.Factory.GetInstance<MembershipHelper>();
-            return helper.IsMemberAuthorized(AllowType.Split(','), AllowGroup.Split(','), members);
+            return helper.IsMemberAuthorized(AllowType.Split(CharArrays.Comma), AllowGroup.Split(CharArrays.Comma), members);
             
         }
 
diff --git a/src/Umbraco.Web/Mvc/RedirectToUmbracoPageResult.cs b/src/Umbraco.Web/Mvc/RedirectToUmbracoPageResult.cs
index 437eec4e5c..014fd7ecd3 100644
--- a/src/Umbraco.Web/Mvc/RedirectToUmbracoPageResult.cs
+++ b/src/Umbraco.Web/Mvc/RedirectToUmbracoPageResult.cs
@@ -17,6 +17,7 @@ namespace Umbraco.Web.Mvc
     {
         private IPublishedContent _publishedContent;
         private readonly int _pageId;
+        private readonly Guid _key;
         private NameValueCollection _queryStringValues;
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private string _url;
@@ -49,14 +50,25 @@ namespace Umbraco.Web.Mvc
             get { return _pageId; }
         }
 
+        public Guid Key
+        {
+            get { return _key; }
+        }
         public IPublishedContent PublishedContent
         {
             get
             {
                 if (_publishedContent != null) return _publishedContent;
 
-                //need to get the URL for the page
-                _publishedContent = Current.UmbracoContext.Content.GetById(_pageId);
+                if (_pageId != default(int))
+                {
+                    _publishedContent = Current.UmbracoContext.Content.GetById(_pageId);
+                }
+
+                else if (_key != default(Guid))
+                {
+                    _publishedContent = Current.UmbracoContext.Content.GetById(_key);
+                }
 
                 return _publishedContent;
             }
@@ -91,6 +103,35 @@ namespace Umbraco.Web.Mvc
         {
         }
 
+        /// <summary>
+        /// Creates a new RedirectToUmbracoResult
+        /// </summary>
+        /// <param name="key"></param>
+        public RedirectToUmbracoPageResult(Guid key)
+            : this(key, Current.UmbracoContextAccessor)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new RedirectToUmbracoResult
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="queryStringValues"></param>
+        public RedirectToUmbracoPageResult(Guid key, NameValueCollection queryStringValues)
+            : this(key, queryStringValues, Current.UmbracoContextAccessor)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new RedirectToUmbracoResult
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="queryString"></param>
+        public RedirectToUmbracoPageResult(Guid key, string queryString)
+            : this(key, queryString, Current.UmbracoContextAccessor)
+        {
+        }
+
         /// <summary>
         /// Creates a new RedirectToUmbracoResult
         /// </summary>
@@ -157,6 +198,43 @@ namespace Umbraco.Web.Mvc
             _umbracoContextAccessor = umbracoContextAccessor;
         }
 
+        /// <summary>
+        /// Creates a new RedirectToUmbracoResult
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="umbracoContextAccessor"></param>
+        public RedirectToUmbracoPageResult(Guid key, IUmbracoContextAccessor umbracoContextAccessor)
+        {
+            _key = key;
+            _umbracoContextAccessor = umbracoContextAccessor;
+        }
+
+        /// <summary>
+        /// Creates a new RedirectToUmbracoResult
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="queryStringValues"></param>
+        /// <param name="umbracoContextAccessor"></param>
+        public RedirectToUmbracoPageResult(Guid key, NameValueCollection queryStringValues, IUmbracoContextAccessor umbracoContextAccessor)
+        {
+            _key = key;
+            _queryStringValues = queryStringValues;
+            _umbracoContextAccessor = umbracoContextAccessor;
+        }
+
+        /// <summary>
+        /// Creates a new RedirectToUmbracoResult
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="queryString"></param>
+        /// <param name="umbracoContextAccessor"></param>
+        public RedirectToUmbracoPageResult(Guid key, string queryString, IUmbracoContextAccessor umbracoContextAccessor)
+        {
+            _key = key;
+            _queryStringValues = ParseQueryString(queryString);
+            _umbracoContextAccessor = umbracoContextAccessor;
+        }
+
         /// <summary>
         /// Creates a new RedirectToUmbracoResult
         /// </summary>
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index 64bdac669f..b15a00a33e 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -155,10 +155,10 @@ namespace Umbraco.Web.Mvc
             };
         }
 
-       
+
 
         /// <summary>
-        /// Handles a posted form to an Umbraco Url and ensures the correct controller is routed to and that
+        /// Handles a posted form to an Umbraco URL and ensures the correct controller is routed to and that
         /// the right DataTokens are set.
         /// </summary>
         /// <param name="requestContext"></param>
@@ -253,7 +253,7 @@ namespace Umbraco.Web.Mvc
                 //the template Alias should always be already saved with a safe name.
                 //if there are hyphens in the name and there is a hijacked route, then the Action will need to be attributed
                 // with the action name attribute.
-                var templateName = request.TemplateAlias.Split('.')[0].ToSafeAlias();
+                var templateName = request.TemplateAlias.Split(Umbraco.Core.Constants.CharArrays.Period)[0].ToSafeAlias();
                 def.ActionName = templateName;
             }
 
diff --git a/src/Umbraco.Web/Mvc/SurfaceController.cs b/src/Umbraco.Web/Mvc/SurfaceController.cs
index 4fc53de4ae..1e2536ddb5 100644
--- a/src/Umbraco.Web/Mvc/SurfaceController.cs
+++ b/src/Umbraco.Web/Mvc/SurfaceController.cs
@@ -56,6 +56,38 @@ namespace Umbraco.Web.Mvc
             return new RedirectToUmbracoPageResult(pageId, queryString,  Current.UmbracoContextAccessor);
         }
 
+        /// <summary>
+        /// Redirects to the Umbraco page with the given id
+        /// </summary>
+        /// <param name="pageId"></param>
+        /// <returns></returns>
+        protected RedirectToUmbracoPageResult RedirectToUmbracoPage(Guid key)
+        {
+            return new RedirectToUmbracoPageResult(key, Current.UmbracoContextAccessor);
+        }
+
+        /// <summary>
+        /// Redirects to the Umbraco page with the given id and passes provided querystring
+        /// </summary>
+        /// <param name="pageId"></param>
+        /// <param name="queryStringValues"></param>
+        /// <returns></returns>
+        protected RedirectToUmbracoPageResult RedirectToUmbracoPage(Guid key, NameValueCollection queryStringValues)
+        {
+            return new RedirectToUmbracoPageResult(key, queryStringValues, Current.UmbracoContextAccessor);
+        }
+
+        /// <summary>
+        /// Redirects to the Umbraco page with the given id and passes provided querystring
+        /// </summary>
+        /// <param name="pageId"></param>
+        /// <param name="queryString"></param>
+        /// <returns></returns>
+        protected RedirectToUmbracoPageResult RedirectToUmbracoPage(Guid key, string queryString)
+        {
+            return new RedirectToUmbracoPageResult(key, queryString, Current.UmbracoContextAccessor);
+        }
+
         /// <summary>
         /// Redirects to the Umbraco page with the given id
         /// </summary>
diff --git a/src/Umbraco.Web/OwinExtensions.cs b/src/Umbraco.Web/OwinExtensions.cs
index 6961f5c915..e7d41d113c 100644
--- a/src/Umbraco.Web/OwinExtensions.cs
+++ b/src/Umbraco.Web/OwinExtensions.cs
@@ -5,13 +5,28 @@ using Microsoft.Owin;
 using Microsoft.Owin.Security;
 using Umbraco.Core;
 using Umbraco.Core.Models.Identity;
-using Umbraco.Core.Security;
 using Umbraco.Web.Security;
 
 namespace Umbraco.Web
 {
     public static class OwinExtensions
     {
+        /// <summary>
+        /// Used by external login providers to set any errors that occur during the OAuth negotiation
+        /// </summary>
+        /// <param name="owinContext"></param>
+        /// <param name="errors"></param>
+        public static void SetExternalLoginProviderErrors(this IOwinContext owinContext, BackOfficeExternalLoginProviderErrors errors)
+            => owinContext.Set(errors);
+
+        /// <summary>
+        /// Retrieve any errors set by external login providers during OAuth negotiation
+        /// </summary>
+        /// <param name="owinContext"></param>
+        /// <returns></returns>
+        internal static BackOfficeExternalLoginProviderErrors GetExternalLoginProviderErrors(this IOwinContext owinContext)
+            => owinContext.Get<BackOfficeExternalLoginProviderErrors>();
+
         /// <summary>
         /// Gets the <see cref="ISecureDataFormat{AuthenticationTicket}"/> for the Umbraco back office cookie
         /// </summary>
diff --git a/src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
new file mode 100644
index 0000000000..8c4ebf49c3
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
@@ -0,0 +1,420 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Blocks;
+using Umbraco.Core.Models.Editors;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+using static Umbraco.Core.Models.Blocks.BlockItemData;
+
+namespace Umbraco.Web.PropertyEditors
+{
+
+    /// <summary>
+    /// Abstract class for block editor based editors
+    /// </summary>
+    public abstract class BlockEditorPropertyEditor : DataEditor
+    {
+        public const string ContentTypeKeyPropertyKey = "contentTypeKey";
+        public const string UdiPropertyKey = "udi";
+        private readonly ILocalizedTextService _localizedTextService;
+        private readonly Lazy<PropertyEditorCollection> _propertyEditors;
+        private readonly IDataTypeService _dataTypeService;
+        private readonly IContentTypeService _contentTypeService;
+
+        public BlockEditorPropertyEditor(ILogger logger, Lazy<PropertyEditorCollection> propertyEditors, IDataTypeService dataTypeService, IContentTypeService contentTypeService, ILocalizedTextService localizedTextService)
+            : base(logger)
+        {
+            _localizedTextService = localizedTextService;
+            _propertyEditors = propertyEditors;
+            _dataTypeService = dataTypeService;
+            _contentTypeService = contentTypeService;
+        }
+
+        // has to be lazy else circular dep in ctor
+        private PropertyEditorCollection PropertyEditors => _propertyEditors.Value;
+
+        #region Value Editor
+
+        protected override IDataValueEditor CreateValueEditor() => new BlockEditorPropertyValueEditor(Attribute, PropertyEditors, _dataTypeService, _contentTypeService, _localizedTextService, Logger);
+
+        internal class BlockEditorPropertyValueEditor : DataValueEditor, IDataValueReference
+        {
+            private readonly PropertyEditorCollection _propertyEditors;
+            private readonly IDataTypeService _dataTypeService;
+            private readonly ILogger _logger;
+            private readonly BlockEditorValues _blockEditorValues;
+
+            public BlockEditorPropertyValueEditor(DataEditorAttribute attribute, PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, IContentTypeService contentTypeService, ILocalizedTextService textService, ILogger logger)
+                : base(attribute)
+            {
+                _propertyEditors = propertyEditors;
+                _dataTypeService = dataTypeService;
+                _logger = logger;
+                _blockEditorValues = new BlockEditorValues(new BlockListEditorDataConverter(), contentTypeService, _logger);
+                Validators.Add(new BlockEditorValidator(_blockEditorValues, propertyEditors, dataTypeService, textService, contentTypeService));
+                Validators.Add(new MinMaxValidator(_blockEditorValues, textService));
+            }
+
+            public IEnumerable<UmbracoEntityReference> GetReferences(object value)
+            {
+                var rawJson = value == null ? string.Empty : value is string str ? str : value.ToString();
+
+                var result = new List<UmbracoEntityReference>();
+                var blockEditorData = _blockEditorValues.DeserializeAndClean(rawJson);
+                if (blockEditorData == null)
+                    return Enumerable.Empty<UmbracoEntityReference>();
+
+                // loop through all content and settings data
+                foreach (var row in blockEditorData.BlockValue.ContentData.Concat(blockEditorData.BlockValue.SettingsData))
+                {
+                    foreach (var prop in row.PropertyValues)
+                    {
+                        var propEditor = _propertyEditors[prop.Value.PropertyType.PropertyEditorAlias];
+
+                        var valueEditor = propEditor?.GetValueEditor();
+                        if (!(valueEditor is IDataValueReference reference)) continue;
+
+                        var val = prop.Value.Value?.ToString();
+
+                        var refs = reference.GetReferences(val);
+
+                        result.AddRange(refs);
+                    }
+                }
+
+                return result;
+            }
+
+            #region Convert database // editor
+
+            // note: there is NO variant support here
+
+            /// <summary>
+            /// Ensure that sub-editor values are translated through their ToEditor methods
+            /// </summary>
+            /// <param name="property"></param>
+            /// <param name="dataTypeService"></param>
+            /// <param name="culture"></param>
+            /// <param name="segment"></param>
+            /// <returns></returns>
+            public override object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
+            {
+                var val = property.GetValue(culture, segment);
+
+                BlockEditorData blockEditorData;
+                try
+                {
+                    blockEditorData = _blockEditorValues.DeserializeAndClean(val);
+                }
+                catch (JsonSerializationException)
+                {
+                    // if this occurs it means the data is invalid, shouldn't happen but has happened if we change the data format.
+                    return string.Empty;
+                }
+
+                if (blockEditorData == null || blockEditorData.BlockValue.ContentData.Count == 0)
+                    return string.Empty;
+
+                foreach (var row in blockEditorData.BlockValue.ContentData)
+                {
+                    foreach (var prop in row.PropertyValues)
+                    {
+                        // create a temp property with the value
+                        // - force it to be culture invariant as the block editor can't handle culture variant element properties
+                        prop.Value.PropertyType.Variations = ContentVariation.Nothing;
+                        var tempProp = new Property(prop.Value.PropertyType);
+
+                        tempProp.SetValue(prop.Value.Value);
+
+                        // convert that temp property, and store the converted value
+                        var propEditor = _propertyEditors[prop.Value.PropertyType.PropertyEditorAlias];
+                        if (propEditor == null)
+                        {
+                            // NOTE: This logic was borrowed from Nested Content and I'm unsure why it exists.
+                            // if the property editor doesn't exist I think everything will break anyways?
+                            // update the raw value since this is what will get serialized out
+                            row.RawPropertyValues[prop.Key] = tempProp.GetValue()?.ToString();
+                            continue;
+                        }
+
+                        var dataType = dataTypeService.GetDataType(prop.Value.PropertyType.DataTypeId);
+                        if (dataType == null)
+                        {
+                            // deal with weird situations by ignoring them (no comment)
+                            row.PropertyValues.Remove(prop.Key);
+                            _logger.Warn<BlockEditorPropertyValueEditor>(
+                                "ToEditor removed property value {PropertyKey} in row {RowId} for property type {PropertyTypeAlias}",
+                                prop.Key, row.Key, property.PropertyType.Alias);
+                            continue;
+                        }
+
+                        var tempConfig = dataType.Configuration;
+                        var valEditor = propEditor.GetValueEditor(tempConfig);
+                        var convValue = valEditor.ToEditor(tempProp, dataTypeService);
+
+                        // update the raw value since this is what will get serialized out
+                        row.RawPropertyValues[prop.Key] = convValue;
+                    }
+                }
+
+                // return json convertable object
+                return blockEditorData.BlockValue;
+            }
+
+            /// <summary>
+            /// Ensure that sub-editor values are translated through their FromEditor methods
+            /// </summary>
+            /// <param name="editorValue"></param>
+            /// <param name="currentValue"></param>
+            /// <returns></returns>
+            public override object FromEditor(ContentPropertyData editorValue, object currentValue)
+            {
+                if (editorValue.Value == null || string.IsNullOrWhiteSpace(editorValue.Value.ToString()))
+                    return null;
+
+                BlockEditorData blockEditorData;
+                try
+                {
+                    blockEditorData = _blockEditorValues.DeserializeAndClean(editorValue.Value);
+                }
+                catch (JsonSerializationException)
+                {
+                    // if this occurs it means the data is invalid, shouldn't happen but has happened if we change the data format.
+                    return string.Empty;
+                }
+
+                if (blockEditorData == null || blockEditorData.BlockValue.ContentData.Count == 0)
+                    return string.Empty;
+
+                foreach (var row in blockEditorData.BlockValue.ContentData)
+                {
+                    foreach (var prop in row.PropertyValues)
+                    {
+                        // Fetch the property types prevalue
+                        var propConfiguration = _dataTypeService.GetDataType(prop.Value.PropertyType.DataTypeId).Configuration;
+
+                        // Lookup the property editor
+                        var propEditor = _propertyEditors[prop.Value.PropertyType.PropertyEditorAlias];
+                        if (propEditor == null) continue;
+
+                        // Create a fake content property data object
+                        var contentPropData = new ContentPropertyData(prop.Value.Value, propConfiguration);
+
+                        // Get the property editor to do it's conversion
+                        var newValue = propEditor.GetValueEditor().FromEditor(contentPropData, prop.Value.Value);
+
+                        // update the raw value since this is what will get serialized out
+                        row.RawPropertyValues[prop.Key] = newValue;
+                    }
+                }
+
+                // return json
+                return JsonConvert.SerializeObject(blockEditorData.BlockValue);
+            }
+
+            #endregion
+        }
+
+        /// <summary>
+        /// Validates the min/max of the block editor
+        /// </summary>
+        private class MinMaxValidator : IValueValidator
+        {
+            private readonly BlockEditorValues _blockEditorValues;
+            private readonly ILocalizedTextService _textService;
+
+            public MinMaxValidator(BlockEditorValues blockEditorValues, ILocalizedTextService textService)
+            {
+                _blockEditorValues = blockEditorValues;
+                _textService = textService;
+            }
+
+            public IEnumerable<ValidationResult> Validate(object value, string valueType, object dataTypeConfiguration)
+            {
+                var blockConfig = (BlockListConfiguration)dataTypeConfiguration;
+                if (blockConfig == null) yield break;
+
+                var validationLimit = blockConfig.ValidationLimit;
+                if (validationLimit == null) yield break;
+
+                var blockEditorData = _blockEditorValues.DeserializeAndClean(value);
+
+                if ((blockEditorData == null && validationLimit.Min.HasValue && validationLimit.Min > 0)
+                    || (blockEditorData != null && validationLimit.Min.HasValue && blockEditorData.Layout.Count() < validationLimit.Min))
+                {
+                    yield return new ValidationResult(
+                        _textService.Localize("validation/entriesShort", new[]
+                        {
+                            validationLimit.Min.ToString(),
+                            (validationLimit.Min - blockEditorData.Layout.Count()).ToString()
+                        }),
+                        new[] { "minCount" });
+                }
+
+                if (blockEditorData != null && validationLimit.Max.HasValue && blockEditorData.Layout.Count() > validationLimit.Max)
+                {
+                    yield return new ValidationResult(
+                        _textService.Localize("validation/entriesExceed", new[]
+                        {
+                            validationLimit.Max.ToString(),
+                            (blockEditorData.Layout.Count() - validationLimit.Max).ToString()
+                        }),
+                        new[] { "maxCount" });
+                }
+            }
+        }
+
+        internal class BlockEditorValidator : ComplexEditorValidator
+        {
+            private readonly BlockEditorValues _blockEditorValues;
+            private readonly IContentTypeService _contentTypeService;
+
+            public BlockEditorValidator(BlockEditorValues blockEditorValues, PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, ILocalizedTextService textService, IContentTypeService contentTypeService)
+                : base(propertyEditors, dataTypeService, textService)
+            {
+                _blockEditorValues = blockEditorValues;
+                _contentTypeService = contentTypeService;
+            }
+
+            protected override IEnumerable<ElementTypeValidationModel> GetElementTypeValidation(object value)
+            {
+                var blockEditorData = _blockEditorValues.DeserializeAndClean(value);
+                if (blockEditorData != null)
+                {
+                    // There is no guarantee that the client will post data for every property defined in the Element Type but we still
+                    // need to validate that data for each property especially for things like 'required' data to work.
+                    // Lookup all element types for all content/settings and then we can populate any empty properties.
+                    var allElements = blockEditorData.BlockValue.ContentData.Concat(blockEditorData.BlockValue.SettingsData).ToList();
+                    var allElementTypes = _contentTypeService.GetAll(allElements.Select(x => x.ContentTypeKey).ToArray()).ToDictionary(x => x.Key);
+
+                    foreach (var row in allElements)
+                    {
+                        if (!allElementTypes.TryGetValue(row.ContentTypeKey, out var elementType))
+                            throw new InvalidOperationException($"No element type found with key {row.ContentTypeKey}");
+
+                        // now ensure missing properties
+                        foreach (var elementTypeProp in elementType.CompositionPropertyTypes)
+                        {
+                            if (!row.PropertyValues.ContainsKey(elementTypeProp.Alias))
+                            {
+                                // set values to null
+                                row.PropertyValues[elementTypeProp.Alias] = new BlockPropertyValue(null, elementTypeProp);
+                                row.RawPropertyValues[elementTypeProp.Alias] = null;
+                            }
+                        }
+
+                        var elementValidation = new ElementTypeValidationModel(row.ContentTypeAlias, row.Key);
+                        foreach (var prop in row.PropertyValues)
+                        {
+                            elementValidation.AddPropertyTypeValidation(
+                                new PropertyTypeValidationModel(prop.Value.PropertyType, prop.Value.Value));
+                        }
+                        yield return elementValidation;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Used to deserialize json values and clean up any values based on the existence of element types and layout structure
+        /// </summary>
+        internal class BlockEditorValues
+        {
+            private readonly Lazy<Dictionary<Guid, IContentType>> _contentTypes;
+            private readonly BlockEditorDataConverter _dataConverter;
+            private readonly ILogger _logger;
+
+            public BlockEditorValues(BlockEditorDataConverter dataConverter, IContentTypeService contentTypeService, ILogger logger)
+            {
+                _contentTypes = new Lazy<Dictionary<Guid, IContentType>>(() => contentTypeService.GetAll().ToDictionary(c => c.Key));
+                _dataConverter = dataConverter;
+                _logger = logger;
+            }
+
+            private IContentType GetElementType(BlockItemData item)
+            {
+                _contentTypes.Value.TryGetValue(item.ContentTypeKey, out var contentType);
+                return contentType;
+            }
+
+            public BlockEditorData DeserializeAndClean(object propertyValue)
+            {
+                if (propertyValue == null || string.IsNullOrWhiteSpace(propertyValue.ToString()))
+                    return null;
+
+                var blockEditorData = _dataConverter.Deserialize(propertyValue.ToString());
+
+                if (blockEditorData.BlockValue.ContentData.Count == 0)
+                {
+                    // if there's no content ensure there's no settings too
+                    blockEditorData.BlockValue.SettingsData.Clear();
+                    return null;
+                }
+
+                var contentTypePropertyTypes = new Dictionary<string, Dictionary<string, PropertyType>>();
+
+                // filter out any content that isn't referenced in the layout references
+                foreach (var block in blockEditorData.BlockValue.ContentData.Where(x => blockEditorData.References.Any(r => r.ContentUdi == x.Udi)))
+                {
+                    ResolveBlockItemData(block, contentTypePropertyTypes);
+                }
+                // filter out any settings that isn't referenced in the layout references
+                foreach (var block in blockEditorData.BlockValue.SettingsData.Where(x => blockEditorData.References.Any(r => r.SettingsUdi == x.Udi)))
+                {
+                    ResolveBlockItemData(block, contentTypePropertyTypes);
+                }
+
+                // remove blocks that couldn't be resolved
+                blockEditorData.BlockValue.ContentData.RemoveAll(x => x.ContentTypeAlias.IsNullOrWhiteSpace());
+                blockEditorData.BlockValue.SettingsData.RemoveAll(x => x.ContentTypeAlias.IsNullOrWhiteSpace());
+
+                return blockEditorData;
+            }
+
+            private bool ResolveBlockItemData(BlockItemData block, Dictionary<string, Dictionary<string, PropertyType>> contentTypePropertyTypes)
+            {
+                var contentType = GetElementType(block);
+                if (contentType == null)
+                    return false;
+
+                // get the prop types for this content type but keep a dictionary of found ones so we don't have to keep re-looking and re-creating
+                // objects on each iteration.
+                if (!contentTypePropertyTypes.TryGetValue(contentType.Alias, out var propertyTypes))
+                    propertyTypes = contentTypePropertyTypes[contentType.Alias] = contentType.CompositionPropertyTypes.ToDictionary(x => x.Alias, x => x);
+
+                var propValues = new Dictionary<string, BlockPropertyValue>();
+
+                // find any keys that are not real property types and remove them
+                foreach (var prop in block.RawPropertyValues.ToList())
+                {
+                    // doesn't exist so remove it
+                    if (!propertyTypes.TryGetValue(prop.Key, out var propType))
+                    {
+                        block.RawPropertyValues.Remove(prop.Key);
+                        _logger.Warn<BlockEditorValues>("The property {PropertyKey} for block {BlockKey} was removed because the property type {PropertyTypeAlias} was not found on {ContentTypeAlias}",
+                            prop.Key, block.Key, prop.Key, contentType.Alias);
+                    }
+                    else
+                    {
+                        // set the value to include the resolved property type
+                        propValues[prop.Key] = new BlockPropertyValue(prop.Value, propType);
+                    }
+                }
+
+                block.ContentTypeAlias = contentType.Alias;
+                block.PropertyValues = propValues;
+
+                return true;
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/BlockListConfiguration.cs b/src/Umbraco.Web/PropertyEditors/BlockListConfiguration.cs
new file mode 100644
index 0000000000..1af3aa1303
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/BlockListConfiguration.cs
@@ -0,0 +1,70 @@
+using Newtonsoft.Json;
+using System;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors
+{
+    /// <summary>
+    /// The configuration object for the Block List editor
+    /// </summary>
+    public class BlockListConfiguration
+    {
+        [ConfigurationField("blocks", "Available Blocks", "views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.html", Description = "Define the available blocks.")]
+        public BlockConfiguration[] Blocks { get; set; }
+
+        public class BlockConfiguration
+        {
+
+            [JsonProperty("backgroundColor")]
+            public string BackgroundColor { get; set; }
+
+            [JsonProperty("iconColor")]
+            public string IconColor { get; set; }
+
+            [JsonProperty("thumbnail")]
+            public string Thumbnail { get; set; }
+
+            [JsonProperty("contentElementTypeKey")]
+            public Guid ContentElementTypeKey { get; set; }
+
+            [JsonProperty("settingsElementTypeKey")]
+            public Guid? SettingsElementTypeKey { get; set; }
+
+            [JsonProperty("view")]
+            public string View { get; set; }
+
+            [JsonProperty("stylesheet")]
+            public string Stylesheet { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("editorSize")]
+            public string EditorSize { get; set; }
+
+            [JsonProperty("forceHideContentEditorInOverlay")]
+            public bool ForceHideContentEditorInOverlay { get; set; }
+        }
+
+        [ConfigurationField("validationLimit", "Amount", "numberrange", Description = "Set a required range of blocks")]
+        public NumberRange ValidationLimit { get; set; } = new NumberRange();
+
+        public class NumberRange
+        {
+            [JsonProperty("min")]
+            public int? Min { get; set; }
+
+            [JsonProperty("max")]
+            public int? Max { get; set; }
+        }
+
+        [ConfigurationField("useLiveEditing", "Live editing mode", "boolean", Description = "Live editing in editor overlays for live updated custom views or labels using custom expression.")]
+        public bool UseLiveEditing { get; set; }
+
+        [ConfigurationField("useInlineEditingAsDefault", "Inline editing mode", "boolean", Description = "Use the inline editor as the default block view.")]
+        public bool UseInlineEditingAsDefault { get; set; }
+
+        [ConfigurationField("maxPropertyWidth", "Property editor width", "textstring", Description = "optional css overwrite, example: 800px or 100%")]
+        public string MaxPropertyWidth { get; set; }
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/BlockListConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/BlockListConfigurationEditor.cs
new file mode 100644
index 0000000000..c866495504
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/BlockListConfigurationEditor.cs
@@ -0,0 +1,13 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors
+{
+    internal class BlockListConfigurationEditor : ConfigurationEditor<BlockListConfiguration>
+    {
+        public BlockListConfigurationEditor()
+        {
+
+        }
+
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/BlockListPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/BlockListPropertyEditor.cs
new file mode 100644
index 0000000000..42023382f1
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/BlockListPropertyEditor.cs
@@ -0,0 +1,35 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.Blocks;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Web.PropertyEditors
+{
+    /// <summary>
+    /// Represents a block list property editor.
+    /// </summary>
+    [DataEditor(
+        Constants.PropertyEditors.Aliases.BlockList,
+        "Block List",
+        "blocklist",
+        ValueType = ValueTypes.Json,
+        Group = Constants.PropertyEditors.Groups.Lists,
+        Icon = "icon-thumbnail-list")]
+    public class BlockListPropertyEditor : BlockEditorPropertyEditor
+    {
+        public BlockListPropertyEditor(ILogger logger, Lazy<PropertyEditorCollection> propertyEditors, IDataTypeService dataTypeService, IContentTypeService contentTypeService, ILocalizedTextService localizedTextService)
+            : base(logger, propertyEditors, dataTypeService, contentTypeService, localizedTextService)
+        { }
+
+        #region Pre Value Editor
+
+        protected override IConfigurationEditor CreateConfigurationEditor() => new BlockListConfigurationEditor();
+
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/ComplexEditorValidator.cs b/src/Umbraco.Web/PropertyEditors/ComplexEditorValidator.cs
new file mode 100644
index 0000000000..365a3fff6b
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/ComplexEditorValidator.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+using Umbraco.Web.PropertyEditors.Validation;
+
+namespace Umbraco.Web.PropertyEditors
+{
+    /// <summary>
+    /// Used to validate complex editors that contain nested editors
+    /// </summary>
+    public abstract class ComplexEditorValidator : IValueValidator
+    {
+        private readonly PropertyValidationService _propertyValidationService;
+
+        public ComplexEditorValidator(PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, ILocalizedTextService textService)
+        {
+            _propertyValidationService = new PropertyValidationService(propertyEditors, dataTypeService, textService);
+        }
+
+        /// <summary>
+        /// Return a single <see cref="ComplexEditorValidationResult"/> for all sub nested validation results in the complex editor
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="valueType"></param>
+        /// <param name="dataTypeConfiguration"></param>
+        /// <returns></returns>
+        public IEnumerable<ValidationResult> Validate(object value, string valueType, object dataTypeConfiguration)
+        {
+            var elementTypeValues = GetElementTypeValidation(value).ToList();
+            var rowResults = GetNestedValidationResults(elementTypeValues).ToList();
+
+            if (rowResults.Count > 0)
+            {
+                var result = new ComplexEditorValidationResult();
+                foreach(var rowResult in rowResults)
+                {
+                    result.ValidationResults.Add(rowResult);
+                }
+                return result.Yield();
+            }
+
+            return Enumerable.Empty<ValidationResult>();
+        }
+
+       
+        protected abstract IEnumerable<ElementTypeValidationModel> GetElementTypeValidation(object value);
+
+        /// <summary>
+        /// Return a nested validation result per row (Element Type)
+        /// </summary>
+        /// <param name="rawValue"></param>
+        /// <returns></returns>
+        protected IEnumerable<ComplexEditorElementTypeValidationResult> GetNestedValidationResults(IEnumerable<ElementTypeValidationModel> elements)
+        {
+            foreach (var row in elements)
+            {
+                var elementTypeValidationResult = new ComplexEditorElementTypeValidationResult(row.ElementTypeAlias, row.Id);
+
+                foreach (var prop in row.PropertyTypeValidation)
+                {
+                    var propValidationResult = new ComplexEditorPropertyTypeValidationResult(prop.PropertyType.Alias);
+
+                    foreach (var validationResult in _propertyValidationService.ValidatePropertyValue(prop.PropertyType, prop.PostedValue))
+                    {
+                        // add the result to the property results
+                        propValidationResult.AddValidationResult(validationResult);
+                    }
+
+                    // add the property results to the element type results
+                    if (propValidationResult.ValidationResults.Count > 0)
+                        elementTypeValidationResult.ValidationResults.Add(propValidationResult);
+                }
+
+                if (elementTypeValidationResult.ValidationResults.Count > 0)
+                {
+                    yield return elementTypeValidationResult;
+                }
+            }
+        }
+
+        public class PropertyTypeValidationModel
+        {
+            public PropertyTypeValidationModel(PropertyType propertyType, object postedValue)
+            {
+                PostedValue = postedValue;
+                PropertyType = propertyType ?? throw new ArgumentNullException(nameof(propertyType));
+            }
+
+            public object PostedValue { get; }
+            public PropertyType PropertyType { get; }
+        }
+
+        public class ElementTypeValidationModel
+        {
+            public ElementTypeValidationModel(string elementTypeAlias, Guid id)
+            {
+                ElementTypeAlias = elementTypeAlias;
+                Id = id;
+            }
+
+            private List<PropertyTypeValidationModel> _list = new List<PropertyTypeValidationModel>();
+
+            public IEnumerable<PropertyTypeValidationModel> PropertyTypeValidation => _list;
+
+            public string ElementTypeAlias { get; }
+            public Guid Id { get; }
+
+            public void AddPropertyTypeValidation(PropertyTypeValidationModel propValidation) => _list.Add(propValidation);
+        }
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/EmailAddressConfiguration.cs b/src/Umbraco.Web/PropertyEditors/EmailAddressConfiguration.cs
index 4039a0e3a2..fa8eb830b0 100644
--- a/src/Umbraco.Web/PropertyEditors/EmailAddressConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/EmailAddressConfiguration.cs
@@ -1,4 +1,5 @@
-using Umbraco.Core.PropertyEditors;
+using System;
+using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
@@ -7,7 +8,8 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     public class EmailAddressConfiguration
     {
-        [ConfigurationField("IsRequired", "Required?", "boolean")]
+        [ConfigurationField("IsRequired", "Required?", "hidden", Description = "Deprecated; Make this required by selecting mandatory when adding to the document type")]
+        [Obsolete("No longer used, use `Mandatory` for the property instead. Will be removed in the next major version")]
         public bool IsRequired { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs b/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs
index ce41628ec1..de538793a5 100644
--- a/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/ListViewConfiguration.cs
@@ -69,6 +69,9 @@ namespace Umbraco.Web.PropertyEditors
         [ConfigurationField("showContentFirst", "Show Content App First", "boolean", Description = "Enable this to show the content app by default instead of the list view app")]
         public bool ShowContentFirst { get; set; }
 
+        [ConfigurationField("useInfiniteEditor", "Edit in Infinite Editor", "boolean", Description = "Enable this to use infinite editing to edit the content of the list view")]
+        public bool UseInfiniteEditor { get; set; }
+
         public class Property
         {
             [JsonProperty("alias")]
diff --git a/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
index fa8060bd15..493fc96f76 100644
--- a/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
@@ -45,7 +45,7 @@ namespace Umbraco.Web.PropertyEditors
 
                 if (string.IsNullOrEmpty(asString)) yield break;
 
-                foreach (var udiStr in asString.Split(','))
+                foreach (var udiStr in asString.Split(Constants.CharArrays.Comma))
                 {
                     if (Udi.TryParse(udiStr, out var udi))
                         yield return new UmbracoEntityReference(udi);
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
index fd7f735e68..1630e706db 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Web.PropertyEditors
             {
                 var asString = value == null ? string.Empty : value is string str ? str : value.ToString();
 
-                var udiPaths = asString.Split(',');
+                var udiPaths = asString.Split(Constants.CharArrays.Comma);
                 foreach (var udiPath in udiPaths)
                     if (Udi.TryParse(udiPath, out var udi))
                         yield return new UmbracoEntityReference(udi);
diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
index 8af2d98018..522a81d7b2 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Web.PropertyEditors
     [DataEditor(
         Constants.PropertyEditors.Aliases.MultiUrlPicker,
         EditorType.PropertyValue,
-        "Multi Url Picker",
+        "Multi URL Picker",
         "multiurlpicker",
         ValueType = ValueTypes.Json,
         Group = Constants.PropertyEditors.Groups.Pickers,
diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
index 853e995ed8..5a84e4b20c 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
@@ -141,7 +141,7 @@ namespace Umbraco.Web.PropertyEditors
                         QueryString = link.QueryString,
                         Target = link.Target,
                         Udi = link.Udi,
-                        Url = link.Udi == null ? link.Url : null, // only save the url for external links
+                        Url = link.Udi == null ? link.Url : null, // only save the URL for external links
                     },
                     new JsonSerializerSettings
                     {
diff --git a/src/Umbraco.Web/PropertyEditors/NestedContentConfiguration.cs b/src/Umbraco.Web/PropertyEditors/NestedContentConfiguration.cs
index 0f53207462..89190883c8 100644
--- a/src/Umbraco.Web/PropertyEditors/NestedContentConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/NestedContentConfiguration.cs
@@ -3,6 +3,7 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
+
     /// <summary>
     /// Represents the configuration for the nested content value editor.
     /// </summary>
diff --git a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
index 564630c574..ca3c5a2a04 100644
--- a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core;
@@ -13,16 +14,18 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Models.Editors;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
+using Umbraco.Web.PropertyEditors.Validation;
 
 namespace Umbraco.Web.PropertyEditors
 {
+
     /// <summary>
     /// Represents a nested content property editor.
     /// </summary>
     [DataEditor(
         Constants.PropertyEditors.Aliases.NestedContent,
         "Nested Content",
-        "nestedcontent",
+        "nestedcontent", 
         ValueType = ValueTypes.Json,
         Group = Constants.PropertyEditors.Groups.Lists,
         Icon = "icon-thumbnail-list")]
@@ -31,14 +34,20 @@ namespace Umbraco.Web.PropertyEditors
         private readonly Lazy<PropertyEditorCollection> _propertyEditors;
         private readonly IDataTypeService _dataTypeService;
         private readonly IContentTypeService _contentTypeService;
+        private readonly ILocalizedTextService _localizedTextService;
         internal const string ContentTypeAliasPropertyKey = "ncContentTypeAlias";
 
+        [Obsolete("Use the constructor specifying all parameters instead")]
         public NestedContentPropertyEditor(ILogger logger, Lazy<PropertyEditorCollection> propertyEditors, IDataTypeService dataTypeService, IContentTypeService contentTypeService)
+            : this(logger, propertyEditors, dataTypeService, contentTypeService, Current.Services.TextService) { }
+
+        public NestedContentPropertyEditor(ILogger logger, Lazy<PropertyEditorCollection> propertyEditors, IDataTypeService dataTypeService, IContentTypeService contentTypeService, ILocalizedTextService localizedTextService)
             : base (logger)
         {
             _propertyEditors = propertyEditors;
             _dataTypeService = dataTypeService;
             _contentTypeService = contentTypeService;
+            _localizedTextService = localizedTextService;
         }
 
         // has to be lazy else circular dep in ctor
@@ -52,21 +61,23 @@ namespace Umbraco.Web.PropertyEditors
 
         #region Value Editor
 
-        protected override IDataValueEditor CreateValueEditor() => new NestedContentPropertyValueEditor(Attribute, PropertyEditors, _dataTypeService, _contentTypeService);
+        protected override IDataValueEditor CreateValueEditor() => new NestedContentPropertyValueEditor(Attribute, PropertyEditors, _dataTypeService, _contentTypeService, _localizedTextService, Logger);
 
         internal class NestedContentPropertyValueEditor : DataValueEditor, IDataValueReference
         {
             private readonly PropertyEditorCollection _propertyEditors;
             private readonly IDataTypeService _dataTypeService;
+            private readonly ILogger _logger;
             private readonly NestedContentValues _nestedContentValues;
             
-            public NestedContentPropertyValueEditor(DataEditorAttribute attribute, PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, IContentTypeService contentTypeService)
+            public NestedContentPropertyValueEditor(DataEditorAttribute attribute, PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, IContentTypeService contentTypeService, ILocalizedTextService textService, ILogger logger)
                 : base(attribute)
             {
                 _propertyEditors = propertyEditors;
                 _dataTypeService = dataTypeService;
+                _logger = logger;
                 _nestedContentValues = new NestedContentValues(contentTypeService);
-                Validators.Add(new NestedContentValidator(propertyEditors, dataTypeService, _nestedContentValues));
+                Validators.Add(new NestedContentValidator(_nestedContentValues, propertyEditors, dataTypeService, textService, contentTypeService));
             }
 
             /// <inheritdoc />
@@ -89,143 +100,153 @@ namespace Umbraco.Web.PropertyEditors
 
             public override string ConvertDbToString(PropertyType propertyType, object propertyValue, IDataTypeService dataTypeService)
             {
-                var vals = _nestedContentValues.GetPropertyValues(propertyValue, out var deserialized).ToList();
+                var rows = _nestedContentValues.GetPropertyValues(propertyValue);
 
-                if (vals.Count == 0)
+                if (rows.Count == 0)
                     return string.Empty;
 
-                foreach (var row in vals)
+                foreach (var row in rows.ToList())
                 {
-                    if (row.PropType == null)
-                    {
-                        // type not found, and property is not system: just delete the value
-                        if (IsSystemPropertyKey(row.PropKey) == false)
-                            row.JsonRowValue[row.PropKey] = null;
-                    }
-                    else
+                    foreach(var prop in row.PropertyValues.ToList())
                     {
                         try
                         {
                             // convert the value, and store the converted value
-                            var propEditor = _propertyEditors[row.PropType.PropertyEditorAlias];
+                            var propEditor = _propertyEditors[prop.Value.PropertyType.PropertyEditorAlias];
                             if (propEditor == null) continue;
 
-                            var tempConfig = dataTypeService.GetDataType(row.PropType.DataTypeId).Configuration;
+                            var tempConfig = dataTypeService.GetDataType(prop.Value.PropertyType.DataTypeId).Configuration;
                             var valEditor = propEditor.GetValueEditor(tempConfig);
-                            var convValue = valEditor.ConvertDbToString(row.PropType, row.JsonRowValue[row.PropKey]?.ToString(), dataTypeService);
-                            row.JsonRowValue[row.PropKey] = convValue;
+                            var convValue = valEditor.ConvertDbToString(prop.Value.PropertyType, prop.Value.Value, dataTypeService);
+
+                            // update the raw value since this is what will get serialized out
+                            row.RawPropertyValues[prop.Key] = convValue;
                         }
-                        catch (InvalidOperationException)
+                        catch (InvalidOperationException ex)
                         {
                             // deal with weird situations by ignoring them (no comment)
-                            row.JsonRowValue[row.PropKey] = null;
+                            row.RawPropertyValues.Remove(prop.Key);
+                            _logger.Warn<NestedContentPropertyValueEditor>(
+                                ex,
+                                "ConvertDbToString removed property value {PropertyKey} in row {RowId} for property type {PropertyTypeAlias}",
+                                prop.Key, row.Id, propertyType.Alias);
                         }
                     }
                 }
 
-                return JsonConvert.SerializeObject(deserialized).ToXmlString<string>();
+                return JsonConvert.SerializeObject(rows).ToXmlString<string>();
             }
 
             #endregion
 
-            
+
 
             #region Convert database // editor
 
             // note: there is NO variant support here
 
+            /// <summary>
+            /// Ensure that sub-editor values are translated through their ToEditor methods
+            /// </summary>
+            /// <param name="property"></param>
+            /// <param name="dataTypeService"></param>
+            /// <param name="culture"></param>
+            /// <param name="segment"></param>
+            /// <returns></returns>
             public override object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
             {
                 var val = property.GetValue(culture, segment);
 
-                var vals = _nestedContentValues.GetPropertyValues(val, out var deserialized).ToList();
+                var rows = _nestedContentValues.GetPropertyValues(val);
 
-                if (vals.Count == 0)
+                if (rows.Count == 0)
                     return string.Empty;
 
-                foreach (var row in vals)
+                foreach (var row in rows.ToList())
                 {
-                    if (row.PropType == null)
-                    {
-                        // type not found, and property is not system: just delete the value
-                        if (IsSystemPropertyKey(row.PropKey) == false)
-                            row.JsonRowValue[row.PropKey] = null;
-                    }
-                    else
+                    foreach(var prop in row.PropertyValues.ToList())
                     {
                         try
                         {
                             // create a temp property with the value
                             // - force it to be culture invariant as NC can't handle culture variant element properties
-                            row.PropType.Variations = ContentVariation.Nothing;
-                            var tempProp = new Property(row.PropType);
-                            tempProp.SetValue(row.JsonRowValue[row.PropKey] == null ? null : row.JsonRowValue[row.PropKey].ToString());
+                            prop.Value.PropertyType.Variations = ContentVariation.Nothing;
+                            var tempProp = new Property(prop.Value.PropertyType);
+
+                            tempProp.SetValue(prop.Value.Value);
 
                             // convert that temp property, and store the converted value
-                            var propEditor = _propertyEditors[row.PropType.PropertyEditorAlias];
+                            var propEditor = _propertyEditors[prop.Value.PropertyType.PropertyEditorAlias];
                             if (propEditor == null)
                             {
-                                row.JsonRowValue[row.PropKey] = tempProp.GetValue()?.ToString();
+                                // update the raw value since this is what will get serialized out
+                                row.RawPropertyValues[prop.Key] = tempProp.GetValue()?.ToString();
                                 continue;
                             }
 
-                            var tempConfig = dataTypeService.GetDataType(row.PropType.DataTypeId).Configuration;
+                            var tempConfig = dataTypeService.GetDataType(prop.Value.PropertyType.DataTypeId).Configuration;
                             var valEditor = propEditor.GetValueEditor(tempConfig);
                             var convValue = valEditor.ToEditor(tempProp, dataTypeService);
-                            row.JsonRowValue[row.PropKey] = convValue == null ? null : JToken.FromObject(convValue);
+
+                            // update the raw value since this is what will get serialized out
+                            row.RawPropertyValues[prop.Key] = convValue == null ? null : JToken.FromObject(convValue);
                         }
-                        catch (InvalidOperationException)
+                        catch (InvalidOperationException ex)
                         {
                             // deal with weird situations by ignoring them (no comment)
-                            row.JsonRowValue[row.PropKey] = null;
+                            row.RawPropertyValues.Remove(prop.Key);
+                            _logger.Warn<NestedContentPropertyValueEditor>(
+                                ex,
+                                "ToEditor removed property value {PropertyKey} in row {RowId} for property type {PropertyTypeAlias}",
+                                prop.Key, row.Id, property.PropertyType.Alias);
                         }
                     }
                 }
 
-                // return json
-                return deserialized;
+                // return the object, there's a native json converter for this so it will serialize correctly
+                return rows;
             }
 
+            /// <summary>
+            /// Ensure that sub-editor values are translated through their FromEditor methods
+            /// </summary>
+            /// <param name="editorValue"></param>
+            /// <param name="currentValue"></param>
+            /// <returns></returns>
             public override object FromEditor(ContentPropertyData editorValue, object currentValue)
             {
                 if (editorValue.Value == null || string.IsNullOrWhiteSpace(editorValue.Value.ToString()))
                     return null;
 
-                var vals = _nestedContentValues.GetPropertyValues(editorValue.Value, out var deserialized).ToList();
+                var rows = _nestedContentValues.GetPropertyValues(editorValue.Value);
 
-                if (vals.Count == 0)
+                if (rows.Count == 0)
                     return string.Empty;
 
-                foreach (var row in vals)
+                foreach (var row in rows.ToList())
                 {
-                    if (row.PropType == null)
-                    {
-                        // type not found, and property is not system: just delete the value
-                        if (IsSystemPropertyKey(row.PropKey) == false)
-                            row.JsonRowValue[row.PropKey] = null;
-                    }
-                    else
+                    foreach(var prop in row.PropertyValues.ToList())
                     {
                         // Fetch the property types prevalue
-                        var propConfiguration = _dataTypeService.GetDataType(row.PropType.DataTypeId).Configuration;
+                        var propConfiguration = _dataTypeService.GetDataType(prop.Value.PropertyType.DataTypeId).Configuration;
 
                         // Lookup the property editor
-                        var propEditor = _propertyEditors[row.PropType.PropertyEditorAlias];
+                        var propEditor = _propertyEditors[prop.Value.PropertyType.PropertyEditorAlias];
                         if (propEditor == null) continue;
 
                         // Create a fake content property data object
-                        var contentPropData = new ContentPropertyData(row.JsonRowValue[row.PropKey], propConfiguration);
+                        var contentPropData = new ContentPropertyData(prop.Value.Value, propConfiguration);
 
                         // Get the property editor to do it's conversion
-                        var newValue = propEditor.GetValueEditor().FromEditor(contentPropData, row.JsonRowValue[row.PropKey]);
+                        var newValue = propEditor.GetValueEditor().FromEditor(contentPropData, prop.Value.Value);
 
-                        // Store the value back
-                        row.JsonRowValue[row.PropKey] = (newValue == null) ? null : JToken.FromObject(newValue);
+                        // update the raw value since this is what will get serialized out
+                        row.RawPropertyValues[prop.Key] = (newValue == null) ? null : JToken.FromObject(newValue);
                     }
                 }
 
                 // return json
-                return JsonConvert.SerializeObject(deserialized);
+                return JsonConvert.SerializeObject(rows);
             }
             #endregion
 
@@ -235,98 +256,89 @@ namespace Umbraco.Web.PropertyEditors
 
                 var result = new List<UmbracoEntityReference>();
 
-                foreach (var row in _nestedContentValues.GetPropertyValues(rawJson, out _))
+                foreach (var row in _nestedContentValues.GetPropertyValues(rawJson))
                 {
-                    if (row.PropType == null) continue;
+                    foreach(var prop in row.PropertyValues)
+                    {
+                        var propEditor = _propertyEditors[prop.Value.PropertyType.PropertyEditorAlias];
 
-                    var propEditor = _propertyEditors[row.PropType.PropertyEditorAlias];
+                        var valueEditor = propEditor?.GetValueEditor();
+                        if (!(valueEditor is IDataValueReference reference)) continue;
 
-                    var valueEditor = propEditor?.GetValueEditor();
-                    if (!(valueEditor is IDataValueReference reference)) continue;
+                        var val = prop.Value.Value?.ToString();
 
-                    var val = row.JsonRowValue[row.PropKey]?.ToString();
+                        var refs = reference.GetReferences(val);
 
-                    var refs = reference.GetReferences(val);
-
-                    result.AddRange(refs);
+                        result.AddRange(refs);
+                    }
                 }
 
                 return result;
             }
         }
 
-        internal class NestedContentValidator : IValueValidator
+        /// <summary>
+        /// Validator for nested content to ensure that all nesting of editors is validated
+        /// </summary>
+        internal class NestedContentValidator : ComplexEditorValidator
         {
-            private readonly PropertyEditorCollection _propertyEditors;
-            private readonly IDataTypeService _dataTypeService;
             private readonly NestedContentValues _nestedContentValues;
+            private readonly IContentTypeService _contentTypeService;
 
-            public NestedContentValidator(PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, NestedContentValues nestedContentValues)
+            public NestedContentValidator(NestedContentValues nestedContentValues, PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, ILocalizedTextService textService, IContentTypeService contentTypeService)
+                : base(propertyEditors, dataTypeService, textService)
             {
-                _propertyEditors = propertyEditors;
-                _dataTypeService = dataTypeService;
                 _nestedContentValues = nestedContentValues;
+                _contentTypeService = contentTypeService;
             }
 
-            public IEnumerable<ValidationResult> Validate(object rawValue, string valueType, object dataTypeConfiguration)
+            protected override IEnumerable<ElementTypeValidationModel> GetElementTypeValidation(object value)
             {
-                var validationResults = new List<ValidationResult>();
+                var rows = _nestedContentValues.GetPropertyValues(value);
+                if (rows.Count == 0) yield break;
 
-                foreach(var row in _nestedContentValues.GetPropertyValues(rawValue, out _))
+                // There is no guarantee that the client will post data for every property defined in the Element Type but we still
+                // need to validate that data for each property especially for things like 'required' data to work.
+                // Lookup all element types for all content/settings and then we can populate any empty properties.
+                var allElementAliases = rows.Select(x => x.ContentTypeAlias).ToList();
+                // unfortunately we need to get all content types and post filter - but they are cached so its ok, there's
+                // no overload to lookup by many aliases.
+                var allElementTypes = _contentTypeService.GetAll().Where(x => allElementAliases.Contains(x.Alias)).ToDictionary(x => x.Alias);
+
+                foreach (var row in rows)
                 {
-                    if (row.PropType == null) continue;
+                    if (!allElementTypes.TryGetValue(row.ContentTypeAlias, out var elementType))
+                        throw new InvalidOperationException($"No element type found with alias {row.ContentTypeAlias}");
 
-                    var config = _dataTypeService.GetDataType(row.PropType.DataTypeId).Configuration;
-                    var propertyEditor = _propertyEditors[row.PropType.PropertyEditorAlias];
-                    if (propertyEditor == null) continue;
-
-                    foreach (var validator in propertyEditor.GetValueEditor().Validators)
+                    // now ensure missing properties
+                    foreach (var elementTypeProp in elementType.CompositionPropertyTypes)
                     {
-                        foreach (var result in validator.Validate(row.JsonRowValue[row.PropKey], propertyEditor.GetValueEditor().ValueType, config))
+                        if (!row.PropertyValues.ContainsKey(elementTypeProp.Alias))
                         {
-                            result.ErrorMessage = "Item " + (row.RowIndex + 1) + " '" + row.PropType.Name + "' " + result.ErrorMessage;
-                            validationResults.Add(result);
+                            // set values to null
+                            row.PropertyValues[elementTypeProp.Alias] = new NestedContentValues.NestedContentPropertyValue
+                            {
+                                PropertyType = elementTypeProp,
+                                Value = null
+                            };
+                            row.RawPropertyValues[elementTypeProp.Alias] = null;
                         }
                     }
 
-                    // Check mandatory
-                    if (row.PropType.Mandatory)
+                    var elementValidation = new ElementTypeValidationModel(row.ContentTypeAlias, row.Id);
+                    foreach (var prop in row.PropertyValues)
                     {
-                        if (row.JsonRowValue[row.PropKey] == null)
-                        {
-                            var message = string.IsNullOrWhiteSpace(row.PropType.MandatoryMessage)
-                                                      ? $"'{row.PropType.Name}' cannot be null"
-                                                      : row.PropType.MandatoryMessage;
-                            validationResults.Add(new ValidationResult($"Item {(row.RowIndex + 1)}: {message}", new[] { row.PropKey }));
-                        }                            
-                        else if (row.JsonRowValue[row.PropKey].ToString().IsNullOrWhiteSpace() || (row.JsonRowValue[row.PropKey].Type == JTokenType.Array && !row.JsonRowValue[row.PropKey].HasValues))
-                        {
-                            var message = string.IsNullOrWhiteSpace(row.PropType.MandatoryMessage)
-                                                      ? $"'{row.PropType.Name}' cannot be empty"
-                                                      : row.PropType.MandatoryMessage;
-                            validationResults.Add(new ValidationResult($"Item {(row.RowIndex + 1)}: {message}", new[] { row.PropKey }));
-                        }   
-                    }
-
-                    // Check regex
-                    if (!row.PropType.ValidationRegExp.IsNullOrWhiteSpace()
-                        && row.JsonRowValue[row.PropKey] != null && !row.JsonRowValue[row.PropKey].ToString().IsNullOrWhiteSpace())
-                    {
-                        var regex = new Regex(row.PropType.ValidationRegExp);
-                        if (!regex.IsMatch(row.JsonRowValue[row.PropKey].ToString()))
-                        {
-                            var message = string.IsNullOrWhiteSpace(row.PropType.ValidationRegExpMessage)
-                                                      ? $"'{row.PropType.Name}' is invalid, it does not match the correct pattern"
-                                                      : row.PropType.ValidationRegExpMessage;
-                           validationResults.Add(new ValidationResult($"Item {(row.RowIndex + 1)}: {message}", new[] { row.PropKey }));
-                        }
+                        elementValidation.AddPropertyTypeValidation(
+                            new PropertyTypeValidationModel(prop.Value.PropertyType, prop.Value.Value));                        
                     }
+                    yield return elementValidation;
                 }
-
-                return validationResults;
             }
         }
 
+        /// <summary>
+        /// Used to deserialize the nested content serialized value
+        /// </summary>
         internal class NestedContentValues
         {
             private readonly Lazy<Dictionary<string, IContentType>> _contentTypes;
@@ -336,84 +348,116 @@ namespace Umbraco.Web.PropertyEditors
                 _contentTypes = new Lazy<Dictionary<string, IContentType>>(() => contentTypeService.GetAll().ToDictionary(c => c.Alias));
             }
 
-            private IContentType GetElementType(JObject item)
+            private IContentType GetElementType(NestedContentRowValue item)
             {
-                var contentTypeAlias = item[ContentTypeAliasPropertyKey]?.ToObject<string>() ?? string.Empty;
-                _contentTypes.Value.TryGetValue(contentTypeAlias, out var contentType);
+                _contentTypes.Value.TryGetValue(item.ContentTypeAlias, out var contentType);
                 return contentType;
             }
 
-            public IEnumerable<RowValue> GetPropertyValues(object propertyValue, out List<JObject> deserialized)
+            /// <summary>
+            /// Deserialize the raw json property value
+            /// </summary>
+            /// <param name="propertyValue"></param>
+            /// <returns></returns>
+            public IReadOnlyList<NestedContentRowValue> GetPropertyValues(object propertyValue)
             {
-                var rowValues = new List<RowValue>();
-
-                deserialized = null;
-
                 if (propertyValue == null || string.IsNullOrWhiteSpace(propertyValue.ToString()))
-                    return Enumerable.Empty<RowValue>();
-
-                deserialized = JsonConvert.DeserializeObject<List<JObject>>(propertyValue.ToString());
+                    return new List<NestedContentRowValue>();
+                
+                 if (!propertyValue.ToString().DetectIsJson())
+                    return new List<NestedContentRowValue>();
+                    
+                var rowValues = JsonConvert.DeserializeObject<List<NestedContentRowValue>>(propertyValue.ToString());
 
                 // There was a note here about checking if the result had zero items and if so it would return null, so we'll continue to do that
                 // The original note was: "Issue #38 - Keep recursive property lookups working"
                 // Which is from the original NC tracker: https://github.com/umco/umbraco-nested-content/issues/38
                 // This check should be used everywhere when iterating NC prop values, instead of just the one previous place so that
                 // empty values don't get persisted when there is nothing, it should actually be null.
-                if (deserialized == null || deserialized.Count == 0)
-                    return Enumerable.Empty<RowValue>();
+                if (rowValues == null || rowValues.Count == 0)
+                    return new List<NestedContentRowValue>();
 
-                var index = 0;
+                var contentTypePropertyTypes = new Dictionary<string, Dictionary<string, PropertyType>>();
 
-                foreach (var o in deserialized)
+                foreach (var row in rowValues)
                 {
-                    var propValues = o;
-
-                    var contentType = GetElementType(propValues);
+                    var contentType = GetElementType(row);
                     if (contentType == null)
                         continue;
 
-                    var propertyTypes = contentType.CompositionPropertyTypes.ToDictionary(x => x.Alias, x => x);
-                    var propAliases = propValues.Properties().Select(x => x.Name);
-                    foreach (var propAlias in propAliases)
+                    // get the prop types for this content type but keep a dictionary of found ones so we don't have to keep re-looking and re-creating
+                    // objects on each iteration.
+                    if (!contentTypePropertyTypes.TryGetValue(contentType.Alias, out var propertyTypes))
+                        propertyTypes = contentTypePropertyTypes[contentType.Alias] = contentType.CompositionPropertyTypes.ToDictionary(x => x.Alias, x => x);
+
+                    // find any keys that are not real property types and remove them
+                    if (row.RawPropertyValues != null)
                     {
-                        propertyTypes.TryGetValue(propAlias, out var propType);
-                        rowValues.Add(new RowValue(propAlias, propType, propValues, index));
+                        foreach (var prop in row.RawPropertyValues.ToList())
+                        {
+                            if (IsSystemPropertyKey(prop.Key)) continue;
+
+                            // doesn't exist so remove it
+                            if (!propertyTypes.TryGetValue(prop.Key, out var propType))
+                            {
+                                row.RawPropertyValues.Remove(prop.Key);
+                            }
+                            else
+                            {
+                                // set the value to include the resolved property type
+                                row.PropertyValues[prop.Key] = new NestedContentPropertyValue
+                                {
+                                    PropertyType = propType,
+                                    Value = prop.Value
+                                };
+                            }
+                        }
                     }
-                    index++;
                 }
 
                 return rowValues;
             }
 
-            internal class RowValue
+            /// <summary>
+            /// Used during deserialization to populate the property value/property type of a nested content row property
+            /// </summary>
+            internal class NestedContentPropertyValue
             {
-                public RowValue(string propKey, PropertyType propType, JObject propValues, int index)
-                {
-                    PropKey = propKey ?? throw new ArgumentNullException(nameof(propKey));
-                    PropType = propType;
-                    JsonRowValue = propValues ?? throw new ArgumentNullException(nameof(propValues));
-                    RowIndex = index;
-                }
+                public object Value { get; set; }
+                public PropertyType PropertyType { get; set; }
+            }
+
+            /// <summary>
+            /// Used to deserialize a nested content row
+            /// </summary>
+            internal class NestedContentRowValue
+            {
+                [JsonProperty("key")]
+                public Guid Id{ get; set; }
+
+                [JsonProperty("name")]
+                public string Name { get; set; }
+
+                [JsonProperty("ncContentTypeAlias")]
+                public string ContentTypeAlias { get; set; }
 
                 /// <summary>
-                /// The current property key being iterated for the row value
+                /// The remaining properties will be serialized to a dictionary
                 /// </summary>
-                public string PropKey { get; }
+                /// <remarks>
+                /// The JsonExtensionDataAttribute is used to put the non-typed properties into a bucket
+                /// http://www.newtonsoft.com/json/help/html/DeserializeExtensionData.htm
+                /// NestedContent serializes to string, int, whatever eg
+                ///   "stringValue":"Some String","numericValue":125,"otherNumeric":null
+                /// </remarks>
+                [JsonExtensionData]
+                public IDictionary<string, object> RawPropertyValues { get; set; }
 
                 /// <summary>
-                /// The <see cref="PropertyType"/> of the value (if any), this may be null
+                /// Used during deserialization to convert the raw property data into data with a property type context
                 /// </summary>
-                public PropertyType PropType { get; }
-
-                /// <summary>
-                /// The json values for the current row
-                /// </summary>
-                public JObject JsonRowValue { get; }
-
-                /// <summary>
-                /// The Nested Content row index
-                /// </summary>
-                public int RowIndex { get; }
+                [JsonIgnore]
+                public IDictionary<string, NestedContentPropertyValue> PropertyValues { get; set; } = new Dictionary<string, NestedContentPropertyValue>();
             }
         }
 
diff --git a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs
index df603d9e88..cd7b7a1f39 100644
--- a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs
+++ b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs
@@ -1,14 +1,19 @@
-using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Events;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    internal sealed class PropertyEditorsComponent : IComponent
+    public sealed class PropertyEditorsComponent : IComponent
     {
         private readonly PropertyEditorCollection _propertyEditors;
+        private readonly List<Action> _terminate = new List<Action>();
 
         public PropertyEditorsComponent(PropertyEditorCollection propertyEditors)
         {
@@ -27,32 +32,48 @@ namespace Umbraco.Web.PropertyEditors
         }
 
         public void Terminate()
-        { }
-
-        private static void Initialize(FileUploadPropertyEditor fileUpload)
         {
-            MediaService.Saving += fileUpload.MediaServiceSaving;
-            ContentService.Copied += fileUpload.ContentServiceCopied;
-
-            MediaService.Deleted += (sender, args)
-                => args.MediaFilesToDelete.AddRange(fileUpload.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
-            ContentService.Deleted += (sender, args)
-                => args.MediaFilesToDelete.AddRange(fileUpload.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
-            MemberService.Deleted += (sender, args)
-                => args.MediaFilesToDelete.AddRange(fileUpload.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
+            foreach (var t in _terminate) t();
         }
 
-        private static void Initialize(ImageCropperPropertyEditor imageCropper)
+        private void Initialize(FileUploadPropertyEditor fileUpload)
+        {
+            MediaService.Saving += fileUpload.MediaServiceSaving;
+            _terminate.Add(() => MediaService.Saving -= fileUpload.MediaServiceSaving);
+            ContentService.Copied += fileUpload.ContentServiceCopied;
+            _terminate.Add(() => ContentService.Copied -= fileUpload.ContentServiceCopied);
+
+            void mediaServiceDeleted(IMediaService sender, DeleteEventArgs<IMedia> args) => args.MediaFilesToDelete.AddRange(fileUpload.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
+            MediaService.Deleted += mediaServiceDeleted;
+            _terminate.Add(() => MediaService.Deleted -= mediaServiceDeleted);
+
+            void contentServiceDeleted(IContentService sender, DeleteEventArgs<IContent> args) => args.MediaFilesToDelete.AddRange(fileUpload.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
+            ContentService.Deleted += contentServiceDeleted;
+            _terminate.Add(() => ContentService.Deleted -= contentServiceDeleted);
+
+            void memberServiceDeleted(IMemberService sender, DeleteEventArgs<IMember> args) => args.MediaFilesToDelete.AddRange(fileUpload.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
+            MemberService.Deleted += memberServiceDeleted;
+            _terminate.Add(() => MemberService.Deleted -= memberServiceDeleted);
+        }
+
+        private void Initialize(ImageCropperPropertyEditor imageCropper)
         {
             MediaService.Saving += imageCropper.MediaServiceSaving;
+            _terminate.Add(() => MediaService.Saving -= imageCropper.MediaServiceSaving);
             ContentService.Copied += imageCropper.ContentServiceCopied;
+            _terminate.Add(() => ContentService.Copied -= imageCropper.ContentServiceCopied);
 
-            MediaService.Deleted += (sender, args)
-                => args.MediaFilesToDelete.AddRange(imageCropper.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
-            ContentService.Deleted += (sender, args)
-                => args.MediaFilesToDelete.AddRange(imageCropper.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
-            MemberService.Deleted += (sender, args)
-                => args.MediaFilesToDelete.AddRange(imageCropper.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
+            void mediaServiceDeleted(IMediaService sender, DeleteEventArgs<IMedia> args) => args.MediaFilesToDelete.AddRange(imageCropper.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
+            MediaService.Deleted += mediaServiceDeleted;
+            _terminate.Add(() => MediaService.Deleted -= mediaServiceDeleted);
+
+            void contentServiceDeleted(IContentService sender, DeleteEventArgs<IContent> args) => args.MediaFilesToDelete.AddRange(imageCropper.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
+            ContentService.Deleted += contentServiceDeleted;
+            _terminate.Add(() => ContentService.Deleted -= contentServiceDeleted);
+
+            void memberServiceDeleted(IMemberService sender, DeleteEventArgs<IMember> args) => args.MediaFilesToDelete.AddRange(imageCropper.ServiceDeleted(args.DeletedEntities.Cast<ContentBase>()));
+            MemberService.Deleted += memberServiceDeleted;
+            _terminate.Add(() => MemberService.Deleted -= memberServiceDeleted);
         }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComposer.cs b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComposer.cs
index ce0cf2904f..f22d18484b 100644
--- a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComposer.cs
+++ b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComposer.cs
@@ -4,6 +4,6 @@ using Umbraco.Core.Composing;
 namespace Umbraco.Web.PropertyEditors
 {
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
-    internal class PropertyEditorsComposer : ComponentComposer<PropertyEditorsComponent>, ICoreComposer
+    public sealed class PropertyEditorsComposer : ComponentComposer<PropertyEditorsComponent>, ICoreComposer
     { }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs b/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
index 67ff82a3e1..5a3334685c 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
@@ -96,7 +96,7 @@ namespace Umbraco.Web.PropertyEditors
                 // Add the UDI to the img element as new data attribute
                 img.SetAttributeValue("data-udi", udi.ToString());
 
-                // Get the new persisted image url
+                // Get the new persisted image URL
                 var mediaTyped = _umbracoContextAccessor?.UmbracoContext?.Media.GetById(udi.Guid);
                 if (mediaTyped == null)
                     throw new PanicException($"Could not find media by id {udi.Guid} or there was no UmbracoContext available.");
diff --git a/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
index b3498c16ae..ca3bd36374 100644
--- a/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
+++ b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
@@ -29,8 +29,8 @@ namespace Umbraco.Web.PropertyEditors
 
             foreach (var provider in _embedCollection)
             {
-                //Url Scheme Regex is an array of possible regex patterns to match against the URL
-                foreach(var urlPattern in provider.UrlSchemeRegex)
+                // UrlSchemeRegex is an array of possible regex patterns to match against the URL
+                foreach (var urlPattern in provider.UrlSchemeRegex)
                 {
                     var regexPattern = new Regex(urlPattern, RegexOptions.IgnoreCase);
                     if (regexPattern.IsMatch(url))
@@ -60,7 +60,7 @@ namespace Umbraco.Web.PropertyEditors
             }
             catch(Exception ex)
             {
-                Logger.Error<RteEmbedController>(ex, "Error embedding url {Url} - width: {Width} height: {Height}", url, width, height);
+                Logger.Error<RteEmbedController>(ex, "Error embedding URL {Url} - width: {Width} height: {Height}", url, width, height);
                 result.OEmbedStatus = OEmbedStatus.Error;
             }
 
diff --git a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
index fd7e8694a3..6066bf7dfb 100644
--- a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
@@ -57,7 +57,7 @@ namespace Umbraco.Web.PropertyEditors
 
                 if (string.IsNullOrWhiteSpace(value) == false)
                 {
-                    return value.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+                    return value.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries);
                 }
 
                 return null;
diff --git a/src/Umbraco.Web/PropertyEditors/TextboxConfiguration.cs b/src/Umbraco.Web/PropertyEditors/TextboxConfiguration.cs
index c9f15e2e2f..641cc8e42a 100644
--- a/src/Umbraco.Web/PropertyEditors/TextboxConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/TextboxConfiguration.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     public class TextboxConfiguration
     {
-        [ConfigurationField("maxChars", "Maximum allowed characters", "textstringlimited", Description = "If empty, 500 character limit")]
+        [ConfigurationField("maxChars", "Maximum allowed characters", "textstringlimited", Description = "If empty, 512 character limit")]
         public int? MaxChars { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs b/src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs
index c6b3953e8c..03973cfc90 100644
--- a/src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/TrueFalseConfiguration.cs
@@ -7,10 +7,16 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     public class TrueFalseConfiguration
     {
-        [ConfigurationField("default", "Default Value", "boolean")]
-        public string Default { get; set; } // TODO: well, true or false?!
+        [ConfigurationField("default", "Initial State", "boolean", Description = "The initial state for the toggle, when it is displayed for the first time in the backoffice, eg. for a new content item.")]
+        public bool Default { get; set; }
 
-        [ConfigurationField("labelOn", "Write a label text", "textstring")]
-        public string Label { get; set; }
+        [ConfigurationField("showLabels", "Show toggle labels", "boolean", Description = "Show labels next to toggle button.")]
+        public bool ShowLabels { get; set; }
+
+        [ConfigurationField("labelOn", "Label On", "textstring", Description = "Label text when enabled.")]
+        public string LabelOn { get; set; }
+
+        [ConfigurationField("labelOff", "Label Off", "textstring", Description = "Label text when disabled.")]
+        public string LabelOff { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
index fb2d2b29fe..76a78c65ba 100644
--- a/src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Web.PropertyEditors
     [DataEditor(
         Constants.PropertyEditors.Aliases.Boolean,
         EditorType.PropertyValue | EditorType.MacroParameter,
-        "Checkbox",
+        "Toggle",
         "boolean",
         ValueType = ValueTypes.Integer,
         Group = Constants.PropertyEditors.Groups.Common,
diff --git a/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs b/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs
index 8d7bd29889..b92141db9c 100644
--- a/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs
+++ b/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Web.PropertyEditors
                     yield break;
             }
 
-            var fileNames = selectedFiles?.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+            var fileNames = selectedFiles?.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries);
 
             if (fileNames == null || !fileNames.Any())
                 yield break;
diff --git a/src/Umbraco.Web/PropertyEditors/UserPickerConfiguration.cs b/src/Umbraco.Web/PropertyEditors/UserPickerConfiguration.cs
index f7bd0ceb7d..bf3cd197a3 100644
--- a/src/Umbraco.Web/PropertyEditors/UserPickerConfiguration.cs
+++ b/src/Umbraco.Web/PropertyEditors/UserPickerConfiguration.cs
@@ -7,7 +7,8 @@ namespace Umbraco.Web.PropertyEditors
     {
         public override IDictionary<string, object> DefaultConfiguration => new Dictionary<string, object>
         {
-            {"entityType", "User"}
+            { "entityType", "User" },
+            { "multiPicker", "0" }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
index daf574719a..32683dbbd0 100644
--- a/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
@@ -8,8 +8,8 @@ namespace Umbraco.Web.PropertyEditors
 {
     [DataEditor(
         Constants.PropertyEditors.Aliases.UserPicker,
-        "User picker",
-        "entitypicker",
+        "User Picker",
+        "userpicker",
         ValueType = ValueTypes.Integer,
         Group = Constants.PropertyEditors.Groups.People,
         Icon = Constants.Icons.User)]
diff --git a/src/Umbraco.Web/PropertyEditors/Validation/ComplexEditorElementTypeValidationResult.cs b/src/Umbraco.Web/PropertyEditors/Validation/ComplexEditorElementTypeValidationResult.cs
new file mode 100644
index 0000000000..9c68deb7b5
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/Validation/ComplexEditorElementTypeValidationResult.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace Umbraco.Web.PropertyEditors.Validation
+{
+    /// <summary>
+    /// A collection of <see cref="ComplexEditorPropertyTypeValidationResult"/> for an element type within complex editor represented by an Element Type
+    /// </summary>
+    /// <remarks>
+    /// For a more indepth explanation of how server side validation works with the angular app, see this GitHub PR: 
+    /// https://github.com/umbraco/Umbraco-CMS/pull/8339
+    /// </remarks>
+    public class ComplexEditorElementTypeValidationResult : ValidationResult
+    {
+        public ComplexEditorElementTypeValidationResult(string elementTypeAlias, Guid blockId)
+            : base(string.Empty)
+        {
+            ElementTypeAlias = elementTypeAlias;
+            BlockId = blockId;
+        }
+
+        public IList<ComplexEditorPropertyTypeValidationResult> ValidationResults { get; } = new List<ComplexEditorPropertyTypeValidationResult>();
+
+        /// <summary>
+        /// The element type alias of the validation result
+        /// </summary>
+        /// <remarks>
+        /// This is useful for debugging purposes but it's not actively used in the angular app
+        /// </remarks>
+        public string ElementTypeAlias { get; }
+
+        /// <summary>
+        /// The Block ID of the validation result
+        /// </summary>
+        /// <remarks>
+        /// This is the GUID id of the content item based on the element type
+        /// </remarks>
+        public Guid BlockId { get; }
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/Validation/ComplexEditorPropertyTypeValidationResult.cs b/src/Umbraco.Web/PropertyEditors/Validation/ComplexEditorPropertyTypeValidationResult.cs
new file mode 100644
index 0000000000..3036529fb7
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/Validation/ComplexEditorPropertyTypeValidationResult.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+
+namespace Umbraco.Web.PropertyEditors.Validation
+{
+    /// <summary>
+    /// A collection of <see cref="ValidationResult"/> for a property type within a complex editor represented by an Element Type
+    /// </summary>
+    /// <remarks>
+    /// For a more indepth explanation of how server side validation works with the angular app, see this GitHub PR: 
+    /// https://github.com/umbraco/Umbraco-CMS/pull/8339
+    /// </remarks>
+    public class ComplexEditorPropertyTypeValidationResult : ValidationResult
+    {
+        public ComplexEditorPropertyTypeValidationResult(string propertyTypeAlias)
+            : base(string.Empty)
+        {
+            PropertyTypeAlias = propertyTypeAlias;
+        }
+
+        private readonly List<ValidationResult> _validationResults = new List<ValidationResult>();
+
+        public void AddValidationResult(ValidationResult validationResult)
+        {
+            if (validationResult is ComplexEditorValidationResult && _validationResults.Any(x => x is ComplexEditorValidationResult))
+                throw new InvalidOperationException($"Cannot add more than one {typeof(ComplexEditorValidationResult)}");
+
+            _validationResults.Add(validationResult);
+        }
+
+        public IReadOnlyList<ValidationResult> ValidationResults => _validationResults;
+        public string PropertyTypeAlias { get; }
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/Validation/ComplexEditorValidationResult.cs b/src/Umbraco.Web/PropertyEditors/Validation/ComplexEditorValidationResult.cs
new file mode 100644
index 0000000000..178e1ec1f4
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/Validation/ComplexEditorValidationResult.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace Umbraco.Web.PropertyEditors.Validation
+{
+
+    /// <summary>
+    /// A collection of <see cref="ComplexEditorElementTypeValidationResult"/> for a complex editor represented by an Element Type
+    /// </summary>
+    /// <remarks>
+    /// For example, each <see cref="ComplexEditorValidationResult"/> represents validation results for a row in Nested Content.
+    ///
+    /// For a more indepth explanation of how server side validation works with the angular app, see this GitHub PR: 
+    /// https://github.com/umbraco/Umbraco-CMS/pull/8339
+    /// </remarks>
+    public class ComplexEditorValidationResult : ValidationResult
+    {
+        public ComplexEditorValidationResult()
+            : base(string.Empty)
+        {
+        }
+
+        public IList<ComplexEditorElementTypeValidationResult> ValidationResults { get; } = new List<ComplexEditorElementTypeValidationResult>();
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/Validation/ContentPropertyValidationResult.cs b/src/Umbraco.Web/PropertyEditors/Validation/ContentPropertyValidationResult.cs
new file mode 100644
index 0000000000..0f161c5628
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/Validation/ContentPropertyValidationResult.cs
@@ -0,0 +1,50 @@
+using Newtonsoft.Json;
+using System.ComponentModel.DataAnnotations;
+
+namespace Umbraco.Web.PropertyEditors.Validation
+{
+    /// <summary>
+    /// Custom <see cref="ValidationResult"/> for content properties
+    /// </summary>
+    /// <remarks>
+    /// This clones the original result and then ensures the nested result if it's the correct type.
+    ///
+    /// For a more indepth explanation of how server side validation works with the angular app, see this GitHub PR: 
+    /// https://github.com/umbraco/Umbraco-CMS/pull/8339
+    /// </remarks>
+    public class ContentPropertyValidationResult : ValidationResult
+    {
+        private readonly string _culture;
+        private readonly string _segment;
+
+        public ContentPropertyValidationResult(ValidationResult nested, string culture, string segment)
+            : base(nested.ErrorMessage, nested.MemberNames)
+        {
+            ComplexEditorResults = nested as ComplexEditorValidationResult;
+            _culture = culture;
+            _segment = segment;
+        }
+
+        /// <summary>
+        /// Nested validation results for the content property
+        /// </summary>
+        /// <remarks>
+        /// There can be nested results for complex editors that contain other editors
+        /// </remarks>
+        public ComplexEditorValidationResult ComplexEditorResults { get; }
+
+        /// <summary>
+        /// Return the <see cref="ValidationResult.ErrorMessage"/> if <see cref="ComplexEditorResults"/> is null, else the serialized
+        /// complex validation results
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            if (ComplexEditorResults == null)
+                return base.ToString();
+
+            var json = JsonConvert.SerializeObject(this, new ValidationResultConverter(_culture, _segment));
+            return json;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/Validation/ValidationResultConverter.cs b/src/Umbraco.Web/PropertyEditors/Validation/ValidationResultConverter.cs
new file mode 100644
index 0000000000..2fb000e2ca
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/Validation/ValidationResultConverter.cs
@@ -0,0 +1,155 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Serialization;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Web.Http.ModelBinding;
+using Umbraco.Core;
+
+namespace Umbraco.Web.PropertyEditors.Validation
+{
+    /// <summary>
+    /// Custom json converter for <see cref="ValidationResult"/> and <see cref="ContentPropertyValidationResult"/>
+    /// </summary>
+    /// <remarks>
+    /// This converter is specifically used to convert validation results for content in order to be able to have nested
+    /// validation results for complex editors.
+    ///
+    /// For a more indepth explanation of how server side validation works with the angular app, see this GitHub PR: 
+    /// https://github.com/umbraco/Umbraco-CMS/pull/8339
+    /// </remarks>
+    internal class ValidationResultConverter : JsonConverter
+    {
+        private readonly string _culture;
+        private readonly string _segment;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="culture">The culture of the containing property which will be transfered to all child model state</param>
+        /// <param name="segment">The segment of the containing property which will be transfered to all child model state</param>
+        public ValidationResultConverter(string culture = "", string segment = "")
+        {
+            _culture = culture;
+            _segment = segment;
+        }
+
+        public override bool CanConvert(Type objectType) => typeof(ValidationResult).IsAssignableFrom(objectType);
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var camelCaseSerializer = new JsonSerializer
+            {
+                ContractResolver = new CamelCasePropertyNamesContractResolver(),
+                DefaultValueHandling = DefaultValueHandling.Ignore
+            };
+            foreach (var c in serializer.Converters)
+                camelCaseSerializer.Converters.Add(c);
+
+            var validationResult = (ValidationResult)value;
+
+            if (validationResult is ComplexEditorValidationResult nestedResult && nestedResult.ValidationResults.Count > 0)
+            {
+                var ja = new JArray();
+                foreach(var nested in nestedResult.ValidationResults)
+                {
+                    // recurse to write out the ComplexEditorElementTypeValidationResult
+                    var block = JObject.FromObject(nested, camelCaseSerializer);
+                    ja.Add(block);
+                }
+                if (nestedResult.ValidationResults.Count > 0)
+                {
+                    ja.WriteTo(writer);
+                }
+            }
+            else if (validationResult is ComplexEditorElementTypeValidationResult elementTypeValidationResult && elementTypeValidationResult.ValidationResults.Count > 0)
+            {
+                var joElementType = new JObject
+                {
+                    { "$id", elementTypeValidationResult.BlockId },
+
+                    // We don't use this anywhere, though it's nice for debugging
+                    { "$elementTypeAlias", elementTypeValidationResult.ElementTypeAlias }
+                };
+
+                var modelState = new ModelStateDictionary();
+
+                // loop over property validations
+                foreach (var propTypeResult in elementTypeValidationResult.ValidationResults)
+                {
+                    // group the results by their type and iterate the groups
+                    foreach (var result in propTypeResult.ValidationResults.GroupBy(x => x.GetType()))
+                    {
+                        // if the group's type isn't ComplexEditorValidationResult then it will in 99% of cases be
+                        // just ValidationResult for whcih we want to create the sub "ModelState" data. If it's not a normal
+                        // ValidationResult it will still just be converted to normal ModelState.
+
+                        if (result.Key == typeof(ComplexEditorValidationResult))
+                        {
+                            // if it's ComplexEditorValidationResult then there can only be one which is validated so just get the single
+                            if (result.Any())
+                            {
+                                var complexResult = result.Single();
+                                // recurse to get the validation result object 
+                                var obj = JToken.FromObject(complexResult, camelCaseSerializer);
+                                joElementType.Add(propTypeResult.PropertyTypeAlias, obj);
+
+                                // For any nested property error we add the model state as empty state for that nested property
+                                // NOTE: Instead of the empty validation message we could put in the translated
+                                // "errors/propertyHasErrors" message, however I think that leaves for less flexibility since it could/should be
+                                // up to the front-end validator to show whatever message it wants (if any) for an error indicating a nested property error.
+                                // Will leave blank.
+                                modelState.AddPropertyValidationError(new ValidationResult(string.Empty), propTypeResult.PropertyTypeAlias, _culture, _segment);
+                            }
+                        }
+                        else
+                        {
+                            foreach (var v in result)
+                            {
+                                modelState.AddPropertyValidationError(v, propTypeResult.PropertyTypeAlias, _culture, _segment);
+                            }
+                        }
+                    }
+                }
+
+                if (modelState.Count > 0)
+                {
+                    joElementType.Add("ModelState", JObject.FromObject(modelState.ToErrorDictionary()));
+                }
+
+                joElementType.WriteTo(writer);
+            }
+            else 
+            {
+                
+                if (validationResult is ContentPropertyValidationResult propertyValidationResult
+                    && propertyValidationResult.ComplexEditorResults?.ValidationResults.Count > 0)
+                {
+                    // recurse to write out the NestedValidationResults
+                    var obj = JToken.FromObject(propertyValidationResult.ComplexEditorResults, camelCaseSerializer);
+                    obj.WriteTo(writer);
+                }
+
+                var jo = new JObject();
+                if (!validationResult.ErrorMessage.IsNullOrWhiteSpace())
+                {
+                    var errObj = JToken.FromObject(validationResult.ErrorMessage, camelCaseSerializer);
+                    jo.Add("errorMessage", errObj);
+                }
+                if (validationResult.MemberNames.Any())
+                {
+                    var memberNamesObj = JToken.FromObject(validationResult.MemberNames, camelCaseSerializer);
+                    jo.Add("memberNames", memberNamesObj);
+                }
+                if (jo.HasValues)
+                    jo.WriteTo(writer);
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/BlockEditorConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/BlockEditorConverter.cs
new file mode 100644
index 0000000000..f043c8e66e
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/BlockEditorConverter.cs
@@ -0,0 +1,52 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using Umbraco.Core;
+using Umbraco.Core.Models.Blocks;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PublishedCache;
+
+namespace Umbraco.Web.PropertyEditors.ValueConverters
+{
+    /// <summary>
+    /// Converts json block objects into <see cref="IPublishedElement"/>
+    /// </summary>
+    public sealed class BlockEditorConverter
+    {
+        private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
+        private readonly IPublishedModelFactory _publishedModelFactory;
+
+        public BlockEditorConverter(IPublishedSnapshotAccessor publishedSnapshotAccessor, IPublishedModelFactory publishedModelFactory)
+        {
+            _publishedSnapshotAccessor = publishedSnapshotAccessor;
+            _publishedModelFactory = publishedModelFactory;
+        }
+
+        public IPublishedElement ConvertToElement(
+            BlockItemData data,
+            PropertyCacheLevel referenceCacheLevel, bool preview)
+        {
+            // hack! we need to cast, we have no choice beacuse we cannot make breaking changes.
+            var publishedContentCache = _publishedSnapshotAccessor.PublishedSnapshot.Content as IPublishedContentCache2;
+            if (publishedContentCache == null)
+                throw new InvalidOperationException("The published content cache is not " + typeof(IPublishedContentCache2));
+
+            // only convert element types - content types will cause an exception when PublishedModelFactory creates the model
+            var publishedContentType = publishedContentCache.GetContentType(data.ContentTypeKey);
+            if (publishedContentType == null || publishedContentType.IsElement == false)
+                return null;
+
+            var propertyValues = data.RawPropertyValues;
+
+            // Get the udi from the deserialized object. If this is empty we can fallback to checking the 'key' if there is one
+            var key = (data.Udi is GuidUdi gudi) ? gudi.Guid : Guid.Empty;
+            if (propertyValues.TryGetValue("key", out var keyo))
+                Guid.TryParse(keyo.ToString(), out key);
+
+            IPublishedElement element = new PublishedElement(publishedContentType, key, propertyValues, preview, referenceCacheLevel, _publishedSnapshotAccessor);
+            element = _publishedModelFactory.CreateModel(element);
+            return element;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs
new file mode 100644
index 0000000000..f46c118174
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs
@@ -0,0 +1,136 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.Blocks;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors.ValueConverters;
+
+namespace Umbraco.Web.PropertyEditors.ValueConverters
+{
+
+    [DefaultPropertyValueConverter(typeof(JsonValueConverter))]
+    public class BlockListPropertyValueConverter : PropertyValueConverterBase
+    {
+        private readonly IProfilingLogger _proflog;
+        private readonly BlockEditorConverter _blockConverter;
+        private readonly BlockListEditorDataConverter _blockListEditorDataConverter;
+
+        public BlockListPropertyValueConverter(IProfilingLogger proflog, BlockEditorConverter blockConverter)
+        {
+            _proflog = proflog;
+            _blockConverter = blockConverter;
+            _blockListEditorDataConverter = new BlockListEditorDataConverter();
+        }
+
+        /// <inheritdoc />
+        public override bool IsConverter(IPublishedPropertyType propertyType)
+            => propertyType.EditorAlias.InvariantEquals(Constants.PropertyEditors.Aliases.BlockList);
+
+        /// <inheritdoc />
+        public override Type GetPropertyValueType(IPublishedPropertyType propertyType) => typeof(BlockListModel);
+
+        /// <inheritdoc />
+        public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
+            => PropertyCacheLevel.Element;
+
+        /// <inheritdoc />
+        public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
+        {
+            return source?.ToString();
+        }
+
+        /// <inheritdoc />
+        public override object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
+        {
+            // NOTE: The intermediate object is just a json string, we don't actually convert from source -> intermediate since source is always just a json string
+
+            using (_proflog.DebugDuration<BlockListPropertyValueConverter>($"ConvertPropertyToBlockList ({propertyType.DataType.Id})"))
+            {
+                var configuration = propertyType.DataType.ConfigurationAs<BlockListConfiguration>();
+                var blockConfigMap = configuration.Blocks.ToDictionary(x => x.ContentElementTypeKey);
+                var validSettingElementTypes = blockConfigMap.Values.Select(x => x.SettingsElementTypeKey).Where(x => x.HasValue).Distinct().ToList();
+
+                var contentPublishedElements = new Dictionary<Guid, IPublishedElement>();
+                var settingsPublishedElements = new Dictionary<Guid, IPublishedElement>();
+
+                var layout = new List<BlockListItem>();
+
+                var value = (string)inter;
+                if (string.IsNullOrWhiteSpace(value)) return BlockListModel.Empty;
+
+                var converted = _blockListEditorDataConverter.Deserialize(value);
+                if (converted.BlockValue.ContentData.Count == 0) return BlockListModel.Empty;
+
+                var blockListLayout = converted.Layout.ToObject<IEnumerable<BlockListLayoutItem>>();
+
+                // convert the content data
+                foreach (var data in converted.BlockValue.ContentData)
+                {
+                    if (!blockConfigMap.ContainsKey(data.ContentTypeKey)) continue;
+
+                    var element = _blockConverter.ConvertToElement(data, referenceCacheLevel, preview);
+                    if (element == null) continue;
+                    contentPublishedElements[element.Key] = element;
+                }
+                // convert the settings data
+                foreach (var data in converted.BlockValue.SettingsData)
+                {
+                    if (!validSettingElementTypes.Contains(data.ContentTypeKey)) continue;
+
+                    var element = _blockConverter.ConvertToElement(data, referenceCacheLevel, preview);
+                    if (element == null) continue;
+                    settingsPublishedElements[element.Key] = element;
+                }
+
+                // if there's no elements just return since if there's no data it doesn't matter what is stored in layout
+                if (contentPublishedElements.Count == 0) return BlockListModel.Empty;
+
+                foreach (var layoutItem in blockListLayout)
+                {
+                    // get the content reference
+                    var contentGuidUdi = (GuidUdi)layoutItem.ContentUdi;                    
+                    if (!contentPublishedElements.TryGetValue(contentGuidUdi.Guid, out var contentData))
+                        continue;
+
+                    // get the setting reference
+                    IPublishedElement settingsData = null;
+                    var settingGuidUdi = layoutItem.SettingsUdi != null ? (GuidUdi)layoutItem.SettingsUdi : null;
+                    if (settingGuidUdi != null)
+                        settingsPublishedElements.TryGetValue(settingGuidUdi.Guid, out settingsData);
+
+                    if (!contentData.ContentType.TryGetKey(out var contentTypeKey))
+                        throw new InvalidOperationException("The content type was not of type " + typeof(IPublishedContentType2));
+
+                    if (!blockConfigMap.TryGetValue(contentTypeKey, out var blockConfig))
+                        continue;
+
+                    // this can happen if they have a settings type, save content, remove the settings type, and display the front-end page before saving the content again
+                    // we also ensure that the content type's match since maybe the settings type has been changed after this has been persisted.
+                    if (settingsData != null)
+                    {
+                        if (!settingsData.ContentType.TryGetKey(out var settingsElementTypeKey))
+                            throw new InvalidOperationException("The settings element type was not of type " + typeof(IPublishedContentType2));
+
+                        if (!blockConfig.SettingsElementTypeKey.HasValue || settingsElementTypeKey != blockConfig.SettingsElementTypeKey)
+                            settingsData = null;
+                    }
+
+                    var layoutType = typeof(BlockListItem<,>).MakeGenericType(contentData.GetType(), settingsData?.GetType() ?? typeof(IPublishedElement));
+                    var layoutRef = (BlockListItem)Activator.CreateInstance(layoutType, contentGuidUdi, contentData, settingGuidUdi, settingsData);
+
+                    layout.Add(layoutRef);
+                }
+
+                var model = new BlockListModel(layout);
+                return model;
+            }
+        }
+
+
+    }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/ContentPickerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/ContentPickerValueConverter.cs
index 8b3655f0cc..5e7cf8fea4 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/ContentPickerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/ContentPickerValueConverter.cs
@@ -36,9 +36,14 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
         {
             if (source == null) return null;
 
-            var attemptConvertInt = source.TryConvertTo<int>();
-            if (attemptConvertInt.Success)
-                return attemptConvertInt.Result;
+            //Don't attempt to convert to int for UDI
+            if(!(source is string) || source is string strSource && !string.IsNullOrWhiteSpace(strSource) && !strSource.StartsWith("umb"))
+            {
+                 var attemptConvertInt = source.TryConvertTo<int>();
+                    if (attemptConvertInt.Success)
+                        return attemptConvertInt.Result;
+            }
+
             var attemptConvertUdi = source.TryConvertTo<Udi>();
             if (attemptConvertUdi.Success)
                 return attemptConvertUdi.Result;
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
index 5c027ed9b6..8abb77839d 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             if (source == null) return null;
             var sourceString = source.ToString();
 
-            // ensures string is parsed for {localLink} and urls are resolved correctly
+            // ensures string is parsed for {localLink} and URLs are resolved correctly
             sourceString = _localLinkParser.EnsureInternalLinks(sourceString, preview);
             sourceString = _urlParser.EnsureUrls(sourceString);
 
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
index a56630d7c5..3f15eca0cc 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
@@ -57,7 +57,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             if (source == null) return null;
 
             var nodeIds = source.ToString()
-                .Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)
+                .Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries)
                 .Select(Udi.Parse)
                 .ToArray();
             return nodeIds;
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MemberPickerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MemberPickerValueConverter.cs
index cd69fd9de6..71bb2fd2ee 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MemberPickerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MemberPickerValueConverter.cs
@@ -31,6 +31,8 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
 
         public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
         {
+            if (source == null) return null;
+
             var attemptConvertInt = source.TryConvertTo<int>();
             if (attemptConvertInt.Success)
                 return attemptConvertInt.Result;
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
index 47f8797295..9f92d6493e 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
@@ -54,7 +54,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             if (propertyType.EditorAlias.Equals(Constants.PropertyEditors.Aliases.MultiNodeTreePicker))
             {
                 var nodeIds = source.ToString()
-                    .Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)
+                    .Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries)
                     .Select(Udi.Parse)
                     .ToArray();
                 return nodeIds;
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/NestedContentManyValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/NestedContentManyValueConverter.cs
index 4a25049695..11b924552e 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/NestedContentManyValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/NestedContentManyValueConverter.cs
@@ -38,8 +38,8 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
         {
             var contentTypes = propertyType.DataType.ConfigurationAs<NestedContentConfiguration>().ContentTypes;
             return contentTypes.Length == 1
-                ? typeof (IEnumerable<>).MakeGenericType(ModelType.For(contentTypes[0].Alias))
-                : typeof (IEnumerable<IPublishedElement>);
+                ? typeof(IEnumerable<>).MakeGenericType(ModelType.For(contentTypes[0].Alias))
+                : typeof(IEnumerable<IPublishedElement>);
         }
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/NestedContentSingleValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/NestedContentSingleValueConverter.cs
index c9c99615f6..c9859c9770 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/NestedContentSingleValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/NestedContentSingleValueConverter.cs
@@ -56,7 +56,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
         {
             using (_proflog.DebugDuration<NestedContentSingleValueConverter>($"ConvertPropertyToNestedContent ({propertyType.DataType.Id})"))
             {
-                var value = (string) inter;
+                var value = (string)inter;
                 if (string.IsNullOrWhiteSpace(value)) return null;
 
                 var objects = JsonConvert.DeserializeObject<List<JObject>>(value);
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
index 3ab502742c..46fda1ea59 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
@@ -87,7 +87,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
 
             var sourceString = source.ToString();
 
-            // ensures string is parsed for {localLink} and urls and media are resolved correctly
+            // ensures string is parsed for {localLink} and URLs and media are resolved correctly
             sourceString = _linkParser.EnsureInternalLinks(sourceString, preview);
             sourceString = _urlParser.EnsureUrls(sourceString);
             sourceString = _imageSourceParser.EnsureImageSources(sourceString);
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/TextStringValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/TextStringValueConverter.cs
index 939a658407..65c0deeacf 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/TextStringValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/TextStringValueConverter.cs
@@ -39,7 +39,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             if (source == null) return null;
             var sourceString = source.ToString();
 
-            // ensures string is parsed for {localLink} and urls are resolved correctly
+            // ensures string is parsed for {localLink} and URLs are resolved correctly
             sourceString = _linkParser.EnsureInternalLinks(sourceString, preview);
             sourceString = _urlParser.EnsureUrls(sourceString);
 
diff --git a/src/Umbraco.Web/PublishedCache/IPublishedCache.cs b/src/Umbraco.Web/PublishedCache/IPublishedCache.cs
index 0370088f77..4760082908 100644
--- a/src/Umbraco.Web/PublishedCache/IPublishedCache.cs
+++ b/src/Umbraco.Web/PublishedCache/IPublishedCache.cs
@@ -7,6 +7,16 @@ using Umbraco.Core.Xml;
 
 namespace Umbraco.Web.PublishedCache
 {
+    public interface IPublishedCache2 : IPublishedCache
+    {
+        /// <summary>
+        /// Gets a content type identified by its alias.
+        /// </summary>
+        /// <param name="key">The content type key.</param>
+        /// <returns>The content type, or null.</returns>
+        IPublishedContentType GetContentType(Guid key);
+    }
+
     /// <summary>
     /// Provides access to cached contents.
     /// </summary>
diff --git a/src/Umbraco.Web/PublishedCache/IPublishedContentCache.cs b/src/Umbraco.Web/PublishedCache/IPublishedContentCache.cs
index b4a6e3d1e0..a31bdf34c5 100644
--- a/src/Umbraco.Web/PublishedCache/IPublishedContentCache.cs
+++ b/src/Umbraco.Web/PublishedCache/IPublishedContentCache.cs
@@ -4,6 +4,11 @@ using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Web.PublishedCache
 {
+    public interface IPublishedContentCache2 : IPublishedContentCache, IPublishedCache2
+    {
+        // NOTE: this is here purely to avoid API breaking changes
+    }
+
     public interface IPublishedContentCache : IPublishedCache
     {
         /// <summary>
@@ -38,16 +43,26 @@ namespace Umbraco.Web.PublishedCache
         /// </summary>
         /// <param name="preview">A value indicating whether to consider unpublished content.</param>
         /// <param name="contentId">The content unique identifier.</param>
-        /// <returns>The route.</returns>
-        /// <remarks>The value of <paramref name="preview"/> overrides defaults.</remarks>
+        /// <returns>A special string formatted route path.</returns>
+        /// <remarks>
+        /// <para>
+        /// The resulting string is a special encoded route string that may contain the domain ID
+        /// for the current route. If a domain is present the string will be prefixed with the domain ID integer, example: {domainId}/route-path-of-item
+        /// </para>
+        /// <para>The value of <paramref name="preview"/> overrides defaults.</para>
+        /// </remarks>
         string GetRouteById(bool preview, int contentId, string culture = null);
 
         /// <summary>
         /// Gets the route for a content identified by its unique identifier.
         /// </summary>
         /// <param name="contentId">The content unique identifier.</param>
-        /// <returns>The route.</returns>
+        /// <returns>A special string formatted route path.</returns>
         /// <remarks>Considers published or unpublished content depending on defaults.</remarks>
+        /// <para>
+        /// The resulting string is a special encoded route string that may contain the domain ID
+        /// for the current route. If a domain is present the string will be prefixed with the domain ID integer, example: {domainId}/route-path-of-item
+        /// </para>
         string GetRouteById(int contentId, string culture = null);
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/IPublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/IPublishedMediaCache.cs
index 0b461882b7..702b4fe49d 100644
--- a/src/Umbraco.Web/PublishedCache/IPublishedMediaCache.cs
+++ b/src/Umbraco.Web/PublishedCache/IPublishedMediaCache.cs
@@ -1,5 +1,10 @@
 namespace Umbraco.Web.PublishedCache
 {
+    public interface IPublishedMediaCache2 : IPublishedMediaCache, IPublishedCache2
+    {
+        // NOTE: this is here purely to avoid API breaking changes
+    }
+
     public interface IPublishedMediaCache : IPublishedCache
     { }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
index 24c6a7018b..dbb427422d 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
@@ -13,7 +13,7 @@ using Umbraco.Web.PublishedCache.NuCache.Navigable;
 
 namespace Umbraco.Web.PublishedCache.NuCache
 {
-    internal class ContentCache : PublishedCacheBase, IPublishedContentCache, INavigableData, IDisposable
+    internal class ContentCache : PublishedCacheBase, IPublishedContentCache2, INavigableData, IDisposable
     {
         private readonly ContentStore.Snapshot _snapshot;
         private readonly IAppCache _snapshotCache;
@@ -79,7 +79,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             var pos = route.IndexOf('/');
             var path = pos == 0 ? route : route.Substring(pos);
             var startNodeId = pos == 0 ? 0 : int.Parse(route.Substring(0, pos));
-            var parts = path.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+            var parts = path.Split(Constants.CharArrays.ForwardSlash, StringSplitOptions.RemoveEmptyEntries);
 
             IPublishedContent content;
 
@@ -109,8 +109,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 content = FollowRoute(content, parts, 1, culture);
             }
 
-            // if hideTopLevelNodePath is true then for url /foo we looked for /*/foo
-            // but maybe that was the url of a non-default top-level node, so we also
+            // if hideTopLevelNodePath is true then for URL /foo we looked for /*/foo
+            // but maybe that was the URL of a non-default top-level node, so we also
             // have to look for /foo (see note in ApplyHideTopLevelNodeFromPath).
             if (content == null && hideTopLevelNode.Value && parts.Length == 1)
             {
@@ -141,7 +141,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             hideTopLevelNode = hideTopLevelNode ?? HideTopLevelNodeFromPath; // default = settings
 
             // walk up from that node until we hit a node with a domain,
-            // or we reach the content root, collecting urls in the way
+            // or we reach the content root, collecting URLs in the way
             var pathParts = new List<string>();
             var n = node;
             var urlSegment = n.UrlSegment(culture);
@@ -384,15 +384,11 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         #region Content types
 
-        public override IPublishedContentType GetContentType(int id)
-        {
-            return _snapshot.GetContentType(id);
-        }
+        public override IPublishedContentType GetContentType(int id) => _snapshot.GetContentType(id);
 
-        public override IPublishedContentType GetContentType(string alias)
-        {
-            return _snapshot.GetContentType(alias);
-        }
+        public override IPublishedContentType GetContentType(string alias) => _snapshot.GetContentType(alias);
+
+        public override IPublishedContentType GetContentType(Guid key) => _snapshot.GetContentType(key);
 
         #endregion
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentNodeKit.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentNodeKit.cs
index 61fb5c12a3..43aa9a14d7 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentNodeKit.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentNodeKit.cs
@@ -15,6 +15,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public bool IsNull => ContentTypeId < 0;
 
+        public static ContentNodeKit Empty { get; } = new ContentNodeKit();
         public static ContentNodeKit Null { get; } = new ContentNodeKit { ContentTypeId = -1 };
 
         public void Build(
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
index a3f918c92c..f25e7fa1c3 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -37,9 +37,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private readonly IVariationContextAccessor _variationContextAccessor;
         private readonly ConcurrentDictionary<int, LinkedNode<ContentNode>> _contentNodes;
         private LinkedNode<ContentNode> _root;
-        private readonly ConcurrentDictionary<int, LinkedNode<IPublishedContentType>> _contentTypesById;
+
+        // We must keep separate dictionaries for by id and by alias because we track these in snapshot/layers
+        // and it is possible that the alias of a content type can be different for the same id in another layer
+        // whereas the GUID -> INT cross reference can never be different
+        private readonly ConcurrentDictionary<int, LinkedNode<IPublishedContentType>> _contentTypesById;       
         private readonly ConcurrentDictionary<string, LinkedNode<IPublishedContentType>> _contentTypesByAlias;
-        private readonly ConcurrentDictionary<Guid, int> _xmap;
+        private readonly ConcurrentDictionary<Guid, int> _contentTypeKeyToIdMap;
+        private readonly ConcurrentDictionary<Guid, int> _contentKeyToIdMap;
 
         private readonly ILogger _logger;
         private BPlusTree<int, ContentNodeKit> _localDb;
@@ -73,7 +78,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _root = new LinkedNode<ContentNode>(new ContentNode(), 0);
             _contentTypesById = new ConcurrentDictionary<int, LinkedNode<IPublishedContentType>>();
             _contentTypesByAlias = new ConcurrentDictionary<string, LinkedNode<IPublishedContentType>>(StringComparer.InvariantCultureIgnoreCase);
-            _xmap = new ConcurrentDictionary<Guid, int>();
+            _contentTypeKeyToIdMap = new ConcurrentDictionary<Guid, int>();
+            _contentKeyToIdMap = new ConcurrentDictionary<Guid, int>();
 
             _genObjs = new ConcurrentQueue<GenObj>();
             _genObj = null; // no initial gen exists
@@ -136,7 +142,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             Monitor.Enter(_wlocko, ref lockInfo.Taken);
 
-            lock(_rlocko)
+            lock (_rlocko)
             {
                 // see SnapDictionary
                 try { }
@@ -152,7 +158,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                         _nextGen = true;
                     }
                 }
-            }           
+            }
         }
 
         private void Release(WriteLockInfo lockInfo, bool commit = true)
@@ -291,8 +297,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             foreach (var type in types)
             {
-                SetValueLocked(_contentTypesById, type.Id, type);
-                SetValueLocked(_contentTypesByAlias, type.Alias, type);
+                SetContentTypeLocked(type);
             }
         }
 
@@ -318,8 +323,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             foreach (var type in index.Values)
             {
-                SetValueLocked(_contentTypesById, type.Id, type);
-                SetValueLocked(_contentTypesByAlias, type.Alias, type);
+                SetContentTypeLocked(type);
             }
 
             foreach (var link in _contentNodes.Values)
@@ -354,8 +358,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             // set all new content types
             foreach (var type in types)
             {
-                SetValueLocked(_contentTypesById, type.Id, type);
-                SetValueLocked(_contentTypesByAlias, type.Alias, type);
+                SetContentTypeLocked(type);
             }
 
             // beware! at that point the cache is inconsistent,
@@ -419,8 +422,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             // perform update of refreshed content types
             foreach (var type in refreshedTypesA)
             {
-                SetValueLocked(_contentTypesById, type.Id, type);
-                SetValueLocked(_contentTypesByAlias, type.Alias, type);
+                SetContentTypeLocked(type);
             }
 
             // perform update of content with refreshed content type - from the kits
@@ -638,7 +640,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 kit.Node.PreviousSiblingContentId = existing.PreviousSiblingContentId;
             }
 
-            _xmap[kit.Node.Uid] = kit.Node.Id;
+            _contentKeyToIdMap[kit.Node.Uid] = kit.Node.Id;
 
             return true;
         }
@@ -734,7 +736,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 // this node becomes the previous node
                 previousNode = thisNode;
 
-                _xmap[kit.Node.Uid] = kit.Node.Id;
+                _contentKeyToIdMap[kit.Node.Uid] = kit.Node.Id;
             }
 
             return ok;
@@ -757,7 +759,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             EnsureLocked();
 
             var ok = true;
-            
+
             ClearLocked(_contentNodes);
             ClearRootLocked();
 
@@ -778,7 +780,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 if (_localDb != null) RegisterChange(kit.Node.Id, kit);
                 AddTreeNodeLocked(kit.Node, parent);
 
-                _xmap[kit.Node.Uid] = kit.Node.Id;
+                _contentKeyToIdMap[kit.Node.Uid] = kit.Node.Id;
             }
 
             return ok;
@@ -807,7 +809,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             EnsureLocked();
 
             var ok = true;
-            
+
             // get existing
             _contentNodes.TryGetValue(rootContentId, out var link);
             var existing = link?.Value;
@@ -833,7 +835,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 if (_localDb != null) RegisterChange(kit.Node.Id, kit);
                 AddTreeNodeLocked(kit.Node, parent);
 
-                _xmap[kit.Node.Uid] = kit.Node.Id;
+                _contentKeyToIdMap[kit.Node.Uid] = kit.Node.Id;
             }
 
             return ok;
@@ -885,11 +887,11 @@ namespace Umbraco.Web.PublishedCache.NuCache
             // This should never be null, all code that calls this method is null checking but we've seen
             // issues of null ref exceptions in issue reports so we'll double check here
             if (content == null) throw new ArgumentNullException(nameof(content));
-            
+
             SetValueLocked(_contentNodes, content.Id, null);
             if (_localDb != null) RegisterChange(content.Id, ContentNodeKit.Null);
 
-            _xmap.TryRemove(content.Uid, out _);
+            _contentKeyToIdMap.TryRemove(content.Uid, out _);
 
             var id = content.FirstChildContentId;
             while (id > 0)
@@ -913,10 +915,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
         {
             if (_contentNodes.TryGetValue(id, out var link))
             {
-                link = GetLinkedNodeGen(link, gen);                
+                link = GetLinkedNodeGen(link, gen);
                 if (link != null && link.Value != null)
                     return link;
-            }   
+            }
 
             throw new PanicException($"failed to get {description} with id={id}");
         }
@@ -929,13 +931,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
         {
             if (content.ParentContentId < 0)
             {
-                var root = GetLinkedNodeGen(_root, gen);                
+                var root = GetLinkedNodeGen(_root, gen);
                 return root;
             }
 
             if (_contentNodes.TryGetValue(content.ParentContentId, out var link))
                 link = GetLinkedNodeGen(link, gen);
-                
+
             return link;
         }
 
@@ -1154,6 +1156,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
+        private void SetContentTypeLocked(IPublishedContentType type)
+        {
+            SetValueLocked(_contentTypesById, type.Id, type);
+            SetValueLocked(_contentTypesByAlias, type.Alias, type);
+            // ensure the key/id map is accurate
+            if (type.TryGetKey(out var key))
+                _contentTypeKeyToIdMap[key] = type.Id;
+        }
+
         // set a node (just the node, not the tree)
         private void SetValueLocked<TKey, TValue>(ConcurrentDictionary<TKey, LinkedNode<TValue>> dict, TKey key, TValue value)
             where TValue : class
@@ -1211,14 +1222,14 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public ContentNode Get(Guid uid, long gen)
         {
-            return _xmap.TryGetValue(uid, out var id)
+            return _contentKeyToIdMap.TryGetValue(uid, out var id)
                 ? GetValue(_contentNodes, id, gen)
                 : null;
         }
 
         public IEnumerable<ContentNode> GetAtRoot(long gen)
         {
-            var root = GetLinkedNodeGen(_root, gen);            
+            var root = GetLinkedNodeGen(_root, gen);
             if (root == null)
                 yield break;
 
@@ -1274,13 +1285,20 @@ namespace Umbraco.Web.PublishedCache.NuCache
             return GetValue(_contentTypesByAlias, alias, gen);
         }
 
+        public IPublishedContentType GetContentType(Guid key, long gen)
+        {
+            if (!_contentTypeKeyToIdMap.TryGetValue(key, out var id))
+                return null;
+            return GetContentType(id, gen);
+        }
+
         #endregion
 
         #region Snapshots
 
         public Snapshot CreateSnapshot()
         {
-            lock(_rlocko)
+            lock (_rlocko)
             {
                 // if no next generation is required, and we already have one,
                 // use it and create a new snapshot
@@ -1362,7 +1380,11 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 {
                     _collectTask = null;
                 }
-            }, TaskContinuationOptions.ExecuteSynchronously);
+            },
+            CancellationToken.None,
+            TaskContinuationOptions.ExecuteSynchronously,
+            // Must explicitly specify this, see https://blog.stephencleary.com/2013/10/continuewith-is-dangerous-too.html
+            TaskScheduler.Default);
             // ReSharper restore InconsistentlySynchronizedField
 
             return task;
@@ -1606,6 +1628,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 return _store.GetContentType(alias, _gen);
             }
 
+            public IPublishedContentType GetContentType(Guid key)
+            {
+                if (_gen < 0)
+                    throw new ObjectDisposedException("snapshot" /*+ " (" + _thisCount + ")"*/);
+                return _store.GetContentType(key, _gen);
+            }
+
             // this code is here just so you don't try to implement it
             // the only way we can iterate over "all" without locking the entire cache forever
             // is by shallow cloning the cache, which is quite expensive, so we should probably not do it,
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentDataSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentDataSerializer.cs
index d02af375c6..1192c892d4 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentDataSerializer.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentDataSerializer.cs
@@ -3,10 +3,22 @@ using CSharpTest.Net.Serialization;
 
 namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 {
-    class ContentDataSerializer : ISerializer<ContentData>
+    /// <summary>
+    /// Serializes/Deserializes data to BTree data source for <see cref="ContentData"/>
+    /// </summary>
+    internal class ContentDataSerializer : ISerializer<ContentData>
     {
-        private static readonly DictionaryOfPropertyDataSerializer PropertiesSerializer = new DictionaryOfPropertyDataSerializer();
-        private static readonly DictionaryOfCultureVariationSerializer CultureVariationsSerializer = new DictionaryOfCultureVariationSerializer();
+        public ContentDataSerializer(IDictionaryOfPropertyDataSerializer dictionaryOfPropertyDataSerializer = null)
+        {
+            _dictionaryOfPropertyDataSerializer = dictionaryOfPropertyDataSerializer;
+            if(_dictionaryOfPropertyDataSerializer == null)
+            {
+                _dictionaryOfPropertyDataSerializer = DefaultPropertiesSerializer;
+            }
+        }
+        private static readonly DictionaryOfPropertyDataSerializer DefaultPropertiesSerializer = new DictionaryOfPropertyDataSerializer();
+        private static readonly DictionaryOfCultureVariationSerializer DefaultCultureVariationsSerializer = new DictionaryOfCultureVariationSerializer();
+        private readonly IDictionaryOfPropertyDataSerializer _dictionaryOfPropertyDataSerializer;
 
         public ContentData ReadFrom(Stream stream)
         {
@@ -19,8 +31,8 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
                 VersionDate = PrimitiveSerializer.DateTime.ReadFrom(stream),
                 WriterId = PrimitiveSerializer.Int32.ReadFrom(stream),
                 TemplateId = PrimitiveSerializer.Int32.ReadFrom(stream),
-                Properties = PropertiesSerializer.ReadFrom(stream), // TODO: We don't want to allocate empty arrays
-                CultureInfos = CultureVariationsSerializer.ReadFrom(stream) // TODO: We don't want to allocate empty arrays
+                Properties = _dictionaryOfPropertyDataSerializer.ReadFrom(stream), // TODO: We don't want to allocate empty arrays
+                CultureInfos = DefaultCultureVariationsSerializer.ReadFrom(stream) // TODO: We don't want to allocate empty arrays
             };
         }
 
@@ -36,8 +48,8 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
             {
                 PrimitiveSerializer.Int32.WriteTo(value.TemplateId.Value, stream);
             }
-            PropertiesSerializer.WriteTo(value.Properties, stream);
-            CultureVariationsSerializer.WriteTo(value.CultureInfos, stream);
+            _dictionaryOfPropertyDataSerializer.WriteTo(value.Properties, stream);
+            DefaultCultureVariationsSerializer.WriteTo(value.CultureInfos, stream);
         }
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentNodeKitSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentNodeKitSerializer.cs
index f799869850..1d668ba4fd 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentNodeKitSerializer.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.ContentNodeKitSerializer.cs
@@ -5,7 +5,17 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 {
     internal class ContentNodeKitSerializer : ISerializer<ContentNodeKit>
     {
-        static readonly ContentDataSerializer DataSerializer = new ContentDataSerializer();
+        public ContentNodeKitSerializer(ContentDataSerializer contentDataSerializer = null)
+        {
+            _contentDataSerializer = contentDataSerializer;
+            if(_contentDataSerializer == null)
+            {
+                _contentDataSerializer = DefaultDataSerializer;
+            }
+        }
+        static readonly ContentDataSerializer DefaultDataSerializer = new ContentDataSerializer();
+        private readonly ContentDataSerializer _contentDataSerializer;
+
         //static readonly ListOfIntSerializer ChildContentIdsSerializer = new ListOfIntSerializer();
 
         public ContentNodeKit ReadFrom(Stream stream)
@@ -26,10 +36,10 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
             };
             var hasDraft = PrimitiveSerializer.Boolean.ReadFrom(stream);
             if (hasDraft)
-                kit.DraftData = DataSerializer.ReadFrom(stream);
+                kit.DraftData = _contentDataSerializer.ReadFrom(stream);
             var hasPublished = PrimitiveSerializer.Boolean.ReadFrom(stream);
             if (hasPublished)
-                kit.PublishedData = DataSerializer.ReadFrom(stream);
+                kit.PublishedData = _contentDataSerializer.ReadFrom(stream);
             return kit;
         }
 
@@ -47,11 +57,11 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 
             PrimitiveSerializer.Boolean.WriteTo(value.DraftData != null, stream);
             if (value.DraftData != null)
-                DataSerializer.WriteTo(value.DraftData, stream);
+                _contentDataSerializer.WriteTo(value.DraftData, stream);
 
             PrimitiveSerializer.Boolean.WriteTo(value.PublishedData != null, stream);
             if (value.PublishedData != null)
-                DataSerializer.WriteTo(value.PublishedData, stream);
+                _contentDataSerializer.WriteTo(value.PublishedData, stream);
         }
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs
index 1fcbdbdae7..b3a6ef2d05 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs
@@ -6,6 +6,9 @@ using Umbraco.Core;
 
 namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 {
+    /// <summary>
+    /// Serializes/Deserializes culture variant data as a dictionary for BTree
+    /// </summary>
     internal class DictionaryOfCultureVariationSerializer : SerializerBase, ISerializer<IReadOnlyDictionary<string, CultureVariation>>
     {
         public IReadOnlyDictionary<string, CultureVariation> ReadFrom(Stream stream)
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs
index e3fa6597e4..0b15c0ba4b 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs
@@ -6,7 +6,10 @@ using Umbraco.Core;
 
 namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 {
-    internal class DictionaryOfPropertyDataSerializer : SerializerBase, ISerializer<IDictionary<string, PropertyData[]>>
+    /// <summary>
+    /// Serializes/Deserializes property data as a dictionary for BTree
+    /// </summary>
+    internal class DictionaryOfPropertyDataSerializer : SerializerBase, ISerializer<IDictionary<string, PropertyData[]>>, IDictionaryOfPropertyDataSerializer
     {
         public IDictionary<string, PropertyData[]> ReadFrom(Stream stream)
         {
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.cs
index 910c0ca737..7ddfc8e6ea 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.cs
@@ -6,10 +6,10 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 {
     internal class BTree
     {
-        public static BPlusTree<int, ContentNodeKit> GetTree(string filepath, bool exists)
+        public static BPlusTree<int, ContentNodeKit> GetTree(string filepath, bool exists, ContentDataSerializer contentDataSerializer = null)
         {
             var keySerializer = new PrimitiveSerializer();
-            var valueSerializer = new ContentNodeKitSerializer();
+            var valueSerializer = new ContentNodeKitSerializer(contentDataSerializer);
             var options = new BPlusTree<int, ContentNodeKit>.OptionsV2(keySerializer, valueSerializer)
             {
                 CreateFile = exists ? CreatePolicy.IfNeeded : CreatePolicy.Always,
@@ -30,6 +30,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
             //btree.
 
             return tree;
+
         }
 
         private static int GetBlockSize()
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentCacheDataModel.cs
similarity index 89%
rename from src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs
rename to src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentCacheDataModel.cs
index 0ff24980fe..40acdfdb55 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentCacheDataModel.cs
@@ -7,10 +7,10 @@ using Umbraco.Core.Serialization;
 namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 {
     /// <summary>
-    /// The content item 1:M data that is serialized to JSON
+    /// The content model stored in the content cache database table serialized as JSON
     /// </summary>
     [DataContract] // NOTE: Use DataContract annotations here to control how MessagePack serializes/deserializes the data to use INT keys
-    public class ContentNestedData
+    public class ContentCacheDataModel
     {
         // TODO: We don't want to allocate empty arrays
         //dont serialize empty properties
@@ -29,17 +29,17 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         public string UrlSegment { get; set; }
 
         //Legacy properties used to deserialize existing nucache db entries
-        [DataMember(Order = 3)]
+        [IgnoreDataMember]
         [JsonProperty("properties")]
         [JsonConverter(typeof(CaseInsensitiveDictionaryConverter<PropertyData[]>))]
         private Dictionary<string, PropertyData[]> LegacyPropertyData { set { PropertyData = value; } }
 
-        [DataMember(Order = 4)]
+        [IgnoreDataMember]
         [JsonProperty("cultureData")]
         [JsonConverter(typeof(CaseInsensitiveDictionaryConverter<CultureVariation>))]
         private Dictionary<string, CultureVariation> LegacyCultureData { set { CultureData = value; } }
 
-        [DataMember(Order = 5)]
+        [IgnoreDataMember]
         [JsonProperty("urlSegment")]
         private string LegacyUrlSegment { set { UrlSegment = value; } }
     }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentCacheDataSerializationResult.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentCacheDataSerializationResult.cs
new file mode 100644
index 0000000000..cde39eaa3c
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentCacheDataSerializationResult.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Web.PublishedCache.NuCache.DataSource
+{
+    /// <summary>
+    /// The serialization result from <see cref="IContentCacheDataSerializer"/> for which the serialized value
+    /// will be either a string or a byte[]
+    /// </summary>
+    public struct ContentCacheDataSerializationResult : IEquatable<ContentCacheDataSerializationResult>
+    {
+        public ContentCacheDataSerializationResult(string stringData, byte[] byteData)
+        {
+            StringData = stringData;
+            ByteData = byteData;
+        }
+
+        public string StringData { get; }
+        public byte[] ByteData { get; }
+
+        public override bool Equals(object obj)
+        {
+            return obj is ContentCacheDataSerializationResult result && Equals(result);
+        }
+
+        public bool Equals(ContentCacheDataSerializationResult other)
+        {
+            return StringData == other.StringData &&
+                   EqualityComparer<byte[]>.Default.Equals(ByteData, other.ByteData);
+        }
+
+        public override int GetHashCode()
+        {
+            var hashCode = 1910544615;
+            hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(StringData);
+            hashCode = hashCode * -1521134295 + EqualityComparer<byte[]>.Default.GetHashCode(ByteData);
+            return hashCode;
+        }
+
+        public static bool operator ==(ContentCacheDataSerializationResult left, ContentCacheDataSerializationResult right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(ContentCacheDataSerializationResult left, ContentCacheDataSerializationResult right)
+        {
+            return !(left == right);
+        }
+    }
+
+}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentCacheDataSerializerEntityType.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentCacheDataSerializerEntityType.cs
new file mode 100644
index 0000000000..e5b15f8dce
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentCacheDataSerializerEntityType.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace Umbraco.Web.PublishedCache.NuCache.DataSource
+{
+    [Flags]
+    public enum ContentCacheDataSerializerEntityType
+    {
+        Document = 1,
+        Media = 2,
+        Member = 4
+    }
+
+}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentData.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentData.cs
index 36586acd12..5f252591e0 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentData.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentData.cs
@@ -3,7 +3,9 @@ using System.Collections.Generic;
 
 namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 {
-    // represents everything that is specific to edited or published version
+    /// <summary>
+    /// Represents everything that is specific to an edited or published content version
+    /// </summary>
     internal class ContentData
     {
         public string Name { get; set; }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentSourceDto.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentSourceDto.cs
index 37fb9df8bb..343885b037 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentSourceDto.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentSourceDto.cs
@@ -1,12 +1,13 @@
 using System;
+using Umbraco.Core.Models;
 
 namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 {
     // read-only dto
-    internal class ContentSourceDto
+    internal class ContentSourceDto : IReadOnlyContentBase
     {
         public int Id { get; set; }
-        public Guid Uid { get; set; }
+        public Guid Key { get; set; }
         public int ContentTypeId { get; set; }
 
         public int Level { get; set; }
@@ -27,6 +28,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         public int EditWriterId { get; set; }
         public int EditTemplateId { get; set; }
         public string EditData { get; set; }
+        public byte[] EditDataRaw { get; set; }
 
         // published data
         public int PublishedVersionId { get; set; }
@@ -35,5 +37,11 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         public int PubWriterId { get; set; }
         public int PubTemplateId { get; set; }
         public string PubData { get; set; }
+        public byte[] PubDataRaw { get; set; }
+
+        // Explicit implementation
+        DateTime IReadOnlyContentBase.UpdateDate => EditVersionDate;
+        string IReadOnlyContentBase.Name => EditName;
+        int IReadOnlyContentBase.WriterId => EditWriterId;
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
index dd3323fa0c..daf60b66ec 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
@@ -27,19 +27,19 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         public bool IsDraft { get; set; }
 
         //Legacy properties used to deserialize existing nucache db entries
-        [DataMember(Order = 4)]
+        [IgnoreDataMember]
         [JsonProperty("name")]
         private string LegacyName { set { Name = value; } }
 
-        [DataMember(Order = 5)]
+        [IgnoreDataMember]
         [JsonProperty("urlSegment")]
         private string LegacyUrlSegment { set { UrlSegment = value; } }
 
-        [DataMember(Order = 6)]
+        [IgnoreDataMember]
         [JsonProperty("date")]
         private DateTime LegacyDate { set { Date = value; } }
 
-        [DataMember(Order = 7)]
+        [IgnoreDataMember]
         [JsonProperty("isDraft")]
         private bool LegacyIsDraft { set { IsDraft = value; } }
     }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
index 9c6a799312..9a28f1374c 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
@@ -2,14 +2,12 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Newtonsoft.Json;
 using NPoco;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Scoping;
-using Umbraco.Core.Serialization;
 using Umbraco.Web.Composing;
 using static Umbraco.Core.Persistence.NPocoSqlExtensions.Statics;
 
@@ -21,20 +19,19 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
     internal class DatabaseDataSource : IDataSource
     {
         private const int PageSize = 500;
-        private readonly IContentNestedDataSerializer _contentNestedDataSerializer;
+        private readonly IContentCacheDataSerializerFactory _contentCacheDataSerializerFactory;
 
-        public DatabaseDataSource(IContentNestedDataSerializer contentNestedDataSerializer)
+        public DatabaseDataSource(IContentCacheDataSerializerFactory contentCacheDataSerializerFactory)
         {
-            _contentNestedDataSerializer = contentNestedDataSerializer;
+            _contentCacheDataSerializerFactory = contentCacheDataSerializerFactory;
         }
 
         // we want arrays, we want them all loaded, not an enumerable
 
-        private Sql<ISqlContext> ContentSourcesSelect(IScope scope, Func<Sql<ISqlContext>, Sql<ISqlContext>> joins = null)
+        private Sql<ISqlContext> SqlContentSourcesSelect(IScope scope, Func<ISqlContext, Sql<ISqlContext>> joins = null)
         {
-            var sql = scope.SqlContext.Sql()
-
-                .Select<NodeDto>(x => Alias(x.NodeId, "Id"), x => Alias(x.UniqueId, "Key"),
+            var sqlTemplate = scope.SqlContext.Templates.Get(Constants.SqlTemplates.NuCacheDatabaseDataSource.ContentSourcesSelect, tsql =>
+                tsql.Select<NodeDto>(x => Alias(x.NodeId, "Id"), x => Alias(x.UniqueId, "Key"),
                     x => Alias(x.Level, "Level"), x => Alias(x.Path, "Path"), x => Alias(x.SortOrder, "SortOrder"), x => Alias(x.ParentId, "ParentId"),
                     x => Alias(x.CreateDate, "CreateDate"), x => Alias(x.UserId, "CreatorId"))
                 .AndSelect<ContentDto>(x => Alias(x.ContentTypeId, "ContentTypeId"))
@@ -49,10 +46,17 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
                 .AndSelect<ContentNuDto>("nuEdit", x => Alias(x.Data, "EditData"))
                 .AndSelect<ContentNuDto>("nuPub", x => Alias(x.Data, "PubData"))
 
-                .From<NodeDto>();
+                .AndSelect<ContentNuDto>("nuEdit", x => Alias(x.RawData, "EditDataRaw"))
+                .AndSelect<ContentNuDto>("nuPub", x => Alias(x.RawData, "PubDataRaw"))
+
+                .From<NodeDto>());
+
+            var sql = sqlTemplate.Sql();
+
+            // TODO: I'm unsure how we can format the below into SQL templates also because right.Current and right.Published end up being parameters
 
             if (joins != null)
-                sql = joins(sql);
+                sql = sql.Append(joins(sql.SqlContext));
 
             sql = sql
                 .InnerJoin<ContentDto>().On<NodeDto, ContentDto>((left, right) => left.NodeId == right.NodeId)
@@ -62,85 +66,118 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
                 .InnerJoin<DocumentVersionDto>().On<ContentVersionDto, DocumentVersionDto>((left, right) => left.Id == right.Id)
 
                 .LeftJoin<ContentVersionDto>(j =>
-                    j.InnerJoin<DocumentVersionDto>("pdver").On<ContentVersionDto, DocumentVersionDto>((left, right) => left.Id == right.Id && right.Published, "pcver", "pdver"), "pcver")
+                    j.InnerJoin<DocumentVersionDto>("pdver").On<ContentVersionDto, DocumentVersionDto>((left, right) => left.Id == right.Id && right.Published == true, "pcver", "pdver"), "pcver")
                 .On<NodeDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId, aliasRight: "pcver")
 
-                .LeftJoin<ContentNuDto>("nuEdit").On<NodeDto, ContentNuDto>((left, right) => left.NodeId == right.NodeId && !right.Published, aliasRight: "nuEdit")
-                .LeftJoin<ContentNuDto>("nuPub").On<NodeDto, ContentNuDto>((left, right) => left.NodeId == right.NodeId && right.Published, aliasRight: "nuPub");
+                .LeftJoin<ContentNuDto>("nuEdit").On<NodeDto, ContentNuDto>((left, right) => left.NodeId == right.NodeId && right.Published == false, aliasRight: "nuEdit")
+                .LeftJoin<ContentNuDto>("nuPub").On<NodeDto, ContentNuDto>((left, right) => left.NodeId == right.NodeId && right.Published == true, aliasRight: "nuPub");
 
             return sql;
         }
 
-        public ContentNodeKit GetContentSource(IScope scope, int id)
+        private Sql<ISqlContext> SqlContentSourcesSelectUmbracoNodeJoin(ISqlContext sqlContext)
         {
-            var sql = ContentSourcesSelect(scope)
-                .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Document && x.NodeId == id && !x.Trashed)
-                .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
+            var syntax = sqlContext.SqlSyntax;
 
-            var dto = scope.Database.Fetch<ContentSourceDto>(sql).FirstOrDefault();
-            return dto == null ? new ContentNodeKit() : CreateContentNodeKit(dto);
+            var sqlTemplate = sqlContext.Templates.Get(Constants.SqlTemplates.NuCacheDatabaseDataSource.SourcesSelectUmbracoNodeJoin, builder =>
+                builder.InnerJoin<NodeDto>("x")
+                    .On<NodeDto, NodeDto>((left, right) => left.NodeId == right.NodeId || SqlText<bool>(left.Path, right.Path, (lp, rp) => $"({lp} LIKE {syntax.GetConcat(rp, "',%'")})"), aliasRight: "x"));
+
+            var sql = sqlTemplate.Sql();
+            return sql;
         }
 
-        public IEnumerable<ContentNodeKit> GetAllContentSources(IScope scope)
+        private Sql<ISqlContext> SqlWhereNodeId(ISqlContext sqlContext, int id)
         {
-            var sql = ContentSourcesSelect(scope)
-                .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Document && !x.Trashed)
-                .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
+            var syntax = sqlContext.SqlSyntax;
 
-            // We need to page here. We don't want to iterate over every single row in one connection cuz this can cause an SQL Timeout.
-            // We also want to read with a db reader and not load everything into memory, QueryPaged lets us do that.
+            var sqlTemplate = sqlContext.Templates.Get(Constants.SqlTemplates.NuCacheDatabaseDataSource.WhereNodeId, builder =>
+                builder.Where<NodeDto>(x => x.NodeId == SqlTemplate.Arg<int>("id")));
 
-            foreach (var row in scope.Database.QueryPaged<ContentSourceDto>(PageSize, sql))
-                yield return CreateContentNodeKit(row);
+            var sql = sqlTemplate.Sql(id);
+            return sql;
         }
 
-        public IEnumerable<ContentNodeKit> GetBranchContentSources(IScope scope, int id)
+        private Sql<ISqlContext> SqlWhereNodeIdX(ISqlContext sqlContext, int id)
         {
-            var syntax = scope.SqlContext.SqlSyntax;
-            var sql = ContentSourcesSelect(scope,
-                s => s.InnerJoin<NodeDto>("x").On<NodeDto, NodeDto>((left, right) => left.NodeId == right.NodeId || SqlText<bool>(left.Path, right.Path, (lp, rp) => $"({lp} LIKE {syntax.GetConcat(rp, "',%'")})"), aliasRight: "x"))
-                    .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Document && !x.Trashed)
-                    .Where<NodeDto>(x => x.NodeId == id, "x")
-                    .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
+            var syntax = sqlContext.SqlSyntax;
 
-            // We need to page here. We don't want to iterate over every single row in one connection cuz this can cause an SQL Timeout.
-            // We also want to read with a db reader and not load everything into memory, QueryPaged lets us do that.
+            var sqlTemplate = sqlContext.Templates.Get(Constants.SqlTemplates.NuCacheDatabaseDataSource.WhereNodeIdX, s =>
+                s.Where<NodeDto>(x => x.NodeId == SqlTemplate.Arg<int>("id"), "x"));
 
-            foreach (var row in scope.Database.QueryPaged<ContentSourceDto>(PageSize, sql))
-                yield return CreateContentNodeKit(row);
+            var sql = sqlTemplate.Sql(id);
+            return sql;
         }
 
-        public IEnumerable<ContentNodeKit> GetTypeContentSources(IScope scope, IEnumerable<int> ids)
+        private Sql<ISqlContext> SqlOrderByLevelIdSortOrder(ISqlContext sqlContext)
         {
-            if (!ids.Any()) yield break;
+            var syntax = sqlContext.SqlSyntax;
 
-            var sql = ContentSourcesSelect(scope)
-                .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Document && !x.Trashed)
-                .WhereIn<ContentDto>(x => x.ContentTypeId, ids)
-                .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
+            var sqlTemplate = sqlContext.Templates.Get(Constants.SqlTemplates.NuCacheDatabaseDataSource.OrderByLevelIdSortOrder, s =>
+                s.OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder));
 
-            // We need to page here. We don't want to iterate over every single row in one connection cuz this can cause an SQL Timeout.
-            // We also want to read with a db reader and not load everything into memory, QueryPaged lets us do that.
-
-            foreach (var row in scope.Database.QueryPaged<ContentSourceDto>(PageSize, sql))
-                yield return CreateContentNodeKit(row);
+            var sql = sqlTemplate.Sql();
+            return sql;
         }
 
-        private Sql<ISqlContext> MediaSourcesSelect(IScope scope, Func<Sql<ISqlContext>, Sql<ISqlContext>> joins = null)
+        private Sql<ISqlContext> SqlObjectTypeNotTrashed(ISqlContext sqlContext, Guid nodeObjectType)
         {
-            var sql = scope.SqlContext.Sql()
+            var syntax = sqlContext.SqlSyntax;
 
-                .Select<NodeDto>(x => Alias(x.NodeId, "Id"), x => Alias(x.UniqueId, "Key"),
+            var sqlTemplate = sqlContext.Templates.Get(Constants.SqlTemplates.NuCacheDatabaseDataSource.ObjectTypeNotTrashedFilter, s =>
+                s.Where<NodeDto>(x => x.NodeObjectType == SqlTemplate.Arg<Guid?>("nodeObjectType") && x.Trashed == SqlTemplate.Arg<bool>("trashed")));
+
+            var sql = sqlTemplate.Sql(nodeObjectType, false);
+            return sql;
+        }
+
+        /// <summary>
+        /// Returns a slightly more optimized query to use for the document counting when paging over the content sources
+        /// </summary>
+        /// <param name="scope"></param>
+        /// <returns></returns>
+        private Sql<ISqlContext> SqlContentSourcesCount(IScope scope, Func<ISqlContext, Sql<ISqlContext>> joins = null)
+        {
+            var sqlTemplate = scope.SqlContext.Templates.Get(Constants.SqlTemplates.NuCacheDatabaseDataSource.ContentSourcesCount, tsql =>
+                tsql.Select<NodeDto>(x => Alias(x.NodeId, "Id"))
+                    .From<NodeDto>()
+                    .InnerJoin<ContentDto>().On<NodeDto, ContentDto>((left, right) => left.NodeId == right.NodeId)
+                    .InnerJoin<DocumentDto>().On<NodeDto, DocumentDto>((left, right) => left.NodeId == right.NodeId));
+
+            var sql = sqlTemplate.Sql();
+
+            if (joins != null)
+                sql = sql.Append(joins(sql.SqlContext));
+
+            // TODO: We can't use a template with this one because of the 'right.Current' and 'right.Published' ends up being a parameter so not sure how we can do that
+            sql = sql
+                .InnerJoin<ContentVersionDto>().On<NodeDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId && right.Current)
+                .InnerJoin<DocumentVersionDto>().On<ContentVersionDto, DocumentVersionDto>((left, right) => left.Id == right.Id)
+                .LeftJoin<ContentVersionDto>(j =>
+                        j.InnerJoin<DocumentVersionDto>("pdver").On<ContentVersionDto, DocumentVersionDto>((left, right) => left.Id == right.Id && right.Published, "pcver", "pdver"), "pcver")
+                    .On<NodeDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId, aliasRight: "pcver");
+
+            return sql;
+        }
+
+        private Sql<ISqlContext> SqlMediaSourcesSelect(IScope scope, Func<ISqlContext, Sql<ISqlContext>> joins = null)
+        {
+            var sqlTemplate = scope.SqlContext.Templates.Get(Constants.SqlTemplates.NuCacheDatabaseDataSource.MediaSourcesSelect, tsql =>
+                tsql.Select<NodeDto>(x => Alias(x.NodeId, "Id"), x => Alias(x.UniqueId, "Key"),
                     x => Alias(x.Level, "Level"), x => Alias(x.Path, "Path"), x => Alias(x.SortOrder, "SortOrder"), x => Alias(x.ParentId, "ParentId"),
                     x => Alias(x.CreateDate, "CreateDate"), x => Alias(x.UserId, "CreatorId"))
                 .AndSelect<ContentDto>(x => Alias(x.ContentTypeId, "ContentTypeId"))
                 .AndSelect<ContentVersionDto>(x => Alias(x.Id, "VersionId"), x => Alias(x.Text, "EditName"), x => Alias(x.VersionDate, "EditVersionDate"), x => Alias(x.UserId, "EditWriterId"))
                 .AndSelect<ContentNuDto>("nuEdit", x => Alias(x.Data, "EditData"))
-                .From<NodeDto>();
+                .AndSelect<ContentNuDto>("nuEdit", x => Alias(x.RawData, "EditDataRaw"))
+                .From<NodeDto>());
+
+            var sql = sqlTemplate.Sql();
 
             if (joins != null)
-                sql = joins(sql);
+                sql = sql.Append(joins(sql.SqlContext));
 
+            // TODO: We can't use a template with this one because of the 'right.Published' ends up being a parameter so not sure how we can do that
             sql = sql
                 .InnerJoin<ContentDto>().On<NodeDto, ContentDto>((left, right) => left.NodeId == right.NodeId)
                 .InnerJoin<ContentVersionDto>().On<NodeDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId && right.Current)
@@ -148,78 +185,215 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 
             return sql;
         }
+        private Sql<ISqlContext> SqlMediaSourcesCount(IScope scope, Func<ISqlContext, Sql<ISqlContext>> joins = null)
+        {
+            var sqlTemplate = scope.SqlContext.Templates.Get(Constants.SqlTemplates.NuCacheDatabaseDataSource.MediaSourcesCount, tsql =>
+               tsql.Select<NodeDto>(x => Alias(x.NodeId, "Id")).From<NodeDto>());
+
+            var sql = sqlTemplate.Sql();
+
+            if (joins != null)
+                sql = sql.Append(joins(sql.SqlContext));
+
+            // TODO: We can't use a template with this one because of the 'right.Current' ends up being a parameter so not sure how we can do that
+            sql = sql
+                .InnerJoin<ContentDto>().On<NodeDto, ContentDto>((left, right) => left.NodeId == right.NodeId)
+                .InnerJoin<ContentVersionDto>().On<NodeDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId && right.Current);
+
+            return sql;
+        }
+
+        public ContentNodeKit GetContentSource(IScope scope, int id)
+        {
+            var sql = SqlContentSourcesSelect(scope)
+                .Append(SqlObjectTypeNotTrashed(scope.SqlContext, Constants.ObjectTypes.Document))
+                .Append(SqlWhereNodeId(scope.SqlContext, id))
+                .Append(SqlOrderByLevelIdSortOrder(scope.SqlContext));
+
+            var dto = scope.Database.Fetch<ContentSourceDto>(sql).FirstOrDefault();
+
+            if (dto == null) return ContentNodeKit.Empty;
+
+            var serializer = _contentCacheDataSerializerFactory.Create(ContentCacheDataSerializerEntityType.Document);
+            return CreateContentNodeKit(dto, serializer);
+        }
+
+        public IEnumerable<ContentNodeKit> GetAllContentSources(IScope scope)
+        {
+            var sql = SqlContentSourcesSelect(scope)
+                .Append(SqlObjectTypeNotTrashed(scope.SqlContext, Constants.ObjectTypes.Document))
+                .Append(SqlOrderByLevelIdSortOrder(scope.SqlContext));
+
+            // Use a more efficient COUNT query
+            var sqlCountQuery = SqlContentSourcesCount(scope)
+                .Append(SqlObjectTypeNotTrashed(scope.SqlContext, Constants.ObjectTypes.Document));
+
+            var sqlCount = scope.SqlContext.Sql("SELECT COUNT(*) FROM (").Append(sqlCountQuery).Append(") npoco_tbl");
+
+            var serializer = _contentCacheDataSerializerFactory.Create(ContentCacheDataSerializerEntityType.Document);
+
+            // We need to page here. We don't want to iterate over every single row in one connection cuz this can cause an SQL Timeout.
+            // We also want to read with a db reader and not load everything into memory, QueryPaged lets us do that.
+
+            foreach (var row in scope.Database.QueryPaged<ContentSourceDto>(PageSize, sql, sqlCount))
+            {
+                yield return CreateContentNodeKit(row, serializer);
+            }
+        }
+
+        public IEnumerable<ContentNodeKit> GetBranchContentSources(IScope scope, int id)
+        {
+            var sql = SqlContentSourcesSelect(scope, SqlContentSourcesSelectUmbracoNodeJoin)
+                .Append(SqlObjectTypeNotTrashed(scope.SqlContext, Constants.ObjectTypes.Document))
+                .Append(SqlWhereNodeIdX(scope.SqlContext, id))
+                .Append(SqlOrderByLevelIdSortOrder(scope.SqlContext));
+
+            // Use a more efficient COUNT query
+            var sqlCountQuery = SqlContentSourcesCount(scope, SqlContentSourcesSelectUmbracoNodeJoin)
+                .Append(SqlObjectTypeNotTrashed(scope.SqlContext, Constants.ObjectTypes.Document))
+                .Append(SqlWhereNodeIdX(scope.SqlContext, id));
+            var sqlCount = scope.SqlContext.Sql("SELECT COUNT(*) FROM (").Append(sqlCountQuery).Append(") npoco_tbl");
+
+            var serializer = _contentCacheDataSerializerFactory.Create(ContentCacheDataSerializerEntityType.Document);
+
+            // We need to page here. We don't want to iterate over every single row in one connection cuz this can cause an SQL Timeout.
+            // We also want to read with a db reader and not load everything into memory, QueryPaged lets us do that.
+
+            foreach (var row in scope.Database.QueryPaged<ContentSourceDto>(PageSize, sql, sqlCount))
+            {
+                yield return CreateContentNodeKit(row, serializer);
+            }
+        }
+
+        public IEnumerable<ContentNodeKit> GetTypeContentSources(IScope scope, IEnumerable<int> ids)
+        {
+            if (!ids.Any()) yield break;
+
+            var sql = SqlContentSourcesSelect(scope)
+                .Append(SqlObjectTypeNotTrashed(scope.SqlContext, Constants.ObjectTypes.Document))
+                .WhereIn<ContentDto>(x => x.ContentTypeId, ids)
+                .Append(SqlOrderByLevelIdSortOrder(scope.SqlContext));
+
+            // Use a more efficient COUNT query
+            var sqlCountQuery = SqlContentSourcesCount(scope)
+                .Append(SqlObjectTypeNotTrashed(scope.SqlContext, Constants.ObjectTypes.Document))
+                .WhereIn<ContentDto>(x => x.ContentTypeId, ids);
+            var sqlCount = scope.SqlContext.Sql("SELECT COUNT(*) FROM (").Append(sqlCountQuery).Append(") npoco_tbl");
+
+            var serializer = _contentCacheDataSerializerFactory.Create(ContentCacheDataSerializerEntityType.Document);
+
+            // We need to page here. We don't want to iterate over every single row in one connection cuz this can cause an SQL Timeout.
+            // We also want to read with a db reader and not load everything into memory, QueryPaged lets us do that.
+
+            foreach (var row in scope.Database.QueryPaged<ContentSourceDto>(PageSize, sql, sqlCount))
+            {
+                yield return CreateContentNodeKit(row, serializer);
+            }
+        }
 
         public ContentNodeKit GetMediaSource(IScope scope, int id)
         {
-            var sql = MediaSourcesSelect(scope)
-                .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Media && x.NodeId == id && !x.Trashed)
-                .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
+            var sql = SqlMediaSourcesSelect(scope)
+                .Append(SqlObjectTypeNotTrashed(scope.SqlContext, Constants.ObjectTypes.Media))
+                .Append(SqlWhereNodeId(scope.SqlContext, id))
+                .Append(SqlOrderByLevelIdSortOrder(scope.SqlContext));
 
             var dto = scope.Database.Fetch<ContentSourceDto>(sql).FirstOrDefault();
-            return dto == null ? new ContentNodeKit() : CreateMediaNodeKit(dto);
+
+            if (dto == null) return ContentNodeKit.Empty;
+
+            var serializer = _contentCacheDataSerializerFactory.Create(ContentCacheDataSerializerEntityType.Media);
+            return CreateMediaNodeKit(dto, serializer);
         }
 
         public IEnumerable<ContentNodeKit> GetAllMediaSources(IScope scope)
         {
-            var sql = MediaSourcesSelect(scope)
-                .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Media && !x.Trashed)
-                .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
+            var sql = SqlMediaSourcesSelect(scope)
+                .Append(SqlObjectTypeNotTrashed(scope.SqlContext, Constants.ObjectTypes.Media))
+                .Append(SqlOrderByLevelIdSortOrder(scope.SqlContext));
+
+            // Use a more efficient COUNT query
+            var sqlCountQuery = SqlMediaSourcesCount(scope)
+                .Append(SqlObjectTypeNotTrashed(scope.SqlContext, Constants.ObjectTypes.Media));
+            var sqlCount = scope.SqlContext.Sql("SELECT COUNT(*) FROM (").Append(sqlCountQuery).Append(") npoco_tbl");
+
+            var serializer = _contentCacheDataSerializerFactory.Create(ContentCacheDataSerializerEntityType.Media);
 
             // We need to page here. We don't want to iterate over every single row in one connection cuz this can cause an SQL Timeout.
             // We also want to read with a db reader and not load everything into memory, QueryPaged lets us do that.
 
-            foreach (var row in scope.Database.QueryPaged<ContentSourceDto>(PageSize, sql))
-                yield return CreateMediaNodeKit(row);
+            foreach (var row in scope.Database.QueryPaged<ContentSourceDto>(PageSize, sql, sqlCount))
+            {
+                yield return CreateMediaNodeKit(row, serializer);
+            }
         }
 
         public IEnumerable<ContentNodeKit> GetBranchMediaSources(IScope scope, int id)
         {
-            var syntax = scope.SqlContext.SqlSyntax;
-            var sql = MediaSourcesSelect(scope,
-                s => s.InnerJoin<NodeDto>("x").On<NodeDto, NodeDto>((left, right) => left.NodeId == right.NodeId || SqlText<bool>(left.Path, right.Path, (lp, rp) => $"({lp} LIKE {syntax.GetConcat(rp, "',%'")})"), aliasRight: "x"))
-                .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Media && !x.Trashed)
-                .Where<NodeDto>(x => x.NodeId == id, "x")
-                .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
+            var sql = SqlMediaSourcesSelect(scope, SqlContentSourcesSelectUmbracoNodeJoin)
+                .Append(SqlObjectTypeNotTrashed(scope.SqlContext, Constants.ObjectTypes.Media))
+                .Append(SqlWhereNodeIdX(scope.SqlContext, id))
+                .Append(SqlOrderByLevelIdSortOrder(scope.SqlContext));
+
+            // Use a more efficient COUNT query
+            var sqlCountQuery = SqlMediaSourcesCount(scope, SqlContentSourcesSelectUmbracoNodeJoin)
+                .Append(SqlObjectTypeNotTrashed(scope.SqlContext, Constants.ObjectTypes.Media))
+                .Append(SqlWhereNodeIdX(scope.SqlContext, id));
+            var sqlCount = scope.SqlContext.Sql("SELECT COUNT(*) FROM (").Append(sqlCountQuery).Append(") npoco_tbl");
+
+            var serializer = _contentCacheDataSerializerFactory.Create(ContentCacheDataSerializerEntityType.Media);
 
             // We need to page here. We don't want to iterate over every single row in one connection cuz this can cause an SQL Timeout.
             // We also want to read with a db reader and not load everything into memory, QueryPaged lets us do that.
 
-            foreach (var row in scope.Database.QueryPaged<ContentSourceDto>(PageSize, sql))
-                yield return CreateMediaNodeKit(row);
+            foreach (var row in scope.Database.QueryPaged<ContentSourceDto>(PageSize, sql, sqlCount))
+            {
+                yield return CreateMediaNodeKit(row, serializer);
+            }
         }
 
         public IEnumerable<ContentNodeKit> GetTypeMediaSources(IScope scope, IEnumerable<int> ids)
         {
             if (!ids.Any()) yield break;
 
-            var sql = MediaSourcesSelect(scope)
-                    .Where<NodeDto>(x => x.NodeObjectType == Constants.ObjectTypes.Media && !x.Trashed)
+            var sql = SqlMediaSourcesSelect(scope)
+                    .Append(SqlObjectTypeNotTrashed(scope.SqlContext, Constants.ObjectTypes.Media))
                     .WhereIn<ContentDto>(x => x.ContentTypeId, ids)
-                    .OrderBy<NodeDto>(x => x.Level, x => x.ParentId, x => x.SortOrder);
+                    .Append(SqlOrderByLevelIdSortOrder(scope.SqlContext));
+
+            // Use a more efficient COUNT query
+            var sqlCountQuery = SqlMediaSourcesCount(scope)
+                .Append(SqlObjectTypeNotTrashed(scope.SqlContext, Constants.ObjectTypes.Media))
+                .WhereIn<ContentDto>(x => x.ContentTypeId, ids);
+            var sqlCount = scope.SqlContext.Sql("SELECT COUNT(*) FROM (").Append(sqlCountQuery).Append(") npoco_tbl");
+
+            var serializer = _contentCacheDataSerializerFactory.Create(ContentCacheDataSerializerEntityType.Media);
 
             // We need to page here. We don't want to iterate over every single row in one connection cuz this can cause an SQL Timeout.
             // We also want to read with a db reader and not load everything into memory, QueryPaged lets us do that.
 
-            foreach (var row in scope.Database.QueryPaged<ContentSourceDto>(PageSize, sql))
-                yield return CreateMediaNodeKit(row);
+            foreach (var row in scope.Database.QueryPaged<ContentSourceDto>(PageSize, sql, sqlCount))
+            {
+                yield return CreateMediaNodeKit(row, serializer);
+            }
         }
 
-        private ContentNodeKit CreateContentNodeKit(ContentSourceDto dto)
+        private ContentNodeKit CreateContentNodeKit(ContentSourceDto dto, IContentCacheDataSerializer serializer)
         {
             ContentData d = null;
             ContentData p = null;
 
             if (dto.Edited)
             {
-                if (dto.EditData == null)
+                if (dto.EditData == null && dto.EditDataRaw == null)
                 {
                     if (Debugger.IsAttached)
-                        throw new Exception("Missing cmsContentNu edited content for node " + dto.Id + ", consider rebuilding.");
+                        throw new InvalidOperationException("Missing cmsContentNu edited content for node " + dto.Id + ", consider rebuilding.");
                     Current.Logger.Warn<DatabaseDataSource>("Missing cmsContentNu edited content for node {NodeId}, consider rebuilding.", dto.Id);
                 }
                 else
                 {
-                    var nested = _contentNestedDataSerializer.Deserialize(dto.EditData);
+                    var deserializedContent = serializer.Deserialize(dto, dto.EditData, dto.EditDataRaw);
 
                     d = new ContentData
                     {
@@ -229,41 +403,41 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
                         VersionId = dto.VersionId,
                         VersionDate = dto.EditVersionDate,
                         WriterId = dto.EditWriterId,
-                        Properties = nested.PropertyData, // TODO: We don't want to allocate empty arrays
-                        CultureInfos = nested.CultureData,
-                        UrlSegment = nested.UrlSegment
+                        Properties = deserializedContent.PropertyData, // TODO: We don't want to allocate empty arrays
+                        CultureInfos = deserializedContent.CultureData,
+                        UrlSegment = deserializedContent.UrlSegment
                     };
                 }
             }
 
             if (dto.Published)
             {
-                if (dto.PubData == null)
+                if (dto.PubData == null && dto.PubDataRaw == null)
                 {
                     if (Debugger.IsAttached)
-                        throw new Exception("Missing cmsContentNu published content for node " + dto.Id + ", consider rebuilding.");
+                        throw new InvalidOperationException("Missing cmsContentNu published content for node " + dto.Id + ", consider rebuilding.");
                     Current.Logger.Warn<DatabaseDataSource>("Missing cmsContentNu published content for node {NodeId}, consider rebuilding.", dto.Id);
                 }
                 else
                 {
-                    var nested = _contentNestedDataSerializer.Deserialize(dto.PubData);
+                    var deserializedContent = serializer.Deserialize(dto, dto.PubData, dto.PubDataRaw);
 
                     p = new ContentData
                     {
                         Name = dto.PubName,
-                        UrlSegment = nested.UrlSegment,
+                        UrlSegment = deserializedContent.UrlSegment,
                         Published = true,
                         TemplateId = dto.PubTemplateId,
                         VersionId = dto.VersionId,
                         VersionDate = dto.PubVersionDate,
                         WriterId = dto.PubWriterId,
-                        Properties = nested.PropertyData, // TODO: We don't want to allocate empty arrays
-                        CultureInfos = nested.CultureData
+                        Properties = deserializedContent.PropertyData, // TODO: We don't want to allocate empty arrays
+                        CultureInfos = deserializedContent.CultureData
                     };
                 }
             }
 
-            var n = new ContentNode(dto.Id, dto.Uid,
+            var n = new ContentNode(dto.Id, dto.Key,
                 dto.Level, dto.Path, dto.SortOrder, dto.ParentId, dto.CreateDate, dto.CreatorId);
 
             var s = new ContentNodeKit
@@ -277,12 +451,12 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
             return s;
         }
 
-        private ContentNodeKit CreateMediaNodeKit(ContentSourceDto dto)
+        private ContentNodeKit CreateMediaNodeKit(ContentSourceDto dto, IContentCacheDataSerializer serializer)
         {
-            if (dto.EditData == null)
-                throw new Exception("No data for media " + dto.Id);
+            if (dto.EditData == null && dto.EditDataRaw == null)
+                throw new InvalidOperationException("No data for media " + dto.Id);
 
-            var nested = _contentNestedDataSerializer.Deserialize(dto.EditData);
+            var deserializedMedia = serializer.Deserialize(dto, dto.EditData, dto.EditDataRaw);
 
             var p = new ContentData
             {
@@ -292,11 +466,11 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
                 VersionId = dto.VersionId,
                 VersionDate = dto.EditVersionDate,
                 WriterId = dto.CreatorId, // what-else?
-                Properties = nested.PropertyData, // TODO: We don't want to allocate empty arrays
-                CultureInfos = nested.CultureData
+                Properties = deserializedMedia.PropertyData, // TODO: We don't want to allocate empty arrays
+                CultureInfos = deserializedMedia.CultureData
             };
 
-            var n = new ContentNode(dto.Id, dto.Uid,
+            var n = new ContentNode(dto.Id, dto.Key,
                 dto.Level, dto.Path, dto.SortOrder, dto.ParentId, dto.CreateDate, dto.CreatorId);
 
             var s = new ContentNodeKit
@@ -309,6 +483,6 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
             return s;
         }
 
-        
+
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IContentCacheDataSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IContentCacheDataSerializer.cs
new file mode 100644
index 0000000000..d1a83d8452
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IContentCacheDataSerializer.cs
@@ -0,0 +1,25 @@
+using Umbraco.Core.Models;
+
+namespace Umbraco.Web.PublishedCache.NuCache.DataSource
+{
+
+    /// <summary>
+    /// Serializes/Deserializes <see cref="ContentCacheDataModel"/> document to the SQL Database as a string
+    /// </summary>
+    /// <remarks>
+    /// Resolved from the <see cref="IContentCacheDataSerializerFactory"/>. This cannot be resolved from DI.
+    /// </remarks>
+    public interface IContentCacheDataSerializer
+    {
+        /// <summary>
+        /// Deserialize the data into a <see cref="ContentCacheDataModel"/>
+        /// </summary>
+        ContentCacheDataModel Deserialize(IReadOnlyContentBase content, string stringData, byte[] byteData);
+
+        /// <summary>
+        /// Serializes the <see cref="ContentCacheDataModel"/> 
+        /// </summary>
+        ContentCacheDataSerializationResult Serialize(IReadOnlyContentBase content, ContentCacheDataModel model);
+    }
+
+}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IContentCacheDataSerializerFactory.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IContentCacheDataSerializerFactory.cs
new file mode 100644
index 0000000000..14dfd7dc5b
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IContentCacheDataSerializerFactory.cs
@@ -0,0 +1,16 @@
+namespace Umbraco.Web.PublishedCache.NuCache.DataSource
+{
+    public interface IContentCacheDataSerializerFactory
+    {
+        /// <summary>
+        /// Gets or creates a new instance of <see cref="IContentCacheDataSerializer"/>
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// This method may return the same instance, however this depends on the state of the application and if any underlying data has changed.
+        /// This method may also be used to initialize anything before a serialization/deserialization session occurs.
+        /// </remarks>
+        IContentCacheDataSerializer Create(ContentCacheDataSerializerEntityType types);
+    }
+
+}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IContentNestedDataSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IContentNestedDataSerializer.cs
deleted file mode 100644
index d9e2702d08..0000000000
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IContentNestedDataSerializer.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Umbraco.Web.PublishedCache.NuCache.DataSource
-{
-    public interface IContentNestedDataSerializer
-    {
-        ContentNestedData Deserialize(string data);
-        string Serialize(ContentNestedData nestedData);
-    }
-}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IDictionaryOfPropertyDataSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IDictionaryOfPropertyDataSerializer.cs
new file mode 100644
index 0000000000..a086e3e2f3
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/IDictionaryOfPropertyDataSerializer.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.IO;
+
+namespace Umbraco.Web.PublishedCache.NuCache.DataSource
+{
+    internal interface IDictionaryOfPropertyDataSerializer
+    {
+        IDictionary<string, PropertyData[]> ReadFrom(Stream stream);
+        void WriteTo(IDictionary<string, PropertyData[]> value, Stream stream);
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/JsonContentNestedDataSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/JsonContentNestedDataSerializer.cs
index 6635fa7090..c4d40f721f 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/JsonContentNestedDataSerializer.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/JsonContentNestedDataSerializer.cs
@@ -1,41 +1,42 @@
 using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Reflection.Emit;
-using System.Text;
-using System.Threading.Tasks;
+using Umbraco.Core.Models;
 using Umbraco.Core.Serialization;
 
 namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 {
 
-    internal class JsonContentNestedDataSerializer : IContentNestedDataSerializer
+    public class JsonContentNestedDataSerializer : IContentCacheDataSerializer
     {
-        public ContentNestedData Deserialize(string data)
+        // by default JsonConvert will deserialize our numeric values as Int64
+        // which is bad, because they were Int32 in the database - take care
+        private readonly JsonSerializerSettings _jsonSerializerSettings = new JsonSerializerSettings
         {
-            // by default JsonConvert will deserialize our numeric values as Int64
-            // which is bad, because they were Int32 in the database - take care
+            Converters = new List<JsonConverter> { new ForceInt32Converter() },
 
-            var settings = new JsonSerializerSettings
-            {
-                Converters = new List<JsonConverter> { new ForceInt32Converter() },
+            // Explicitly specify date handling so that it's consistent and follows the same date handling as MessagePack
+            DateParseHandling = DateParseHandling.DateTime,
+            DateFormatHandling = DateFormatHandling.IsoDateFormat,
+            DateTimeZoneHandling = DateTimeZoneHandling.Utc,
+            DateFormatString = "o"
+        };
 
-                // Explicitly specify date handling so that it's consistent and follows the same date handling as MessagePack
-                DateParseHandling = DateParseHandling.DateTime,
-                DateFormatHandling = DateFormatHandling.IsoDateFormat,
-                DateTimeZoneHandling = DateTimeZoneHandling.Utc,
-                DateFormatString = "o"                
-            };
+        public ContentCacheDataModel Deserialize(IReadOnlyContentBase content, string stringData, byte[] byteData)
+        {
+            if (stringData == null && byteData != null)
+                throw new NotSupportedException($"{typeof(JsonContentNestedDataSerializer)} does not support byte[] serialization");
 
-            return JsonConvert.DeserializeObject<ContentNestedData>(data, settings);
+            return JsonConvert.DeserializeObject<ContentCacheDataModel>(stringData, _jsonSerializerSettings);
         }
 
-        public string Serialize(ContentNestedData nestedData)
+        public ContentCacheDataSerializationResult Serialize(IReadOnlyContentBase content, ContentCacheDataModel model)
         {
             // note that numeric values (which are Int32) are serialized without their
             // type (eg "value":1234) and JsonConvert by default deserializes them as Int64
 
-            return JsonConvert.SerializeObject(nestedData);
+            var json = JsonConvert.SerializeObject(model);
+            return new ContentCacheDataSerializationResult(json, null);
         }
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/JsonContentNestedDataSerializerFactory.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/JsonContentNestedDataSerializerFactory.cs
new file mode 100644
index 0000000000..e857eb8bf5
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/JsonContentNestedDataSerializerFactory.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Umbraco.Web.PublishedCache.NuCache.DataSource
+{
+    internal class JsonContentNestedDataSerializerFactory : IContentCacheDataSerializerFactory
+    {
+        private Lazy<JsonContentNestedDataSerializer> _serializer = new Lazy<JsonContentNestedDataSerializer>();
+        public IContentCacheDataSerializer Create(ContentCacheDataSerializerEntityType types) => _serializer.Value;
+    }
+}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/LazyCompressedString.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/LazyCompressedString.cs
new file mode 100644
index 0000000000..2be2568f7e
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/LazyCompressedString.cs
@@ -0,0 +1,109 @@
+using K4os.Compression.LZ4;
+using System;
+using System.Diagnostics;
+using System.Text;
+using Umbraco.Core.Exceptions;
+
+namespace Umbraco.Web.PublishedCache.NuCache.DataSource
+{
+    /// <summary>
+    /// Lazily decompresses a LZ4 Pickler compressed UTF8 string
+    /// </summary>
+    [DebuggerDisplay("{Display}")]
+    internal struct LazyCompressedString
+    {
+        private byte[] _bytes;
+        private string _str;
+        private readonly object _locker;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="bytes">LZ4 Pickle compressed UTF8 String</param>
+        public LazyCompressedString(byte[] bytes)
+        {
+            _locker = new object();
+            _bytes = bytes;
+            _str = null;
+        }
+
+        public byte[] GetBytes()
+        {
+            if (_bytes == null)
+            {
+                throw new InvalidOperationException("The bytes have already been expanded");
+            }
+
+            return _bytes;
+        }
+
+        /// <summary>
+        /// Returns the decompressed string from the bytes. This methods can only be called once.
+        /// </summary>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException">Throws if this is called more than once</exception>
+        public string DecompressString()
+        {
+            if (_str != null)
+            {
+                return _str;
+            }
+
+            lock (_locker)
+            {
+                if (_str != null)
+                {
+                    // double check
+                    return _str;
+                }
+
+                if (_bytes == null)
+                {
+                    throw new InvalidOperationException("Bytes have already been cleared");
+                }
+
+                _str = Encoding.UTF8.GetString(LZ4Pickler.Unpickle(_bytes));
+                _bytes = null;
+            }
+            return _str;
+        }
+
+        /// <summary>
+        /// Used to display debugging output since ToString() can only be called once
+        /// </summary>
+        private string Display
+        {
+            get
+            {
+                if (_str != null)
+                {
+                    return $"Decompressed: {_str}";
+                }
+
+                lock (_locker)
+                {
+                    if (_str != null)
+                    {
+                        // double check
+                        return $"Decompressed: {_str}";
+                    }
+
+                    if (_bytes == null)
+                    {
+                        // This shouldn't happen
+                        throw new PanicException("Bytes have already been cleared");
+                    }
+                    else
+                    {
+                        return $"Compressed Bytes: {_bytes.Length}";
+                    }
+                }
+            }
+        }
+
+        public override string ToString() => DecompressString();
+
+        public static implicit operator string(LazyCompressedString l) => l.ToString();
+    }
+
+}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializer.cs
index 99a306fecb..944d93107d 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializer.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializer.cs
@@ -1,19 +1,28 @@
-using MessagePack;
-using MessagePack.Formatters;
+using K4os.Compression.LZ4;
+using MessagePack;
 using MessagePack.Resolvers;
 using System;
-using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Umbraco.Core.Models;
+using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 {
-    internal class MsgPackContentNestedDataSerializer : IContentNestedDataSerializer
+
+    /// <summary>
+    /// Serializes/Deserializes <see cref="ContentCacheDataModel"/> document to the SQL Database as bytes using MessagePack
+    /// </summary>
+    public class MsgPackContentNestedDataSerializer : IContentCacheDataSerializer
     {
-        private MessagePackSerializerOptions _options;
+        private readonly MessagePackSerializerOptions _options;
+        private readonly IPropertyCacheCompression _propertyOptions;
 
-        public MsgPackContentNestedDataSerializer()
+        public MsgPackContentNestedDataSerializer(IPropertyCacheCompression propertyOptions)
         {
-            var defaultOptions = ContractlessStandardResolver.Options;
+            _propertyOptions = propertyOptions ?? throw new ArgumentNullException(nameof(propertyOptions));
 
+            var defaultOptions = ContractlessStandardResolver.Options;
             var resolver = CompositeResolver.Create(
 
                 // TODO: We want to be able to intern the strings for aliases when deserializing like we do for Newtonsoft but I'm unsure exactly how
@@ -29,31 +38,92 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 
             _options = defaultOptions
                 .WithResolver(resolver)
-                .WithCompression(MessagePackCompression.Lz4BlockArray);
+                .WithCompression(MessagePackCompression.Lz4BlockArray);            
         }
 
-        public string ToJson(string serialized)
+        public string ToJson(byte[] bin)
         {
-            var bin = Convert.FromBase64String(serialized);
             var json = MessagePackSerializer.ConvertToJson(bin, _options);
             return json;
         }
 
-        // TODO: Instead of returning base64 it would be more ideal to avoid that translation entirely and just store/retrieve raw bytes
-
-        public ContentNestedData Deserialize(string data)
+        public ContentCacheDataModel Deserialize(IReadOnlyContentBase content, string stringData, byte[] byteData)
         {
-            var bin = Convert.FromBase64String(data);
-            var obj = MessagePackSerializer.Deserialize<ContentNestedData>(bin, _options);
-            return obj;
+            if (byteData != null)
+            {
+                var cacheModel = MessagePackSerializer.Deserialize<ContentCacheDataModel>(byteData, _options);
+                Expand(content, cacheModel);
+                return cacheModel;
+            }
+            else if (stringData != null)
+            {
+                // NOTE: We don't really support strings but it's possible if manually used (i.e. tests)
+                var bin = Convert.FromBase64String(stringData);
+                var cacheModel = MessagePackSerializer.Deserialize<ContentCacheDataModel>(bin, _options);
+                Expand(content, cacheModel);
+                return cacheModel;
+            }
+            else
+            {
+                return null;
+            }
         }
 
-        public string Serialize(ContentNestedData nestedData)
+        public ContentCacheDataSerializationResult Serialize(IReadOnlyContentBase content, ContentCacheDataModel model)
         {
-            var bin = MessagePackSerializer.Serialize(nestedData, _options);
-            return Convert.ToBase64String(bin);
+            Compress(content, model);
+            var bytes = MessagePackSerializer.Serialize(model, _options);
+            return new ContentCacheDataSerializationResult(null, bytes);
         }
 
+        /// <summary>
+        /// Used during serialization to compress properties
+        /// </summary>
+        /// <param name="model"></param>
+        /// <remarks>
+        /// This will essentially 'double compress' property data. The MsgPack data as a whole will already be compressed
+        /// but this will go a step further and double compress property data so that it is stored in the nucache file
+        /// as compressed bytes and therefore will exist in memory as compressed bytes. That is, until the bytes are
+        /// read/decompressed as a string to be displayed on the front-end. This allows for potentially a significant
+        /// memory savings but could also affect performance of first rendering pages while decompression occurs.
+        /// </remarks>
+        private void Compress(IReadOnlyContentBase content, ContentCacheDataModel model)
+        {
+            foreach(var propertyAliasToData in model.PropertyData)
+            {
+                if (_propertyOptions.IsCompressed(content, propertyAliasToData.Key))
+                {
+                    foreach(var property in propertyAliasToData.Value.Where(x => x.Value != null && x.Value is string))
+                    {
+                        property.Value = LZ4Pickler.Pickle(Encoding.UTF8.GetBytes((string)property.Value), LZ4Level.L00_FAST);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Used during deserialization to map the property data as lazy or expand the value
+        /// </summary>
+        /// <param name="nestedData"></param>
+        private void Expand(IReadOnlyContentBase content, ContentCacheDataModel nestedData)
+        {
+            foreach (var propertyAliasToData in nestedData.PropertyData)
+            {
+                if (_propertyOptions.IsCompressed(content, propertyAliasToData.Key))
+                {
+                    foreach (var property in propertyAliasToData.Value.Where(x => x.Value != null))
+                    {
+                        if (property.Value is byte[] byteArrayValue)
+                        {
+                            property.Value = new LazyCompressedString(byteArrayValue);
+                        }
+                    }
+                }
+            }
+        }
+
+       
+
         //private class ContentNestedDataResolver : IFormatterResolver
         //{
         //    // GetFormatter<T>'s get cost should be minimized so use type cache.
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializerFactory.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializerFactory.cs
new file mode 100644
index 0000000000..fcc3fa2bb8
--- /dev/null
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializerFactory.cs
@@ -0,0 +1,69 @@
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Web.PublishedCache.NuCache.DataSource
+{
+    internal class MsgPackContentNestedDataSerializerFactory : IContentCacheDataSerializerFactory
+    {
+        private readonly IContentTypeService _contentTypeService;
+        private readonly IMediaTypeService _mediaTypeService;
+        private readonly IMemberTypeService _memberTypeService;
+        private readonly PropertyEditorCollection _propertyEditors;
+        private readonly IPropertyCacheCompressionOptions _compressionOptions;
+        private readonly ConcurrentDictionary<(int, string), bool> _isCompressedCache = new ConcurrentDictionary<(int, string), bool>();
+
+        public MsgPackContentNestedDataSerializerFactory(
+            IContentTypeService contentTypeService,
+            IMediaTypeService mediaTypeService,
+            IMemberTypeService memberTypeService,
+            PropertyEditorCollection propertyEditors,
+            IPropertyCacheCompressionOptions compressionOptions)
+        {
+            _contentTypeService = contentTypeService;
+            _mediaTypeService = mediaTypeService;
+            _memberTypeService = memberTypeService;
+            _propertyEditors = propertyEditors;
+            _compressionOptions = compressionOptions;
+        }
+
+        public IContentCacheDataSerializer Create(ContentCacheDataSerializerEntityType types)
+        {
+            // Depending on which entity types are being requested, we need to look up those content types
+            // to initialize the compression options.
+            // We need to initialize these options now so that any data lookups required are completed and are not done while the content cache
+            // is performing DB queries which will result in errors since we'll be trying to query with open readers.
+            // NOTE: The calls to GetAll() below should be cached if the data has not been changed.
+
+            var contentTypes = new Dictionary<int, IContentTypeComposition>();
+            if ((types & ContentCacheDataSerializerEntityType.Document) == ContentCacheDataSerializerEntityType.Document)
+            {
+                foreach(var ct in _contentTypeService.GetAll())
+                {
+                    contentTypes[ct.Id] = ct;
+                }
+            }
+            if ((types & ContentCacheDataSerializerEntityType.Media) == ContentCacheDataSerializerEntityType.Media)
+            {
+                foreach (var ct in _mediaTypeService.GetAll())
+                {
+                    contentTypes[ct.Id] = ct;
+                }
+            }
+            if ((types & ContentCacheDataSerializerEntityType.Member) == ContentCacheDataSerializerEntityType.Member)
+            {
+                foreach (var ct in _memberTypeService.GetAll())
+                {
+                    contentTypes[ct.Id] = ct;
+                }
+            }
+
+            var compression = new PropertyCacheCompression(_compressionOptions, contentTypes, _propertyEditors, _isCompressedCache);
+            var serializer = new MsgPackContentNestedDataSerializer(compression);
+
+            return serializer;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs
index b49a781e0c..7a3cb67d50 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs
@@ -38,21 +38,21 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         public object Value { get; set; }
 
         //Legacy properties used to deserialize existing nucache db entries
-        [DataMember(Order = 3)]
+        [IgnoreDataMember]
         [JsonProperty("culture")]
         private string LegacyCulture
         {
             set => Culture = value;
         }
 
-        [DataMember(Order = 4)]
+        [IgnoreDataMember]
         [JsonProperty("seg")]
         private string LegacySegment
         {
             set => Segment = value;
         }
 
-        [DataMember(Order = 5)]
+        [IgnoreDataMember]
         [JsonProperty("val")]
         private object LegacyValue
         {
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs
index afc0827ed3..7a0f6962b6 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs
@@ -16,6 +16,14 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         private const char PrefixDouble = 'B';
         private const char PrefixDateTime = 'D';
         private const char PrefixByte = 'O';
+        private const char PrefixByteArray = 'A';
+        private const char PrefixCompressedStringByteArray = 'C';
+        private const char PrefixSignedByte = 'E';
+        private const char PrefixBool = 'M';
+        private const char PrefixGuid = 'G';
+        private const char PrefixTimeSpan = 'T';
+        private const char PrefixInt16 = 'Q';
+        private const char PrefixChar = 'R';
 
         protected string ReadString(Stream stream) => PrimitiveSerializer.String.ReadFrom(stream);
         protected int ReadInt(Stream stream) => PrimitiveSerializer.Int32.ReadFrom(stream);
@@ -23,8 +31,9 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         protected float ReadFloat(Stream stream) => PrimitiveSerializer.Float.ReadFrom(stream);
         protected double ReadDouble(Stream stream) => PrimitiveSerializer.Double.ReadFrom(stream);
         protected DateTime ReadDateTime(Stream stream) => PrimitiveSerializer.DateTime.ReadFrom(stream);
+        protected byte[] ReadByteArray(Stream stream) => PrimitiveSerializer.Bytes.ReadFrom(stream);
 
-        private T? ReadObject<T>(Stream stream, char t, Func<Stream, T> read)
+        private T? ReadStruct<T>(Stream stream, char t, Func<Stream, T> read)
             where T : struct
         {
             var type = PrimitiveSerializer.Char.ReadFrom(stream);
@@ -39,26 +48,33 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
             var type = PrimitiveSerializer.Char.ReadFrom(stream);
             if (type == PrefixNull) return null;
             if (type != PrefixString)
-                throw new NotSupportedException($"Cannot deserialize type '{type}', expected 'S'.");
+                throw new NotSupportedException($"Cannot deserialize type '{type}', expected '{PrefixString}'.");
             return intern
                 ? string.Intern(PrimitiveSerializer.String.ReadFrom(stream))
                 : PrimitiveSerializer.String.ReadFrom(stream);
         }
 
-        protected int? ReadIntObject(Stream stream) => ReadObject(stream, PrefixInt32, ReadInt);
-        protected long? ReadLongObject(Stream stream) => ReadObject(stream, PrefixLong, ReadLong);
-        protected float? ReadFloatObject(Stream stream) => ReadObject(stream, PrefixFloat, ReadFloat);
-        protected double? ReadDoubleObject(Stream stream) => ReadObject(stream, PrefixDouble, ReadDouble);
-        protected DateTime? ReadDateTimeObject(Stream stream) => ReadObject(stream, PrefixDateTime, ReadDateTime);
+        protected int? ReadIntObject(Stream stream) => ReadStruct(stream, PrefixInt32, ReadInt);
+        protected long? ReadLongObject(Stream stream) => ReadStruct(stream, PrefixLong, ReadLong);
+        protected float? ReadFloatObject(Stream stream) => ReadStruct(stream, PrefixFloat, ReadFloat);
+        protected double? ReadDoubleObject(Stream stream) => ReadStruct(stream, PrefixDouble, ReadDouble);
+        protected DateTime? ReadDateTimeObject(Stream stream) => ReadStruct(stream, PrefixDateTime, ReadDateTime);
 
         protected object ReadObject(Stream stream)
             => ReadObject(PrimitiveSerializer.Char.ReadFrom(stream), stream);
 
+        /// <summary>
+        /// Reads in a value based on its char type
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="stream"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This will incur boxing because the result is an object but in most cases the value will be a struct.
+        /// When the type is known use the specific methods like <see cref="ReadInt(Stream)"/> instead
+        /// </remarks>
         protected object ReadObject(char type, Stream stream)
         {
-            // NOTE: There is going to be a ton of boxing going on here, but i'm not sure we can avoid that because innevitably with our
-            // current model structure the value will need to end up being 'object' at some point anyways.
-
             switch (type)
             {
                 case PrefixNull:
@@ -81,11 +97,36 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
                     return PrimitiveSerializer.Double.ReadFrom(stream);
                 case PrefixDateTime:
                     return PrimitiveSerializer.DateTime.ReadFrom(stream);
+                case PrefixByteArray:
+                    return PrimitiveSerializer.Bytes.ReadFrom(stream);
+                case PrefixSignedByte:
+                    return PrimitiveSerializer.SByte.ReadFrom(stream);
+                case PrefixBool:
+                    return PrimitiveSerializer.Boolean.ReadFrom(stream);
+                case PrefixGuid:
+                    return PrimitiveSerializer.Guid.ReadFrom(stream);
+                case PrefixTimeSpan:
+                    return PrimitiveSerializer.TimeSpan.ReadFrom(stream);
+                case PrefixInt16:
+                    return PrimitiveSerializer.Int16.ReadFrom(stream);
+                case PrefixChar:
+                    return PrimitiveSerializer.Char.ReadFrom(stream);
+                case PrefixCompressedStringByteArray:
+                    return new LazyCompressedString(PrimitiveSerializer.Bytes.ReadFrom(stream));
                 default:
                     throw new NotSupportedException($"Cannot deserialize unknown type '{type}'.");
             }
         }
 
+        /// <summary>
+        /// Writes a value to the stream ensuring it's char type is prefixed to the value for reading later
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="stream"></param>
+        /// <remarks>
+        /// This method will incur boxing if the value is a struct. When the type is known use the <see cref="PrimitiveSerializer"/>
+        /// to write the value directly.
+        /// </remarks>
         protected void WriteObject(object value, Stream stream)
         {
             if (value == null)
@@ -137,6 +178,46 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
                 PrimitiveSerializer.Char.WriteTo(PrefixUInt32, stream);
                 PrimitiveSerializer.UInt32.WriteTo(uInt32Value, stream);
             }
+            else if (value is byte[] byteArrayValue)
+            {
+                PrimitiveSerializer.Char.WriteTo(PrefixByteArray, stream);
+                PrimitiveSerializer.Bytes.WriteTo(byteArrayValue, stream);
+            }
+            else if (value is LazyCompressedString lazyCompressedString)
+            {
+                PrimitiveSerializer.Char.WriteTo(PrefixCompressedStringByteArray, stream);
+                PrimitiveSerializer.Bytes.WriteTo(lazyCompressedString.GetBytes(), stream);
+            }
+            else if (value is sbyte signedByteValue)
+            {
+                PrimitiveSerializer.Char.WriteTo(PrefixSignedByte, stream);
+                PrimitiveSerializer.SByte.WriteTo(signedByteValue, stream);
+            }
+            else if (value is bool boolValue)
+            {
+                PrimitiveSerializer.Char.WriteTo(PrefixBool, stream);
+                PrimitiveSerializer.Boolean.WriteTo(boolValue, stream);
+            }
+            else if (value is Guid guidValue)
+            {
+                PrimitiveSerializer.Char.WriteTo(PrefixGuid, stream);
+                PrimitiveSerializer.Guid.WriteTo(guidValue, stream);
+            }
+            else if (value is TimeSpan timespanValue)
+            {
+                PrimitiveSerializer.Char.WriteTo(PrefixTimeSpan, stream);
+                PrimitiveSerializer.TimeSpan.WriteTo(timespanValue, stream);
+            }
+            else if (value is short int16Value)
+            {
+                PrimitiveSerializer.Char.WriteTo(PrefixInt16, stream);
+                PrimitiveSerializer.Int16.WriteTo(int16Value, stream);
+            }
+            else if (value is char charValue)
+            {
+                PrimitiveSerializer.Char.WriteTo(PrefixChar, stream);
+                PrimitiveSerializer.Char.WriteTo(charValue, stream);
+            }
             else
                 throw new NotSupportedException("Value type " + value.GetType().FullName + " cannot be serialized.");
         }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/MediaCache.cs b/src/Umbraco.Web/PublishedCache/NuCache/MediaCache.cs
index 182086ed7f..a466460ede 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/MediaCache.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/MediaCache.cs
@@ -11,7 +11,7 @@ using Umbraco.Web.PublishedCache.NuCache.Navigable;
 
 namespace Umbraco.Web.PublishedCache.NuCache
 {
-    internal class MediaCache : PublishedCacheBase, IPublishedMediaCache, INavigableData, IDisposable
+    internal class MediaCache : PublishedCacheBase, IPublishedMediaCache2, INavigableData, IDisposable
     {
         private readonly ContentStore.Snapshot _snapshot;
         private readonly IVariationContextAccessor _variationContextAccessor;
@@ -155,15 +155,11 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         #region Content types
 
-        public override IPublishedContentType GetContentType(int id)
-        {
-            return _snapshot.GetContentType(id);
-        }
+        public override IPublishedContentType GetContentType(int id) => _snapshot.GetContentType(id);
 
-        public override IPublishedContentType GetContentType(string alias)
-        {
-            return _snapshot.GetContentType(alias);
-        }
+        public override IPublishedContentType GetContentType(string alias) => _snapshot.GetContentType(alias);
+
+        public override IPublishedContentType GetContentType(Guid key) => _snapshot.GetContentType(key);
 
         #endregion
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
index 205ac55cdc..98d8b91386 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
@@ -1,6 +1,7 @@
 using System.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Web.PublishedCache.NuCache.DataSource;
 
 namespace Umbraco.Web.PublishedCache.NuCache
@@ -12,18 +13,22 @@ namespace Umbraco.Web.PublishedCache.NuCache
             base.Compose(composition);
 
             var serializer = ConfigurationManager.AppSettings["Umbraco.Web.PublishedCache.NuCache.Serializer"];
-
-            if (serializer == "MsgPack")
+            if (serializer != "MsgPack")
             {
-                composition.Register<IContentNestedDataSerializer, MsgPackContentNestedDataSerializer>();                
+                // TODO: This allows people to revert to the legacy serializer, by default it will be MessagePack
+                composition.RegisterUnique<IContentCacheDataSerializerFactory, JsonContentNestedDataSerializerFactory>();
             }
             else
             {
-                composition.Register<IContentNestedDataSerializer, JsonContentNestedDataSerializer>();
+                composition.RegisterUnique<IContentCacheDataSerializerFactory, MsgPackContentNestedDataSerializerFactory>();                
             }
 
+            composition.RegisterUnique<IPropertyCacheCompressionOptions, NoopPropertyCacheCompressionOptions>();
+
+            composition.RegisterUnique(factory => new ContentDataSerializer(new DictionaryOfPropertyDataSerializer()));
+
             // register the NuCache database data source
-            composition.Register<IDataSource, DatabaseDataSource>();
+            composition.RegisterUnique<IDataSource, DatabaseDataSource>();
 
             // register the NuCache published snapshot service
             // must register default options, required in the service ctor
@@ -34,5 +39,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
             // TODO: no NuCache health check yet
             //composition.HealthChecks().Add<NuCacheIntegrityHealthCheck>();
         }
+
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
index d80affbfa9..24747c43ad 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
@@ -33,15 +33,16 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _urlSegment = ContentData.UrlSegment;
             IsPreviewing = ContentData.Published == false;
 
-            var properties = new List<IPublishedProperty>();
+            var properties = new IPublishedProperty[_contentNode.ContentType.PropertyTypes.Count()];
+            int i =0;
             foreach (var propertyType in _contentNode.ContentType.PropertyTypes)
             {
                 // add one property per property type - this is required, for the indexing to work
                 // if contentData supplies pdatas, use them, else use null
                 contentData.Properties.TryGetValue(propertyType.Alias, out var pdatas); // else will be null
-                properties.Add(new Property(propertyType, this, pdatas, _publishedSnapshotAccessor));
+                properties[i++] =new Property(propertyType, this, pdatas, _publishedSnapshotAccessor);
             }
-            PropertiesArray = properties.ToArray();
+            PropertiesArray = properties;
         }
 
         private string GetProfileNameById(int id)
@@ -297,7 +298,18 @@ namespace Umbraco.Web.PublishedCache.NuCache
                             throw new PanicException($"failed to get content with id={id}");
                     }
 
-                    id = UnwrapIPublishedContent(content)._contentNode.NextSiblingContentId;
+                    var next = UnwrapIPublishedContent(content)._contentNode.NextSiblingContentId;
+
+#if DEBUG
+                    // I've seen this happen but I think that may have been due to corrupt DB data due to my own
+                    // bugs, but I'm leaving this here just in case we encounter it again while we're debugging.
+                    if (next == id)
+                    {
+                        throw new PanicException($"The current content id {id} is the same as it's next sibling id {next}");
+                    }
+#endif
+
+                    id = next;
                 }
             }
         }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index 6289667d3b..dbbcb4ee9b 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -1,14 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
-using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using CSharpTest.Net.Collections;
-using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
@@ -49,7 +45,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly IDefaultCultureAccessor _defaultCultureAccessor;
         private readonly UrlSegmentProviderCollection _urlSegmentProviders;
-        private readonly IContentNestedDataSerializer _contentNestedDataSerializer;
+        private readonly IContentCacheDataSerializerFactory _contentCacheDataSerializerFactory;
+        private readonly ContentDataSerializer _contentDataSerializer;
 
         // volatile because we read it with no lock
         private volatile bool _isReady;
@@ -83,7 +80,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             IDataSource dataSource, IGlobalSettings globalSettings,
             IEntityXmlSerializer entitySerializer,
             IPublishedModelFactory publishedModelFactory,
-            UrlSegmentProviderCollection urlSegmentProviders, IContentNestedDataSerializer contentNestedDataSerializer)
+            UrlSegmentProviderCollection urlSegmentProviders, IContentCacheDataSerializerFactory contentCacheDataSerializerFactory, ContentDataSerializer contentDataSerializer = null)
             : base(publishedSnapshotAccessor, variationContextAccessor)
         {
             //if (Interlocked.Increment(ref _singletonCheck) > 1)
@@ -100,7 +97,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _defaultCultureAccessor = defaultCultureAccessor;
             _globalSettings = globalSettings;
             _urlSegmentProviders = urlSegmentProviders;
-            _contentNestedDataSerializer = contentNestedDataSerializer;
+            _contentCacheDataSerializerFactory = contentCacheDataSerializerFactory;
+            _contentDataSerializer = contentDataSerializer;
 
             // we need an Xml serializer here so that the member cache can support XPath,
             // for members this is done by navigating the serialized-to-xml member
@@ -182,8 +180,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _localMediaDbExists = File.Exists(localMediaDbPath);
 
             // if both local databases exist then GetTree will open them, else new databases will be created
-            _localContentDb = BTree.GetTree(localContentDbPath, _localContentDbExists);
-            _localMediaDb = BTree.GetTree(localMediaDbPath, _localMediaDbExists);
+            _localContentDb = BTree.GetTree(localContentDbPath, _localContentDbExists, _contentDataSerializer);
+            _localMediaDb = BTree.GetTree(localMediaDbPath, _localMediaDbExists, _contentDataSerializer);
 
             _logger.Info<PublishedSnapshotService>("Registered with MainDom, localContentDbExists? {LocalContentDbExists}, localMediaDbExists? {LocalMediaDbExists}", _localContentDbExists, _localMediaDbExists);
         }
@@ -385,10 +383,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
             // contentStore is wlocked (1 thread)
             // content (and types) are read-locked
 
-            var contentTypes = _serviceContext.ContentTypeService.GetAll()
-                .Select(x => _publishedContentTypeFactory.CreateContentType(x));
+            var contentTypes = _serviceContext.ContentTypeService.GetAll().ToList();
 
-            _contentStore.SetAllContentTypesLocked(contentTypes);
+            _contentStore.SetAllContentTypesLocked(contentTypes.Select(x => _publishedContentTypeFactory.CreateContentType(x)));
 
             using (_logger.TraceDuration<PublishedSnapshotService>("Loading content from database"))
             {
@@ -1285,8 +1282,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
             var db = args.Scope.Database;
             var content = (Content)args.Entity;
 
+            var serializer = _contentCacheDataSerializerFactory.Create(ContentCacheDataSerializerEntityType.Document);
+
             // always refresh the edited data
-            OnRepositoryRefreshed(db, content, false);
+            OnRepositoryRefreshed(serializer, db, content, false);
 
             // if unpublishing, remove published data from table
             if (content.PublishedState == PublishedState.Unpublishing)
@@ -1294,37 +1293,42 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             // if publishing, refresh the published data
             else if (content.PublishedState == PublishedState.Publishing)
-                OnRepositoryRefreshed(db, content, true);
+                OnRepositoryRefreshed(serializer, db, content, true);
         }
 
         private void OnMediaRefreshedEntity(MediaRepository sender, MediaRepository.ScopedEntityEventArgs args)
         {
+            var serializer = _contentCacheDataSerializerFactory.Create(ContentCacheDataSerializerEntityType.Media);
+
             var db = args.Scope.Database;
             var media = args.Entity;
 
             // refresh the edited data
-            OnRepositoryRefreshed(db, media, false);
+            OnRepositoryRefreshed(serializer, db, media, false);
         }
 
         private void OnMemberRefreshedEntity(MemberRepository sender, MemberRepository.ScopedEntityEventArgs args)
         {
+            var serializer = _contentCacheDataSerializerFactory.Create(ContentCacheDataSerializerEntityType.Member);
+
             var db = args.Scope.Database;
             var member = args.Entity;
 
             // refresh the edited data
-            OnRepositoryRefreshed(db, member, false);
+            OnRepositoryRefreshed(serializer, db, member, false);
         }
 
-        private void OnRepositoryRefreshed(IUmbracoDatabase db, IContentBase content, bool published)
+        private void OnRepositoryRefreshed(IContentCacheDataSerializer serializer, IUmbracoDatabase db, IContentBase content, bool published)
         {
             // use a custom SQL to update row version on each update
             //db.InsertOrUpdate(dto);
 
-            var dto = GetDto(content, published);
+            var dto = GetDto(content, published, serializer);
             db.InsertOrUpdate(dto,
-                "SET data=@data, rv=rv+1 WHERE nodeId=@id AND published=@published",
+                "SET data=@data, dataRaw=@dataRaw, rv=rv+1 WHERE nodeId=@id AND published=@published",
                 new
                 {
+                    dataRaw = dto.RawData ?? Array.Empty<byte>(),
                     data = dto.Data,
                     id = dto.NodeId,
                     published = dto.Published
@@ -1373,7 +1377,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
         }
 
-        private ContentNuDto GetDto(IContentBase content, bool published)
+        private ContentNuDto GetDto(IContentBase content, bool published, IContentCacheDataSerializer serializer)
         {
             // should inject these in ctor
             // BUT for the time being we decide not to support ConvertDbToXml/String
@@ -1445,18 +1449,21 @@ namespace Umbraco.Web.PublishedCache.NuCache
             }
 
             //the dictionary that will be serialized
-            var nestedData = new ContentNestedData
+            var contentCacheData = new ContentCacheDataModel
             {
                 PropertyData = propertyData,
                 CultureData = cultureData,
                 UrlSegment = content.GetUrlSegment(_urlSegmentProviders)
             };
 
+            var serialized = serializer.Serialize(ReadOnlyContentBaseAdapter.Create(content), contentCacheData);
+
             var dto = new ContentNuDto
             {
                 NodeId = content.Id,
                 Published = published,
-                Data = _contentNestedDataSerializer.Serialize(nestedData)
+                Data = serialized.StringData,
+                RawData = serialized.ByteData
             };
 
             //Core.Composing.Current.Logger.Debug<PublishedSnapshotService>(dto.Data);
@@ -1479,30 +1486,32 @@ namespace Umbraco.Web.PublishedCache.NuCache
         public override void Rebuild()
         {
             _logger.Debug<PublishedSnapshotService>("Rebuilding...");
+            var serializer = _contentCacheDataSerializerFactory.Create(ContentCacheDataSerializerEntityType.Document | ContentCacheDataSerializerEntityType.Media | ContentCacheDataSerializerEntityType.Member);
             using (var scope = _scopeProvider.CreateScope(repositoryCacheMode: RepositoryCacheMode.Scoped))
             {
                 scope.ReadLock(Constants.Locks.ContentTree);
                 scope.ReadLock(Constants.Locks.MediaTree);
                 scope.ReadLock(Constants.Locks.MemberTree);
-                RebuildContentDbCacheLocked(scope, GetSqlPagingSize(), null);
-                RebuildMediaDbCacheLocked(scope, GetSqlPagingSize(), null);
-                RebuildMemberDbCacheLocked(scope, GetSqlPagingSize(), null);
+                RebuildContentDbCacheLocked(serializer, scope, GetSqlPagingSize(), null);
+                RebuildMediaDbCacheLocked(serializer, scope, GetSqlPagingSize(), null);
+                RebuildMemberDbCacheLocked(serializer, scope, GetSqlPagingSize(), null);
                 scope.Complete();
             }
         }
 
         public void RebuildContentDbCache(int groupSize = DefaultSqlPagingSize, IEnumerable<int> contentTypeIds = null)
         {
+            var serializer = _contentCacheDataSerializerFactory.Create(ContentCacheDataSerializerEntityType.Document);
             using (var scope = _scopeProvider.CreateScope(repositoryCacheMode: RepositoryCacheMode.Scoped))
             {
                 scope.ReadLock(Constants.Locks.ContentTree);
-                RebuildContentDbCacheLocked(scope, groupSize, contentTypeIds);
+                RebuildContentDbCacheLocked(serializer, scope, groupSize, contentTypeIds);
                 scope.Complete();
             }
         }
 
         // assumes content tree lock
-        private void RebuildContentDbCacheLocked(IScope scope, int groupSize, IEnumerable<int> contentTypeIds)
+        private void RebuildContentDbCacheLocked(IContentCacheDataSerializer serializer, IScope scope, int groupSize, IEnumerable<int> contentTypeIds)
         {
             var contentTypeIdsA = contentTypeIds?.ToArray();
             var contentObjectType = Constants.ObjectTypes.Document;
@@ -1549,11 +1558,11 @@ WHERE cmsContentNu.nodeId IN (
                 foreach (var c in descendants)
                 {
                     // always the edited version
-                    items.Add(GetDto(c, false));
+                    items.Add(GetDto(c, false, serializer));
 
                     // and also the published version if it makes any sense
                     if (c.Published)
-                        items.Add(GetDto(c, true));
+                        items.Add(GetDto(c, true, serializer));
 
                     count++;
                 }
@@ -1565,16 +1574,17 @@ WHERE cmsContentNu.nodeId IN (
 
         public void RebuildMediaDbCache(int groupSize = DefaultSqlPagingSize, IEnumerable<int> contentTypeIds = null)
         {
+            var serializer = _contentCacheDataSerializerFactory.Create(ContentCacheDataSerializerEntityType.Media);
             using (var scope = _scopeProvider.CreateScope(repositoryCacheMode: RepositoryCacheMode.Scoped))
             {
                 scope.ReadLock(Constants.Locks.MediaTree);
-                RebuildMediaDbCacheLocked(scope, groupSize, contentTypeIds);
+                RebuildMediaDbCacheLocked(serializer, scope, groupSize, contentTypeIds);
                 scope.Complete();
             }
         }
 
         // assumes media tree lock
-        public void RebuildMediaDbCacheLocked(IScope scope, int groupSize, IEnumerable<int> contentTypeIds)
+        public void RebuildMediaDbCacheLocked(IContentCacheDataSerializer serializer, IScope scope, int groupSize, IEnumerable<int> contentTypeIds)
         {
             var contentTypeIdsA = contentTypeIds?.ToArray();
             var mediaObjectType = Constants.ObjectTypes.Media;
@@ -1616,7 +1626,7 @@ WHERE cmsContentNu.nodeId IN (
             {
                 // the tree is locked, counting and comparing to total is safe
                 var descendants = _mediaRepository.GetPage(query, pageIndex++, groupSize, out total, null, Ordering.By("Path"));
-                var items = descendants.Select(m => GetDto(m, false)).ToList();
+                var items = descendants.Select(m => GetDto(m, false, serializer)).ToList();
                 db.BulkInsertRecords(items);
                 processed += items.Count;
             } while (processed < total);
@@ -1624,16 +1634,17 @@ WHERE cmsContentNu.nodeId IN (
 
         public void RebuildMemberDbCache(int groupSize = DefaultSqlPagingSize, IEnumerable<int> contentTypeIds = null)
         {
+            var serializer = _contentCacheDataSerializerFactory.Create(ContentCacheDataSerializerEntityType.Member);
             using (var scope = _scopeProvider.CreateScope(repositoryCacheMode: RepositoryCacheMode.Scoped))
             {
                 scope.ReadLock(Constants.Locks.MemberTree);
-                RebuildMemberDbCacheLocked(scope, groupSize, contentTypeIds);
+                RebuildMemberDbCacheLocked(serializer, scope, groupSize, contentTypeIds);
                 scope.Complete();
             }
         }
 
         // assumes member tree lock
-        public void RebuildMemberDbCacheLocked(IScope scope, int groupSize, IEnumerable<int> contentTypeIds)
+        public void RebuildMemberDbCacheLocked(IContentCacheDataSerializer serializer, IScope scope, int groupSize, IEnumerable<int> contentTypeIds)
         {
             var contentTypeIdsA = contentTypeIds?.ToArray();
             var memberObjectType = Constants.ObjectTypes.Member;
@@ -1674,7 +1685,7 @@ WHERE cmsContentNu.nodeId IN (
             do
             {
                 var descendants = _memberRepository.GetPage(query, pageIndex++, groupSize, out total, null, Ordering.By("Path"));
-                var items = descendants.Select(m => GetDto(m, false)).ToArray();
+                var items = descendants.Select(m => GetDto(m, false, serializer)).ToArray();
                 db.BulkInsertRecords(items);
                 processed += items.Length;
             } while (processed < total);
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
index c38940da25..589cd06d8a 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
@@ -380,7 +380,11 @@ namespace Umbraco.Web.PublishedCache.NuCache
                 {
                     _collectTask = null;
                 }
-            }, TaskContinuationOptions.ExecuteSynchronously);
+            },
+            CancellationToken.None,
+            TaskContinuationOptions.ExecuteSynchronously,
+            // Must explicitly specify this, see https://blog.stephencleary.com/2013/10/continuewith-is-dangerous-too.html
+            TaskScheduler.Default);
             // ReSharper restore InconsistentlySynchronizedField
 
             return task;
diff --git a/src/Umbraco.Web/PublishedCache/PublishedCacheBase.cs b/src/Umbraco.Web/PublishedCache/PublishedCacheBase.cs
index 1f637663e5..1b4a9bb92a 100644
--- a/src/Umbraco.Web/PublishedCache/PublishedCacheBase.cs
+++ b/src/Umbraco.Web/PublishedCache/PublishedCacheBase.cs
@@ -8,7 +8,7 @@ using Umbraco.Core.Xml;
 
 namespace Umbraco.Web.PublishedCache
 {
-    abstract class PublishedCacheBase : IPublishedCache
+    internal abstract class PublishedCacheBase : IPublishedCache2
     {
         public bool PreviewDefault { get; }
 
@@ -89,8 +89,8 @@ namespace Umbraco.Web.PublishedCache
         }
 
         public abstract IPublishedContentType GetContentType(int id);
-
         public abstract IPublishedContentType GetContentType(string alias);
+        public abstract IPublishedContentType GetContentType(Guid key);
 
         public virtual IEnumerable<IPublishedContent> GetByContentType(IPublishedContentType contentType)
         {
diff --git a/src/Umbraco.Web/PublishedCache/PublishedContentTypeCache.cs b/src/Umbraco.Web/PublishedCache/PublishedContentTypeCache.cs
index e453471bb8..8eb50b0588 100644
--- a/src/Umbraco.Web/PublishedCache/PublishedContentTypeCache.cs
+++ b/src/Umbraco.Web/PublishedCache/PublishedContentTypeCache.cs
@@ -15,8 +15,10 @@ namespace Umbraco.Web.PublishedCache
     /// <remarks>This cache is not snapshotted, so it refreshes any time things change.</remarks>
     public class PublishedContentTypeCache
     {
+        // NOTE: These are not concurrent dictionaries because all access is done within a lock
         private readonly Dictionary<string, IPublishedContentType> _typesByAlias = new Dictionary<string, IPublishedContentType>();
         private readonly Dictionary<int, IPublishedContentType> _typesById = new Dictionary<int, IPublishedContentType>();
+        private readonly Dictionary<Guid, int> _keyToIdMap = new Dictionary<Guid, int>();
         private readonly IContentTypeService _contentTypeService;
         private readonly IMediaTypeService _mediaTypeService;
         private readonly IMemberTypeService _memberTypeService;
@@ -130,6 +132,42 @@ namespace Umbraco.Web.PublishedCache
             }
         }
 
+        /// <summary>
+        /// Gets a published content type.
+        /// </summary>
+        /// <param name="itemType">An item type.</param>
+        /// <param name="key">An key.</param>
+        /// <returns>The published content type corresponding to the item key.</returns>
+        public IPublishedContentType Get(PublishedItemType itemType, Guid key)
+        {
+            try
+            {
+                _lock.EnterUpgradeableReadLock();
+
+                if (_keyToIdMap.TryGetValue(key, out var id))
+                    return Get(itemType, id);
+
+                var type = CreatePublishedContentType(itemType, key);
+
+                try
+                {
+                    _lock.EnterWriteLock();
+                    _keyToIdMap[key] = type.Id;
+                    return _typesByAlias[GetAliasKey(type)] = _typesById[type.Id] = type;
+                }
+                finally
+                {
+                    if (_lock.IsWriteLockHeld)
+                        _lock.ExitWriteLock();
+                }
+            }
+            finally
+            {
+                if (_lock.IsUpgradeableReadLockHeld)
+                    _lock.ExitUpgradeableReadLock();
+            }
+        }
+
         /// <summary>
         /// Gets a published content type.
         /// </summary>
@@ -152,7 +190,8 @@ namespace Umbraco.Web.PublishedCache
                 try
                 {
                     _lock.EnterWriteLock();
-
+                    if (type.TryGetKey(out var key))
+                        _keyToIdMap[key] = type.Id;
                     return _typesByAlias[aliasKey] = _typesById[type.Id] = type;
                 }
                 finally
@@ -188,7 +227,8 @@ namespace Umbraco.Web.PublishedCache
                 try
                 {
                     _lock.EnterWriteLock();
-
+                    if (type.TryGetKey(out var key))
+                        _keyToIdMap[key] = type.Id;
                     return _typesByAlias[GetAliasKey(type)] = _typesById[type.Id] = type;
                 }
                 finally
@@ -204,27 +244,32 @@ namespace Umbraco.Web.PublishedCache
             }
         }
 
+        private IPublishedContentType CreatePublishedContentType(PublishedItemType itemType, Guid key)
+        {
+            IContentTypeComposition contentType = itemType switch
+            {
+                PublishedItemType.Content => _contentTypeService.Get(key),
+                PublishedItemType.Media => _mediaTypeService.Get(key),
+                PublishedItemType.Member => _memberTypeService.Get(key),
+                _ => throw new ArgumentOutOfRangeException(nameof(itemType)),
+            };
+            if (contentType == null)
+                throw new Exception($"ContentTypeService failed to find a {itemType.ToString().ToLower()} type with key \"{key}\".");
+
+            return _publishedContentTypeFactory.CreateContentType(contentType);
+        }
+
         private IPublishedContentType CreatePublishedContentType(PublishedItemType itemType, string alias)
         {
             if (GetPublishedContentTypeByAlias != null)
                 return GetPublishedContentTypeByAlias(alias);
-
-            IContentTypeComposition contentType;
-            switch (itemType)
+            IContentTypeComposition contentType = itemType switch
             {
-                case PublishedItemType.Content:
-                    contentType = _contentTypeService.Get(alias);
-                    break;
-                case PublishedItemType.Media:
-                    contentType = _mediaTypeService.Get(alias);
-                    break;
-                case PublishedItemType.Member:
-                    contentType = _memberTypeService.Get(alias);
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(itemType));
-            }
-
+                PublishedItemType.Content => _contentTypeService.Get(alias),
+                PublishedItemType.Media => _mediaTypeService.Get(alias),
+                PublishedItemType.Member => _memberTypeService.Get(alias),
+                _ => throw new ArgumentOutOfRangeException(nameof(itemType)),
+            };
             if (contentType == null)
                 throw new Exception($"ContentTypeService failed to find a {itemType.ToString().ToLower()} type with alias \"{alias}\".");
 
@@ -235,23 +280,13 @@ namespace Umbraco.Web.PublishedCache
         {
             if (GetPublishedContentTypeById != null)
                 return GetPublishedContentTypeById(id);
-
-            IContentTypeComposition contentType;
-            switch (itemType)
+            IContentTypeComposition contentType = itemType switch
             {
-                case PublishedItemType.Content:
-                    contentType = _contentTypeService.Get(id);
-                    break;
-                case PublishedItemType.Media:
-                    contentType = _mediaTypeService.Get(id);
-                    break;
-                case PublishedItemType.Member:
-                    contentType = _memberTypeService.Get(id);
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(itemType));
-            }
-
+                PublishedItemType.Content => _contentTypeService.Get(id),
+                PublishedItemType.Media => _mediaTypeService.Get(id),
+                PublishedItemType.Member => _memberTypeService.Get(id),
+                _ => throw new ArgumentOutOfRangeException(nameof(itemType)),
+            };
             if (contentType == null)
                 throw new Exception($"ContentTypeService failed to find a {itemType.ToString().ToLower()} type with id {id}.");
 
@@ -259,6 +294,7 @@ namespace Umbraco.Web.PublishedCache
         }
 
         // for unit tests - changing the callback must reset the cache obviously
+        // TODO: Why does this even exist? For testing you'd pass in a mocked service to get by id
         private Func<string, IPublishedContentType> _getPublishedContentTypeByAlias;
         internal Func<string, IPublishedContentType> GetPublishedContentTypeByAlias
         {
@@ -282,6 +318,7 @@ namespace Umbraco.Web.PublishedCache
         }
 
         // for unit tests - changing the callback must reset the cache obviously
+        // TODO: Why does this even exist? For testing you'd pass in a mocked service to get by id
         private Func<int, IPublishedContentType> _getPublishedContentTypeById;
         internal Func<int, IPublishedContentType> GetPublishedContentTypeById
         {
diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index 73148b667a..f4c11977dc 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -1333,25 +1333,25 @@ namespace Umbraco.Web
         #region Url
 
         /// <summary>
-        /// Gets the url of the content item.
+        /// Gets the URL of the content item.
         /// </summary>
         /// <remarks>
-        /// <para>If the content item is a document, then this method returns the url of the
-        /// document. If it is a media, then this methods return the media url for the
-        /// 'umbracoFile' property. Use the MediaUrl() method to get the media url for other
+        /// <para>If the content item is a document, then this method returns the URL of the
+        /// document. If it is a media, then this methods return the media URL for the
+        /// 'umbracoFile' property. Use the MediaUrl() method to get the media URL for other
         /// properties.</para>
         /// <para>The value of this property is contextual. It depends on the 'current' request uri,
-        /// if any. In addition, when the content type is multi-lingual, this is the url for the
-        /// specified culture. Otherwise, it is the invariant url.</para>
+        /// if any. In addition, when the content type is multi-lingual, this is the URL for the
+        /// specified culture. Otherwise, it is the invariant URL.</para>
         /// </remarks>
         public static string Url(this IPublishedContent content, string culture = null, UrlMode mode = UrlMode.Default)
         {
             var umbracoContext = Composing.Current.UmbracoContext;
 
             if (umbracoContext == null)
-                throw new InvalidOperationException("Cannot resolve a Url when Current.UmbracoContext is null.");
+                throw new InvalidOperationException("Cannot resolve a URL when Current.UmbracoContext is null.");
             if (umbracoContext.UrlProvider == null)
-                throw new InvalidOperationException("Cannot resolve a Url when Current.UmbracoContext.UrlProvider is null.");
+                throw new InvalidOperationException("Cannot resolve a URL when Current.UmbracoContext.UrlProvider is null.");
 
             switch (content.ContentType.ItemType)
             {
diff --git a/src/Umbraco.Web/PublishedElementExtensions.cs b/src/Umbraco.Web/PublishedElementExtensions.cs
index f28581eb42..4c71e75f85 100644
--- a/src/Umbraco.Web/PublishedElementExtensions.cs
+++ b/src/Umbraco.Web/PublishedElementExtensions.cs
@@ -193,17 +193,17 @@ namespace Umbraco.Web
         #region MediaUrl
 
         /// <summary>
-        /// Gets the url for a media.
+        /// Gets the URL for a media.
         /// </summary>
         /// <param name="content">The content item.</param>
         /// <param name="culture">The culture (use current culture by default).</param>
-        /// <param name="mode">The url mode (use site configuration by default).</param>
+        /// <param name="mode">The URL mode (use site configuration by default).</param>
         /// <param name="propertyAlias">The alias of the property (use 'umbracoFile' by default).</param>
-        /// <returns>The url for the media.</returns>
+        /// <returns>The URL for the media.</returns>
         /// <remarks>
         /// <para>The value of this property is contextual. It depends on the 'current' request uri,
-        /// if any. In addition, when the content type is multi-lingual, this is the url for the
-        /// specified culture. Otherwise, it is the invariant url.</para>
+        /// if any. In addition, when the content type is multi-lingual, this is the URL for the
+        /// specified culture. Otherwise, it is the invariant URL.</para>
         /// </remarks>
         public static string MediaUrl(this IPublishedContent content, string culture = null, UrlMode mode = UrlMode.Default, string propertyAlias = Constants.Conventions.Media.File)
         {
diff --git a/src/Umbraco.Web/RoutableDocumentFilter.cs b/src/Umbraco.Web/RoutableDocumentFilter.cs
index 9725ce0e14..6096429db6 100644
--- a/src/Umbraco.Web/RoutableDocumentFilter.cs
+++ b/src/Umbraco.Web/RoutableDocumentFilter.cs
@@ -45,7 +45,7 @@ namespace Umbraco.Web
             var maybeDoc = true;
             var lpath = uri.AbsolutePath.ToLowerInvariant();
 
-            // handle directory-urls used for asmx
+            // handle directory-URLs used for asmx
             // TODO: legacy - what's the point really?
             var asmxPos = lpath.IndexOf(".asmx/", StringComparison.OrdinalIgnoreCase);
             if (asmxPos >= 0)
@@ -53,7 +53,7 @@ namespace Umbraco.Web
                 // use uri.AbsolutePath, not path, 'cos path has been lowercased
                 httpContext.RewritePath(uri.AbsolutePath.Substring(0, asmxPos + 5), // filePath
                     uri.AbsolutePath.Substring(asmxPos + 5), // pathInfo
-                    uri.Query.TrimStart('?'));
+                    uri.Query.TrimStart(Constants.CharArrays.QuestionMark));
                 maybeDoc = false;
             }
 
@@ -101,7 +101,7 @@ namespace Umbraco.Web
                 // add URLs and paths to a new list
                 var newReservedList = new HashSet<string>();
                 foreach (var reservedUrlTrimmed in reservedUrlsCache
-                    .Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)
+                    .Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries)
                     .Select(x => x.Trim().ToLowerInvariant())
                     .Where(x => x.IsNullOrWhiteSpace() == false)
                     .Select(reservedUrl => IOHelper.ResolveUrl(reservedUrl).Trim().EnsureStartsWith("/"))
@@ -110,7 +110,7 @@ namespace Umbraco.Web
                     newReservedList.Add(reservedUrlTrimmed);
                 }
 
-                foreach (var reservedPathTrimmed in NormalizePaths(reservedPathsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)))
+                foreach (var reservedPathTrimmed in NormalizePaths(reservedPathsCache.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries)))
                 {
                     newReservedList.Add(reservedPathTrimmed);
                 }
@@ -124,16 +124,16 @@ namespace Umbraco.Web
                 return newReservedList;
             });
 
-            //The url should be cleaned up before checking:
+            //The URL should be cleaned up before checking:
             // * If it doesn't contain an '.' in the path then we assume it is a path based URL, if that is the case we should add an trailing '/' because all of our reservedPaths use a trailing '/'
             // * We shouldn't be comparing the query at all
-            var pathPart = url.Split(new[] { '?' }, StringSplitOptions.RemoveEmptyEntries)[0].ToLowerInvariant();
+            var pathPart = url.Split(Constants.CharArrays.QuestionMark, StringSplitOptions.RemoveEmptyEntries)[0].ToLowerInvariant();
             if (pathPart.Contains(".") == false)
             {
                 pathPart = pathPart.EnsureEndsWith('/');
             }
 
-            // return true if url starts with an element of the reserved list
+            // return true if URL starts with an element of the reserved list
             return _reservedList.Any(x => pathPart.InvariantStartsWith(x));
         }
 
diff --git a/src/Umbraco.Web/Routing/AliasUrlProvider.cs b/src/Umbraco.Web/Routing/AliasUrlProvider.cs
index f84ac608d2..12828f06d7 100644
--- a/src/Umbraco.Web/Routing/AliasUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/AliasUrlProvider.cs
@@ -9,7 +9,7 @@ using Umbraco.Core.Models.PublishedContent;
 namespace Umbraco.Web.Routing
 {
     /// <summary>
-    /// Provides urls using the <c>umbracoUrlAlias</c> property.
+    /// Provides URLs using the <c>umbracoUrlAlias</c> property.
     /// </summary>
     public class AliasUrlProvider : IUrlProvider
     {
@@ -41,15 +41,15 @@ namespace Umbraco.Web.Routing
         #region GetOtherUrls
 
         /// <summary>
-        /// Gets the other urls of a published content.
+        /// Gets the other URLs of a published content.
         /// </summary>
         /// <param name="umbracoContext">The Umbraco context.</param>
         /// <param name="id">The published content id.</param>
-        /// <param name="current">The current absolute url.</param>
-        /// <returns>The other urls for the published content.</returns>
+        /// <param name="current">The current absolute URL.</param>
+        /// <returns>The other URLs for the published content.</returns>
         /// <remarks>
-        /// <para>Other urls are those that <c>GetUrl</c> would not return in the current context, but would be valid
-        /// urls for the node in other contexts (different domain for current request, umbracoUrlAlias...).</para>
+        /// <para>Other URLs are those that <c>GetUrl</c> would not return in the current context, but would be valid
+        /// URLs for the node in other contexts (different domain for current request, umbracoUrlAlias...).</para>
         /// </remarks>
         public IEnumerable<UrlInfo> GetOtherUrls(UmbracoContext umbracoContext, int id, Uri current)
         {
@@ -76,7 +76,7 @@ namespace Umbraco.Web.Routing
             if (domainUris == null)
             {
                 // no domain
-                // if the property is invariant, then url "/<alias>" is ok
+                // if the property is invariant, then URL "/<alias>" is ok
                 // if the property varies, then what are we supposed to do?
                 //  the content finder may work, depending on the 'current' culture,
                 //  but there's no way we can return something meaningful here
@@ -84,7 +84,7 @@ namespace Umbraco.Web.Routing
                     yield break;
 
                 var umbracoUrlName = node.Value<string>(Constants.Conventions.Content.UrlAlias);
-                var aliases = umbracoUrlName?.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                var aliases = umbracoUrlName?.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries);
 
                 if (aliases == null || aliases.Any() == false)
                     yield break;
@@ -98,11 +98,11 @@ namespace Umbraco.Web.Routing
             }
             else
             {
-                // some domains: one url per domain, which is "<domain>/<alias>"
-                foreach(var domainUri in domainUris)
+                // some domains: one URL per domain, which is "<domain>/<alias>"
+                foreach (var domainUri in domainUris)
                 {
-                    // if the property is invariant, get the invariant value, url is "<domain>/<invariant-alias>"
-                    // if the property varies, get the variant value, url is "<domain>/<variant-alias>"
+                    // if the property is invariant, get the invariant value, URL is "<domain>/<invariant-alias>"
+                    // if the property varies, get the variant value, URL is "<domain>/<variant-alias>"
 
                     // but! only if the culture is published, else ignore
                     if (varies && !node.HasCulture(domainUri.Culture.Name)) continue;
@@ -111,7 +111,7 @@ namespace Umbraco.Web.Routing
                         ? node.Value<string>(Constants.Conventions.Content.UrlAlias, culture: domainUri.Culture.Name)
                         : node.Value<string>(Constants.Conventions.Content.UrlAlias);
 
-                    var aliases = umbracoUrlName?.Split(new [] {','}, StringSplitOptions.RemoveEmptyEntries);
+                    var aliases = umbracoUrlName?.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries);
 
                     if (aliases == null || aliases.Any() == false)
                         continue;
@@ -132,8 +132,8 @@ namespace Umbraco.Web.Routing
 
         string CombinePaths(string path1, string path2)
         {
-            string path = path1.TrimEnd('/') + path2;
-            return path == "/" ? path : path.TrimEnd('/');
+            string path = path1.TrimEnd(Constants.CharArrays.ForwardSlash) + path2;
+            return path == "/" ? path : path.TrimEnd(Constants.CharArrays.ForwardSlash);
         }
 
         #endregion
diff --git a/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs b/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
index 46e44dc5a3..6c1195d222 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Services;
 namespace Umbraco.Web.Routing
 {
     /// <summary>
-    /// Provides an implementation of <see cref="IContentFinder"/> that handles page url rewrites
+    /// Provides an implementation of <see cref="IContentFinder"/> that handles page URL rewrites
     /// that are stored when moving, saving, or deleting a node.
     /// </summary>
     /// <remarks>
@@ -36,7 +36,9 @@ namespace Umbraco.Web.Routing
                 ? frequest.Domain.ContentId + DomainUtilities.PathRelativeToDomain(frequest.Domain.Uri, frequest.Uri.GetAbsolutePathDecoded())
                 : frequest.Uri.GetAbsolutePathDecoded();
 
-            var redirectUrl = _redirectUrlService.GetMostRecentRedirectUrl(route);
+
+
+            var redirectUrl = _redirectUrlService.GetMostRecentRedirectUrl(route, frequest.Culture.Name);
 
             if (redirectUrl == null)
             {
@@ -48,14 +50,14 @@ namespace Umbraco.Web.Routing
             var url = content == null ? "#" : content.Url(redirectUrl.Culture);
             if (url.StartsWith("#"))
             {
-                _logger.Debug<ContentFinderByRedirectUrl>("Route {Route} matches content {ContentId} which has no url.", route, redirectUrl.ContentId);
+                _logger.Debug<ContentFinderByRedirectUrl>("Route {Route} matches content {ContentId} which has no URL.", route, redirectUrl.ContentId);
                 return false;
             }
 
-            // Appending any querystring from the incoming request to the redirect url.
+            // Appending any querystring from the incoming request to the redirect URL
             url = string.IsNullOrEmpty(frequest.Uri.Query) ? url : url + frequest.Uri.Query;
 
-            _logger.Debug<ContentFinderByRedirectUrl>("Route {Route} matches content {ContentId} with url '{Url}', redirecting.", route, content.Id, url);
+            _logger.Debug<ContentFinderByRedirectUrl>("Route {Route} matches content {ContentId} with URL '{Url}', redirecting.", route, content.Id, url);
             frequest.SetRedirectPermanent(url);
 
 
diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrl.cs b/src/Umbraco.Web/Routing/ContentFinderByUrl.cs
index 0a14dc97fe..074193417a 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByUrl.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByUrl.cs
@@ -5,10 +5,10 @@ using Umbraco.Core.Models.PublishedContent;
 namespace Umbraco.Web.Routing
 {
     /// <summary>
-    /// Provides an implementation of <see cref="IContentFinder"/> that handles page nice urls.
+    /// Provides an implementation of <see cref="IContentFinder"/> that handles page nice URLs.
     /// </summary>
     /// <remarks>
-    /// <para>Handles <c>/foo/bar</c> where <c>/foo/bar</c> is the nice url of a document.</para>
+    /// <para>Handles <c>/foo/bar</c> where <c>/foo/bar</c> is the nice URL of a document.</para>
     /// </remarks>
     public class ContentFinderByUrl : IContentFinder
     {
diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
index cf71611047..0ee5f3d42d 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
@@ -64,7 +64,7 @@ namespace Umbraco.Web.Routing
 
             const string propertyAlias = Constants.Conventions.Content.UrlAlias;
 
-            var test1 = alias.TrimStart('/') + ",";
+            var test1 = alias.TrimStart(Constants.CharArrays.ForwardSlash) + ",";
             var test2 = ",/" + test1; // test2 is ",/alias,"
             test1 = "," + test1; // test1 is ",alias,"
 
@@ -96,7 +96,7 @@ namespace Umbraco.Web.Routing
             }
 
             // TODO: even with Linq, what happens below has to be horribly slow
-            // but the only solution is to entirely refactor url providers to stop being dynamic
+            // but the only solution is to entirely refactor URL providers to stop being dynamic
 
             if (rootNodeId > 0)
             {
diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs
index 16dfa63596..a02ebbb2a8 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs
@@ -9,11 +9,11 @@ using Umbraco.Core.Services;
 namespace Umbraco.Web.Routing
 {
     /// <summary>
-    /// Provides an implementation of <see cref="IContentFinder"/> that handles page nice urls and a template.
+    /// Provides an implementation of <see cref="IContentFinder"/> that handles page nice URLs and a template.
     /// </summary>
     /// <remarks>
     /// <para>This finder allows for an odd routing pattern similar to altTemplate, probably only use case is if there is an alternative mime type template and it should be routable by something like "/hello/world/json" where the JSON template is to be used for the "world" page</para>
-    /// <para>Handles <c>/foo/bar/template</c> where <c>/foo/bar</c> is the nice url of a document, and <c>template</c> a template alias.</para>
+    /// <para>Handles <c>/foo/bar/template</c> where <c>/foo/bar</c> is the nice URL of a document, and <c>template</c> a template alias.</para>
     /// <para>If successful, then the template of the document request is also assigned.</para>
     /// </remarks>
     public class ContentFinderByUrlAndTemplate : ContentFinderByUrl
diff --git a/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs b/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs
index 89abde0576..48d173816d 100644
--- a/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs
@@ -6,7 +6,7 @@ using Umbraco.Core.PropertyEditors;
 namespace Umbraco.Web.Routing
 {
     /// <summary>
-    /// Default media url provider.
+    /// Default media URL provider.
     /// </summary>
     public class DefaultMediaUrlProvider : IMediaUrlProvider
     {
diff --git a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
index 4092538481..f26f05c36c 100644
--- a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
@@ -5,6 +5,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core;
 
 namespace Umbraco.Web.Routing
 {
@@ -31,7 +32,7 @@ namespace Umbraco.Web.Routing
         /// <inheritdoc />
         public virtual UrlInfo GetUrl(UmbracoContext umbracoContext, IPublishedContent content, UrlMode mode, string culture, Uri current)
         {
-            if (!current.IsAbsoluteUri) throw new ArgumentException("Current url must be absolute.", nameof(current));
+            if (!current.IsAbsoluteUri) throw new ArgumentException("Current URL must be absolute.", nameof(current));
 
             // will not use cache if previewing
             var route = umbracoContext.Content.GetRouteById(content.Id, culture);
@@ -55,7 +56,7 @@ namespace Umbraco.Web.Routing
                 ? null
                 : DomainUtilities.DomainForNode(umbracoContext.PublishedSnapshot.Domains, _siteDomainHelper, int.Parse(route.Substring(0, pos)), current, culture);
 
-            // assemble the url from domainUri (maybe null) and path
+            // assemble the URL from domainUri (maybe null) and path
             var url = AssembleUrl(domainUri, path, current, mode).ToString();
 
             return UrlInfo.Url(url, culture);
@@ -66,15 +67,15 @@ namespace Umbraco.Web.Routing
         #region GetOtherUrls
 
         /// <summary>
-        /// Gets the other urls of a published content.
+        /// Gets the other URLs of a published content.
         /// </summary>
         /// <param name="umbracoContext">The Umbraco context.</param>
         /// <param name="id">The published content id.</param>
-        /// <param name="current">The current absolute url.</param>
-        /// <returns>The other urls for the published content.</returns>
+        /// <param name="current">The current absolute URL.</param>
+        /// <returns>The other URLs for the published content.</returns>
         /// <remarks>
-        /// <para>Other urls are those that <c>GetUrl</c> would not return in the current context, but would be valid
-        /// urls for the node in other contexts (different domain for current request, umbracoUrlAlias...).</para>
+        /// <para>Other URLs are those that <c>GetUrl</c> would not return in the current context, but would be valid
+        /// URLs for the node in other contexts (different domain for current request, umbracoUrlAlias...).</para>
         /// </remarks>
         public virtual IEnumerable<UrlInfo> GetOtherUrls(UmbracoContext umbracoContext, int id, Uri current)
         {
@@ -166,14 +167,14 @@ namespace Umbraco.Web.Routing
             }
 
             // UriFromUmbraco will handle vdir
-            // meaning it will add vdir into domain urls too!
+            // meaning it will add vdir into domain URLs too!
             return UriUtility.UriFromUmbraco(uri, _globalSettings, _requestSettings);
         }
 
         string CombinePaths(string path1, string path2)
         {
-            string path = path1.TrimEnd('/') + path2;
-            return path == "/" ? path : path.TrimEnd('/');
+            string path = path1.TrimEnd(Constants.CharArrays.ForwardSlash) + path2;
+            return path == "/" ? path : path.TrimEnd(Constants.CharArrays.ForwardSlash);
         }
 
         #endregion
diff --git a/src/Umbraco.Web/Routing/DomainUtilities.cs b/src/Umbraco.Web/Routing/DomainUtilities.cs
index fb0c56b28d..9f5ab32acb 100644
--- a/src/Umbraco.Web/Routing/DomainUtilities.cs
+++ b/src/Umbraco.Web/Routing/DomainUtilities.cs
@@ -327,7 +327,7 @@ namespace Umbraco.Web.Routing
         {
             var stopNodeId = rootNodeId ?? -1;
 
-            return path.Split(',')
+            return path.Split(Constants.CharArrays.Comma)
                        .Reverse()
                        .Select(int.Parse)
                        .TakeWhile(id => id != stopNodeId)
@@ -348,7 +348,7 @@ namespace Umbraco.Web.Routing
         {
             var stopNodeId = rootNodeId ?? -1;
 
-            return path.Split(',')
+            return path.Split(Constants.CharArrays.Comma)
                        .Reverse()
                        .Select(int.Parse)
                        .TakeWhile(id => id != stopNodeId)
diff --git a/src/Umbraco.Web/Routing/IMediaUrlProvider.cs b/src/Umbraco.Web/Routing/IMediaUrlProvider.cs
index 8a81b27415..efb005907d 100644
--- a/src/Umbraco.Web/Routing/IMediaUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/IMediaUrlProvider.cs
@@ -4,27 +4,27 @@ using Umbraco.Core.Models.PublishedContent;
 namespace Umbraco.Web.Routing
 {
     /// <summary>
-    /// Provides media urls.
+    /// Provides media URL.
     /// </summary>
     public interface IMediaUrlProvider
     {
         /// <summary>
-        /// Gets the url of a media item.
+        /// Gets the URL of a media item.
         /// </summary>
         /// <param name="umbracoContext">The Umbraco context.</param>
         /// <param name="content">The published content.</param>
-        /// <param name="propertyAlias">The property alias to resolve the url from.</param>
-        /// <param name="mode">The url mode.</param>
+        /// <param name="propertyAlias">The property alias to resolve the URL from.</param>
+        /// <param name="mode">The URL mode.</param>
         /// <param name="culture">The variation language.</param>
-        /// <param name="current">The current absolute url.</param>
-        /// <returns>The url for the media.</returns>
+        /// <param name="current">The current absolute URL.</param>
+        /// <returns>The URL for the media.</returns>
         /// <remarks>
-        /// <para>The url is absolute or relative depending on <c>mode</c> and on <c>current</c>.</para>
-        /// <para>If the media is multi-lingual, gets the url for the specified culture or,
+        /// <para>The URL is absolute or relative depending on <c>mode</c> and on <c>current</c>.</para>
+        /// <para>If the media is multi-lingual, gets the URL for the specified culture or,
         /// when no culture is specified, the current culture.</para>
-        /// <para>The url provider can ignore the mode and always return an absolute url,
-        /// e.g. a cdn url provider will most likely always return an absolute url.</para>
-        /// <para>If the provider is unable to provide a url, it returns <c>null</c>.</para>
+        /// <para>The URL provider can ignore the mode and always return an absolute URL,
+        /// e.g. a cdn URL provider will most likely always return an absolute URL.</para>
+        /// <para>If the provider is unable to provide a URL, it returns <c>null</c>.</para>
         /// </remarks>
         UrlInfo GetMediaUrl(UmbracoContext umbracoContext, IPublishedContent content, string propertyAlias, UrlMode mode, string culture, Uri current);
     }
diff --git a/src/Umbraco.Web/Routing/IUrlProvider.cs b/src/Umbraco.Web/Routing/IUrlProvider.cs
index c0ce1fef39..e7d5628fd0 100644
--- a/src/Umbraco.Web/Routing/IUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/IUrlProvider.cs
@@ -5,37 +5,37 @@ using Umbraco.Core.Models.PublishedContent;
 namespace Umbraco.Web.Routing
 {
     /// <summary>
-    /// Provides urls.
+    /// Provides URLs.
     /// </summary>
     public interface IUrlProvider
     {
         /// <summary>
-        /// Gets the url of a published content.
+        /// Gets the URL of a published content.
         /// </summary>
         /// <param name="umbracoContext">The Umbraco context.</param>
         /// <param name="content">The published content.</param>
-        /// <param name="mode">The url mode.</param>
+        /// <param name="mode">The URL mode.</param>
         /// <param name="culture">A culture.</param>
-        /// <param name="current">The current absolute url.</param>
-        /// <returns>The url for the published content.</returns>
+        /// <param name="current">The current absolute URL.</param>
+        /// <returns>The URL for the published content.</returns>
         /// <remarks>
-        /// <para>The url is absolute or relative depending on <c>mode</c> and on <c>current</c>.</para>
-        /// <para>If the published content is multi-lingual, gets the url for the specified culture or,
+        /// <para>The URL is absolute or relative depending on <c>mode</c> and on <c>current</c>.</para>
+        /// <para>If the published content is multi-lingual, gets the URL for the specified culture or,
         /// when no culture is specified, the current culture.</para>
-        /// <para>If the provider is unable to provide a url, it should return <c>null</c>.</para>
+        /// <para>If the provider is unable to provide a URL, it should return <c>null</c>.</para>
         /// </remarks>
         UrlInfo GetUrl(UmbracoContext umbracoContext, IPublishedContent content, UrlMode mode, string culture, Uri current);
 
         /// <summary>
-        /// Gets the other urls of a published content.
+        /// Gets the other URLs of a published content.
         /// </summary>
         /// <param name="umbracoContext">The Umbraco context.</param>
         /// <param name="id">The published content id.</param>
-        /// <param name="current">The current absolute url.</param>
-        /// <returns>The other urls for the published content.</returns>
+        /// <param name="current">The current absolute URL.</param>
+        /// <returns>The other URLs for the published content.</returns>
         /// <remarks>
-        /// <para>Other urls are those that <c>GetUrl</c> would not return in the current context, but would be valid
-        /// urls for the node in other contexts (different domain for current request, umbracoUrlAlias...).</para>
+        /// <para>Other URLs are those that <c>GetUrl</c> would not return in the current context, but would be valid
+        /// URLs for the node in other contexts (different domain for current request, umbracoUrlAlias...).</para>
         /// </remarks>
         IEnumerable<UrlInfo> GetOtherUrls(UmbracoContext umbracoContext, int id, Uri current);
     }
diff --git a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
index 38ecb09b2b..9fefeeb843 100644
--- a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
+++ b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
@@ -96,7 +96,7 @@ namespace Umbraco.Web.Routing
                         getPath: nodeid =>
                         {
                             var ent = entityService.Get(nodeid);
-                            return ent.Path.Split(',').Reverse();
+                            return ent.Path.Split(Constants.CharArrays.Comma).Reverse();
                         },
                         publishedContentExists: i => publishedContentQuery.Content(i) != null);
 
diff --git a/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs b/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
index e1f9022f27..0045cf33dc 100644
--- a/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
+++ b/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
@@ -30,11 +30,11 @@ namespace Umbraco.Web.Routing
             response.Clear();
 
             var frequest = Current.UmbracoContext.PublishedRequest;
-            var reason = "Cannot render the page at url '{0}'.";
+            var reason = "Cannot render the page at URL '{0}'.";
             if (frequest.HasPublishedContent == false)
-                reason = "No umbraco document matches the url '{0}'.";
+                reason = "No umbraco document matches the URL '{0}'.";
             else if (frequest.HasTemplate == false)
-                reason = "No template exists to render the document at url '{0}'.";
+                reason = "No template exists to render the document at URL '{0}'.";
 
             response.Write("<html><body><h1>Page not found</h1>");
             response.Write("<h2>");
diff --git a/src/Umbraco.Web/Routing/PublishedRequest.cs b/src/Umbraco.Web/Routing/PublishedRequest.cs
index aee7ba4de8..959f96acc0 100644
--- a/src/Umbraco.Web/Routing/PublishedRequest.cs
+++ b/src/Umbraco.Web/Routing/PublishedRequest.cs
@@ -369,14 +369,14 @@ namespace Umbraco.Web.Routing
         public bool IsRedirectPermanent { get; private set; }
 
         /// <summary>
-        /// Gets or sets the url to redirect to, when the content request triggers a redirect.
+        /// Gets or sets the URL to redirect to, when the content request triggers a redirect.
         /// </summary>
         public string RedirectUrl { get; private set; }
 
         /// <summary>
         /// Indicates that the content request should trigger a redirect (302).
         /// </summary>
-        /// <param name="url">The url to redirect to.</param>
+        /// <param name="url">The URL to redirect to.</param>
         /// <remarks>Does not actually perform a redirect, only registers that the response should
         /// redirect. Redirect will or will not take place in due time.</remarks>
         public void SetRedirect(string url)
@@ -389,7 +389,7 @@ namespace Umbraco.Web.Routing
         /// <summary>
         /// Indicates that the content request should trigger a permanent redirect (301).
         /// </summary>
-        /// <param name="url">The url to redirect to.</param>
+        /// <param name="url">The URL to redirect to.</param>
         /// <remarks>Does not actually perform a redirect, only registers that the response should
         /// redirect. Redirect will or will not take place in due time.</remarks>
         public void SetRedirectPermanent(string url)
@@ -402,7 +402,7 @@ namespace Umbraco.Web.Routing
         /// <summary>
         /// Indicates that the content request should trigger a redirect, with a specified status code.
         /// </summary>
-        /// <param name="url">The url to redirect to.</param>
+        /// <param name="url">The URL to redirect to.</param>
         /// <param name="status">The status code (300-308).</param>
         /// <remarks>Does not actually perform a redirect, only registers that the response should
         /// redirect. Redirect will or will not take place in due time.</remarks>
diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs
index 6e768c28b6..fee9a62158 100644
--- a/src/Umbraco.Web/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Web/Routing/PublishedRouter.cs
@@ -96,7 +96,7 @@ namespace Umbraco.Web.Routing
         {
             // note - at that point the original legacy module did something do handle IIS custom 404 errors
             //   ie pages looking like /anything.aspx?404;/path/to/document - I guess the reason was to support
-            //   "directory urls" without having to do wildcard mapping to ASP.NET on old IIS. This is a pain
+            //   "directory URLs" without having to do wildcard mapping to ASP.NET on old IIS. This is a pain
             //   to maintain and probably not used anymore - removed as of 06/2012. @zpqrtbnk.
             //
             //   to trigger Umbraco's not-found, one should configure IIS and/or ASP.NET custom 404 errors
diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
index fcf6f55f44..c12d735a60 100644
--- a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
+++ b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
@@ -11,8 +11,8 @@ using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Web.Routing
 {
-    /// Implements an Application Event Handler for managing redirect urls tracking.
-    /// <para>when content is renamed or moved, we want to create a permanent 301 redirect from it's old url</para>
+    /// Implements an Application Event Handler for managing redirect URLs tracking.
+    /// <para>when content is renamed or moved, we want to create a permanent 301 redirect from it's old URL</para>
     /// <para>
     ///     not managing domains because we don't know how to do it - changing domains => must create a higher level
     ///     strategy using rewriting rules probably
@@ -52,7 +52,12 @@ namespace Umbraco.Web.Routing
         }
 
         public void Terminate()
-        { }
+        {
+            ContentService.Publishing -= ContentService_Publishing;
+            ContentService.Published -= ContentService_Published;
+            ContentService.Moving -= ContentService_Moving;
+            ContentService.Moved -= ContentService_Moved;
+        }
 
         private void ContentService_Publishing(IContentService sender, PublishEventArgs<IContent> args)
         {
diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs b/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs
index bcafc8d050..a58c7c5679 100644
--- a/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs
+++ b/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs
@@ -4,10 +4,10 @@ using Umbraco.Core.Composing;
 namespace Umbraco.Web.Routing
 {
     /// <summary>
-    /// Implements an Application Event Handler for managing redirect urls tracking.
+    /// Implements an Application Event Handler for managing redirect URLs tracking.
     /// </summary>
     /// <remarks>
-    /// <para>when content is renamed or moved, we want to create a permanent 301 redirect from it's old url</para>
+    /// <para>when content is renamed or moved, we want to create a permanent 301 redirect from it's old URL</para>
     /// <para>not managing domains because we don't know how to do it - changing domains => must create a higher level strategy using rewriting rules probably</para>
     /// <para>recycle bin = moving to and from does nothing: to = the node is gone, where would we redirect? from = same</para>
     /// </remarks>
diff --git a/src/Umbraco.Web/Routing/UrlInfo.cs b/src/Umbraco.Web/Routing/UrlInfo.cs
index 8385ab54a9..59145d19ec 100644
--- a/src/Umbraco.Web/Routing/UrlInfo.cs
+++ b/src/Umbraco.Web/Routing/UrlInfo.cs
@@ -4,14 +4,14 @@ using System.Runtime.Serialization;
 namespace Umbraco.Web.Routing
 {
     /// <summary>
-    /// Represents infos for a url.
+    /// Represents infos for a URL.
     /// </summary>
     [DataContract(Name = "urlInfo", Namespace = "")]
     public class UrlInfo : IEquatable<UrlInfo>
     {
 
         /// <summary>
-        /// Creates a <see cref="UrlInfo"/> instance representing a true url.
+        /// Creates a <see cref="UrlInfo"/> instance representing a true URL.
         /// </summary>
         public static UrlInfo Url(string text, string culture = null) => new UrlInfo(text, true, culture);
 
@@ -38,14 +38,14 @@ namespace Umbraco.Web.Routing
         public string Culture { get; }
 
         /// <summary>
-        /// Gets a value indicating whether the url is a true url.
+        /// Gets a value indicating whether the URL is a true URL.
         /// </summary>
         /// <remarks>Otherwise, it is a message.</remarks>
         [DataMember(Name = "isUrl")]
         public bool IsUrl { get; }
 
         /// <summary>
-        /// Gets the text, which is either the url, or a message.
+        /// Gets the text, which is either the URL, or a message.
         /// </summary>
         [DataMember(Name = "text")]
         public string Text { get; }
diff --git a/src/Umbraco.Web/Routing/UrlProvider.cs b/src/Umbraco.Web/Routing/UrlProvider.cs
index d42639b781..5ab4e06c5e 100644
--- a/src/Umbraco.Web/Routing/UrlProvider.cs
+++ b/src/Umbraco.Web/Routing/UrlProvider.cs
@@ -9,19 +9,19 @@ using Umbraco.Web.Composing;
 namespace Umbraco.Web.Routing
 {
     /// <summary>
-    /// Provides urls.
+    /// Provides URLs.
     /// </summary>
     public class UrlProvider
     {
         #region Ctor and configuration
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="UrlProvider"/> class with an Umbraco context and a list of url providers.
+        /// Initializes a new instance of the <see cref="UrlProvider"/> class with an Umbraco context and a list of URL providers.
         /// </summary>
         /// <param name="umbracoContext">The Umbraco context.</param>
         /// <param name="routingSettings">Routing settings.</param>
-        /// <param name="urlProviders">The list of url providers.</param>
-        /// <param name="mediaUrlProviders">The list of media url providers.</param>
+        /// <param name="urlProviders">The list of URL providers.</param>
+        /// <param name="mediaUrlProviders">The list of media URL providers.</param>
         /// <param name="variationContextAccessor">The current variation accessor.</param>
         public UrlProvider(UmbracoContext umbracoContext, IWebRoutingSection routingSettings, IEnumerable<IUrlProvider> urlProviders, IEnumerable<IMediaUrlProvider> mediaUrlProviders, IVariationContextAccessor variationContextAccessor)
         {
@@ -41,11 +41,11 @@ namespace Umbraco.Web.Routing
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="UrlProvider"/> class with an Umbraco context and a list of url providers.
+        /// Initializes a new instance of the <see cref="UrlProvider"/> class with an Umbraco context and a list of URL providers.
         /// </summary>
         /// <param name="umbracoContext">The Umbraco context.</param>
-        /// <param name="urlProviders">The list of url providers.</param>
-        /// <param name="mediaUrlProviders">The list of media url providers</param>
+        /// <param name="urlProviders">The list of URL providers.</param>
+        /// <param name="mediaUrlProviders">The list of media URL providers</param>
         /// <param name="variationContextAccessor">The current variation accessor.</param>
         /// <param name="mode">An optional provider mode.</param>
         public UrlProvider(UmbracoContext umbracoContext, IEnumerable<IUrlProvider> urlProviders, IEnumerable<IMediaUrlProvider> mediaUrlProviders, IVariationContextAccessor variationContextAccessor, UrlMode mode = UrlMode.Auto)
@@ -64,7 +64,7 @@ namespace Umbraco.Web.Routing
         private readonly IVariationContextAccessor _variationContextAccessor;
 
         /// <summary>
-        /// Gets or sets the provider url mode.
+        /// Gets or sets the provider URL mode.
         /// </summary>
         public UrlMode Mode { get; set; }
 
@@ -78,40 +78,40 @@ namespace Umbraco.Web.Routing
         private IPublishedContent GetMedia(Guid id) => _umbracoContext.Media.GetById(id);
 
         /// <summary>
-        /// Gets the url of a published content.
+        /// Gets the URL of a published content.
         /// </summary>
         /// <param name="id">The published content identifier.</param>
-        /// <param name="mode">The url mode.</param>
+        /// <param name="mode">The URL mode.</param>
         /// <param name="culture">A culture.</param>
-        /// <param name="current">The current absolute url.</param>
-        /// <returns>The url for the published content.</returns>
+        /// <param name="current">The current absolute URL.</param>
+        /// <returns>The URL for the published content.</returns>
         public string GetUrl(Guid id, UrlMode mode = UrlMode.Default, string culture = null, Uri current = null)
             => GetUrl(GetDocument(id), mode, culture, current);
 
         /// <summary>
-        /// Gets the url of a published content.
+        /// Gets the URL of a published content.
         /// </summary>
         /// <param name="id">The published content identifier.</param>
-        /// <param name="mode">The url mode.</param>
+        /// <param name="mode">The URL mode.</param>
         /// <param name="culture">A culture.</param>
-        /// <param name="current">The current absolute url.</param>
-        /// <returns>The url for the published content.</returns>
+        /// <param name="current">The current absolute URL.</param>
+        /// <returns>The URL for the published content.</returns>
         public string GetUrl(int id, UrlMode mode = UrlMode.Default, string culture = null, Uri current = null)
             => GetUrl(GetDocument(id), mode, culture, current);
 
         /// <summary>
-        /// Gets the url of a published content.
+        /// Gets the URL of a published content.
         /// </summary>
         /// <param name="content">The published content.</param>
-        /// <param name="mode">The url mode.</param>
+        /// <param name="mode">The URL mode.</param>
         /// <param name="culture">A culture.</param>
-        /// <param name="current">The current absolute url.</param>
-        /// <returns>The url for the published content.</returns>
+        /// <param name="current">The current absolute URL.</param>
+        /// <returns>The URL for the published content.</returns>
         /// <remarks>
-        /// <para>The url is absolute or relative depending on <c>mode</c> and on <c>current</c>.</para>
-        /// <para>If the published content is multi-lingual, gets the url for the specified culture or,
+        /// <para>The URL is absolute or relative depending on <c>mode</c> and on <c>current</c>.</para>
+        /// <para>If the published content is multi-lingual, gets the URL for the specified culture or,
         /// when no culture is specified, the current culture.</para>
-        /// <para>If the provider is unable to provide a url, it returns "#".</para>
+        /// <para>If the provider is unable to provide a URL, it returns "#".</para>
         /// </remarks>
         public string GetUrl(IPublishedContent content, UrlMode mode = UrlMode.Default, string culture = null, Uri current = null)
         {
@@ -152,14 +152,14 @@ namespace Umbraco.Web.Routing
         #region GetOtherUrls
 
         /// <summary>
-        /// Gets the other urls of a published content.
+        /// Gets the other URLs of a published content.
         /// </summary>
         /// <param name="id">The published content id.</param>
-        /// <returns>The other urls for the published content.</returns>
+        /// <returns>The other URLs for the published content.</returns>
         /// <remarks>
-        /// <para>Other urls are those that <c>GetUrl</c> would not return in the current context, but would be valid
-        /// urls for the node in other contexts (different domain for current request, umbracoUrlAlias...).</para>
-        /// <para>The results depend on the current url.</para>
+        /// <para>Other URLs are those that <c>GetUrl</c> would not return in the current context, but would be valid
+        /// URLs for the node in other contexts (different domain for current request, umbracoUrlAlias...).</para>
+        /// <para>The results depend on the current URL.</para>
         /// </remarks>
         public IEnumerable<UrlInfo> GetOtherUrls(int id)
         {
@@ -167,14 +167,14 @@ namespace Umbraco.Web.Routing
         }
 
         /// <summary>
-        /// Gets the other urls of a published content.
+        /// Gets the other URLs of a published content.
         /// </summary>
         /// <param name="id">The published content id.</param>
-        /// <param name="current">The current absolute url.</param>
-        /// <returns>The other urls for the published content.</returns>
+        /// <param name="current">The current absolute URL.</param>
+        /// <returns>The other URLs for the published content.</returns>
         /// <remarks>
-        /// <para>Other urls are those that <c>GetUrl</c> would not return in the current context, but would be valid
-        /// urls for the node in other contexts (different domain for current request, umbracoUrlAlias...).</para>
+        /// <para>Other URLs are those that <c>GetUrl</c> would not return in the current context, but would be valid
+        /// URLs for the node in other contexts (different domain for current request, umbracoUrlAlias...).</para>
         /// </remarks>
         public IEnumerable<UrlInfo> GetOtherUrls(int id, Uri current)
         {
@@ -186,7 +186,7 @@ namespace Umbraco.Web.Routing
         #region GetMediaUrl
 
         /// <summary>
-        /// Gets the url of a media item.
+        /// Gets the URL of a media item.
         /// </summary>
         /// <param name="id"></param>
         /// <param name="mode"></param>
@@ -198,19 +198,19 @@ namespace Umbraco.Web.Routing
             => GetMediaUrl(GetMedia(id), mode, culture, propertyAlias, current);
 
         /// <summary>
-        /// Gets the url of a media item.
+        /// Gets the URL of a media item.
         /// </summary>
         /// <param name="content">The published content.</param>
-        /// <param name="propertyAlias">The property alias to resolve the url from.</param>
-        /// <param name="mode">The url mode.</param>
+        /// <param name="propertyAlias">The property alias to resolve the URL from.</param>
+        /// <param name="mode">The URL mode.</param>
         /// <param name="culture">The variation language.</param>
-        /// <param name="current">The current absolute url.</param>
-        /// <returns>The url for the media.</returns>
+        /// <param name="current">The current absolute URL.</param>
+        /// <returns>The URL for the media.</returns>
         /// <remarks>
-        /// <para>The url is absolute or relative depending on <c>mode</c> and on <c>current</c>.</para>
-        /// <para>If the media is multi-lingual, gets the url for the specified culture or,
+        /// <para>The URL is absolute or relative depending on <c>mode</c> and on <c>current</c>.</para>
+        /// <para>If the media is multi-lingual, gets the URL for the specified culture or,
         /// when no culture is specified, the current culture.</para>
-        /// <para>If the provider is unable to provide a url, it returns <see cref="String.Empty"/>.</para>
+        /// <para>If the provider is unable to provide a URL, it returns <see cref="String.Empty"/>.</para>
         /// </remarks>
         public string GetMediaUrl(IPublishedContent content, UrlMode mode = UrlMode.Default, string culture = null, string propertyAlias = Constants.Conventions.Media.File, Uri current = null)
         {
diff --git a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs
index 077680d2e2..3bd9d985a6 100644
--- a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs
+++ b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs
@@ -11,11 +11,11 @@ namespace Umbraco.Web.Routing
     internal static class UrlProviderExtensions
     {
         /// <summary>
-        /// Gets the Urls of the content item.
+        /// Gets the URLs of the content item.
         /// </summary>
         /// <remarks>
-        /// <para>Use when displaying Urls. If errors occur when generating the Urls, they will show in the list.</para>
-        /// <para>Contains all the Urls that we can figure out (based upon domains, etc).</para>
+        /// <para>Use when displaying URLs. If errors occur when generating the URLs, they will show in the list.</para>
+        /// <para>Contains all the URLs that we can figure out (based upon domains, etc).</para>
         /// </remarks>
         public static IEnumerable<UrlInfo> GetContentUrls(this IContent content,
             IPublishedRouter publishedRouter,
@@ -39,13 +39,13 @@ namespace Umbraco.Web.Routing
                 yield break;
             }
 
-            // build a list of urls, for the back-office
+            // build a list of URLs, for the back-office
             // which will contain
-            // - the 'main' urls, which is what .Url would return, for each culture
-            // - the 'other' urls we know (based upon domains, etc)
+            // - the 'main' URLs, which is what .Url would return, for each culture
+            // - the 'other' URLs we know (based upon domains, etc)
             //
             // need to work through each installed culture:
-            // on invariant nodes, each culture returns the same url segment but,
+            // on invariant nodes, each culture returns the same URL segment but,
             // we don't know if the branch to this content is invariant, so we need to ask
             // for URLs for all cultures.
             // and, not only for those assigned to domains in the branch, because we want
@@ -61,7 +61,7 @@ namespace Umbraco.Web.Routing
                 urls.Add(cultureUrl);
             }
 
-            //return the real urls first, then the messages
+            //return the real URLs first, then the messages
             foreach (var urlGroup in urls.GroupBy(x => x.IsUrl).OrderByDescending(x => x.Key))
             {
                 //in some cases there will be the same URL for multiple cultures:
@@ -72,8 +72,8 @@ namespace Umbraco.Web.Routing
                     yield return dUrl;
             }
 
-            // get the 'other' urls - ie not what you'd get with GetUrl() but urls that would route to the document, nevertheless.
-            // for these 'other' urls, we don't check whether they are routable, collide, anything - we just report them.
+            // get the 'other' URLs - ie not what you'd get with GetUrl() but URLs that would route to the document, nevertheless.
+            // for these 'other' URLs, we don't check whether they are routable, collide, anything - we just report them.
             foreach (var otherUrl in umbracoContext.UrlProvider.GetOtherUrls(content.Id).OrderBy(x => x.Text).ThenBy(x => x.Culture))
                 if (urls.Add(otherUrl)) //avoid duplicates
                     yield return otherUrl;
@@ -119,7 +119,7 @@ namespace Umbraco.Web.Routing
 
                 switch (url)
                 {
-                    // deal with 'could not get the url'
+                    // deal with 'could not get the URL'
                     case "#":
                         yield return HandleCouldNotGetUrl(content, culture, contentService, textService);
                         break;
@@ -129,7 +129,7 @@ namespace Umbraco.Web.Routing
                         yield return UrlInfo.Message(textService.Localize("content/getUrlException"), culture);
                         break;
 
-                    // got a url, deal with collisions, add url
+                    // got a URL, deal with collisions, add URL
                     default:
                         if (DetectCollision(content, url, culture, umbracoContext, publishedRouter, textService, out var urlInfo)) // detect collisions, etc
                             yield return urlInfo;
@@ -142,7 +142,7 @@ namespace Umbraco.Web.Routing
 
         private static UrlInfo HandleCouldNotGetUrl(IContent content, string culture, IContentService contentService, ILocalizedTextService textService)
         {
-            // document has a published version yet its url is "#" => a parent must be
+            // document has a published version yet its URL is "#" => a parent must be
             // unpublished, walk up the tree until we find it, and report.
             var parent = content;
             do
@@ -163,8 +163,8 @@ namespace Umbraco.Web.Routing
 
         private static bool DetectCollision(IContent content, string url, string culture, UmbracoContext umbracoContext, IPublishedRouter publishedRouter, ILocalizedTextService textService, out UrlInfo urlInfo)
         {
-            // test for collisions on the 'main' url
-            var uri = new Uri(url.TrimEnd('/'), UriKind.RelativeOrAbsolute);
+            // test for collisions on the 'main' URL
+            var uri = new Uri(url.TrimEnd(Constants.CharArrays.ForwardSlash), UriKind.RelativeOrAbsolute);
             if (uri.IsAbsoluteUri == false) uri = uri.MakeAbsolute(umbracoContext.CleanedUmbracoUrl);
             uri = UriUtility.UriToUmbraco(uri);
             var pcr = publishedRouter.CreateRequest(umbracoContext, uri);
diff --git a/src/Umbraco.Web/Runtime/WebInitialComponent.cs b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
index ac813d7196..ee4bb86273 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
@@ -129,7 +129,7 @@ namespace Umbraco.Web.Runtime
 
             if (ConfigurationManager.GetSection("system.web/httpRuntime") is HttpRuntimeSection section)
             {
-                //set the max url length for CDF to be the smallest of the max query length, max request length
+                //set the max URL length for CDF to be the smallest of the max query length, max request length
                 ClientDependency.Core.CompositeFiles.CompositeDependencyHandler.MaxHandlerUrlLength = Math.Min(section.MaxQueryStringLength, section.MaxRequestLength);
             }
 
@@ -208,7 +208,7 @@ namespace Umbraco.Web.Runtime
             var url = umbracoPath + (meta.IsBackOffice ? "/BackOffice" : "") + "/Api/" + meta.ControllerName + "/{action}/{id}";
             var route = RouteTable.Routes.MapHttpRoute(
                 $"umbraco-api-{meta.ControllerName}",
-                url, // url to match
+                url, // URL to match
                 new { controller = meta.ControllerName, id = UrlParameter.Optional },
                 new[] { meta.ControllerNamespace });
             if (route.DataTokens == null) // web api routes don't set the data tokens object
@@ -222,7 +222,7 @@ namespace Umbraco.Web.Runtime
             var url = umbracoPath + "/Surface/" + meta.ControllerName + "/{action}/{id}";
             var route = RouteTable.Routes.MapRoute(
                 $"umbraco-surface-{meta.ControllerName}",
-                url, // url to match
+                url, // URL to match
                 new { controller = meta.ControllerName, action = "Index", id = UrlParameter.Optional },
                 new[] { meta.ControllerNamespace }); // look in this namespace to create the controller
             route.DataTokens.Add(Core.Constants.Web.UmbracoDataToken, "surface"); // ensure the umbraco token is set
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 60521e6d90..ac7e34d5cb 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -110,6 +110,7 @@ namespace Umbraco.Web.Runtime
             composition.RegisterUnique<HtmlUrlParser>();
             composition.RegisterUnique<HtmlImageSourceParser>();
             composition.RegisterUnique<RichTextEditorPastedImages>();
+            composition.RegisterUnique<PropertyEditors.ValueConverters.BlockEditorConverter>();
 
             // register the umbraco helper - this is Transient! very important!
             // also, if not level.Run, we cannot really use the helper (during upgrade...)
@@ -136,8 +137,8 @@ namespace Umbraco.Web.Runtime
             composition.RegisterUnique<IEventMessagesAccessor, HybridEventMessagesAccessor>();
             composition.RegisterUnique<ITreeService, TreeService>();
             composition.RegisterUnique<ISectionService, SectionService>();
-
             composition.RegisterUnique<IDashboardService, DashboardService>();
+            composition.RegisterUnique<IIconService, IconService>();
 
             composition.RegisterUnique<IExamineManager>(factory => ExamineManager.Instance);
 
@@ -269,7 +270,6 @@ namespace Umbraco.Web.Runtime
             // note: IEmbedProvider is not IDiscoverable - think about it if going for type scanning
             composition.OEmbedProviders()
                 .Append<YouTube>()
-                .Append<Instagram>()
                 .Append<Twitter>()
                 .Append<Vimeo>()
                 .Append<DailyMotion>()
diff --git a/src/Umbraco.Web/Runtime/WebRuntime.cs b/src/Umbraco.Web/Runtime/WebRuntime.cs
index ffcd2343ed..e32f2f824f 100644
--- a/src/Umbraco.Web/Runtime/WebRuntime.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntime.cs
@@ -54,12 +54,16 @@ namespace Umbraco.Web.Runtime
 
             var factory = base.Boot(register);
 
-            // now (and only now) is the time to switch over to perWebRequest scopes.
-            // up until that point we may not have a request, and scoped services would
-            // fail to resolve - but we run Initialize within a factory scope - and then,
-            // here, we switch the factory to bind scopes to requests
-            factory.EnablePerWebRequestScope();
-
+            // factory can be null if part of the boot process fails
+            if (factory != null)
+            {
+                // now (and only now) is the time to switch over to perWebRequest scopes.
+                // up until that point we may not have a request, and scoped services would
+                // fail to resolve - but we run Initialize within a factory scope - and then,
+                // here, we switch the factory to bind scopes to requests
+                factory.EnablePerWebRequestScope();
+            }
+            
             return factory;
         }
 
diff --git a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
index c0475b1f79..81bb45e270 100644
--- a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
+++ b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
@@ -756,9 +756,17 @@ namespace Umbraco.Web.Scheduling
                 lock (_locker)
                 {
                     if (_runningTask != null)
-                        _runningTask.ContinueWith(_ => StopImmediate());
+                    {
+                        _runningTask.ContinueWith(
+                            _ => StopImmediate(),
+                            // Must explicitly specify this, see https://blog.stephencleary.com/2013/10/continuewith-is-dangerous-too.html
+                            TaskScheduler.Default);
+                    }   
                     else
+                    {
                         StopImmediate();
+                    }
+                        
                 }
             }
 
diff --git a/src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs b/src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
index 746bc61e34..9a4a4f0e2c 100644
--- a/src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
+++ b/src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
@@ -5,6 +5,7 @@ using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Scoping;
 using Umbraco.Core.Sync;
 using Umbraco.Web.HealthCheck;
 
@@ -15,16 +16,17 @@ namespace Umbraco.Web.Scheduling
         private readonly IRuntimeState _runtimeState;
         private readonly HealthCheckCollection _healthChecks;
         private readonly HealthCheckNotificationMethodCollection _notifications;
+        private readonly IScopeProvider _scopeProvider;
         private readonly IProfilingLogger _logger;
 
         public HealthCheckNotifier(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
             HealthCheckCollection healthChecks, HealthCheckNotificationMethodCollection notifications,
-            IRuntimeState runtimeState,
-            IProfilingLogger logger)
+            IScopeProvider scopeProvider, IRuntimeState runtimeState, IProfilingLogger logger)
             : base(runner, delayMilliseconds, periodMilliseconds)
         {
             _healthChecks = healthChecks;
             _notifications = notifications;
+            _scopeProvider = scopeProvider;
             _runtimeState = runtimeState;
             _logger = logger;
         }
@@ -51,6 +53,10 @@ namespace Umbraco.Web.Scheduling
                 return false; // do NOT repeat, going down
             }
 
+            // Ensure we use an explicit scope since we are running on a background thread and plugin health
+            // checks can be making service/database calls so we want to ensure the CallContext/Ambient scope
+            // isn't used since that can be problematic.
+            using (var scope = _scopeProvider.CreateScope())
             using (_logger.DebugDuration<HealthCheckNotifier>("Health checks executing", "Health checks complete"))
             {
                 var healthCheckConfig = Current.Configs.HealthChecks();
diff --git a/src/Umbraco.Web/Scheduling/KeepAlive.cs b/src/Umbraco.Web/Scheduling/KeepAlive.cs
index 9a22c59566..2dcf9a24a7 100644
--- a/src/Umbraco.Web/Scheduling/KeepAlive.cs
+++ b/src/Umbraco.Web/Scheduling/KeepAlive.cs
@@ -62,7 +62,7 @@ namespace Umbraco.Web.Scheduling
                             return true; // repeat
                         }
 
-                        keepAlivePingUrl = keepAlivePingUrl.Replace("{umbracoApplicationUrl}", umbracoAppUrl.TrimEnd('/'));
+                        keepAlivePingUrl = keepAlivePingUrl.Replace("{umbracoApplicationUrl}", umbracoAppUrl.TrimEnd(Constants.CharArrays.ForwardSlash));
                     }
 
                     var request = new HttpRequestMessage(HttpMethod.Get, keepAlivePingUrl);
diff --git a/src/Umbraco.Web/Scheduling/LogScrubber.cs b/src/Umbraco.Web/Scheduling/LogScrubber.cs
index db13a80f9b..ffdb584c7a 100644
--- a/src/Umbraco.Web/Scheduling/LogScrubber.cs
+++ b/src/Umbraco.Web/Scheduling/LogScrubber.cs
@@ -70,8 +70,7 @@ namespace Umbraco.Web.Scheduling
                 return false; // do NOT repeat, going down
             }
 
-            // running on a background task, and Log.CleanLogs uses the old SqlHelper,
-            // better wrap in a scope and ensure it's all cleaned up and nothing leaks
+            // Ensure we use an explicit scope since we are running on a background thread.
             using (var scope = _scopeProvider.CreateScope())
             using (_logger.DebugDuration<LogScrubber>("Log scrubbing executing", "Log scrubbing complete"))
             {
diff --git a/src/Umbraco.Web/Scheduling/RecurringTaskBase.cs b/src/Umbraco.Web/Scheduling/RecurringTaskBase.cs
index 58df54a07e..4544711946 100644
--- a/src/Umbraco.Web/Scheduling/RecurringTaskBase.cs
+++ b/src/Umbraco.Web/Scheduling/RecurringTaskBase.cs
@@ -15,9 +15,29 @@ namespace Umbraco.Web.Scheduling
     public abstract class RecurringTaskBase : LatchedBackgroundTaskBase
     {
         private readonly IBackgroundTaskRunner<RecurringTaskBase> _runner;
-        private readonly int _periodMilliseconds;
+        private readonly long _periodMilliseconds;
         private readonly Timer _timer;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RecurringTaskBase"/> class.
+        /// </summary>
+        /// <param name="runner">The task runner.</param>
+        /// <param name="delayMilliseconds">The delay.</param>
+        /// <param name="periodMilliseconds">The period.</param>
+        /// <remarks>The task will repeat itself periodically. Use this constructor to create a new task.</remarks>
+        protected RecurringTaskBase(IBackgroundTaskRunner<RecurringTaskBase> runner, long delayMilliseconds, long periodMilliseconds)
+        {
+            _runner = runner;
+            _periodMilliseconds = periodMilliseconds;
+
+            // note
+            // must use the single-parameter constructor on Timer to avoid it from being GC'd
+            // read http://stackoverflow.com/questions/4962172/why-does-a-system-timers-timer-survive-gc-but-not-system-threading-timer
+
+            _timer = new Timer(_ => Release());
+            _timer.Change(delayMilliseconds, 0);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="RecurringTaskBase"/> class.
         /// </summary>
diff --git a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
index 2e79e40d7a..97afe25e22 100644
--- a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
+++ b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
 
@@ -55,30 +56,24 @@ namespace Umbraco.Web.Scheduling
 
             try
             {
-                // ensure we run with an UmbracoContext, because this may run in a background task,
-                // yet developers may be using the 'current' UmbracoContext in the event handlers
-                //
-                // TODO: or maybe not, CacheRefresherComponent already ensures a context when handling events
-                // - UmbracoContext 'current' needs to be refactored and cleaned up
-                // - batched messenger should not depend on a current HttpContext
-                //    but then what should be its "scope"? could we attach it to scopes?
-                // - and we should definitively *not* have to flush it here (should be auto)
-                //
-                using (var contextReference = _umbracoContextFactory.EnsureUmbracoContext())
+                // We don't need an explicit scope here because PerformScheduledPublish creates it's own scope
+                // so it's safe as it will create it's own ambient scope.
+                // Ensure we run with an UmbracoContext, because this will run in a background task,
+                // and developers may be using the UmbracoContext in the event handlers.
+
+                using var contextReference = _umbracoContextFactory.EnsureUmbracoContext();
+                try
                 {
-                    try
-                    {
-                        // run
-                        var result = _contentService.PerformScheduledPublish(DateTime.Now);
-                        foreach (var grouped in result.GroupBy(x => x.Result))
-                            _logger.Info<ScheduledPublishing>("Scheduled publishing result: '{StatusCount}' items with status {Status}", grouped.Count(), grouped.Key);
-                    }
-                    finally
-                    {
-                        // if running on a temp context, we have to flush the messenger
-                        if (contextReference.IsRoot && Composing.Current.ServerMessenger is BatchedDatabaseServerMessenger m)
-                            m.FlushBatch();
-                    }
+                    // run
+                    var result = _contentService.PerformScheduledPublish(DateTime.Now);
+                    foreach (var grouped in result.GroupBy(x => x.Result))
+                        _logger.Info<ScheduledPublishing>("Scheduled publishing result: '{StatusCount}' items with status {Status}", grouped.Count(), grouped.Key);
+                }
+                finally
+                {
+                    // if running on a temp context, we have to flush the messenger
+                    if (contextReference.IsRoot && Composing.Current.ServerMessenger is BatchedDatabaseServerMessenger m)
+                        m.FlushBatch();
                 }
             }
             catch (Exception ex)
diff --git a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
index a08289186f..f353a9506e 100644
--- a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
+++ b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
@@ -16,7 +16,7 @@ using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.Scheduling
 {
-    internal sealed class SchedulerComponent : IComponent
+    public sealed class SchedulerComponent : IComponent
     {
         private const int DefaultDelayMilliseconds = 180000; // 3 mins
         private const int OneMinuteMilliseconds = 60000;
@@ -155,7 +155,7 @@ namespace Umbraco.Web.Scheduling
             }
 
             var periodInMilliseconds = healthCheckConfig.NotificationSettings.PeriodInHours * 60 * 60 * 1000;
-            var task = new HealthCheckNotifier(_healthCheckRunner, delayInMilliseconds, periodInMilliseconds, healthChecks, notifications, _runtime, logger);
+            var task = new HealthCheckNotifier(_healthCheckRunner, delayInMilliseconds, periodInMilliseconds, healthChecks, notifications, _scopeProvider, _runtime, logger);
             _healthCheckRunner.TryAdd(task);
             return task;
         }
@@ -177,7 +177,7 @@ namespace Umbraco.Web.Scheduling
                 new[] { new DirectoryInfo(IOHelper.MapPath(SystemDirectories.TempFileUploads)) },
                 TimeSpan.FromDays(1), //files that are over a day old
                 _runtime, _logger);
-            _scrubberRunner.TryAdd(task);
+            _fileCleanupRunner.TryAdd(task);
             return task;
         }
     }
diff --git a/src/Umbraco.Web/Scheduling/SchedulerComposer.cs b/src/Umbraco.Web/Scheduling/SchedulerComposer.cs
index 5c56f3d314..8e71004d0c 100644
--- a/src/Umbraco.Web/Scheduling/SchedulerComposer.cs
+++ b/src/Umbraco.Web/Scheduling/SchedulerComposer.cs
@@ -12,6 +12,6 @@ namespace Umbraco.Web.Scheduling
     /// the task correctly instead of killing it completely when the app domain shuts down.
     /// </remarks>
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
-    internal sealed class SchedulerComposer : ComponentComposer<SchedulerComponent>, ICoreComposer
+    public sealed class SchedulerComposer : ComponentComposer<SchedulerComponent>, ICoreComposer
     { }
 }
diff --git a/src/Umbraco.Web/Scheduling/SimpleTask.cs b/src/Umbraco.Web/Scheduling/SimpleTask.cs
new file mode 100644
index 0000000000..a8603915b0
--- /dev/null
+++ b/src/Umbraco.Web/Scheduling/SimpleTask.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Umbraco.Web.Scheduling
+{
+    /// <summary>
+    /// A simple task that executes a delegate synchronously
+    /// </summary>
+    internal class SimpleTask : IBackgroundTask
+    {
+        private readonly Action _action;
+
+        public SimpleTask(Action action)
+        {
+            _action = action;
+        }
+
+        public bool IsAsync => false;
+
+        public void Run() => _action();
+
+        public Task RunAsync(CancellationToken token)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Scheduling/TaskAndFactoryExtensions.cs b/src/Umbraco.Web/Scheduling/TaskAndFactoryExtensions.cs
index 7220e77e0c..557fe37709 100644
--- a/src/Umbraco.Web/Scheduling/TaskAndFactoryExtensions.cs
+++ b/src/Umbraco.Web/Scheduling/TaskAndFactoryExtensions.cs
@@ -8,6 +8,7 @@ namespace Umbraco.Web.Scheduling
     {
         #region Task Extensions
 
+        // TODO: Not used, is this used in Deploy or something?
         static void SetCompletionSource<TResult>(TaskCompletionSource<TResult> completionSource, Task task)
         {
             if (task.IsFaulted)
@@ -16,6 +17,7 @@ namespace Umbraco.Web.Scheduling
                 completionSource.SetResult(default(TResult));
         }
 
+        // TODO: Not used, is this used in Deploy or something?
         static void SetCompletionSource<TResult>(TaskCompletionSource<TResult> completionSource, Task<TResult> task)
         {
             if (task.IsFaulted)
@@ -24,17 +26,33 @@ namespace Umbraco.Web.Scheduling
                 completionSource.SetResult(task.Result);
         }
 
+        // TODO: Not used, is this used in Deploy or something?
         public static Task ContinueWithTask(this Task task, Func<Task, Task> continuation)
         {
             var completionSource = new TaskCompletionSource<object>();
-            task.ContinueWith(atask => continuation(atask).ContinueWith(atask2 => SetCompletionSource(completionSource, atask2)));
+            task.ContinueWith(atask => continuation(atask).ContinueWith(
+                    atask2 => SetCompletionSource(completionSource, atask2),
+                    // Must explicitly specify this, see https://blog.stephencleary.com/2013/10/continuewith-is-dangerous-too.html
+                    TaskScheduler.Default),
+                // Must explicitly specify this, see https://blog.stephencleary.com/2013/10/continuewith-is-dangerous-too.html
+                TaskScheduler.Default);
             return completionSource.Task;
         }
 
+        // TODO: Not used, is this used in Deploy or something?
         public static Task ContinueWithTask(this Task task, Func<Task, Task> continuation, CancellationToken token)
         {
             var completionSource = new TaskCompletionSource<object>();
-            task.ContinueWith(atask => continuation(atask).ContinueWith(atask2 => SetCompletionSource(completionSource, atask2), token), token);
+            task.ContinueWith(atask => continuation(atask).ContinueWith(
+                    atask2 => SetCompletionSource(completionSource, atask2),
+                    token,
+                    TaskContinuationOptions.None,
+                    // Must explicitly specify this, see https://blog.stephencleary.com/2013/10/continuewith-is-dangerous-too.html
+                    TaskScheduler.Default),
+                token,
+                TaskContinuationOptions.None,
+                // Must explicitly specify this, see https://blog.stephencleary.com/2013/10/continuewith-is-dangerous-too.html
+                TaskScheduler.Default);
             return completionSource.Task;
         }
 
diff --git a/src/Umbraco.Web/Scheduling/TempFileCleanup.cs b/src/Umbraco.Web/Scheduling/TempFileCleanup.cs
index 5d28bbfdb1..d2a254dfd6 100644
--- a/src/Umbraco.Web/Scheduling/TempFileCleanup.cs
+++ b/src/Umbraco.Web/Scheduling/TempFileCleanup.cs
@@ -51,6 +51,7 @@ namespace Umbraco.Web.Scheduling
             if (!dir.Exists)
             {
                 _logger.Debug<TempFileCleanup>("The cleanup folder doesn't exist {Folder}", dir.FullName);
+                return;
             }
 
             var files = dir.GetFiles("*.*", SearchOption.AllDirectories);
@@ -60,6 +61,7 @@ namespace Umbraco.Web.Scheduling
                 {
                     try
                     {
+                        file.IsReadOnly = false;
                         file.Delete();
                     }
                     catch (Exception ex)
diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index 149b4d1436..c9d7b7cf56 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -17,9 +17,13 @@ using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Examine.LuceneEngine.Directories;
 using Umbraco.Core.Composing;
 using System.ComponentModel;
+using System.Threading;
+using Umbraco.Web.Scheduling;
 
 namespace Umbraco.Web.Search
 {
+    
+
     public sealed class ExamineComponent : Umbraco.Core.Composing.IComponent
     {
         private readonly IExamineManager _examineManager;
@@ -34,7 +38,8 @@ namespace Umbraco.Web.Search
         private readonly IMainDom _mainDom;
         private readonly IProfilingLogger _logger;
         private readonly IUmbracoIndexesCreator _indexCreator;
-        
+        private readonly BackgroundTaskRunner<IBackgroundTask> _indexItemTaskRunner;
+
 
         // the default enlist priority is 100
         // enlist with a lower priority to ensure that anything "default" runs after us
@@ -62,6 +67,7 @@ namespace Umbraco.Web.Search
             _mainDom = mainDom;
             _logger = profilingLogger;
             _indexCreator = indexCreator;
+            _indexItemTaskRunner = new BackgroundTaskRunner<IBackgroundTask>(_logger);
         }
 
         public void Initialize()
@@ -117,7 +123,13 @@ namespace Umbraco.Web.Search
         }
 
         public void Terminate()
-        { }
+        {
+            ContentCacheRefresher.CacheUpdated -= ContentCacheRefresherUpdated;
+            ContentTypeCacheRefresher.CacheUpdated -= ContentTypeCacheRefresherUpdated;
+            MediaCacheRefresher.CacheUpdated -= MediaCacheRefresherUpdated;
+            MemberCacheRefresher.CacheUpdated -= MemberCacheRefresherUpdated;
+            LanguageCacheRefresher.CacheUpdated -= LanguageCacheRefresherUpdated;
+        }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
         [Obsolete("This method should not be used and will be removed in future versions, rebuilding indexes can be done with the IndexRebuilder or the BackgroundIndexRebuilder")]
@@ -257,6 +269,14 @@ namespace Umbraco.Web.Search
                         DeleteIndexForEntity(c4.Id, false);
                     }
                     break;
+                case MessageType.RefreshByPayload:
+                    var payload = (MemberCacheRefresher.JsonPayload[])args.MessageObject;
+                    var members = payload.Select(x => _services.MemberService.GetById(x.Id));
+                    foreach(var m in members)
+                    {
+                        ReIndexForMember(m);
+                    }
+                    break;
                 case MessageType.RefreshAll:
                 case MessageType.RefreshByJson:
                 default:
@@ -574,12 +594,18 @@ namespace Umbraco.Web.Search
             }
         }
 
+        /// <summary>
+        /// An action that will execute at the end of the Scope being completed
+        /// </summary>
         private abstract class DeferedAction
         {
             public virtual void Execute()
             { }
         }
 
+        /// <summary>
+        /// Re-indexes an <see cref="IContent"/> item on a background thread
+        /// </summary>
         private class DeferedReIndexForContent : DeferedAction
         {
             private readonly ExamineComponent _examineComponent;
@@ -600,21 +626,32 @@ namespace Umbraco.Web.Search
 
             public static void Execute(ExamineComponent examineComponent, IContent content, bool isPublished)
             {
-                foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
-                    //filter the indexers
-                    .Where(x => isPublished || !x.PublishedValuesOnly)
-                    .Where(x => x.EnableDefaultEventHandler))
+                // perform the ValueSet lookup on a background thread
+                examineComponent._indexItemTaskRunner.Add(new SimpleTask(() =>
                 {
-                    //for content we have a different builder for published vs unpublished
-                    var builder = index.PublishedValuesOnly
-                        ? examineComponent._publishedContentValueSetBuilder
-                        : (IValueSetBuilder<IContent>)examineComponent._contentValueSetBuilder;
+                    // for content we have a different builder for published vs unpublished
+                    // we don't want to build more value sets than is needed so we'll lazily build 2 one for published one for non-published
+                    var builders = new Dictionary<bool, Lazy<List<ValueSet>>>
+                    {
+                        [true] = new Lazy<List<ValueSet>>(() => examineComponent._publishedContentValueSetBuilder.GetValueSets(content).ToList()),
+                        [false] = new Lazy<List<ValueSet>>(() => examineComponent._contentValueSetBuilder.GetValueSets(content).ToList())
+                    };
 
-                    index.IndexItems(builder.GetValueSets(content));
-                }
+                    foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
+                        //filter the indexers
+                        .Where(x => isPublished || !x.PublishedValuesOnly)
+                        .Where(x => x.EnableDefaultEventHandler))
+                    {
+                        var valueSet = builders[index.PublishedValuesOnly].Value;
+                        index.IndexItems(valueSet);
+                    }
+                }));
             }
         }
 
+        /// <summary>
+        /// Re-indexes an <see cref="IMedia"/> item on a background thread
+        /// </summary>
         private class DeferedReIndexForMedia : DeferedAction
         {
             private readonly ExamineComponent _examineComponent;
@@ -635,18 +672,25 @@ namespace Umbraco.Web.Search
 
             public static void Execute(ExamineComponent examineComponent, IMedia media, bool isPublished)
             {
-                var valueSet = examineComponent._mediaValueSetBuilder.GetValueSets(media).ToList();
-
-                foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
-                    //filter the indexers
-                    .Where(x => isPublished || !x.PublishedValuesOnly)
-                    .Where(x => x.EnableDefaultEventHandler))
+                // perform the ValueSet lookup on a background thread
+                examineComponent._indexItemTaskRunner.Add(new SimpleTask(() =>
                 {
-                    index.IndexItems(valueSet);
-                }
+                    var valueSet = examineComponent._mediaValueSetBuilder.GetValueSets(media).ToList();
+
+                    foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
+                        //filter the indexers
+                        .Where(x => isPublished || !x.PublishedValuesOnly)
+                        .Where(x => x.EnableDefaultEventHandler))
+                    {
+                        index.IndexItems(valueSet);
+                    }
+                })); 
             }
         }
 
+        /// <summary>
+        /// Re-indexes an <see cref="IMember"/> item on a background thread
+        /// </summary>
         private class DeferedReIndexForMember : DeferedAction
         {
             private readonly ExamineComponent _examineComponent;
@@ -665,13 +709,17 @@ namespace Umbraco.Web.Search
 
             public static void Execute(ExamineComponent examineComponent, IMember member)
             {
-                var valueSet = examineComponent._memberValueSetBuilder.GetValueSets(member).ToList();
-                foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
-                    //filter the indexers
-                    .Where(x => x.EnableDefaultEventHandler))
+                // perform the ValueSet lookup on a background thread
+                examineComponent._indexItemTaskRunner.Add(new SimpleTask(() =>
                 {
-                    index.IndexItems(valueSet);
-                }
+                    var valueSet = examineComponent._memberValueSetBuilder.GetValueSets(member).ToList();
+                    foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
+                        //filter the indexers
+                        .Where(x => x.EnableDefaultEventHandler))
+                    {
+                        index.IndexItems(valueSet);
+                    }
+                }));
             }
         }
 
@@ -706,6 +754,6 @@ namespace Umbraco.Web.Search
         }
         #endregion
 
-        
+
     }
 }
diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index dcc156e356..410b654e32 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -186,6 +186,9 @@ namespace Umbraco.Web.Search
 
             var allLangs = _languageService.GetAllLanguages().Select(x => x.IsoCode.ToLowerInvariant()).ToList();
 
+            // the chars [*-_] in the query will mess everything up so let's remove those
+            query = Regex.Replace(query, "[\\*\\-_]", "");
+
             //check if text is surrounded by single or double quotes, if so, then exact match
             var surroundedByQuotes = Regex.IsMatch(query, "^\".*?\"$")
                                      || Regex.IsMatch(query, "^\'.*?\'$");
@@ -193,7 +196,7 @@ namespace Umbraco.Web.Search
             if (surroundedByQuotes)
             {
                 //strip quotes, escape string, the replace again
-                query = query.Trim('\"', '\'');
+                query = query.Trim(Constants.CharArrays.DoubleQuoteSingleQuote);
 
                 query = Lucene.Net.QueryParsers.QueryParser.Escape(query);
 
@@ -227,7 +230,7 @@ namespace Umbraco.Web.Search
             }
             else
             {
-                var trimmed = query.Trim(new[] { '\"', '\'' });
+                var trimmed = query.Trim(Constants.CharArrays.DoubleQuoteSingleQuote);
 
                 //nothing to search
                 if (searchFrom.IsNullOrWhiteSpace() && trimmed.IsNullOrWhiteSpace())
@@ -240,7 +243,7 @@ namespace Umbraco.Web.Search
                 {
                     query = Lucene.Net.QueryParsers.QueryParser.Escape(query);
 
-                    var querywords = query.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                    var querywords = query.Split(Constants.CharArrays.Space, StringSplitOptions.RemoveEmptyEntries);
 
                     sb.Append("+(");
 
diff --git a/src/Umbraco.Web/Security/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
index 0a3e57c4fd..8f33f10eea 100644
--- a/src/Umbraco.Web/Security/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
@@ -1,5 +1,8 @@
 using System;
 using System.Threading;
+using System.Web;
+using System.Web.Mvc;
+using System.Web.SessionState;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.Owin;
 using Microsoft.Owin;
@@ -266,7 +269,7 @@ namespace Umbraco.Web.Security
             {
                 //Then our custom middlewares
                 app.Use(typeof(ForceRenewalCookieAuthenticationMiddleware), app, options, Current.UmbracoContextAccessor);
-                app.Use(typeof(FixWindowsAuthMiddlware));
+                app.Use(typeof(FixWindowsAuthMiddlware));                
             }
 
             //Marks all of the above middlewares to execute on Authenticate
@@ -378,6 +381,19 @@ namespace Umbraco.Web.Security
             return app;
         }
 
+        /// <summary>
+        /// Enable the back office to detect and handle errors registered with external login providers
+        /// </summary>
+        /// <param name="app"></param>
+        /// <param name="stage"></param>
+        /// <returns></returns>
+        public static IAppBuilder UseUmbracoBackOfficeExternalLoginErrors(this IAppBuilder app, PipelineStage stage = PipelineStage.Authorize)
+        {            
+            app.Use(typeof(BackOfficeExternalLoginProviderErrorMiddlware));
+            app.UseStageMarker(stage);
+            return app;
+        }
+
         public static void SanitizeThreadCulture(this IAppBuilder app)
         {
             Thread.CurrentThread.SanitizeThreadCulture();
diff --git a/src/Umbraco.Web/Security/AuthenticationManagerExtensions.cs b/src/Umbraco.Web/Security/AuthenticationManagerExtensions.cs
index 5da9c77d6b..78ff55ba73 100644
--- a/src/Umbraco.Web/Security/AuthenticationManagerExtensions.cs
+++ b/src/Umbraco.Web/Security/AuthenticationManagerExtensions.cs
@@ -1,9 +1,14 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.Owin;
 using Microsoft.Owin.Security;
+using Umbraco.Core;
+using Constants = Umbraco.Core.Constants;
 
 namespace Umbraco.Web.Security
 {
@@ -36,6 +41,36 @@ namespace Umbraco.Web.Security
             };
         }
 
+        public static IEnumerable<AuthenticationDescription> GetBackOfficeExternalLoginProviders(this IAuthenticationManager manager)
+        {
+            return manager.GetExternalAuthenticationTypes().Where(p => p.Properties.ContainsKey(Constants.Security.BackOfficeAuthenticationType));
+        }
+
+        /// <summary>
+        /// Returns the authentication type for the last registered external login (oauth) provider that specifies an auto-login redirect option
+        /// </summary>
+        /// <param name="manager"></param>
+        /// <returns></returns>
+        public static string GetAutoLoginProvider(this IAuthenticationManager manager)
+        {
+            var found = manager.GetExternalAuthenticationTypes()
+                .LastOrDefault(p => p.Properties.ContainsKey(Constants.Security.BackOfficeAuthenticationType)
+                    && p.Properties.TryGetValue(Constants.Security.BackOfficeExternalLoginOptionsProperty, out var options)
+                    && options is BackOfficeExternalLoginProviderOptions externalLoginProviderOptions
+                    && externalLoginProviderOptions.AutoRedirectLoginToExternalProvider);
+
+            return found?.AuthenticationType;
+        }
+
+        public static bool HasDenyLocalLogin(this IAuthenticationManager manager)
+        {
+            return manager.GetExternalAuthenticationTypes()
+                .Any(p => p.Properties.ContainsKey(Constants.Security.BackOfficeAuthenticationType)
+                    && p.Properties.TryGetValue(Constants.Security.BackOfficeExternalLoginOptionsProperty, out var options)
+                    && options is BackOfficeExternalLoginProviderOptions externalLoginProviderOptions
+                    && externalLoginProviderOptions.DenyLocalLogin);
+        }
+
         /// <summary>
         ///     Extracts login info out of an external identity
         /// </summary>
diff --git a/src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs b/src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
index 568bfc1a26..18f43b07e3 100644
--- a/src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
+++ b/src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
@@ -9,53 +9,59 @@ namespace Umbraco.Web.Security
 {
     public static class AuthenticationOptionsExtensions
     {
+        // these are used for backwards compat
+        private const string ExternalSignInAutoLinkOptionsProperty = "ExternalSignInAutoLinkOptions";
+        private const string ChallengeResultCallbackProperty = "ChallengeResultCallback";
 
         /// <summary>
-        /// When trying to implement an Azure AD B2C provider or other OAuth provider that requires a customized Challenge Result in order to work then
-        /// this must be used.
+        /// Used to specify all back office external login options
         /// </summary>
         /// <param name="authOptions"></param>
-        /// <param name="authProperties"></param>
-        /// <remarks>
-        /// See: http://issues.umbraco.org/issue/U4-7353
-        /// </remarks>
+        /// <param name="externalLoginProviderOptions"></param>
+        public static void SetBackOfficeExternalLoginProviderOptions(this AuthenticationOptions authOptions,
+            BackOfficeExternalLoginProviderOptions externalLoginProviderOptions)
+        {
+            authOptions.Description.Properties[Constants.Security.BackOfficeExternalLoginOptionsProperty] = externalLoginProviderOptions;
+
+            // for backwards compat, we need to add these:
+            if (externalLoginProviderOptions.AutoLinkOptions != null)
+                authOptions.Description.Properties[ExternalSignInAutoLinkOptionsProperty] = externalLoginProviderOptions.AutoLinkOptions;
+            if (externalLoginProviderOptions.OnChallenge != null)
+                authOptions.Description.Properties[ChallengeResultCallbackProperty] = externalLoginProviderOptions.OnChallenge;
+        }
+
+        [Obsolete("Use SetBackOfficeExternalLoginProviderOptions instead")]
         public static void SetSignInChallengeResultCallback(
             this AuthenticationOptions authOptions,
             Func<IOwinContext, AuthenticationProperties> authProperties)
         {
-            authOptions.Description.Properties["ChallengeResultCallback"] = authProperties;
+            authOptions.Description.Properties[ChallengeResultCallbackProperty] = authProperties;
         }
 
         public static AuthenticationProperties GetSignInChallengeResult(this AuthenticationDescription authenticationDescription, IOwinContext ctx)
         {
-            if (authenticationDescription.Properties.ContainsKey("ChallengeResultCallback") == false) return null;
-            var cb = authenticationDescription.Properties["ChallengeResultCallback"] as Func<IOwinContext, AuthenticationProperties>;
+            if (authenticationDescription.Properties.ContainsKey(ChallengeResultCallbackProperty) == false) return null;
+            var cb = authenticationDescription.Properties[ChallengeResultCallbackProperty] as Func<IOwinContext, AuthenticationProperties>;
             if (cb == null) return null;
             return cb(ctx);
         }
 
-        /// <summary>
-        /// Used during the External authentication process to assign external sign-in options
-        /// that are used by the Umbraco authentication process.
-        /// </summary>
-        /// <param name="authOptions"></param>
-        /// <param name="options"></param>
+        [Obsolete("Use SetBackOfficeExternalLoginProviderOptions instead")]
         public static void SetExternalSignInAutoLinkOptions(
             this AuthenticationOptions authOptions,
             ExternalSignInAutoLinkOptions options)
         {
-            authOptions.Description.Properties["ExternalSignInAutoLinkOptions"] = options;
+            authOptions.Description.Properties[ExternalSignInAutoLinkOptionsProperty] = options;
         }
 
-        /// <summary>
-        /// Used during the External authentication process to retrieve external sign-in options
-        /// that have been set with SetExternalAuthenticationOptions
-        /// </summary>
-        /// <param name="authenticationDescription"></param>
+        [Obsolete("Use GetExternalSignInAutoLinkOptions instead")]
         public static ExternalSignInAutoLinkOptions GetExternalAuthenticationOptions(this AuthenticationDescription authenticationDescription)
+            => authenticationDescription.GetExternalSignInAutoLinkOptions();
+
+        public static ExternalSignInAutoLinkOptions GetExternalSignInAutoLinkOptions(this AuthenticationDescription authenticationDescription)
         {
-            if (authenticationDescription.Properties.ContainsKey("ExternalSignInAutoLinkOptions") == false) return null;
-            var options = authenticationDescription.Properties["ExternalSignInAutoLinkOptions"] as ExternalSignInAutoLinkOptions;
+            if (authenticationDescription.Properties.ContainsKey(ExternalSignInAutoLinkOptionsProperty) == false) return null;
+            var options = authenticationDescription.Properties[ExternalSignInAutoLinkOptionsProperty] as ExternalSignInAutoLinkOptions;
             return options;
         }
 
@@ -88,7 +94,7 @@ namespace Umbraco.Web.Security
             options.Description.Properties["SocialIcon"] = icon;
 
             //flag for use in back office
-            options.Description.Properties["UmbracoBackOffice"] = true;
+            options.Description.Properties[Constants.Security.BackOfficeAuthenticationType] = true;
 
             if (callbackPath.IsNullOrWhiteSpace())
             {
diff --git a/src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs b/src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs
index fbc24d2cd9..d61d2ea711 100644
--- a/src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs
+++ b/src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs
@@ -26,7 +26,13 @@ namespace Umbraco.Web.Security
         public override async Task<ClaimsIdentity> CreateAsync(UserManager<T, int> manager, T user, string authenticationType)
         {
             var baseIdentity = await base.CreateAsync(manager, user, authenticationType);
-            
+
+            // now we can flow any custom claims that the actual user has currently assigned which could be done in the OnExternalLogin callback
+            foreach (var claim in user.Claims)
+            {
+                baseIdentity.AddClaim(new Claim(claim.ClaimType, claim.ClaimValue));
+            }
+
             var umbracoIdentity = new UmbracoBackOfficeIdentity(baseIdentity,
                 user.Id,
                 user.UserName,
diff --git a/src/Umbraco.Web/Security/BackOfficeExternalLoginProviderErrorMiddlware.cs b/src/Umbraco.Web/Security/BackOfficeExternalLoginProviderErrorMiddlware.cs
new file mode 100644
index 0000000000..6e6477443b
--- /dev/null
+++ b/src/Umbraco.Web/Security/BackOfficeExternalLoginProviderErrorMiddlware.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.Mvc;
+using Microsoft.Owin;
+using Newtonsoft.Json;
+using Umbraco.Core;
+
+namespace Umbraco.Web.Security
+{
+    /// <summary>
+    /// Used to handle errors registered by external login providers
+    /// </summary>
+    /// <remarks>
+    /// When an external login provider registers an error with <see cref="OwinExtensions.SetExternalLoginProviderErrors"/> during the OAuth process,
+    /// this middleware will detect that, store the errors into cookie data and redirect to the back office login so we can read the errors back out.
+    /// </remarks>
+    internal class BackOfficeExternalLoginProviderErrorMiddlware : OwinMiddleware
+    {
+        public BackOfficeExternalLoginProviderErrorMiddlware(OwinMiddleware next) : base(next)
+        {
+        }
+
+        public override async Task Invoke(IOwinContext context)
+        {
+            var shortCircuit = false;
+            if (!context.Request.Uri.IsClientSideRequest())
+            {
+                // check if we have any errors registered
+                var errors = context.GetExternalLoginProviderErrors();
+                if (errors != null)
+                {
+                    shortCircuit = true;
+
+                    var serialized = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(errors)));
+
+                    context.Response.Cookies.Append(ViewDataExtensions.TokenExternalSignInError, serialized, new CookieOptions
+                    {
+                        Expires = DateTime.Now.AddMinutes(5),
+                        HttpOnly = true,
+                        Secure = context.Request.IsSecure
+                    });
+
+                    context.Response.Redirect(context.Request.Uri.ToString());
+                }
+            }
+
+            if (Next != null && !shortCircuit)
+            {
+                await Next.Invoke(context);
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Security/BackOfficeExternalLoginProviderErrors.cs b/src/Umbraco.Web/Security/BackOfficeExternalLoginProviderErrors.cs
new file mode 100644
index 0000000000..39b967fa96
--- /dev/null
+++ b/src/Umbraco.Web/Security/BackOfficeExternalLoginProviderErrors.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Umbraco.Web.Security
+{
+    public class BackOfficeExternalLoginProviderErrors
+    {
+        // required for deserialization
+        public BackOfficeExternalLoginProviderErrors()
+        {
+        }
+
+        public BackOfficeExternalLoginProviderErrors(string authenticationType, IEnumerable<string> errors)
+        {
+            AuthenticationType = authenticationType;
+            Errors = errors ?? Enumerable.Empty<string>();
+        }
+
+        public string AuthenticationType { get; set; }
+        public IEnumerable<string> Errors { get; set; }
+    }
+}
diff --git a/src/Umbraco.Web/Security/BackOfficeExternalLoginProviderOptions.cs b/src/Umbraco.Web/Security/BackOfficeExternalLoginProviderOptions.cs
new file mode 100644
index 0000000000..4ef527460e
--- /dev/null
+++ b/src/Umbraco.Web/Security/BackOfficeExternalLoginProviderOptions.cs
@@ -0,0 +1,53 @@
+using Microsoft.Owin;
+using Microsoft.Owin.Security;
+using System;
+using System.Collections;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Security
+{
+
+    /// <summary>
+    /// Options used to configure back office external login providers
+    /// </summary>
+    public class BackOfficeExternalLoginProviderOptions
+    {
+        /// <summary>
+        /// When specified this will be called to retrieve the <see cref="AuthenticationProperties"/> used during the authentication Challenge response.
+        /// </summary>
+        /// <remarks>
+        /// This will generally not be needed since OpenIdConnect.RedirectToIdentityProvider options should be used instead
+        /// </remarks>
+        [IgnoreDataMember]
+        public Func<IOwinContext, AuthenticationProperties> OnChallenge { get; set; }
+
+        /// <summary>
+        /// Options used to control how users can be auto-linked/created/updated based on the external login provider
+        /// </summary>
+        [IgnoreDataMember] // we are ignoring this one from serialization for backwards compat since these options are manually incuded in the response separately
+        public ExternalSignInAutoLinkOptions AutoLinkOptions { get; set; } = new ExternalSignInAutoLinkOptions();
+
+        /// <summary>
+        /// When set to true will disable all local user login functionality
+        /// </summary>
+        public bool DenyLocalLogin { get; set; }
+
+        /// <summary>
+        /// When specified this will automatically redirect to the OAuth login provider instead of prompting the user to click on the OAuth button first.
+        /// </summary>
+        /// <remarks>
+        /// This is generally used in conjunction with <see cref="DenyLocalLogin"/>. If more than one OAuth provider specifies this, the last registered
+        /// provider's redirect settings will win.
+        /// </remarks>
+        public bool AutoRedirectLoginToExternalProvider { get; set; }
+
+        /// <summary>
+        /// A virtual path to a custom angular view that is used to replace the entire UI that renders the external login button that the user interacts with
+        /// </summary>
+        /// <remarks>
+        /// If this view is specified it is 100% up to the user to render the html responsible for rendering the link/un-link buttons along with showing any errors
+        /// that occur. This overrides what Umbraco normally does by default.
+        /// </remarks>
+        public string CustomBackOfficeView { get; set; }
+    }
+}
diff --git a/src/Umbraco.Web/Security/BackOfficeUserManager.cs b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
index 6205c1705c..f91c128cde 100644
--- a/src/Umbraco.Web/Security/BackOfficeUserManager.cs
+++ b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
@@ -610,9 +610,11 @@ namespace Umbraco.Web.Security
             OnLoginSuccess(new IdentityAuditEventArgs(AuditEvent.LoginSucces, GetCurrentRequestIpAddress(), affectedUser: userId));
         }
 
-        internal void RaiseLogoutSuccessEvent(int userId)
+        internal SignOutAuditEventArgs RaiseLogoutSuccessEvent(int userId)
         {
-            OnLogoutSuccess(new IdentityAuditEventArgs(AuditEvent.LogoutSuccess, GetCurrentRequestIpAddress(), affectedUser: userId));
+            var args = new SignOutAuditEventArgs(AuditEvent.LogoutSuccess, GetCurrentRequestIpAddress(), affectedUser: userId);
+            OnLogoutSuccess(args);
+            return args;
         }
 
         internal void RaisePasswordChangedEvent(int userId)
@@ -631,6 +633,10 @@ namespace Umbraco.Web.Security
             OnResetAccessFailedCount(new IdentityAuditEventArgs(AuditEvent.ResetAccessFailedCount, GetCurrentRequestIpAddress(), affectedUser: userId));
         }
 
+        internal void RaiseSendingUserInvite(UserInviteEventArgs args) => OnSendingUserInvite(args);
+        internal bool HasSendingUserInviteEventHandler => SendingUserInvite != null;
+
+        // TODO: Not sure why these are not strongly typed events?? They should be in netcore!
         public static event EventHandler AccountLocked;
         public static event EventHandler AccountUnlocked;
         public static event EventHandler ForgotPasswordRequested;
@@ -643,60 +649,34 @@ namespace Umbraco.Web.Security
         public static event EventHandler PasswordReset;
         public static event EventHandler ResetAccessFailedCount;
 
-        protected virtual void OnAccountLocked(IdentityAuditEventArgs e)
-        {
-            if (AccountLocked != null) AccountLocked(this, e);
-        }
+        /// <summary>
+        /// Raised when a user is invited
+        /// </summary>
+        public static event EventHandler SendingUserInvite; // this event really has nothing to do with the user manager but was the most convenient place to put it
 
-        protected virtual void OnAccountUnlocked(IdentityAuditEventArgs e)
-        {
-            if (AccountUnlocked != null) AccountUnlocked(this, e);
-        }
+        protected virtual void OnSendingUserInvite(UserInviteEventArgs e) => SendingUserInvite?.Invoke(this, e);
 
-        protected virtual void OnForgotPasswordRequested(IdentityAuditEventArgs e)
-        {
-            if (ForgotPasswordRequested != null) ForgotPasswordRequested(this, e);
-        }
+        protected virtual void OnAccountLocked(IdentityAuditEventArgs e) => AccountLocked?.Invoke(this, e);
 
-        protected virtual void OnForgotPasswordChangedSuccess(IdentityAuditEventArgs e)
-        {
-            if (ForgotPasswordChangedSuccess != null) ForgotPasswordChangedSuccess(this, e);
-        }
+        protected virtual void OnAccountUnlocked(IdentityAuditEventArgs e) => AccountUnlocked?.Invoke(this, e);
 
-        protected virtual void OnLoginFailed(IdentityAuditEventArgs e)
-        {
-            if (LoginFailed != null) LoginFailed(this, e);
-        }
+        protected virtual void OnForgotPasswordRequested(IdentityAuditEventArgs e) => ForgotPasswordRequested?.Invoke(this, e);
 
-        protected virtual void OnLoginRequiresVerification(IdentityAuditEventArgs e)
-        {
-            if (LoginRequiresVerification != null) LoginRequiresVerification(this, e);
-        }
+        protected virtual void OnForgotPasswordChangedSuccess(IdentityAuditEventArgs e) => ForgotPasswordChangedSuccess?.Invoke(this, e);
 
-        protected virtual void OnLoginSuccess(IdentityAuditEventArgs e)
-        {
-            if (LoginSuccess != null) LoginSuccess(this, e);
-        }
+        protected virtual void OnLoginFailed(IdentityAuditEventArgs e) => LoginFailed?.Invoke(this, e);
 
-        protected virtual void OnLogoutSuccess(IdentityAuditEventArgs e)
-        {
-            if (LogoutSuccess != null) LogoutSuccess(this, e);
-        }
+        protected virtual void OnLoginRequiresVerification(IdentityAuditEventArgs e) => LoginRequiresVerification?.Invoke(this, e);
 
-        protected virtual void OnPasswordChanged(IdentityAuditEventArgs e)
-        {
-            if (PasswordChanged != null) PasswordChanged(this, e);
-        }
+        protected virtual void OnLoginSuccess(IdentityAuditEventArgs e) => LoginSuccess?.Invoke(this, e);
 
-        protected virtual void OnPasswordReset(IdentityAuditEventArgs e)
-        {
-            if (PasswordReset != null) PasswordReset(this, e);
-        }
+        protected virtual void OnLogoutSuccess(IdentityAuditEventArgs e) => LogoutSuccess?.Invoke(this, e);
 
-        protected virtual void OnResetAccessFailedCount(IdentityAuditEventArgs e)
-        {
-            if (ResetAccessFailedCount != null) ResetAccessFailedCount(this, e);
-        }
+        protected virtual void OnPasswordChanged(IdentityAuditEventArgs e) => PasswordChanged?.Invoke(this, e);
+
+        protected virtual void OnPasswordReset(IdentityAuditEventArgs e) => PasswordReset?.Invoke(this, e);
+
+        protected virtual void OnResetAccessFailedCount(IdentityAuditEventArgs e) => ResetAccessFailedCount?.Invoke(this, e);
 
         /// <summary>
         /// Returns the current request IP address for logging if there is one
diff --git a/src/Umbraco.Web/Security/ExternalSignInAutoLinkOptions.cs b/src/Umbraco.Web/Security/ExternalSignInAutoLinkOptions.cs
index 2a9c3a5f07..52f758aa74 100644
--- a/src/Umbraco.Web/Security/ExternalSignInAutoLinkOptions.cs
+++ b/src/Umbraco.Web/Security/ExternalSignInAutoLinkOptions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.Serialization;
 using Microsoft.AspNet.Identity.Owin;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
@@ -7,6 +8,7 @@ using Umbraco.Core.Models.Identity;
 
 namespace Umbraco.Web.Security
 {
+
     /// <summary>
     /// Options used to configure auto-linking external OAuth providers
     /// </summary>
@@ -30,15 +32,23 @@ namespace Umbraco.Web.Security
 
         private readonly string[] _defaultUserGroups;
 
+        /// <summary>
+        /// By default this is true which allows the user to manually link and unlink the external provider, if set to false the back office user
+        /// will not see and cannot perform manual linking or unlinking of the external provider.
+        /// </summary>
+        public bool AllowManualLinking { get; set; } = true;
+
         /// <summary>
         /// A callback executed during account auto-linking and before the user is persisted
         /// </summary>
+        [IgnoreDataMember]
         public Action<BackOfficeIdentityUser, ExternalLoginInfo> OnAutoLinking { get; set; }
 
         /// <summary>
         /// A callback executed during every time a user authenticates using an external login.
         /// returns a boolean indicating if sign in should continue or not.
         /// </summary>
+        [IgnoreDataMember]
         public Func<BackOfficeIdentityUser, ExternalLoginInfo, bool> OnExternalLogin { get; set; }
 
 
@@ -48,7 +58,7 @@ namespace Umbraco.Web.Security
         /// <param name="umbracoContext"></param>
         /// <param name="loginInfo"></param>
         /// <returns></returns>
-        public string[] GetDefaultUserGroups(UmbracoContext umbracoContext, ExternalLoginInfo loginInfo)
+        public virtual string[] GetDefaultUserGroups(UmbracoContext umbracoContext, ExternalLoginInfo loginInfo)
         {
             return _defaultUserGroups;
         }
@@ -61,7 +71,7 @@ namespace Umbraco.Web.Security
         ///
         /// For public auth providers this should always be false!!!
         /// </summary>
-        public bool ShouldAutoLinkExternalAccount(UmbracoContext umbracoContext, ExternalLoginInfo loginInfo)
+        public virtual bool ShouldAutoLinkExternalAccount(UmbracoContext umbracoContext, ExternalLoginInfo loginInfo)
         {
             return _autoLinkExternalAccount;
         }
@@ -71,7 +81,7 @@ namespace Umbraco.Web.Security
         /// <summary>
         /// The default Culture to use for auto-linking users
         /// </summary>
-        public string GetDefaultCulture(UmbracoContext umbracoContext, ExternalLoginInfo loginInfo)
+        public virtual string GetDefaultCulture(UmbracoContext umbracoContext, ExternalLoginInfo loginInfo)
         {
             return _defaultCulture;
         }
diff --git a/src/Umbraco.Web/Security/FixWindowsAuthMiddlware.cs b/src/Umbraco.Web/Security/FixWindowsAuthMiddlware.cs
index 30038e1f31..3338344e73 100644
--- a/src/Umbraco.Web/Security/FixWindowsAuthMiddlware.cs
+++ b/src/Umbraco.Web/Security/FixWindowsAuthMiddlware.cs
@@ -8,6 +8,7 @@ using Umbraco.Core.Security;
 
 namespace Umbraco.Web.Security
 {
+
     /// <summary>
     /// This is used to inspect the request to see if 2 x identities are assigned: A windows one and a back office one.
     /// When this is the case, it means that auth has executed for Windows & auth has executed for our back office cookie
diff --git a/src/Umbraco.Web/Security/IdentityAuditEventArgs.cs b/src/Umbraco.Web/Security/IdentityAuditEventArgs.cs
index 81407afe50..23e570dd40 100644
--- a/src/Umbraco.Web/Security/IdentityAuditEventArgs.cs
+++ b/src/Umbraco.Web/Security/IdentityAuditEventArgs.cs
@@ -4,6 +4,7 @@ using Umbraco.Core.Security;
 
 namespace Umbraco.Web.Security
 {
+
     /// <summary>
     /// This class is used by events raised from the BackofficeUserManager
     /// </summary>
@@ -126,6 +127,7 @@ namespace Umbraco.Web.Security
         LogoutSuccess,
         PasswordChanged,
         PasswordReset,
-        ResetAccessFailedCount
+        ResetAccessFailedCount,
+        SendingUserInvite
     }
 }
diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index f74897d565..e655b87767 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -77,6 +77,17 @@ namespace Umbraco.Web.Security
             return _publicAccessService.IsProtected(path);
         }
 
+        public virtual IDictionary<string, bool> IsProtected(IEnumerable<string> paths)
+        {
+            var result = new Dictionary<string, bool>();
+            foreach (var path in paths)
+            {
+                //this is a cached call
+                result[path] = _publicAccessService.IsProtected(path);
+            }
+            return result;
+        }
+
         /// <summary>
         /// Check if the current user has access to a document
         /// </summary>
@@ -84,15 +95,33 @@ namespace Umbraco.Web.Security
         /// <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 _appCaches.RequestCache.GetCacheItem<bool>($"{typeof(MembershipHelper)}.MemberHasAccess-{path}", () =>
+            if (IsProtected(path))
             {
-                if (IsProtected(path))
-                {
-                    return IsLoggedIn() && HasAccess(path, Roles.Provider);
-                }
-                return true;
-            });
+                return IsLoggedIn() && HasAccess(path, Roles.Provider);
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Checks if the current user has access to the paths
+        /// </summary>
+        /// <param name="paths"></param>
+        /// <returns></returns>
+        public virtual IDictionary<string, bool> MemberHasAccess(IEnumerable<string> paths)
+        {
+            var protectedPaths = IsProtected(paths);
+
+            var pathsWithProtection = protectedPaths.Where(x => x.Value).Select(x => x.Key);
+            var pathsWithAccess = HasAccess(pathsWithProtection, Roles.Provider);
+
+            var result = new Dictionary<string, bool>();
+            foreach(var path in paths)
+            {
+                pathsWithAccess.TryGetValue(path, out var hasAccess);
+                // if it's not found it's false anyways
+                result[path] = !pathsWithProtection.Contains(path) || hasAccess;
+            }
+            return result;
         }
 
         /// <summary>
@@ -106,6 +135,25 @@ namespace Umbraco.Web.Security
             return _publicAccessService.HasAccess(path, CurrentUserName, roleProvider.GetRolesForUser);
         }
 
+        private IDictionary<string, bool> HasAccess(IEnumerable<string> paths, RoleProvider roleProvider)
+        {
+            // ensure we only lookup user roles once
+            string[] userRoles = null;
+            string[] getUserRoles(string username)
+            {
+                if (userRoles != null) return userRoles;
+                userRoles = roleProvider.GetRolesForUser(username).ToArray();
+                return userRoles;
+            }
+
+            var result = new Dictionary<string, bool>();
+            foreach (var path in paths)
+            {
+                result[path] = IsLoggedIn() && _publicAccessService.HasAccess(path, CurrentUserName, getUserRoles);
+            }
+            return result;
+        }
+
         /// <summary>
         /// Returns true if the current membership provider is the Umbraco built-in one.
         /// </summary>
@@ -261,8 +309,9 @@ namespace Umbraco.Web.Security
             {
                 return false;
             }
-            //Set member online
-            var member = provider.GetUser(username, true);
+            // Get the member, do not set to online - this is done implicitly as part of ValidateUser which is consistent with
+            // how the .NET framework SqlMembershipProvider works. Passing in true will just cause more unnecessary SQL queries/locks.
+            var member = provider.GetUser(username, false);
             if (member == null)
             {
                 //this should not happen
@@ -778,33 +827,17 @@ namespace Umbraco.Web.Security
         /// <returns></returns>
         private IMember GetCurrentPersistedMember()
         {
-            return _appCaches.RequestCache.GetCacheItem<IMember>(
-                GetCacheKey("GetCurrentPersistedMember"), () =>
-                {
-                    var provider = _membershipProvider;
+            var provider = _membershipProvider;
 
-                    if (provider.IsUmbracoMembershipProvider() == false)
-                    {
-                        throw new NotSupportedException("An IMember model can only be retrieved when using the built-in Umbraco membership providers");
-                    }
-                    var username = provider.GetCurrentUserName();
-                    var member = _memberService.GetByUsername(username);
-                    return member;
-                });
-        }
-
-        private static string GetCacheKey(string key, params object[] additional)
-        {
-            var sb = new StringBuilder();
-            sb.Append(typeof (MembershipHelper).Name);
-            sb.Append("-");
-            sb.Append(key);
-            foreach (var s in additional)
+            if (provider.IsUmbracoMembershipProvider() == false)
             {
-                sb.Append("-");
-                sb.Append(s);
+                throw new NotSupportedException("An IMember model can only be retrieved when using the built-in Umbraco membership providers");
             }
-            return sb.ToString();
+            var username = provider.GetCurrentUserName();
+
+            // The result of this is cached by the MemberRepository
+            var member = _memberService.GetByUsername(username);
+            return member;
         }
 
     }
diff --git a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
index 1f7e2c8084..bf9ee654c4 100644
--- a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
@@ -348,15 +348,16 @@ namespace Umbraco.Web.Security.Providers
 
             if (userIsOnline)
             {
-                member.LastLoginDate = DateTime.Now;
-                member.UpdateDate = DateTime.Now;
-                //don't raise events for this! It just sets the member dates, if we do raise events this will
-                // cause all distributed cache to execute - which will clear out some caches we don't want.
-                // http://issues.umbraco.org/issue/U4-3451
-
                 // when upgrading from 7.2 to 7.3 trying to save will throw
                 if (UmbracoVersion.Current >= new Version(7, 3, 0, 0))
-                    MemberService.Save(member, false);
+                {
+                    var now = DateTime.Now;
+                    // update the database data directly instead of a full member save which requires DB locks
+                    MemberService.SetLastLogin(username, now);
+                    member.LastLoginDate = now;
+                    member.UpdateDate = now;
+                }
+                    
             }
 
             return ConvertToMembershipUser(member);
@@ -555,6 +556,8 @@ namespace Umbraco.Web.Security.Providers
 
             var authenticated = CheckPassword(password, member.RawPasswordValue);
 
+            var requiresFullSave = false;
+
             if (authenticated == false)
             {
                 // TODO: Increment login attempts - lock if too many.
@@ -574,6 +577,8 @@ namespace Umbraco.Web.Security.Providers
                 {
                     Current.Logger.Info<UmbracoMembershipProviderBase>("Login attempt failed for username {Username} from IP address {IpAddress}", username, GetCurrentRequestIpAddress());
                 }
+
+                requiresFullSave = true;
             }
             else
             {
@@ -581,6 +586,7 @@ namespace Umbraco.Web.Security.Providers
                 {
                     //we have successfully logged in, reset the AccessFailedCount
                     member.FailedPasswordAttempts = 0;
+                    requiresFullSave = true;
                 }
 
                 member.LastLoginDate = DateTime.Now;
@@ -588,15 +594,23 @@ namespace Umbraco.Web.Security.Providers
                 Current.Logger.Info<UmbracoMembershipProviderBase>("Login attempt succeeded for username {Username} from IP address {IpAddress}", username, GetCurrentRequestIpAddress());
             }
 
-            //don't raise events for this! It just sets the member dates, if we do raise events this will
+            // don't raise events for this! It just sets the member dates, if we do raise events this will
             // cause all distributed cache to execute - which will clear out some caches we don't want.
             // http://issues.umbraco.org/issue/U4-3451
             // TODO: In v8 we aren't going to have an overload to disable events, so we'll need to make a different method
             // for this type of thing (i.e. UpdateLastLogin or similar).
 
-            // when upgrading from 7.2 to 7.3 trying to save will throw
-            if (UmbracoVersion.Current >= new Version(7, 3, 0, 0))
-                MemberService.Save(member, false);
+            if (requiresFullSave)
+            {
+                // when upgrading from 7.2 to 7.3 trying to save will throw
+                if (UmbracoVersion.Current >= new Version(7, 3, 0, 0))
+                    MemberService.Save(member, false);
+            }
+            else
+            {
+                // set the last login date without full save (fast, no locks)
+                MemberService.SetLastLogin(member.Username, member.LastLoginDate);
+            }
 
             return new ValidateUserResult
             {
diff --git a/src/Umbraco.Web/Security/SignOutAuditEventArgs.cs b/src/Umbraco.Web/Security/SignOutAuditEventArgs.cs
new file mode 100644
index 0000000000..e7943f70b6
--- /dev/null
+++ b/src/Umbraco.Web/Security/SignOutAuditEventArgs.cs
@@ -0,0 +1,19 @@
+namespace Umbraco.Web.Security
+{
+    /// <summary>
+    /// Event args used when signing out
+    /// </summary>
+    public class SignOutAuditEventArgs : IdentityAuditEventArgs
+    {
+        public SignOutAuditEventArgs(AuditEvent action, string ipAddress, string comment = null, int performingUser = -1, int affectedUser = -1)
+            : base(action, ipAddress, comment, performingUser, affectedUser)
+        {
+        }
+
+        /// <summary>
+        /// Allows event handlers to set a GET absolute URL to be redirected to after successful logout out of the back office. This
+        /// can be used for external login providers.
+        /// </summary>
+        public string SignOutRedirectUrl { get; set; }
+    }
+}
diff --git a/src/Umbraco.Web/Security/UserInviteEventArgs.cs b/src/Umbraco.Web/Security/UserInviteEventArgs.cs
new file mode 100644
index 0000000000..9fb53a44c0
--- /dev/null
+++ b/src/Umbraco.Web/Security/UserInviteEventArgs.cs
@@ -0,0 +1,36 @@
+using Umbraco.Core.Models.Membership;
+using Umbraco.Web.Models.ContentEditing;
+
+namespace Umbraco.Web.Security
+{
+    public class UserInviteEventArgs : IdentityAuditEventArgs
+    {
+        public UserInviteEventArgs(string ipAddress, int performingUser, UserInvite invitedUser, IUser localUser, string comment = null)
+            : base(AuditEvent.SendingUserInvite, ipAddress, comment, performingUser)
+        {
+            InvitedUser = invitedUser ?? throw new System.ArgumentNullException(nameof(invitedUser));
+            User = localUser;
+        }
+
+        /// <summary>
+        /// The model used to invite the user
+        /// </summary>
+        public UserInvite InvitedUser { get; }
+
+        /// <summary>
+        /// If event handler sets this to true it indicates that Umbraco will no try to send the invite itself
+        /// </summary>
+        public bool InviteHandled { get; set; }
+
+        /// <summary>
+        /// The local user that has been created that is pending the invite
+        /// </summary>        
+        public IUser User { get; }
+
+        /// <summary>
+        /// if set to true will show the edit user button in the UI, else it will not be shown
+        /// </summary>
+        public bool ShowUserResult { get; set; }
+
+    }
+}
diff --git a/src/Umbraco.Web/Services/DashboardService.cs b/src/Umbraco.Web/Services/DashboardService.cs
index 794c6fa671..19944a9cb1 100644
--- a/src/Umbraco.Web/Services/DashboardService.cs
+++ b/src/Umbraco.Web/Services/DashboardService.cs
@@ -86,7 +86,7 @@ namespace Umbraco.Web.Services
                 if (grantBySectionRules.Length > 0)
                 {
                     var allowedSections = sectionService.GetAllowedSections(user.Id).Select(x => x.Alias).ToArray();
-                    var wantedSections = grantBySectionRules.SelectMany(g => g.Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)).ToArray();
+                    var wantedSections = grantBySectionRules.SelectMany(g => g.Value.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries)).ToArray();
 
                     if (wantedSections.Intersect(allowedSections).Any())
                         hasAccess = true;
@@ -97,7 +97,7 @@ namespace Umbraco.Web.Services
                 if (hasAccess == false && grantRules.Any())
                 {
                     assignedUserGroups = user.Groups.Select(x => x.Alias).ToArray();
-                    var wantedUserGroups = grantRules.SelectMany(g => g.Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)).ToArray();
+                    var wantedUserGroups = grantRules.SelectMany(g => g.Value.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries)).ToArray();
 
                     if (wantedUserGroups.Intersect(assignedUserGroups).Any())
                         hasAccess = true;
@@ -111,7 +111,7 @@ namespace Umbraco.Web.Services
             // check if this item has any deny arguments, if so check if the user is in one of the denied user groups, if so they will
             // be denied to see it no matter what
             assignedUserGroups = assignedUserGroups ?? user.Groups.Select(x => x.Alias).ToArray();
-            var deniedUserGroups = denyRules.SelectMany(g => g.Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)).ToArray();
+            var deniedUserGroups = denyRules.SelectMany(g => g.Value.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries)).ToArray();
 
             if (deniedUserGroups.Intersect(assignedUserGroups).Any())
                 hasAccess = false;
diff --git a/src/Umbraco.Web/Services/IconService.cs b/src/Umbraco.Web/Services/IconService.cs
new file mode 100644
index 0000000000..206af296f9
--- /dev/null
+++ b/src/Umbraco.Web/Services/IconService.cs
@@ -0,0 +1,95 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Ganss.XSS;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Web.Services
+{
+    public class IconService : IIconService
+    {
+        private readonly IGlobalSettings _globalSettings;
+
+        public IconService(IGlobalSettings globalSettings)
+        {
+            _globalSettings = globalSettings;
+        }
+
+
+        /// <inheritdoc />
+        public IList<IconModel> GetAllIcons()
+        {
+            var icons = new List<IconModel>();
+            var directory = new DirectoryInfo(IOHelper.MapPath($"{_globalSettings.IconsPath}/"));
+            var iconNames = directory.GetFiles("*.svg");
+
+            iconNames.OrderBy(f => f.Name).ToList().ForEach(iconInfo =>
+            {
+                var icon = GetIcon(iconInfo);
+
+                if (icon != null)
+                {
+                    icons.Add(icon);
+                }
+            });
+
+            return icons;
+        }
+
+        /// <inheritdoc />
+        public IconModel GetIcon(string iconName)
+        {
+            return string.IsNullOrWhiteSpace(iconName)
+                ? null
+                : CreateIconModel(iconName.StripFileExtension(), IOHelper.MapPath($"{_globalSettings.IconsPath}/{iconName}.svg"));
+        }
+
+        /// <summary>
+        /// Gets an IconModel using values from a FileInfo model
+        /// </summary>
+        /// <param name="fileInfo"></param>
+        /// <returns></returns>
+        private IconModel GetIcon(FileInfo fileInfo)
+        {
+            return fileInfo == null || string.IsNullOrWhiteSpace(fileInfo.Name)
+                ? null
+                : CreateIconModel(fileInfo.Name.StripFileExtension(), fileInfo.FullName);
+        }
+
+        /// <summary>
+        /// Gets an IconModel containing the icon name and SvgString
+        /// </summary>
+        /// <param name="iconName"></param>
+        /// <param name="iconPath"></param>
+        /// <returns></returns>
+        private IconModel CreateIconModel(string iconName, string iconPath)
+        {
+            var sanitizer = new HtmlSanitizer();
+            sanitizer.AllowedAttributes.UnionWith(Constants.SvgSanitizer.Attributes);
+            sanitizer.AllowedCssProperties.UnionWith(Constants.SvgSanitizer.Attributes);
+            sanitizer.AllowedTags.UnionWith(Constants.SvgSanitizer.Tags);
+
+            try
+            {
+                var svgContent = System.IO.File.ReadAllText(iconPath);
+                var sanitizedString = sanitizer.Sanitize(svgContent);
+
+                var svg = new IconModel
+                {
+                    Name = iconName,
+                    SvgString = sanitizedString
+                };
+
+                return svg;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Telemetry/ReportSiteTask.cs b/src/Umbraco.Web/Telemetry/ReportSiteTask.cs
new file mode 100644
index 0000000000..24ac7cbf3a
--- /dev/null
+++ b/src/Umbraco.Web/Telemetry/ReportSiteTask.cs
@@ -0,0 +1,100 @@
+using Newtonsoft.Json;
+using System;
+using System.Net.Http;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Logging;
+using Umbraco.Web.Scheduling;
+
+namespace Umbraco.Web.Telemetry
+{
+    public class ReportSiteTask : RecurringTaskBase
+    {
+        private readonly IProfilingLogger _logger;
+        private static HttpClient _httpClient;
+        private readonly IUmbracoSettingsSection _settings;
+
+        public ReportSiteTask(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayBeforeWeStart, int howOftenWeRepeat, IProfilingLogger logger, IUmbracoSettingsSection settings)
+            : base(runner, delayBeforeWeStart, howOftenWeRepeat)
+        {
+            _logger = logger;
+            _httpClient = new HttpClient();
+            _settings = settings;
+        }
+
+        /// <summary>
+        /// Runs the background task to send the anonymous ID
+        /// to telemetry service
+        /// </summary>
+        /// <returns>A value indicating whether to repeat the task.</returns>
+        public override async Task<bool> PerformRunAsync(CancellationToken token)
+        {
+            // Try & get a value stored in umbracoSettings.config on the backoffice XML element ID attribute
+            var backofficeIdentifierRaw = _settings.BackOffice.Id;
+
+            // Parse as a GUID & verify its a GUID and not some random string
+            // In case of users may have messed or decided to empty the file contents or put in something random
+            if (Guid.TryParse(backofficeIdentifierRaw, out var telemetrySiteIdentifier) == false)
+            {
+                // Some users may have decided to mess with the XML attribute and put in something else
+                // Stop repeating this task (no need to keep checking)
+                // The only time it will recheck when the site is recycled
+                return false;
+            }
+
+            try
+            {
+                // Send data to LIVE telemetry
+                _httpClient.BaseAddress = new Uri("https://telemetry.umbraco.com/");
+
+#if DEBUG
+                // Send data to DEBUG telemetry service
+                _httpClient.BaseAddress = new Uri("https://telemetry.rainbowsrock.net/");
+#endif
+
+                _httpClient.DefaultRequestHeaders.TryAddWithoutValidation("Content-Type", "application/json");
+
+                using (var request = new HttpRequestMessage(HttpMethod.Post, "installs/"))
+                {
+                    var postData = new TelemetryReportData { Id = telemetrySiteIdentifier, Version = UmbracoVersion.SemanticVersion.ToSemanticString() };
+                    request.Content = new StringContent(JsonConvert.SerializeObject(postData), Encoding.UTF8, "application/json"); //CONTENT-TYPE header
+
+                    // Set a low timeout - no need to use a larger default timeout for this POST request
+                    _httpClient.Timeout = new TimeSpan(0, 0, 1);
+
+                    // Make a HTTP Post to telemetry service
+                    // https://telemetry.umbraco.com/installs/
+                    // Fire & Forget, do not need to know if its a 200, 500 etc
+                    var result = await _httpClient.SendAsync(request, token);
+                }
+            }
+            catch
+            {
+                // Silently swallow
+                // The user does not need the logs being polluted if our service has fallen over or is down etc
+                // Hence only logging this at a more verbose level (which users should not be using in production)
+                _logger.Debug<ReportSiteTask>("There was a problem sending a request to the Umbraco telemetry service");
+            }
+
+            // Keep recurring this task & pinging the telemetry service
+            return true;
+        }
+
+        public override bool IsAsync => true;
+
+        [DataContract]
+        private class TelemetryReportData
+        {
+            [DataMember(Name = "id")]
+            public Guid Id { get; set; }
+
+            [DataMember(Name = "version")]
+            public string Version { get; set; }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Telemetry/TelemetryComponent.cs b/src/Umbraco.Web/Telemetry/TelemetryComponent.cs
new file mode 100644
index 0000000000..1ae9ad9764
--- /dev/null
+++ b/src/Umbraco.Web/Telemetry/TelemetryComponent.cs
@@ -0,0 +1,37 @@
+using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Logging;
+using Umbraco.Web.Scheduling;
+
+namespace Umbraco.Web.Telemetry
+{
+    public class TelemetryComponent : IComponent
+    {
+        private readonly IProfilingLogger _logger;
+        private readonly IUmbracoSettingsSection _settings;
+        private BackgroundTaskRunner<IBackgroundTask> _telemetryReporterRunner;
+
+        public TelemetryComponent(IProfilingLogger logger, IUmbracoSettingsSection settings)
+        {
+            _logger = logger;
+            _settings = settings;
+        }
+
+        public void Initialize()
+        {
+            // backgrounds runners are web aware, if the app domain dies, these tasks will wind down correctly
+            _telemetryReporterRunner = new BackgroundTaskRunner<IBackgroundTask>("TelemetryReporter", _logger);
+
+            const int delayBeforeWeStart = 60 * 1000; // 60 * 1000ms = 1min (60,000)
+            const int howOftenWeRepeat = 60 * 1000 * 60 * 24; // 60 * 1000 * 60 * 24 = 24hrs (86400000)
+
+            // As soon as we add our task to the runner it will start to run (after its delay period)
+            var task = new ReportSiteTask(_telemetryReporterRunner, delayBeforeWeStart, howOftenWeRepeat, _logger, _settings);
+            _telemetryReporterRunner.TryAdd(task);
+        }
+
+        public void Terminate()
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Telemetry/TelemetryComposer.cs b/src/Umbraco.Web/Telemetry/TelemetryComposer.cs
new file mode 100644
index 0000000000..933b302e1c
--- /dev/null
+++ b/src/Umbraco.Web/Telemetry/TelemetryComposer.cs
@@ -0,0 +1,10 @@
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Web.Telemetry
+{
+
+    [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
+    public class TelemetryComposer : ComponentComposer<TelemetryComponent>, ICoreComposer
+    { }
+}
diff --git a/src/Umbraco.Web/Templates/HtmlImageSourceParser.cs b/src/Umbraco.Web/Templates/HtmlImageSourceParser.cs
index 539ce303fd..4fa77be77f 100644
--- a/src/Umbraco.Web/Templates/HtmlImageSourceParser.cs
+++ b/src/Umbraco.Web/Templates/HtmlImageSourceParser.cs
@@ -82,7 +82,7 @@ namespace Umbraco.Web.Templates
         }
 
         /// <summary>
-        /// Removes media urls from &lt;img&gt; tags where a data-udi attribute is present
+        /// Removes media URLs from &lt;img&gt; tags where a data-udi attribute is present
         /// </summary>
         /// <param name="text"></param>
         /// <returns></returns>
diff --git a/src/Umbraco.Web/Templates/HtmlLocalLinkParser.cs b/src/Umbraco.Web/Templates/HtmlLocalLinkParser.cs
index f65a7183b7..391614e68e 100644
--- a/src/Umbraco.Web/Templates/HtmlLocalLinkParser.cs
+++ b/src/Umbraco.Web/Templates/HtmlLocalLinkParser.cs
@@ -47,7 +47,7 @@ namespace Umbraco.Web.Templates
             if (!preview)
                 return EnsureInternalLinks(text);
 
-            using (_umbracoContextAccessor.UmbracoContext.ForcedPreview(preview)) // force for url provider
+            using (_umbracoContextAccessor.UmbracoContext.ForcedPreview(preview)) // force for URL provider
             {
                 return EnsureInternalLinks(text);
             }
diff --git a/src/Umbraco.Web/Templates/HtmlUrlParser.cs b/src/Umbraco.Web/Templates/HtmlUrlParser.cs
index 5b78477579..0692b75fa7 100644
--- a/src/Umbraco.Web/Templates/HtmlUrlParser.cs
+++ b/src/Umbraco.Web/Templates/HtmlUrlParser.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Web.Templates
 
             using (var timer = _logger.DebugDuration(typeof(IOHelper), "ResolveUrlsFromTextString starting", "ResolveUrlsFromTextString complete"))
             {
-                // find all relative urls (ie. urls that contain ~)
+                // find all relative URLs (ie. URLs that contain ~)
                 var tags = ResolveUrlPattern.Matches(text);
                 _logger.Debug(typeof(IOHelper), "After regex: {Duration} matched: {TagsCount}", timer.Stopwatch.ElapsedMilliseconds, tags.Count);
                 foreach (Match tag in tags)
@@ -43,7 +43,7 @@ namespace Umbraco.Web.Templates
                     if (tag.Groups[1].Success)
                         url = tag.Groups[1].Value;
 
-                    // The richtext editor inserts a slash in front of the url. That's why we need this little fix
+                    // The richtext editor inserts a slash in front of the URL. That's why we need this little fix
                     //                if (url.StartsWith("/"))
                     //                    text = text.Replace(url, ResolveUrl(url.Substring(1)));
                     //                else
diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs
index 4602942be1..127dc6033a 100644
--- a/src/Umbraco.Web/Templates/TemplateRenderer.cs
+++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs
@@ -45,7 +45,7 @@ namespace Umbraco.Web.Templates
             if (writer == null) throw new ArgumentNullException(nameof(writer));
 
             // instantiate a request and process
-            // important to use CleanedUmbracoUrl - lowercase path-only version of the current url, though this isn't going to matter
+            // important to use CleanedUmbracoUrl - lowercase path-only version of the current URL, though this isn't going to matter
             // terribly much for this implementation since we are just creating a doc content request to modify it's properties manually.
             var contentRequest = _publishedRouter.CreateRequest(_umbracoContextAccessor.UmbracoContext);
 
diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs
index f08abfaf12..105d3e0812 100644
--- a/src/Umbraco.Web/Templates/TemplateUtilities.cs
+++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Web.Templates
         [Obsolete("Inject and use an instance of " + nameof(HtmlLocalLinkParser) + " instead")]
         internal static string ParseInternalLinks(string text, bool preview, UmbracoContext umbracoContext)
         {
-            using (umbracoContext.ForcedPreview(preview)) // force for url provider
+            using (umbracoContext.ForcedPreview(preview)) // force for URL provider
             {
                 text = ParseInternalLinks(text, umbracoContext.UrlProvider);
             }
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
index f0a860496e..ad9e3ca172 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
@@ -205,7 +205,7 @@ namespace Umbraco.Web.Trees
         {
             if (tree == null) throw new ArgumentNullException(nameof(tree));
 
-            var controller = (TreeController) await GetApiControllerProxy(tree.TreeControllerType, "GetRootNode", querystring);
+            var controller = (TreeControllerBase) await GetApiControllerProxy(tree.TreeControllerType, "GetRootNode", querystring);
             var rootNode = controller.GetRootNode(querystring);
             if (rootNode == null)
                 throw new InvalidOperationException($"Failed to get root node for tree \"{tree.TreeAlias}\".");
@@ -226,7 +226,7 @@ namespace Umbraco.Web.Trees
             d["id"] = null;
             var proxyQuerystring = new FormDataCollection(d);
 
-            var controller = (TreeController) await GetApiControllerProxy(tree.TreeControllerType, "GetNodes", proxyQuerystring);
+            var controller = (TreeControllerBase) await GetApiControllerProxy(tree.TreeControllerType, "GetNodes", proxyQuerystring);
             return controller.GetNodes(id.ToInvariantString(), querystring);
         }
 
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index 663af43643..ead265e7c5 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -135,7 +135,7 @@ namespace Umbraco.Web.Trees
 
                 //these two are the standard items
                 menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
-                menu.Items.Add<ActionSort>(Services.TextService, true);
+                menu.Items.Add<ActionSort>(Services.TextService, true, opensDialog: true);
 
                 //filter the standard items
                 FilterUserAllowedMenuItems(menu, nodeActions);
@@ -175,7 +175,7 @@ namespace Umbraco.Web.Trees
             var nodeMenu = GetAllNodeMenuItems(item);            
             
             //if the content node is in the recycle bin, don't have a default menu, just show the regular menu
-            if (item.Path.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Contains(RecycleBinId.ToInvariantString()))
+            if (item.Path.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).Contains(RecycleBinId.ToInvariantString()))
             {
                 nodeMenu.DefaultMenuAlias = null;
                 nodeMenu = GetNodeMenuItemsForDeletedContent(item);
@@ -235,7 +235,7 @@ namespace Umbraco.Web.Trees
             AddActionNode<ActionCreateBlueprintFromContent>(item, menu, opensDialog: true);
             AddActionNode<ActionMove>(item, menu, true, opensDialog: true);
             AddActionNode<ActionCopy>(item, menu, opensDialog: true);
-            AddActionNode<ActionSort>(item, menu, true);
+            AddActionNode<ActionSort>(item, menu, true, opensDialog: true);
             AddActionNode<ActionAssignDomain>(item, menu, opensDialog: true);
             AddActionNode<ActionRights>(item, menu, opensDialog: true);
             AddActionNode<ActionProtect>(item, menu, true, opensDialog: true);
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index 95de72b7bf..e9c34608a2 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -369,7 +369,7 @@ namespace Umbraco.Web.Trees
 
                 if (startNodes.Any(x =>
                 {
-                    var pathParts = x.Path.Split(',');
+                    var pathParts = x.Path.Split(Constants.CharArrays.Comma);
                     return pathParts.Contains(e.Id.ToInvariantString());
                 }))
                 {
diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
index 6a7fb7f5ad..8dd41e19bf 100644
--- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
@@ -46,7 +46,7 @@ namespace Umbraco.Web.Trees
                    .OrderBy(entity => entity.Name)
                    .Select(dt =>
                    {
-                       var node = CreateTreeNode(dt, Constants.ObjectTypes.DataType, id, queryStrings, "icon-folder", dt.HasChildren);
+                       var node = CreateTreeNode(dt, Constants.ObjectTypes.DataType, id, queryStrings, Constants.Icons.Folder, dt.HasChildren);
                        node.Path = dt.Path;
                        node.NodeType = "container";
                        // TODO: This isn't the best way to ensure a no operation process for clicking a node but it works for now.
diff --git a/src/Umbraco.Web/Trees/DictionaryTreeController.cs b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
index 3f7b89bcdf..6540eb4a63 100644
--- a/src/Umbraco.Web/Trees/DictionaryTreeController.cs
+++ b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
@@ -67,12 +67,12 @@ namespace Umbraco.Web.Trees
                             id,
                             queryStrings,
                             x.ItemKey,
-                            "icon-book-alt",
+                            Constants.Icons.Dictionary,
                             Services.LocalizationService.GetDictionaryItemChildren(x.Key).Any())));
             }
             else
             {
-                // maybe we should use the guid as url param to avoid the extra call for getting dictionary item
+                // maybe we should use the guid as URL param to avoid the extra call for getting dictionary item
                 var parentDictionary = Services.LocalizationService.GetDictionaryItemById(intId.Result);
                 if (parentDictionary == null)
                     return nodes;
@@ -83,7 +83,7 @@ namespace Umbraco.Web.Trees
                         id,
                         queryStrings,
                         x.ItemKey,
-                        "icon-book-alt",
+                        Constants.Icons.Dictionary,
                         Services.LocalizationService.GetDictionaryItemChildren(x.Key).Any())));
             }
 
diff --git a/src/Umbraco.Web/Trees/FileSystemTreeController.cs b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
index 6e21c8114f..cad59619df 100644
--- a/src/Umbraco.Web/Trees/FileSystemTreeController.cs
+++ b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
@@ -62,7 +62,7 @@ namespace Umbraco.Web.Trees
                 if (Extensions.Contains("*"))
                     return true;
                 
-                return extension != null && Extensions.Contains(extension.Trim('.'), StringComparer.InvariantCultureIgnoreCase);
+                return extension != null && Extensions.Contains(extension.Trim(Constants.CharArrays.Period), StringComparer.InvariantCultureIgnoreCase);
             });
 
             foreach (var file in files)
diff --git a/src/Umbraco.Web/Trees/LanguageTreeController.cs b/src/Umbraco.Web/Trees/LanguageTreeController.cs
index ac2c0571e0..863f94a9f5 100644
--- a/src/Umbraco.Web/Trees/LanguageTreeController.cs
+++ b/src/Umbraco.Web/Trees/LanguageTreeController.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Web.Trees
 
             //this will load in a custom UI instead of the dashboard for the root node
             root.RoutePath = $"{Constants.Applications.Settings}/{Constants.Trees.Languages}/overview";
-            root.Icon = "icon-globe";
+            root.Icon = Constants.Icons.Language;
             root.HasChildren = false;
             root.MenuUrl = null;
 
diff --git a/src/Umbraco.Web/Trees/LogViewerTreeController.cs b/src/Umbraco.Web/Trees/LogViewerTreeController.cs
index 7452828d00..964852d4bd 100644
--- a/src/Umbraco.Web/Trees/LogViewerTreeController.cs
+++ b/src/Umbraco.Web/Trees/LogViewerTreeController.cs
@@ -33,8 +33,8 @@ namespace Umbraco.Web.Trees
             var root = base.CreateRootNode(queryStrings);
 
             //this will load in a custom UI instead of the dashboard for the root node
-            root.RoutePath = string.Format("{0}/{1}/{2}", Constants.Applications.Settings, Constants.Trees.LogViewer, "overview");
-            root.Icon = "icon-box-alt";
+            root.RoutePath = $"{Constants.Applications.Settings}/{Constants.Trees.LogViewer}/overview";
+            root.Icon = Constants.Icons.LogViewer;
             root.HasChildren = false;
             root.MenuUrl = null;
 
diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs
index df44a809c9..cc71b92d15 100644
--- a/src/Umbraco.Web/Trees/MediaTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTreeController.cs
@@ -101,7 +101,7 @@ namespace Umbraco.Web.Trees
 
                 // root actions
                 menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
-                menu.Items.Add<ActionSort>(Services.TextService, true);
+                menu.Items.Add<ActionSort>(Services.TextService, true, opensDialog: true);
                 menu.Items.Add(new RefreshNode(Services.TextService, true));
                 return menu;
             }
@@ -125,7 +125,7 @@ namespace Umbraco.Web.Trees
 
 
             //if the media item is in the recycle bin, we don't have a default menu and we need to show a limited menu
-            if (item.Path.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).Contains(RecycleBinId.ToInvariantString()))
+            if (item.Path.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).Contains(RecycleBinId.ToInvariantString()))
             {
                 menu.Items.Add<ActionRestore>(Services.TextService, opensDialog: true);
                 menu.Items.Add<ActionMove>(Services.TextService, opensDialog: true);
@@ -141,7 +141,7 @@ namespace Umbraco.Web.Trees
                 menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
                 menu.Items.Add<ActionMove>(Services.TextService, opensDialog: true);
                 menu.Items.Add<ActionDelete>(Services.TextService, opensDialog: true);
-                menu.Items.Add<ActionSort>(Services.TextService);
+                menu.Items.Add<ActionSort>(Services.TextService, opensDialog: true);
                 menu.Items.Add(new RefreshNode(Services.TextService, true));
 
                 //set the default to create
diff --git a/src/Umbraco.Web/Trees/PackagesTreeController.cs b/src/Umbraco.Web/Trees/PackagesTreeController.cs
index 9b1bf98823..b6921771b6 100644
--- a/src/Umbraco.Web/Trees/PackagesTreeController.cs
+++ b/src/Umbraco.Web/Trees/PackagesTreeController.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Web.Trees
 
             //this will load in a custom UI instead of the dashboard for the root node
             root.RoutePath = $"{Constants.Applications.Packages}/{Constants.Trees.Packages}/repo";
-            root.Icon = "icon-box";
+            root.Icon = Constants.Icons.Packages;
 
             root.HasChildren = false;
             return root;
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
index 77e5ebef62..f618d053ac 100644
--- a/src/Umbraco.Web/Trees/TreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -250,7 +250,7 @@ namespace Umbraco.Web.Trees
         }
 
         /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url + UDI
+        /// Helper method to create tree nodes and automatically generate the json URL + UDI
         /// </summary>
         /// <param name="entity"></param>
         /// <param name="entityObjectType"></param>
@@ -270,7 +270,7 @@ namespace Umbraco.Web.Trees
         }
 
         /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url + UDI
+        /// Helper method to create tree nodes and automatically generate the json URL + UDI
         /// </summary>
         /// <param name="entity"></param>
         /// <param name="entityObjectType"></param>
@@ -289,7 +289,7 @@ namespace Umbraco.Web.Trees
         }
 
         /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url
+        /// Helper method to create tree nodes and automatically generate the json URL
         /// </summary>
         /// <param name="id"></param>
         /// <param name="parentId"></param>
@@ -306,7 +306,7 @@ namespace Umbraco.Web.Trees
         }
 
         /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url
+        /// Helper method to create tree nodes and automatically generate the json URL
         /// </summary>
         /// <param name="id"></param>
         /// <param name="parentId"></param>
@@ -325,7 +325,7 @@ namespace Umbraco.Web.Trees
         }
 
         /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url + UDI
+        /// Helper method to create tree nodes and automatically generate the json URL + UDI
         /// </summary>
         /// <param name="id"></param>
         /// <param name="parentId"></param>
diff --git a/src/Umbraco.Web/Trees/UrlHelperExtensions.cs b/src/Umbraco.Web/Trees/UrlHelperExtensions.cs
index 3221023ca2..864d43583c 100644
--- a/src/Umbraco.Web/Trees/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/Trees/UrlHelperExtensions.cs
@@ -49,7 +49,7 @@ namespace Umbraco.Web.Trees
             var sb = new StringBuilder("-1");
 
             //split the virtual path and iterate through it
-            var pathPaths = virtualPath.Split('/');
+            var pathPaths = virtualPath.Split(Constants.CharArrays.ForwardSlash);
 
             for (var p = 0; p < pathPaths.Length; p++)
             {
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
old mode 100755
new mode 100644
index 088fb0eeb3..2613a5d286
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -65,9 +65,15 @@
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="Examine" Version="1.0.2" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
+    <PackageReference Include="HtmlSanitizer">
+      <Version>4.0.217</Version>
+    </PackageReference>
     <PackageReference Include="ImageProcessor">
       <Version>2.7.0.100</Version>
     </PackageReference>
+    <PackageReference Include="K4os.Compression.LZ4">
+      <Version>1.1.11</Version>
+    </PackageReference>
     <PackageReference Include="LightInject" Version="5.4.0" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
     <PackageReference Include="LightInject.Mvc" Version="2.0.0" />
@@ -124,6 +130,7 @@
     <Compile Include="AppBuilderExtensions.cs" />
     <Compile Include="AreaRegistrationContextExtensions.cs" />
     <Compile Include="AspNetHttpContextAccessor.cs" />
+    <Compile Include="BlockListTemplateExtensions.cs" />
     <Compile Include="Cache\DistributedCacheBinder.cs" />
     <Compile Include="Cache\DistributedCacheBinderComposer.cs" />
     <Compile Include="Cache\DistributedCacheBinder_Handlers.cs" />
@@ -132,6 +139,8 @@
     <Compile Include="Cache\UserGroupCacheRefresher.cs" />
     <Compile Include="Cache\UserGroupPermissionsCacheRefresher.cs" />
     <Compile Include="Compose\BackOfficeUserAuditEventsComposer.cs" />
+    <Compile Include="Compose\BlockEditorComponent.cs" />
+    <Compile Include="Compose\BlockEditorComposer.cs" />
     <Compile Include="Compose\NestedContentPropertyComponent.cs" />
     <Compile Include="Compose\NotificationsComposer.cs" />
     <Compile Include="Compose\PublicAccessComposer.cs" />
@@ -156,8 +165,12 @@
     <Compile Include="Dashboards\RedirectUrlDashboard.cs" />
     <Compile Include="Dashboards\SettingsDashboards.cs" />
     <Compile Include="Editors\BackOfficePreviewModel.cs" />
+    <Compile Include="Editors\ChallengeResult.cs" />
+    <Compile Include="Editors\ElementTypeController.cs" />
     <Compile Include="Editors\Filters\ContentSaveModelValidator.cs" />
+    <Compile Include="Editors\Filters\DenyLocalLoginAuthorizationAttribute.cs" />
     <Compile Include="Editors\Filters\MediaSaveModelValidator.cs" />
+    <Compile Include="Editors\IconController.cs" />
     <Compile Include="Editors\ImageUrlGeneratorController.cs" />
     <Compile Include="Editors\PackageController.cs" />
     <Compile Include="Editors\KeepAliveController.cs" />
@@ -166,6 +179,7 @@
     <Compile Include="Editors\TinyMceController.cs" />
     <Compile Include="HealthCheck\Checks\Data\DatabaseIntegrityCheck.cs" />
     <Compile Include="ImageCropperTemplateCoreExtensions.cs" />
+    <Compile Include="Install\InstallSteps\TelemetryIdentifierStep.cs" />
     <Compile Include="IUmbracoContextFactory.cs" />
     <Compile Include="Install\ChangesMonitor.cs" />
     <Compile Include="Logging\WebProfiler.cs" />
@@ -189,7 +203,6 @@
     <Compile Include="Media\EmbedProviders\Twitter.cs" />
     <Compile Include="Media\EmbedProviders\Kickstarter.cs" />
     <Compile Include="Media\EmbedProviders\OEmbedResponse.cs" />
-    <Compile Include="Media\EmbedProviders\Instagram.cs" />
     <Compile Include="Media\EmbedProviders\Slideshare.cs" />
     <Compile Include="Media\Exif\BitConverterEx.cs" />
     <Compile Include="Media\Exif\ExifBitConverter.cs" />
@@ -245,12 +258,31 @@
     <Compile Include="Mvc\SurfaceControllerTypeCollectionBuilder.cs" />
     <Compile Include="Mvc\ValidateUmbracoFormRouteStringAttribute.cs" />
     <Compile Include="Profiling\WebProfilingController.cs" />
+    <Compile Include="PropertyEditors\BlockEditorPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\BlockListConfiguration.cs" />
+    <Compile Include="PropertyEditors\BlockListConfigurationEditor.cs" />
+    <Compile Include="PropertyEditors\BlockListPropertyEditor.cs" />
     <Compile Include="Compose\NestedContentPropertyComposer.cs" />
+    <Compile Include="PropertyEditors\ComplexEditorValidator.cs" />
     <Compile Include="PropertyEditors\ParameterEditors\MultipleMediaPickerParameterEditor.cs" />
     <Compile Include="PropertyEditors\RichTextEditorPastedImages.cs" />
-    <Compile Include="PublishedCache\NuCache\DataSource\IContentNestedDataSerializer.cs" />
+    <Compile Include="PublishedCache\NuCache\DataSource\ContentCacheDataSerializationResult.cs" />
+    <Compile Include="PublishedCache\NuCache\DataSource\ContentCacheDataSerializerEntityType.cs" />
+    <Compile Include="PublishedCache\NuCache\DataSource\IContentCacheDataSerializer.cs" />
+    <Compile Include="PublishedCache\NuCache\DataSource\IContentCacheDataSerializerFactory.cs" />
+    <Compile Include="PublishedCache\NuCache\DataSource\IDictionaryOfPropertyDataSerializer.cs" />
     <Compile Include="PublishedCache\NuCache\DataSource\JsonContentNestedDataSerializer.cs" />
+    <Compile Include="PublishedCache\NuCache\DataSource\JsonContentNestedDataSerializerFactory.cs" />
+    <Compile Include="PublishedCache\NuCache\DataSource\LazyCompressedString.cs" />
     <Compile Include="PublishedCache\NuCache\DataSource\MsgPackContentNestedDataSerializer.cs" />
+    <Compile Include="PropertyEditors\Validation\ComplexEditorElementTypeValidationResult.cs" />
+    <Compile Include="PropertyEditors\Validation\ComplexEditorPropertyTypeValidationResult.cs" />
+    <Compile Include="PropertyEditors\Validation\ComplexEditorValidationResult.cs" />
+    <Compile Include="PropertyEditors\Validation\ContentPropertyValidationResult.cs" />
+    <Compile Include="PropertyEditors\Validation\ValidationResultConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\BlockEditorConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\BlockListPropertyValueConverter.cs" />
+    <Compile Include="PublishedCache\NuCache\DataSource\MsgPackContentNestedDataSerializerFactory.cs" />
     <Compile Include="PublishedCache\NuCache\PublishedSnapshotServiceOptions.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
     <Compile Include="PublishedCache\NuCache\Snap\GenRef.cs" />
@@ -261,6 +293,7 @@
     <Compile Include="Routing\IPublishedRouter.cs" />
     <Compile Include="Routing\MediaUrlProviderCollection.cs" />
     <Compile Include="Routing\MediaUrlProviderCollectionBuilder.cs" />
+    <Compile Include="Scheduling\SimpleTask.cs" />
     <Compile Include="Scheduling\TempFileCleanup.cs" />
     <Compile Include="Search\BackgroundIndexRebuilder.cs" />
     <Compile Include="Search\ExamineFinalComponent.cs" />
@@ -268,11 +301,20 @@
     <Compile Include="Search\ExamineUserComponent.cs" />
     <Compile Include="Search\IUmbracoTreeSearcherFields.cs" />
     <Compile Include="Search\UmbracoTreeSearcherFields.cs" />
+    <Compile Include="Security\BackOfficeExternalLoginProviderErrorMiddlware.cs" />
+    <Compile Include="Security\BackOfficeExternalLoginProviderErrors.cs" />
+    <Compile Include="Security\BackOfficeExternalLoginProviderOptions.cs" />
+    <Compile Include="Security\SignOutAuditEventArgs.cs" />
+    <Compile Include="Security\UserInviteEventArgs.cs" />
     <Compile Include="Services\DashboardService.cs" />
+    <Compile Include="Services\IconService.cs" />
     <Compile Include="Services\IDashboardService.cs" />
     <Compile Include="Models\Link.cs" />
     <Compile Include="Models\LinkType.cs" />
     <Compile Include="Models\TemplateQuery\OperatorFactory.cs" />
+    <Compile Include="Telemetry\ReportSiteTask.cs" />
+    <Compile Include="Telemetry\TelemetryComponent.cs" />
+    <Compile Include="Telemetry\TelemetryComposer.cs" />
     <Compile Include="Templates\HtmlLocalLinkParser.cs" />
     <Compile Include="Templates\HtmlImageSourceParser.cs" />
     <Compile Include="Templates\HtmlUrlParser.cs" />
@@ -560,7 +602,7 @@
     <Compile Include="PublishedCache\NuCache\DataSource\BTree.ContentNodeKitSerializer.cs" />
     <Compile Include="PublishedCache\NuCache\DataSource\BTree.DictionaryOfCultureVariationSerializer.cs" />
     <Compile Include="PublishedCache\NuCache\DataSource\BTree.DictionaryOfPropertyDataSerializer.cs" />
-    <Compile Include="PublishedCache\NuCache\DataSource\ContentNestedData.cs" />
+    <Compile Include="PublishedCache\NuCache\DataSource\ContentCacheDataModel.cs" />
     <Compile Include="PublishedCache\NuCache\DataSource\CultureVariation.cs" />
     <Compile Include="PublishedCache\NuCache\DataSource\IDataSource.cs" />
     <Compile Include="PublishedCache\NuCache\DataSource\PropertyData.cs" />
diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs
index f5667a5a85..c96e21e348 100644
--- a/src/Umbraco.Web/UmbracoApplication.cs
+++ b/src/Umbraco.Web/UmbracoApplication.cs
@@ -1,7 +1,10 @@
-using System.Configuration;
+using System;
+using System.Configuration;
+using System.IO;
 using System.Threading;
 using System.Web;
 using Umbraco.Core;
+using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
 using Umbraco.Core.Runtime;
@@ -23,6 +26,53 @@ namespace Umbraco.Web
             return runtime;
         }
 
+        protected override void OnApplicationError(object sender, EventArgs evargs)
+        {
+            base.OnApplicationError(sender, evargs);
+
+            // if the exception is a BootFailedException we want to show a custom 500 page
+            if (Server.GetLastError() is BootFailedException)
+            {
+                // if the requested file exists on disk, clear the error and return
+                // this is needed to serve static files
+                if (File.Exists(Request.PhysicalPath))
+                {
+                    Server.ClearError();
+                    return;
+                }
+
+                // if the application is in debug mode we don't want to show the custom 500 page
+                if (Context.IsDebuggingEnabled) return;
+
+                // find the error file to show
+                var fileName = GetBootErrorFileName();
+
+                // if the file doesn't exist we return and a YSOD will be shown
+                if (File.Exists(fileName) == false) return;
+
+                Response.TrySkipIisCustomErrors = true;
+                Server.ClearError();
+                Response.Clear();
+
+                Response.StatusCode = 500;
+                Response.ContentType = "text/html";
+                Response.WriteFile(fileName);
+
+                CompleteRequest();
+            }
+        }
+
+        /// <summary>
+        /// Returns the absolute filename to the BootException html file.
+        /// </summary>
+        protected virtual string GetBootErrorFileName()
+        {
+            var fileName = Server.MapPath("~/config/errors/BootFailed.html");
+            if (File.Exists(fileName)) return fileName;
+
+            return Server.MapPath("~/umbraco/views/errors/BootFailed.html");
+        }
+
         /// <summary>
         /// Returns a new MainDom
         /// </summary>
@@ -31,6 +81,8 @@ namespace Umbraco.Web
             // Determine if we should use the sql main dom or the default
             var appSettingMainDomLock = ConfigurationManager.AppSettings[Constants.AppSettings.MainDomLock];
 
+            // TODO: Can we automatically and consistently determine we're running on Azure without this app setting?
+
             var mainDomLock = appSettingMainDomLock == "SqlMainDomLock"
                 ? (IMainDomLock)new SqlMainDomLock(logger)
                 : new MainDomSemaphoreLock(logger);
diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs
index 59b5b1779b..32a949e972 100644
--- a/src/Umbraco.Web/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Web/UmbracoApplicationBase.cs
@@ -6,7 +6,6 @@ using System.Web.Hosting;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Logging.Serilog;
 
 namespace Umbraco.Web
 {
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index 347f79e51b..ab8470c64f 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -66,7 +66,7 @@ namespace Umbraco.Web
             // beware - we cannot expect a current user here, so detecting preview mode must be a lazy thing
             _publishedSnapshot = new Lazy<IPublishedSnapshot>(() => publishedSnapshotService.CreatePublishedSnapshot(PreviewToken));
 
-            // set the urls...
+            // set the URLs...
             // NOTE: The request will not be available during app startup so we can only set this to an absolute URL of localhost, this
             // is a work around to being able to access the UmbracoContext during application startup and this will also ensure that people
             // 'could' still generate URLs during startup BUT any domain driven URL generation will not work because it is NOT possible to get
@@ -101,7 +101,7 @@ namespace Umbraco.Web
         internal Uri OriginalRequestUrl { get; }
 
         /// <summary>
-        /// Gets the cleaned up url that is handled by Umbraco.
+        /// Gets the cleaned up URL that is handled by Umbraco.
         /// </summary>
         /// <remarks>That is, lowercase, no trailing slash after path, no .aspx...</remarks>
         internal Uri CleanedUmbracoUrl { get; }
@@ -144,7 +144,7 @@ namespace Umbraco.Web
         public bool IsFrontEndUmbracoRequest => PublishedRequest != null;
 
         /// <summary>
-        /// Gets the url provider.
+        /// Gets the URL provider.
         /// </summary>
         public UrlProvider UrlProvider { get; }
 
@@ -197,57 +197,57 @@ namespace Umbraco.Web
         #region Urls
 
         /// <summary>
-        /// Gets the url of a content identified by its identifier.
+        /// Gets the URL of a content identified by its identifier.
         /// </summary>
         /// <param name="contentId">The content identifier.</param>
         /// <param name="culture"></param>
-        /// <returns>The url for the content.</returns>
+        /// <returns>The URL for the content.</returns>
         public string Url(int contentId, string culture = null)
         {
             return UrlProvider.GetUrl(contentId, culture: culture);
         }
 
         /// <summary>
-        /// Gets the url of a content identified by its identifier.
+        /// Gets the URL of a content identified by its identifier.
         /// </summary>
         /// <param name="contentId">The content identifier.</param>
         /// <param name="culture"></param>
-        /// <returns>The url for the content.</returns>
+        /// <returns>The URL for the content.</returns>
         public string Url(Guid contentId, string culture = null)
         {
             return UrlProvider.GetUrl(contentId, culture: culture);
         }
 
         /// <summary>
-        /// Gets the url of a content identified by its identifier, in a specified mode.
+        /// Gets the URL of a content identified by its identifier, in a specified mode.
         /// </summary>
         /// <param name="contentId">The content identifier.</param>
         /// <param name="mode">The mode.</param>
         /// <param name="culture"></param>
-        /// <returns>The url for the content.</returns>
+        /// <returns>The URL for the content.</returns>
         public string Url(int contentId, UrlMode mode, string culture = null)
         {
             return UrlProvider.GetUrl(contentId, mode, culture);
         }
 
         /// <summary>
-        /// Gets the url of a content identified by its identifier, in a specified mode.
+        /// Gets the URL of a content identified by its identifier, in a specified mode.
         /// </summary>
         /// <param name="contentId">The content identifier.</param>
         /// <param name="mode">The mode.</param>
         /// <param name="culture"></param>
-        /// <returns>The url for the content.</returns>
+        /// <returns>The URL for the content.</returns>
         public string Url(Guid contentId, UrlMode mode, string culture = null)
         {
             return UrlProvider.GetUrl(contentId, mode, culture);
         }
 
         /// <summary>
-        /// Gets the absolute url of a content identified by its identifier.
+        /// Gets the absolute URL of a content identified by its identifier.
         /// </summary>
         /// <param name="contentId">The content identifier.</param>
         /// <param name="culture"></param>
-        /// <returns>The absolute url for the content.</returns>
+        /// <returns>The absolute URL for the content.</returns>
         [Obsolete("Use the Url() method with UrlMode.Absolute.")]
         public string UrlAbsolute(int contentId, string culture = null)
         {
@@ -255,11 +255,11 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// Gets the absolute url of a content identified by its identifier.
+        /// Gets the absolute URL of a content identified by its identifier.
         /// </summary>
         /// <param name="contentId">The content identifier.</param>
         /// <param name="culture"></param>
-        /// <returns>The absolute url for the content.</returns>
+        /// <returns>The absolute URL for the content.</returns>
         [Obsolete("Use the Url() method with UrlMode.Absolute.")]
         public string UrlAbsolute(Guid contentId, string culture = null)
         {
diff --git a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
index 0633cca3a0..9a9f5e7e01 100644
--- a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
+++ b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
@@ -68,6 +68,9 @@ namespace Umbraco.Web
             // Configure OWIN for authentication.
             ConfigureUmbracoAuthentication(app);
 
+            // must come after all authentication
+            app.UseUmbracoBackOfficeExternalLoginErrors();
+
             app
                 .UseSignalR(GlobalSettings)
                 .FinalizeMiddlewareConfiguration();
@@ -99,6 +102,7 @@ namespace Umbraco.Web
             app
                 .UseUmbracoBackOfficeCookieAuthentication(UmbracoContextAccessor, RuntimeState, Services.UserService, GlobalSettings, UmbracoSettings.Security, PipelineStage.Authenticate)
                 .UseUmbracoBackOfficeExternalCookieAuthentication(UmbracoContextAccessor, RuntimeState, GlobalSettings, PipelineStage.Authenticate)
+                // TODO: this would be considered a breaking change but this must come after all authentication so should be moved within ConfigureMiddleware
                 .UseUmbracoPreviewAuthentication(UmbracoContextAccessor, RuntimeState, GlobalSettings, UmbracoSettings.Security, PipelineStage.Authorize);
         }
 
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 6a2fba1152..d73f98b6b5 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -141,7 +141,7 @@ namespace Umbraco.Web
         /// <returns></returns>
         public IHtmlString RenderTemplate(int contentId, int? altTemplateId = null)
         {
-            return ComponentRenderer.RenderTemplate(contentId, altTemplateId);
+            return _componentRenderer.RenderTemplate(contentId, altTemplateId);
         }
 
         #region RenderMacro
@@ -153,7 +153,7 @@ namespace Umbraco.Web
         /// <returns></returns>
         public IHtmlString RenderMacro(string alias)
         {
-            return ComponentRenderer.RenderMacro(AssignedContentItem?.Id ?? 0, alias, null);
+            return _componentRenderer.RenderMacro(AssignedContentItem?.Id ?? 0, alias, null);
         }
 
         /// <summary>
@@ -164,7 +164,7 @@ namespace Umbraco.Web
         /// <returns></returns>
         public IHtmlString RenderMacro(string alias, object parameters)
         {
-            return ComponentRenderer.RenderMacro(AssignedContentItem?.Id ?? 0, alias, parameters?.ToDictionary<object>());
+            return _componentRenderer.RenderMacro(AssignedContentItem?.Id ?? 0, alias, parameters?.ToDictionary<object>());
         }
 
         /// <summary>
@@ -175,7 +175,7 @@ namespace Umbraco.Web
         /// <returns></returns>
         public IHtmlString RenderMacro(string alias, IDictionary<string, object> parameters)
         {
-            return ComponentRenderer.RenderMacro(AssignedContentItem?.Id ?? 0, alias, parameters);
+            return _componentRenderer.RenderMacro(AssignedContentItem?.Id ?? 0, alias, parameters);
         }
 
         #endregion
@@ -212,7 +212,7 @@ namespace Umbraco.Web
         /// Returns the ICultureDictionary for access to dictionary items
         /// </summary>
         public ICultureDictionary CultureDictionary => _cultureDictionary
-            ?? (_cultureDictionary = CultureDictionaryFactory.CreateDictionary());
+            ?? (_cultureDictionary = _cultureDictionaryFactory.CreateDictionary());
 
         #endregion
 
@@ -225,7 +225,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)
         {
-            return MembershipHelper.MemberHasAccess(path);
+            return _membershipHelper.MemberHasAccess(path);
         }
 
         /// <summary>
@@ -234,7 +234,7 @@ namespace Umbraco.Web
         /// <returns>True is the current user is logged in</returns>
         public bool MemberIsLoggedOn()
         {
-            return MembershipHelper.IsLoggedIn();
+            return _membershipHelper.IsLoggedIn();
         }
 
         #endregion
@@ -275,7 +275,7 @@ namespace Umbraco.Web
 
         public IPublishedContent Member(Guid id)
         {
-            return MembershipHelper.GetById(id);
+            return _membershipHelper.GetById(id);
         }
 
         public IPublishedContent Member(object id)
@@ -291,18 +291,18 @@ namespace Umbraco.Web
 
         public IPublishedContent Member(int id)
         {
-            return MembershipHelper.GetById(id);
+            return _membershipHelper.GetById(id);
         }
 
         public IPublishedContent Member(string id)
         {
             var asInt = id.TryConvertTo<int>();
-            return asInt ? MembershipHelper.GetById(asInt.Result) : MembershipHelper.GetByProviderKey(id);
+            return asInt ? _membershipHelper.GetById(asInt.Result) : _membershipHelper.GetByProviderKey(id);
         }
 
         public IEnumerable<IPublishedContent> Members(IEnumerable<int> ids)
         {
-            return MembershipHelper.GetByIds(ids);
+            return _membershipHelper.GetByIds(ids);
         }
 
         public IEnumerable<IPublishedContent> Members(IEnumerable<string> ids)
@@ -312,7 +312,7 @@ namespace Umbraco.Web
 
         public IEnumerable<IPublishedContent> Members(IEnumerable<Guid> ids)
         {
-            return MembershipHelper.GetByIds(ids);
+            return _membershipHelper.GetByIds(ids);
         }
 
         public IEnumerable<IPublishedContent> Members(IEnumerable<Udi> ids)
@@ -337,7 +337,7 @@ namespace Umbraco.Web
 
         public IEnumerable<IPublishedContent> Members(params Guid[] ids)
         {
-            return MembershipHelper.GetByIds(ids);
+            return _membershipHelper.GetByIds(ids);
         }
 
         public IEnumerable<IPublishedContent> Members(params Udi[] ids)
@@ -367,11 +367,11 @@ namespace Umbraco.Web
         private IPublishedContent ContentForObject(object id)
         {
             if (ConvertIdObjectToInt(id, out var intId))
-                return ContentQuery.Content(intId);
+                return _publishedContentQuery.Content(intId);
             if (ConvertIdObjectToGuid(id, out var guidId))
-                return ContentQuery.Content(guidId);
+                return _publishedContentQuery.Content(guidId);
             if (ConvertIdObjectToUdi(id, out var udiId))
-                return ContentQuery.Content(udiId);
+                return _publishedContentQuery.Content(udiId);
             return null;
         }
 
@@ -382,7 +382,7 @@ namespace Umbraco.Web
         /// <returns>The content, or null of the content item is not in the cache.</returns>
         public IPublishedContent Content(int id)
         {
-            return ContentQuery.Content(id);
+            return _publishedContentQuery.Content(id);
         }
 
         /// <summary>
@@ -392,7 +392,7 @@ namespace Umbraco.Web
         /// <returns>The content, or null of the content item is not in the cache.</returns>
         public IPublishedContent Content(Guid id)
         {
-            return ContentQuery.Content(id);
+            return _publishedContentQuery.Content(id);
         }
 
         /// <summary>
@@ -407,12 +407,12 @@ namespace Umbraco.Web
 
         public IPublishedContent Content(Udi id)
         {
-            return ContentQuery.Content(id);
+            return _publishedContentQuery.Content(id);
         }
 
         public IPublishedContent ContentSingleAtXPath(string xpath, params XPathVariable[] vars)
         {
-            return ContentQuery.ContentSingleAtXPath(xpath, vars);
+            return _publishedContentQuery.ContentSingleAtXPath(xpath, vars);
         }
 
         /// <summary>
@@ -434,7 +434,7 @@ namespace Umbraco.Web
         /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
         public IEnumerable<IPublishedContent> Content(params Udi[] ids)
         {
-            return ids.Select(id => ContentQuery.Content(id)).WhereNotNull();
+            return ids.Select(id => _publishedContentQuery.Content(id)).WhereNotNull();
         }
 
         /// <summary>
@@ -445,16 +445,16 @@ namespace Umbraco.Web
         /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
         public IEnumerable<IPublishedContent> Content(params GuidUdi[] ids)
         {
-            return ids.Select(id => ContentQuery.Content(id));
+            return ids.Select(id => _publishedContentQuery.Content(id));
         }
 
         private IEnumerable<IPublishedContent> ContentForObjects(IEnumerable<object> ids)
         {
             var idsA = ids.ToArray();
             if (ConvertIdsObjectToInts(idsA, out var intIds))
-                return ContentQuery.Content(intIds);
+                return _publishedContentQuery.Content(intIds);
             if (ConvertIdsObjectToGuids(idsA, out var guidIds))
-                return ContentQuery.Content(guidIds);
+                return _publishedContentQuery.Content(guidIds);
             return Enumerable.Empty<IPublishedContent>();
         }
 
@@ -465,7 +465,7 @@ namespace Umbraco.Web
         /// <returns>The content items that were found in the cache.</returns>
         public IEnumerable<IPublishedContent> Content(params int[] ids)
         {
-            return ContentQuery.Content(ids);
+            return _publishedContentQuery.Content(ids);
         }
 
         /// <summary>
@@ -475,7 +475,7 @@ namespace Umbraco.Web
         /// <returns>The content items that were found in the cache.</returns>
         public IEnumerable<IPublishedContent> Content(params Guid[] ids)
         {
-            return ContentQuery.Content(ids);
+            return _publishedContentQuery.Content(ids);
         }
 
         /// <summary>
@@ -507,7 +507,7 @@ namespace Umbraco.Web
         /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
         public IEnumerable<IPublishedContent> Content(IEnumerable<Udi> ids)
         {
-            return ids.Select(id => ContentQuery.Content(id)).WhereNotNull();
+            return ids.Select(id => _publishedContentQuery.Content(id)).WhereNotNull();
         }
 
         /// <summary>
@@ -518,7 +518,7 @@ namespace Umbraco.Web
         /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
         public IEnumerable<IPublishedContent> Content(IEnumerable<GuidUdi> ids)
         {
-            return ids.Select(id => ContentQuery.Content(id));
+            return ids.Select(id => _publishedContentQuery.Content(id));
         }
 
         /// <summary>
@@ -540,22 +540,22 @@ namespace Umbraco.Web
         /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
         public IEnumerable<IPublishedContent> Content(IEnumerable<int> ids)
         {
-            return ContentQuery.Content(ids);
+            return _publishedContentQuery.Content(ids);
         }
 
         public IEnumerable<IPublishedContent> ContentAtXPath(string xpath, params XPathVariable[] vars)
         {
-            return ContentQuery.ContentAtXPath(xpath, vars);
+            return _publishedContentQuery.ContentAtXPath(xpath, vars);
         }
 
         public IEnumerable<IPublishedContent> ContentAtXPath(XPathExpression xpath, params XPathVariable[] vars)
         {
-            return ContentQuery.ContentAtXPath(xpath, vars);
+            return _publishedContentQuery.ContentAtXPath(xpath, vars);
         }
 
         public IEnumerable<IPublishedContent> ContentAtRoot()
         {
-            return ContentQuery.ContentAtRoot();
+            return _publishedContentQuery.ContentAtRoot();
         }
 
         internal static bool ConvertIdObjectToInt(object id, out int intId)
@@ -654,7 +654,7 @@ namespace Umbraco.Web
 
         public IPublishedContent Media(Guid id)
         {
-            return ContentQuery.Media(id);
+            return _publishedContentQuery.Media(id);
         }
 
         /// <summary>
@@ -675,17 +675,17 @@ namespace Umbraco.Web
         private IPublishedContent MediaForObject(object id)
         {
             if (ConvertIdObjectToInt(id, out var intId))
-                return ContentQuery.Media(intId);
+                return _publishedContentQuery.Media(intId);
             if (ConvertIdObjectToGuid(id, out var guidId))
-                return ContentQuery.Media(guidId);
+                return _publishedContentQuery.Media(guidId);
             if (ConvertIdObjectToUdi(id, out var udiId))
-                return ContentQuery.Media(udiId);
+                return _publishedContentQuery.Media(udiId);
             return null;
         }
 
         public IPublishedContent Media(int id)
         {
-            return ContentQuery.Media(id);
+            return _publishedContentQuery.Media(id);
         }
 
         public IPublishedContent Media(string id)
@@ -708,9 +708,9 @@ namespace Umbraco.Web
         {
             var idsA = ids.ToArray();
             if (ConvertIdsObjectToInts(idsA, out var intIds))
-                return ContentQuery.Media(intIds);
+                return _publishedContentQuery.Media(intIds);
             if (ConvertIdsObjectToGuids(idsA, out var guidIds))
-                return ContentQuery.Media(guidIds);
+                return _publishedContentQuery.Media(guidIds);
             return Enumerable.Empty<IPublishedContent>();
         }
 
@@ -722,7 +722,7 @@ namespace Umbraco.Web
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
         public IEnumerable<IPublishedContent> Media(params int[] ids)
         {
-            return ContentQuery.Media(ids);
+            return _publishedContentQuery.Media(ids);
         }
 
         /// <summary>
@@ -745,7 +745,7 @@ namespace Umbraco.Web
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
         public IEnumerable<IPublishedContent> Media(params Udi[] ids)
         {
-            return ids.Select(id => ContentQuery.Media(id)).WhereNotNull();
+            return ids.Select(id => _publishedContentQuery.Media(id)).WhereNotNull();
         }
 
         /// <summary>
@@ -756,7 +756,7 @@ namespace Umbraco.Web
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
         public IEnumerable<IPublishedContent> Media(params GuidUdi[] ids)
         {
-            return ids.Select(id => ContentQuery.Media(id));
+            return ids.Select(id => _publishedContentQuery.Media(id));
         }
 
         /// <summary>
@@ -778,7 +778,7 @@ namespace Umbraco.Web
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
         public IEnumerable<IPublishedContent> Media(IEnumerable<int> ids)
         {
-            return ContentQuery.Media(ids);
+            return _publishedContentQuery.Media(ids);
         }
 
         /// <summary>
@@ -789,7 +789,7 @@ namespace Umbraco.Web
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
         public IEnumerable<IPublishedContent> Media(IEnumerable<Udi> ids)
         {
-            return ids.Select(id => ContentQuery.Media(id)).WhereNotNull();
+            return ids.Select(id => _publishedContentQuery.Media(id)).WhereNotNull();
         }
 
         /// <summary>
@@ -800,7 +800,7 @@ namespace Umbraco.Web
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
         public IEnumerable<IPublishedContent> Media(IEnumerable<GuidUdi> ids)
         {
-            return ids.Select(id => ContentQuery.Media(id));
+            return ids.Select(id => _publishedContentQuery.Media(id));
         }
 
         /// <summary>
@@ -816,7 +816,7 @@ namespace Umbraco.Web
 
         public IEnumerable<IPublishedContent> MediaAtRoot()
         {
-            return ContentQuery.MediaAtRoot();
+            return _publishedContentQuery.MediaAtRoot();
         }
 
         #endregion
diff --git a/src/Umbraco.Web/UmbracoHttpHandler.cs b/src/Umbraco.Web/UmbracoHttpHandler.cs
index 447bdde430..fae2b571c5 100644
--- a/src/Umbraco.Web/UmbracoHttpHandler.cs
+++ b/src/Umbraco.Web/UmbracoHttpHandler.cs
@@ -61,7 +61,7 @@ namespace Umbraco.Web
         public WebSecurity Security => UmbracoContextAccessor.UmbracoContext.Security;
 
         /// <summary>
-        /// Gets the Url helper.
+        /// Gets the URL helper.
         /// </summary>
         /// <remarks>This URL helper is created without any route data and an empty request context.</remarks>
         public UrlHelper Url => _url ?? (_url = new UrlHelper(HttpContext.Current.Request.RequestContext));
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index 6dc41d39ee..cc130a7b56 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -62,7 +62,7 @@ namespace Umbraco.Web
         /// <param name="httpContext"></param>
         private void BeginRequest(HttpContextBase httpContext)
         {
-            // ensure application url is initialized
+            // ensure application URL is initialized
             ((RuntimeState) Current.RuntimeState).EnsureApplicationUrl(httpContext.Request);
 
             // do not process if client-side request
@@ -128,7 +128,7 @@ namespace Umbraco.Web
             // auth. Paul Sterling confirmed in Jan. 2013 that we can get rid of it.
 
             // instantiate, prepare and process the published content request
-            // important to use CleanedUmbracoUrl - lowercase path-only version of the current url
+            // important to use CleanedUmbracoUrl - lowercase path-only version of the current URL
             var request = _publishedRouter.CreateRequest(umbracoContext);
             umbracoContext.PublishedRequest = request;
             _publishedRouter.PrepareRequest(request);
@@ -249,7 +249,7 @@ namespace Umbraco.Web
         private void RewriteToBackOfficeHandler(HttpContextBase context)
         {
             // GlobalSettings.Path has already been through IOHelper.ResolveUrl() so it begins with / and vdir (if any)
-            var rewritePath = _globalSettings.Path.TrimEnd('/') + "/Default";
+            var rewritePath = _globalSettings.Path.TrimEnd(Constants.CharArrays.ForwardSlash) + "/Default";
             // rewrite the path to the path of the handler (i.e. /umbraco/RenderMvc)
             context.RewritePath(rewritePath, "", "", false);
 
@@ -276,13 +276,13 @@ namespace Umbraco.Web
         {
             // NOTE: we do not want to use TransferRequest even though many docs say it is better with IIS7, turns out this is
             // not what we need. The purpose of TransferRequest is to ensure that .net processes all of the rules for the newly
-            // rewritten url, but this is not what we want!
+            // rewritten URL, but this is not what we want!
             // read: http://forums.iis.net/t/1146511.aspx
 
-            var query = pcr.Uri.Query.TrimStart('?');
+            var query = pcr.Uri.Query.TrimStart(Constants.CharArrays.QuestionMark);
 
             // GlobalSettings.Path has already been through IOHelper.ResolveUrl() so it begins with / and vdir (if any)
-            var rewritePath = _globalSettings.Path.TrimEnd('/') + "/RenderMvc";
+            var rewritePath = _globalSettings.Path.TrimEnd(Constants.CharArrays.ForwardSlash) + "/RenderMvc";
             // rewrite the path to the path of the handler (i.e. /umbraco/RenderMvc)
             context.RewritePath(rewritePath, "", query, false);
 
@@ -357,15 +357,13 @@ namespace Umbraco.Web
                 // there's nothing we can do really
                 app.BeginRequest += (sender, args) =>
                 {
-                    // would love to avoid throwing, and instead display a customized Umbraco 500
-                    // page - however if we don't throw here, something else might go wrong, and
-                    // it's this later exception that would be reported. could not figure out how
-                    // to prevent it, either with httpContext.Response.End() or .ApplicationInstance
-                    // .CompleteRequest()
+                    // if we don't throw here, something else might go wrong,
+                    // and it's this later exception that would be reported.
 
                     // also, if something goes wrong with our DI setup, the logging subsystem may
                     // not even kick in, so here we try to give as much detail as possible
 
+                    // the exception is handled in UmbracoApplication which shows a custom error page
                     BootFailedException.Rethrow(Core.Composing.Current.RuntimeState.BootFailedException);
                 };
                 return;
diff --git a/src/Umbraco.Web/UmbracoWebService.cs b/src/Umbraco.Web/UmbracoWebService.cs
index bccdb5771d..f7268283f5 100644
--- a/src/Umbraco.Web/UmbracoWebService.cs
+++ b/src/Umbraco.Web/UmbracoWebService.cs
@@ -77,7 +77,7 @@ namespace Umbraco.Web
         public WebSecurity Security => UmbracoContext.Security;
 
         /// <summary>
-        /// Gets the Url helper.
+        /// Gets the URL helper.
         /// </summary>
         /// <remarks>This URL helper is created without any route data and an empty request context.</remarks>
         public UrlHelper Url => _url ?? (_url = new UrlHelper(Context.Request.RequestContext));
diff --git a/src/Umbraco.Web/UriUtility.cs b/src/Umbraco.Web/UriUtility.cs
index 9e94a4a20a..730a50bd61 100644
--- a/src/Umbraco.Web/UriUtility.cs
+++ b/src/Umbraco.Web/UriUtility.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Web
         public static string ToAbsolute(string url)
         {
             //return ResolveUrl(url);
-            url = url.TrimStart('~');
+            url = url.TrimStart(Constants.CharArrays.Tilde);
             return _appPathPrefix + url;
         }
 
@@ -102,7 +102,7 @@ namespace Umbraco.Web
             }
             if (path != "/")
             {
-                path = path.TrimEnd('/');
+                path = path.TrimEnd(Constants.CharArrays.ForwardSlash);
             }
 
             //if any part of the path contains .aspx, replace it with nothing.
@@ -216,7 +216,7 @@ namespace Umbraco.Web
             var pos = Math.Min(pos1, pos2);
 
             var path = pos > 0 ? uri.Substring(0, pos) : uri;
-            path = path.TrimEnd('/');
+            path = path.TrimEnd(Constants.CharArrays.ForwardSlash);
 
             if (pos > 0)
                 path += uri.Substring(pos);
@@ -227,7 +227,7 @@ namespace Umbraco.Web
         #endregion
 
         /// <summary>
-        /// Returns an full url with the host, port, etc...
+        /// Returns an full URL with the host, port, etc...
         /// </summary>
         /// <param name="absolutePath">An absolute path (i.e. starts with a '/' )</param>
         /// <param name="httpContext"> </param>
diff --git a/src/Umbraco.Web/UrlHelperExtensions.cs b/src/Umbraco.Web/UrlHelperExtensions.cs
index 7e63ff16b8..f2c954d399 100644
--- a/src/Umbraco.Web/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/UrlHelperExtensions.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Web
     {
 
         /// <summary>
-        /// Return the Url for a Web Api service
+        /// Return the URL for a Web Api service
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="url"></param>
@@ -58,7 +58,7 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// Return the Url for a Web Api service
+        /// Return the URL for a Web Api service
         /// </summary>
         /// <param name="url"></param>
         /// <param name="actionName"></param>
@@ -87,7 +87,7 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// Return the Url for a Web Api service
+        /// Return the URL for a Web Api service
         /// </summary>
         /// <param name="url"></param>
         /// <param name="actionName"></param>
@@ -119,7 +119,7 @@ namespace Umbraco.Web
 
 
         /// <summary>
-        /// Return the Url for an action with a cache-busting hash appended
+        /// Return the URL for an action with a cache-busting hash appended
         /// </summary>
         /// <param name="url"></param>
         /// <param name="actionName"></param>
diff --git a/src/Umbraco.Web/UrlHelperRenderExtensions.cs b/src/Umbraco.Web/UrlHelperRenderExtensions.cs
index 8e410bf584..0f5b0557f4 100644
--- a/src/Umbraco.Web/UrlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/UrlHelperRenderExtensions.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Web
         #region GetCropUrl
 
         /// <summary>
-        /// Gets the ImageProcessor Url of a media item by the crop alias (using default media item property alias of "umbracoFile")
+        /// Gets the ImageProcessor URL of a media item by the crop alias (using default media item property alias of "umbracoFile")
         /// </summary>
         /// <param name="urlHelper"></param>
         /// <param name="mediaItem">
@@ -46,7 +46,7 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// Gets the ImageProcessor Url by the crop alias using the specified property containing the image cropper Json data on the IPublishedContent item.
+        /// Gets the ImageProcessor URL by the crop alias using the specified property containing the image cropper Json data on the IPublishedContent item.
         /// </summary>
         /// <param name="urlHelper"></param>
         /// <param name="mediaItem">
@@ -63,7 +63,7 @@ namespace Umbraco.Web
         /// set to false if using the result of this method for CSS.
         /// </param>
         /// <returns>
-        /// The ImageProcessor.Web Url.
+        /// The ImageProcessor.Web URL.
         /// </returns>
         public static IHtmlString GetCropUrl(this UrlHelper urlHelper, IPublishedContent mediaItem, string propertyAlias, string cropAlias, bool htmlEncode = true)
         {
@@ -74,7 +74,7 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// Gets the ImageProcessor Url from the image path.
+        /// Gets the ImageProcessor URL from the image path.
         /// </summary>
         /// <param name="mediaItem">
         /// The IPublishedContent item.
@@ -157,10 +157,10 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// Gets the ImageProcessor Url from the image path.
+        /// Gets the ImageProcessor URL from the image path.
         /// </summary>
         /// <param name="imageUrl">
-        /// The image url.
+        /// The image URL.
         /// </param>
         /// <param name="width">
         /// The width of the output image.
diff --git a/src/Umbraco.Web/ViewDataExtensions.cs b/src/Umbraco.Web/ViewDataExtensions.cs
index e47171f1ba..ac4f4cdf75 100644
--- a/src/Umbraco.Web/ViewDataExtensions.cs
+++ b/src/Umbraco.Web/ViewDataExtensions.cs
@@ -1,5 +1,12 @@
-using System.Collections.Generic;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web;
 using System.Web.Mvc;
+using Umbraco.Core;
+using Umbraco.Web.Security;
 
 namespace Umbraco.Web
 {
@@ -18,6 +25,49 @@ namespace Umbraco.Web
             return true;
         }
 
+        /// <summary>
+        /// Copies data from a request cookie to view data and then clears the cookie in the response
+        /// </summary>
+        /// <param name="viewData"></param>
+        /// <param name="httpContext"></param>
+        /// <param name="cookieName"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// <para>
+        /// This is similar to TempData but in some cases we cannot use TempData which relies on the temp data provider and session.
+        /// The cookie value can either be a simple string value
+        /// </para>
+        /// </remarks>
+        internal static bool FromBase64CookieData<T>(this ViewDataDictionary viewData, HttpContextBase httpContext, string cookieName)
+        {
+            var hasCookie = httpContext.Request.HasCookie(cookieName);
+            if (!hasCookie) return false;
+
+            // get the cookie value
+            var cookieVal = httpContext.Request.GetCookieValue(cookieName);
+
+            if (cookieVal == null)
+                return false;
+
+            // ensure the cookie is expired (must be done after reading the value)
+            httpContext.ExpireCookie(cookieName);
+
+            if (cookieVal.IsNullOrWhiteSpace())
+                return false;
+
+            try
+            {
+                var decoded = Encoding.UTF8.GetString(Convert.FromBase64String(System.Net.WebUtility.UrlDecode(cookieVal)));
+                // deserialize to T and store in viewdata
+                viewData[cookieName] = JsonConvert.DeserializeObject<T>(decoded);
+                return true;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+        }
+
         public static string GetUmbracoPath(this ViewDataDictionary viewData)
         {
             return (string)viewData[TokenUmbracoPath];
@@ -48,14 +98,37 @@ namespace Umbraco.Web
             viewData[TokenUmbracoBaseFolder] = value;
         }
 
-        public static IEnumerable<string> GetExternalSignInError(this ViewDataDictionary viewData)
+        /// <summary>
+        /// Used by the back office login screen to get any registered external login provider errors
+        /// </summary>
+        /// <param name="viewData"></param>
+        /// <returns></returns>
+        public static BackOfficeExternalLoginProviderErrors GetExternalSignInProviderErrors(this ViewDataDictionary viewData)
         {
-            return (IEnumerable<string>)viewData[TokenExternalSignInError];
+            return (BackOfficeExternalLoginProviderErrors)viewData[TokenExternalSignInError];
         }
 
+        [Obsolete("Use GetExternalSignInProviderErrors instead")]
+        public static IEnumerable<string> GetExternalSignInError(this ViewDataDictionary viewData)
+        {
+            var errs = viewData.GetExternalSignInProviderErrors();
+            return errs?.Errors ?? Enumerable.Empty<string>();
+        }
+
+        /// <summary>
+        /// Used by the back office controller to register any external login provider errors
+        /// </summary>
+        /// <param name="viewData"></param>
+        /// <param name="errors"></param>
+        public static void SetExternalSignInProviderErrors(this ViewDataDictionary viewData, BackOfficeExternalLoginProviderErrors errors)
+        {
+            viewData[TokenExternalSignInError] = errors;
+        }
+
+        [Obsolete("Use SetExternalSignInProviderErrors instead")]
         public static void SetExternalSignInError(this ViewDataDictionary viewData, IEnumerable<string> value)
         {
-            viewData[TokenExternalSignInError] = value;
+            viewData[TokenExternalSignInError] = new BackOfficeExternalLoginProviderErrors(string.Empty, value);
         }
 
         public static string GetPasswordResetCode(this ViewDataDictionary viewData)
diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
index 28f09b46b7..550b4dcdf1 100644
--- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Web.WebApi.Filters
             int nodeId;
             if (_nodeId.HasValue == false)
             {
-                var parts = _paramName.Split(new[] {'.'}, StringSplitOptions.RemoveEmptyEntries);
+                var parts = _paramName.Split(Constants.CharArrays.Period, StringSplitOptions.RemoveEmptyEntries);
 
                 if (actionContext.ActionArguments[parts[0]] == null)
                 {
diff --git a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs
index 60e2889fd5..3c60f43be0 100644
--- a/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs
@@ -91,7 +91,7 @@ namespace Umbraco.Web.WebApi.Filters
             int nodeId;
             if (_nodeId.HasValue == false)
             {
-                var parts = _paramName.Split(new [] { '.' }, StringSplitOptions.RemoveEmptyEntries);
+                var parts = _paramName.Split(Constants.CharArrays.Period, StringSplitOptions.RemoveEmptyEntries);
 
                 if (actionContext.ActionArguments[parts[0]] == null)
                 {
diff --git a/src/Umbraco.Web/WebApi/HttpActionContextExtensions.cs b/src/Umbraco.Web/WebApi/HttpActionContextExtensions.cs
index c67ec2f6a7..08d0ac8254 100644
--- a/src/Umbraco.Web/WebApi/HttpActionContextExtensions.cs
+++ b/src/Umbraco.Web/WebApi/HttpActionContextExtensions.cs
@@ -89,7 +89,9 @@ namespace Umbraco.Web.WebApi
                         throw x.Exception;
                     }
                     result = x.ConfigureAwait(false).GetAwaiter().GetResult();
-                });
+                },
+                // Must explicitly specify this, see https://blog.stephencleary.com/2013/10/continuewith-is-dangerous-too.html
+                TaskScheduler.Default);
             task.Wait();
 
             if (result == null)
diff --git a/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
index bc1e9a4318..65f34b05fb 100644
--- a/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
@@ -38,7 +38,7 @@ namespace Umbraco.Web.WebApi
                 AllowType = "";
 
             var members = new List<int>();
-            foreach (var s in AllowMembers.Split(','))
+            foreach (var s in AllowMembers.Split(Constants.CharArrays.Comma))
             {
                 if (int.TryParse(s, out var id))
                 {
@@ -47,7 +47,7 @@ namespace Umbraco.Web.WebApi
             }
 
             var helper = Current.Factory.GetInstance<MembershipHelper>();
-            return helper.IsMemberAuthorized(AllowType.Split(','), AllowGroup.Split(','), members);
+            return helper.IsMemberAuthorized(AllowType.Split(Constants.CharArrays.Comma), AllowGroup.Split(Constants.CharArrays.Comma), members);
         }
 
     }
diff --git a/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs b/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
index a1cd7708e2..9e22928cf6 100644
--- a/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
+++ b/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
@@ -125,7 +125,7 @@ namespace Umbraco.Web.WebApi
         internal IRuntimeState RuntimeState { get; }
 
         /// <summary>
-        /// Gets the application url.
+        /// Gets the application URL.
         /// </summary>
         protected Uri ApplicationUrl => RuntimeState.ApplicationUrl;
 
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 63fb856b5d..78ff0ef12d 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -58,8 +58,24 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Web.UI.Client", "ht
 		StartServerOnDebug = "false"
 	EndProjectSection
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Tests.AcceptanceTest\", "Umbraco.Tests.AcceptanceTest\", "{9E4C8A12-FBE0-4673-8CE2-DF99D5D57817}"
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Tests.AcceptanceTest", "Umbraco.Tests.AcceptanceTest\", "{9E4C8A12-FBE0-4673-8CE2-DF99D5D57817}"
 	ProjectSection(WebsiteProperties) = preProject
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
+		Debug.AspNetCompiler.VirtualPath = "/localhost_62926"
+		Debug.AspNetCompiler.PhysicalPath = "Umbraco.Tests.AcceptanceTest\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_62926\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/localhost_62926"
+		Release.AspNetCompiler.PhysicalPath = "Umbraco.Tests.AcceptanceTest\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_62926\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "62926"
 		SlnRelativePath = "Umbraco.Tests.AcceptanceTest\"
 	EndProjectSection
 EndProject
@@ -123,6 +139,9 @@ Global
 		{4C4C194C-B5E4-4991-8F87-4373E24CC19F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3819A550-DCEC-4153-91B4-8BA9F7F0B9B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3819A550-DCEC-4153-91B4-8BA9F7F0B9B4}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E4C8A12-FBE0-4673-8CE2-DF99D5D57817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E4C8A12-FBE0-4673-8CE2-DF99D5D57817}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E4C8A12-FBE0-4673-8CE2-DF99D5D57817}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{651E1350-91B6-44B7-BD60-7207006D7003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{651E1350-91B6-44B7-BD60-7207006D7003}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{651E1350-91B6-44B7-BD60-7207006D7003}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -157,6 +176,7 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{227C3B55-80E5-4E7E-A802-BE16C5128B9D} = {2849E9D4-3B4E-40A3-A309-F3CB4F0E125F}
+		{9E4C8A12-FBE0-4673-8CE2-DF99D5D57817} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 		{5D3B8245-ADA6-453F-A008-50ED04BFE770} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 		{E3F9F378-AFE1-40A5-90BD-82833375DBFE} = {227C3B55-80E5-4E7E-A802-BE16C5128B9D}
 		{5B03EF4E-E0AC-4905-861B-8C3EC1A0D458} = {227C3B55-80E5-4E7E-A802-BE16C5128B9D}
@@ -164,7 +184,6 @@ Global
 		{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 		{C7311C00-2184-409B-B506-52A5FAEA8736} = {FD962632-184C-4005-A5F3-E705D92FC645}
 		{FB5676ED-7A69-492C-B802-E7B24144C0FC} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
-		{9E4C8A12-FBE0-4673-8CE2-DF99D5D57817} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7A0F2E34-D2AF-4DAB-86A0-7D7764B3D0EC}
diff --git a/src/umbraco.sln.DotSettings b/src/umbraco.sln.DotSettings
index 2f99fe6350..3d42d188af 100644
--- a/src/umbraco.sln.DotSettings
+++ b/src/umbraco.sln.DotSettings
@@ -5,5 +5,6 @@
 	<s:String x:Key="/Default/PatternsAndTemplates/StructuralSearch/Pattern/=2DA32DA040A7D74599ABE288C7224CF0/Severity/@EntryValue">HINT</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/StructuralSearch/Pattern/=37A0B37A0ABAA34AA5CB32A93653C4FE/@KeyIndexDefined">False</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Default</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Allowlist/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=unpublish/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=unpublishing/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>